From 995732fad27ed88d0b2d75333b72e53c0f8eb5e2 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 3 Nov 2016 15:35:10 -0700 Subject: [PATCH 001/116] Add undefined to default-valued parameters When --strictNullChecks is on --- src/compiler/checker.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 28b14502af98b..a459db40e1b9e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3206,7 +3206,8 @@ namespace ts { // Use the type of the initializer expression if one is present if (declaration.initializer) { const type = checkDeclarationInitializer(declaration); - return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality); + const isOptional = declaration.questionToken || (declaration.initializer && declaration.kind === SyntaxKind.Parameter); + return addOptionality(type, isOptional && includeOptionality); } // If it is a short-hand property assignment, use the type of the identifier From 286845c6c5ea4b5bd791b23ed5d6f78291b01f16 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 3 Nov 2016 15:35:29 -0700 Subject: [PATCH 002/116] Test adding undefined to default-valued parameters When --strictNullChecks is on Also update a baseline that changes now. --- .../defaultParameterAddsUndefinedWithStrictNullChecks.js | 9 +++++++++ ...ultParameterAddsUndefinedWithStrictNullChecks.symbols | 7 +++++++ ...faultParameterAddsUndefinedWithStrictNullChecks.types | 8 ++++++++ tests/baselines/reference/optionalMethods.js | 4 ++-- tests/baselines/reference/optionalMethods.types | 6 +++--- .../defaultParameterAddsUndefinedWithStrictNullChecks.ts | 3 +++ 6 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js create mode 100644 tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols create mode 100644 tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types create mode 100644 tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js new file mode 100644 index 0000000000000..34a540a29082d --- /dev/null +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -0,0 +1,9 @@ +//// [defaultParameterAddsUndefinedWithStrictNullChecks.ts] +function f(addUndefined1 = "J", addUndefined2?: number) { +} + + +//// [defaultParameterAddsUndefinedWithStrictNullChecks.js] +function f(addUndefined1, addUndefined2) { + if (addUndefined1 === void 0) { addUndefined1 = "J"; } +} diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols new file mode 100644 index 0000000000000..054291e602ba3 --- /dev/null +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols @@ -0,0 +1,7 @@ +=== tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts === +function f(addUndefined1 = "J", addUndefined2?: number) { +>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0)) +>addUndefined1 : Symbol(addUndefined1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 11)) +>addUndefined2 : Symbol(addUndefined2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 31)) +} + diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types new file mode 100644 index 0000000000000..af35394da5645 --- /dev/null +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types @@ -0,0 +1,8 @@ +=== tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts === +function f(addUndefined1 = "J", addUndefined2?: number) { +>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => void +>addUndefined1 : string | undefined +>"J" : "J" +>addUndefined2 : number | undefined +} + diff --git a/tests/baselines/reference/optionalMethods.js b/tests/baselines/reference/optionalMethods.js index 28ed0bcd76e38..953ebb527a570 100644 --- a/tests/baselines/reference/optionalMethods.js +++ b/tests/baselines/reference/optionalMethods.js @@ -128,11 +128,11 @@ interface Foo { declare function test1(x: Foo): void; declare class Bar { d: number; - e: number; + e: number | undefined; a: number; b?: number; c?: number | undefined; - constructor(d?: number, e?: number); + constructor(d?: number, e?: number | undefined); f(): number; g?(): number; h?(): number; diff --git a/tests/baselines/reference/optionalMethods.types b/tests/baselines/reference/optionalMethods.types index cf545eda50997..cf86f8b6bcfba 100644 --- a/tests/baselines/reference/optionalMethods.types +++ b/tests/baselines/reference/optionalMethods.types @@ -87,7 +87,7 @@ class Bar { constructor(public d?: number, public e = 10) {} >d : number | undefined ->e : number +>e : number | undefined >10 : 10 f() { @@ -133,9 +133,9 @@ function test2(x: Bar) { >d : number | undefined x.e; ->x.e : number +>x.e : number | undefined >x : Bar ->e : number +>e : number | undefined x.f; >x.f : () => number diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts new file mode 100644 index 0000000000000..b681c34afe5f9 --- /dev/null +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -0,0 +1,3 @@ +// @strictNullChecks: true +function f(addUndefined1 = "J", addUndefined2?: number) { +} From 00ff0e5bb8952a3478c118e3833f2d93119dbc7c Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 4 Nov 2016 08:22:55 -0700 Subject: [PATCH 003/116] Do not add undefined to parameter properties They are actually properties, so don't get undefined added when they have an initialiser. Also update baselines --- src/compiler/checker.ts | 4 +++- tests/baselines/reference/optionalMethods.js | 4 ++-- tests/baselines/reference/optionalMethods.types | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a459db40e1b9e..814a003210422 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3206,7 +3206,9 @@ namespace ts { // Use the type of the initializer expression if one is present if (declaration.initializer) { const type = checkDeclarationInitializer(declaration); - const isOptional = declaration.questionToken || (declaration.initializer && declaration.kind === SyntaxKind.Parameter); + // initialized parameters (but not parameter properties) are optional + const isOptional = declaration.questionToken || + (declaration.kind === SyntaxKind.Parameter && !(getModifierFlags(declaration) & ModifierFlags.ParameterPropertyModifier)); return addOptionality(type, isOptional && includeOptionality); } diff --git a/tests/baselines/reference/optionalMethods.js b/tests/baselines/reference/optionalMethods.js index 953ebb527a570..28ed0bcd76e38 100644 --- a/tests/baselines/reference/optionalMethods.js +++ b/tests/baselines/reference/optionalMethods.js @@ -128,11 +128,11 @@ interface Foo { declare function test1(x: Foo): void; declare class Bar { d: number; - e: number | undefined; + e: number; a: number; b?: number; c?: number | undefined; - constructor(d?: number, e?: number | undefined); + constructor(d?: number, e?: number); f(): number; g?(): number; h?(): number; diff --git a/tests/baselines/reference/optionalMethods.types b/tests/baselines/reference/optionalMethods.types index cf86f8b6bcfba..cf545eda50997 100644 --- a/tests/baselines/reference/optionalMethods.types +++ b/tests/baselines/reference/optionalMethods.types @@ -87,7 +87,7 @@ class Bar { constructor(public d?: number, public e = 10) {} >d : number | undefined ->e : number | undefined +>e : number >10 : 10 f() { @@ -133,9 +133,9 @@ function test2(x: Bar) { >d : number | undefined x.e; ->x.e : number | undefined +>x.e : number >x : Bar ->e : number | undefined +>e : number x.f; >x.f : () => number From 96c14de26a83eaac7cfdfeb1ed3b4f6734cf9e54 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 8 Dec 2016 10:25:21 -0800 Subject: [PATCH 004/116] More tests:default-valued parameter+strictNullChecks --- .../defaultParameterAddsUndefinedWithStrictNullChecks.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts index b681c34afe5f9..17c9f0638828d 100644 --- a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -1,3 +1,9 @@ // @strictNullChecks: true function f(addUndefined1 = "J", addUndefined2?: number) { + return addUndefined1.length + (addUndefined2 || 0); } +function g(addUndefined = "J", addDefined: number) { + return addUndefined.length + addDefined; +} +let total = f() + f('a', 1) + f('b') + f(undefined, 2); +total = g('c', 3) + g(undefined, 4); From caad486a46c428e4099c2e8e5e9c92f538556f7f Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 13 Dec 2016 11:10:12 -0800 Subject: [PATCH 005/116] More test cases and notes --- ...ameterAddsUndefinedWithStrictNullChecks.ts | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts index 17c9f0638828d..eb11a85ac09ce 100644 --- a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -1,4 +1,5 @@ // @strictNullChecks: true +// @declaration: true function f(addUndefined1 = "J", addUndefined2?: number) { return addUndefined1.length + (addUndefined2 || 0); } @@ -7,3 +8,30 @@ function g(addUndefined = "J", addDefined: number) { } let total = f() + f('a', 1) + f('b') + f(undefined, 2); total = g('c', 3) + g(undefined, 4); + +function foo1(x: string = "string", b: number) { + x.length; +} + +function foo2(x: string | undefined = "string", b: number) { + x.length; // ok, should be narrowed to string +} + +function foo3(x = "string", b: number) { + x.length; // ok, should be narrowed to string +} + +function foo4(x: string | undefined, b: number) { + x.length; // error, Object is possibly 'undefined' +} + +foo1(undefined, 1); +foo2(undefined, 1); +foo3(undefined, 1); +foo4(undefined, 1); + + +// all four functions should have `x: string| undefined` in their type +// .d.ts should have `T | undefined` for all of them +// foo2 to have x be initialized on the first line +// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" From bb6f3ad29a61895fb209f60012f2d8aaaff94d64 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 14 Dec 2016 08:48:39 -0800 Subject: [PATCH 006/116] Add parameter initialisers to control flow Also a little code to emit them in declarations, but this doesn't work yet. --- src/compiler/binder.ts | 5 ++++- src/compiler/checker.ts | 20 +++++++++++--------- src/compiler/declarationEmitter.ts | 8 ++++---- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index a6f5993f6c88d..4aa55d3dd709d 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -810,7 +810,7 @@ namespace ts { }; } - function createFlowAssignment(antecedent: FlowNode, node: Expression | VariableDeclaration | BindingElement): FlowNode { + function createFlowAssignment(antecedent: FlowNode, node: Expression | VariableDeclaration | BindingElement | ParameterDeclaration): FlowNode { setFlowNodeReferenced(antecedent); return { flags: FlowFlags.Assignment, @@ -2311,6 +2311,9 @@ namespace ts { } else { declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable, SymbolFlags.ParameterExcludes); + if (node.initializer) { + currentFlow = createFlowAssignment(currentFlow, node); + } } // If this is a property-parameter, then also declare the property symbol into the diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 07fbb2a716472..72438c244f850 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3245,7 +3245,9 @@ namespace ts { // Use type from type annotation if one is present if (declaration.type) { - return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality); + const isOptional = declaration.questionToken || + (declaration.initializer && declaration.kind === SyntaxKind.Parameter && !(getModifierFlags(declaration) & ModifierFlags.ParameterPropertyModifier)); + return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ isOptional && includeOptionality); } if ((compilerOptions.noImplicitAny || declaration.flags & NodeFlags.JavaScriptFile) && @@ -9042,8 +9044,8 @@ namespace ts { switch (source.kind) { case SyntaxKind.Identifier: return target.kind === SyntaxKind.Identifier && getResolvedSymbol(source) === getResolvedSymbol(target) || - (target.kind === SyntaxKind.VariableDeclaration || target.kind === SyntaxKind.BindingElement) && - getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target); + (target.kind === SyntaxKind.VariableDeclaration || target.kind === SyntaxKind.BindingElement) && getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target) || + target.kind === SyntaxKind.Parameter && getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source as Identifier)) === getSymbolOfNode(target); case SyntaxKind.ThisKeyword: return target.kind === SyntaxKind.ThisKeyword; case SyntaxKind.PropertyAccessExpression: @@ -9314,7 +9316,7 @@ namespace ts { return links.resolvedType || getTypeOfExpression(node); } - function getInitialTypeOfVariableDeclaration(node: VariableDeclaration) { + function getInitialTypeOfVariableDeclaration(node: VariableDeclaration | ParameterDeclaration) { if (node.initializer) { return getTypeOfInitializer(node.initializer); } @@ -9327,15 +9329,15 @@ namespace ts { return unknownType; } - function getInitialType(node: VariableDeclaration | BindingElement) { - return node.kind === SyntaxKind.VariableDeclaration ? - getInitialTypeOfVariableDeclaration(node) : + function getInitialType(node: VariableDeclaration | BindingElement | ParameterDeclaration) { + return node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.Parameter ? + getInitialTypeOfVariableDeclaration(node) : getInitialTypeOfBindingElement(node); } function getInitialOrAssignedType(node: VariableDeclaration | BindingElement | Expression) { - return node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement ? - getInitialType(node) : + return node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement || node.kind === SyntaxKind.Parameter ? + getInitialType(node) : getAssignedType(node); } diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index cd98622e080a1..23122d05612c2 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -319,12 +319,12 @@ namespace ts { } } - function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { + function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic, addUndefined?: boolean) { writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic; write(": "); if (type) { // Write the type - emitType(type); + emitType(type, addUndefined); } else { errorNameNode = declaration.name; @@ -384,7 +384,7 @@ namespace ts { emitType(type); } - function emitType(type: TypeNode | Identifier | QualifiedName) { + function emitType(type: TypeNode | Identifier | QualifiedName, addUndefined?: boolean) { switch (type.kind) { case SyntaxKind.AnyKeyword: case SyntaxKind.StringKeyword: @@ -1593,7 +1593,7 @@ namespace ts { emitTypeOfVariableDeclarationFromTypeLiteral(node); } else if (!hasModifier(node.parent, ModifierFlags.Private)) { - writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError); + writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError, !!node.initializer && !(getModifierFlags(node) & ModifierFlags.ParameterPropertyModifier)); } function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic { From f097eafd11f20b2f08d5285b8e193920880a0ba7 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 14 Dec 2016 08:49:21 -0800 Subject: [PATCH 007/116] More tests of parameter initialiser type --- ...rAddsUndefinedWithStrictNullChecks.symbols | 79 ++++++++++++ ...terAddsUndefinedWithStrictNullChecks.types | 114 +++++++++++++++++- ...ameterAddsUndefinedWithStrictNullChecks.ts | 7 -- 3 files changed, 192 insertions(+), 8 deletions(-) diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols index 054291e602ba3..ae11720ed15ab 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols @@ -3,5 +3,84 @@ function f(addUndefined1 = "J", addUndefined2?: number) { >f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0)) >addUndefined1 : Symbol(addUndefined1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 11)) >addUndefined2 : Symbol(addUndefined2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 31)) + + return addUndefined1.length + (addUndefined2 || 0); +>addUndefined1.length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>addUndefined1 : Symbol(addUndefined1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 11)) +>length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>addUndefined2 : Symbol(addUndefined2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 31)) +} +function g(addUndefined = "J", addDefined: number) { +>g : Symbol(g, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 2, 1)) +>addUndefined : Symbol(addUndefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 11)) +>addDefined : Symbol(addDefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 30)) + + return addUndefined.length + addDefined; +>addUndefined.length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>addUndefined : Symbol(addUndefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 11)) +>length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>addDefined : Symbol(addDefined, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 3, 30)) +} +let total = f() + f('a', 1) + f('b') + f(undefined, 2); +>total : Symbol(total, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 6, 3)) +>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0)) +>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0)) +>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0)) +>f : Symbol(f, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 0, 0)) +>undefined : Symbol(undefined) + +total = g('c', 3) + g(undefined, 4); +>total : Symbol(total, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 6, 3)) +>g : Symbol(g, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 2, 1)) +>g : Symbol(g, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 2, 1)) +>undefined : Symbol(undefined) + +function foo1(x: string = "string", b: number) { +>foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 9, 14)) +>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 9, 35)) + + x.length; +>x.length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 9, 14)) +>length : Symbol(String.length, Decl(lib.d.ts, --, --)) +} + +function foo2(x: string | undefined = "string", b: number) { +>foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14)) +>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 47)) + + x.length; // ok, should be narrowed to string +>x.length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14)) +>length : Symbol(String.length, Decl(lib.d.ts, --, --)) +} + +function foo3(x = "string", b: number) { +>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14)) +>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 27)) + + x.length; // ok, should be narrowed to string +>x.length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14)) +>length : Symbol(String.length, Decl(lib.d.ts, --, --)) } +foo1(undefined, 1); +>foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36)) +>undefined : Symbol(undefined) + +foo2(undefined, 1); +>foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1)) +>undefined : Symbol(undefined) + +foo3(undefined, 1); +>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1)) +>undefined : Symbol(undefined) + + +// .d.ts should have `T | undefined` for all of them +// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" + diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types index af35394da5645..29dac892689f4 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types @@ -1,8 +1,120 @@ === tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts === function f(addUndefined1 = "J", addUndefined2?: number) { ->f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => void +>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number >addUndefined1 : string | undefined >"J" : "J" >addUndefined2 : number | undefined + + return addUndefined1.length + (addUndefined2 || 0); +>addUndefined1.length + (addUndefined2 || 0) : number +>addUndefined1.length : number +>addUndefined1 : string +>length : number +>(addUndefined2 || 0) : number +>addUndefined2 || 0 : number +>addUndefined2 : number | undefined +>0 : 0 +} +function g(addUndefined = "J", addDefined: number) { +>g : (addUndefined: string | undefined, addDefined: number) => number +>addUndefined : string | undefined +>"J" : "J" +>addDefined : number + + return addUndefined.length + addDefined; +>addUndefined.length + addDefined : number +>addUndefined.length : number +>addUndefined : string +>length : number +>addDefined : number +} +let total = f() + f('a', 1) + f('b') + f(undefined, 2); +>total : number +>f() + f('a', 1) + f('b') + f(undefined, 2) : number +>f() + f('a', 1) + f('b') : number +>f() + f('a', 1) : number +>f() : number +>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>f('a', 1) : number +>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>'a' : "a" +>1 : 1 +>f('b') : number +>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>'b' : "b" +>f(undefined, 2) : number +>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>undefined : undefined +>2 : 2 + +total = g('c', 3) + g(undefined, 4); +>total = g('c', 3) + g(undefined, 4) : number +>total : number +>g('c', 3) + g(undefined, 4) : number +>g('c', 3) : number +>g : (addUndefined: string | undefined, addDefined: number) => number +>'c' : "c" +>3 : 3 +>g(undefined, 4) : number +>g : (addUndefined: string | undefined, addDefined: number) => number +>undefined : undefined +>4 : 4 + +function foo1(x: string = "string", b: number) { +>foo1 : (x: string | undefined, b: number) => void +>x : string | undefined +>"string" : "string" +>b : number + + x.length; +>x.length : number +>x : string +>length : number +} + +function foo2(x: string | undefined = "string", b: number) { +>foo2 : (x: string | undefined, b: number) => void +>x : string | undefined +>"string" : "string" +>b : number + + x.length; // ok, should be narrowed to string +>x.length : number +>x : string +>length : number +} + +function foo3(x = "string", b: number) { +>foo3 : (x: string | undefined, b: number) => void +>x : string | undefined +>"string" : "string" +>b : number + + x.length; // ok, should be narrowed to string +>x.length : number +>x : string +>length : number } +foo1(undefined, 1); +>foo1(undefined, 1) : void +>foo1 : (x: string | undefined, b: number) => void +>undefined : undefined +>1 : 1 + +foo2(undefined, 1); +>foo2(undefined, 1) : void +>foo2 : (x: string | undefined, b: number) => void +>undefined : undefined +>1 : 1 + +foo3(undefined, 1); +>foo3(undefined, 1) : void +>foo3 : (x: string | undefined, b: number) => void +>undefined : undefined +>1 : 1 + + +// .d.ts should have `T | undefined` for all of them +// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" + diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts index eb11a85ac09ce..f84e85286ff3d 100644 --- a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -21,17 +21,10 @@ function foo3(x = "string", b: number) { x.length; // ok, should be narrowed to string } -function foo4(x: string | undefined, b: number) { - x.length; // error, Object is possibly 'undefined' -} - foo1(undefined, 1); foo2(undefined, 1); foo3(undefined, 1); -foo4(undefined, 1); -// all four functions should have `x: string| undefined` in their type // .d.ts should have `T | undefined` for all of them -// foo2 to have x be initialized on the first line // need to remove special-case code to allow calling foo1(undefined) for x: string = "string" From 604631881cfe883fe32e62a780315ad8f73ea7d2 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 16 Dec 2016 13:38:29 -0800 Subject: [PATCH 008/116] Add `| undefined` in .d.ts for initialised params --- src/compiler/declarationEmitter.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 23122d05612c2..9c8cd96280f43 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -319,12 +319,12 @@ namespace ts { } } - function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic, addUndefined?: boolean) { + function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic; write(": "); if (type) { // Write the type - emitType(type, addUndefined); + emitType(type); } else { errorNameNode = declaration.name; @@ -384,7 +384,7 @@ namespace ts { emitType(type); } - function emitType(type: TypeNode | Identifier | QualifiedName, addUndefined?: boolean) { + function emitType(type: TypeNode | Identifier | QualifiedName) { switch (type.kind) { case SyntaxKind.AnyKeyword: case SyntaxKind.StringKeyword: @@ -1593,7 +1593,10 @@ namespace ts { emitTypeOfVariableDeclarationFromTypeLiteral(node); } else if (!hasModifier(node.parent, ModifierFlags.Private)) { - writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError, !!node.initializer && !(getModifierFlags(node) & ModifierFlags.ParameterPropertyModifier)); + // use the checker's type, not the declared type, for an initialized parameter (that isn't a parameter property) + const isInitializedParameter = node.initializer && !(getModifierFlags(node) & ModifierFlags.ParameterPropertyModifier); + const typeNode = isInitializedParameter ? undefined : node.type; + writeTypeOfDeclaration(node, typeNode, getParameterDeclarationTypeVisibilityError); } function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic { From 739c0838e0483e6762d95f2e1d5b83d12a764608 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 16 Dec 2016 13:40:16 -0800 Subject: [PATCH 009/116] More tests of initialised parameters adding undefined --- ...ameterAddsUndefinedWithStrictNullChecks.js | 59 +++++++++++++++++++ .../destructureOptionalParameter.types | 2 +- ...ameterAddsUndefinedWithStrictNullChecks.ts | 3 +- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js index 34a540a29082d..107260dbada84 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -1,9 +1,68 @@ //// [defaultParameterAddsUndefinedWithStrictNullChecks.ts] function f(addUndefined1 = "J", addUndefined2?: number) { + return addUndefined1.length + (addUndefined2 || 0); } +function g(addUndefined = "J", addDefined: number) { + return addUndefined.length + addDefined; +} +let total = f() + f('a', 1) + f('b') + f(undefined, 2); +total = g('c', 3) + g(undefined, 4); + +function foo1(x: string = "string", b: number) { + x.length; +} + +function foo2(x: string | undefined = "string", b: number) { + x.length; // ok, should be narrowed to string +} + +function foo3(x = "string", b: number) { + x.length; // ok, should be narrowed to string +} + +foo1(undefined, 1); +foo2(undefined, 1); +foo3(undefined, 1); + + +// .d.ts should have `T | undefined` for all of them +// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" //// [defaultParameterAddsUndefinedWithStrictNullChecks.js] function f(addUndefined1, addUndefined2) { if (addUndefined1 === void 0) { addUndefined1 = "J"; } + return addUndefined1.length + (addUndefined2 || 0); +} +function g(addUndefined, addDefined) { + if (addUndefined === void 0) { addUndefined = "J"; } + return addUndefined.length + addDefined; } +var total = f() + f('a', 1) + f('b') + f(undefined, 2); +total = g('c', 3) + g(undefined, 4); +function foo1(x, b) { + if (x === void 0) { x = "string"; } + x.length; +} +function foo2(x, b) { + if (x === void 0) { x = "string"; } + x.length; // ok, should be narrowed to string +} +function foo3(x, b) { + if (x === void 0) { x = "string"; } + x.length; // ok, should be narrowed to string +} +foo1(undefined, 1); +foo2(undefined, 1); +foo3(undefined, 1); +// .d.ts should have `T | undefined` for all of them +// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" + + +//// [defaultParameterAddsUndefinedWithStrictNullChecks.d.ts] +declare function f(addUndefined1?: string | undefined, addUndefined2?: number): number; +declare function g(addUndefined: string | undefined, addDefined: number): number; +declare let total: number; +declare function foo1(x: string | undefined, b: number): void; +declare function foo2(x: string | undefined, b: number): void; +declare function foo3(x: string | undefined, b: number): void; diff --git a/tests/baselines/reference/destructureOptionalParameter.types b/tests/baselines/reference/destructureOptionalParameter.types index a72b03f59397f..c068e3b569c59 100644 --- a/tests/baselines/reference/destructureOptionalParameter.types +++ b/tests/baselines/reference/destructureOptionalParameter.types @@ -8,7 +8,7 @@ declare function f1({ a, b }?: { a: number, b: string }): void; >b : string function f2({ a, b }: { a: number, b: number } = { a: 0, b: 0 }) { ->f2 : ({a, b}?: { a: number; b: number; }) => void +>f2 : ({a, b}?: { a: number; b: number; } | undefined) => void >a : number >b : number >a : number diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts index f84e85286ff3d..01eefa7dd1309 100644 --- a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -26,5 +26,4 @@ foo2(undefined, 1); foo3(undefined, 1); -// .d.ts should have `T | undefined` for all of them -// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" +// .d.ts should have `T | undefined` for foo1, foo2, foo3 From cee708df8907ec0cd953ef5cd9d138fc46d3f539 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 21 Dec 2016 10:50:38 -0800 Subject: [PATCH 010/116] Remove undefined when checking patterns in function declarations --- src/compiler/checker.ts | 9 ++++++++- src/compiler/declarationEmitter.ts | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 208af45196b82..3b0329881fdb1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3098,7 +3098,8 @@ namespace ts { /** Return the inferred type for a binding element */ function getTypeForBindingElement(declaration: BindingElement): Type { const pattern = declaration.parent; - const parentType = getTypeForBindingElementParent(pattern.parent); + let parentType = getTypeForBindingElementParent(pattern.parent); + // If parent has the unknown (error) type, then so does this binding element if (parentType === unknownType) { return unknownType; @@ -3112,6 +3113,12 @@ namespace ts { } return parentType; } + // In strict null checking mode, a default value of a binding pattern adds undefined, + // which should be removed to get the type of the elements + const func = getContainingFunction(declaration); + if (strictNullChecks && func && !func.body && getFalsyFlags(parentType) & TypeFlags.Undefined) { + parentType = getTypeWithFacts(parentType, TypeFacts.NEUndefined); + } let type: Type; if (pattern.kind === SyntaxKind.ObjectBindingPattern) { diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 9c8cd96280f43..af32a5b408277 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -319,7 +319,7 @@ namespace ts { } } - function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { + function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic; write(": "); if (type) { From 61c742ad6a1cbf3f9e219502eee1a45629bbf378 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 21 Dec 2016 10:51:57 -0800 Subject: [PATCH 011/116] Update tests --- .../defaultParameterAddsUndefinedWithStrictNullChecks.js | 6 ++---- ...efaultParameterAddsUndefinedWithStrictNullChecks.symbols | 3 +-- .../defaultParameterAddsUndefinedWithStrictNullChecks.types | 3 +-- tests/baselines/reference/destructureOptionalParameter.js | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js index 107260dbada84..3e75890738031 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -25,8 +25,7 @@ foo2(undefined, 1); foo3(undefined, 1); -// .d.ts should have `T | undefined` for all of them -// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" +// .d.ts should have `T | undefined` for foo1, foo2, foo3 //// [defaultParameterAddsUndefinedWithStrictNullChecks.js] @@ -55,8 +54,7 @@ function foo3(x, b) { foo1(undefined, 1); foo2(undefined, 1); foo3(undefined, 1); -// .d.ts should have `T | undefined` for all of them -// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" +// .d.ts should have `T | undefined` for foo1, foo2, foo3 //// [defaultParameterAddsUndefinedWithStrictNullChecks.d.ts] diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols index ae11720ed15ab..97cccafe10332 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols @@ -81,6 +81,5 @@ foo3(undefined, 1); >undefined : Symbol(undefined) -// .d.ts should have `T | undefined` for all of them -// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" +// .d.ts should have `T | undefined` for foo1, foo2, foo3 diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types index 29dac892689f4..fa41973233eb5 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types @@ -115,6 +115,5 @@ foo3(undefined, 1); >1 : 1 -// .d.ts should have `T | undefined` for all of them -// need to remove special-case code to allow calling foo1(undefined) for x: string = "string" +// .d.ts should have `T | undefined` for foo1, foo2, foo3 diff --git a/tests/baselines/reference/destructureOptionalParameter.js b/tests/baselines/reference/destructureOptionalParameter.js index b937d58412f9a..1ffe678b50c8d 100644 --- a/tests/baselines/reference/destructureOptionalParameter.js +++ b/tests/baselines/reference/destructureOptionalParameter.js @@ -40,7 +40,7 @@ declare function f1({a, b}?: { declare function f2({a, b}?: { a: number; b: number; -}): void; +} | undefined): void; interface Type { t: void; } From 6543048097a69a589dee0a3aab9503e5b58c46f0 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 21 Dec 2016 14:57:39 -0800 Subject: [PATCH 012/116] Change narrowing rules for parameter initialisers They don't narrow the parameter type, except to remove undefined, and only if the initialiser type doesn't include undefined. --- src/compiler/binder.ts | 13 +++++++++++-- src/compiler/checker.ts | 34 +++++++++++++++++++++++++++++++--- src/compiler/types.ts | 18 ++++++++++++------ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 4aa55d3dd709d..60af7a1267fdb 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -810,7 +810,7 @@ namespace ts { }; } - function createFlowAssignment(antecedent: FlowNode, node: Expression | VariableDeclaration | BindingElement | ParameterDeclaration): FlowNode { + function createFlowAssignment(antecedent: FlowNode, node: Expression | VariableDeclaration | BindingElement): FlowNode { setFlowNodeReferenced(antecedent); return { flags: FlowFlags.Assignment, @@ -819,6 +819,15 @@ namespace ts { }; } + function createFlowInitializedParameter(antecedent: FlowNode, node: ParameterDeclaration): FlowNode { + setFlowNodeReferenced(antecedent); + return { + flags: FlowFlags.InitializedParameter, + antecedent, + node + }; + } + function createFlowArrayMutation(antecedent: FlowNode, node: CallExpression | BinaryExpression): FlowNode { setFlowNodeReferenced(antecedent); return { @@ -2312,7 +2321,7 @@ namespace ts { else { declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable, SymbolFlags.ParameterExcludes); if (node.initializer) { - currentFlow = createFlowAssignment(currentFlow, node); + currentFlow = createFlowInitializedParameter(currentFlow, node); } } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 3b0329881fdb1..550fab0267947 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9060,8 +9060,8 @@ namespace ts { switch (source.kind) { case SyntaxKind.Identifier: return target.kind === SyntaxKind.Identifier && getResolvedSymbol(source) === getResolvedSymbol(target) || - (target.kind === SyntaxKind.VariableDeclaration || target.kind === SyntaxKind.BindingElement) && getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target) || - target.kind === SyntaxKind.Parameter && getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source as Identifier)) === getSymbolOfNode(target); + (target.kind === SyntaxKind.VariableDeclaration || target.kind === SyntaxKind.BindingElement || target.kind === SyntaxKind.Parameter) && + getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source as Identifier)) === getSymbolOfNode(target); case SyntaxKind.ThisKeyword: return target.kind === SyntaxKind.ThisKeyword; case SyntaxKind.PropertyAccessExpression: @@ -9155,6 +9155,13 @@ namespace ts { return false; } + function getInitializedParameterReducedType(declaredType: UnionType, assignedType: Type) { + if (declaredType === assignedType || getFalsyFlags(assignedType) & TypeFlags.Undefined) { + return declaredType; + } + return getTypeWithFacts(declaredType, TypeFacts.NEUndefined); + } + // Remove those constituent types of declaredType to which no constituent type of assignedType is assignable. // For example, when a variable of type number | string | boolean is assigned a value of type number | boolean, // we remove type string. @@ -9351,7 +9358,7 @@ namespace ts { getInitialTypeOfBindingElement(node); } - function getInitialOrAssignedType(node: VariableDeclaration | BindingElement | Expression) { + function getInitialOrAssignedType(node: VariableDeclaration | BindingElement | Expression | ParameterDeclaration) { return node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement || node.kind === SyntaxKind.Parameter ? getInitialType(node) : getAssignedType(node); @@ -9622,6 +9629,13 @@ namespace ts { continue; } } + else if (flow.flags & FlowFlags.InitializedParameter) { + type = getTypeAtFlowInitializedParameter(flow as FlowInitializedParameter); + if (!type) { + flow = (flow as FlowInitializedParameter).antecedent; + continue; + } + } else if (flow.flags & FlowFlags.Condition) { type = getTypeAtFlowCondition(flow); } @@ -9669,6 +9683,20 @@ namespace ts { } } + function getTypeAtFlowInitializedParameter(flow: FlowInitializedParameter) { + const node = flow.node; + // Parameter initializers don't really narrow the declared type except to remove undefined. + // If the initializer includes undefined in the type, it doesn't even remove undefined. + if (isMatchingReference(reference, node)) { + if (declaredType.flags & TypeFlags.Union) { + return getInitializedParameterReducedType(declaredType, getInitialOrAssignedType(node)); + } + return declaredType; + } + + return undefined; + } + function getTypeAtFlowAssignment(flow: FlowAssignment) { const node = flow.node; // Assignments only narrow the computed type if the declared type is a union type. Thus, we diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 1ee59149b2c5c..2363b76cb455a 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2042,12 +2042,13 @@ namespace ts { BranchLabel = 1 << 2, // Non-looping junction LoopLabel = 1 << 3, // Looping junction Assignment = 1 << 4, // Assignment - TrueCondition = 1 << 5, // Condition known to be true - FalseCondition = 1 << 6, // Condition known to be false - SwitchClause = 1 << 7, // Switch statement clause - ArrayMutation = 1 << 8, // Potential array mutation - Referenced = 1 << 9, // Referenced as antecedent once - Shared = 1 << 10, // Referenced as antecedent more than once + InitializedParameter = 1 << 5, // Parameter with initializer + TrueCondition = 1 << 6, // Condition known to be true + FalseCondition = 1 << 7, // Condition known to be false + SwitchClause = 1 << 8, // Switch statement clause + ArrayMutation = 1 << 9, // Potential array mutation + Referenced = 1 << 10, // Referenced as antecedent once + Shared = 1 << 11, // Referenced as antecedent more than once Label = BranchLabel | LoopLabel, Condition = TrueCondition | FalseCondition } @@ -2097,6 +2098,11 @@ namespace ts { antecedent: FlowNode; } + export interface FlowInitializedParameter extends FlowNode { + node: ParameterDeclaration; + antecedent: FlowNode; + } + export type FlowType = Type | IncompleteType; // Incomplete types occur during control flow analysis of loops. An IncompleteType From 3b1309d53f21e7793b708e5fc74fcf997ee92d1c Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 21 Dec 2016 14:58:44 -0800 Subject: [PATCH 013/116] Test parameter initialisation narrowing rules --- ...ameterAddsUndefinedWithStrictNullChecks.js | 37 ++++++++++++++- ...rAddsUndefinedWithStrictNullChecks.symbols | 36 ++++++++++++++- ...terAddsUndefinedWithStrictNullChecks.types | 45 ++++++++++++++++++- ...ameterAddsUndefinedWithStrictNullChecks.ts | 17 ++++++- 4 files changed, 130 insertions(+), 5 deletions(-) diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js index 3e75890738031..50779650c3ac4 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -20,12 +20,27 @@ function foo3(x = "string", b: number) { x.length; // ok, should be narrowed to string } +// .d.ts should have `T | undefined` for foo1, foo2, foo3 foo1(undefined, 1); foo2(undefined, 1); foo3(undefined, 1); -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +function removeUndefinedButNotFalse(x = true) { + if (x === false) { + return x; + } +} + +declare const cond: boolean; +function removeNothing(y = cond ? true : undefined) { + if (y !== undefined) { + if (y === false) { + return y; + } + } + return true; +} //// [defaultParameterAddsUndefinedWithStrictNullChecks.js] @@ -51,10 +66,25 @@ function foo3(x, b) { if (x === void 0) { x = "string"; } x.length; // ok, should be narrowed to string } +// .d.ts should have `T | undefined` for foo1, foo2, foo3 foo1(undefined, 1); foo2(undefined, 1); foo3(undefined, 1); -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +function removeUndefinedButNotFalse(x) { + if (x === void 0) { x = true; } + if (x === false) { + return x; + } +} +function removeNothing(y) { + if (y === void 0) { y = cond ? true : undefined; } + if (y !== undefined) { + if (y === false) { + return y; + } + } + return true; +} //// [defaultParameterAddsUndefinedWithStrictNullChecks.d.ts] @@ -64,3 +94,6 @@ declare let total: number; declare function foo1(x: string | undefined, b: number): void; declare function foo2(x: string | undefined, b: number): void; declare function foo3(x: string | undefined, b: number): void; +declare function removeUndefinedButNotFalse(x?: boolean | undefined): false | undefined; +declare const cond: boolean; +declare function removeNothing(y?: boolean | undefined): boolean; diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols index 97cccafe10332..f722ed3af2603 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols @@ -68,6 +68,7 @@ function foo3(x = "string", b: number) { >length : Symbol(String.length, Decl(lib.d.ts, --, --)) } +// .d.ts should have `T | undefined` for foo1, foo2, foo3 foo1(undefined, 1); >foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36)) >undefined : Symbol(undefined) @@ -81,5 +82,38 @@ foo3(undefined, 1); >undefined : Symbol(undefined) -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +function removeUndefinedButNotFalse(x = true) { +>removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 24, 19)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36)) + + if (x === false) { +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36)) + + return x; +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36)) + } +} + +declare const cond: boolean; +>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 13)) + +function removeNothing(y = cond ? true : undefined) { +>removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 28)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) +>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 13)) +>undefined : Symbol(undefined) + + if (y !== undefined) { +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) +>undefined : Symbol(undefined) + + if (y === false) { +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) + + return y; +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) + } + } + return true; +} diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types index fa41973233eb5..15535eb435e2d 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types @@ -96,6 +96,7 @@ function foo3(x = "string", b: number) { >length : number } +// .d.ts should have `T | undefined` for foo1, foo2, foo3 foo1(undefined, 1); >foo1(undefined, 1) : void >foo1 : (x: string | undefined, b: number) => void @@ -115,5 +116,47 @@ foo3(undefined, 1); >1 : 1 -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +function removeUndefinedButNotFalse(x = true) { +>removeUndefinedButNotFalse : (x?: boolean | undefined) => false | undefined +>x : boolean | undefined +>true : true + + if (x === false) { +>x === false : boolean +>x : boolean +>false : false + + return x; +>x : false + } +} + +declare const cond: boolean; +>cond : boolean + +function removeNothing(y = cond ? true : undefined) { +>removeNothing : (y?: boolean | undefined) => boolean +>y : boolean | undefined +>cond ? true : undefined : true | undefined +>cond : boolean +>true : true +>undefined : undefined + + if (y !== undefined) { +>y !== undefined : boolean +>y : boolean | undefined +>undefined : undefined + + if (y === false) { +>y === false : boolean +>y : boolean +>false : false + + return y; +>y : false + } + } + return true; +>true : true +} diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts index 01eefa7dd1309..44f17c949e0c1 100644 --- a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -21,9 +21,24 @@ function foo3(x = "string", b: number) { x.length; // ok, should be narrowed to string } +// .d.ts should have `T | undefined` for foo1, foo2, foo3 foo1(undefined, 1); foo2(undefined, 1); foo3(undefined, 1); -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +function removeUndefinedButNotFalse(x = true) { + if (x === false) { + return x; + } +} + +declare const cond: boolean; +function removeNothing(y = cond ? true : undefined) { + if (y !== undefined) { + if (y === false) { + return y; + } + } + return true; +} From e0bf73f79ee7e1f89d1daec28db7ca60027b94ae Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 21 Dec 2016 15:31:17 -0800 Subject: [PATCH 014/116] Remove old add-undefined code in getTypeOfParameter --- src/compiler/checker.ts | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 550fab0267947..eb4866083c063 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6964,8 +6964,8 @@ namespace ts { const sourceParams = source.parameters; const targetParams = target.parameters; for (let i = 0; i < checkCount; i++) { - const s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source); - const t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target); + const s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source); + const t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target); const related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors); if (!related) { if (reportErrors) { @@ -8163,8 +8163,8 @@ namespace ts { const targetLen = target.parameters.length; for (let i = 0; i < targetLen; i++) { - const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]); - const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]); + const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]); + const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]); const related = compareTypes(s, t); if (!related) { return Ternary.False; @@ -13863,21 +13863,10 @@ namespace ts { return getNonNullableType(checkExpression(node.expression)); } - function getTypeOfParameter(symbol: Symbol) { - const type = getTypeOfSymbol(symbol); - if (strictNullChecks) { - const declaration = symbol.valueDeclaration; - if (declaration && (declaration).initializer) { - return includeFalsyTypes(type, TypeFlags.Undefined); - } - } - return type; - } - function getTypeAtPosition(signature: Signature, pos: number): Type { return signature.hasRestParameter ? - pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) : - pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType; + pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : + pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; } function assignContextualParameterTypes(signature: Signature, context: Signature, mapper: TypeMapper) { From 156d5a9043fc3163e8e5439e5a6967ad6773fd91 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 5 Jan 2017 11:15:01 -0800 Subject: [PATCH 015/116] Add `| undefined` to all optional properties too in declarationEmitter.ts --- src/compiler/declarationEmitter.ts | 8 +++++--- ...efaultParameterAddsUndefinedWithStrictNullChecks.js | 2 +- .../reference/destructureOptionalParameter.js | 10 +++++----- tests/baselines/reference/optionalMethods.js | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index af32a5b408277..965cb2330b56e 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -1593,9 +1593,11 @@ namespace ts { emitTypeOfVariableDeclarationFromTypeLiteral(node); } else if (!hasModifier(node.parent, ModifierFlags.Private)) { - // use the checker's type, not the declared type, for an initialized parameter (that isn't a parameter property) - const isInitializedParameter = node.initializer && !(getModifierFlags(node) & ModifierFlags.ParameterPropertyModifier); - const typeNode = isInitializedParameter ? undefined : node.type; + // use the checker's type, not the declared type, + // for optional parameters and initialized ones that aren't a parameter property + const typeShouldAddUndefined = resolver.isOptionalParameter(node) || + node.initializer && !(getModifierFlags(node) & ModifierFlags.ParameterPropertyModifier); + const typeNode = typeShouldAddUndefined ? undefined : node.type; writeTypeOfDeclaration(node, typeNode, getParameterDeclarationTypeVisibilityError); } diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js index 50779650c3ac4..561fa65a154f5 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -88,7 +88,7 @@ function removeNothing(y) { //// [defaultParameterAddsUndefinedWithStrictNullChecks.d.ts] -declare function f(addUndefined1?: string | undefined, addUndefined2?: number): number; +declare function f(addUndefined1?: string | undefined, addUndefined2?: number | undefined): number; declare function g(addUndefined: string | undefined, addDefined: number): number; declare let total: number; declare function foo1(x: string | undefined, b: number): void; diff --git a/tests/baselines/reference/destructureOptionalParameter.js b/tests/baselines/reference/destructureOptionalParameter.js index 1ffe678b50c8d..f375c41dbed51 100644 --- a/tests/baselines/reference/destructureOptionalParameter.js +++ b/tests/baselines/reference/destructureOptionalParameter.js @@ -36,7 +36,7 @@ function f2(_a) { declare function f1({a, b}?: { a: number; b: string; -}): void; +} | undefined): void; declare function f2({a, b}?: { a: number; b: number; @@ -49,11 +49,11 @@ interface QueryMetadata { } interface QueryMetadataFactory { (selector: Type | string, {descendants, read}?: { - descendants?: boolean; + descendants?: boolean | undefined; read?: any; - }): ParameterDecorator; + } | undefined): ParameterDecorator; new (selector: Type | string, {descendants, read}?: { - descendants?: boolean; + descendants?: boolean | undefined; read?: any; - }): QueryMetadata; + } | undefined): QueryMetadata; } diff --git a/tests/baselines/reference/optionalMethods.js b/tests/baselines/reference/optionalMethods.js index 28ed0bcd76e38..c6051c622f51f 100644 --- a/tests/baselines/reference/optionalMethods.js +++ b/tests/baselines/reference/optionalMethods.js @@ -132,7 +132,7 @@ declare class Bar { a: number; b?: number; c?: number | undefined; - constructor(d?: number, e?: number); + constructor(d?: number | undefined, e?: number); f(): number; g?(): number; h?(): number; From 432808d50b92ad5eeae067279b582ba9702746c0 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Wed, 25 Jan 2017 07:31:24 -0800 Subject: [PATCH 016/116] Allow package.json "main" to specify a directory --- src/compiler/diagnosticMessages.json | 6 +- src/compiler/moduleNameResolver.ts | 123 +++++++++--------- ...lutionWithExtensions_unexpected.trace.json | 11 +- ...utionWithExtensions_unexpected2.trace.json | 8 +- tests/baselines/reference/packageJsonMain.js | 34 +++++ .../reference/packageJsonMain.symbols | 15 +++ .../reference/packageJsonMain.trace.json | 68 ++++++++++ .../baselines/reference/packageJsonMain.types | 17 +++ .../packageJsonMain_isNonRecursive.errors.txt | 18 +++ .../packageJsonMain_isNonRecursive.js | 18 +++ .../packageJsonMain_isNonRecursive.trace.json | 28 ++++ tests/baselines/reference/typingsLookup4.js | 15 ++- .../reference/typingsLookup4.symbols | 10 +- .../reference/typingsLookup4.trace.json | 37 +++++- .../baselines/reference/typingsLookup4.types | 12 +- .../moduleResolution/packageJsonMain.ts | 27 ++++ .../packageJsonMain_isNonRecursive.ts | 15 +++ .../conformance/typings/typingsLookup4.ts | 10 +- 18 files changed, 393 insertions(+), 79 deletions(-) create mode 100644 tests/baselines/reference/packageJsonMain.js create mode 100644 tests/baselines/reference/packageJsonMain.symbols create mode 100644 tests/baselines/reference/packageJsonMain.trace.json create mode 100644 tests/baselines/reference/packageJsonMain.types create mode 100644 tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt create mode 100644 tests/baselines/reference/packageJsonMain_isNonRecursive.js create mode 100644 tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json create mode 100644 tests/cases/conformance/moduleResolution/packageJsonMain.ts create mode 100644 tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 4278784e9abf4..dd49db54a6f29 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2793,7 +2793,7 @@ "category": "Message", "code": 6099 }, - "'package.json' does not have a 'types' or 'main' field.": { + "'package.json' does not have a '{0}' field.": { "category": "Message", "code": 6100 }, @@ -2941,10 +2941,6 @@ "category": "Message", "code": 6136 }, - "No types specified in 'package.json', so returning 'main' value of '{0}'": { - "category": "Message", - "code": 6137 - }, "Property '{0}' is declared but never used.": { "category": "Error", "code": 6138 diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 0300ff71ec565..519b1d5fad223 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -67,40 +67,32 @@ namespace ts { } /** Reads from "main" or "types"/"typings" depending on `extensions`. */ - function tryReadPackageJsonMainOrTypes(extensions: Extensions, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string { + function tryReadPackageJsonFields(ts: boolean, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string | undefined { const jsonContent = readJson(packageJsonPath, state.host); + const file = ts ? tryReadFromField("typings") || tryReadFromField("types") : tryReadFromField("main"); + if (!file && state.traceEnabled) { + trace(state.host, Diagnostics.package_json_does_not_have_a_0_field, ts ? "types" : "main"); + } + return file; - switch (extensions) { - case Extensions.DtsOnly: - case Extensions.TypeScript: - return tryReadFromField("typings") || tryReadFromField("types"); + function tryReadFromField(fieldName: "typings" | "types" | "main"): string | undefined { + if (!hasProperty(jsonContent, fieldName)) { + return; + } - case Extensions.JavaScript: - if (typeof jsonContent.main === "string") { - if (state.traceEnabled) { - trace(state.host, Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main); - } - return normalizePath(combinePaths(baseDirectory, jsonContent.main)); + const fileName = jsonContent[fieldName]; + if (typeof fileName !== "string") { + if (state.traceEnabled) { + trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof fileName); } - return undefined; - } + return; + } - function tryReadFromField(fieldName: string) { - if (hasProperty(jsonContent, fieldName)) { - const typesFile = (jsonContent)[fieldName]; - if (typeof typesFile === "string") { - const typesFilePath = normalizePath(combinePaths(baseDirectory, typesFile)); - if (state.traceEnabled) { - trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath); - } - return typesFilePath; - } - else { - if (state.traceEnabled) { - trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof typesFile); - } - } + const path = normalizePath(combinePaths(baseDirectory, fileName)); + if (state.traceEnabled) { + trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path); } + return path; } } @@ -731,7 +723,7 @@ namespace ts { return real; } - function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined { + function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true): Resolved | undefined { if (state.traceEnabled) { trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1, candidate, Extensions[extensions]); } @@ -759,7 +751,7 @@ namespace ts { onlyRecordFailures = true; } } - return loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state); + return loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson); } /* @internal */ @@ -835,48 +827,56 @@ namespace ts { return undefined; } - function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: Push, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined { - const packageJsonPath = pathToPackageJson(candidate); + function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: Push, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true): Resolved | undefined { const directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); - if (directoryExists && state.host.fileExists(packageJsonPath)) { - if (state.traceEnabled) { - trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath); - } - const mainOrTypesFile = tryReadPackageJsonMainOrTypes(extensions, packageJsonPath, candidate, state); - if (mainOrTypesFile) { - const onlyRecordFailures = !directoryProbablyExists(getDirectoryPath(mainOrTypesFile), state.host); - // A package.json "typings" may specify an exact filename, or may choose to omit an extension. - const fromExactFile = tryFile(mainOrTypesFile, failedLookupLocations, onlyRecordFailures, state); - if (fromExactFile) { - const resolved = fromExactFile && resolvedIfExtensionMatches(extensions, fromExactFile); - if (resolved) { - return resolved; - } - if (state.traceEnabled) { - trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromExactFile); - } - } - const resolved = tryAddingExtensions(mainOrTypesFile, Extensions.TypeScript, failedLookupLocations, onlyRecordFailures, state); - if (resolved) { - return resolved; + if (considerPackageJson) { + const packageJsonPath = pathToPackageJson(candidate); + if (directoryExists && state.host.fileExists(packageJsonPath)) { + const fromPackageJson = loadModuleFromPackageJson(packageJsonPath, extensions, candidate, failedLookupLocations, state); + if (fromPackageJson) { + return fromPackageJson; } } else { - if (state.traceEnabled) { - trace(state.host, Diagnostics.package_json_does_not_have_a_types_or_main_field); + if (directoryExists && state.traceEnabled) { + trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath); } + // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results + failedLookupLocations.push(packageJsonPath); } } - else { - if (directoryExists && state.traceEnabled) { - trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath); + + return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + } + + function loadModuleFromPackageJson(packageJsonPath: string, extensions: Extensions, candidate: string, failedLookupLocations: Push, state: ModuleResolutionState): Resolved | undefined { + if (state.traceEnabled) { + trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath); + } + + const ts = extensions !== Extensions.JavaScript; + const file = tryReadPackageJsonFields(ts, packageJsonPath, candidate, state); + if (!file) { + return undefined; + } + + const onlyRecordFailures = !directoryProbablyExists(getDirectoryPath(file), state.host); + const fromFile = tryFile(file, failedLookupLocations, onlyRecordFailures, state); + if (fromFile) { + const resolved = fromFile && resolvedIfExtensionMatches(extensions, fromFile); + if (resolved) { + return resolved; + } + if (state.traceEnabled) { + trace(state.host, Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromFile); } - // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results - failedLookupLocations.push(packageJsonPath); } - return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + // Even if extensions is DtsOnly, we can still look up a .ts file as a result of package.json "types" + const nextExtensions = extensions === Extensions.DtsOnly ? Extensions.TypeScript : extensions; + // Don't do package.json lookup recursively, because Node.js' package lookup doesn't. + return nodeLoadModuleByRelativeName(nextExtensions, file, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/ false); } /** Resolve from an arbitrarily specified file. Return `undefined` if it has an unsupported extension. */ @@ -1040,7 +1040,6 @@ namespace ts { return value !== undefined ? { value } : undefined; } - /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */ function forEachAncestorDirectory(directory: string, callback: (directory: string) => SearchResult): SearchResult { while (true) { diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json index e1b1673b32a70..c53a32ef97d95 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json @@ -6,7 +6,7 @@ "File '/node_modules/normalize.css.tsx' does not exist.", "File '/node_modules/normalize.css.d.ts' does not exist.", "Found 'package.json' at '/node_modules/normalize.css/package.json'.", - "'package.json' does not have a 'types' or 'main' field.", + "'package.json' does not have a 'types' field.", "File '/node_modules/normalize.css/index.ts' does not exist.", "File '/node_modules/normalize.css/index.tsx' does not exist.", "File '/node_modules/normalize.css/index.d.ts' does not exist.", @@ -15,12 +15,13 @@ "File '/node_modules/normalize.css.js' does not exist.", "File '/node_modules/normalize.css.jsx' does not exist.", "Found 'package.json' at '/node_modules/normalize.css/package.json'.", - "No types specified in 'package.json', so returning 'main' value of 'normalize.css'", + "'package.json' has 'main' field 'normalize.css' that references '/node_modules/normalize.css/normalize.css'.", "File '/node_modules/normalize.css/normalize.css' exist - use it as a name resolution result.", "File '/node_modules/normalize.css/normalize.css' has an unsupported extension, so skipping it.", - "File '/node_modules/normalize.css/normalize.css.ts' does not exist.", - "File '/node_modules/normalize.css/normalize.css.tsx' does not exist.", - "File '/node_modules/normalize.css/normalize.css.d.ts' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/normalize.css/normalize.css', target file type 'JavaScript'.", + "File '/node_modules/normalize.css/normalize.css.js' does not exist.", + "File '/node_modules/normalize.css/normalize.css.jsx' does not exist.", + "Directory '/node_modules/normalize.css/normalize.css' does not exist, skipping all lookups in it.", "File '/node_modules/normalize.css/index.js' does not exist.", "File '/node_modules/normalize.css/index.jsx' does not exist.", "======== Module name 'normalize.css' was not resolved. ========" diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json index 11dd95ebe45a5..f007bc77d75d3 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json @@ -9,9 +9,15 @@ "'package.json' has 'types' field 'foo.js' that references '/node_modules/foo/foo.js'.", "File '/node_modules/foo/foo.js' exist - use it as a name resolution result.", "File '/node_modules/foo/foo.js' has an unsupported extension, so skipping it.", + "Loading module as file / folder, candidate module location '/node_modules/foo/foo.js', target file type 'TypeScript'.", "File '/node_modules/foo/foo.js.ts' does not exist.", "File '/node_modules/foo/foo.js.tsx' does not exist.", "File '/node_modules/foo/foo.js.d.ts' does not exist.", + "File name '/node_modules/foo/foo.js' has a '.js' extension - stripping it", + "File '/node_modules/foo/foo.ts' does not exist.", + "File '/node_modules/foo/foo.tsx' does not exist.", + "File '/node_modules/foo/foo.d.ts' does not exist.", + "Directory '/node_modules/foo/foo.js' does not exist, skipping all lookups in it.", "File '/node_modules/foo/index.ts' does not exist.", "File '/node_modules/foo/index.tsx' does not exist.", "File '/node_modules/foo/index.d.ts' does not exist.", @@ -20,7 +26,7 @@ "File '/node_modules/foo.js' does not exist.", "File '/node_modules/foo.jsx' does not exist.", "Found 'package.json' at '/node_modules/foo/package.json'.", - "'package.json' does not have a 'types' or 'main' field.", + "'package.json' does not have a 'main' field.", "File '/node_modules/foo/index.js' does not exist.", "File '/node_modules/foo/index.jsx' does not exist.", "======== Module name 'foo' was not resolved. ========" diff --git a/tests/baselines/reference/packageJsonMain.js b/tests/baselines/reference/packageJsonMain.js new file mode 100644 index 0000000000000..c7f63af27f2b7 --- /dev/null +++ b/tests/baselines/reference/packageJsonMain.js @@ -0,0 +1,34 @@ +//// [tests/cases/conformance/moduleResolution/packageJsonMain.ts] //// + +//// [package.json] + +{ "main": "oof" } + +//// [oof.js] +module.exports = 0; + +//// [package.json] +{ "main": "rab.js" } + +//// [rab.js] +module.exports = 0; + +//// [package.json] +{ "main": "zab" } + +//// [index.js] +module.exports = 0; + +//// [a.ts] +import foo = require("foo"); +import bar = require("bar"); +import baz = require("baz"); +foo + bar + baz; + + +//// [a.js] +"use strict"; +var foo = require("foo"); +var bar = require("bar"); +var baz = require("baz"); +foo + bar + baz; diff --git a/tests/baselines/reference/packageJsonMain.symbols b/tests/baselines/reference/packageJsonMain.symbols new file mode 100644 index 0000000000000..c34c36e89012c --- /dev/null +++ b/tests/baselines/reference/packageJsonMain.symbols @@ -0,0 +1,15 @@ +=== /a.ts === +import foo = require("foo"); +>foo : Symbol(foo, Decl(a.ts, 0, 0)) + +import bar = require("bar"); +>bar : Symbol(bar, Decl(a.ts, 0, 28)) + +import baz = require("baz"); +>baz : Symbol(baz, Decl(a.ts, 1, 28)) + +foo + bar + baz; +>foo : Symbol(foo, Decl(a.ts, 0, 0)) +>bar : Symbol(bar, Decl(a.ts, 0, 28)) +>baz : Symbol(baz, Decl(a.ts, 1, 28)) + diff --git a/tests/baselines/reference/packageJsonMain.trace.json b/tests/baselines/reference/packageJsonMain.trace.json new file mode 100644 index 0000000000000..9b71c6723373e --- /dev/null +++ b/tests/baselines/reference/packageJsonMain.trace.json @@ -0,0 +1,68 @@ +[ + "======== Resolving module 'foo' from '/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.", + "File '/node_modules/foo.ts' does not exist.", + "File '/node_modules/foo.tsx' does not exist.", + "File '/node_modules/foo.d.ts' does not exist.", + "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' does not have a 'types' field.", + "File '/node_modules/foo/index.ts' does not exist.", + "File '/node_modules/foo/index.tsx' does not exist.", + "File '/node_modules/foo/index.d.ts' does not exist.", + "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", + "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.", + "File '/node_modules/foo.js' does not exist.", + "File '/node_modules/foo.jsx' does not exist.", + "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.", + "File '/node_modules/foo/oof' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/foo/oof', target file type 'JavaScript'.", + "File '/node_modules/foo/oof.js' exist - use it as a name resolution result.", + "Resolving real path for '/node_modules/foo/oof.js', result '/node_modules/foo/oof.js'", + "======== Module name 'foo' was successfully resolved to '/node_modules/foo/oof.js'. ========", + "======== Resolving module 'bar' from '/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "Loading module 'bar' from 'node_modules' folder, target file type 'TypeScript'.", + "File '/node_modules/bar.ts' does not exist.", + "File '/node_modules/bar.tsx' does not exist.", + "File '/node_modules/bar.d.ts' does not exist.", + "Found 'package.json' at '/node_modules/bar/package.json'.", + "'package.json' does not have a 'types' field.", + "File '/node_modules/bar/index.ts' does not exist.", + "File '/node_modules/bar/index.tsx' does not exist.", + "File '/node_modules/bar/index.d.ts' does not exist.", + "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", + "Loading module 'bar' from 'node_modules' folder, target file type 'JavaScript'.", + "File '/node_modules/bar.js' does not exist.", + "File '/node_modules/bar.jsx' does not exist.", + "Found 'package.json' at '/node_modules/bar/package.json'.", + "'package.json' has 'main' field 'rab.js' that references '/node_modules/bar/rab.js'.", + "File '/node_modules/bar/rab.js' exist - use it as a name resolution result.", + "Resolving real path for '/node_modules/bar/rab.js', result '/node_modules/bar/rab.js'", + "======== Module name 'bar' was successfully resolved to '/node_modules/bar/rab.js'. ========", + "======== Resolving module 'baz' from '/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "Loading module 'baz' from 'node_modules' folder, target file type 'TypeScript'.", + "File '/node_modules/baz.ts' does not exist.", + "File '/node_modules/baz.tsx' does not exist.", + "File '/node_modules/baz.d.ts' does not exist.", + "Found 'package.json' at '/node_modules/baz/package.json'.", + "'package.json' does not have a 'types' field.", + "File '/node_modules/baz/index.ts' does not exist.", + "File '/node_modules/baz/index.tsx' does not exist.", + "File '/node_modules/baz/index.d.ts' does not exist.", + "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", + "Loading module 'baz' from 'node_modules' folder, target file type 'JavaScript'.", + "File '/node_modules/baz.js' does not exist.", + "File '/node_modules/baz.jsx' does not exist.", + "Found 'package.json' at '/node_modules/baz/package.json'.", + "'package.json' has 'main' field 'zab' that references '/node_modules/baz/zab'.", + "File '/node_modules/baz/zab' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/baz/zab', target file type 'JavaScript'.", + "File '/node_modules/baz/zab.js' does not exist.", + "File '/node_modules/baz/zab.jsx' does not exist.", + "File '/node_modules/baz/zab/index.js' exist - use it as a name resolution result.", + "Resolving real path for '/node_modules/baz/zab/index.js', result '/node_modules/baz/zab/index.js'", + "======== Module name 'baz' was successfully resolved to '/node_modules/baz/zab/index.js'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/packageJsonMain.types b/tests/baselines/reference/packageJsonMain.types new file mode 100644 index 0000000000000..f30bd95f0e543 --- /dev/null +++ b/tests/baselines/reference/packageJsonMain.types @@ -0,0 +1,17 @@ +=== /a.ts === +import foo = require("foo"); +>foo : any + +import bar = require("bar"); +>bar : any + +import baz = require("baz"); +>baz : any + +foo + bar + baz; +>foo + bar + baz : any +>foo + bar : any +>foo : any +>bar : any +>baz : any + diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt new file mode 100644 index 0000000000000..a886fe3dca51f --- /dev/null +++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.errors.txt @@ -0,0 +1,18 @@ +/a.ts(1,22): error TS2307: Cannot find module 'foo'. + + +==== /a.ts (1 errors) ==== + import foo = require("foo"); + ~~~~~ +!!! error TS2307: Cannot find module 'foo'. + +==== /node_modules/foo/package.json (0 errors) ==== + + { "main": "oof" } + +==== /node_modules/foo/oof/package.json (0 errors) ==== + { "main": "ofo" } + +==== /node_modules/foo/oof/ofo.js (0 errors) ==== + module.exports = 0; + \ No newline at end of file diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.js b/tests/baselines/reference/packageJsonMain_isNonRecursive.js new file mode 100644 index 0000000000000..edd56b359ee1e --- /dev/null +++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.js @@ -0,0 +1,18 @@ +//// [tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts] //// + +//// [package.json] + +{ "main": "oof" } + +//// [package.json] +{ "main": "ofo" } + +//// [ofo.js] +module.exports = 0; + +//// [a.ts] +import foo = require("foo"); + + +//// [a.js] +"use strict"; diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json new file mode 100644 index 0000000000000..9d1f2f9bedfad --- /dev/null +++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json @@ -0,0 +1,28 @@ +[ + "======== Resolving module 'foo' from '/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.", + "File '/node_modules/foo.ts' does not exist.", + "File '/node_modules/foo.tsx' does not exist.", + "File '/node_modules/foo.d.ts' does not exist.", + "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' does not have a 'types' field.", + "File '/node_modules/foo/index.ts' does not exist.", + "File '/node_modules/foo/index.tsx' does not exist.", + "File '/node_modules/foo/index.d.ts' does not exist.", + "Directory '/node_modules/@types' does not exist, skipping all lookups in it.", + "Loading module 'foo' from 'node_modules' folder, target file type 'JavaScript'.", + "File '/node_modules/foo.js' does not exist.", + "File '/node_modules/foo.jsx' does not exist.", + "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' has 'main' field 'oof' that references '/node_modules/foo/oof'.", + "File '/node_modules/foo/oof' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/foo/oof', target file type 'JavaScript'.", + "File '/node_modules/foo/oof.js' does not exist.", + "File '/node_modules/foo/oof.jsx' does not exist.", + "File '/node_modules/foo/oof/index.js' does not exist.", + "File '/node_modules/foo/oof/index.jsx' does not exist.", + "File '/node_modules/foo/index.js' does not exist.", + "File '/node_modules/foo/index.jsx' does not exist.", + "======== Module name 'foo' was not resolved. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js index c11bc13c6138b..bc506a6036ba5 100644 --- a/tests/baselines/reference/typingsLookup4.js +++ b/tests/baselines/reference/typingsLookup4.js @@ -18,19 +18,30 @@ export const k: number; //// [lquery.ts] export const l = 2; +//// [package.json] +{ "typings": "mquery" } + +//// [index.tsx] +export const m = 3; + //// [a.ts] import { j } from "jquery"; import { k } from "kquery"; import { l } from "lquery"; -j + k + l; +import { m } from "mquery"; +j + k + l + m; //// [lquery.js] "use strict"; exports.l = 2; +//// [index.js] +"use strict"; +exports.m = 3; //// [a.js] "use strict"; var jquery_1 = require("jquery"); var kquery_1 = require("kquery"); var lquery_1 = require("lquery"); -jquery_1.j + kquery_1.k + lquery_1.l; +var mquery_1 = require("mquery"); +jquery_1.j + kquery_1.k + lquery_1.l + mquery_1.m; diff --git a/tests/baselines/reference/typingsLookup4.symbols b/tests/baselines/reference/typingsLookup4.symbols index 144548c645265..9269ee6617dbf 100644 --- a/tests/baselines/reference/typingsLookup4.symbols +++ b/tests/baselines/reference/typingsLookup4.symbols @@ -8,10 +8,14 @@ import { k } from "kquery"; import { l } from "lquery"; >l : Symbol(l, Decl(a.ts, 2, 8)) -j + k + l; +import { m } from "mquery"; +>m : Symbol(m, Decl(a.ts, 3, 8)) + +j + k + l + m; >j : Symbol(j, Decl(a.ts, 0, 8)) >k : Symbol(k, Decl(a.ts, 1, 8)) >l : Symbol(l, Decl(a.ts, 2, 8)) +>m : Symbol(m, Decl(a.ts, 3, 8)) === /node_modules/@types/jquery/jquery.d.ts === export const j: number; @@ -25,3 +29,7 @@ export const k: number; export const l = 2; >l : Symbol(l, Decl(lquery.ts, 0, 12)) +=== /node_modules/@types/mquery/mquery/index.tsx === +export const m = 3; +>m : Symbol(m, Decl(index.tsx, 0, 12)) + diff --git a/tests/baselines/reference/typingsLookup4.trace.json b/tests/baselines/reference/typingsLookup4.trace.json index 451d68edf281f..332d9ffa41600 100644 --- a/tests/baselines/reference/typingsLookup4.trace.json +++ b/tests/baselines/reference/typingsLookup4.trace.json @@ -21,6 +21,7 @@ "Found 'package.json' at '/node_modules/@types/kquery/package.json'.", "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.", "File '/node_modules/@types/kquery/kquery' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/@types/kquery/kquery', target file type 'TypeScript'.", "File '/node_modules/@types/kquery/kquery.ts' does not exist.", "File '/node_modules/@types/kquery/kquery.tsx' does not exist.", "File '/node_modules/@types/kquery/kquery.d.ts' exist - use it as a name resolution result.", @@ -36,9 +37,28 @@ "Found 'package.json' at '/node_modules/@types/lquery/package.json'.", "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.", "File '/node_modules/@types/lquery/lquery' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/@types/lquery/lquery', target file type 'TypeScript'.", "File '/node_modules/@types/lquery/lquery.ts' exist - use it as a name resolution result.", "Resolving real path for '/node_modules/@types/lquery/lquery.ts', result '/node_modules/@types/lquery/lquery.ts'", "======== Module name 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts'. ========", + "======== Resolving module 'mquery' from '/a.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "Loading module 'mquery' from 'node_modules' folder, target file type 'TypeScript'.", + "File '/node_modules/mquery.ts' does not exist.", + "File '/node_modules/mquery.tsx' does not exist.", + "File '/node_modules/mquery.d.ts' does not exist.", + "File '/node_modules/@types/mquery.d.ts' does not exist.", + "Found 'package.json' at '/node_modules/@types/mquery/package.json'.", + "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.", + "File '/node_modules/@types/mquery/mquery' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/@types/mquery/mquery', target file type 'TypeScript'.", + "File '/node_modules/@types/mquery/mquery.ts' does not exist.", + "File '/node_modules/@types/mquery/mquery.tsx' does not exist.", + "File '/node_modules/@types/mquery/mquery.d.ts' does not exist.", + "File '/node_modules/@types/mquery/mquery/index.ts' does not exist.", + "File '/node_modules/@types/mquery/mquery/index.tsx' exist - use it as a name resolution result.", + "Resolving real path for '/node_modules/@types/mquery/mquery/index.tsx', result '/node_modules/@types/mquery/mquery/index.tsx'", + "======== Module name 'mquery' was successfully resolved to '/node_modules/@types/mquery/mquery/index.tsx'. ========", "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========", "Resolving with primary search path '/node_modules/@types'", "Found 'package.json' at '/node_modules/@types/jquery/package.json'.", @@ -51,6 +71,7 @@ "Found 'package.json' at '/node_modules/@types/kquery/package.json'.", "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.", "File '/node_modules/@types/kquery/kquery' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/@types/kquery/kquery', target file type 'TypeScript'.", "File '/node_modules/@types/kquery/kquery.ts' does not exist.", "File '/node_modules/@types/kquery/kquery.tsx' does not exist.", "File '/node_modules/@types/kquery/kquery.d.ts' exist - use it as a name resolution result.", @@ -61,7 +82,21 @@ "Found 'package.json' at '/node_modules/@types/lquery/package.json'.", "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.", "File '/node_modules/@types/lquery/lquery' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/@types/lquery/lquery', target file type 'TypeScript'.", "File '/node_modules/@types/lquery/lquery.ts' exist - use it as a name resolution result.", "Resolving real path for '/node_modules/@types/lquery/lquery.ts', result '/node_modules/@types/lquery/lquery.ts'", - "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========" + "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========", + "======== Resolving type reference directive 'mquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========", + "Resolving with primary search path '/node_modules/@types'", + "Found 'package.json' at '/node_modules/@types/mquery/package.json'.", + "'package.json' has 'typings' field 'mquery' that references '/node_modules/@types/mquery/mquery'.", + "File '/node_modules/@types/mquery/mquery' does not exist.", + "Loading module as file / folder, candidate module location '/node_modules/@types/mquery/mquery', target file type 'TypeScript'.", + "File '/node_modules/@types/mquery/mquery.ts' does not exist.", + "File '/node_modules/@types/mquery/mquery.tsx' does not exist.", + "File '/node_modules/@types/mquery/mquery.d.ts' does not exist.", + "File '/node_modules/@types/mquery/mquery/index.ts' does not exist.", + "File '/node_modules/@types/mquery/mquery/index.tsx' exist - use it as a name resolution result.", + "Resolving real path for '/node_modules/@types/mquery/mquery/index.tsx', result '/node_modules/@types/mquery/mquery/index.tsx'", + "======== Type reference directive 'mquery' was successfully resolved to '/node_modules/@types/mquery/mquery/index.tsx', primary: true. ========" ] \ No newline at end of file diff --git a/tests/baselines/reference/typingsLookup4.types b/tests/baselines/reference/typingsLookup4.types index e3f747ac55d6c..afa2483a86281 100644 --- a/tests/baselines/reference/typingsLookup4.types +++ b/tests/baselines/reference/typingsLookup4.types @@ -8,12 +8,17 @@ import { k } from "kquery"; import { l } from "lquery"; >l : 2 -j + k + l; +import { m } from "mquery"; +>m : 3 + +j + k + l + m; +>j + k + l + m : number >j + k + l : number >j + k : number >j : number >k : number >l : 2 +>m : 3 === /node_modules/@types/jquery/jquery.d.ts === export const j: number; @@ -28,3 +33,8 @@ export const l = 2; >l : 2 >2 : 2 +=== /node_modules/@types/mquery/mquery/index.tsx === +export const m = 3; +>m : 3 +>3 : 3 + diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain.ts b/tests/cases/conformance/moduleResolution/packageJsonMain.ts new file mode 100644 index 0000000000000..6bf21cfaa3a82 --- /dev/null +++ b/tests/cases/conformance/moduleResolution/packageJsonMain.ts @@ -0,0 +1,27 @@ +// @noImplicitReferences: true +// @currentDirectory: / +// @traceResolution: true + +// @filename: /node_modules/foo/package.json +{ "main": "oof" } + +// @filename: /node_modules/foo/oof.js +module.exports = 0; + +// @filename: /node_modules/bar/package.json +{ "main": "rab.js" } + +// @filename: /node_modules/bar/rab.js +module.exports = 0; + +// @filename: /node_modules/baz/package.json +{ "main": "zab" } + +// @filename: /node_modules/baz/zab/index.js +module.exports = 0; + +// @filename: /a.ts +import foo = require("foo"); +import bar = require("bar"); +import baz = require("baz"); +foo + bar + baz; diff --git a/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts new file mode 100644 index 0000000000000..c6e684b3fe1ba --- /dev/null +++ b/tests/cases/conformance/moduleResolution/packageJsonMain_isNonRecursive.ts @@ -0,0 +1,15 @@ +// @noImplicitReferences: true +// @currentDirectory: / +// @traceResolution: true + +// @filename: /node_modules/foo/package.json +{ "main": "oof" } + +// @filename: /node_modules/foo/oof/package.json +{ "main": "ofo" } + +// @filename: /node_modules/foo/oof/ofo.js +module.exports = 0; + +// @filename: /a.ts +import foo = require("foo"); diff --git a/tests/cases/conformance/typings/typingsLookup4.ts b/tests/cases/conformance/typings/typingsLookup4.ts index 234090aebad52..10317b6084b9f 100644 --- a/tests/cases/conformance/typings/typingsLookup4.ts +++ b/tests/cases/conformance/typings/typingsLookup4.ts @@ -1,6 +1,7 @@ // @traceResolution: true // @noImplicitReferences: true // @currentDirectory: / +// @jsx: react // A file extension is optional in typings entries. // @filename: /tsconfig.json @@ -24,8 +25,15 @@ export const k: number; // @filename: /node_modules/@types/lquery/lquery.ts export const l = 2; +// @filename: /node_modules/@types/mquery/package.json +{ "typings": "mquery" } + +// @filename: /node_modules/@types/mquery/mquery/index.tsx +export const m = 3; + // @filename: /a.ts import { j } from "jquery"; import { k } from "kquery"; import { l } from "lquery"; -j + k + l; +import { m } from "mquery"; +j + k + l + m; From 01a9e4f9be4eeebb1eb45350f6e55557035d7e38 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 26 Jan 2017 12:01:27 -0800 Subject: [PATCH 017/116] isOptionalParameter says unused IIFE arguments are optional Related to adding undefined, though not strictly the same, this change adds '?' to unused IIFE parameters in quick info. --- src/compiler/checker.ts | 8 +++++++- tests/baselines/reference/contextuallyTypedIife.types | 8 ++++---- tests/cases/fourslash/quickInfoDisplayPartsIife.ts | 5 +++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 tests/cases/fourslash/quickInfoDisplayPartsIife.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 22db0d327671c..34d71a0ab6e8b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5145,6 +5145,12 @@ namespace ts { Debug.assert(parameterIndex >= 0); return parameterIndex >= signature.minArgumentCount; } + const iife = getImmediatelyInvokedFunctionExpression(node.parent); + if (iife) { + return !node.type && + !node.dotDotDotToken && + indexOf((node.parent as SignatureDeclaration).parameters, node) >= iife.arguments.length; + } return false; } @@ -14026,7 +14032,7 @@ namespace ts { return getTypeOfSymbol(symbol); } } - + function getTypeAtPosition(signature: Signature, pos: number): Type { return signature.hasRestParameter ? pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : diff --git a/tests/baselines/reference/contextuallyTypedIife.types b/tests/baselines/reference/contextuallyTypedIife.types index 15038e7dd263a..676755fb34175 100644 --- a/tests/baselines/reference/contextuallyTypedIife.types +++ b/tests/baselines/reference/contextuallyTypedIife.types @@ -253,8 +253,8 @@ let eleven = (o => o.a(11))({ a: function(n) { return n; } }); // missing arguments (function(x, undefined) { return x; })(42); >(function(x, undefined) { return x; })(42) : number ->(function(x, undefined) { return x; }) : (x: number, undefined: any) => number ->function(x, undefined) { return x; } : (x: number, undefined: any) => number +>(function(x, undefined) { return x; }) : (x: number, undefined?: any) => number +>function(x, undefined) { return x; } : (x: number, undefined?: any) => number >x : number >undefined : any >x : number @@ -262,8 +262,8 @@ let eleven = (o => o.a(11))({ a: function(n) { return n; } }); ((x, y, z) => 42)(); >((x, y, z) => 42)() : number ->((x, y, z) => 42) : (x: any, y: any, z: any) => number ->(x, y, z) => 42 : (x: any, y: any, z: any) => number +>((x, y, z) => 42) : (x?: any, y?: any, z?: any) => number +>(x, y, z) => 42 : (x?: any, y?: any, z?: any) => number >x : any >y : any >z : any diff --git a/tests/cases/fourslash/quickInfoDisplayPartsIife.ts b/tests/cases/fourslash/quickInfoDisplayPartsIife.ts new file mode 100644 index 0000000000000..e4ce2bf96e3ec --- /dev/null +++ b/tests/cases/fourslash/quickInfoDisplayPartsIife.ts @@ -0,0 +1,5 @@ +/// +// @strictNullChecks: true +////var iife = (function foo/*1*/(x, y) { return x })(12); + +verify.quickInfoAt('1', '(local function) foo(x: number, y?: undefined): number'); From 132fa7093ed64bc0e78a9a3bb4ca7a7325e540be Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Thu, 26 Jan 2017 14:26:49 -0800 Subject: [PATCH 018/116] Respond to comments --- src/compiler/moduleNameResolver.ts | 21 +++++++++---------- .../reference/library-reference-12.trace.json | 1 + .../reference/library-reference-2.trace.json | 2 ++ ...lutionWithExtensions_unexpected.trace.json | 1 + ...utionWithExtensions_unexpected2.trace.json | 1 + .../reference/packageJsonMain.trace.json | 3 +++ .../packageJsonMain_isNonRecursive.trace.json | 1 + 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 519b1d5fad223..68b043f1439ff 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -67,16 +67,15 @@ namespace ts { } /** Reads from "main" or "types"/"typings" depending on `extensions`. */ - function tryReadPackageJsonFields(ts: boolean, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string | undefined { + function tryReadPackageJsonFields(readTypes: boolean, packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string | undefined { const jsonContent = readJson(packageJsonPath, state.host); - const file = ts ? tryReadFromField("typings") || tryReadFromField("types") : tryReadFromField("main"); - if (!file && state.traceEnabled) { - trace(state.host, Diagnostics.package_json_does_not_have_a_0_field, ts ? "types" : "main"); - } - return file; + return readTypes ? tryReadFromField("typings") || tryReadFromField("types") : tryReadFromField("main"); function tryReadFromField(fieldName: "typings" | "types" | "main"): string | undefined { if (!hasProperty(jsonContent, fieldName)) { + if (state.traceEnabled) { + trace(state.host, Diagnostics.package_json_does_not_have_a_0_field, fieldName); + } return; } @@ -690,7 +689,8 @@ namespace ts { return { resolvedModule: undefined, failedLookupLocations }; function tryResolve(extensions: Extensions): SearchResult<{ resolved: Resolved, isExternalLibraryImport: boolean }> { - const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state); + const loader: ResolutionKindSpecificLoader = (extensions, candidate, failedLookupLocations, onlyRecordFailures, state) => nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, /*considerPackageJson*/true); + const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state); if (resolved) { return toSearchResult({ resolved, isExternalLibraryImport: false }); } @@ -705,7 +705,7 @@ namespace ts { } else { const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); - const resolved = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state); + const resolved = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/true); return resolved && toSearchResult({ resolved, isExternalLibraryImport: false }); } } @@ -723,7 +723,7 @@ namespace ts { return real; } - function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson = true): Resolved | undefined { + function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push, onlyRecordFailures: boolean, state: ModuleResolutionState, considerPackageJson: boolean): Resolved | undefined { if (state.traceEnabled) { trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1, candidate, Extensions[extensions]); } @@ -855,8 +855,7 @@ namespace ts { trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath); } - const ts = extensions !== Extensions.JavaScript; - const file = tryReadPackageJsonFields(ts, packageJsonPath, candidate, state); + const file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, packageJsonPath, candidate, state); if (!file) { return undefined; } diff --git a/tests/baselines/reference/library-reference-12.trace.json b/tests/baselines/reference/library-reference-12.trace.json index 14e46647d6d6c..75b53d589eeb1 100644 --- a/tests/baselines/reference/library-reference-12.trace.json +++ b/tests/baselines/reference/library-reference-12.trace.json @@ -5,6 +5,7 @@ "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.", "File '/a/node_modules/jquery.d.ts' does not exist.", "Found 'package.json' at '/a/node_modules/jquery/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' has 'types' field 'dist/jquery.d.ts' that references '/a/node_modules/jquery/dist/jquery.d.ts'.", "File '/a/node_modules/jquery/dist/jquery.d.ts' exist - use it as a name resolution result.", "Resolving real path for '/a/node_modules/jquery/dist/jquery.d.ts', result '/a/node_modules/jquery/dist/jquery.d.ts'", diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json index 8837f2c9cb1b8..ef0936a35a2ed 100644 --- a/tests/baselines/reference/library-reference-2.trace.json +++ b/tests/baselines/reference/library-reference-2.trace.json @@ -2,6 +2,7 @@ "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/types'. ========", "Resolving with primary search path '/types'", "Found 'package.json' at '/types/jquery/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.", "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.", "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'", @@ -9,6 +10,7 @@ "======== Resolving type reference directive 'jquery', containing file 'test/__inferred type names__.ts', root directory '/types'. ========", "Resolving with primary search path '/types'", "Found 'package.json' at '/types/jquery/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.", "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.", "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'", diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json index c53a32ef97d95..8c820e07e4811 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json @@ -6,6 +6,7 @@ "File '/node_modules/normalize.css.tsx' does not exist.", "File '/node_modules/normalize.css.d.ts' does not exist.", "Found 'package.json' at '/node_modules/normalize.css/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' does not have a 'types' field.", "File '/node_modules/normalize.css/index.ts' does not exist.", "File '/node_modules/normalize.css/index.tsx' does not exist.", diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json index f007bc77d75d3..e550bb41eabbd 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.trace.json @@ -6,6 +6,7 @@ "File '/node_modules/foo.tsx' does not exist.", "File '/node_modules/foo.d.ts' does not exist.", "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' has 'types' field 'foo.js' that references '/node_modules/foo/foo.js'.", "File '/node_modules/foo/foo.js' exist - use it as a name resolution result.", "File '/node_modules/foo/foo.js' has an unsupported extension, so skipping it.", diff --git a/tests/baselines/reference/packageJsonMain.trace.json b/tests/baselines/reference/packageJsonMain.trace.json index 9b71c6723373e..a167e8dfec654 100644 --- a/tests/baselines/reference/packageJsonMain.trace.json +++ b/tests/baselines/reference/packageJsonMain.trace.json @@ -6,6 +6,7 @@ "File '/node_modules/foo.tsx' does not exist.", "File '/node_modules/foo.d.ts' does not exist.", "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' does not have a 'types' field.", "File '/node_modules/foo/index.ts' does not exist.", "File '/node_modules/foo/index.tsx' does not exist.", @@ -28,6 +29,7 @@ "File '/node_modules/bar.tsx' does not exist.", "File '/node_modules/bar.d.ts' does not exist.", "Found 'package.json' at '/node_modules/bar/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' does not have a 'types' field.", "File '/node_modules/bar/index.ts' does not exist.", "File '/node_modules/bar/index.tsx' does not exist.", @@ -48,6 +50,7 @@ "File '/node_modules/baz.tsx' does not exist.", "File '/node_modules/baz.d.ts' does not exist.", "Found 'package.json' at '/node_modules/baz/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' does not have a 'types' field.", "File '/node_modules/baz/index.ts' does not exist.", "File '/node_modules/baz/index.tsx' does not exist.", diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json index 9d1f2f9bedfad..53e1ad256052e 100644 --- a/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json +++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.trace.json @@ -6,6 +6,7 @@ "File '/node_modules/foo.tsx' does not exist.", "File '/node_modules/foo.d.ts' does not exist.", "Found 'package.json' at '/node_modules/foo/package.json'.", + "'package.json' does not have a 'typings' field.", "'package.json' does not have a 'types' field.", "File '/node_modules/foo/index.ts' does not exist.", "File '/node_modules/foo/index.tsx' does not exist.", From 3c243dbe0c262ed18a19f1afb0caa302717e9b0d Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 27 Jan 2017 14:29:00 -0800 Subject: [PATCH 019/116] Remove control flow-based undefined addition Just add undefined when displaying the type. Don't actually add it to the type. --- src/compiler/binder.ts | 12 ------ src/compiler/checker.ts | 92 ++++++++++++++++++----------------------- src/compiler/types.ts | 18 +++----- 3 files changed, 46 insertions(+), 76 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index d0acfaed61fff..04dc4011a1591 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -822,15 +822,6 @@ namespace ts { }; } - function createFlowInitializedParameter(antecedent: FlowNode, node: ParameterDeclaration): FlowNode { - setFlowNodeReferenced(antecedent); - return { - flags: FlowFlags.InitializedParameter, - antecedent, - node - }; - } - function createFlowArrayMutation(antecedent: FlowNode, node: CallExpression | BinaryExpression): FlowNode { setFlowNodeReferenced(antecedent); return { @@ -2328,9 +2319,6 @@ namespace ts { } else { declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable, SymbolFlags.ParameterExcludes); - if (node.initializer) { - currentFlow = createFlowInitializedParameter(currentFlow, node); - } } // If this is a property-parameter, then also declare the property symbol into the diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 34d71a0ab6e8b..a9c98d02341a0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2694,7 +2694,11 @@ namespace ts { writePunctuation(writer, SyntaxKind.ColonToken); writeSpace(writer); - buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack); + let type = getTypeOfSymbol(p); + if (strictNullChecks && parameterNode.initializer && !(getModifierFlags(parameterNode) & ModifierFlags.ParameterPropertyModifier)) { + type = includeFalsyTypes(type, TypeFlags.Undefined); + } + buildTypeDisplay(type, writer, enclosingDeclaration, flags, symbolStack); } function buildBindingPatternDisplay(bindingPattern: BindingPattern, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) { @@ -3315,9 +3319,7 @@ namespace ts { // Use type from type annotation if one is present if (declaration.type) { - const isOptional = declaration.questionToken || - (declaration.initializer && declaration.kind === SyntaxKind.Parameter && !(getModifierFlags(declaration) & ModifierFlags.ParameterPropertyModifier)); - return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ isOptional && includeOptionality); + return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality); } if ((compilerOptions.noImplicitAny || declaration.flags & NodeFlags.JavaScriptFile) && @@ -3368,10 +3370,7 @@ namespace ts { // Use the type of the initializer expression if one is present if (declaration.initializer) { const type = checkDeclarationInitializer(declaration); - // initialized parameters (but not parameter properties) are optional - const isOptional = declaration.questionToken || - (declaration.kind === SyntaxKind.Parameter && !(getModifierFlags(declaration) & ModifierFlags.ParameterPropertyModifier)); - return addOptionality(type, isOptional && includeOptionality); + return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality); } // If it is a short-hand property assignment, use the type of the identifier @@ -7101,8 +7100,8 @@ namespace ts { const sourceParams = source.parameters; const targetParams = target.parameters; for (let i = 0; i < checkCount; i++) { - const s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source); - const t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target); + const s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source); + const t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target); const related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors); if (!related) { if (reportErrors) { @@ -8299,8 +8298,8 @@ namespace ts { const targetLen = target.parameters.length; for (let i = 0; i < targetLen; i++) { - const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]); - const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]); + const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]); + const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]); const related = compareTypes(s, t); if (!related) { return Ternary.False; @@ -9196,8 +9195,8 @@ namespace ts { switch (source.kind) { case SyntaxKind.Identifier: return target.kind === SyntaxKind.Identifier && getResolvedSymbol(source) === getResolvedSymbol(target) || - (target.kind === SyntaxKind.VariableDeclaration || target.kind === SyntaxKind.BindingElement || target.kind === SyntaxKind.Parameter) && - getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source as Identifier)) === getSymbolOfNode(target); + (target.kind === SyntaxKind.VariableDeclaration || target.kind === SyntaxKind.BindingElement) && + getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target); case SyntaxKind.ThisKeyword: return target.kind === SyntaxKind.ThisKeyword; case SyntaxKind.PropertyAccessExpression: @@ -9291,13 +9290,6 @@ namespace ts { return false; } - function getInitializedParameterReducedType(declaredType: UnionType, assignedType: Type) { - if (declaredType === assignedType || getFalsyFlags(assignedType) & TypeFlags.Undefined) { - return declaredType; - } - return getTypeWithFacts(declaredType, TypeFacts.NEUndefined); - } - // Remove those constituent types of declaredType to which no constituent type of assignedType is assignable. // For example, when a variable of type number | string | boolean is assigned a value of type number | boolean, // we remove type string. @@ -9478,7 +9470,7 @@ namespace ts { return links.resolvedType || getTypeOfExpression(node); } - function getInitialTypeOfVariableDeclaration(node: VariableDeclaration | ParameterDeclaration) { + function getInitialTypeOfVariableDeclaration(node: VariableDeclaration) { if (node.initializer) { return getTypeOfInitializer(node.initializer); } @@ -9491,15 +9483,15 @@ namespace ts { return unknownType; } - function getInitialType(node: VariableDeclaration | BindingElement | ParameterDeclaration) { - return node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.Parameter ? - getInitialTypeOfVariableDeclaration(node) : + function getInitialType(node: VariableDeclaration | BindingElement) { + return node.kind === SyntaxKind.VariableDeclaration ? + getInitialTypeOfVariableDeclaration(node) : getInitialTypeOfBindingElement(node); } - function getInitialOrAssignedType(node: VariableDeclaration | BindingElement | Expression | ParameterDeclaration) { - return node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement || node.kind === SyntaxKind.Parameter ? - getInitialType(node) : + function getInitialOrAssignedType(node: VariableDeclaration | BindingElement | Expression) { + return node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement ? + getInitialType(node) : getAssignedType(node); } @@ -9768,13 +9760,6 @@ namespace ts { continue; } } - else if (flow.flags & FlowFlags.InitializedParameter) { - type = getTypeAtFlowInitializedParameter(flow as FlowInitializedParameter); - if (!type) { - flow = (flow as FlowInitializedParameter).antecedent; - continue; - } - } else if (flow.flags & FlowFlags.Condition) { type = getTypeAtFlowCondition(flow); } @@ -9822,20 +9807,6 @@ namespace ts { } } - function getTypeAtFlowInitializedParameter(flow: FlowInitializedParameter) { - const node = flow.node; - // Parameter initializers don't really narrow the declared type except to remove undefined. - // If the initializer includes undefined in the type, it doesn't even remove undefined. - if (isMatchingReference(reference, node)) { - if (declaredType.flags & TypeFlags.Union) { - return getInitializedParameterReducedType(declaredType, getInitialOrAssignedType(node)); - } - return declaredType; - } - - return undefined; - } - function getTypeAtFlowAssignment(flow: FlowAssignment) { const node = flow.node; // Assignments only narrow the computed type if the declared type is a union type. Thus, we @@ -14033,10 +14004,21 @@ namespace ts { } } + function getTypeOfParameter(symbol: Symbol) { + const type = getTypeOfSymbol(symbol); + if (strictNullChecks) { + const declaration = symbol.valueDeclaration; + if (declaration && (declaration).initializer) { + return includeFalsyTypes(type, TypeFlags.Undefined); + } + } + return type; + } + function getTypeAtPosition(signature: Signature, pos: number): Type { return signature.hasRestParameter ? - pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) : - pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType; + pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) : + pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType; } function assignContextualParameterTypes(signature: Signature, context: Signature, mapper: TypeMapper) { @@ -20652,9 +20634,15 @@ namespace ts { function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) { // Get type of the symbol if this is the valid symbol otherwise get type at location const symbol = getSymbolOfNode(declaration); - const type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature)) + let type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature)) ? getWidenedLiteralType(getTypeOfSymbol(symbol)) : unknownType; + if (strictNullChecks && + declaration.kind === SyntaxKind.Parameter && + (declaration as ParameterDeclaration).initializer && + !(getModifierFlags(declaration) & ModifierFlags.ParameterPropertyModifier)) { + type = includeFalsyTypes(type, TypeFlags.Undefined); + } getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 374c7fa89d8a2..8b49af402cf6c 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2062,13 +2062,12 @@ BranchLabel = 1 << 2, // Non-looping junction LoopLabel = 1 << 3, // Looping junction Assignment = 1 << 4, // Assignment - InitializedParameter = 1 << 5, // Parameter with initializer - TrueCondition = 1 << 6, // Condition known to be true - FalseCondition = 1 << 7, // Condition known to be false - SwitchClause = 1 << 8, // Switch statement clause - ArrayMutation = 1 << 9, // Potential array mutation - Referenced = 1 << 10, // Referenced as antecedent once - Shared = 1 << 11, // Referenced as antecedent more than once + TrueCondition = 1 << 5, // Condition known to be true + FalseCondition = 1 << 6, // Condition known to be false + SwitchClause = 1 << 7, // Switch statement clause + ArrayMutation = 1 << 8, // Potential array mutation + Referenced = 1 << 9, // Referenced as antecedent once + Shared = 1 << 10, // Referenced as antecedent more than once Label = BranchLabel | LoopLabel, Condition = TrueCondition | FalseCondition } @@ -2118,11 +2117,6 @@ antecedent: FlowNode; } - export interface FlowInitializedParameter extends FlowNode { - node: ParameterDeclaration; - antecedent: FlowNode; - } - export type FlowType = Type | IncompleteType; // Incomplete types occur during control flow analysis of loops. An IncompleteType From bb40819f7537988ac32a8b4889cd9f1c33976e22 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 27 Jan 2017 14:30:11 -0800 Subject: [PATCH 020/116] Update tests and baselines --- ...ameterAddsUndefinedWithStrictNullChecks.js | 21 +++------ ...rAddsUndefinedWithStrictNullChecks.symbols | 45 +++++++------------ ...terAddsUndefinedWithStrictNullChecks.types | 32 +++---------- ...ameterAddsUndefinedWithStrictNullChecks.ts | 11 ++--- 4 files changed, 30 insertions(+), 79 deletions(-) diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js index 561fa65a154f5..d2933f15668ae 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -12,18 +12,13 @@ function foo1(x: string = "string", b: number) { x.length; } -function foo2(x: string | undefined = "string", b: number) { - x.length; // ok, should be narrowed to string -} - -function foo3(x = "string", b: number) { - x.length; // ok, should be narrowed to string +function foo2(x = "string", b: number) { + x.length; } -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +// .d.ts should have `T | undefined` for foo1 and foo2 foo1(undefined, 1); foo2(undefined, 1); -foo3(undefined, 1); function removeUndefinedButNotFalse(x = true) { @@ -60,16 +55,11 @@ function foo1(x, b) { } function foo2(x, b) { if (x === void 0) { x = "string"; } - x.length; // ok, should be narrowed to string -} -function foo3(x, b) { - if (x === void 0) { x = "string"; } - x.length; // ok, should be narrowed to string + x.length; } -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +// .d.ts should have `T | undefined` for foo1 and foo2 foo1(undefined, 1); foo2(undefined, 1); -foo3(undefined, 1); function removeUndefinedButNotFalse(x) { if (x === void 0) { x = true; } if (x === false) { @@ -93,7 +83,6 @@ declare function g(addUndefined: string | undefined, addDefined: number): number declare let total: number; declare function foo1(x: string | undefined, b: number): void; declare function foo2(x: string | undefined, b: number): void; -declare function foo3(x: string | undefined, b: number): void; declare function removeUndefinedButNotFalse(x?: boolean | undefined): false | undefined; declare const cond: boolean; declare function removeNothing(y?: boolean | undefined): boolean; diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols index f722ed3af2603..6d4e02c6ab3e1 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols @@ -46,29 +46,18 @@ function foo1(x: string = "string", b: number) { >length : Symbol(String.length, Decl(lib.d.ts, --, --)) } -function foo2(x: string | undefined = "string", b: number) { +function foo2(x = "string", b: number) { >foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1)) >x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14)) ->b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 47)) +>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 27)) - x.length; // ok, should be narrowed to string + x.length; >x.length : Symbol(String.length, Decl(lib.d.ts, --, --)) >x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14)) >length : Symbol(String.length, Decl(lib.d.ts, --, --)) } -function foo3(x = "string", b: number) { ->foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1)) ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14)) ->b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 27)) - - x.length; // ok, should be narrowed to string ->x.length : Symbol(String.length, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14)) ->length : Symbol(String.length, Decl(lib.d.ts, --, --)) -} - -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +// .d.ts should have `T | undefined` for foo1 and foo2 foo1(undefined, 1); >foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36)) >undefined : Symbol(undefined) @@ -77,41 +66,37 @@ foo2(undefined, 1); >foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1)) >undefined : Symbol(undefined) -foo3(undefined, 1); ->foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1)) ->undefined : Symbol(undefined) - function removeUndefinedButNotFalse(x = true) { ->removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 24, 19)) ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36)) +>removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 19, 19)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36)) if (x === false) { ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36)) return x; ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36)) } } declare const cond: boolean; ->cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 13)) +>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 13)) function removeNothing(y = cond ? true : undefined) { ->removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 28)) ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) ->cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 13)) +>removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 28)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) +>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 13)) >undefined : Symbol(undefined) if (y !== undefined) { ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) >undefined : Symbol(undefined) if (y === false) { ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) return y; ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) } } return true; diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types index 15535eb435e2d..1311a6e9222b6 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types @@ -1,7 +1,7 @@ === tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts === function f(addUndefined1 = "J", addUndefined2?: number) { >f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number ->addUndefined1 : string | undefined +>addUndefined1 : string >"J" : "J" >addUndefined2 : number | undefined @@ -17,7 +17,7 @@ function f(addUndefined1 = "J", addUndefined2?: number) { } function g(addUndefined = "J", addDefined: number) { >g : (addUndefined: string | undefined, addDefined: number) => number ->addUndefined : string | undefined +>addUndefined : string >"J" : "J" >addDefined : number @@ -62,7 +62,7 @@ total = g('c', 3) + g(undefined, 4); function foo1(x: string = "string", b: number) { >foo1 : (x: string | undefined, b: number) => void ->x : string | undefined +>x : string >"string" : "string" >b : number @@ -72,31 +72,19 @@ function foo1(x: string = "string", b: number) { >length : number } -function foo2(x: string | undefined = "string", b: number) { +function foo2(x = "string", b: number) { >foo2 : (x: string | undefined, b: number) => void ->x : string | undefined ->"string" : "string" ->b : number - - x.length; // ok, should be narrowed to string ->x.length : number >x : string ->length : number -} - -function foo3(x = "string", b: number) { ->foo3 : (x: string | undefined, b: number) => void ->x : string | undefined >"string" : "string" >b : number - x.length; // ok, should be narrowed to string + x.length; >x.length : number >x : string >length : number } -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +// .d.ts should have `T | undefined` for foo1 and foo2 foo1(undefined, 1); >foo1(undefined, 1) : void >foo1 : (x: string | undefined, b: number) => void @@ -109,16 +97,10 @@ foo2(undefined, 1); >undefined : undefined >1 : 1 -foo3(undefined, 1); ->foo3(undefined, 1) : void ->foo3 : (x: string | undefined, b: number) => void ->undefined : undefined ->1 : 1 - function removeUndefinedButNotFalse(x = true) { >removeUndefinedButNotFalse : (x?: boolean | undefined) => false | undefined ->x : boolean | undefined +>x : boolean >true : true if (x === false) { diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts index 44f17c949e0c1..47344e6974bcb 100644 --- a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -13,18 +13,13 @@ function foo1(x: string = "string", b: number) { x.length; } -function foo2(x: string | undefined = "string", b: number) { - x.length; // ok, should be narrowed to string -} - -function foo3(x = "string", b: number) { - x.length; // ok, should be narrowed to string +function foo2(x = "string", b: number) { + x.length; } -// .d.ts should have `T | undefined` for foo1, foo2, foo3 +// .d.ts should have `T | undefined` for foo1 and foo2 foo1(undefined, 1); foo2(undefined, 1); -foo3(undefined, 1); function removeUndefinedButNotFalse(x = true) { From a235d544f3213bde39fda163a65c6147967b3a67 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 30 Jan 2017 14:59:23 -0800 Subject: [PATCH 021/116] Remove undefined from initialized+annotated parameter type --- src/compiler/checker.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a9c98d02341a0..199cb60c3c753 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3286,6 +3286,16 @@ namespace ts { return strictNullChecks && optional ? includeFalsyTypes(type, TypeFlags.Undefined) : type; } + /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */ + function removeOptionalityFromAnnotation(annotatedType: Type, declaration: VariableLikeDeclaration): Type { + const annotationIncludesUndefined = strictNullChecks && + declaration.kind === SyntaxKind.Parameter && + declaration.initializer && + getFalsyFlags(annotatedType) & TypeFlags.Undefined && + !(getFalsyFlags(checkExpression(declaration.initializer)) & TypeFlags.Undefined); + return annotationIncludesUndefined ? getNonNullableType(annotatedType) : annotatedType; + } + // Return the inferred type for a variable, parameter, or property declaration function getTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration, includeOptionality: boolean): Type { if (declaration.flags & NodeFlags.JavaScriptFile) { @@ -3319,7 +3329,8 @@ namespace ts { // Use type from type annotation if one is present if (declaration.type) { - return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality); + const declaredType = removeOptionalityFromAnnotation(getTypeFromTypeNode(declaration.type), declaration); + return addOptionality(declaredType, /*optional*/ declaration.questionToken && includeOptionality); } if ((compilerOptions.noImplicitAny || declaration.flags & NodeFlags.JavaScriptFile) && From 7cf595a381492ad9da75ec4b4ced82c4f4b1dbdb Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 30 Jan 2017 15:00:50 -0800 Subject: [PATCH 022/116] Test removing undefined from initialized, annotated parameters --- ...ameterAddsUndefinedWithStrictNullChecks.js | 32 +++++++++-- ...rAddsUndefinedWithStrictNullChecks.symbols | 57 ++++++++++++++----- ...terAddsUndefinedWithStrictNullChecks.types | 40 ++++++++++++- ...ameterAddsUndefinedWithStrictNullChecks.ts | 16 +++++- 4 files changed, 124 insertions(+), 21 deletions(-) diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js index d2933f15668ae..cb556cc2cec3a 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -13,12 +13,24 @@ function foo1(x: string = "string", b: number) { } function foo2(x = "string", b: number) { - x.length; + x.length; // ok, should be string +} + +function foo3(x: string | undefined = "string", b: number) { + x.length; // ok, should be string } -// .d.ts should have `T | undefined` for foo1 and foo2 +function foo4(x: string | undefined = undefined, b: number) { + x; // should be string | undefined +} + + + +// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4 foo1(undefined, 1); foo2(undefined, 1); +foo3(undefined, 1); +foo4(undefined, 1); function removeUndefinedButNotFalse(x = true) { @@ -55,11 +67,21 @@ function foo1(x, b) { } function foo2(x, b) { if (x === void 0) { x = "string"; } - x.length; + x.length; // ok, should be string +} +function foo3(x, b) { + if (x === void 0) { x = "string"; } + x.length; // ok, should be string +} +function foo4(x, b) { + if (x === void 0) { x = undefined; } + x; // should be string | undefined } -// .d.ts should have `T | undefined` for foo1 and foo2 +// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4 foo1(undefined, 1); foo2(undefined, 1); +foo3(undefined, 1); +foo4(undefined, 1); function removeUndefinedButNotFalse(x) { if (x === void 0) { x = true; } if (x === false) { @@ -83,6 +105,8 @@ declare function g(addUndefined: string | undefined, addDefined: number): number declare let total: number; declare function foo1(x: string | undefined, b: number): void; declare function foo2(x: string | undefined, b: number): void; +declare function foo3(x: string | undefined, b: number): void; +declare function foo4(x: string | undefined, b: number): void; declare function removeUndefinedButNotFalse(x?: boolean | undefined): false | undefined; declare const cond: boolean; declare function removeNothing(y?: boolean | undefined): boolean; diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols index 6d4e02c6ab3e1..fb0fce7dc7f1a 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols @@ -51,13 +51,36 @@ function foo2(x = "string", b: number) { >x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14)) >b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 27)) - x.length; + x.length; // ok, should be string >x.length : Symbol(String.length, Decl(lib.d.ts, --, --)) >x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14)) >length : Symbol(String.length, Decl(lib.d.ts, --, --)) } -// .d.ts should have `T | undefined` for foo1 and foo2 +function foo3(x: string | undefined = "string", b: number) { +>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14)) +>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 47)) + + x.length; // ok, should be string +>x.length : Symbol(String.length, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14)) +>length : Symbol(String.length, Decl(lib.d.ts, --, --)) +} + +function foo4(x: string | undefined = undefined, b: number) { +>foo4 : Symbol(foo4, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 19, 1)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 21, 14)) +>undefined : Symbol(undefined) +>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 21, 48)) + + x; // should be string | undefined +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 21, 14)) +} + + + +// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4 foo1(undefined, 1); >foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36)) >undefined : Symbol(undefined) @@ -66,37 +89,45 @@ foo2(undefined, 1); >foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1)) >undefined : Symbol(undefined) +foo3(undefined, 1); +>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1)) +>undefined : Symbol(undefined) + +foo4(undefined, 1); +>foo4 : Symbol(foo4, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 19, 1)) +>undefined : Symbol(undefined) + function removeUndefinedButNotFalse(x = true) { ->removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 19, 19)) ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36)) +>removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 31, 19)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 36)) if (x === false) { ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 36)) return x; ->x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36)) +>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 36)) } } declare const cond: boolean; ->cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 13)) +>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 40, 13)) function removeNothing(y = cond ? true : undefined) { ->removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 28)) ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) ->cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 13)) +>removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 40, 28)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23)) +>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 40, 13)) >undefined : Symbol(undefined) if (y !== undefined) { ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23)) >undefined : Symbol(undefined) if (y === false) { ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23)) return y; ->y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23)) +>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 41, 23)) } } return true; diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types index 1311a6e9222b6..21ff19fc6593e 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types @@ -78,13 +78,37 @@ function foo2(x = "string", b: number) { >"string" : "string" >b : number - x.length; + x.length; // ok, should be string +>x.length : number +>x : string +>length : number +} + +function foo3(x: string | undefined = "string", b: number) { +>foo3 : (x: string | undefined, b: number) => void +>x : string +>"string" : "string" +>b : number + + x.length; // ok, should be string >x.length : number >x : string >length : number } -// .d.ts should have `T | undefined` for foo1 and foo2 +function foo4(x: string | undefined = undefined, b: number) { +>foo4 : (x: string | undefined, b: number) => void +>x : string | undefined +>undefined : undefined +>b : number + + x; // should be string | undefined +>x : string | undefined +} + + + +// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4 foo1(undefined, 1); >foo1(undefined, 1) : void >foo1 : (x: string | undefined, b: number) => void @@ -97,6 +121,18 @@ foo2(undefined, 1); >undefined : undefined >1 : 1 +foo3(undefined, 1); +>foo3(undefined, 1) : void +>foo3 : (x: string | undefined, b: number) => void +>undefined : undefined +>1 : 1 + +foo4(undefined, 1); +>foo4(undefined, 1) : void +>foo4 : (x: string | undefined, b: number) => void +>undefined : undefined +>1 : 1 + function removeUndefinedButNotFalse(x = true) { >removeUndefinedButNotFalse : (x?: boolean | undefined) => false | undefined diff --git a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts index 47344e6974bcb..8abea19f6cd35 100644 --- a/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts +++ b/tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts @@ -14,12 +14,24 @@ function foo1(x: string = "string", b: number) { } function foo2(x = "string", b: number) { - x.length; + x.length; // ok, should be string +} + +function foo3(x: string | undefined = "string", b: number) { + x.length; // ok, should be string } -// .d.ts should have `T | undefined` for foo1 and foo2 +function foo4(x: string | undefined = undefined, b: number) { + x; // should be string | undefined +} + + + +// .d.ts should have `string | undefined` for foo1, foo2, foo3 and foo4 foo1(undefined, 1); foo2(undefined, 1); +foo3(undefined, 1); +foo4(undefined, 1); function removeUndefinedButNotFalse(x = true) { From 8515f7e2b56c39cbaee699125dc7363d5a819dc9 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Fri, 27 Jan 2017 08:59:33 -0800 Subject: [PATCH 023/116] Change find-all-references tests to test for groups * Also always test for isWriteAccess and isDefinition --- src/harness/fourslash.ts | 121 +++++++++++++----- src/services/findAllReferences.ts | 19 +-- src/services/services.ts | 7 +- .../fourslash/ambientShorthandFindAllRefs.ts | 15 ++- ...cellationWhenfindingAllRefsOnDefinition.ts | 18 ++- .../findAllReferencesOfConstructor.ts | 6 +- ...dAllReferencesOfConstructor_badOverload.ts | 2 +- .../findAllRefsForComputedProperties.ts | 20 ++- .../findAllRefsForComputedProperties2.ts | 18 ++- .../fourslash/findAllRefsForDefaultExport.ts | 6 +- .../findAllRefsForDefaultExport01.ts | 7 +- .../findAllRefsForDefaultExport02.ts | 17 ++- .../findAllRefsForDefaultExport03.ts | 9 +- .../findAllRefsForDefaultExport04.ts | 23 ---- .../findAllRefsForDefaultExport05.ts | 23 ---- .../findAllRefsForDefaultExport06.ts | 23 ---- .../findAllRefsForDefaultExport07.ts | 16 --- .../findAllRefsForDefaultExport08.ts | 5 +- .../findAllRefsForFunctionExpression01.ts | 4 +- .../fourslash/findAllRefsForMappedType.ts | 18 ++- .../findAllRefsForObjectLiteralProperties.ts | 10 +- .../fourslash/findAllRefsForObjectSpread.ts | 17 ++- tests/cases/fourslash/findAllRefsForRest.ts | 4 +- .../findAllRefsForStringLiteralTypes.ts | 2 +- .../findAllRefsForUMDModuleAlias1.ts | 4 +- ...findAllRefsForVariableInExtendsClause01.ts | 4 +- ...findAllRefsForVariableInExtendsClause02.ts | 4 +- ...dAllRefsForVariableInImplementsClause01.ts | 3 +- .../fourslash/findAllRefsInClassExpression.ts | 12 +- .../findAllRefsInheritedProperties1.ts | 14 +- .../findAllRefsInheritedProperties2.ts | 10 +- .../findAllRefsInheritedProperties3.ts | 46 ++++--- .../findAllRefsInheritedProperties4.ts | 17 +-- .../findAllRefsInheritedProperties5.ts | 15 +-- .../fourslash/findAllRefsInsideTemplates1.ts | 4 +- .../fourslash/findAllRefsInsideTemplates2.ts | 4 +- .../fourslash/findAllRefsInsideWithBlock.ts | 6 +- ...lRefsObjectBindingElementPropertyName01.ts | 4 +- ...lRefsObjectBindingElementPropertyName02.ts | 4 +- ...lRefsObjectBindingElementPropertyName03.ts | 12 +- ...lRefsObjectBindingElementPropertyName04.ts | 13 +- ...lRefsObjectBindingElementPropertyName05.ts | 2 +- ...lRefsObjectBindingElementPropertyName06.ts | 21 ++- ...lRefsObjectBindingElementPropertyName07.ts | 10 +- ...lRefsObjectBindingElementPropertyName09.ts | 15 --- ...lRefsObjectBindingElementPropertyName10.ts | 4 +- .../findAllRefsOfConstructor_withModifier.ts | 3 +- .../fourslash/findAllRefsOnDecorators.ts | 4 +- .../fourslash/findAllRefsOnDefinition.ts | 10 +- .../fourslash/findAllRefsOnDefinition2.ts | 8 +- .../fourslash/findAllRefsOnImportAliases.ts | 11 +- .../fourslash/findAllRefsOnImportAliases2.ts | 16 ++- .../findAllRefsOnPrivateParameterProperty1.ts | 4 +- ...indAllRefsParameterPropertyDeclaration1.ts | 9 +- ...indAllRefsParameterPropertyDeclaration2.ts | 9 +- ...indAllRefsParameterPropertyDeclaration3.ts | 9 +- tests/cases/fourslash/findAllRefsPrimitive.ts | 2 +- ...sPropertyContextuallyTypedByTypeParam01.ts | 18 ++- .../cases/fourslash/findAllRefsThisKeyword.ts | 22 ++-- .../findAllRefsWithLeadingUnderscoreNames1.ts | 10 +- .../findAllRefsWithLeadingUnderscoreNames2.ts | 10 +- .../findAllRefsWithLeadingUnderscoreNames3.ts | 10 +- .../findAllRefsWithLeadingUnderscoreNames4.ts | 10 +- .../findAllRefsWithLeadingUnderscoreNames5.ts | 4 +- .../findAllRefsWithLeadingUnderscoreNames6.ts | 4 +- .../findAllRefsWithLeadingUnderscoreNames7.ts | 4 +- .../findAllRefsWithLeadingUnderscoreNames8.ts | 4 +- .../findAllRefsWithLeadingUnderscoreNames9.ts | 4 +- ...dAllRefsWithShorthandPropertyAssignment.ts | 21 +-- ...AllRefsWithShorthandPropertyAssignment2.ts | 20 ++- .../findReferencesAcrossMultipleProjects.ts | 8 +- .../fourslash/findReferencesAfterEdit.ts | 6 +- .../fourslash/findReferencesJSXTagName.ts | 8 +- .../fourslash/findReferencesJSXTagName2.ts | 6 +- tests/cases/fourslash/fourslash.ts | 16 +-- ...tOccurrencesIsDefinitionOfArrowFunction.ts | 6 +- ...OccurrencesIsDefinitionOfBindingPattern.ts | 4 +- .../getOccurrencesIsDefinitionOfClass.ts | 9 +- ...currencesIsDefinitionOfComputedProperty.ts | 12 +- .../getOccurrencesIsDefinitionOfEnum.ts | 6 +- .../getOccurrencesIsDefinitionOfExport.ts | 8 +- .../getOccurrencesIsDefinitionOfFunction.ts | 6 +- .../getOccurrencesIsDefinitionOfInterface.ts | 6 +- ...rencesIsDefinitionOfInterfaceClassMerge.ts | 13 +- .../getOccurrencesIsDefinitionOfNamespace.ts | 6 +- ...rencesIsDefinitionOfNumberNamedProperty.ts | 10 +- .../getOccurrencesIsDefinitionOfParameter.ts | 6 +- ...rencesIsDefinitionOfStringNamedProperty.ts | 10 +- .../getOccurrencesIsDefinitionOfTypeAlias.ts | 6 +- .../getOccurrencesIsDefinitionOfVariable.ts | 28 ++-- tests/cases/fourslash/hoverOverComment.ts | 2 +- tests/cases/fourslash/localGetReferences.ts | 66 ++++++---- tests/cases/fourslash/quickInfoForRequire.ts | 5 +- ...referenceInParameterPropertyDeclaration.ts | 21 ++- tests/cases/fourslash/referenceToClass.ts | 7 +- .../cases/fourslash/referencesBloomFilters.ts | 16 ++- .../fourslash/referencesBloomFilters2.ts | 16 ++- .../fourslash/referencesBloomFilters3.ts | 4 +- .../cases/fourslash/referencesForAmbients.ts | 16 +-- .../fourslash/referencesForClassLocal.ts | 4 +- .../fourslash/referencesForClassMembers.ts | 30 ++++- ...esForClassMembersExtendingAbstractClass.ts | 30 ++++- ...cesForClassMembersExtendingGenericClass.ts | 30 ++++- .../fourslash/referencesForClassParameter.ts | 10 +- ...ontextuallyTypedObjectLiteralProperties.ts | 28 ++-- ...ncesForContextuallyTypedUnionProperties.ts | 36 +++--- ...cesForContextuallyTypedUnionProperties2.ts | 26 ++-- tests/cases/fourslash/referencesForEnums.ts | 11 +- .../fourslash/referencesForExportedValues.ts | 4 +- .../referencesForExternalModuleNames.ts | 7 +- .../referencesForFunctionOverloads.ts | 6 +- .../referencesForFunctionParameter.ts | 6 +- tests/cases/fourslash/referencesForGlobals.ts | 4 +- .../cases/fourslash/referencesForGlobals2.ts | 4 +- .../cases/fourslash/referencesForGlobals3.ts | 4 +- .../cases/fourslash/referencesForGlobals4.ts | 4 +- .../cases/fourslash/referencesForGlobals5.ts | 4 +- .../referencesForGlobalsInExternalModule.ts | 18 ++- .../referencesForIllegalAssignment.ts | 10 +- tests/cases/fourslash/referencesForImports.ts | 8 +- .../fourslash/referencesForIndexProperty.ts | 8 +- .../fourslash/referencesForIndexProperty2.ts | 2 +- .../fourslash/referencesForIndexProperty3.ts | 4 +- .../referencesForInheritedProperties.ts | 25 +++- .../referencesForInheritedProperties2.ts | 25 +++- .../referencesForInheritedProperties3.ts | 8 +- .../referencesForInheritedProperties4.ts | 15 ++- .../referencesForInheritedProperties5.ts | 22 +++- .../referencesForInheritedProperties6.ts | 21 ++- .../referencesForInheritedProperties7.ts | 44 ++++--- .../referencesForInheritedProperties8.ts | 13 +- .../referencesForInheritedProperties9.ts | 12 +- tests/cases/fourslash/referencesForLabel.ts | 4 +- tests/cases/fourslash/referencesForLabel2.ts | 3 +- tests/cases/fourslash/referencesForLabel3.ts | 3 +- tests/cases/fourslash/referencesForLabel4.ts | 2 +- tests/cases/fourslash/referencesForLabel5.ts | 4 +- tests/cases/fourslash/referencesForLabel6.ts | 6 +- .../referencesForMergedDeclarations.ts | 13 +- .../referencesForMergedDeclarations2.ts | 4 +- .../referencesForMergedDeclarations3.ts | 12 +- .../referencesForMergedDeclarations4.ts | 10 +- .../referencesForMergedDeclarations5.ts | 14 +- .../referencesForMergedDeclarations6.ts | 4 +- .../referencesForMergedDeclarations7.ts | 14 +- .../referencesForMergedDeclarations8.ts | 4 +- .../cases/fourslash/referencesForNoContext.ts | 12 +- ...eferencesForNumericLiteralPropertyNames.ts | 19 ++- .../referencesForObjectLiteralProperties.ts | 10 +- .../cases/fourslash/referencesForOverrides.ts | 93 +++++++++++--- .../referencesForPropertiesOfGenericType.ts | 14 +- tests/cases/fourslash/referencesForStatic.ts | 4 +- ...rencesForStaticsAndMembersWithSameNames.ts | 19 +-- ...referencesForStringLiteralPropertyNames.ts | 18 ++- ...eferencesForStringLiteralPropertyNames2.ts | 11 +- ...eferencesForStringLiteralPropertyNames3.ts | 12 +- ...eferencesForStringLiteralPropertyNames4.ts | 12 +- .../fourslash/referencesForUnionProperties.ts | 22 +++- tests/cases/fourslash/referencesInComment.ts | 2 +- tests/cases/fourslash/remoteGetReferences.ts | 42 ++++-- tests/cases/fourslash/renameDefaultImport.ts | 10 +- .../renameDefaultImportDifferentName.ts | 10 +- .../renameImportAndExportInDiffFiles.ts | 8 +- .../shims-pp/getReferencesAtPosition.ts | 12 +- .../shims/getReferencesAtPosition.ts | 12 +- tests/cases/fourslash/untypedModuleImport.ts | 6 +- 166 files changed, 1349 insertions(+), 776 deletions(-) delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport04.ts delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport05.ts delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport06.ts delete mode 100644 tests/cases/fourslash/findAllRefsForDefaultExport07.ts delete mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 721647df0cdf7..3deddf1f2ccf7 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -452,7 +452,8 @@ namespace FourSlash { } private messageAtLastKnownMarker(message: string) { - return "Marker: " + this.lastKnownMarker + "\n" + message; + const locationDescription = this.lastKnownMarker ? this.lastKnownMarker : this.getLineColStringAtPosition(this.currentCaretPosition); + return `At ${locationDescription}: ${message}`; } private assertionMessageAtLastKnownMarker(msg: string) { @@ -562,7 +563,7 @@ namespace FourSlash { } public verifyGoToDefinitionIs(endMarker: string | string[]) { - this.verifyGoToXWorker(endMarker instanceof Array ? endMarker : [endMarker], () => this.getGoToDefinition()); + this.verifyGoToXWorker(toArray(endMarker), () => this.getGoToDefinition()); } public verifyGoToDefinition(arg0: any, endMarkerNames?: string | string[]) { @@ -582,7 +583,7 @@ namespace FourSlash { if (endMarkerNames) { this.verifyGoToXPlain(arg0, endMarkerNames, getDefs); } - else if (arg0 instanceof Array) { + else if (ts.isArray(arg0)) { const pairs: [string | string[], string | string[]][] = arg0; for (const [start, end] of pairs) { this.verifyGoToXPlain(start, end, getDefs); @@ -599,13 +600,8 @@ namespace FourSlash { } private verifyGoToXPlain(startMarkerNames: string | string[], endMarkerNames: string | string[], getDefs: () => ts.DefinitionInfo[] | undefined) { - if (startMarkerNames instanceof Array) { - for (const start of startMarkerNames) { - this.verifyGoToXSingle(start, endMarkerNames, getDefs); - } - } - else { - this.verifyGoToXSingle(startMarkerNames, endMarkerNames, getDefs); + for (const start of toArray(startMarkerNames)) { + this.verifyGoToXSingle(start, endMarkerNames, getDefs); } } @@ -617,7 +613,7 @@ namespace FourSlash { private verifyGoToXSingle(startMarkerName: string, endMarkerNames: string | string[], getDefs: () => ts.DefinitionInfo[] | undefined) { this.goToMarker(startMarkerName); - this.verifyGoToXWorker(endMarkerNames instanceof Array ? endMarkerNames : [endMarkerNames], getDefs); + this.verifyGoToXWorker(toArray(endMarkerNames), getDefs); } private verifyGoToXWorker(endMarkers: string[], getDefs: () => ts.DefinitionInfo[] | undefined) { @@ -899,8 +895,74 @@ namespace FourSlash { } } - public verifyRangesWithSameTextReferenceEachOther() { - this.rangesByText().forEach(ranges => this.verifyRangesReferenceEachOther(ranges)); + public verifyReferenceGroups(startRanges: Range | Range[], parts: Array<{ definition: string, ranges: Range[] }>): void { + interface ReferenceJson { definition: string; ranges: ts.ReferenceEntry[]; } + type ReferencesJson = ReferenceJson[]; + const fullExpected = parts.map(({ definition, ranges }) => ({ definition, ranges: ranges.map(rangeToReferenceEntry) })); + + for (const startRange of toArray(startRanges)) { + this.goToRangeStart(startRange); + const fullActual = this.findReferencesAtCaret().map(({ definition, references }) => ({ + definition: definition.displayParts.map(d => d.text).join(""), + ranges: references + })); + this.assertObjectsEqual(fullActual, fullExpected); + } + + function rangeToReferenceEntry(r: Range) { + let { isWriteAccess, isDefinition } = (r.marker && r.marker.data) || { isWriteAccess: false, isDefinition: false }; + isWriteAccess = isWriteAccess || false; isDefinition = isDefinition || false; + return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition } + } + } + + public verifyNoReferences(markerNameOrRange?: string | Range) { + if (markerNameOrRange) { + if (typeof markerNameOrRange === "string") { + this.goToMarker(markerNameOrRange); + } + else { + this.goToRangeStart(markerNameOrRange); + } + } + + const refs = this.getReferencesAtCaret(); + if (refs && refs.length) { + console.log(refs); + this.raiseError("Expected getReferences to fail"); + } + } + + public verifySingleReferenceGroup(definition: string, ranges?: Range[]) { + ranges = ranges || this.getRanges(); + this.verifyReferenceGroups(ranges, [{ definition, ranges }]); + } + + private assertObjectsEqual(fullActual: T, fullExpected: T, msgPrefix = ""): void { + const recur = (actual: U, expected: U, path: string) => { + const fail = (msg: string) => { + console.log("Expected:", stringify(fullExpected)); + console.log("Actual: ", stringify(fullActual)); + this.raiseError(`${msgPrefix}At ${path}: ${msg}`); + }; + + for (const key in actual) if (ts.hasProperty(actual as any, key)) { + const ak = actual[key], ek = expected[key]; + if (typeof ak === "object" && typeof ek === "object") { + recur(ak, ek, path ? path + "." + key : key); + } + else if (ak !== ek) { + fail(`Expected '${key}' to be '${ek}', got '${ak}'`); + } + } + for (const key in expected) if (ts.hasProperty(expected as any, key)) { + if (!ts.hasProperty(actual as any, key)) { + fail(`${msgPrefix}Missing property '${key}'`); + } + } + }; + recur(fullActual, fullExpected, ""); + } public verifyDisplayPartsOfReferencedSymbol(expected: ts.SymbolDisplayPart[]) { @@ -974,7 +1036,7 @@ namespace FourSlash { public verifyQuickInfos(namesAndTexts: { [name: string]: string | [string, string] }) { for (const name in namesAndTexts) if (ts.hasProperty(namesAndTexts, name)) { const text = namesAndTexts[name]; - if (text instanceof Array) { + if (ts.isArray(text)) { assert(text.length === 2); const [expectedText, expectedDocumentation] = text; this.verifyQuickInfoAt(name, expectedText, expectedDocumentation); @@ -1411,13 +1473,6 @@ namespace FourSlash { Harness.IO.log(membersString); } - public printReferences() { - const references = this.getReferencesAtCaret(); - ts.forEach(references, entry => { - Harness.IO.log(stringify(entry)); - }); - } - public printContext() { ts.forEach(this.languageServiceAdapterHost.getFilenames(), Harness.IO.log); } @@ -3082,6 +3137,10 @@ ${code} } return ts.arrayFrom(set.keys()); } + + function toArray(x: T | T[]): T[] { + return ts.isArray(x) ? x : [x]; + } } namespace FourSlashInterface { @@ -3346,6 +3405,18 @@ namespace FourSlashInterface { this.state.verifyReferencesOf(start, references); } + public referenceGroups(startRanges: FourSlash.Range[], parts: Array<{ definition: string, ranges: FourSlash.Range[] }>) { + this.state.verifyReferenceGroups(startRanges, parts); + } + + public noReferences(markerNameOrRange?: string | FourSlash.Range) { + this.state.verifyNoReferences(markerNameOrRange); + } + + public singleReferenceGroup(definition: string, ranges?: FourSlash.Range[]) { + this.state.verifySingleReferenceGroup(definition, ranges); + } + public rangesReferenceEachOther(ranges?: FourSlash.Range[]) { this.state.verifyRangesReferenceEachOther(ranges); } @@ -3354,10 +3425,6 @@ namespace FourSlashInterface { this.state.verifyDisplayPartsOfReferencedSymbol(expected); } - public rangesWithSameTextReferenceEachOther() { - this.state.verifyRangesWithSameTextReferenceEachOther(); - } - public currentParameterHelpArgumentNameIs(name: string) { this.state.verifyCurrentParameterHelpName(name); } @@ -3660,10 +3727,6 @@ namespace FourSlashInterface { this.state.printNavigationBar(); } - public printReferences() { - this.state.printReferences(); - } - public printContext() { this.state.printContext(); } diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index 28474839cf3c9..cd1477c444898 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -5,6 +5,10 @@ namespace ts.FindAllReferences { return getReferencedSymbolsForNode(typeChecker, cancellationToken, node, sourceFiles, findInStrings, findInComments, isForRename); } + export function convertReferences(referenceSymbols: ReferencedSymbol[]): ReferenceEntry[] { + return referenceSymbols && flatMap(referenceSymbols, r => r.references); + } + export function getReferencedSymbolsForNode(typeChecker: TypeChecker, cancellationToken: CancellationToken, node: Node, sourceFiles: SourceFile[], findInStrings?: boolean, findInComments?: boolean, isForRename?: boolean, implementations?: boolean): ReferencedSymbol[] | undefined { if (!implementations) { const special = getReferencedSymbolsSpecial(node, sourceFiles, typeChecker, cancellationToken); @@ -411,7 +415,6 @@ namespace ts.FindAllReferences { textSpan: createTextSpan(0, 1), displayParts: [{ text: name, kind: ScriptElementKind.keyword }] } - const references: ReferenceEntry[] = []; for (const sourceFile of sourceFiles) { cancellationToken.throwIfCancellationRequested(); @@ -1316,20 +1319,6 @@ namespace ts.FindAllReferences { return meaning; } - export function convertReferences(referenceSymbols: ReferencedSymbol[]): ReferenceEntry[] { - if (!referenceSymbols) { - return undefined; - } - - const referenceEntries: ReferenceEntry[] = []; - - for (const referenceSymbol of referenceSymbols) { - addRange(referenceEntries, referenceSymbol.references); - } - - return referenceEntries; - } - function isImplementation(node: Node): boolean { if (!node) { return false; diff --git a/src/services/services.ts b/src/services/services.ts index b3e3093cddb71..b83995e31ed63 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1415,7 +1415,6 @@ namespace ts { function findReferences(fileName: string, position: number): ReferencedSymbol[] { const referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false, /*isForRename*/false); - // Only include referenced symbols that have a valid definition. return filter(referencedSymbols, rs => !!rs.definition); } @@ -2015,9 +2014,5 @@ namespace ts { throw new Error("getDefaultLibFilePath is only supported when consumed as a node module. "); } - function initializeServices() { - objectAllocator = getServicesObjectAllocator(); - } - - initializeServices(); + objectAllocator = getServicesObjectAllocator(); } diff --git a/tests/cases/fourslash/ambientShorthandFindAllRefs.ts b/tests/cases/fourslash/ambientShorthandFindAllRefs.ts index 2f0dbf914e770..06bc6e94782b6 100644 --- a/tests/cases/fourslash/ambientShorthandFindAllRefs.ts +++ b/tests/cases/fourslash/ambientShorthandFindAllRefs.ts @@ -4,9 +4,18 @@ ////declare module "jquery"; // @Filename: user.ts -////import {[|x|]} from "jquery"; +////import {[|{| "isWriteAccess": true, "isDefinition": true |}x|]} from "jquery"; // @Filename: user2.ts -////import {[|x|]} from "jquery"; +////import {[|{| "isWriteAccess": true, "isDefinition": true |}x|]} from "jquery"; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [ + { definition: "import x", ranges: [r0] }, + { definition: 'module "jquery"', ranges: [r1] } +]); +verify.referenceGroups(r1, [ + { definition: 'module "jquery"', ranges: [r0] }, + { definition: "import x", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts b/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts index d3d18b2dabb0d..8f80c871eb3af 100644 --- a/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts +++ b/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts @@ -7,7 +7,7 @@ //// //// } //// -//// public /**/[|start|](){ +//// public /**/[|{| "isWriteAccess": true, "isDefinition": true |}start|](){ //// return this; //// } //// @@ -23,11 +23,21 @@ ////second.[|start|](); ////second.stop(); -verify.rangesReferenceEachOther(); +checkRefs(); cancellation.setCancelled(); -verifyOperationIsCancelled(() => verify.rangesReferenceEachOther()); +verifyOperationIsCancelled(checkRefs); // verify that internal state is still correct cancellation.resetCancelled(); -verify.rangesReferenceEachOther(); +checkRefs(); + +function checkRefs() { + const ranges = test.ranges(); + const [r0, r1] = ranges; + verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]); + verify.referenceGroups(r1, [ + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] }, + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] } + ]); +} diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor.ts b/tests/cases/fourslash/findAllReferencesOfConstructor.ts index b25508a60db1f..dcdc23bdc7fb8 100644 --- a/tests/cases/fourslash/findAllReferencesOfConstructor.ts +++ b/tests/cases/fourslash/findAllReferencesOfConstructor.ts @@ -41,6 +41,6 @@ ////class d extends a.C { constructor() { [|super|](); } const ranges = test.ranges(); -for (const ctr of ranges.slice(0, 3)) { - verify.referencesOf(ctr, ranges); -} +const [r0, r1, r2] = ranges; +verify.referenceGroups([r0, r2], [{ definition: "constructor C(n: number): C (+1 overload)", ranges }]); +verify.referenceGroups(r1, [{ definition: "constructor C(): C (+1 overload)", ranges }]); diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts index 77479bad1134c..bb8b62a1462e5 100644 --- a/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts +++ b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts @@ -5,4 +5,4 @@ //// [|constructor|](){} ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("constructor C(n: number): C"); diff --git a/tests/cases/fourslash/findAllRefsForComputedProperties.ts b/tests/cases/fourslash/findAllRefsForComputedProperties.ts index 065d34c6fc5eb..72c49104dedae 100644 --- a/tests/cases/fourslash/findAllRefsForComputedProperties.ts +++ b/tests/cases/fourslash/findAllRefsForComputedProperties.ts @@ -1,16 +1,26 @@ /// - ////interface I { -//// ["[|prop1|]"]: () => void; +//// ["[|{| "isDefinition": true |}prop1|]"]: () => void; ////} //// ////class C implements I { -//// ["[|prop1|]"]: any; +//// ["[|{| "isDefinition": true |}prop1|]"]: any; ////} //// ////var x: I = { -//// ["[|prop1|]"]: function () { }, +//// ["[|{| "isDefinition": true |}prop1|]"]: function () { }, ////} -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(r0, [{ definition: '(property) I[["prop1"]]: () => void', ranges }]); +verify.referenceGroups(r1, [ + { definition: '(property) I[["prop1"]]: () => void', ranges: [r0, r2] }, + { definition: '(property) C[["prop1"]]: any', ranges: [r1] } +]); +verify.referenceGroups(r2, [ + { definition: '(property) I[["prop1"]]: () => void', ranges: [r0, r1] }, + { definition: '(property) ["prop1"]: () => void', ranges: [r2] } +]); + diff --git a/tests/cases/fourslash/findAllRefsForComputedProperties2.ts b/tests/cases/fourslash/findAllRefsForComputedProperties2.ts index 37a9bd8470e6b..4a7a17047ec79 100644 --- a/tests/cases/fourslash/findAllRefsForComputedProperties2.ts +++ b/tests/cases/fourslash/findAllRefsForComputedProperties2.ts @@ -1,15 +1,25 @@ /// ////interface I { -//// [[|42|]](): void; +//// [[|{| "isDefinition": true |}42|]](): void; ////} //// ////class C implements I { -//// [[|42|]]: any; +//// [[|{| "isDefinition": true |}42|]]: any; ////} //// ////var x: I = { -//// ["[|42|]"]: function () { } +//// ["[|{| "isDefinition": true |}42|]"]: function () { } ////} -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) I[[42]](): void", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) I[[42]](): void", ranges: [r0, r2] }, + { definition: "(property) C[[42]]: any", ranges: [r1] } +]); +verify.referenceGroups(r2, [ + { definition: "(method) I[[42]](): void", ranges: [r0, r1] }, + { definition: '(property) ["42"]: () => void', ranges: [r2] } +]); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport.ts b/tests/cases/fourslash/findAllRefsForDefaultExport.ts index a27227b907a74..c518bb8f59e78 100644 --- a/tests/cases/fourslash/findAllRefsForDefaultExport.ts +++ b/tests/cases/fourslash/findAllRefsForDefaultExport.ts @@ -1,11 +1,11 @@ /// // @Filename: a.ts -////export default function /*def*/[|f|]() {} +////export default function /*def*/[|{| "isWriteAccess": true, "isDefinition": true |}f|]() {} // @Filename: b.ts -////import [|g|] from "./a"; +////import [|{| "isWriteAccess": true, "isDefinition": true |}g|] from "./a"; /////*ref*/[|g|](); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("function f(): void"); verify.goToDefinition("ref", "def"); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport01.ts b/tests/cases/fourslash/findAllRefsForDefaultExport01.ts index 39079294a3b5d..c04550e54f311 100644 --- a/tests/cases/fourslash/findAllRefsForDefaultExport01.ts +++ b/tests/cases/fourslash/findAllRefsForDefaultExport01.ts @@ -1,10 +1,13 @@ /// -////export default class [|DefaultExportedClass|] { +////export default class [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedClass|] { ////} //// ////var x: [|DefaultExportedClass|]; //// ////var y = new [|DefaultExportedClass|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups([r0, r1], [{ definition: "class DefaultExportedClass", ranges }]); +verify.referenceGroups(r2, [{ definition: "constructor DefaultExportedClass(): DefaultExportedClass", ranges }]); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport02.ts b/tests/cases/fourslash/findAllRefsForDefaultExport02.ts index 19f31ece9b037..558bbd2de8502 100644 --- a/tests/cases/fourslash/findAllRefsForDefaultExport02.ts +++ b/tests/cases/fourslash/findAllRefsForDefaultExport02.ts @@ -1,11 +1,22 @@ /// -////export default function [|DefaultExportedFunction|]() { -//// return [|DefaultExportedFunction|] +////export default function [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedFunction|]() { +//// return [|DefaultExportedFunction|]; ////} //// ////var x: typeof [|DefaultExportedFunction|]; //// ////var y = [|DefaultExportedFunction|](); +//// +////namespace [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedFunction|] { +////} + + +const ranges = test.ranges(); +const [r0, r1, r2, r3, r4] = ranges; +const fnRanges = [r0, r1, r2, r3]; +verify.singleReferenceGroup("function DefaultExportedFunction(): () => typeof DefaultExportedFunction", fnRanges); -verify.rangesReferenceEachOther(); +// The namespace and function do not merge, +// so the namespace should be all alone. +verify.singleReferenceGroup("namespace DefaultExportedFunction", [r4]); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport03.ts b/tests/cases/fourslash/findAllRefsForDefaultExport03.ts index b9bbfa14a641c..d94043f401605 100644 --- a/tests/cases/fourslash/findAllRefsForDefaultExport03.ts +++ b/tests/cases/fourslash/findAllRefsForDefaultExport03.ts @@ -1,6 +1,6 @@ /// -////function [|f|]() { +////function [|{| "isWriteAccess": true, "isDefinition": true |}f|]() { //// return 100; ////} //// @@ -10,8 +10,11 @@ //// ////var y = [|f|](); //// -////namespace [|f|] { +////namespace [|{| "isWriteAccess": true, "isDefinition": true |}f|] { //// var local = 100; ////} -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3, r4] = ranges; +verify.referenceGroups([r0, r3], [{ definition: "function f(): number\nnamespace f", ranges }]); +verify.referenceGroups([r1, r2, r4], [{ definition: "namespace f\nfunction f(): number", ranges }]); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport04.ts b/tests/cases/fourslash/findAllRefsForDefaultExport04.ts deleted file mode 100644 index 44b7ee0a06f59..0000000000000 --- a/tests/cases/fourslash/findAllRefsForDefaultExport04.ts +++ /dev/null @@ -1,23 +0,0 @@ -/// - -////function f() { -//// return 100; -////} -//// -////export default [|f|]; -//// -////var x: typeof f; -//// -////var y = f(); -//// -////namespace /**/[|f|] { -////} - -// The function 'f' and the namespace 'f' don't get merged, -// but the 'export default' site, includes both meanings. - -// Here we are testing whether the 'export default' -// site is included in the references to the namespace. - -goTo.marker(); -verify.referencesAre(test.ranges()); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport05.ts b/tests/cases/fourslash/findAllRefsForDefaultExport05.ts deleted file mode 100644 index 0f06792458dcb..0000000000000 --- a/tests/cases/fourslash/findAllRefsForDefaultExport05.ts +++ /dev/null @@ -1,23 +0,0 @@ -/// - -////function /**/[|f|]() { -//// return 100; -////} -//// -////export default [|f|]; -//// -////var x: typeof [|f|]; -//// -////var y = [|f|](); -//// -////namespace f { -////} - -// The function 'f' and the namespace 'f' don't get merged, -// but the 'export default' site, includes both meanings. - -// Here we are testing whether the 'export default' site -// and all value-uses of 'f' are included in the references to the function. - -goTo.marker(); -verify.referencesAre(test.ranges()); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport06.ts b/tests/cases/fourslash/findAllRefsForDefaultExport06.ts deleted file mode 100644 index cdd9b4f980c06..0000000000000 --- a/tests/cases/fourslash/findAllRefsForDefaultExport06.ts +++ /dev/null @@ -1,23 +0,0 @@ -/// - -////function [|f|]() { -//// return 100; -////} -//// -////export default /**/[|f|]; -//// -////var x: typeof [|f|]; -//// -////var y = [|f|](); -//// -////namespace [|f|] { -////} - -// The function 'f' and the namespace 'f' don't get merged, -// but the 'export default' site, includes both meanings. - -// Here we are testing whether the 'export default' site -// and all value-uses of 'f' are included in the references to the function. - -goTo.marker(); -verify.referencesAre(test.ranges()); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport07.ts b/tests/cases/fourslash/findAllRefsForDefaultExport07.ts deleted file mode 100644 index 88d0a77502621..0000000000000 --- a/tests/cases/fourslash/findAllRefsForDefaultExport07.ts +++ /dev/null @@ -1,16 +0,0 @@ -/// - -////export default function DefaultExportedFunction() { -//// return DefaultExportedFunction -////} -//// -////var x: typeof DefaultExportedFunction; -//// -////var y = DefaultExportedFunction(); -//// -////namespace [|DefaultExportedFunction|] { -////} - -// The namespace and function do not merge, -// so the namespace should be all alone. -verify.rangesReferenceEachOther(); diff --git a/tests/cases/fourslash/findAllRefsForDefaultExport08.ts b/tests/cases/fourslash/findAllRefsForDefaultExport08.ts index b7ae7f4d5347d..b29060f6099b4 100644 --- a/tests/cases/fourslash/findAllRefsForDefaultExport08.ts +++ b/tests/cases/fourslash/findAllRefsForDefaultExport08.ts @@ -7,10 +7,9 @@ //// ////var y = new DefaultExportedClass; //// -////namespace [|DefaultExportedClass|] { +////namespace [|{| "isWriteAccess": true, "isDefinition": true |}DefaultExportedClass|] { ////} // The namespace and class do not merge, // so the namespace should be all alone. - -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("namespace DefaultExportedClass"); diff --git a/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts b/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts index 35d5c45e3d91e..15ff0aca5cbbd 100644 --- a/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts +++ b/tests/cases/fourslash/findAllRefsForFunctionExpression01.ts @@ -1,7 +1,7 @@ /// // @Filename: file1.ts -////var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) { +////var foo = function [|{| "isWriteAccess": true, "isDefinition": true |}foo|](a = [|foo|](), b = () => [|foo|]) { //// [|foo|]([|foo|], [|foo|]); ////} @@ -9,4 +9,4 @@ /////// ////foo(); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(local function) foo(a?: void, b?: () => (a?: void, b?: any) => void): void"); diff --git a/tests/cases/fourslash/findAllRefsForMappedType.ts b/tests/cases/fourslash/findAllRefsForMappedType.ts index 38fb3a226c6d9..a841c7e6e464f 100644 --- a/tests/cases/fourslash/findAllRefsForMappedType.ts +++ b/tests/cases/fourslash/findAllRefsForMappedType.ts @@ -1,9 +1,19 @@ /// -////interface T { [|a|]: number }; +////interface T { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number }; ////type U = { [K in keyof T]: string }; ////type V = { [K in keyof U]: boolean }; -////const u: U = { [|a|]: "" } -////const v: V = { [|a|]: true } +////const u: U = { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: "" } +////const v: V = { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: true } -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(r0, [{ definition: "(property) T.a: number", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(property) T.a: number", ranges: [r0, r2] }, + { definition: "(property) a: string", ranges: [r1] } +]); +verify.referenceGroups(r2, [ + { definition: "(property) T.a: number", ranges: [r0, r1] }, + { definition: "(property) a: boolean", ranges: [r2] } +]); diff --git a/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts b/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts index cea4db81ea189..125a11f19c421 100644 --- a/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts +++ b/tests/cases/fourslash/findAllRefsForObjectLiteralProperties.ts @@ -1,11 +1,17 @@ /// ////var x = { -//// [|property|]: {} +//// [|{| "isWriteAccess": true, "isDefinition": true |}property|]: {} ////}; //// ////x.[|property|]; //// ////let {[|property|]: pVar} = x; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(r0, [{ definition: "(property) property: {}", ranges }]); +verify.referenceGroups([r1, r2], [ + { definition: "(property) property: {}", ranges: [r0] }, + { definition: "(property) property: {}", ranges: [r1, r2] } +]); diff --git a/tests/cases/fourslash/findAllRefsForObjectSpread.ts b/tests/cases/fourslash/findAllRefsForObjectSpread.ts index 05c83491f6651..a65f18ef57c16 100644 --- a/tests/cases/fourslash/findAllRefsForObjectSpread.ts +++ b/tests/cases/fourslash/findAllRefsForObjectSpread.ts @@ -1,14 +1,21 @@ /// -////interface A1 { [|a|]: string }; -////interface A2 { [|a|]?: number }; +////interface A1 { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string }; +////interface A2 { [|{| "isWriteAccess": true, "isDefinition": true |}a|]?: number }; ////let a1: A1; ////let a2: A2; ////let a12 = { ...a1, ...a2 }; ////a12.[|a|]; const ranges = test.ranges(); +const [r0, r1, r2] = ranges; + // members of spread types only refer to themselves and the resulting property -verify.referencesOf(ranges[0], [ranges[0], ranges[2]]); -verify.referencesOf(ranges[1], [ranges[1], ranges[2]]); +verify.referenceGroups(r0, [{ definition: "(property) A1.a: string", ranges: [r0, r2] }]); +verify.referenceGroups(r1, [{ definition: "(property) A2.a: number", ranges: [r1, r2] }]); + // but the resulting property refers to everything -verify.referencesOf(ranges[2], ranges); +verify.referenceGroups(r2, [ + { definition: "(property) A1.a: string", ranges: [r0] }, + { definition: "(property) A2.a: number", ranges: [r1] }, + { definition: "(property) a: string | number", ranges: [r2] } +]); diff --git a/tests/cases/fourslash/findAllRefsForRest.ts b/tests/cases/fourslash/findAllRefsForRest.ts index 65d6a3c60e306..026451d68b818 100644 --- a/tests/cases/fourslash/findAllRefsForRest.ts +++ b/tests/cases/fourslash/findAllRefsForRest.ts @@ -1,11 +1,11 @@ /// ////interface Gen { //// x: number -//// [|parent|]: Gen; +//// [|{| "isWriteAccess": true, "isDefinition": true |}parent|]: Gen; //// millenial: string; ////} ////let t: Gen; ////var { x, ...rest } = t; ////rest.[|parent|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) Gen.parent: Gen"); diff --git a/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts b/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts index 45e981d8a84ef..e450102c12754 100644 --- a/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts +++ b/tests/cases/fourslash/findAllRefsForStringLiteralTypes.ts @@ -3,4 +3,4 @@ ////type Options = "[|option 1|]" | "option 2"; ////let myOption: Options = "[|option 1|]"; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup('"option 1"'); diff --git a/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts b/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts index 4177e154532b8..99ca347eac4bb 100644 --- a/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts +++ b/tests/cases/fourslash/findAllRefsForUMDModuleAlias1.ts @@ -4,10 +4,10 @@ //// export function doThing(): string; //// export function doTheOtherThing(): void; -//// export as namespace [|myLib|]; +//// export as namespace [|{| "isWriteAccess": true, "isDefinition": true |}myLib|]; // @Filename: 1.ts //// /// //// [|myLib|].doThing(); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("export namespace myLib"); diff --git a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts index dd8fb1026c43b..d40cb009f1e38 100644 --- a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts +++ b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts @@ -1,6 +1,6 @@ /// -////var [|Base|] = class { }; +////var [|{| "isWriteAccess": true, "isDefinition": true |}Base|] = class { }; ////class C extends [|Base|] { } -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var Base: typeof (Anonymous class)"); diff --git a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts index 3fc41358dfdd2..5685df0c4e1dc 100644 --- a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts +++ b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts @@ -1,9 +1,9 @@ /// -////interface [|Base|] { } +////interface [|{| "isWriteAccess": true, "isDefinition": true |}Base|] { } ////namespace n { //// var Base = class { }; //// interface I extends [|Base|] { } ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("interface Base"); diff --git a/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts b/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts index f8326eade5825..419b828d0b3bb 100644 --- a/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts +++ b/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts @@ -3,5 +3,4 @@ ////var Base = class { }; ////class C extends Base implements /**/Base { } -goTo.marker(); -verify.referencesAre([]); +verify.noReferences(""); diff --git a/tests/cases/fourslash/findAllRefsInClassExpression.ts b/tests/cases/fourslash/findAllRefsInClassExpression.ts index f874bcbcb5cd4..b83d8992b4fdc 100644 --- a/tests/cases/fourslash/findAllRefsInClassExpression.ts +++ b/tests/cases/fourslash/findAllRefsInClassExpression.ts @@ -1,8 +1,14 @@ /// -////interface I { [|boom|](): void; } +////interface I { [|{| "isWriteAccess": true, "isDefinition": true |}boom|](): void; } ////new class C implements I { -//// [|boom|](){} +//// [|{| "isWriteAccess": true, "isDefinition": true |}boom|](){} ////} -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) I.boom(): void", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) I.boom(): void", ranges: [r0] }, + { definition: "(method) C.boom(): void", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties1.ts b/tests/cases/fourslash/findAllRefsInheritedProperties1.ts index 358ba3f249d47..41acc117f9e66 100644 --- a/tests/cases/fourslash/findAllRefsInheritedProperties1.ts +++ b/tests/cases/fourslash/findAllRefsInheritedProperties1.ts @@ -1,8 +1,8 @@ /// //// class class1 extends class1 { -//// [|doStuff|]() { } -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// //// var v: class1; @@ -10,7 +10,9 @@ //// v.[|propName|]; const [r0, r1, r2, r3] = test.ranges(); -verify.referencesOf(r0, [r0, r2]); -verify.referencesOf(r1, [r1, r3]); -verify.referencesOf(r2, [r0, r2]); -verify.referencesOf(r3, [r1, r3]); +verify.referenceGroups(r0, [{ definition: "(method) class1.doStuff(): void", ranges: [r0, r2] }]); +verify.referenceGroups(r2, [ + { definition: "(method) class1.doStuff(): void", ranges: [r0] }, + { definition: "(method) class1.doStuff(): void", ranges: [r2] } +]); +verify.singleReferenceGroup("(property) class1.propName: string", [r1, r3]); diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties2.ts b/tests/cases/fourslash/findAllRefsInheritedProperties2.ts index 9fe36fbb48e67..23badd64d484e 100644 --- a/tests/cases/fourslash/findAllRefsInheritedProperties2.ts +++ b/tests/cases/fourslash/findAllRefsInheritedProperties2.ts @@ -1,8 +1,8 @@ /// //// interface interface1 extends interface1 { -//// [|doStuff|](): void; // r0 -//// [|propName|]: string; // r1 +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; // r0 +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; // r1 //// } //// //// var v: interface1; @@ -10,7 +10,5 @@ //// v.[|propName|]; // r3 const [r0, r1, r2, r3] = test.ranges(); -verify.referencesOf(r0, [r0, r2]); -verify.referencesOf(r1, [r1, r3]); -verify.referencesOf(r2, [r0, r2]); -verify.referencesOf(r3, [r1, r3]); +verify.singleReferenceGroup("(method) interface1.doStuff(): void", [r0, r2]); +verify.singleReferenceGroup("(property) interface1.propName: string", [r1, r3]); diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties3.ts b/tests/cases/fourslash/findAllRefsInheritedProperties3.ts index 772fb78a2e885..cc82e4a4e448e 100644 --- a/tests/cases/fourslash/findAllRefsInheritedProperties3.ts +++ b/tests/cases/fourslash/findAllRefsInheritedProperties3.ts @@ -1,28 +1,40 @@ /// //// class class1 extends class1 { -//// [|doStuff|]() { } // r0 -//// [|propName|]: string; // r1 +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } // r0 +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; // r1 //// } //// interface interface1 extends interface1 { -//// [|doStuff|](): void; // r2 -//// [|propName|]: string; // r3 +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; // r2 +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; // r3 //// } //// class class2 extends class1 implements interface1 { -//// [|doStuff|]() { } // r4 -//// [|propName|]: string; // r5 +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } // r4 +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; // r5 //// } -//// +//// //// var v: class2; -//// v.[|propName|]; // r6 -//// v.[|doStuff|](); // r7 +//// v.[|doStuff|](); // r6 +//// v.[|propName|]; // r7 const [r0, r1, r2, r3, r4, r5, r6, r7] = test.ranges(); -verify.referencesOf(r0, [r0, r4, r7]); -verify.referencesOf(r1, [r1, r5, r6]); -verify.referencesOf(r2, [r2, r4, r7]); -verify.referencesOf(r3, [r3, r5, r6]); -verify.referencesOf(r4, [r0, r2, r4, r7]); -verify.referencesOf(r5, [r1, r3, r5, r6]); -verify.referencesOf(r6, [r1, r3, r5, r6]); -verify.referencesOf(r7, [r0, r2, r4, r7]); +verify.referenceGroups(r0, [{ definition: "(method) class1.doStuff(): void", ranges: [r0, r4, r6] }]); +verify.referenceGroups(r1, [{ definition: "(property) class1.propName: string", ranges: [r1, r5, r7] }]); +verify.referenceGroups(r2, [{ definition: "(method) interface1.doStuff(): void", ranges: [r2, r4, r6] }]); +verify.referenceGroups(r3, [{ definition: "(property) interface1.propName: string", ranges: [r3, r5, r7] }]); +verify.referenceGroups(r4, [ + { definition: "(method) class1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface1.doStuff(): void", ranges: [r2] }, + { definition: "(method) class2.doStuff(): void", ranges: [r4, r6] } +]); +verify.referenceGroups([r5, r7], [ + { definition: "(property) class1.propName: string", ranges: [r1] }, + { definition: "(property) interface1.propName: string", ranges: [r3] }, + { definition: "(property) class2.propName: string", ranges: [r5, r7] } +]); +verify.referenceGroups(r6, [ + { definition: "(method) class1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface1.doStuff(): void", ranges: [r2] }, + { definition: "(method) class2.doStuff(): void", ranges: [r4] }, + { definition: "(method) class2.doStuff(): void", ranges: [r6] } +]); diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties4.ts b/tests/cases/fourslash/findAllRefsInheritedProperties4.ts index 1ecb85bfae1aa..e2d8887bbe86c 100644 --- a/tests/cases/fourslash/findAllRefsInheritedProperties4.ts +++ b/tests/cases/fourslash/findAllRefsInheritedProperties4.ts @@ -1,12 +1,12 @@ /// //// interface C extends D { -//// [|prop0|]: string; // r0 -//// [|prop1|]: number; // r1 +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string; // r0 +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: number; // r1 //// } //// //// interface D extends C { -//// [|prop0|]: string; // r2 +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string; // r2 //// } //// //// var d: D; @@ -14,8 +14,9 @@ //// d.[|prop1|]; // r4 const [r0, r1, r2, r3, r4] = test.ranges(); -verify.referencesOf(r0, [r0, r2, r3]); -verify.referencesOf(r1, [r1]); -verify.referencesOf(r2, [r0, r2, r3]); -verify.referencesOf(r3, [r0, r2, r3]); -verify.referencesOf(r4, []); +verify.referenceGroups([r0, r2, r3], [ + { definition: "(property) C.prop0: string", ranges: [r0] }, + { definition: "(property) D.prop0: string", ranges: [r2, r3] } +]); +verify.singleReferenceGroup("(property) C.prop1: number", [r1]); +verify.noReferences(r4); diff --git a/tests/cases/fourslash/findAllRefsInheritedProperties5.ts b/tests/cases/fourslash/findAllRefsInheritedProperties5.ts index 6d6dbb392bf76..c534a9d6aab84 100644 --- a/tests/cases/fourslash/findAllRefsInheritedProperties5.ts +++ b/tests/cases/fourslash/findAllRefsInheritedProperties5.ts @@ -1,12 +1,12 @@ /// //// class C extends D { -//// [|prop0|]: string; // r0 -//// [|prop1|]: number; // r1 +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string; // r0 +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: number; // r1 //// } //// //// class D extends C { -//// [|prop0|]: string; // r2 +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop0|]: string; // r2 //// } //// //// var d: D; @@ -14,8 +14,7 @@ //// d.[|prop1|]; // r4 const [r0, r1, r2, r3, r4] = test.ranges(); -verify.referencesOf(r0, [r0]); -verify.referencesOf(r1, [r1]); -verify.referencesOf(r2, [r2, r3]); -verify.referencesOf(r3, [r2, r3]); -verify.referencesOf(r4, []); +verify.singleReferenceGroup("(property) C.prop0: string", [r0]); +verify.singleReferenceGroup("(property) C.prop1: number", [r1]); +verify.singleReferenceGroup("(property) D.prop0: string", [r2, r3]); +verify.noReferences(r4); diff --git a/tests/cases/fourslash/findAllRefsInsideTemplates1.ts b/tests/cases/fourslash/findAllRefsInsideTemplates1.ts index 9ab4c6242300b..8d41961c6fda1 100644 --- a/tests/cases/fourslash/findAllRefsInsideTemplates1.ts +++ b/tests/cases/fourslash/findAllRefsInsideTemplates1.ts @@ -1,6 +1,6 @@ /// -////var [|x|] = 10; +////var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 10; ////var y = `${ [|x|] } ${ [|x|] }` -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var x: number"); diff --git a/tests/cases/fourslash/findAllRefsInsideTemplates2.ts b/tests/cases/fourslash/findAllRefsInsideTemplates2.ts index 63265eb944b1f..24a4a7c131b42 100644 --- a/tests/cases/fourslash/findAllRefsInsideTemplates2.ts +++ b/tests/cases/fourslash/findAllRefsInsideTemplates2.ts @@ -1,6 +1,6 @@ /// -////function [|f|](...rest: any[]) { } +////function [|{| "isWriteAccess": true, "isDefinition": true |}f|](...rest: any[]) { } ////[|f|] `${ [|f|] } ${ [|f|] }` -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("function f(...rest: any[]): void"); diff --git a/tests/cases/fourslash/findAllRefsInsideWithBlock.ts b/tests/cases/fourslash/findAllRefsInsideWithBlock.ts index c95925ff86331..5293624809588 100644 --- a/tests/cases/fourslash/findAllRefsInsideWithBlock.ts +++ b/tests/cases/fourslash/findAllRefsInsideWithBlock.ts @@ -1,12 +1,12 @@ /// -////var [|x|] = 0; +////var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 0; //// ////with ({}) { //// var y = x; // Reference of x here should not be picked //// /*2*/y++; // also reference for y should be ignored ////} //// -////[|x|] = [|x|] + 1; +////[|{| "isWriteAccess": true |}x|] = [|x|] + 1; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var x: number"); diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts index 895b2168b238f..d11bcee506f43 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts @@ -1,11 +1,11 @@ /// ////interface I { -//// [|property1|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number; //// property2: string; ////} //// ////var foo: I; ////var { [|property1|]: prop1 } = foo; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) I.property1: number"); diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts index 67a31f33d1eab..6ad98df9cd8e9 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts @@ -1,11 +1,11 @@ /// ////interface I { -//// [|property1|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number; //// property2: string; ////} //// ////var foo: I; ////var { [|property1|]: {} } = foo; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) I.property1: number"); diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts index 40ecf0139a72d..520dbc8e1e4f0 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts @@ -1,11 +1,17 @@ /// ////interface I { -//// [|property1|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number; //// property2: string; ////} //// ////var foo: I; -////var [{ [|property1|]: prop1 }, { [|property1|], property2 } ] = [foo, foo]; +////var [{ [|property1|]: prop1 }, { [|{| "isWriteAccess": true, "isDefinition": true |}property1|], property2 } ] = [foo, foo]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups([r0, r1], [{ definition: "(property) I.property1: number", ranges }]); +verify.referenceGroups(r2, [ + { definition: "(property) I.property1: number", ranges: [r0, r1] }, + { definition: "var property1: number", ranges: [r2] } +]); diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts index 5696d242feda6..f25fff9da2318 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts @@ -1,15 +1,22 @@ /// ////interface I { -//// [|property1|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number; //// property2: string; ////} //// ////function f({ [|property1|]: p1 }: I, -//// { [|property1|] }: I, +//// { [|{| "isWriteAccess": true, "isDefinition": true |}property1|] }: I, //// { property1: p2 }) { //// //// return [|property1|] + 1; ////} -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups([r0, r1], [{ definition: "(property) I.property1: number", ranges }]); +verify.referenceGroups([r2, r3], [ + { definition: "(property) I.property1: number", ranges: [r0, r1] }, + { definition: "var property1: number", ranges: [r2, r3] } +]); + diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts index e33c73ff83808..f4e7bd70f7aae 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts @@ -10,4 +10,4 @@ ////} goTo.marker(); -verify.referencesAre([]); \ No newline at end of file +verify.noReferences(""); \ No newline at end of file diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts index 8be45ac87e61c..c589dccacbc47 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts @@ -1,22 +1,29 @@ /// ////interface I { -//// [|property1|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}property1|]: number; //// property2: string; ////} //// ////var elems: I[]; ////for (let { [|property1|]: p } of elems) { ////} -////for (let { [|property1|] } of elems) { +////for (let { [|{| "isWriteAccess": true, "isDefinition": true |}property1|] } of elems) { ////} ////for (var { [|property1|]: p1 } of elems) { ////} ////var p2; -////for ({ [|property1|] : p2 } of elems) { +////for ({ [|{| "isWriteAccess": true, "isDefinition": true |}property1|] : p2 } of elems) { ////} -// Note: if this test ever changes, consider updating -// 'quickInfoForObjectBindingElementPropertyName05.ts' - -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3, r4] = ranges; +verify.referenceGroups([r0, r1, r3], [{ definition: "(property) I.property1: number", ranges }]); +verify.referenceGroups(r2, [ + { definition: "(property) I.property1: number", ranges: [r0, r1, r3, r4] }, + { definition: "let property1: number", ranges: [r2] } +]); +verify.referenceGroups(r4, [ + { definition: "(property) I.property1: number", ranges: [r0, r1, r2, r3] }, + { definition: "(property) property1: I", ranges: [r4] } +]); diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts index 96f414dc06036..f9415ab6a81ed 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts @@ -2,6 +2,12 @@ ////let p, b; //// -////p, [{ [|a|]: p, b }] = [{ [|a|]: 10, b: true }]; +////p, [{ [|{| "isWriteAccess": true, "isDefinition": true |}a|]: p, b }] = [{ [|{| "isWriteAccess": true, "isDefinition": true |}a|]: 10, b: true }]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(property) a: any", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(property) a: any", ranges: [r0] }, + { definition: "(property) a: number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts deleted file mode 100644 index 5696d242feda6..0000000000000 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts +++ /dev/null @@ -1,15 +0,0 @@ -/// - -////interface I { -//// [|property1|]: number; -//// property2: string; -////} -//// -////function f({ [|property1|]: p1 }: I, -//// { [|property1|] }: I, -//// { property1: p2 }) { -//// -//// return [|property1|] + 1; -////} - -verify.rangesReferenceEachOther(); diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts index 6ffa4b03b685f..1c79d326dbcf3 100644 --- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts +++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts @@ -1,11 +1,11 @@ /// ////interface Recursive { -//// [|next|]?: Recursive; +//// [|{| "isWriteAccess": true, "isDefinition": true |}next|]?: Recursive; //// value: any; ////} //// ////function f ({ [|next|]: { [|next|]: x} }: Recursive) { ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) Recursive.next: Recursive"); diff --git a/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts b/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts index 0954945a546bf..061903e703dc1 100644 --- a/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts +++ b/tests/cases/fourslash/findAllRefsOfConstructor_withModifier.ts @@ -6,5 +6,4 @@ ////var x = new [|X|](); const ranges = test.ranges(); -const ctr = ranges[0]; -verify.referencesOf(ctr, ranges); +verify.referenceGroups(ranges[0], [{ definition: "constructor X(): X", ranges }]); diff --git a/tests/cases/fourslash/findAllRefsOnDecorators.ts b/tests/cases/fourslash/findAllRefsOnDecorators.ts index b58e15b9571dd..95bf1072014d1 100644 --- a/tests/cases/fourslash/findAllRefsOnDecorators.ts +++ b/tests/cases/fourslash/findAllRefsOnDecorators.ts @@ -1,7 +1,7 @@ /// // @Filename: a.ts -////function [|decorator|](target) { +////function [|{| "isWriteAccess": true, "isDefinition": true |}decorator|](target) { //// return target; ////} ////[|decorator|](); @@ -13,4 +13,4 @@ //// method() {} ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("function decorator(target: any): any"); diff --git a/tests/cases/fourslash/findAllRefsOnDefinition.ts b/tests/cases/fourslash/findAllRefsOnDefinition.ts index cb829807602e4..7d136efc42adc 100644 --- a/tests/cases/fourslash/findAllRefsOnDefinition.ts +++ b/tests/cases/fourslash/findAllRefsOnDefinition.ts @@ -7,7 +7,7 @@ //// //// } //// -//// public [|start|](){ +//// public [|{| "isWriteAccess": true, "isDefinition": true |}start|](){ //// return this; //// } //// @@ -23,4 +23,10 @@ ////second.[|start|](); ////second.stop(); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] }, + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] }, +]); diff --git a/tests/cases/fourslash/findAllRefsOnDefinition2.ts b/tests/cases/fourslash/findAllRefsOnDefinition2.ts index 8edfd7f8cd7b1..6d2438a124c91 100644 --- a/tests/cases/fourslash/findAllRefsOnDefinition2.ts +++ b/tests/cases/fourslash/findAllRefsOnDefinition2.ts @@ -3,7 +3,7 @@ //@Filename: findAllRefsOnDefinition2-import.ts ////export module Test{ //// -//// export interface [|start|] { } +//// export interface [|{| "isWriteAccess": true, "isDefinition": true |}start|] { } //// //// export interface stop { } ////} @@ -14,4 +14,8 @@ ////var start: Second.Test.[|start|]; ////var stop: Second.Test.stop; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "interface Test.start", ranges }]); +verify.referenceGroups(r1, [{ definition: "interface Second.Test.start", ranges }]); + diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases.ts b/tests/cases/fourslash/findAllRefsOnImportAliases.ts index cd258e80316fc..7574e11625f5a 100644 --- a/tests/cases/fourslash/findAllRefsOnImportAliases.ts +++ b/tests/cases/fourslash/findAllRefsOnImportAliases.ts @@ -1,15 +1,18 @@ /// //@Filename: a.ts -////export class [|Class|] { +////export class [|{| "isWriteAccess": true, "isDefinition": true |}Class|] { ////} //@Filename: b.ts -////import { [|Class|] } from "./a"; +////import { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] } from "./a"; //// ////var c = new [|Class|](); //@Filename: c.ts -////export { [|Class|] } from "./a"; +////export { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] } from "./a"; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups([r0, r1, r3], [{ definition: "class Class", ranges }]); +verify.referenceGroups(r2, [{ definition: "constructor Class(): Class", ranges }]); diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts index 67c4d14b5d9db..a21d2da4c0396 100644 --- a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts +++ b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts @@ -1,15 +1,23 @@ /// //@Filename: a.ts -////export class [|Class|] { +////export class [|{| "isWriteAccess": true, "isDefinition": true |}Class|] { ////} //@Filename: b.ts -////import { [|Class|] as [|C2|] } from "./a"; +////import { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C2|] } from "./a"; //// ////var c = new [|C2|](); //@Filename: c.ts -////export { [|Class|] as [|C3|] } from "./a"; +////export { [|{| "isWriteAccess": true, "isDefinition": true |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C3|] } from "./a"; -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +verify.singleReferenceGroup("class Class", ranges.get("Class")); + +const c2s = ranges.get("C2"); +const [c2_0, c2_1] = c2s; +verify.referenceGroups(c2_0, [{ definition: "import C2", ranges: c2s }]); +verify.referenceGroups(c2_1, [{ definition: "(alias) new C2(): C2\nimport C2", ranges: c2s }]); + +verify.singleReferenceGroup("import C3", ranges.get("C3")); diff --git a/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts b/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts index 3b8b5084a6bc8..df33f2888e6c1 100644 --- a/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts +++ b/tests/cases/fourslash/findAllRefsOnPrivateParameterProperty1.ts @@ -1,7 +1,7 @@ /// ////class ABCD { -//// constructor(private x: number, public y: number, private [|z|]: number) { +//// constructor(private x: number, public y: number, private [|{| "isWriteAccess": true, "isDefinition": true |}z|]: number) { //// } //// //// func() { @@ -9,4 +9,4 @@ //// } ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) ABCD.z: number"); diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts index 8f30e3cc8530c..fa1254118a1d2 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration1.ts @@ -1,10 +1,15 @@ /// //// class Foo { -//// constructor(private [|privateParam|]: number) { +//// constructor(private [|{| "isWriteAccess": true, "isDefinition": true |}privateParam|]: number) { //// let localPrivate = [|privateParam|]; //// this.[|privateParam|] += 10; //// } //// } -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(ranges, [ + { definition: "(property) Foo.privateParam: number", ranges: [r0, r2] }, + { definition: "(parameter) privateParam: number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts index d9656e8b5cf1f..45d814f909eda 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration2.ts @@ -1,10 +1,15 @@ /// //// class Foo { -//// constructor(public [|publicParam|]: number) { +//// constructor(public [|{| "isWriteAccess": true, "isDefinition": true |}publicParam|]: number) { //// let localPublic = [|publicParam|]; //// this.[|publicParam|] += 10; //// } //// } -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(ranges, [ + { definition: "(property) Foo.publicParam: number", ranges: [r0, r2] }, + { definition: "(parameter) publicParam: number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts index dc48ffedb211c..3520fecb8ad9b 100644 --- a/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts +++ b/tests/cases/fourslash/findAllRefsParameterPropertyDeclaration3.ts @@ -1,10 +1,15 @@ /// //// class Foo { -//// constructor(protected [|protectedParam|]: number) { +//// constructor(protected [|{| "isWriteAccess": true, "isDefinition": true |}protectedParam|]: number) { //// let localProtected = [|protectedParam|]; //// this.[|protectedParam|] += 10; //// } //// } -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(ranges, [ + { definition: "(property) Foo.protectedParam: number", ranges: [r0, r2] }, + { definition: "(parameter) protectedParam: number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsPrimitive.ts b/tests/cases/fourslash/findAllRefsPrimitive.ts index 51c463843e196..bf704c6ae71c9 100644 --- a/tests/cases/fourslash/findAllRefsPrimitive.ts +++ b/tests/cases/fourslash/findAllRefsPrimitive.ts @@ -24,7 +24,7 @@ // @Filename: b.ts // const z: [|any|] = 0; -verify.rangesWithSameTextReferenceEachOther(); +test.rangesByText().forEach((ranges, text) => verify.singleReferenceGroup(text, ranges)); verify.rangesWithSameTextAreDocumentHighlights(); goTo.rangeStart(test.ranges()[0]); diff --git a/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts index f5b0143ac4b2e..dec6575ebc4dd 100644 --- a/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts +++ b/tests/cases/fourslash/findAllRefsPropertyContextuallyTypedByTypeParam01.ts @@ -1,12 +1,12 @@ /// ////interface IFoo { -//// [|a|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string; ////} ////class C { //// method() { //// var x: T = { -//// [|a|]: "" +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]: "" //// }; //// x.[|a|]; //// } @@ -14,7 +14,17 @@ //// //// ////var x: IFoo = { -//// [|a|]: "ss" +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]: "ss" ////}; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups([r0, r2], [{ definition: "(property) IFoo.a: string", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(property) IFoo.a: string", ranges: [r0, r2, r3] }, + { definition: "(property) a: string", ranges: [r1] } +]); +verify.referenceGroups(r3, [ + { definition: "(property) IFoo.a: string", ranges: [r0, r1, r2] }, + { definition: "(property) a: string", ranges: [r3] } +]); diff --git a/tests/cases/fourslash/findAllRefsThisKeyword.ts b/tests/cases/fourslash/findAllRefsThisKeyword.ts index f08a70ccf6553..6f5374f902a69 100644 --- a/tests/cases/fourslash/findAllRefsThisKeyword.ts +++ b/tests/cases/fourslash/findAllRefsThisKeyword.ts @@ -2,9 +2,9 @@ // @noLib: true ////[|this|]; -////function f([|this|]) { +////function f([|{| "isWriteAccess": true, "isDefinition": true |}this|]) { //// return [|this|]; -//// function g([|this|]) { return [|this|]; } +//// function g([|{| "isWriteAccess": true, "isDefinition": true |}this|]) { return [|this|]; } ////} ////class C { //// static x() { @@ -21,13 +21,19 @@ //// } ////} ////// These are *not* real uses of the 'this' keyword, they are identifiers. -////const x = { [|this|]: 0 } +////const x = { [|{| "isWriteAccess": true, "isDefinition": true |}this|]: 0 } ////x.[|this|]; const [global, f0, f1, g0, g1, x, y, constructor, method, propDef, propUse] = test.ranges(); verify.referencesOf(global, [global]); -verify.rangesReferenceEachOther([f0, f1]); -verify.rangesReferenceEachOther([g0, g1]); -verify.rangesReferenceEachOther([x, y]); -verify.rangesReferenceEachOther([constructor, method]); -verify.rangesReferenceEachOther([propDef, propUse]); +verify.referenceGroups(f0, [{ definition: "(parameter) this: any", ranges: [f0, f1] }]); +verify.referenceGroups(f1, [{ definition: "this: any", ranges: [f0, f1] }]); +verify.referenceGroups(g0, [{ definition: "(parameter) this: any", ranges: [g0, g1] }]); +verify.referenceGroups(g1, [{ definition: "this: any", ranges: [g0, g1] }]); +verify.singleReferenceGroup("this: typeof C", [x, y]); +verify.singleReferenceGroup("this: this", [constructor, method]); +verify.referenceGroups(propDef, [{ definition: "(property) this: number", ranges: [propDef, propUse] }]); +verify.referenceGroups(propUse, [ + { definition: "(property) this: number", ranges: [propDef] }, + { definition: "(property) this: number", ranges: [propUse] }, +]); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts index 7cc47ee34eaf9..d2baf7c96b3b5 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames1.ts @@ -1,10 +1,16 @@ /// ////class Foo { -//// public [|_bar|]() { return 0; } +//// public [|{| "isWriteAccess": true, "isDefinition": true |}_bar|]() { return 0; } ////} //// ////var x: Foo; ////x.[|_bar|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) Foo._bar(): number", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) Foo._bar(): number", ranges: [r0] }, + { definition: "(method) Foo._bar(): number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts index d1449016b5969..3f5cd9ddbed85 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames2.ts @@ -1,10 +1,16 @@ /// ////class Foo { -//// public [|__bar|]() { return 0; } +//// public [|{| "isWriteAccess": true, "isDefinition": true |}__bar|]() { return 0; } ////} //// ////var x: Foo; ////x.[|__bar|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) Foo.__bar(): number", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) Foo.__bar(): number", ranges: [r0] }, + { definition: "(method) Foo.__bar(): number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts index e0d6f7f3456ae..e1870065325cc 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames3.ts @@ -1,10 +1,16 @@ /// ////class Foo { -//// public [|___bar|]() { return 0; } +//// public [|{| "isWriteAccess": true, "isDefinition": true |}___bar|]() { return 0; } ////} //// ////var x: Foo; ////x.[|___bar|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) Foo.___bar(): number", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) Foo.___bar(): number", ranges: [r0] }, + { definition: "(method) Foo.___bar(): number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts index 5a8de54db4dec..74eef0ae98950 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames4.ts @@ -1,10 +1,16 @@ /// ////class Foo { -//// public [|____bar|]() { return 0; } +//// public [|{| "isWriteAccess": true, "isDefinition": true |}____bar|]() { return 0; } ////} //// ////var x: Foo; ////x.[|____bar|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) Foo.____bar(): number", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) Foo.____bar(): number", ranges: [r0] }, + { definition: "(method) Foo.____bar(): number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts index 4ab28f164fec1..d54b48bf66254 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames5.ts @@ -3,7 +3,7 @@ ////class Foo { //// public _bar; //// public __bar; -//// public [|___bar|]; +//// public [|{| "isWriteAccess": true, "isDefinition": true |}___bar|]; //// public ____bar; ////} //// @@ -13,4 +13,4 @@ ////x.[|___bar|]; ////x.____bar; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) Foo.___bar: any"); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts index 191b0bdbc147d..39bc1d73ca3b2 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames6.ts @@ -2,7 +2,7 @@ ////class Foo { //// public _bar; -//// public [|__bar|]; +//// public [|{| "isWriteAccess": true, "isDefinition": true |}__bar|]; //// public ___bar; //// public ____bar; ////} @@ -13,4 +13,4 @@ ////x.___bar; ////x.____bar; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) Foo.__bar: any"); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts index f3578193096e1..dac42f4fc7c1a 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames7.ts @@ -1,7 +1,7 @@ /// -////function [|__foo|]() { +////function [|{| "isWriteAccess": true, "isDefinition": true |}__foo|]() { //// [|__foo|](); ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("function __foo(): void"); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts index 15c66f4e7c677..8c92275e27fc7 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames8.ts @@ -1,7 +1,7 @@ /// -////(function [|__foo|]() { +////(function [|{| "isWriteAccess": true, "isDefinition": true |}__foo|]() { //// [|__foo|](); ////}) -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(local function) __foo(): void"); diff --git a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts index cc33b618c41c3..bc5799e61cff0 100644 --- a/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts +++ b/tests/cases/fourslash/findAllRefsWithLeadingUnderscoreNames9.ts @@ -1,7 +1,7 @@ /// -////(function [|___foo|]() { +////(function [|{| "isWriteAccess": true, "isDefinition": true |}___foo|]() { //// [|___foo|](); ////}) -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(local function) ___foo(): void"); diff --git a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts index 0dc050602c5a8..544a3238e3bdf 100644 --- a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts +++ b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment.ts @@ -1,14 +1,19 @@ /// -//// var [|name|] = "Foo"; +//// var [|{| "isWriteAccess": true, "isDefinition": true |}name|] = "Foo"; //// -//// var obj = { [|name|] }; -//// var obj1 = { [|name|]:[|name|] }; +//// var obj = { [|{| "isWriteAccess": true, "isDefinition": true |}name|] }; +//// var obj1 = { [|{| "isWriteAccess": true, "isDefinition": true |}name|]:[|name|] }; //// obj.[|name|]; const [r0, r1, r2, r3, r4] = test.ranges(); -verify.referencesOf(r0, [r0, r1, r3]); -verify.referencesOf(r1, [r0, r1, r3, r4]); -verify.referencesOf(r2, [r2]); -verify.referencesOf(r3, [r0, r1, r3]); -verify.referencesOf(r4, [r1, r4]); +verify.referenceGroups([r0, r3], [{ definition: "var name: string", ranges: [r0, r1, r3] }]); +verify.referenceGroups(r1, [ + { definition: "var name: string", ranges: [r0, r3] }, + { definition: "(property) name: string", ranges: [r1, r4] } +]); +verify.singleReferenceGroup("(property) name: string", [r2]); +verify.referenceGroups(r4, [ + { definition: "(property) name: string", ranges: [r1] }, + { definition: "(property) name: string", ranges: [r4] }, +]); diff --git a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts index 59ba87fabb634..d4f758696fe76 100644 --- a/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts +++ b/tests/cases/fourslash/findAllRefsWithShorthandPropertyAssignment2.ts @@ -1,16 +1,22 @@ /// -//// var [|dx|] = "Foo"; +//// var [|{| "isWriteAccess": true, "isDefinition": true |}dx|] = "Foo"; //// -//// module M { export var [|dx|]; } +//// module M { export var [|{| "isWriteAccess": true, "isDefinition": true |}dx|]; } //// module M { //// var z = 100; -//// export var y = { [|dx|], z }; +//// export var y = { [|{| "isWriteAccess": true, "isDefinition": true |}dx|], z }; //// } //// M.y.[|dx|]; const [r0, r1, r2, r3] = test.ranges(); -verify.referencesOf(r0, [r0]); -verify.referencesOf(r1, [r1, r2]); -verify.referencesOf(r2, [r1, r2, r3]); -verify.referencesOf(r3, [r2, r3]); +verify.singleReferenceGroup("var dx: string", [r0]); +verify.referenceGroups(r1, [{ definition: "var M.dx: any", ranges: [r1, r2] }]); +verify.referenceGroups(r2, [ + { definition: "var M.dx: any", ranges: [r1] }, + { definition: "(property) dx: any", ranges: [r2, r3] } +]); +verify.referenceGroups(r3, [ + { definition: "(property) dx: any", ranges: [r2] }, + { definition: "(property) dx: any", ranges: [r3] } +]); diff --git a/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts b/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts index a9915fc4b3dc3..f9feb5ddb626d 100644 --- a/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts +++ b/tests/cases/fourslash/findReferencesAcrossMultipleProjects.ts @@ -1,14 +1,14 @@ /// //@Filename: a.ts -////var [|x|]: number; +////var [|{| "isWriteAccess": true, "isDefinition": true |}x|]: number; //@Filename: b.ts /////// -////[|x|]++; +////[|{| "isWriteAccess": true |}x|]++; //@Filename: c.ts /////// -////[|x|]++; +////[|{| "isWriteAccess": true |}x|]++; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var x: number"); diff --git a/tests/cases/fourslash/findReferencesAfterEdit.ts b/tests/cases/fourslash/findReferencesAfterEdit.ts index 6140ca9a767da..2d57e78c6372d 100644 --- a/tests/cases/fourslash/findReferencesAfterEdit.ts +++ b/tests/cases/fourslash/findReferencesAfterEdit.ts @@ -2,7 +2,7 @@ // @Filename: a.ts ////interface A { -//// [|foo|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}foo|]: string; ////} // @Filename: b.ts @@ -12,9 +12,9 @@ //// x.[|foo|] ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) A.foo: string"); goTo.marker(""); edit.insert("\r\n"); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) A.foo: string"); diff --git a/tests/cases/fourslash/findReferencesJSXTagName.ts b/tests/cases/fourslash/findReferencesJSXTagName.ts index 24760046eb24c..5f8bc3a475fd1 100644 --- a/tests/cases/fourslash/findReferencesJSXTagName.ts +++ b/tests/cases/fourslash/findReferencesJSXTagName.ts @@ -1,14 +1,16 @@ /// // @Filename: index.tsx -////import { [|SubmissionComp|] } from "./RedditSubmission" +////import { [|{| "isWriteAccess": true, "isDefinition": true |}SubmissionComp|] } from "./RedditSubmission" ////function displaySubreddit(subreddit: string) { //// let components = submissions //// .map((value, index) => <[|SubmissionComp|] key={ index } elementPosition= { index } {...value.data} />); ////} // @Filename: RedditSubmission.ts -////export const [|SubmissionComp|] = (submission: SubmissionProps) => +////export const [|{| "isWriteAccess": true, "isDefinition": true |}SubmissionComp|] = (submission: SubmissionProps) => ////
; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(ranges, [{ definition: "const SubmissionComp: (submission: any) => any", ranges: [r2, r0, r1] }]); diff --git a/tests/cases/fourslash/findReferencesJSXTagName2.ts b/tests/cases/fourslash/findReferencesJSXTagName2.ts index 4ce08647c52aa..a8882b600886a 100644 --- a/tests/cases/fourslash/findReferencesJSXTagName2.ts +++ b/tests/cases/fourslash/findReferencesJSXTagName2.ts @@ -1,7 +1,9 @@ /// // @Filename: index.tsx -////const [|obj|] = {Component: () =>
}; +////const [|{| "isWriteAccess": true, "isDefinition": true |}obj|] = {Component: () =>
}; ////const element = <[|obj|].Component/>; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup(`const obj: { + Component: () => any; +}`); diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 6685bbc19c09f..c613204f53951 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -182,18 +182,19 @@ declare namespace FourSlashInterface { goToType(startMarkerNames: string | string[], endMarkerNames: string | string[]): void; verifyGetEmitOutputForCurrentFile(expected: string): void; verifyGetEmitOutputContentsForCurrentFile(expected: ts.OutputFile[]): void; + noReferences(markerNameOrRange?: string | Range): void; /** - * Asserts that the given ranges are the references from the current position. - * If ranges have markers, those markers may have "isDefinition" and "isWriteAccess" data - * (otherwise these properties pf the reference are not tested). - * Order of ranges does not matter. - */ - referencesAre(ranges: Range[]): void; - /** + * @deprecated, prefer 'referenceGroups' * Like `referencesAre`, but goes to `start` first. * `start` should be included in `references`. */ referencesOf(start: Range, references: Range[]): void; + /** + * For each of startRanges, asserts the ranges that are referenced from there. + * This uses the 'findReferences' command instead of 'getReferencesAtPosition', so references are grouped by their definition. + */ + referenceGroups(startRanges: Range | Range[], parts: Array<{ definition: string, ranges: Range[] }>): void; + singleReferenceGroup(definition: string, ranges?: Range[]): void; rangesAreOccurrences(isWriteAccess?: boolean): void; rangesAreRenameLocations(findInStrings?: boolean, findInComments?: boolean): void; /** @@ -202,7 +203,6 @@ declare namespace FourSlashInterface { */ rangesReferenceEachOther(ranges?: Range[]): void; findReferencesDefinitionDisplayPartsAtCaretAre(expected: ts.SymbolDisplayPart[]): void; - rangesWithSameTextReferenceEachOther(): void; currentParameterHelpArgumentNameIs(name: string): void; currentParameterSpanIs(parameter: string): void; currentParameterHelpArgumentDocCommentIs(docComment: string): void; diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts index 57b4c14ffba1c..b1acb76ad2c80 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfArrowFunction.ts @@ -1,5 +1,5 @@ /// -////var [|{| "isDefinition": true |}f|] = x => x + 1; -////[|{| "isDefinition": false |}f|](12); +////var [|{| "isWriteAccess": true, "isDefinition": true |}f|] = x => x + 1; +////[|f|](12); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var f: (x: any) => any"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts index e60921ec3b861..7725b2e94f8b1 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfBindingPattern.ts @@ -1,5 +1,5 @@ /// -////const { [|{| "isDefinition": true |}x|], y } = { x: 1, y: 2 }; +////const { [|{| "isWriteAccess": true, "isDefinition": true |}x|], y } = { x: 1, y: 2 }; ////const z = [|{| "isDefinition": false |}x|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("const x: number"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts index 0a3c2e4231c9d..b39c11dfe6b05 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfClass.ts @@ -1,10 +1,13 @@ /// -////class [|{| "isDefinition": true |}C|] { +////class [|{| "isWriteAccess": true, "isDefinition": true |}C|] { //// n: number; //// constructor() { //// this.n = 12; //// } ////} -////let c = new [|{| "isDefinition": false |}C|](); +////let c = new [|C|](); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "class C", ranges }]); +verify.referenceGroups(r1, [{ definition: "constructor C(): C", ranges }]); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts index 81df97eff2dd0..27c34e5660058 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfComputedProperty.ts @@ -1,7 +1,9 @@ /// -////let o = { ["/**/[|{| "isDefinition": true |}foo|]"]: 12 }; -////let y = o.[|{| "isDefinition": false |}foo|]; -////let z = o['[|{| "isDefinition": false |}foo|]']; +////let o = { ["[|{| "isDefinition": true |}foo|]"]: 12 }; +////let y = o.[|foo|]; +////let z = o['[|foo|]']; -goTo.marker(); -verify.referencesAre(test.ranges()); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(r0, [{ definition: '(property) ["foo"]: number', ranges }]); +verify.referenceGroups([r1, r2], []); // TODO: fix diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts index 5b77bf6158aa9..325674d8ee721 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfEnum.ts @@ -1,8 +1,8 @@ /// -////enum [|{| "isDefinition": true |}E|] { +////enum [|{| "isWriteAccess": true, "isDefinition": true |}E|] { //// First, //// Second ////} -////let first = [|{| "isDefinition": false |}E|].First; +////let first = [|E|].First; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("enum E"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts index 759df4fa383f1..9cdfb0aa0f735 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfExport.ts @@ -1,8 +1,8 @@ /// // @Filename: m.ts -////export var [|{| "isDefinition": true |}x|] = 12; +////export var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 12; // @Filename: main.ts -////import { [|{| "isDefinition": true |}x|] } from "./m"; -////const y = [|{| "isDefinition": false |}x|]; +////import { [|{| "isWriteAccess": true, "isDefinition": true |}x|] } from "./m"; +////const y = [|x|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var x: number"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts index 357ef088d6140..4c91bc08ef851 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfFunction.ts @@ -1,6 +1,6 @@ /// -////function [|{| "isDefinition": true |}func|](x: number) { +////function [|{| "isWriteAccess": true, "isDefinition": true |}func|](x: number) { ////} -////[|{| "isDefinition": false |}func|](x) +////[|func|](x) -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("function func(x: number): void"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts index b7117995d8465..826890c4da93e 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterface.ts @@ -1,7 +1,7 @@ /// -////interface [|{| "isDefinition": true |}I|] { +////interface [|{| "isWriteAccess": true, "isDefinition": true |}I|] { //// p: number; ////} -////let i: [|{| "isDefinition": false |}I|] = { p: 12 }; +////let i: [|I|] = { p: 12 }; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("interface I"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts index b0506490c7074..0e949ca649603 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfInterfaceClassMerge.ts @@ -1,16 +1,19 @@ /// -////interface [|{| "isDefinition": true |}Numbers|] { +////interface [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] { //// p: number; ////} -////interface [|{| "isDefinition": true |}Numbers|] { +////interface [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] { //// m: number; ////} -////class [|{| "isDefinition": true |}Numbers|] { +////class [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] { //// f(n: number) { //// return this.p + this.m + n; //// } ////} -////let i: [|{| "isDefinition": false |}Numbers|] = new [|{| "isDefinition": false |}Numbers|](); +////let i: [|Numbers|] = new [|Numbers|](); ////let x = i.f(i.p + i.m); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3, r4] = ranges; +verify.referenceGroups([r0, r1, r2, r3], [{ definition: "class Numbers\ninterface Numbers", ranges }]); +verify.referenceGroups(r4, [{ definition: "constructor Numbers(): Numbers", ranges }]); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts index ff1cf00fa9b3c..04d00e6c19f74 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNamespace.ts @@ -1,7 +1,7 @@ /// -////namespace [|{| "isDefinition": true |}Numbers|] { +////namespace [|{| "isWriteAccess": true, "isDefinition": true |}Numbers|] { //// export var n = 12; ////} -////let x = [|{| "isDefinition": false |}Numbers|].n + 1; +////let x = [|Numbers|].n + 1; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("namespace Numbers"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts index a041dab435ac3..c603f398e5ea7 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfNumberNamedProperty.ts @@ -1,5 +1,11 @@ /// ////let o = { [|{| "isDefinition": true |}1|]: 12 }; -////let y = o[[|{| "isDefinition": false |}1|]]; +////let y = o[[|1|]]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(property) 1: number", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(property) 1: number", ranges: [r0] }, + { definition: "(property) 1: number", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts index cdcc47014fdfb..8afa67bfe641c 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfParameter.ts @@ -1,6 +1,6 @@ /// -////function f([|{| "isDefinition": true |}x|]: number) { -//// return [|{| "isDefinition": false |}x|] + 1 +////function f([|{| "isWriteAccess": true, "isDefinition": true |}x|]: number) { +//// return [|x|] + 1 ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(parameter) x: number"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts index 383cf49a2e34d..43fe0c571fc95 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfStringNamedProperty.ts @@ -1,5 +1,11 @@ /// ////let o = { "[|{| "isDefinition": true |}x|]": 12 }; -////let y = o.[|{| "isDefinition": false |}x|]; +////let y = o.[|x|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: '(property) "x": number', ranges }]); +verify.referenceGroups(r1, [ + { definition: '(property) "x": number', ranges: [r0] }, + { definition: '(property) "x": number', ranges: [r1] }, +]); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts index 2bd66830c69a0..18a4ec0396c46 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfTypeAlias.ts @@ -1,5 +1,5 @@ /// -////type [|{| "isDefinition": true |}Alias|]= number; -////let n: [|{| "isDefinition": false |}Alias|] = 12; +////type [|{| "isWriteAccess": true, "isDefinition": true |}Alias|]= number; +////let n: [|Alias|] = 12; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("type Alias = number"); diff --git a/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts b/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts index 78529186ad35b..2faf5b53e1b7b 100644 --- a/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts +++ b/tests/cases/fourslash/getOccurrencesIsDefinitionOfVariable.ts @@ -1,20 +1,20 @@ /// -////var [|{| "isDefinition": true |}x|] = 0; -////var assignmentRightHandSide = [|{| "isDefinition": false |}x|]; -////var assignmentRightHandSide2 = 1 + [|{| "isDefinition": false |}x|]; +////var [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 0; +////var assignmentRightHandSide = [|x|]; +////var assignmentRightHandSide2 = 1 + [|x|]; //// -////[|{| "isDefinition": false |}x|] = 1; -////[|{| "isDefinition": false |}x|] = [|{| "isDefinition": false |}x|] + [|{| "isDefinition": false |}x|]; +////[|{| "isWriteAccess": true |}x|] = 1; +////[|{| "isWriteAccess": true |}x|] = [|x|] + [|x|]; //// -////[|{| "isDefinition": false |}x|] == 1; -////[|{| "isDefinition": false |}x|] <= 1; +////[|x|] == 1; +////[|x|] <= 1; //// -////var preIncrement = ++[|{| "isDefinition": false |}x|]; -////var postIncrement = [|{| "isDefinition": false |}x|]++; -////var preDecrement = --[|{| "isDefinition": false |}x|]; -////var postDecrement = [|{| "isDefinition": false |}x|]--; +////var preIncrement = ++[|{| "isWriteAccess": true |}x|]; +////var postIncrement = [|{| "isWriteAccess": true |}x|]++; +////var preDecrement = --[|{| "isWriteAccess": true |}x|]; +////var postDecrement = [|{| "isWriteAccess": true |}x|]--; //// -////[|{| "isDefinition": false |}x|] += 1; -////[|{| "isDefinition": false |}x|] <<= 1; +////[|{| "isWriteAccess": true |}x|] += 1; +////[|{| "isWriteAccess": true |}x|] <<= 1; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var x: number"); diff --git a/tests/cases/fourslash/hoverOverComment.ts b/tests/cases/fourslash/hoverOverComment.ts index 653eaedfcb770..fd1a7fcd9defb 100644 --- a/tests/cases/fourslash/hoverOverComment.ts +++ b/tests/cases/fourslash/hoverOverComment.ts @@ -7,4 +7,4 @@ goTo.marker(); verify.quickInfoIs(""); verify.goToDefinitionIs([]); -verify.referencesAre([]); +verify.noReferences(); diff --git a/tests/cases/fourslash/localGetReferences.ts b/tests/cases/fourslash/localGetReferences.ts index d8e64be1ada3e..4648471648af0 100644 --- a/tests/cases/fourslash/localGetReferences.ts +++ b/tests/cases/fourslash/localGetReferences.ts @@ -3,17 +3,17 @@ // @Filename: localGetReferences_1.ts ////// Comment Refence Test: g/*1*/lobalVar ////// References to a variable declared in global. -////var [|globalVar|]: number = 2; +////var [|{| "isWriteAccess": true, "isDefinition": true |}globalVar|]: number = 2; //// ////class fooCls { //// // References to static variable declared in a class. -//// static [|clsSVar|] = 1; +//// static [|{| "isWriteAccess": true, "isDefinition": true |}clsSVar|] = 1; //// // References to a variable declared in a class. -//// [|clsVar|] = 1; +//// [|{| "isWriteAccess": true, "isDefinition": true |}clsVar|] = 1; //// -//// constructor (public [|clsParam|]: number) { +//// constructor (public [|{| "isWriteAccess": true, "isDefinition": true |}clsParam|]: number) { //// //Increments -//// [|globalVar|]++; +//// [|{| "isWriteAccess": true |}globalVar|]++; //// this.[|clsVar|]++; //// fooCls.[|clsSVar|]++; //// // References to a class parameter. @@ -23,18 +23,18 @@ ////} //// ////// References to a function parameter. -////function [|foo|]([|x|]: number) { +////function [|{| "isWriteAccess": true, "isDefinition": true |}foo|]([|{| "isWriteAccess": true, "isDefinition": true |}x|]: number) { //// // References to a variable declared in a function. -//// var [|fnVar|] = 1; +//// var [|{| "isWriteAccess": true, "isDefinition": true |}fnVar|] = 1; //// //// //Increments //// fooCls.[|clsSVar|]++; -//// [|globalVar|]++; +//// [|{| "isWriteAccess": true |}globalVar|]++; //// modTest.modVar++; -//// [|fnVar|]++; +//// [|{| "isWriteAccess": true |}fnVar|]++; //// //// //Return -//// return [|x|]++; +//// return [|{| "isWriteAccess": true |}x|]++; ////} //// ////module modTest { @@ -42,7 +42,7 @@ //// export var modVar:number; //// //// //Increments -//// [|globalVar|]++; +//// [|{| "isWriteAccess": true |}globalVar|]++; //// fooCls.[|clsSVar|]++; //// modVar++; //// @@ -54,7 +54,7 @@ //// static boo = [|foo|]; //// //// //Increments -//// [|globalVar|]++; +//// [|{| "isWriteAccess": true |}globalVar|]++; //// fooCls.[|clsSVar|]++; //// modVar++; //// } @@ -76,18 +76,18 @@ //////Increments ////fooCls.[|clsSVar|]++; ////modTest.modVar++; -////[|globalVar|] = [|globalVar|] + [|globalVar|]; +////[|{| "isWriteAccess": true |}globalVar|] = [|globalVar|] + [|globalVar|]; //// //////ETC - Other cases -////[|globalVar|] = 3; +////[|{| "isWriteAccess": true |}globalVar|] = 3; ////// References to illegal assignment. -////[|foo|] = [|foo|] + 1; +////[|{| "isWriteAccess": true |}foo|] = [|foo|] + 1; /////*3*/err = err++; /////*4*/ //////Shadowed fn Parameter -////function shdw([|{| "shadow": true |}globalVar|]: number) { +////function shdw([|{| "isWriteAccess": true, "isDefinition": true, "shadow": true |}globalVar|]: number) { //// //Increments -//// [|{| "shadow": true |}globalVar|]++; +//// [|{| "isWriteAccess": true, "shadow": true |}globalVar|]++; //// return [|{| "shadow": true |}globalVar|]; ////} //// @@ -117,7 +117,7 @@ ////array.forEach( //// //// -////function([|str|]) { +////function([|{| "isWriteAccess": true, "isDefinition": true |}str|]) { //// //// //// @@ -187,24 +187,36 @@ // References to comment. goTo.marker("1"); -verify.referencesAre([]); +verify.noReferences(); // References to unresolved symbol. goTo.marker("3"); -verify.referencesAre([]); +verify.noReferences(); // References to no context. goTo.marker("4"); -verify.referencesAre([]); +verify.noReferences(); -const rangesByText = test.rangesByText(); -rangesByText.forEach((ranges, text) => { +test.rangesByText().forEach((ranges, text) => { if (text === "globalVar") { - verify.rangesReferenceEachOther(ranges.filter(isShadow)); - verify.rangesReferenceEachOther(ranges.filter(r => !isShadow(r))); - } else { - verify.rangesReferenceEachOther(ranges); + verify.singleReferenceGroup("(parameter) globalVar: number", ranges.filter(isShadow)); + verify.singleReferenceGroup("var globalVar: number", ranges.filter(r => !isShadow(r))); + return; } + + const definition = (() => { + switch (text) { + case "fnVar": return "(local var) fnVar: number"; + case "clsSVar": return "(property) fooCls.clsSVar: number"; + case "clsVar": return "(property) fooCls.clsVar: number"; + case "clsParam": return "(property) fooCls.clsParam: number"; + case "foo": return "function foo(x: number): number"; + case "x": return "(parameter) x: number"; + case "str": return "(parameter) str: string"; + default: throw new Error(text); + } + })(); + verify.singleReferenceGroup(definition, ranges); }); function isShadow(r) { diff --git a/tests/cases/fourslash/quickInfoForRequire.ts b/tests/cases/fourslash/quickInfoForRequire.ts index 26b0371fe0ee1..e97810401f4bf 100644 --- a/tests/cases/fourslash/quickInfoForRequire.ts +++ b/tests/cases/fourslash/quickInfoForRequire.ts @@ -6,5 +6,6 @@ //@Filename: quickInfoForRequire_input.ts ////import a = require("./AA/B/*1*/B"); -verify.quickInfoAt("1", "module a"); -verify.referencesAre([]); \ No newline at end of file +goTo.marker("1"); +verify.quickInfoIs("module a"); +verify.noReferences(); diff --git a/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts b/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts index 68a9f73b1d6d1..79bf61728636e 100644 --- a/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts +++ b/tests/cases/fourslash/referenceInParameterPropertyDeclaration.ts @@ -2,19 +2,26 @@ // @Filename: file1.ts //// class Foo { -//// constructor(private [|privateParam|]: number, -//// public [|publicParam|]: string, -//// protected [|protectedParam|]: boolean) { -//// +//// constructor(private [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}privateParam|]: number, +//// public [|{| "isWriteAccess": true, "isDefinition": true, "type": "string" |}publicParam|]: string, +//// protected [|{| "isWriteAccess": true, "isDefinition": true, "type": "boolean" |}protectedParam|]: boolean) { +//// //// let localPrivate = [|privateParam|]; //// this.[|privateParam|] += 10; -//// +//// //// let localPublic = [|publicParam|]; //// this.[|publicParam|] += " Hello!"; -//// +//// //// let localProtected = [|protectedParam|]; //// this.[|protectedParam|] = false; //// } //// } -verify.rangesWithSameTextReferenceEachOther(); +test.rangesByText().forEach((ranges, text) => { + const [r0, r1, r2] = ranges; + const type = r0.marker.data.type; + verify.referenceGroups(ranges, [ + { definition: `(property) Foo.${text}: ${type}`, ranges: [r0, r2] }, + { definition: `(parameter) ${text}: ${type}`, ranges: [r1] } + ]); +}); diff --git a/tests/cases/fourslash/referenceToClass.ts b/tests/cases/fourslash/referenceToClass.ts index 3e523487bd13d..d6d2171507cda 100644 --- a/tests/cases/fourslash/referenceToClass.ts +++ b/tests/cases/fourslash/referenceToClass.ts @@ -3,7 +3,7 @@ // Class references should work across file and not find local variables. // @Filename: referenceToClass_1.ts -////class [|foo|] { +////class [|{| "isWriteAccess": true, "isDefinition": true |}foo|] { //// public n: [|foo|]; //// public foo: number; ////} @@ -20,4 +20,7 @@ // @Filename: referenceToClass_2.ts ////var k: [|foo|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3, r4, r5] = ranges; +verify.referenceGroups([r0, r1, r2, r4, r5], [{ definition: "class foo", ranges }]); +verify.referenceGroups(r3, [{ definition: "constructor foo(): foo", ranges }]); diff --git a/tests/cases/fourslash/referencesBloomFilters.ts b/tests/cases/fourslash/referencesBloomFilters.ts index 7d99ccdfd3c1b..c9f290db0db71 100644 --- a/tests/cases/fourslash/referencesBloomFilters.ts +++ b/tests/cases/fourslash/referencesBloomFilters.ts @@ -3,7 +3,7 @@ // Ensure BloomFilter building logic is correct, by having one reference per file // @Filename: declaration.ts -////var container = { [|searchProp|] : 1 }; +////var container = { [|{| "isWriteAccess": true, "isDefinition": true |}searchProp|] : 1 }; // @Filename: expression.ts ////function blah() { return (1 + 2 + container.[|searchProp|]()) === 2; }; @@ -12,6 +12,16 @@ ////function blah2() { container["[|searchProp|]"] }; // @Filename: redeclaration.ts -////container = { "[|searchProp|]" : 18 }; +////container = { "[|{| "isDefinition": true |}searchProp|]" : 18 }; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups(r0, [{ definition: "(property) searchProp: number", ranges }]); +verify.referenceGroups([r1, r2], [ + { definition: "(property) searchProp: number", ranges: [r0, r3] }, + { definition: "(property) searchProp: number", ranges: [r1, r2] } +]); +verify.referenceGroups(r3, [ + { definition: "(property) searchProp: number", ranges: [r0, r1, r2] }, + { definition: '(property) "searchProp": number', ranges: [r3] } +]); diff --git a/tests/cases/fourslash/referencesBloomFilters2.ts b/tests/cases/fourslash/referencesBloomFilters2.ts index c42e5d4eaf12a..daf60d0dd019e 100644 --- a/tests/cases/fourslash/referencesBloomFilters2.ts +++ b/tests/cases/fourslash/referencesBloomFilters2.ts @@ -3,7 +3,7 @@ // Ensure BloomFilter building logic is correct, by having one reference per file // @Filename: declaration.ts -////var container = { [|42|]: 1 }; +////var container = { [|{| "isDefinition": true |}42|]: 1 }; // @Filename: expression.ts ////function blah() { return (container[[|42|]]) === 2; }; @@ -12,6 +12,16 @@ ////function blah2() { container["[|42|]"] }; // @Filename: redeclaration.ts -////container = { "[|42|]" : 18 }; +////container = { "[|{| "isDefinition": true |}42|]" : 18 }; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups(r0, [{ definition: "(property) 42: number", ranges }]); +verify.referenceGroups([r1, r2], [ + { definition: "(property) 42: number", ranges: [r0, r3] }, + { definition: "(property) 42: number", ranges: [r1, r2] } +]); +verify.referenceGroups(r3, [ + { definition: "(property) 42: number", ranges: [r0, r1, r2] }, + { definition: '(property) "42": number', ranges: [r3] } +]); diff --git a/tests/cases/fourslash/referencesBloomFilters3.ts b/tests/cases/fourslash/referencesBloomFilters3.ts index 9703baceb124a..0dd5c64526460 100644 --- a/tests/cases/fourslash/referencesBloomFilters3.ts +++ b/tests/cases/fourslash/referencesBloomFilters3.ts @@ -4,9 +4,9 @@ // @Filename: declaration.ts -////enum Test { "[|42|]" = 1 }; +////enum Test { "[|{| "isDefinition": true |}42|]" = 1 }; // @Filename: expression.ts ////(Test[[|42|]]); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup('(enum member) Test["42"] = 1'); diff --git a/tests/cases/fourslash/referencesForAmbients.ts b/tests/cases/fourslash/referencesForAmbients.ts index da3f3f43aaef7..58e4d6e59a573 100644 --- a/tests/cases/fourslash/referencesForAmbients.ts +++ b/tests/cases/fourslash/referencesForAmbients.ts @@ -1,11 +1,11 @@ /// -////declare module "[|foo|]" { -//// var [|f|]: number; +////declare module "[|{| "isDefinition": true |}foo|]" { +//// var [|{| "isWriteAccess": true, "isDefinition": true |}f|]: number; ////} //// -////declare module "[|bar|]" { -//// export import [|foo|] = require("[|foo|]"); +////declare module "[|{| "isDefinition": true |}bar|]" { +//// export import [|{| "isWriteAccess": true, "isDefinition": true |}foo|] = require("[|foo|]"); //// var f2: typeof [|foo|].[|f|]; ////} //// @@ -15,7 +15,7 @@ ////} const [moduleFoo0, f0, moduleBar0, foo0, moduleFoo1, foo1, f1, moduleBar1, foo2] = test.ranges(); -verify.rangesReferenceEachOther([moduleFoo0, moduleFoo1]); -verify.rangesReferenceEachOther([moduleBar0, moduleBar1]); -verify.rangesReferenceEachOther([foo0, foo1, foo2]); -verify.rangesReferenceEachOther([f0, f1]); +verify.singleReferenceGroup('module "foo"', [moduleFoo0, moduleFoo1]); +verify.singleReferenceGroup('module "bar"', [moduleBar0, moduleBar1]); +verify.singleReferenceGroup('import foo = require("foo")', [foo0, foo1, foo2]); +verify.singleReferenceGroup("var f: number", [f0, f1]); diff --git a/tests/cases/fourslash/referencesForClassLocal.ts b/tests/cases/fourslash/referencesForClassLocal.ts index bdde0e7f1265e..4108c060a39aa 100644 --- a/tests/cases/fourslash/referencesForClassLocal.ts +++ b/tests/cases/fourslash/referencesForClassLocal.ts @@ -5,7 +5,7 @@ ////var n = 14; //// ////class foo { -//// private [|n|] = 0; +//// private [|{| "isWriteAccess": true, "isDefinition": true |}n|] = 0; //// //// public bar() { //// this.[|n|] = 9; @@ -20,4 +20,4 @@ //// } ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) foo.n: number"); diff --git a/tests/cases/fourslash/referencesForClassMembers.ts b/tests/cases/fourslash/referencesForClassMembers.ts index 0208b13589da4..0db4ebb087370 100644 --- a/tests/cases/fourslash/referencesForClassMembers.ts +++ b/tests/cases/fourslash/referencesForClassMembers.ts @@ -1,16 +1,36 @@ /// ////class Base { -//// [|a|]: number; -//// [|method|](): void { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void { } ////} ////class MyClass extends Base { -//// [|a|]; -//// [|method|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|]() { } ////} //// ////var c: MyClass; ////c.[|a|]; ////c.[|method|](); -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +const properties = ranges.get("a"); +const [a0, a1, a2] = properties; +verify.referenceGroups(a0, [{ definition: "(property) Base.a: number", ranges: properties }]); +verify.referenceGroups([a1, a2], [ + { definition: "(property) Base.a: number", ranges: [a0] }, + { definition: "(property) MyClass.a: any", ranges: [a1, a2] } +]); + +const methods = ranges.get("method"); +const [m0, m1, m2] = methods; +verify.referenceGroups(m0, [{ definition: "(method) Base.method(): void", ranges: methods }]); +verify.referenceGroups(m1, [ + { definition: "(method) Base.method(): void", ranges: [m0] }, + { definition: "(method) MyClass.method(): void", ranges: [m1, m2] } +]); +verify.referenceGroups(m2, [ + { definition: "(method) Base.method(): void", ranges: [m0] }, + { definition: "(method) MyClass.method(): void", ranges: [m1] }, + { definition: "(method) MyClass.method(): void", ranges: [m2] } +]); diff --git a/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts b/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts index 46115f9da171c..b5be77a73bb85 100644 --- a/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts +++ b/tests/cases/fourslash/referencesForClassMembersExtendingAbstractClass.ts @@ -1,16 +1,36 @@ /// ////abstract class Base { -//// abstract [|a|]: number; -//// abstract [|method|](): void; +//// abstract [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number; +//// abstract [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void; ////} ////class MyClass extends Base { -//// [|a|]; -//// [|method|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|]() { } ////} //// ////var c: MyClass; ////c.[|a|]; ////c.[|method|](); -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +const properties = ranges.get("a"); +const [a0, a1, a2] = properties; +verify.referenceGroups(a0, [{ definition: "(property) Base.a: number", ranges: properties }]); +verify.referenceGroups([a1, a2], [ + { definition: "(property) Base.a: number", ranges: [a0] }, + { definition: "(property) MyClass.a: any", ranges: [a1, a2] } +]); + +const methods = ranges.get("method"); +const [m0, m1, m2] = methods; +verify.referenceGroups(m0, [{ definition: "(method) Base.method(): void", ranges: methods }]); +verify.referenceGroups(m1, [ + { definition: "(method) Base.method(): void", ranges: [m0] }, + { definition: "(method) MyClass.method(): void", ranges: [m1, m2] } +]); +verify.referenceGroups(m2, [ + { definition: "(method) Base.method(): void", ranges: [m0] }, + { definition: "(method) MyClass.method(): void", ranges: [m1] }, + { definition: "(method) MyClass.method(): void", ranges: [m2] } +]); diff --git a/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts b/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts index 2b701f25cc15c..3e453663f63ab 100644 --- a/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts +++ b/tests/cases/fourslash/referencesForClassMembersExtendingGenericClass.ts @@ -1,16 +1,36 @@ /// ////class Base { -//// [|a|]: this; -//// [|method|](a?:T, b?:U): this { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]: this; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|](a?:T, b?:U): this { } ////} ////class MyClass extends Base { -//// [|a|]; -//// [|method|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|]() { } ////} //// ////var c: MyClass; ////c.[|a|]; ////c.[|method|](); -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +const properties = ranges.get("a"); +const [a0, a1, a2] = properties; +verify.referenceGroups(a0, [{ definition: "(property) Base.a: this", ranges: properties }]); +verify.referenceGroups([a1, a2], [ + { definition: "(property) Base.a: this", ranges: [a0] }, + { definition: "(property) MyClass.a: any", ranges: [a1, a2] } +]); + +const methods = ranges.get("method"); +const [m0, m1, m2] = methods; +verify.referenceGroups(m0, [{ definition: "(method) Base.method(a?: T, b?: U): this", ranges: methods }]); +verify.referenceGroups(m1, [ + { definition: "(method) Base.method(): void", ranges: [m0] }, + { definition: "(method) MyClass.method(): void", ranges: [m1, m2] } +]); +verify.referenceGroups(m2, [ + { definition: "(method) Base.method(a?: T, b?: U): this", ranges: [m0] }, + { definition: "(method) MyClass.method(): void", ranges: [m1] }, + { definition: "(method) MyClass.method(): void", ranges: [m2] } +]); diff --git a/tests/cases/fourslash/referencesForClassParameter.ts b/tests/cases/fourslash/referencesForClassParameter.ts index ce383b3650315..e1a33dc5ac4b1 100644 --- a/tests/cases/fourslash/referencesForClassParameter.ts +++ b/tests/cases/fourslash/referencesForClassParameter.ts @@ -7,7 +7,7 @@ ////class p { } //// ////class foo { -//// constructor (public [|p|]: any) { +//// constructor (public [|{| "isWriteAccess": true, "isDefinition": true |}p|]: any) { //// } //// //// public f(p) { @@ -19,4 +19,10 @@ ////var n = new foo(undefined); ////n.[|p|] = null; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups([r0, r1], [{ definition: "(property) foo.p: any", ranges }]); +verify.referenceGroups(r2, [ + { definition: "(property) foo.p: any", ranges: [r0, r1] }, + { definition: "(property) foo.p: any", ranges: [r2] } +]); diff --git a/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts b/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts index 65bd7eebfb5b4..7d6bc05cf3063 100644 --- a/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts +++ b/tests/cases/fourslash/referencesForContextuallyTypedObjectLiteralProperties.ts @@ -1,28 +1,36 @@ /// -////interface IFoo { [|xy|]: number; } +////interface IFoo { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: number; } //// ////// Assignment -////var a1: IFoo = { [|xy|]: 0 }; -////var a2: IFoo = { [|xy|]: 0 }; +////var a1: IFoo = { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 }; +////var a2: IFoo = { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 }; //// ////// Function call ////function consumer(f: IFoo) { } -////consumer({ [|xy|]: 1 }); +////consumer({ [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 1 }); //// -////// Type cast -////var c = { [|xy|]: 0 }; +////// Type cast +////var c = { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 }; //// ////// Array literal -////var ar: IFoo[] = [{ [|xy|]: 1 }, { [|xy|]: 2 }]; +////var ar: IFoo[] = [{ [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 1 }, { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 2 }]; //// ////// Nested object literal -////var ob: { ifoo: IFoo } = { ifoo: { [|xy|]: 0 } }; +////var ob: { ifoo: IFoo } = { ifoo: { [|{| "isWriteAccess": true, "isDefinition": true |}xy|]: 0 } }; //// ////// Widened type -////var w: IFoo = { [|xy|]: undefined }; +////var w: IFoo = { [|{| "isWriteAccess": true, "isDefinition": true, "type": "undefined" |}xy|]: undefined }; //// ////// Untped -- should not be included ////var u = { xy: 0 }; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +verify.referenceGroups(ranges[0], [{ definition: "(property) IFoo.xy: number", ranges }]); +for (const range of ranges.slice(1)) { + const type = range.marker.data.type || "number"; + verify.referenceGroups(range, [ + { definition: "(property) IFoo.xy: number", ranges: ranges.filter(r => r !== range) }, + { definition: `(property) xy: ${type}`, ranges: [range] } + ]); +} diff --git a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts index c0e4a5f90ea9d..d79d4097ee7fb 100644 --- a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts +++ b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties.ts @@ -2,33 +2,33 @@ ////interface A { //// a: number; -//// [|common|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}common|]: string; ////} //// ////interface B { //// b: number; -//// [|common|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}common|]: number; ////} //// ////// Assignment -////var v1: A | B = { a: 0, [|common|]: "" }; -////var v2: A | B = { b: 0, [|common|]: 3 }; +////var v1: A | B = { a: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "string" |}common|]: "" }; +////var v2: A | B = { b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 3 }; //// ////// Function call ////function consumer(f: A | B) { } -////consumer({ a: 0, b: 0, [|common|]: 1 }); +////consumer({ a: 0, b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 1 }); //// -////// Type cast -////var c = { [|common|]: 0, b: 0 }; +////// Type cast +////var c = { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 0, b: 0 }; //// ////// Array literal -////var ar: Array = [{ a: 0, [|common|]: "" }, { b: 0, [|common|]: 0 }]; +////var ar: Array = [{ a: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "string" |}common|]: "" }, { b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 0 }]; //// ////// Nested object literal -////var ob: { aorb: A|B } = { aorb: { b: 0, [|common|]: 0 } }; +////var ob: { aorb: A|B } = { aorb: { b: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}common|]: 0 } }; //// ////// Widened type -////var w: A|B = { a:0, [|common|]: undefined }; +////var w: A|B = { a:0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "undefined" |}common|]: undefined }; //// ////// Untped -- should not be included ////var u1 = { a: 0, b: 0, common: "" }; @@ -36,8 +36,14 @@ const all = test.ranges(); const [aCommon, bCommon, ...unionRefs] = all; -verify.referencesOf(aCommon, [aCommon, ...unionRefs]); -verify.referencesOf(bCommon, [bCommon, ...unionRefs]); -for (const ref of unionRefs) { - verify.referencesOf(ref, all); -} +verify.referenceGroups(aCommon, [{ definition: "(property) A.common: string", ranges: [aCommon, ...unionRefs] }]); +verify.referenceGroups(bCommon, [{ definition: "(property) B.common: number", ranges: [bCommon, ...unionRefs] }]); + +unionRefs.forEach((unionRef, idx) => { + const type = unionRef.marker.data.type; + verify.referenceGroups(unionRef, [ + { definition: "(property) A.common: string", ranges: all.filter(x => x !== bCommon && x !== unionRef) }, + { definition: "(property) B.common: number", ranges: [bCommon] }, + { definition: `(property) common: ${type}`, ranges: [unionRef] } + ]); +}); diff --git a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts index de9ffbfd3be03..2c48e353b03bd 100644 --- a/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts +++ b/tests/cases/fourslash/referencesForContextuallyTypedUnionProperties2.ts @@ -6,32 +6,40 @@ ////} //// ////interface B { -//// [|b|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}b|]: number; //// common: number; ////} //// ////// Assignment ////var v1: A | B = { a: 0, common: "" }; -////var v2: A | B = { [|b|]: 0, common: 3 }; +////var v2: A | B = { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 3 }; //// ////// Function call ////function consumer(f: A | B) { } -////consumer({ a: 0, [|b|]: 0, common: 1 }); +////consumer({ a: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 1 }); //// -////// Type cast -////var c = { common: 0, [|b|]: 0 }; +////// Type cast +////var c = { common: 0, [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0 }; //// ////// Array literal -////var ar: Array = [{ a: 0, common: "" }, { [|b|]: 0, common: 0 }]; +////var ar: Array = [{ a: 0, common: "" }, { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 0 }]; //// ////// Nested object literal -////var ob: { aorb: A|B } = { aorb: { [|b|]: 0, common: 0 } }; +////var ob: { aorb: A|B } = { aorb: { [|{| "isWriteAccess": true, "isDefinition": true, "type": "number" |}b|]: 0, common: 0 } }; //// ////// Widened type -////var w: A|B = { [|b|]:undefined, common: undefined }; +////var w: A|B = { [|{| "isWriteAccess": true, "isDefinition": true, "type": "undefined" |}b|]:undefined, common: undefined }; //// ////// Untped -- should not be included ////var u1 = { a: 0, b: 0, common: "" }; ////var u2 = { b: 0, common: 0 }; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +verify.referenceGroups(ranges[0], [{ definition: "(property) B.b: number", ranges }]); +for (const reference of ranges.slice(1)) { + const type = reference.marker.data.type; + verify.referenceGroups(reference, [ + { definition: "(property) B.b: number", ranges: ranges.filter(r => r !== reference) }, + { definition: `(property) b: ${type}`, ranges: [reference] } + ]); +} diff --git a/tests/cases/fourslash/referencesForEnums.ts b/tests/cases/fourslash/referencesForEnums.ts index 3b979bc50968d..68face36d04b3 100644 --- a/tests/cases/fourslash/referencesForEnums.ts +++ b/tests/cases/fourslash/referencesForEnums.ts @@ -1,9 +1,9 @@ /// ////enum E { -//// [|value1|] = 1, -//// "[|value2|]" = [|value1|], -//// [|111|] = 11 +//// [|{| "isWriteAccess": true, "isDefinition": true |}value1|] = 1, +//// "[|{| "isDefinition": true |}value2|]" = [|value1|], +//// [|{| "isDefinition": true |}111|] = 11 ////} //// ////E.[|value1|]; @@ -11,4 +11,7 @@ ////E.[|value2|]; ////E[[|111|]]; -verify.rangesWithSameTextReferenceEachOther(); +const r = test.rangesByText(); +verify.singleReferenceGroup("(enum member) E.value1 = 1", r.get("value1")); +verify.singleReferenceGroup("(enum member) E[\"value2\"] = 1", r.get("value2")); +verify.singleReferenceGroup("(enum member) E[111] = 11", r.get("111")); diff --git a/tests/cases/fourslash/referencesForExportedValues.ts b/tests/cases/fourslash/referencesForExportedValues.ts index 315d0b1b58597..ff00f844260f3 100644 --- a/tests/cases/fourslash/referencesForExportedValues.ts +++ b/tests/cases/fourslash/referencesForExportedValues.ts @@ -1,7 +1,7 @@ /// ////module M { -//// export var [|variable|] = 0; +//// export var [|{| "isWriteAccess": true, "isDefinition": true |}variable|] = 0; //// //// // local use //// var x = [|variable|]; @@ -10,4 +10,4 @@ ////// external use ////M.[|variable|] -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var M.variable: number"); diff --git a/tests/cases/fourslash/referencesForExternalModuleNames.ts b/tests/cases/fourslash/referencesForExternalModuleNames.ts index ee783c8bd7ed9..5e01eae3530f9 100644 --- a/tests/cases/fourslash/referencesForExternalModuleNames.ts +++ b/tests/cases/fourslash/referencesForExternalModuleNames.ts @@ -3,7 +3,7 @@ // Global interface reference. // @Filename: referencesForGlobals_1.ts -////declare module "[|foo|]" { +////declare module "[|{| "isDefinition": true |}foo|]" { //// var f: number; ////} @@ -11,4 +11,7 @@ // @Filename: referencesForGlobals_2.ts ////import f = require("[|foo|]"); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: 'module "foo"', ranges }]); +verify.referenceGroups(r1, [{ definition: 'module f', ranges }]); diff --git a/tests/cases/fourslash/referencesForFunctionOverloads.ts b/tests/cases/fourslash/referencesForFunctionOverloads.ts index d6873643cd4c1..7afa5a2013318 100644 --- a/tests/cases/fourslash/referencesForFunctionOverloads.ts +++ b/tests/cases/fourslash/referencesForFunctionOverloads.ts @@ -2,9 +2,9 @@ // Function overloads should be highlighted together. -////function [|foo|](x: string); -////function [|foo|](x: string, y: number) { +////function [|{| "isWriteAccess": true, "isDefinition": true |}foo|](x: string); +////function [|{| "isWriteAccess": true, "isDefinition": true |}foo|](x: string, y: number) { //// [|foo|]('', 43); ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("function foo(x: string): any"); diff --git a/tests/cases/fourslash/referencesForFunctionParameter.ts b/tests/cases/fourslash/referencesForFunctionParameter.ts index 64d33ca9a6094..24582a68e08a2 100644 --- a/tests/cases/fourslash/referencesForFunctionParameter.ts +++ b/tests/cases/fourslash/referencesForFunctionParameter.ts @@ -3,9 +3,9 @@ ////var x; ////var n; //// -////function n(x: number, [|n|]: number) { -//// [|n|] = 32; +////function n(x: number, [|{| "isWriteAccess": true, "isDefinition": true |}n|]: number) { +//// [|{| "isWriteAccess": true |}n|] = 32; //// x = [|n|]; ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(parameter) n: number"); diff --git a/tests/cases/fourslash/referencesForGlobals.ts b/tests/cases/fourslash/referencesForGlobals.ts index f4d7c47976712..dc5bc4deb6f83 100644 --- a/tests/cases/fourslash/referencesForGlobals.ts +++ b/tests/cases/fourslash/referencesForGlobals.ts @@ -3,7 +3,7 @@ // Global variable reference. // @Filename: referencesForGlobals_1.ts -////var [|global|] = 2; +////var [|{| "isWriteAccess": true, "isDefinition": true |}global|] = 2; //// ////class foo { //// constructor (public global) { } @@ -25,4 +25,4 @@ // @Filename: referencesForGlobals_2.ts ////var m = [|global|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var global: number"); diff --git a/tests/cases/fourslash/referencesForGlobals2.ts b/tests/cases/fourslash/referencesForGlobals2.ts index 7c6baf5bf6717..e08be585c7ac9 100644 --- a/tests/cases/fourslash/referencesForGlobals2.ts +++ b/tests/cases/fourslash/referencesForGlobals2.ts @@ -3,11 +3,11 @@ // Global class reference. // @Filename: referencesForGlobals_1.ts -////class [|globalClass|] { +////class [|{| "isWriteAccess": true, "isDefinition": true |}globalClass|] { //// public f() { } ////} // @Filename: referencesForGlobals_2.ts ////var c = [|globalClass|](); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("class globalClass"); diff --git a/tests/cases/fourslash/referencesForGlobals3.ts b/tests/cases/fourslash/referencesForGlobals3.ts index 67e209aaad352..38edddc82557f 100644 --- a/tests/cases/fourslash/referencesForGlobals3.ts +++ b/tests/cases/fourslash/referencesForGlobals3.ts @@ -3,11 +3,11 @@ // Global interface reference. // @Filename: referencesForGlobals_1.ts -////interface [|globalInterface|] { +////interface [|{| "isWriteAccess": true, "isDefinition": true |}globalInterface|] { //// f(); ////} // @Filename: referencesForGlobals_2.ts ////var i: [|globalInterface|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("interface globalInterface"); diff --git a/tests/cases/fourslash/referencesForGlobals4.ts b/tests/cases/fourslash/referencesForGlobals4.ts index d7acfbd2df4b0..b8356461699be 100644 --- a/tests/cases/fourslash/referencesForGlobals4.ts +++ b/tests/cases/fourslash/referencesForGlobals4.ts @@ -3,11 +3,11 @@ // Global module reference. // @Filename: referencesForGlobals_1.ts -////module [|globalModule|] { +////module [|{| "isWriteAccess": true, "isDefinition": true |}globalModule|] { //// export f() { }; ////} // @Filename: referencesForGlobals_2.ts ////var m = [|globalModule|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("namespace globalModule"); diff --git a/tests/cases/fourslash/referencesForGlobals5.ts b/tests/cases/fourslash/referencesForGlobals5.ts index 4db2410f6389d..d7dd930474667 100644 --- a/tests/cases/fourslash/referencesForGlobals5.ts +++ b/tests/cases/fourslash/referencesForGlobals5.ts @@ -7,9 +7,9 @@ //// export var x; ////} //// -////import [|globalAlias|] = globalModule; +////import [|{| "isWriteAccess": true, "isDefinition": true |}globalAlias|] = globalModule; // @Filename: referencesForGlobals_2.ts ////var m = [|globalAlias|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("import globalAlias = globalModule"); diff --git a/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts b/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts index c2f704204021a..5047a2f12a4f6 100644 --- a/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts +++ b/tests/cases/fourslash/referencesForGlobalsInExternalModule.ts @@ -2,20 +2,28 @@ // Global variable reference. -////var [|topLevelVar|] = 2; +////var [|{| "isWriteAccess": true, "isDefinition": true |}topLevelVar|] = 2; ////var topLevelVar2 = [|topLevelVar|]; //// -////class [|topLevelClass|] { } +////class [|{| "isWriteAccess": true, "isDefinition": true |}topLevelClass|] { } ////var c = new [|topLevelClass|](); //// -////interface [|topLevelInterface|] { } +////interface [|{| "isWriteAccess": true, "isDefinition": true |}topLevelInterface|] { } ////var i: [|topLevelInterface|]; //// -////module [|topLevelModule|] { +////module [|{| "isWriteAccess": true, "isDefinition": true |}topLevelModule|] { //// export var x; ////} ////var x = [|topLevelModule|].x; //// ////export = x; -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +verify.singleReferenceGroup("var topLevelVar: number", ranges.get("topLevelVar")); + +const topLevelClass = ranges.get("topLevelClass"); +verify.referenceGroups(topLevelClass[0], [{ definition: "class topLevelClass", ranges: topLevelClass }]); +verify.referenceGroups(topLevelClass[1], [{ definition: "constructor topLevelClass(): topLevelClass", ranges: topLevelClass }]); + +verify.singleReferenceGroup("interface topLevelInterface", ranges.get("topLevelInterface")); +verify.singleReferenceGroup("namespace topLevelModule", ranges.get("topLevelModule")); diff --git a/tests/cases/fourslash/referencesForIllegalAssignment.ts b/tests/cases/fourslash/referencesForIllegalAssignment.ts index 59cb6f4f273b9..f65cd5bf1a6f8 100644 --- a/tests/cases/fourslash/referencesForIllegalAssignment.ts +++ b/tests/cases/fourslash/referencesForIllegalAssignment.ts @@ -2,13 +2,13 @@ ////f/*1*/oo = fo/*2*/o; -////var [|bar|] = function () { }; -////[|bar|] = [|bar|] + 1; +////var [|{| "isWriteAccess": true, "isDefinition": true |}bar|] = function () { }; +////[|{| "isWriteAccess": true |}bar|] = [|bar|] + 1; goTo.marker("1"); -verify.referencesAre([]); +verify.noReferences(); goTo.marker("2"); -verify.referencesAre([]); +verify.noReferences(); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var bar: () => void"); diff --git a/tests/cases/fourslash/referencesForImports.ts b/tests/cases/fourslash/referencesForImports.ts index 0203bcee09613..54cbb0f115582 100644 --- a/tests/cases/fourslash/referencesForImports.ts +++ b/tests/cases/fourslash/referencesForImports.ts @@ -5,11 +5,11 @@ //// export = $; ////} -////import [|$|] = require("jquery"); +////import [|{| "isWriteAccess": true, "isDefinition": true |}$|] = require("jquery"); ////[|$|]("a"); -////import [|$|] = require("jquery"); +////import [|{| "isWriteAccess": true, "isDefinition": true |}$|] = require("jquery"); const [r0, r1, r2] = test.ranges(); -verify.rangesReferenceEachOther([r0, r1]); -verify.referencesOf(r2, [r2]); +verify.singleReferenceGroup('import $ = require("jquery")', [r0, r1]); +verify.singleReferenceGroup('import $ = require("jquery")', [r2]); diff --git a/tests/cases/fourslash/referencesForIndexProperty.ts b/tests/cases/fourslash/referencesForIndexProperty.ts index 49d12c258191f..dba2549e4147e 100644 --- a/tests/cases/fourslash/referencesForIndexProperty.ts +++ b/tests/cases/fourslash/referencesForIndexProperty.ts @@ -3,12 +3,14 @@ // References a class property using string index access ////class Foo { -//// [|property|]: number; -//// [|method|](): void { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}property|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void { } ////} //// ////var f: Foo; ////f["[|property|]"]; ////f["[|method|]"]; -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +verify.singleReferenceGroup("(property) Foo.property: number", ranges.get("property")); +verify.singleReferenceGroup("(method) Foo.method(): void", ranges.get("method")); diff --git a/tests/cases/fourslash/referencesForIndexProperty2.ts b/tests/cases/fourslash/referencesForIndexProperty2.ts index 35c9d7cdd64ce..a4d5c75a90833 100644 --- a/tests/cases/fourslash/referencesForIndexProperty2.ts +++ b/tests/cases/fourslash/referencesForIndexProperty2.ts @@ -5,4 +5,4 @@ ////var a; ////a["[|blah|]"]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup('"blah"'); diff --git a/tests/cases/fourslash/referencesForIndexProperty3.ts b/tests/cases/fourslash/referencesForIndexProperty3.ts index 1fdee9b66023a..a2e008c937e8b 100644 --- a/tests/cases/fourslash/referencesForIndexProperty3.ts +++ b/tests/cases/fourslash/referencesForIndexProperty3.ts @@ -3,7 +3,7 @@ // References to a property of the apparent type using string indexer ////interface Object { -//// [|toMyString|](); +//// [|{| "isWriteAccess": true, "isDefinition": true |}toMyString|](); ////} //// ////var y: Object; @@ -12,4 +12,4 @@ ////var x = {}; ////x["[|toMyString|]"](); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(method) Object.toMyString(): any"); diff --git a/tests/cases/fourslash/referencesForInheritedProperties.ts b/tests/cases/fourslash/referencesForInheritedProperties.ts index 19fef4066ee04..c2674fe1fe120 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties.ts @@ -1,15 +1,15 @@ /// ////interface interface1 { -//// [|doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; ////} //// ////interface interface2 extends interface1{ -//// [|doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; ////} //// ////class class1 implements interface2 { -//// [|doStuff|]() { +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { //// //// } ////} @@ -21,4 +21,21 @@ ////var v: class2; ////v.[|doStuff|](); -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) interface1.doStuff(): void", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) interface1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface2.doStuff(): void", ranges: [r1, r2, r3] } +]); +verify.referenceGroups(r2, [ + { definition: "(method) interface1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface2.doStuff(): void", ranges: [r1] }, + { definition: "(method) class1.doStuff(): void", ranges: [r2, r3] } +]); +verify.referenceGroups(r3, [ + { definition: "(method) interface1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface2.doStuff(): void", ranges: [r1] }, + { definition: "(method) class1.doStuff(): void", ranges: [r2] }, + { definition: "(method) class1.doStuff(): void", ranges: [r3] } +]); diff --git a/tests/cases/fourslash/referencesForInheritedProperties2.ts b/tests/cases/fourslash/referencesForInheritedProperties2.ts index 33a7f26aaeaa2..0f89a9aa744f3 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties2.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties2.ts @@ -3,18 +3,18 @@ // extends statement in a diffrent declaration ////interface interface1 { -//// [|doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; ////} //// ////interface interface2 { -//// [|doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; ////} //// ////interface interface2 extends interface1 { ////} //// ////class class1 implements interface2 { -//// [|doStuff|]() { +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { //// //// } ////} @@ -26,4 +26,21 @@ ////var v: class2; ////v.[|doStuff|](); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) interface1.doStuff(): void", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) interface1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface2.doStuff(): void", ranges: [r1, r2, r3] } +]); +verify.referenceGroups(r2, [ + { definition: "(method) interface1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface2.doStuff(): void", ranges: [r1] }, + { definition: "(method) class1.doStuff(): void", ranges: [r2, r3] } +]); +verify.referenceGroups(r3, [ + { definition: "(method) interface1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface2.doStuff(): void", ranges: [r1] }, + { definition: "(method) class1.doStuff(): void", ranges: [r2] }, + { definition: "(method) class1.doStuff(): void", ranges: [r3] } +]); diff --git a/tests/cases/fourslash/referencesForInheritedProperties3.ts b/tests/cases/fourslash/referencesForInheritedProperties3.ts index 3a2d11da69262..c6c870ca350a5 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties3.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties3.ts @@ -1,12 +1,14 @@ /// //// interface interface1 extends interface1 { -//// [|doStuff|](): void; -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// //// var v: interface1; //// v.[|propName|]; //// v.[|doStuff|](); -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +verify.singleReferenceGroup("(method) interface1.doStuff(): void", ranges.get("doStuff")); +verify.singleReferenceGroup("(property) interface1.propName: string", ranges.get("propName")); diff --git a/tests/cases/fourslash/referencesForInheritedProperties4.ts b/tests/cases/fourslash/referencesForInheritedProperties4.ts index 96010d0508666..8a822ec523872 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties4.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties4.ts @@ -1,12 +1,21 @@ /// //// class class1 extends class1 { -//// [|doStuff|]() { } -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// //// var c: class1; //// c.[|doStuff|](); //// c.[|propName|]; -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +const [r0, r1] = ranges.get("doStuff"); +verify.referenceGroups(r0, [ + { definition: "(method) class1.doStuff(): void", ranges: [r0, r1] }, +]); +verify.referenceGroups(r1, [ + { definition: "(method) class1.doStuff(): void", ranges: [r0] }, + { definition: "(method) class1.doStuff(): void", ranges: [r1] }, +]); +verify.singleReferenceGroup("(property) class1.propName: string", ranges.get("propName")); diff --git a/tests/cases/fourslash/referencesForInheritedProperties5.ts b/tests/cases/fourslash/referencesForInheritedProperties5.ts index bbb86f0defbb7..7a5cff0ad2ba0 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties5.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties5.ts @@ -1,16 +1,28 @@ /// //// interface interface1 extends interface1 { -//// [|doStuff|](): void; -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// interface interface2 extends interface1 { -//// [|doStuff|](): void; -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// //// var v: interface1; //// v.[|propName|]; //// v.[|doStuff|](); -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +const [m0, m1, m2] = ranges.get("doStuff"); +const [p0, p1, p2] = ranges.get("propName"); +verify.referenceGroups([m0, m2], [{ definition: "(method) interface1.doStuff(): void", ranges: [m0, m1, m2] }]); +verify.referenceGroups(m1, [ + { definition: "(method) interface1.doStuff(): void", ranges: [m0, m2] }, + { definition: "(method) interface2.doStuff(): void", ranges: [m1] } +]); +verify.referenceGroups([p0, p2], [{ definition: "(property) interface1.propName: string", ranges: [p0, p1, p2] }]); +verify.referenceGroups(p1, [ + { definition: "(property) interface1.propName: string", ranges: [p0, p2] }, + { definition: "(property) interface2.propName: string", ranges: [p1] } +]); diff --git a/tests/cases/fourslash/referencesForInheritedProperties6.ts b/tests/cases/fourslash/referencesForInheritedProperties6.ts index ff008cceb434a..a39dc085c71fc 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties6.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties6.ts @@ -1,16 +1,27 @@ /// //// class class1 extends class1 { -//// [|doStuff|]() { } -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// class class2 extends class1 { -//// [|doStuff|]() { } -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// //// var v: class2; //// v.[|propName|]; //// v.[|doStuff|](); -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); +const [m0, m1, m2] = ranges.get("doStuff"); +verify.referenceGroups(m0, [{ definition: "(method) class1.doStuff(): void", ranges: [m0, m1, m2] }]); +verify.referenceGroups(m1, [ + { definition: "(method) class1.doStuff(): void", ranges: [m0] }, + { definition: "(method) class2.doStuff(): void", ranges: [m1, m2] } +]); +verify.referenceGroups(m2, [ + { definition: "(method) class1.doStuff(): void", ranges: [m0] }, + { definition: "(method) class2.doStuff(): void", ranges: [m1] }, + { definition: "(method) class2.doStuff(): void", ranges: [m2] } +]); diff --git a/tests/cases/fourslash/referencesForInheritedProperties7.ts b/tests/cases/fourslash/referencesForInheritedProperties7.ts index ec92a06f0a321..4911cbefd5747 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties7.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties7.ts @@ -1,30 +1,40 @@ /// //// class class1 extends class1 { -//// [|doStuff|]() { } -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// interface interface1 extends interface1 { -//// [|doStuff|](): void; -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// class class2 extends class1 implements interface1 { -//// [|doStuff|]() { } -//// [|propName|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doStuff|]() { } +//// [|{| "isWriteAccess": true, "isDefinition": true |}propName|]: string; //// } //// //// var v: class2; -//// v.[|propName|]; //// v.[|doStuff|](); +//// v.[|propName|]; const [r0, r1, r2, r3, r4, r5, r6, r7] = test.ranges(); -verify.referencesOf(r0, [r0, r4, r7]); -verify.referencesOf(r1, [r1, r5, r6]); -verify.referencesOf(r2, [r2, r4, r7]); -verify.referencesOf(r3, [r3, r5, r6]); -const allDoStuff = [r0, r2, r4, r7]; -verify.referencesOf(r4, allDoStuff); -const allPropName = [r1, r3, r5, r6]; -verify.referencesOf(r5, allPropName); -verify.referencesOf(r6, allPropName); -verify.referencesOf(r7, allDoStuff); +verify.referenceGroups(r0, [{ definition: "(method) class1.doStuff(): void", ranges: [r0, r4, r6] }]); +verify.referenceGroups(r1, [{ definition: "(property) class1.propName: string", ranges: [r1, r5, r7] }]); +verify.referenceGroups(r2, [{ definition: "(method) interface1.doStuff(): void", ranges: [r2, r4, r6] }]); +verify.referenceGroups(r3, [{ definition: "(property) interface1.propName: string", ranges: [r3, r5, r7] }]); +verify.referenceGroups(r4, [ + { definition: "(method) class1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface1.doStuff(): void", ranges: [r2] }, + { definition: "(method) class2.doStuff(): void", ranges: [r4, r6] } +]); +verify.referenceGroups([r5, r7], [ + { definition: "(property) class1.propName: string", ranges: [r1] }, + { definition: "(property) interface1.propName: string", ranges: [r3] }, + { definition: "(property) class2.propName: string", ranges: [r5, r7] } +]); +verify.referenceGroups(r6, [ + { definition: "(method) class1.doStuff(): void", ranges: [r0] }, + { definition: "(method) interface1.doStuff(): void", ranges: [r2] }, + { definition: "(method) class2.doStuff(): void", ranges: [r4] }, + { definition: "(method) class2.doStuff(): void", ranges: [r6] } +]); diff --git a/tests/cases/fourslash/referencesForInheritedProperties8.ts b/tests/cases/fourslash/referencesForInheritedProperties8.ts index 964309fc47744..d0d94b49b5734 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties8.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties8.ts @@ -1,16 +1,19 @@ /// //// interface C extends D { -//// [|propD|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}propD|]: number; //// } //// interface D extends C { -//// [|propD|]: string; -//// [|propC|]: number; +//// [|{| "isWriteAccess": true, "isDefinition": true |}propD|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}propC|]: number; //// } //// var d: D; //// d.[|propD|]; //// d.[|propC|]; const [d0, d1, c0, d2, c1] = test.ranges(); -verify.rangesReferenceEachOther([d0, d1, d2]); -verify.rangesReferenceEachOther([c0, c1]); +verify.referenceGroups([d0, d1, d2], [ + { definition: "(property) C.propD: number", ranges: [d0] }, + { definition: "(property) D.propD: string", ranges: [d1, d2] }, +]); +verify.singleReferenceGroup("(property) D.propC: number", [c0, c1]); diff --git a/tests/cases/fourslash/referencesForInheritedProperties9.ts b/tests/cases/fourslash/referencesForInheritedProperties9.ts index 7d4330d0aa6d7..27bc164a8fc44 100644 --- a/tests/cases/fourslash/referencesForInheritedProperties9.ts +++ b/tests/cases/fourslash/referencesForInheritedProperties9.ts @@ -1,16 +1,16 @@ /// //// class D extends C { -//// [|prop1|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: string; //// } -//// +//// //// class C extends D { -//// [|prop1|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}prop1|]: string; //// } -//// +//// //// var c: C; //// c.[|prop1|]; const [r0, r1, r2] = test.ranges(); -verify.referencesOf(r0, [r0]); -verify.rangesReferenceEachOther([r1, r2]); +verify.singleReferenceGroup("(property) D.prop1: string", [r0]); +verify.singleReferenceGroup("(property) C.prop1: string", [r1, r2]); diff --git a/tests/cases/fourslash/referencesForLabel.ts b/tests/cases/fourslash/referencesForLabel.ts index 14b58fd1d928d..1abcafda0f264 100644 --- a/tests/cases/fourslash/referencesForLabel.ts +++ b/tests/cases/fourslash/referencesForLabel.ts @@ -11,5 +11,5 @@ ////var label = "label"; const [r0, r1, r2, r3] = test.ranges(); -verify.rangesReferenceEachOther([r0, r1, r2]); -verify.referencesOf(r3, [r3]); +verify.singleReferenceGroup("label", [r0, r1, r2]); +verify.singleReferenceGroup("label", [r3]); diff --git a/tests/cases/fourslash/referencesForLabel2.ts b/tests/cases/fourslash/referencesForLabel2.ts index 841e35ad700f0..6f3721431e090 100644 --- a/tests/cases/fourslash/referencesForLabel2.ts +++ b/tests/cases/fourslash/referencesForLabel2.ts @@ -8,5 +8,4 @@ //// if (true) continue label; ////} -goTo.marker(); -verify.referencesAre([]); +verify.noReferences(""); diff --git a/tests/cases/fourslash/referencesForLabel3.ts b/tests/cases/fourslash/referencesForLabel3.ts index fb7a51f858efa..13622eb90c3b9 100644 --- a/tests/cases/fourslash/referencesForLabel3.ts +++ b/tests/cases/fourslash/referencesForLabel3.ts @@ -6,5 +6,4 @@ //// var label = "label"; ////} -const [label] = test.ranges(); -verify.referencesOf(label, [label]); +verify.singleReferenceGroup("label"); diff --git a/tests/cases/fourslash/referencesForLabel4.ts b/tests/cases/fourslash/referencesForLabel4.ts index 5462500f53c10..2ff159bc755c2 100644 --- a/tests/cases/fourslash/referencesForLabel4.ts +++ b/tests/cases/fourslash/referencesForLabel4.ts @@ -8,4 +8,4 @@ //// } ////} -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("label"); diff --git a/tests/cases/fourslash/referencesForLabel5.ts b/tests/cases/fourslash/referencesForLabel5.ts index 48d5aab04c2a5..bc986e3350ddf 100644 --- a/tests/cases/fourslash/referencesForLabel5.ts +++ b/tests/cases/fourslash/referencesForLabel5.ts @@ -13,5 +13,5 @@ //// } const [outer1, outer2, inner1, inner2, outer3] = test.ranges(); -verify.rangesReferenceEachOther([outer1, outer2, outer3]); -verify.rangesReferenceEachOther([inner1, inner2]); +verify.singleReferenceGroup("label", [outer1, outer2, outer3]); +verify.singleReferenceGroup("label", [inner1, inner2]); diff --git a/tests/cases/fourslash/referencesForLabel6.ts b/tests/cases/fourslash/referencesForLabel6.ts index aea458057569a..0255c07943c1c 100644 --- a/tests/cases/fourslash/referencesForLabel6.ts +++ b/tests/cases/fourslash/referencesForLabel6.ts @@ -7,6 +7,6 @@ //// break labelc; ////} -const [a, b, useB] = test.ranges(); -verify.referencesOf(a, [a]); -verify.rangesReferenceEachOther([b, useB]); +const ranges = test.rangesByText(); +verify.singleReferenceGroup("labela", ranges.get("labela")); +verify.singleReferenceGroup("labelb", ranges.get("labelb")); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations.ts b/tests/cases/fourslash/referencesForMergedDeclarations.ts index 8a0a5d4c680c4..3e2fe8e4b2c04 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations.ts @@ -1,13 +1,13 @@ /// -////interface [|Foo|] { +////interface [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] { ////} //// -////module [|Foo|] { +////module [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] { //// export interface Bar { } ////} //// -////function [|Foo|](): void { +////function [|{| "isWriteAccess": true, "isDefinition": true |}Foo|](): void { ////} //// ////var f1: [|Foo|].Bar; @@ -15,6 +15,7 @@ ////[|Foo|].bind(this); const [type1, namespace1, value1, namespace2, type2, value2] = test.ranges(); -verify.rangesReferenceEachOther([type1, type2]); -verify.rangesReferenceEachOther([namespace1, namespace2]); -verify.rangesReferenceEachOther([value1, value2]); +verify.singleReferenceGroup("interface Foo\nnamespace Foo\nfunction Foo(): void", [type1, type2]); +verify.singleReferenceGroup("namespace Foo\nfunction Foo(): void", [namespace1, namespace2]); +verify.referenceGroups(value1, [{ definition: "function Foo(): void\nnamespace Foo", ranges: [value1, value2] }]); +verify.referenceGroups(value2, [{ definition: "namespace Foo\nfunction Foo(): void", ranges: [value1, value2] }]); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations2.ts b/tests/cases/fourslash/referencesForMergedDeclarations2.ts index 75d485002a496..5cf9234511a90 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations2.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations2.ts @@ -6,9 +6,9 @@ //// ////function ATest() { } //// -////import [|alias|] = ATest; // definition +////import [|{| "isWriteAccess": true, "isDefinition": true |}alias|] = ATest; // definition //// ////var a: [|alias|].Bar; // namespace ////[|alias|].call(this); // value -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("import alias = ATest"); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations3.ts b/tests/cases/fourslash/referencesForMergedDeclarations3.ts index 181d68e79b3b6..5ce024258ed5b 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations3.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations3.ts @@ -1,13 +1,13 @@ /// -// class and uninstanciated module +// class and uninstantiated module -////class [|testClass|] { +////class [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] { //// static staticMethod() { } //// method() { } ////} //// -////module [|testClass|] { +////module [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] { //// export interface Bar { //// //// } @@ -21,5 +21,7 @@ ////new [|testClass|](); const [class0, module0, class1, module1, class2, class3, class4, class5] = test.ranges(); -verify.rangesReferenceEachOther([module0, module1]); -verify.rangesReferenceEachOther([class0, class1, class2, class3, class4, class5]); +verify.singleReferenceGroup("class testClass\nnamespace testClass", [module0, module1]); +const classes = [class0, class1, class2, class3, class4, class5]; +verify.referenceGroups(classes.slice(0, 5), [{ definition: "class testClass\nnamespace testClass", ranges: classes }]); +verify.referenceGroups(class5, [{ definition: "constructor testClass(): testClass\nnamespace testClass", ranges: classes }]); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations4.ts b/tests/cases/fourslash/referencesForMergedDeclarations4.ts index d35cbea745de1..55eb331dd9068 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations4.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations4.ts @@ -1,13 +1,13 @@ /// -// class and instanciated module +// class and instantiated module -////class [|testClass|] { +////class [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] { //// static staticMethod() { } //// method() { } ////} //// -////module [|testClass|] { +////module [|{| "isWriteAccess": true, "isDefinition": true |}testClass|] { //// export interface Bar { //// //// } @@ -22,4 +22,6 @@ ////[|testClass|].s; ////new [|testClass|](); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +verify.referenceGroups(ranges.slice(0, 8), [{ definition: "class testClass\nnamespace testClass", ranges }]); +verify.referenceGroups(ranges[8], [{ definition: "constructor testClass(): testClass\nnamespace testClass", ranges }]); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations5.ts b/tests/cases/fourslash/referencesForMergedDeclarations5.ts index 8fe33ca31e415..8cf597333b09c 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations5.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations5.ts @@ -1,10 +1,14 @@ /// -////interface [|Foo|] { } -////module [|Foo|] { export interface Bar { } } -////function [|Foo|]() { } +////interface [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] { } +////module [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] { export interface Bar { } } +////function [|{| "isWriteAccess": true, "isDefinition": true |}Foo|]() { } //// ////export = [|Foo|]; -const [r0, r1, r2, r3] = test.ranges(); -verify.referencesOf(r3, [r0, r1, r2, r3]); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups(r0, [{ definition: "interface Foo\nnamespace Foo\nfunction Foo(): void", ranges: [r0, r3] }]); +verify.referenceGroups(r1, [{ definition: "namespace Foo\nfunction Foo(): void", ranges: [r1, r3] }]); +verify.referenceGroups(r2, [{ definition: "function Foo(): void\nnamespace Foo", ranges: [r2, r3] }]); +verify.referenceGroups(r3, [{ definition: "interface Foo\nnamespace Foo\nfunction Foo(): void", ranges }]); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations6.ts b/tests/cases/fourslash/referencesForMergedDeclarations6.ts index e4b5b9111c660..79ee0128ab602 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations6.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations6.ts @@ -1,7 +1,7 @@ /// ////interface Foo { } -////module [|Foo|] { +////module [|{| "isWriteAccess": true, "isDefinition": true |}Foo|] { //// export interface Bar { } //// export module Bar { export interface Baz { } } //// export function Bar() { } @@ -10,4 +10,4 @@ ////// module ////import a1 = [|Foo|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("namespace Foo"); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations7.ts b/tests/cases/fourslash/referencesForMergedDeclarations7.ts index bc56b5d6f9d9b..66acffde980dc 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations7.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations7.ts @@ -2,13 +2,17 @@ ////interface Foo { } ////module Foo { -//// export interface [|Bar|] { } -//// export module [|Bar|] { export interface Baz { } } -//// export function [|Bar|]() { } +//// export interface [|{| "isWriteAccess": true, "isDefinition": true |}Bar|] { } +//// export module [|{| "isWriteAccess": true, "isDefinition": true |}Bar|] { export interface Baz { } } +//// export function [|{| "isWriteAccess": true, "isDefinition": true |}Bar|]() { } ////} //// ////// module, value and type ////import a2 = Foo.[|Bar|]; -const [r0, r1, r2, r3] = test.ranges(); -verify.referencesOf(r3, [r0, r1, r2, r3]); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups(r0, [{ definition: "interface Foo.Bar\nnamespace Foo.Bar\nfunction Foo.Bar(): void", ranges: [r0, r3] }]); +verify.referenceGroups(r1, [{ definition: "namespace Foo.Bar\nfunction Foo.Bar(): void", ranges: [r1, r3] }]); +verify.referenceGroups(r2, [{ definition: "function Foo.Bar(): void\nnamespace Foo.Bar", ranges: [r2, r3] }]); +verify.referenceGroups(r3, [{ definition: "interface Foo.Bar\nnamespace Foo.Bar\nfunction Foo.Bar(): void", ranges }]); diff --git a/tests/cases/fourslash/referencesForMergedDeclarations8.ts b/tests/cases/fourslash/referencesForMergedDeclarations8.ts index b5b1428b7c94e..742561e21c565 100644 --- a/tests/cases/fourslash/referencesForMergedDeclarations8.ts +++ b/tests/cases/fourslash/referencesForMergedDeclarations8.ts @@ -3,11 +3,11 @@ ////interface Foo { } ////module Foo { //// export interface Bar { } -//// export module [|Bar|] { export interface Baz { } } +//// export module [|{| "isWriteAccess": true, "isDefinition": true |}Bar|] { export interface Baz { } } //// export function Bar() { } ////} //// ////// module ////import a3 = Foo.[|Bar|].Baz; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("namespace Foo.Bar\nfunction Foo.Bar(): void"); diff --git a/tests/cases/fourslash/referencesForNoContext.ts b/tests/cases/fourslash/referencesForNoContext.ts index 4631ce50c16e2..2ea576561678a 100644 --- a/tests/cases/fourslash/referencesForNoContext.ts +++ b/tests/cases/fourslash/referencesForNoContext.ts @@ -21,14 +21,4 @@ //// } ////} -goTo.marker("1"); -verify.referencesAre([]); - -goTo.marker("2"); -verify.referencesAre([]); - -goTo.marker("3"); -verify.referencesAre([]); - -goTo.marker("4"); -verify.referencesAre([]); +goTo.eachMarker(() => verify.noReferences()); diff --git a/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts b/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts index 5e6e817209247..effa4abc16451 100644 --- a/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts +++ b/tests/cases/fourslash/referencesForNumericLiteralPropertyNames.ts @@ -1,12 +1,23 @@ /// ////class Foo { -//// public [|12|]: any; +//// public [|{| "isDefinition": true |}12|]: any; ////} //// ////var x: Foo; ////x[[|12|]]; -////x = { "[|12|]": 0 }; -////x = { [|12|]: 0 }; +////x = { "[|{| "isDefinition": true |}12|]": 0 }; +////x = { [|{| "isDefinition": true |}12|]: 0 }; -verify.rangesReferenceEachOther(); +//verify.singleReferenceGroup("(property) Foo[12]: any"); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups([r0, r1], [{ definition: "(property) Foo[12]: any", ranges }]); +verify.referenceGroups(r2, [ + { definition: "(property) Foo[12]: any", ranges: [r0, r1, r3] }, + { definition: "(property) \"12\": number", ranges: [r2] } +]); +verify.referenceGroups(r3, [ + { definition: "(property) Foo[12]: any", ranges: [r0, r1, r2] }, + { definition: "(property) 12: number", ranges: [r3] } +]); diff --git a/tests/cases/fourslash/referencesForObjectLiteralProperties.ts b/tests/cases/fourslash/referencesForObjectLiteralProperties.ts index f2a815e845bac..ea7c20829ae64 100644 --- a/tests/cases/fourslash/referencesForObjectLiteralProperties.ts +++ b/tests/cases/fourslash/referencesForObjectLiteralProperties.ts @@ -2,10 +2,16 @@ // References to an object literal property -////var x = { [|add|]: 0, b: "string" }; +////var x = { [|{| "isWriteAccess": true, "isDefinition": true |}add|]: 0, b: "string" }; ////x["[|add|]"]; ////x.[|add|]; ////var y = x; ////y.[|add|]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3] = ranges; +verify.referenceGroups(r0, [{ definition: "(property) add: number", ranges }]); +verify.referenceGroups([r1, r2, r3], [ + { definition: "(property) add: number", ranges: [r0] }, + { definition: "(property) add: number", ranges: [r1, r2, r3] } +]); diff --git a/tests/cases/fourslash/referencesForOverrides.ts b/tests/cases/fourslash/referencesForOverrides.ts index 4896bd1cd39d9..5ce6bc5ed040e 100644 --- a/tests/cases/fourslash/referencesForOverrides.ts +++ b/tests/cases/fourslash/referencesForOverrides.ts @@ -3,59 +3,59 @@ ////module FindRef3 { //// module SimpleClassTest { //// export class Foo { -//// public [|foo|](): void { +//// public [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void { //// } //// } //// export class Bar extends Foo { -//// public [|foo|](): void { +//// public [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void { //// } //// } //// } //// //// module SimpleInterfaceTest { //// export interface IFoo { -//// [|ifoo|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}ifoo|](): void; //// } //// export interface IBar extends IFoo { -//// [|ifoo|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}ifoo|](): void; //// } //// } //// //// module SimpleClassInterfaceTest { //// export interface IFoo { -//// [|icfoo|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}icfoo|](): void; //// } //// export class Bar implements IFoo { -//// public [|icfoo|](): void { +//// public [|{| "isWriteAccess": true, "isDefinition": true |}icfoo|](): void { //// } //// } //// } //// //// module Test { //// export interface IBase { -//// [|field|]: string; -//// [|method|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}field|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void; //// } //// //// export interface IBlah extends IBase { -//// [|field|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}field|]: string; //// } //// //// export interface IBlah2 extends IBlah { -//// [|field|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}field|]: string; //// } //// //// export interface IDerived extends IBlah2 { -//// [|method|](): void; +//// [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void; //// } //// //// export class Bar implements IDerived { -//// public [|field|]: string; -//// public [|method|](): void { } +//// public [|{| "isWriteAccess": true, "isDefinition": true |}field|]: string; +//// public [|{| "isWriteAccess": true, "isDefinition": true |}method|](): void { } //// } //// //// export class BarBlah extends Bar { -//// public [|field|]: string; +//// public [|{| "isWriteAccess": true, "isDefinition": true |}field|]: string; //// } //// } //// @@ -75,4 +75,67 @@ //// } ////} -verify.rangesWithSameTextReferenceEachOther(); +const ranges = test.rangesByText(); + +const fooRanges = ranges.get("foo"); +const [foo0, foo1, foo2] = fooRanges; +verify.referenceGroups(foo0, [{ definition: "(method) SimpleClassTest.Foo.foo(): void", ranges: fooRanges }]); +verify.referenceGroups([foo1, foo2], [ + { definition: "(method) SimpleClassTest.Foo.foo(): void", ranges: [foo0] }, + { definition: "(method) SimpleClassTest.Bar.foo(): void", ranges: [foo1, foo2] } +]); + +const ifooRanges = ranges.get("ifoo"); +const [ifoo0, ifoo1, ifoo2] = ifooRanges; +verify.referenceGroups(ifoo0, [{ definition: "(method) SimpleInterfaceTest.IFoo.ifoo(): void", ranges: ifooRanges }]); +verify.referenceGroups([ifoo1, ifoo2], [ + { definition: "(method) SimpleInterfaceTest.IFoo.ifoo(): void", ranges: [ifoo0] }, + { definition: "(method) SimpleInterfaceTest.IBar.ifoo(): void", ranges: [ifoo1, ifoo2] } +]); + +const icfooRanges = ranges.get("icfoo"); +const [icfoo0, icfoo1, icfoo2] = icfooRanges; +verify.referenceGroups(icfoo0, [{ definition: "(method) SimpleClassInterfaceTest.IFoo.icfoo(): void", ranges: icfooRanges }]); +verify.referenceGroups([icfoo1, icfoo2], [ + { definition: "(method) SimpleClassInterfaceTest.IFoo.icfoo(): void", ranges: [icfoo0] }, + { definition: "(method) SimpleClassInterfaceTest.Bar.icfoo(): void", ranges: [icfoo1, icfoo2] } +]); + +const fieldRanges = ranges.get("field"); +const [field0, field1, field2, field3, field4, field5] = fieldRanges; +verify.referenceGroups(field0, [{ definition: "(property) Test.IBase.field: string", ranges: fieldRanges }]); +verify.referenceGroups(field1, [ + { definition: "(property) Test.IBase.field: string", ranges: [field0] }, + { definition: "(property) Test.IBlah.field: string", ranges: fieldRanges.slice(1) } +]); +verify.referenceGroups(field2, [ + { definition: "(property) Test.IBase.field: string", ranges: [field0] }, + { definition: "(property) Test.IBlah.field: string", ranges: [field1] }, + { definition: "(property) Test.IBlah2.field: string", ranges: fieldRanges.slice(2) } +]); +verify.referenceGroups(field3, [ + { definition: "(property) Test.IBase.field: string", ranges: [field0] }, + { definition: "(property) Test.IBlah.field: string", ranges: [field1] }, + { definition: "(property) Test.IBlah2.field: string", ranges: [field2] }, + { definition: "(property) Test.Bar.field: string", ranges: fieldRanges.slice(3) } +]); +verify.referenceGroups([field4, field5], [ + { definition: "(property) Test.IBase.field: string", ranges: [field0] }, + { definition: "(property) Test.IBlah.field: string", ranges: [field1] }, + { definition: "(property) Test.IBlah2.field: string", ranges: [field2] }, + { definition: "(property) Test.Bar.field: string", ranges: [field3] }, + { definition: "(property) Test.BarBlah.field: string", ranges: fieldRanges.slice(4) } +]); + +const methodRanges = ranges.get("method"); +const [method0, method1, method2, method3] = methodRanges; +verify.referenceGroups(method0, [{ definition: "(method) Test.IBase.method(): void", ranges: methodRanges }]); +verify.referenceGroups(method1, [ + { definition: "(method) Test.IBase.method(): void", ranges: [method0] }, + { definition: "(method) Test.IDerived.method(): void", ranges: methodRanges.slice(1) } +]); +verify.referenceGroups([method2, method3], [ + { definition: "(method) Test.IBase.method(): void", ranges: [method0] }, + { definition: "(method) Test.IDerived.method(): void", ranges: [method1] }, + { definition: "(method) Test.Bar.method(): void", ranges: methodRanges.slice(2) } +]); diff --git a/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts b/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts index a8b08eae50614..a92ac909782bc 100644 --- a/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts +++ b/tests/cases/fourslash/referencesForPropertiesOfGenericType.ts @@ -1,7 +1,7 @@ /// ////interface IFoo { -//// [|doSomething|](v: T): T; +//// [|{| "isWriteAccess": true, "isDefinition": true |}doSomething|](v: T): T; ////} //// ////var x: IFoo; @@ -10,4 +10,14 @@ ////var y: IFoo; ////y.[|doSomething|](12); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) IFoo.doSomething(v: T): T", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) IFoo.doSomething(v: string): string", ranges: [r0, r2] }, + { definition: "(method) IFoo.doSomething(v: string): string", ranges: [r1] } +]); +verify.referenceGroups(r2, [ + { definition: "(method) IFoo.doSomething(v: number): number", ranges: [r0, r1] }, + { definition: "(method) IFoo.doSomething(v: number): number", ranges: [r2] } +]); diff --git a/tests/cases/fourslash/referencesForStatic.ts b/tests/cases/fourslash/referencesForStatic.ts index c659400670819..17c33daac32d6 100644 --- a/tests/cases/fourslash/referencesForStatic.ts +++ b/tests/cases/fourslash/referencesForStatic.ts @@ -6,7 +6,7 @@ ////var n = 43; //// ////class foo { -//// static [|n|] = ''; +//// static [|{| "isWriteAccess": true, "isDefinition": true |}n|] = ''; //// //// public bar() { //// foo.[|n|] = "'"; @@ -30,4 +30,4 @@ // @Filename: referencesOnStatic_2.ts ////var q = foo.[|n|]; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("(property) foo.n: string"); diff --git a/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts b/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts index cada3e0fcf496..1e393ef6761c3 100644 --- a/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts +++ b/tests/cases/fourslash/referencesForStaticsAndMembersWithSameNames.ts @@ -3,12 +3,12 @@ ////module FindRef4 { //// module MixedStaticsClassTest { //// export class Foo { -//// [|bar|]: Foo; -//// static [|bar|]: Foo; +//// [|{| "isWriteAccess": true, "isDefinition": true |}bar|]: Foo; +//// static [|{| "isWriteAccess": true, "isDefinition": true |}bar|]: Foo; //// -//// public [|foo|](): void { +//// public [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void { //// } -//// public static [|foo|](): void { +//// public static [|{| "isWriteAccess": true, "isDefinition": true |}foo|](): void { //// } //// } //// } @@ -28,13 +28,16 @@ const [fooBar, fooStaticBar, fooFoo, fooStaticFoo, xFoo, xBar, staticFoo, staticBar] = test.ranges(); // References to a member method with the same name as a static. -verify.referencesOf(fooFoo, [fooFoo, xFoo]); +verify.singleReferenceGroup("(method) MixedStaticsClassTest.Foo.foo(): void", [fooFoo, xFoo]); // References to a static method with the same name as a member. -verify.referencesOf(fooStaticFoo, [fooStaticFoo, staticFoo]); +verify.singleReferenceGroup("(method) MixedStaticsClassTest.Foo.foo(): void", [fooStaticFoo, staticFoo]); // References to a member property with the same name as a static. -verify.referencesOf(fooBar, [fooBar, xBar]); +//verify.singleReferenceGroup("(property) MixedStaticsClassTest.Foo.bar: Foo", [fooBar, xBar]); +verify.referenceGroups(fooBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: Foo", ranges: [fooBar, xBar] }]); +verify.referenceGroups(xBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: MixedStaticsClassTest.Foo", ranges: [fooBar, xBar] }]); // References to a static property with the same name as a member. -verify.referencesOf(fooStaticBar, [fooStaticBar, staticBar]); +verify.referenceGroups(fooStaticBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: Foo", ranges: [fooStaticBar, staticBar] }]); +verify.referenceGroups(staticBar, [{ definition: "(property) MixedStaticsClassTest.Foo.bar: MixedStaticsClassTest.Foo", ranges: [fooStaticBar, staticBar] }]); diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts index 2db0325d32448..e9be352f8196a 100644 --- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts +++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames.ts @@ -1,13 +1,23 @@ /// ////class Foo { -//// public "[|ss|]": any; +//// public "[|{| "isDefinition": true |}ss|]": any; ////} //// ////var x: Foo; ////x.[|ss|]; ////x["[|ss|]"]; -////x = { "[|ss|]": 0 }; -////x = { [|ss|]: 0 }; +////x = { "[|{| "isDefinition": true |}ss|]": 0 }; +////x = { [|{| "isWriteAccess": true, "isDefinition": true |}ss|]: 0 }; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2, r3, r4] = ranges; +verify.referenceGroups([r0, r1, r2], [{ definition: '(property) Foo["ss"]: any', ranges }]); +verify.referenceGroups(r3, [ + { definition: '(property) Foo["ss"]: any', ranges: [r0, r1, r2, r4] }, + { definition: '(property) "ss": number', ranges: [r3] } +]); +verify.referenceGroups(r4, [ + { definition: '(property) Foo["ss"]: any', ranges: [r0, r1, r2, r3] }, + { definition: '(property) ss: number', ranges: [r4] } +]); diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts index 275a2b2756c0b..6fbb0b850729d 100644 --- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts +++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames2.ts @@ -1,10 +1,17 @@ /// ////class Foo { -//// "[|blah|]"() { return 0; } +//// "[|{| "isDefinition": true |}blah|]"() { return 0; } ////} //// ////var x: Foo; ////x.[|blah|]; -verify.rangesReferenceEachOther(); +//verify.singleReferenceGroup('(method) Foo["blah"](): number'); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: '(method) Foo["blah"](): number', ranges }]); +verify.referenceGroups(r1, [ + { definition: '(method) Foo["blah"](): number', ranges: [r0] }, + { definition: '(method) Foo["blah"](): number', ranges: [r1] } +]); diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts index 55a067ae8c338..d4e12a67afc0a 100644 --- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts +++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames3.ts @@ -1,11 +1,17 @@ /// ////class Foo2 { -//// get "[|42|]"() { return 0; } -//// set [|42|](n) { } +//// get "[|{| "isDefinition": true |}42|]"() { return 0; } +//// set [|{| "isDefinition": true |}42|](n) { } ////} //// ////var y: Foo2; ////y[[|42|]]; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups([r0, r1], [{ definition: '(property) Foo2["42"]: number', ranges }]); +verify.referenceGroups(r2, [ + { definition: '(property) Foo2["42"]: number', ranges: [r0, r1] }, + { definition: '(property) Foo2["42"]: number', ranges: [r2] }, +]); diff --git a/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts b/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts index 34cad8f11e891..efe8972f2c7dc 100644 --- a/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts +++ b/tests/cases/fourslash/referencesForStringLiteralPropertyNames4.ts @@ -1,7 +1,13 @@ /// -////var x = { "[|someProperty|]": 0 } +////var x = { "[|{| "isDefinition": true |}someProperty|]": 0 } ////x["[|someProperty|]"] = 3; -////x./*1*/[|someProperty|] = 5; +////x.[|someProperty|] = 5; -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1, r2] = ranges; +verify.referenceGroups(r0, [{ definition: '(property) "someProperty": number', ranges }]); +verify.referenceGroups([r1, r2], [ + { definition: '(property) "someProperty": number', ranges: [r0] }, + { definition: '(property) "someProperty": number', ranges: [r1, r2] }, +]); diff --git a/tests/cases/fourslash/referencesForUnionProperties.ts b/tests/cases/fourslash/referencesForUnionProperties.ts index 07eebeb5f7434..975700773463c 100644 --- a/tests/cases/fourslash/referencesForUnionProperties.ts +++ b/tests/cases/fourslash/referencesForUnionProperties.ts @@ -1,16 +1,16 @@ /// ////interface One { -//// common: { [|a|]: number; }; +//// common: { [|{| "isWriteAccess": true, "isDefinition": true |}a|]: number; }; ////} //// ////interface Base { -//// [|a|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string; //// b: string; ////} //// ////interface HasAOrB extends Base { -//// [|a|]: string; +//// [|{| "isWriteAccess": true, "isDefinition": true |}a|]: string; //// b: string; ////} //// @@ -23,7 +23,15 @@ ////x.common.[|a|]; const [one, base, hasAOrB, x] = test.ranges(); -verify.referencesOf(one, [one, x]); -verify.referencesOf(base, [base, hasAOrB, x]); -verify.referencesOf(hasAOrB, [base, hasAOrB, x]); -verify.referencesOf(x, [one, base, hasAOrB, x]); +verify.referenceGroups(one, [{ definition: "(property) a: number", ranges: [one, x] }]); +verify.referenceGroups(base, [{ definition: "(property) Base.a: string", ranges: [base, hasAOrB, x] }]); +verify.referenceGroups(hasAOrB, [ + { definition: "(property) Base.a: string", ranges: [base] }, + { definition: "(property) HasAOrB.a: string", ranges: [hasAOrB, x] } +]); +verify.referenceGroups(x, [ + { definition: "(property) a: number", ranges: [one] }, + { definition: "(property) Base.a: string", ranges: [base] }, + { definition: "(property) HasAOrB.a: string", ranges: [hasAOrB] }, + { definition: "(property) a: string | number", ranges: [x] } +]); diff --git a/tests/cases/fourslash/referencesInComment.ts b/tests/cases/fourslash/referencesInComment.ts index eabf74d2f232f..674ee41a8d286 100644 --- a/tests/cases/fourslash/referencesInComment.ts +++ b/tests/cases/fourslash/referencesInComment.ts @@ -5,4 +5,4 @@ ////class foo { } ////var bar = 0; -goTo.eachMarker(() => verify.referencesAre([])); +goTo.eachMarker(() => verify.noReferences()); diff --git a/tests/cases/fourslash/remoteGetReferences.ts b/tests/cases/fourslash/remoteGetReferences.ts index d9b6c6e852c6a..292864f9ed4a6 100644 --- a/tests/cases/fourslash/remoteGetReferences.ts +++ b/tests/cases/fourslash/remoteGetReferences.ts @@ -95,10 +95,10 @@ //////Increments ////[|remotefooCls|].[|remoteclsSVar|]++; ////remotemodTest.remotemodVar++; -////[|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|]; +////[|{| "isWriteAccess": true |}remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|]; //// //////ETC - Other cases -////[|remoteglobalVar|] = 3; +////[|{| "isWriteAccess": true |}remoteglobalVar|] = 3; //// //////Find References misses method param ////var @@ -119,16 +119,16 @@ ////}); // @Filename: remoteGetReferences_2.ts -////var [|remoteglobalVar|]: number = 2; +////var [|{| "isWriteAccess": true, "isDefinition": true |}remoteglobalVar|]: number = 2; //// -////class [|remotefooCls|] { +////class [|{| "isWriteAccess": true, "isDefinition": true |}remotefooCls|] { //// //Declare -//// [|remoteclsVar|] = 1; -//// static [|remoteclsSVar|] = 1; +//// [|{| "isWriteAccess": true, "isDefinition": true |}remoteclsVar|] = 1; +//// static [|{| "isWriteAccess": true, "isDefinition": true |}remoteclsSVar|] = 1; //// //// constructor(public remoteclsParam: number) { //// //Increments -//// [|remoteglobalVar|]++; +//// [|{| "isWriteAccess": true |}remoteglobalVar|]++; //// this.[|remoteclsVar|]++; //// [|remotefooCls|].[|remoteclsSVar|]++; //// this.remoteclsParam++; @@ -142,7 +142,7 @@ //// //// //Increments //// [|remotefooCls|].[|remoteclsSVar|]++; -//// [|remoteglobalVar|]++; +//// [|{| "isWriteAccess": true |}remoteglobalVar|]++; //// remotemodTest.remotemodVar++; //// remotefnVar++; //// @@ -155,7 +155,7 @@ //// export var remotemodVar: number; //// //// //Increments -//// [|remoteglobalVar|]++; +//// [|{| "isWriteAccess": true |}remoteglobalVar|]++; //// [|remotefooCls|].[|remoteclsSVar|]++; //// remotemodVar++; //// @@ -167,7 +167,7 @@ //// static remoteboo = remotefoo; //// //// //Increments -//// [|remoteglobalVar|]++; +//// [|{| "isWriteAccess": true |}remoteglobalVar|]++; //// [|remotefooCls|].[|remoteclsSVar|]++; //// remotemodVar++; //// } @@ -177,4 +177,24 @@ //// } ////} -verify.rangesWithSameTextReferenceEachOther(); +test.rangesByText().forEach((ranges, text) => { + const definition = (() => { + switch (text) { + case "remotefooCls": return "class remotefooCls"; + case "remoteglobalVar": return "var remoteglobalVar: number"; + case "remoteclsSVar": return "(property) remotefooCls.remoteclsSVar: number"; + case "remoteclsVar": return "(property) remotefooCls.remoteclsVar: number"; + default: throw new Error(text); + } + })(); + + if (text === "remotefooCls") { + verify.referenceGroups([ranges[0], ...ranges.slice(2)], [{ definition, ranges }]); + verify.referenceGroups(ranges[1], [ + { definition: "constructor remotefooCls(remoteclsParam: number): remotefooCls", ranges} + ]); + } + else { + verify.singleReferenceGroup(definition, ranges); + } +}); diff --git a/tests/cases/fourslash/renameDefaultImport.ts b/tests/cases/fourslash/renameDefaultImport.ts index ff297ffa14741..bcac46d7a636b 100644 --- a/tests/cases/fourslash/renameDefaultImport.ts +++ b/tests/cases/fourslash/renameDefaultImport.ts @@ -1,21 +1,23 @@ /// // @Filename: B.ts -////export default class /*1*/[|B|] { +////export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true |}B|] { //// test() { //// } ////} // @Filename: A.ts -////import [|B|] from "./B"; +////import [|{| "isWriteAccess": true, "isDefinition": true |}B|] from "./B"; ////let b = new [|B|](); ////b.test(); goTo.marker("1"); verify.occurrencesAtPositionCount(1); -const [C, B0, B1] = test.ranges(); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [C, B0, B1] = ranges; +verify.referenceGroups([C, B0], [{ definition: "class B", ranges }]); +verify.referenceGroups(B1, [{ definition: "constructor B(): B", ranges }]); goTo.rangeStart(C); verify.renameLocations(false, false, [C, B0, B1]); diff --git a/tests/cases/fourslash/renameDefaultImportDifferentName.ts b/tests/cases/fourslash/renameDefaultImportDifferentName.ts index be968c9b8830d..590c81c650c7c 100644 --- a/tests/cases/fourslash/renameDefaultImportDifferentName.ts +++ b/tests/cases/fourslash/renameDefaultImportDifferentName.ts @@ -1,21 +1,23 @@ /// // @Filename: B.ts -////export default class /*1*/[|C|] { +////export default class /*1*/[|{| "isWriteAccess": true, "isDefinition": true |}C|] { //// test() { //// } ////} // @Filename: A.ts -////import [|B|] from "./B"; +////import [|{| "isWriteAccess": true, "isDefinition": true |}B|] from "./B"; ////let b = new [|B|](); ////b.test(); goTo.marker("1"); verify.occurrencesAtPositionCount(1); -const [C, B0, B1] = test.ranges(); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [C, B0, B1] = ranges; +verify.referenceGroups([C, B0], [{ definition: "class C", ranges }]); +verify.referenceGroups(B1, [{ definition: "constructor C(): B", ranges }]); goTo.rangeStart(C); verify.renameLocations(false, false, [C, B0, B1]); diff --git a/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts index e982d6a4c7bd2..656a48f24dd69 100644 --- a/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts +++ b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts @@ -1,10 +1,10 @@ /// // @Filename: a.ts -////export var [|a|]; +////export var [|{| "isWriteAccess": true, "isDefinition": true |}a|]; // @Filename: b.ts -////import { [|a|] } from './a'; -////export { [|a|] }; +////import { [|{| "isWriteAccess": true, "isDefinition": true |}a|] } from './a'; +////export { [|{| "isWriteAccess": true, "isDefinition": true |}a|] }; -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("var a: any"); diff --git a/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts b/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts index cb829807602e4..fa9a510d5ac18 100644 --- a/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts +++ b/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts @@ -1,4 +1,4 @@ -/// +/// //@Filename: findAllRefsOnDefinition-import.ts ////export class Test{ @@ -7,7 +7,7 @@ //// //// } //// -//// public [|start|](){ +//// public [|{| "isWriteAccess": true, "isDefinition": true |}start|](){ //// return this; //// } //// @@ -23,4 +23,10 @@ ////second.[|start|](); ////second.stop(); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] }, + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/shims/getReferencesAtPosition.ts b/tests/cases/fourslash/shims/getReferencesAtPosition.ts index cb829807602e4..fa9a510d5ac18 100644 --- a/tests/cases/fourslash/shims/getReferencesAtPosition.ts +++ b/tests/cases/fourslash/shims/getReferencesAtPosition.ts @@ -1,4 +1,4 @@ -/// +/// //@Filename: findAllRefsOnDefinition-import.ts ////export class Test{ @@ -7,7 +7,7 @@ //// //// } //// -//// public [|start|](){ +//// public [|{| "isWriteAccess": true, "isDefinition": true |}start|](){ //// return this; //// } //// @@ -23,4 +23,10 @@ ////second.[|start|](); ////second.stop(); -verify.rangesReferenceEachOther(); +const ranges = test.ranges(); +const [r0, r1] = ranges; +verify.referenceGroups(r0, [{ definition: "(method) Test.start(): this", ranges }]); +verify.referenceGroups(r1, [ + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r0] }, + { definition: "(method) Second.Test.start(): Second.Test", ranges: [r1] } +]); diff --git a/tests/cases/fourslash/untypedModuleImport.ts b/tests/cases/fourslash/untypedModuleImport.ts index da6473cf992ed..1854010d5b68f 100644 --- a/tests/cases/fourslash/untypedModuleImport.ts +++ b/tests/cases/fourslash/untypedModuleImport.ts @@ -4,7 +4,7 @@ ////{} // @Filename: a.ts -////import /*foo*/[|foo|] from /*fooModule*/"foo"; +////import /*foo*/[|{| "isWriteAccess": true, "isDefinition": true |}foo|] from /*fooModule*/"foo"; ////[|foo|](); goTo.file("a.ts"); @@ -13,9 +13,9 @@ verify.numberOfErrorsInCurrentFile(0); goTo.marker("fooModule"); verify.goToDefinitionIs([]); verify.quickInfoIs(""); -verify.referencesAre([]) +verify.noReferences(); goTo.marker("foo"); verify.goToDefinitionIs([]); verify.quickInfoIs("import foo"); -verify.rangesReferenceEachOther(); +verify.singleReferenceGroup("import foo"); From d77945fe1f426ef5b7e1d110125a628013a83d16 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 31 Jan 2017 10:28:02 -0800 Subject: [PATCH 024/116] typeof now has string literal union type Previously, it was just a string --- src/compiler/checker.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 26c27cb3be2e3..47811d6ccaf53 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14609,7 +14609,9 @@ namespace ts { function checkTypeOfExpression(node: TypeOfExpression): Type { checkExpression(node.expression); - return stringType; + const types: Type[] = []; + typeofEQFacts.forEach((_, s) => types.push(getLiteralTypeForText(TypeFlags.StringLiteral, s))); + return getUnionType(types); } function checkVoidExpression(node: VoidExpression): Type { From 69e9bfef356ed904d35ec601ff0d00f4c842a7d3 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 31 Jan 2017 10:28:32 -0800 Subject: [PATCH 025/116] Add typeof test case and update baselines Test that `typeof x === 'random' as string`: 1. Does not issue an error. 2. Does not narrow. --- .../reference/TypeGuardWithEnumUnion.types | 8 +- .../reference/anonymousClassExpression1.types | 2 +- ...WithoutReturnTypeAnnotationInference.types | 10 +- .../reference/castExpressionParentheses.types | 2 +- tests/baselines/reference/castOfAwait.types | 4 +- .../classDoesNotDependOnBaseTypes.types | 2 +- ...tionalOperatorConditionIsBooleanType.types | 6 +- ...itionalOperatorConditoinIsStringType.types | 6 +- .../constLocalsInFunctionExpressions.types | 10 +- .../reference/controlFlowCommaOperator.types | 4 +- .../controlFlowDoWhileStatement.types | 2 +- .../reference/controlFlowForStatement.types | 8 +- .../baselines/reference/controlFlowIIFE.types | 6 +- .../reference/controlFlowIfStatement.types | 4 +- .../reference/controlFlowWhileStatement.types | 2 +- .../controlFlowWithIncompleteTypes.types | 4 +- ...eclarationEmitIdentifierPredicates01.types | 2 +- .../discriminantsAndPrimitives.types | 8 +- ...onentiationOperatorInTempalteString4.types | 8 +- ...ntiationOperatorInTempalteString4ES6.types | 8 +- ...onentiationOperatorInTemplateString1.types | 12 +- ...ntiationOperatorInTemplateString1ES6.types | 12 +- ...onentiationOperatorInTemplateString2.types | 12 +- ...ntiationOperatorInTemplateString2ES6.types | 12 +- ...onentiationOperatorInTemplateString3.types | 12 +- ...ntiationOperatorInTemplateString3ES6.types | 12 +- .../interfaceDoesNotDependOnBaseTypes.types | 2 +- tests/baselines/reference/mappedTypes4.types | 2 +- .../narrowingConstrainedTypeParameter.types | 2 +- .../reference/nestedLoopTypeGuards.types | 8 +- tests/baselines/reference/neverType.types | 4 +- .../overloadResolutionOverNonCTLambdas.types | 2 +- .../reference/overloadReturnTypes.types | 2 +- ...fixUnaryOperatorsOnExportedVariables.types | 2 +- tests/baselines/reference/symbolType17.types | 2 +- tests/baselines/reference/symbolType18.types | 2 +- tests/baselines/reference/symbolType19.types | 2 +- .../reference/templateStringInTypeOf.types | 4 +- .../reference/templateStringInTypeOfES6.types | 4 +- ...lateStringWithEmbeddedTypeOfOperator.types | 2 +- ...eStringWithEmbeddedTypeOfOperatorES6.types | 2 +- .../baselines/reference/throwStatements.types | 2 +- .../baselines/reference/typeGuardEnums.types | 4 +- .../typeGuardIntersectionTypes.types | 2 +- .../reference/typeGuardNesting.types | 24 +-- .../typeGuardOfFormExpr1AndExpr2.types | 18 +- .../typeGuardOfFormExpr1OrExpr2.types | 18 +- .../reference/typeGuardOfFormNotExpr.types | 20 +- .../typeGuardOfFormTypeOfBoolean.types | 20 +- ...FormTypeOfEqualEqualHasNoEffect.errors.txt | 5 +- ...eGuardOfFormTypeOfIsOrderIndependent.types | 8 +- ...OfFormTypeOfNotEqualHasNoEffect.errors.txt | 5 +- .../typeGuardOfFormTypeOfNumber.types | 20 +- .../typeGuardOfFormTypeOfOther.errors.txt | 118 +++++++++++ .../reference/typeGuardOfFormTypeOfOther.js | 12 ++ .../typeGuardOfFormTypeOfOther.symbols | 153 --------------- .../typeGuardOfFormTypeOfOther.types | 183 ------------------ ...ypeGuardOfFormTypeOfPrimitiveSubtype.types | 12 +- .../typeGuardOfFormTypeOfString.types | 20 +- .../reference/typeGuardRedundancy.types | 16 +- .../typeGuardTautologicalConsistiency.types | 8 +- .../reference/typeGuardTypeOfUndefined.types | 64 +++--- .../reference/typeGuardsAsAssertions.types | 12 +- .../typeGuardsInClassAccessors.types | 40 ++-- .../reference/typeGuardsInClassMethods.types | 30 +-- .../typeGuardsInConditionalExpression.types | 34 ++-- .../reference/typeGuardsInDoStatement.types | 6 +- .../typeGuardsInExternalModule.types | 4 +- .../reference/typeGuardsInForStatement.types | 6 +- .../reference/typeGuardsInFunction.types | 38 ++-- .../typeGuardsInFunctionAndModuleBlock.types | 26 +-- .../reference/typeGuardsInGlobal.types | 2 +- .../reference/typeGuardsInModule.types | 22 +-- .../reference/typeGuardsInProperties.types | 12 +- ...GuardsInRightOperandOfAndAndOperator.types | 22 +-- ...peGuardsInRightOperandOfOrOrOperator.types | 22 +-- .../typeGuardsInWhileStatement.types | 6 +- .../typeGuardsNestedAssignments.types | 2 +- .../reference/typeGuardsObjectMethods.types | 20 +- .../reference/typeGuardsOnClassProperty.types | 8 +- .../reference/typeOfOperator1.errors.txt | 6 +- .../typeGuards/typeGuardOfFormTypeOfOther.ts | 6 + 82 files changed, 542 insertions(+), 734 deletions(-) create mode 100644 tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt delete mode 100644 tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols delete mode 100644 tests/baselines/reference/typeGuardOfFormTypeOfOther.types diff --git a/tests/baselines/reference/TypeGuardWithEnumUnion.types b/tests/baselines/reference/TypeGuardWithEnumUnion.types index d33411c4c7c1a..8ee4aaca363c6 100644 --- a/tests/baselines/reference/TypeGuardWithEnumUnion.types +++ b/tests/baselines/reference/TypeGuardWithEnumUnion.types @@ -12,7 +12,7 @@ function f1(x: Color | string) { if (typeof x === "number") { >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | Color >"number" : "number" @@ -41,7 +41,7 @@ function f2(x: Color | string | string[]) { if (typeof x === "object") { >typeof x === "object" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | Color | string[] >"object" : "object" @@ -54,7 +54,7 @@ function f2(x: Color | string | string[]) { } if (typeof x === "number") { >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | Color | string[] >"number" : "number" @@ -76,7 +76,7 @@ function f2(x: Color | string | string[]) { } if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | Color | string[] >"string" : "string" diff --git a/tests/baselines/reference/anonymousClassExpression1.types b/tests/baselines/reference/anonymousClassExpression1.types index 0fbffffdf4b82..3bc019604925c 100644 --- a/tests/baselines/reference/anonymousClassExpression1.types +++ b/tests/baselines/reference/anonymousClassExpression1.types @@ -4,7 +4,7 @@ function f() { return typeof class {} === "function"; >typeof class {} === "function" : boolean ->typeof class {} : string +>typeof class {} : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >class {} : typeof (Anonymous class) >"function" : "function" } diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types index 0b515750aecc6..658eff38bbb8a 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types @@ -103,17 +103,17 @@ var r6 = foo6(1); >1 : 1 function foo7(x) { ->foo7 : (x: any) => string +>foo7 : (x: any) => "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : any return typeof x; ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : any } var r7 = foo7(1); ->r7 : string ->foo7(1) : string ->foo7 : (x: any) => string +>r7 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" +>foo7(1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" +>foo7 : (x: any) => "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >1 : 1 // object types diff --git a/tests/baselines/reference/castExpressionParentheses.types b/tests/baselines/reference/castExpressionParentheses.types index dafe3377aea94..aa633825eec99 100644 --- a/tests/baselines/reference/castExpressionParentheses.types +++ b/tests/baselines/reference/castExpressionParentheses.types @@ -182,7 +182,7 @@ declare var A; >(typeof A).x : any >(typeof A) : any >typeof A : any ->typeof A : string +>typeof A : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >A : any >x : any diff --git a/tests/baselines/reference/castOfAwait.types b/tests/baselines/reference/castOfAwait.types index 30220ca2ab6fe..805affe49db4b 100644 --- a/tests/baselines/reference/castOfAwait.types +++ b/tests/baselines/reference/castOfAwait.types @@ -8,7 +8,7 @@ async function f() { >0 : 0 typeof await 0; ->typeof await 0 : string +>typeof await 0 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >await 0 : 0 >0 : 0 @@ -21,7 +21,7 @@ async function f() { >await void typeof void await 0 : any >void typeof void await 0 : undefined > typeof void await 0 : string ->typeof void await 0 : string +>typeof void await 0 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" > void await 0 : number >void await 0 : undefined >await 0 : 0 diff --git a/tests/baselines/reference/classDoesNotDependOnBaseTypes.types b/tests/baselines/reference/classDoesNotDependOnBaseTypes.types index 5ac20c6e0fadb..54b67dfd6a7e7 100644 --- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.types +++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.types @@ -5,7 +5,7 @@ var x: StringTree; if (typeof x !== "string") { >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : StringTree >"string" : "string" diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types index f19769b1c5864..610b80ef61283 100644 --- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types +++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types @@ -120,7 +120,7 @@ true ? exprString1 : exprBoolean1; // union typeof "123" == "string" ? exprBoolean1 : exprBoolean2; >typeof "123" == "string" ? exprBoolean1 : exprBoolean2 : boolean >typeof "123" == "string" : boolean ->typeof "123" : string +>typeof "123" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >"123" : "123" >"string" : "string" >exprBoolean1 : boolean @@ -262,7 +262,7 @@ var resultIsBoolean3 = typeof "123" == "string" ? exprBoolean1 : exprBoolean2; >resultIsBoolean3 : boolean >typeof "123" == "string" ? exprBoolean1 : exprBoolean2 : boolean >typeof "123" == "string" : boolean ->typeof "123" : string +>typeof "123" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >"123" : "123" >"string" : "string" >exprBoolean1 : boolean @@ -299,7 +299,7 @@ var resultIsStringOrBoolean4 = typeof "123" === "string" ? exprString1 : exprBoo >resultIsStringOrBoolean4 : string | boolean >typeof "123" === "string" ? exprString1 : exprBoolean1 : string | boolean >typeof "123" === "string" : boolean ->typeof "123" : string +>typeof "123" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >"123" : "123" >"string" : "string" >exprString1 : string diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types index a6906d7024a80..33e34bea635c3 100644 --- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types +++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types @@ -123,7 +123,7 @@ var array = ["1", "2", "3"]; typeof condString ? exprAny1 : exprAny2; >typeof condString ? exprAny1 : exprAny2 : any ->typeof condString : string +>typeof condString : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >condString : string >exprAny1 : any >exprAny2 : any @@ -254,7 +254,7 @@ var resultIsStringOrBoolean2 = "hello" ? exprString1 : exprBoolean1; // union var resultIsAny3 = typeof condString ? exprAny1 : exprAny2; >resultIsAny3 : any >typeof condString ? exprAny1 : exprAny2 : any ->typeof condString : string +>typeof condString : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >condString : string >exprAny1 : any >exprAny2 : any @@ -297,7 +297,7 @@ var resultIsObject3 = array[1] ? exprIsObject1 : exprIsObject2; var resultIsStringOrBoolean3 = typeof condString ? exprString1 : exprBoolean1; // union >resultIsStringOrBoolean3 : string | boolean >typeof condString ? exprString1 : exprBoolean1 : string | boolean ->typeof condString : string +>typeof condString : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >condString : string >exprString1 : string >exprBoolean1 : boolean diff --git a/tests/baselines/reference/constLocalsInFunctionExpressions.types b/tests/baselines/reference/constLocalsInFunctionExpressions.types index db1da04e0ca1e..07d3392045cad 100644 --- a/tests/baselines/reference/constLocalsInFunctionExpressions.types +++ b/tests/baselines/reference/constLocalsInFunctionExpressions.types @@ -12,7 +12,7 @@ function f1() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -35,7 +35,7 @@ function f2() { if (typeof x !== "string") { >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -59,7 +59,7 @@ function f3() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -82,7 +82,7 @@ function f4() { if (typeof x !== "string") { >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -106,7 +106,7 @@ function f5() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" diff --git a/tests/baselines/reference/controlFlowCommaOperator.types b/tests/baselines/reference/controlFlowCommaOperator.types index 52fd3d7b87d62..d4e073295d79f 100644 --- a/tests/baselines/reference/controlFlowCommaOperator.types +++ b/tests/baselines/reference/controlFlowCommaOperator.types @@ -17,7 +17,7 @@ function f(x: string | number | boolean) { >y : string | number | boolean >"" : "" >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -36,7 +36,7 @@ function f(x: string | number | boolean) { >z : string | number | boolean >1 : 1 >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" diff --git a/tests/baselines/reference/controlFlowDoWhileStatement.types b/tests/baselines/reference/controlFlowDoWhileStatement.types index 24f3e92b144d3..baa585bc14d5e 100644 --- a/tests/baselines/reference/controlFlowDoWhileStatement.types +++ b/tests/baselines/reference/controlFlowDoWhileStatement.types @@ -66,7 +66,7 @@ function c() { if (typeof x === "string") continue; >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" diff --git a/tests/baselines/reference/controlFlowForStatement.types b/tests/baselines/reference/controlFlowForStatement.types index d227e87ea1d53..f82a018573bcc 100644 --- a/tests/baselines/reference/controlFlowForStatement.types +++ b/tests/baselines/reference/controlFlowForStatement.types @@ -82,7 +82,7 @@ function d() { >x : string | number | boolean >"" : "" >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >x = 5 : 5 @@ -107,7 +107,7 @@ function e() { >"" : "" >0 : 0 >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | true >"string" : "string" >x = "" || true : true @@ -128,7 +128,7 @@ function f() { for (; typeof x !== "string";) { >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -137,7 +137,7 @@ function f() { if (typeof x === "number") break; >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" diff --git a/tests/baselines/reference/controlFlowIIFE.types b/tests/baselines/reference/controlFlowIIFE.types index 7cf4337b53bd0..1c2e82903941f 100644 --- a/tests/baselines/reference/controlFlowIIFE.types +++ b/tests/baselines/reference/controlFlowIIFE.types @@ -13,7 +13,7 @@ function f1() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -41,7 +41,7 @@ function f2() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -73,7 +73,7 @@ function f3() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" diff --git a/tests/baselines/reference/controlFlowIfStatement.types b/tests/baselines/reference/controlFlowIfStatement.types index fd8f25b9ee331..e0ce68db7b15e 100644 --- a/tests/baselines/reference/controlFlowIfStatement.types +++ b/tests/baselines/reference/controlFlowIfStatement.types @@ -100,7 +100,7 @@ function c(data: string | T): T { if (typeof data === 'string') { >typeof data === 'string' : boolean ->typeof data : string +>typeof data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >data : string | T >'string' : "string" @@ -124,7 +124,7 @@ function d(data: string | T): never { if (typeof data === 'string') { >typeof data === 'string' : boolean ->typeof data : string +>typeof data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >data : string | T >'string' : "string" diff --git a/tests/baselines/reference/controlFlowWhileStatement.types b/tests/baselines/reference/controlFlowWhileStatement.types index 19f7fc49d02fc..4576e1a4f62a3 100644 --- a/tests/baselines/reference/controlFlowWhileStatement.types +++ b/tests/baselines/reference/controlFlowWhileStatement.types @@ -69,7 +69,7 @@ function c() { if (typeof x === "string") continue; >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" diff --git a/tests/baselines/reference/controlFlowWithIncompleteTypes.types b/tests/baselines/reference/controlFlowWithIncompleteTypes.types index 784f22a3966f0..f5e8f2bcf2403 100644 --- a/tests/baselines/reference/controlFlowWithIncompleteTypes.types +++ b/tests/baselines/reference/controlFlowWithIncompleteTypes.types @@ -16,7 +16,7 @@ function foo1() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -49,7 +49,7 @@ function foo2() { if (typeof x === "number") { >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"number" : "number" diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.types b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types index 1129012a80a9c..1aeb3ea824d67 100644 --- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.types +++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types @@ -7,7 +7,7 @@ export function f(x: any): x is number { return typeof x === "number"; >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : any >"number" : "number" } diff --git a/tests/baselines/reference/discriminantsAndPrimitives.types b/tests/baselines/reference/discriminantsAndPrimitives.types index d3e1b70e59911..0870d17948fce 100644 --- a/tests/baselines/reference/discriminantsAndPrimitives.types +++ b/tests/baselines/reference/discriminantsAndPrimitives.types @@ -30,7 +30,7 @@ function f1(x: Foo | Bar | string) { if (typeof x !== 'string') { >typeof x !== 'string' : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | Foo | Bar >'string' : "string" @@ -58,7 +58,7 @@ function f2(x: Foo | Bar | string | undefined) { if (typeof x === "object") { >typeof x === "object" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | Foo | Bar | undefined >"object" : "object" @@ -89,7 +89,7 @@ function f3(x: Foo | Bar | string | null) { >x && typeof x !== "string" : boolean | "" | null >x : string | Foo | Bar | null >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | Foo | Bar >"string" : "string" @@ -120,7 +120,7 @@ function f4(x: Foo | Bar | string | number | null) { >x && typeof x === "object" : boolean | "" | 0 | null >x : string | number | Foo | Bar | null >typeof x === "object" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | Foo | Bar >"object" : "object" diff --git a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types index 7991ef224f0f0..d11846227f2e1 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4.types @@ -64,7 +64,7 @@ var s; `${typeof (t1 ** t2 ** t1) } world`; >`${typeof (t1 ** t2 ** t1) } world` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -162,14 +162,14 @@ var s; `${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}`; >`${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,7 +223,7 @@ var s; `hello ${typeof (t1 ** t2 ** t1)}`; >`hello ${typeof (t1 ** t2 ** t1)}` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types index 981829dd42b9d..610c3a64a6ed2 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTempalteString4ES6.types @@ -64,7 +64,7 @@ var s; `${typeof (t1 ** t2 ** t1) } world`; >`${typeof (t1 ** t2 ** t1) } world` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -162,14 +162,14 @@ var s; `${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}`; >`${typeof (t1 ** t2 ** t1)} hello world ${typeof (t1 ** t2 ** t1)}` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,7 +223,7 @@ var s; `hello ${typeof (t1 ** t2 ** t1)}`; >`hello ${typeof (t1 ** t2 ** t1)}` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types index bbfb5b88e04c4..4f78cd61fcc20 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1.types @@ -54,7 +54,7 @@ var s; `${typeof (t1 ** t2 ** t1) }`; >`${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -66,7 +66,7 @@ var s; >`${1 + typeof (t1 ** t2 ** t1) }` : string >1 + typeof (t1 ** t2 ** t1) : string >1 : 1 ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -141,14 +141,14 @@ var s; `${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}`; >`${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,14 +223,14 @@ var s; `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`; >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types index a005dd074630c..0bc65c31b1255 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString1ES6.types @@ -54,7 +54,7 @@ var s; `${typeof (t1 ** t2 ** t1) }`; >`${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -66,7 +66,7 @@ var s; >`${1 + typeof (t1 ** t2 ** t1) }` : string >1 + typeof (t1 ** t2 ** t1) : string >1 : 1 ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -141,14 +141,14 @@ var s; `${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}`; >`${typeof (t1 ** t2 ** t1)}${typeof (t1 ** t2 ** t1)}` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,14 +223,14 @@ var s; `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`; >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types index 156851b60b946..9b77f4bc3fccd 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2.types @@ -54,7 +54,7 @@ var s; `hello ${typeof (t1 ** t2 ** t1) }`; >`hello ${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -66,7 +66,7 @@ var s; >`hello ${1 + typeof (t1 ** t2 ** t1) }` : string >1 + typeof (t1 ** t2 ** t1) : string >1 : 1 ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -141,14 +141,14 @@ var s; `hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }`; >`hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,14 +223,14 @@ var s; `hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`; >`hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types index dbeee05554eb0..ed0be973e5b80 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString2ES6.types @@ -54,7 +54,7 @@ var s; `hello ${typeof (t1 ** t2 ** t1) }`; >`hello ${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -66,7 +66,7 @@ var s; >`hello ${1 + typeof (t1 ** t2 ** t1) }` : string >1 + typeof (t1 ** t2 ** t1) : string >1 : 1 ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -141,14 +141,14 @@ var s; `hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }`; >`hello ${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,14 +223,14 @@ var s; `hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }`; >`hello ${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1) }` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types index d3472beac1254..16fe31dde5edc 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3.types @@ -54,7 +54,7 @@ var s; `${typeof (t1 ** t2 ** t1) } world`; >`${typeof (t1 ** t2 ** t1) } world` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -66,7 +66,7 @@ var s; >`${1 + typeof (t1 ** t2 ** t1) } world` : string >1 + typeof (t1 ** t2 ** t1) : string >1 : 1 ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -141,14 +141,14 @@ var s; `${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world`; >`${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,14 +223,14 @@ var s; `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!`; >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types index 239ef02a52953..86eb42efc0593 100644 --- a/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types +++ b/tests/baselines/reference/emitExponentiationOperatorInTemplateString3ES6.types @@ -54,7 +54,7 @@ var s; `${typeof (t1 ** t2 ** t1) } world`; >`${typeof (t1 ** t2 ** t1) } world` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -66,7 +66,7 @@ var s; >`${1 + typeof (t1 ** t2 ** t1) } world` : string >1 + typeof (t1 ** t2 ** t1) : string >1 : 1 ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -141,14 +141,14 @@ var s; `${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world`; >`${typeof (t1 ** t2 ** t1) }${typeof (t1 ** t2 ** t1) } world` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number @@ -223,14 +223,14 @@ var s; `${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!`; >`${typeof (t1 ** t2 ** t1) } hello world ${typeof (t1 ** t2 ** t1)} !!` : string ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number >t2 ** t1 : number >t2 : number >t1 : number ->typeof (t1 ** t2 ** t1) : string +>typeof (t1 ** t2 ** t1) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(t1 ** t2 ** t1) : number >t1 ** t2 ** t1 : number >t1 : number diff --git a/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types b/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types index 4f60c5d36cc57..eae55bc09d1ed 100644 --- a/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types +++ b/tests/baselines/reference/interfaceDoesNotDependOnBaseTypes.types @@ -5,7 +5,7 @@ var x: StringTree; if (typeof x !== "string") { >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : StringTree >"string" : "string" diff --git a/tests/baselines/reference/mappedTypes4.types b/tests/baselines/reference/mappedTypes4.types index a2fec06cceca8..1d0c4c16b8955 100644 --- a/tests/baselines/reference/mappedTypes4.types +++ b/tests/baselines/reference/mappedTypes4.types @@ -29,7 +29,7 @@ function boxify(obj: T): Boxified { if (typeof obj === "object") { >typeof obj === "object" : boolean ->typeof obj : string +>typeof obj : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >obj : T >"object" : "object" diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.types b/tests/baselines/reference/narrowingConstrainedTypeParameter.types index 942b9f7055d8d..348716ab3c450 100644 --- a/tests/baselines/reference/narrowingConstrainedTypeParameter.types +++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.types @@ -17,7 +17,7 @@ function isPet(pet: any): pet is Pet { return typeof pet.name === "string"; >typeof pet.name === "string" : boolean ->typeof pet.name : string +>typeof pet.name : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >pet.name : any >pet : any >name : any diff --git a/tests/baselines/reference/nestedLoopTypeGuards.types b/tests/baselines/reference/nestedLoopTypeGuards.types index 9d7b793badf96..e027932501259 100644 --- a/tests/baselines/reference/nestedLoopTypeGuards.types +++ b/tests/baselines/reference/nestedLoopTypeGuards.types @@ -9,7 +9,7 @@ function f1() { if (typeof a !== 'boolean') { >typeof a !== 'boolean' : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : string | number | boolean >'boolean' : "boolean" @@ -34,7 +34,7 @@ function f1() { if (typeof a === 'string') { >typeof a === 'string' : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : string | number >'string' : "string" @@ -66,7 +66,7 @@ function f2() { if (typeof a === 'string') { >typeof a === 'string' : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : string | number >'string' : "string" @@ -78,7 +78,7 @@ function f2() { if (typeof a === 'string') { >typeof a === 'string' : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : string >'string' : "string" diff --git a/tests/baselines/reference/neverType.types b/tests/baselines/reference/neverType.types index bdb1ff56c3e4e..9555285e4be8c 100644 --- a/tests/baselines/reference/neverType.types +++ b/tests/baselines/reference/neverType.types @@ -164,7 +164,7 @@ function f1(x: string | number) { if (typeof x === "boolean") { >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"boolean" : "boolean" @@ -182,7 +182,7 @@ function f2(x: string | number) { if (typeof x === "boolean") { >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"boolean" : "boolean" diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types index ee5c336ba9ce7..a4de1666d0bb5 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types @@ -32,7 +32,7 @@ module Bugs { return typeof args[index] !== 'undefined' >typeof args[index] !== 'undefined' ? args[index] : match : any >typeof args[index] !== 'undefined' : boolean ->typeof args[index] : string +>typeof args[index] : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >args[index] : any >args : any[] >index : any diff --git a/tests/baselines/reference/overloadReturnTypes.types b/tests/baselines/reference/overloadReturnTypes.types index c0f573fb98074..daf790b9a9234 100644 --- a/tests/baselines/reference/overloadReturnTypes.types +++ b/tests/baselines/reference/overloadReturnTypes.types @@ -26,7 +26,7 @@ function attr(nameOrMap: any, value?: string): any { >nameOrMap && typeof nameOrMap === "object" : boolean >nameOrMap : any >typeof nameOrMap === "object" : boolean ->typeof nameOrMap : string +>typeof nameOrMap : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >nameOrMap : any >"object" : "object" diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types index 4e4dbe93372f3..41df41af51bf8 100644 --- a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types +++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.types @@ -39,7 +39,7 @@ if (void x) { } if (typeof x) { ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : false } diff --git a/tests/baselines/reference/symbolType17.types b/tests/baselines/reference/symbolType17.types index c186f915cd0ac..6ba36d335a7ee 100644 --- a/tests/baselines/reference/symbolType17.types +++ b/tests/baselines/reference/symbolType17.types @@ -12,7 +12,7 @@ x; if (typeof x === "symbol") { >typeof x === "symbol" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : symbol | Foo >"symbol" : "symbol" diff --git a/tests/baselines/reference/symbolType18.types b/tests/baselines/reference/symbolType18.types index 8f0012f4f118b..9c58320ed3bb1 100644 --- a/tests/baselines/reference/symbolType18.types +++ b/tests/baselines/reference/symbolType18.types @@ -12,7 +12,7 @@ x; if (typeof x === "object") { >typeof x === "object" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : symbol | Foo >"object" : "object" diff --git a/tests/baselines/reference/symbolType19.types b/tests/baselines/reference/symbolType19.types index 18daa27fd00d7..66bd80b33d8a6 100644 --- a/tests/baselines/reference/symbolType19.types +++ b/tests/baselines/reference/symbolType19.types @@ -11,7 +11,7 @@ x; if (typeof x === "number") { >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : symbol | E >"number" : "number" diff --git a/tests/baselines/reference/templateStringInTypeOf.types b/tests/baselines/reference/templateStringInTypeOf.types index 0d7d26a82b29a..5de62164a703c 100644 --- a/tests/baselines/reference/templateStringInTypeOf.types +++ b/tests/baselines/reference/templateStringInTypeOf.types @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/templates/templateStringInTypeOf.ts === var x = typeof `abc${ 123 }def`; ->x : string ->typeof `abc${ 123 }def` : string +>x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" +>typeof `abc${ 123 }def` : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >`abc${ 123 }def` : string >123 : 123 diff --git a/tests/baselines/reference/templateStringInTypeOfES6.types b/tests/baselines/reference/templateStringInTypeOfES6.types index ad142d13fe5f8..cc035a2550175 100644 --- a/tests/baselines/reference/templateStringInTypeOfES6.types +++ b/tests/baselines/reference/templateStringInTypeOfES6.types @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/templates/templateStringInTypeOfES6.ts === var x = typeof `abc${ 123 }def`; ->x : string ->typeof `abc${ 123 }def` : string +>x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" +>typeof `abc${ 123 }def` : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >`abc${ 123 }def` : string >123 : 123 diff --git a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types index 48330140ad347..a7811bd03bdf5 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types +++ b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperator.types @@ -2,6 +2,6 @@ var x = `abc${ typeof "hi" }def`; >x : string >`abc${ typeof "hi" }def` : string ->typeof "hi" : string +>typeof "hi" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >"hi" : "hi" diff --git a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types index 3d7eba45c1912..27e593bf4b398 100644 --- a/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types +++ b/tests/baselines/reference/templateStringWithEmbeddedTypeOfOperatorES6.types @@ -2,6 +2,6 @@ var x = `abc${ typeof "hi" }def`; >x : string >`abc${ typeof "hi" }def` : string ->typeof "hi" : string +>typeof "hi" : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >"hi" : "hi" diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types index 19b8988ed47e4..3c8fd64ee3978 100644 --- a/tests/baselines/reference/throwStatements.types +++ b/tests/baselines/reference/throwStatements.types @@ -174,7 +174,7 @@ throw aModule; >aModule : typeof M throw typeof M; ->typeof M : string +>typeof M : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >M : typeof M var aClassInModule = new M.A(); diff --git a/tests/baselines/reference/typeGuardEnums.types b/tests/baselines/reference/typeGuardEnums.types index f9d5cb1754e8a..cf62bccebd32e 100644 --- a/tests/baselines/reference/typeGuardEnums.types +++ b/tests/baselines/reference/typeGuardEnums.types @@ -12,7 +12,7 @@ let x: number|string|E|V; if (typeof x === "number") { >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | E | V >"number" : "number" @@ -26,7 +26,7 @@ else { if (typeof x !== "number") { >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | E | V >"number" : "number" diff --git a/tests/baselines/reference/typeGuardIntersectionTypes.types b/tests/baselines/reference/typeGuardIntersectionTypes.types index 6b6dbae8ca27e..b6206ed200765 100644 --- a/tests/baselines/reference/typeGuardIntersectionTypes.types +++ b/tests/baselines/reference/typeGuardIntersectionTypes.types @@ -163,7 +163,7 @@ function hasLegs(x: Beast): x is Legged { return x && typeof x.legs === 'number' >x && typeof x.legs === 'number' : boolean >x : Beast >typeof x.legs === 'number' : boolean ->typeof x.legs : string +>typeof x.legs : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x.legs : number | undefined >x : Beast >legs : number | undefined diff --git a/tests/baselines/reference/typeGuardNesting.types b/tests/baselines/reference/typeGuardNesting.types index 29f6cba10db59..c1396130c053a 100644 --- a/tests/baselines/reference/typeGuardNesting.types +++ b/tests/baselines/reference/typeGuardNesting.types @@ -7,13 +7,13 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri >(typeof strOrBool === 'boolean' && !strOrBool) : boolean >typeof strOrBool === 'boolean' && !strOrBool : boolean >typeof strOrBool === 'boolean' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'boolean' : "boolean" >!strOrBool : boolean >strOrBool : boolean >typeof strOrBool === 'string' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | true >'string' : "string" @@ -22,7 +22,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri >(typeof strOrBool === 'string') ? strOrBool : "string" : string >(typeof strOrBool === 'string') : boolean >typeof strOrBool === 'string' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'string' : "string" >strOrBool : string @@ -33,7 +33,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri >(typeof strOrBool === 'boolean') ? strOrBool : false : boolean >(typeof strOrBool === 'boolean') : boolean >typeof strOrBool === 'boolean' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'boolean' : "boolean" >strOrBool : boolean @@ -44,7 +44,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri >(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string >(typeof strOrBool !== 'boolean') : boolean >typeof strOrBool !== 'boolean' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'boolean' : "boolean" >strOrBool : string @@ -55,7 +55,7 @@ if ((typeof strOrBool === 'boolean' && !strOrBool) || typeof strOrBool === 'stri >(typeof strOrBool !== 'string') ? strOrBool : false : boolean >(typeof strOrBool !== 'string') : boolean >typeof strOrBool !== 'string' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'string' : "string" >strOrBool : boolean @@ -67,13 +67,13 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole >(typeof strOrBool !== 'string' && !strOrBool) : boolean >typeof strOrBool !== 'string' && !strOrBool : boolean >typeof strOrBool !== 'string' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'string' : "string" >!strOrBool : boolean >strOrBool : boolean >typeof strOrBool !== 'boolean' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | true >'boolean' : "boolean" @@ -82,7 +82,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole >(typeof strOrBool === 'string') ? strOrBool : "string" : string >(typeof strOrBool === 'string') : boolean >typeof strOrBool === 'string' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'string' : "string" >strOrBool : string @@ -93,7 +93,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole >(typeof strOrBool === 'boolean') ? strOrBool : false : boolean >(typeof strOrBool === 'boolean') : boolean >typeof strOrBool === 'boolean' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'boolean' : "boolean" >strOrBool : boolean @@ -104,7 +104,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole >(typeof strOrBool !== 'boolean') ? strOrBool : "string" : string >(typeof strOrBool !== 'boolean') : boolean >typeof strOrBool !== 'boolean' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'boolean' : "boolean" >strOrBool : string @@ -115,7 +115,7 @@ if ((typeof strOrBool !== 'string' && !strOrBool) || typeof strOrBool !== 'boole >(typeof strOrBool !== 'string') ? strOrBool : false : boolean >(typeof strOrBool !== 'string') : boolean >typeof strOrBool !== 'string' : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >'string' : "string" >strOrBool : boolean diff --git a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types index b24b63f61dc44..78d419d7dcdae 100644 --- a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types +++ b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.types @@ -42,11 +42,11 @@ var strOrNumOrBoolOrC: string | number | boolean | C; if (typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number") { >typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number" : boolean >typeof strOrNumOrBool !== "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >typeof strOrNumOrBool !== "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : number | boolean >"number" : "number" @@ -66,15 +66,15 @@ if (typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "numbe >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" && typeof strOrNumOrBoolOrC !== "boolean" : boolean >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" : boolean >typeof strOrNumOrBoolOrC !== "string" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : string | number | boolean | C >"string" : "string" >typeof strOrNumOrBoolOrC !== "number" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : number | boolean | C >"number" : "number" >typeof strOrNumOrBoolOrC !== "boolean" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : boolean | C >"boolean" : "boolean" @@ -94,15 +94,15 @@ if (typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "numbe >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" && typeof strOrNumOrBool === "boolean" : boolean >typeof strOrNumOrBoolOrC !== "string" && typeof strOrNumOrBoolOrC !== "number" : boolean >typeof strOrNumOrBoolOrC !== "string" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : string | number | boolean | C >"string" : "string" >typeof strOrNumOrBoolOrC !== "number" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : number | boolean | C >"number" : "number" >typeof strOrNumOrBool === "boolean" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"boolean" : "boolean" @@ -130,7 +130,7 @@ else { if (typeof strOrNumOrBool !== "string" && numOrBool !== strOrNumOrBool) { >typeof strOrNumOrBool !== "string" && numOrBool !== strOrNumOrBool : boolean >typeof strOrNumOrBool !== "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >numOrBool !== strOrNumOrBool : boolean diff --git a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types index eb428bcb6795d..e2a06a817af21 100644 --- a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types +++ b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.types @@ -42,11 +42,11 @@ var strOrNumOrBoolOrC: string | number | boolean | C; if (typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number") { >typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number" : boolean >typeof strOrNumOrBool === "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >typeof strOrNumOrBool === "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : number | boolean >"number" : "number" @@ -66,15 +66,15 @@ if (typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "numbe >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" || typeof strOrNumOrBoolOrC === "boolean" : boolean >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" : boolean >typeof strOrNumOrBoolOrC === "string" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : string | number | boolean | C >"string" : "string" >typeof strOrNumOrBoolOrC === "number" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : number | boolean | C >"number" : "number" >typeof strOrNumOrBoolOrC === "boolean" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : boolean | C >"boolean" : "boolean" @@ -94,15 +94,15 @@ if (typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "numbe >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" || typeof strOrNumOrBool !== "boolean" : boolean >typeof strOrNumOrBoolOrC === "string" || typeof strOrNumOrBoolOrC === "number" : boolean >typeof strOrNumOrBoolOrC === "string" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : string | number | boolean | C >"string" : "string" >typeof strOrNumOrBoolOrC === "number" : boolean ->typeof strOrNumOrBoolOrC : string +>typeof strOrNumOrBoolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBoolOrC : number | boolean | C >"number" : "number" >typeof strOrNumOrBool !== "boolean" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"boolean" : "boolean" @@ -130,7 +130,7 @@ else { if (typeof strOrNumOrBool === "string" || numOrBool !== strOrNumOrBool) { >typeof strOrNumOrBool === "string" || numOrBool !== strOrNumOrBool : boolean >typeof strOrNumOrBool === "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >numOrBool !== strOrNumOrBool : boolean diff --git a/tests/baselines/reference/typeGuardOfFormNotExpr.types b/tests/baselines/reference/typeGuardOfFormNotExpr.types index e4490d42dae3c..624bd7c71fced 100644 --- a/tests/baselines/reference/typeGuardOfFormNotExpr.types +++ b/tests/baselines/reference/typeGuardOfFormNotExpr.types @@ -26,7 +26,7 @@ if (!(typeof strOrNum === "string")) { >!(typeof strOrNum === "string") : boolean >(typeof strOrNum === "string") : boolean >typeof strOrNum === "string" : boolean ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number >"string" : "string" @@ -47,11 +47,11 @@ if (!(typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number")) >(typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number") : boolean >typeof strOrNumOrBool === "string" || typeof strOrNumOrBool === "number" : boolean >typeof strOrNumOrBool === "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >typeof strOrNumOrBool === "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : number | boolean >"number" : "number" @@ -72,13 +72,13 @@ if (!(typeof strOrNumOrBool !== "string") || !(typeof strOrNumOrBool !== "number >!(typeof strOrNumOrBool !== "string") : boolean >(typeof strOrNumOrBool !== "string") : boolean >typeof strOrNumOrBool !== "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >!(typeof strOrNumOrBool !== "number") : boolean >(typeof strOrNumOrBool !== "number") : boolean >typeof strOrNumOrBool !== "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : number | boolean >"number" : "number" @@ -99,11 +99,11 @@ if (!(typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number")) >(typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number") : boolean >typeof strOrNumOrBool !== "string" && typeof strOrNumOrBool !== "number" : boolean >typeof strOrNumOrBool !== "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >typeof strOrNumOrBool !== "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : number | boolean >"number" : "number" @@ -124,13 +124,13 @@ if (!(typeof strOrNumOrBool === "string") && !(typeof strOrNumOrBool === "number >!(typeof strOrNumOrBool === "string") : boolean >(typeof strOrNumOrBool === "string") : boolean >typeof strOrNumOrBool === "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >!(typeof strOrNumOrBool === "number") : boolean >(typeof strOrNumOrBool === "number") : boolean >typeof strOrNumOrBool === "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : number | boolean >"number" : "number" @@ -151,7 +151,7 @@ if (!(typeof strOrNumOrBool === "string") && numOrBool !== strOrNumOrBool) { >!(typeof strOrNumOrBool === "string") : boolean >(typeof strOrNumOrBool === "string") : boolean >typeof strOrNumOrBool === "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" >numOrBool !== strOrNumOrBool : boolean diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types index c06c16e331dea..a2cfdf64ea835 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types +++ b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.types @@ -46,7 +46,7 @@ var c: C; // - when false, removes the primitive type from the type of x. if (typeof strOrBool === "boolean") { >typeof strOrBool === "boolean" : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >"boolean" : "boolean" @@ -63,7 +63,7 @@ else { } if (typeof numOrBool === "boolean") { >typeof numOrBool === "boolean" : boolean ->typeof numOrBool : string +>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrBool : number | boolean >"boolean" : "boolean" @@ -80,7 +80,7 @@ else { } if (typeof strOrNumOrBool === "boolean") { >typeof strOrNumOrBool === "boolean" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"boolean" : "boolean" @@ -97,7 +97,7 @@ else { } if (typeof boolOrC === "boolean") { >typeof boolOrC === "boolean" : boolean ->typeof boolOrC : string +>typeof boolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >boolOrC : boolean | C >"boolean" : "boolean" @@ -115,7 +115,7 @@ else { if (typeof strOrNum === "boolean") { >typeof strOrNum === "boolean" : boolean ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number >"boolean" : "boolean" @@ -135,7 +135,7 @@ else { // - when false, narrows the type of x by typeof x === s when true. if (typeof strOrBool !== "boolean") { >typeof strOrBool !== "boolean" : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >"boolean" : "boolean" @@ -152,7 +152,7 @@ else { } if (typeof numOrBool !== "boolean") { >typeof numOrBool !== "boolean" : boolean ->typeof numOrBool : string +>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrBool : number | boolean >"boolean" : "boolean" @@ -169,7 +169,7 @@ else { } if (typeof strOrNumOrBool !== "boolean") { >typeof strOrNumOrBool !== "boolean" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"boolean" : "boolean" @@ -186,7 +186,7 @@ else { } if (typeof boolOrC !== "boolean") { >typeof boolOrC !== "boolean" : boolean ->typeof boolOrC : string +>typeof boolOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >boolOrC : boolean | C >"boolean" : "boolean" @@ -204,7 +204,7 @@ else { if (typeof strOrNum !== "boolean") { >typeof strOrNum !== "boolean" : boolean ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number >"boolean" : "boolean" diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt index c76c6e819df11..1845d2e9775f2 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt +++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt @@ -1,10 +1,11 @@ tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r1' must be of type 'string', but here has type 'number'. tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r2' must be of type 'boolean', but here has type 'string'. tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r3' must be of type 'number', but here has type 'boolean'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(30,5): error TS2365: Operator '==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r4' must be of type 'C', but here has type 'string'. -==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts (4 errors) ==== +==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts (5 errors) ==== class C { private p: string }; var strOrNum: string | number; @@ -41,6 +42,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHa } if (typeof strOrC == "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. var r4 = strOrC; // string | C } else { diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types b/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types index 43cc37f98e837..be5949837791b 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types +++ b/tests/baselines/reference/typeGuardOfFormTypeOfIsOrderIndependent.types @@ -26,7 +26,7 @@ var func: () => void; if ("string" === typeof strOrNum) { >"string" === typeof strOrNum : boolean >"string" : "string" ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number str = strOrNum; @@ -43,7 +43,7 @@ else { if ("function" === typeof strOrFunc) { >"function" === typeof strOrFunc : boolean >"function" : "function" ->typeof strOrFunc : string +>typeof strOrFunc : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrFunc : string | (() => void) func = strOrFunc; @@ -60,7 +60,7 @@ else { if ("number" === typeof numOrBool) { >"number" === typeof numOrBool : boolean >"number" : "number" ->typeof numOrBool : string +>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrBool : number | boolean num = numOrBool; @@ -77,7 +77,7 @@ else { if ("boolean" === typeof strOrBool) { >"boolean" === typeof strOrBool : boolean >"boolean" : "boolean" ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean bool = strOrBool; diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt index 3b29f3ecba841..1814abec82380 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt +++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt @@ -1,10 +1,11 @@ tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r1' must be of type 'number', but here has type 'string'. tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r2' must be of type 'string', but here has type 'boolean'. tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r3' must be of type 'boolean', but here has type 'number'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(30,5): error TS2365: Operator '!=' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type. Variable 'r4' must be of type 'string', but here has type 'C'. -==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts (4 errors) ==== +==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts (5 errors) ==== class C { private p: string }; var strOrNum: string | number; @@ -41,6 +42,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasN } if (typeof strOrC != "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '!=' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. var r4 = strOrC; // string | C } else { diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types index 17787d06486ca..ec0854f6bc2be 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types +++ b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.types @@ -46,7 +46,7 @@ var c: C; // - when false, removes the primitive type from the type of x. if (typeof strOrNum === "number") { >typeof strOrNum === "number" : boolean ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number >"number" : "number" @@ -63,7 +63,7 @@ else { } if (typeof numOrBool === "number") { >typeof numOrBool === "number" : boolean ->typeof numOrBool : string +>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrBool : number | boolean >"number" : "number" @@ -79,7 +79,7 @@ else { } if (typeof strOrNumOrBool === "number") { >typeof strOrNumOrBool === "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"number" : "number" @@ -96,7 +96,7 @@ else { } if (typeof numOrC === "number") { >typeof numOrC === "number" : boolean ->typeof numOrC : string +>typeof numOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrC : number | C >"number" : "number" @@ -114,7 +114,7 @@ else { if (typeof strOrBool === "number") { >typeof strOrBool === "number" : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >"number" : "number" @@ -133,7 +133,7 @@ else { // - when false, narrows the type of x by typeof x === s when true. if (typeof strOrNum !== "number") { >typeof strOrNum !== "number" : boolean ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number >"number" : "number" @@ -150,7 +150,7 @@ else { } if (typeof numOrBool !== "number") { >typeof numOrBool !== "number" : boolean ->typeof numOrBool : string +>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrBool : number | boolean >"number" : "number" @@ -166,7 +166,7 @@ else { } if (typeof strOrNumOrBool !== "number") { >typeof strOrNumOrBool !== "number" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"number" : "number" @@ -183,7 +183,7 @@ else { } if (typeof numOrC !== "number") { >typeof numOrC !== "number" : boolean ->typeof numOrC : string +>typeof numOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrC : number | C >"number" : "number" @@ -201,7 +201,7 @@ else { if (typeof strOrBool !== "number") { >typeof strOrBool !== "number" : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >"number" : "number" diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt new file mode 100644 index 0000000000000..c9cb9fdd4561c --- /dev/null +++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.errors.txt @@ -0,0 +1,118 @@ +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(21,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(27,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(33,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(40,5): error TS2322: Type 'string | C' is not assignable to type 'C'. + Type 'string' is not assignable to type 'C'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(43,9): error TS2322: Type 'string | C' is not assignable to type 'string'. + Type 'C' is not assignable to type 'string'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(46,5): error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(56,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(62,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(68,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. +tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts(75,5): error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + + +==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts (10 errors) ==== + class C { private p: string }; + + var str: string; + var bool: boolean; + var num: number; + var strOrNum: string | number; + var strOrBool: string | boolean; + var numOrBool: number | boolean + var strOrNumOrBool: string | number | boolean; + var strOrC: string | C; + var numOrC: number | C; + var boolOrC: boolean | C; + var emptyObj: {}; + var c: C; + + // A type guard of the form typeof x === s, + // where s is a string literal with any value but 'string', 'number' or 'boolean', + // - when true, removes the primitive types string, number, and boolean from the type of x, or + // - when false, has no effect on the type of x. + + if (typeof strOrC === "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + c = strOrC; // C + } + else { + var r2: string = strOrC; // string + } + if (typeof numOrC === "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + c = numOrC; // C + } + else { + var r3: number = numOrC; // number + } + if (typeof boolOrC === "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + c = boolOrC; // C + } + else { + var r4: boolean = boolOrC; // boolean + } + if (typeof strOrC === "Object" as string) { // comparison is OK with cast + c = strOrC; // error: but no narrowing to C + ~ +!!! error TS2322: Type 'string | C' is not assignable to type 'C'. +!!! error TS2322: Type 'string' is not assignable to type 'C'. + } + else { + var r5: string = strOrC; // error: no narrowing to string + ~~ +!!! error TS2322: Type 'string | C' is not assignable to type 'string'. +!!! error TS2322: Type 'C' is not assignable to type 'string'. + } + + if (typeof strOrNumOrBool === "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '===' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + let q1: {} = strOrNumOrBool; // {} + } + else { + let q2: string | number | boolean = strOrNumOrBool; // string | number | boolean + } + + // A type guard of the form typeof x !== s, where s is a string literal, + // - 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") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + var r2: string = strOrC; // string + } + else { + c = strOrC; // C + } + if (typeof numOrC !== "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + var r3: number = numOrC; // number + } + else { + c = numOrC; // C + } + if (typeof boolOrC !== "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + var r4: boolean = boolOrC; // boolean + } + else { + c = boolOrC; // C + } + + if (typeof strOrNumOrBool !== "Object") { + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2365: Operator '!==' cannot be applied to types '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' and '"Object"'. + let q1: string | number | boolean = strOrNumOrBool; // string | number | boolean + } + else { + let q2: {} = strOrNumOrBool; // {} + } + \ No newline at end of file diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js index ee0b6f6633279..571edc7e5a2e8 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js +++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js @@ -37,6 +37,12 @@ if (typeof boolOrC === "Object") { else { var r4: boolean = boolOrC; // boolean } +if (typeof strOrC === "Object" as string) { // comparison is OK with cast + c = strOrC; // error: but no narrowing to C +} +else { + var r5: string = strOrC; // error: no narrowing to string +} if (typeof strOrNumOrBool === "Object") { let q1: {} = strOrNumOrBool; // {} @@ -116,6 +122,12 @@ if (typeof boolOrC === "Object") { else { var r4 = boolOrC; // boolean } +if (typeof strOrC === "Object") { + c = strOrC; // error: but no narrowing to C +} +else { + var r5 = strOrC; // error: no narrowing to string +} if (typeof strOrNumOrBool === "Object") { var q1 = strOrNumOrBool; // {} } diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols deleted file mode 100644 index a8760feda4515..0000000000000 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols +++ /dev/null @@ -1,153 +0,0 @@ -=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts === -class C { private p: string }; ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) ->p : Symbol(C.p, Decl(typeGuardOfFormTypeOfOther.ts, 0, 9)) - -var str: string; ->str : Symbol(str, Decl(typeGuardOfFormTypeOfOther.ts, 2, 3)) - -var bool: boolean; ->bool : Symbol(bool, Decl(typeGuardOfFormTypeOfOther.ts, 3, 3)) - -var num: number; ->num : Symbol(num, Decl(typeGuardOfFormTypeOfOther.ts, 4, 3)) - -var strOrNum: string | number; ->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfOther.ts, 5, 3)) - -var strOrBool: string | boolean; ->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 6, 3)) - -var numOrBool: number | boolean ->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 7, 3)) - -var strOrNumOrBool: string | number | boolean; ->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3)) - -var strOrC: string | C; ->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) - -var numOrC: number | C; ->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) - -var boolOrC: boolean | C; ->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) - -var emptyObj: {}; ->emptyObj : Symbol(emptyObj, Decl(typeGuardOfFormTypeOfOther.ts, 12, 3)) - -var c: C; ->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3)) ->C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0)) - -// A type guard of the form typeof x === s, -// where s is a string literal with any value but 'string', 'number' or 'boolean', -// - when true, removes the primitive types string, number, and boolean from the type of x, or -// - when false, has no effect on the type of x. - -if (typeof strOrC === "Object") { ->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) - - c = strOrC; // C ->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3)) ->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) -} -else { - var r2: string = strOrC; // string ->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 50, 7)) ->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) -} -if (typeof numOrC === "Object") { ->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) - - c = numOrC; // C ->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3)) ->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) -} -else { - var r3: number = numOrC; // number ->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 56, 7)) ->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) -} -if (typeof boolOrC === "Object") { ->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) - - c = boolOrC; // C ->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3)) ->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) -} -else { - var r4: boolean = boolOrC; // boolean ->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 62, 7)) ->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) -} - -if (typeof strOrNumOrBool === "Object") { ->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3)) - - let q1: {} = strOrNumOrBool; // {} ->q1 : Symbol(q1, Decl(typeGuardOfFormTypeOfOther.ts, 40, 7)) ->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3)) -} -else { - let q2: string | number | boolean = strOrNumOrBool; // string | number | boolean ->q2 : Symbol(q2, Decl(typeGuardOfFormTypeOfOther.ts, 43, 7)) ->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3)) -} - -// A type guard of the form typeof x !== s, where s is a string literal, -// - 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") { ->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) - - var r2: string = strOrC; // string ->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfOther.ts, 24, 7), Decl(typeGuardOfFormTypeOfOther.ts, 50, 7)) ->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) -} -else { - c = strOrC; // C ->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3)) ->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfOther.ts, 9, 3)) -} -if (typeof numOrC !== "Object") { ->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) - - var r3: number = numOrC; // number ->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfOther.ts, 30, 7), Decl(typeGuardOfFormTypeOfOther.ts, 56, 7)) ->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) -} -else { - c = numOrC; // C ->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3)) ->numOrC : Symbol(numOrC, Decl(typeGuardOfFormTypeOfOther.ts, 10, 3)) -} -if (typeof boolOrC !== "Object") { ->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) - - var r4: boolean = boolOrC; // boolean ->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfOther.ts, 36, 7), Decl(typeGuardOfFormTypeOfOther.ts, 62, 7)) ->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) -} -else { - c = boolOrC; // C ->c : Symbol(c, Decl(typeGuardOfFormTypeOfOther.ts, 13, 3)) ->boolOrC : Symbol(boolOrC, Decl(typeGuardOfFormTypeOfOther.ts, 11, 3)) -} - -if (typeof strOrNumOrBool !== "Object") { ->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3)) - - let q1: string | number | boolean = strOrNumOrBool; // string | number | boolean ->q1 : Symbol(q1, Decl(typeGuardOfFormTypeOfOther.ts, 69, 7)) ->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3)) -} -else { - let q2: {} = strOrNumOrBool; // {} ->q2 : Symbol(q2, Decl(typeGuardOfFormTypeOfOther.ts, 72, 7)) ->strOrNumOrBool : Symbol(strOrNumOrBool, Decl(typeGuardOfFormTypeOfOther.ts, 8, 3)) -} - diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types b/tests/baselines/reference/typeGuardOfFormTypeOfOther.types deleted file mode 100644 index b87f6a2a004b3..0000000000000 --- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.types +++ /dev/null @@ -1,183 +0,0 @@ -=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts === -class C { private p: string }; ->C : C ->p : string - -var str: string; ->str : string - -var bool: boolean; ->bool : boolean - -var num: number; ->num : number - -var strOrNum: string | number; ->strOrNum : string | number - -var strOrBool: string | boolean; ->strOrBool : string | boolean - -var numOrBool: number | boolean ->numOrBool : number | boolean - -var strOrNumOrBool: string | number | boolean; ->strOrNumOrBool : string | number | boolean - -var strOrC: string | C; ->strOrC : string | C ->C : C - -var numOrC: number | C; ->numOrC : number | C ->C : C - -var boolOrC: boolean | C; ->boolOrC : boolean | C ->C : C - -var emptyObj: {}; ->emptyObj : {} - -var c: C; ->c : C ->C : C - -// A type guard of the form typeof x === s, -// where s is a string literal with any value but 'string', 'number' or 'boolean', -// - when true, removes the primitive types string, number, and boolean from the type of x, or -// - when false, has no effect on the type of x. - -if (typeof strOrC === "Object") { ->typeof strOrC === "Object" : boolean ->typeof strOrC : string ->strOrC : string | C ->"Object" : "Object" - - c = strOrC; // C ->c = strOrC : C ->c : C ->strOrC : C -} -else { - var r2: string = strOrC; // string ->r2 : string ->strOrC : string -} -if (typeof numOrC === "Object") { ->typeof numOrC === "Object" : boolean ->typeof numOrC : string ->numOrC : number | C ->"Object" : "Object" - - c = numOrC; // C ->c = numOrC : C ->c : C ->numOrC : C -} -else { - var r3: number = numOrC; // number ->r3 : number ->numOrC : number -} -if (typeof boolOrC === "Object") { ->typeof boolOrC === "Object" : boolean ->typeof boolOrC : string ->boolOrC : boolean | C ->"Object" : "Object" - - c = boolOrC; // C ->c = boolOrC : C ->c : C ->boolOrC : C -} -else { - var r4: boolean = boolOrC; // boolean ->r4 : boolean ->boolOrC : boolean -} - -if (typeof strOrNumOrBool === "Object") { ->typeof strOrNumOrBool === "Object" : boolean ->typeof strOrNumOrBool : string ->strOrNumOrBool : string | number | boolean ->"Object" : "Object" - - let q1: {} = strOrNumOrBool; // {} ->q1 : {} ->strOrNumOrBool : never -} -else { - let q2: string | number | boolean = strOrNumOrBool; // string | number | boolean ->q2 : string | number | boolean ->strOrNumOrBool : string | number | boolean -} - -// A type guard of the form typeof x !== s, where s is a string literal, -// - 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") { ->typeof strOrC !== "Object" : boolean ->typeof strOrC : string ->strOrC : string | C ->"Object" : "Object" - - var r2: string = strOrC; // string ->r2 : string ->strOrC : string -} -else { - c = strOrC; // C ->c = strOrC : C ->c : C ->strOrC : C -} -if (typeof numOrC !== "Object") { ->typeof numOrC !== "Object" : boolean ->typeof numOrC : string ->numOrC : number | C ->"Object" : "Object" - - var r3: number = numOrC; // number ->r3 : number ->numOrC : number -} -else { - c = numOrC; // C ->c = numOrC : C ->c : C ->numOrC : C -} -if (typeof boolOrC !== "Object") { ->typeof boolOrC !== "Object" : boolean ->typeof boolOrC : string ->boolOrC : boolean | C ->"Object" : "Object" - - var r4: boolean = boolOrC; // boolean ->r4 : boolean ->boolOrC : boolean -} -else { - c = boolOrC; // C ->c = boolOrC : C ->c : C ->boolOrC : C -} - -if (typeof strOrNumOrBool !== "Object") { ->typeof strOrNumOrBool !== "Object" : boolean ->typeof strOrNumOrBool : string ->strOrNumOrBool : string | number | boolean ->"Object" : "Object" - - let q1: string | number | boolean = strOrNumOrBool; // string | number | boolean ->q1 : string | number | boolean ->strOrNumOrBool : string | number | boolean -} -else { - let q2: {} = strOrNumOrBool; // {} ->q2 : {} ->strOrNumOrBool : never -} - diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types b/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types index 6302ef58005c9..4787c07d75807 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types +++ b/tests/baselines/reference/typeGuardOfFormTypeOfPrimitiveSubtype.types @@ -8,7 +8,7 @@ let b: {toString(): string}; if (typeof a === "number") { >typeof a === "number" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : {} >"number" : "number" @@ -18,7 +18,7 @@ if (typeof a === "number") { } if (typeof a === "string") { >typeof a === "string" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : {} >"string" : "string" @@ -28,7 +28,7 @@ if (typeof a === "string") { } if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : {} >"boolean" : "boolean" @@ -39,7 +39,7 @@ if (typeof a === "boolean") { if (typeof b === "number") { >typeof b === "number" : boolean ->typeof b : string +>typeof b : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >b : { toString(): string; } >"number" : "number" @@ -49,7 +49,7 @@ if (typeof b === "number") { } if (typeof b === "string") { >typeof b === "string" : boolean ->typeof b : string +>typeof b : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >b : { toString(): string; } >"string" : "string" @@ -59,7 +59,7 @@ if (typeof b === "string") { } if (typeof b === "boolean") { >typeof b === "boolean" : boolean ->typeof b : string +>typeof b : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >b : { toString(): string; } >"boolean" : "boolean" diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfString.types b/tests/baselines/reference/typeGuardOfFormTypeOfString.types index e9960ac3019db..6b3e048212a6e 100644 --- a/tests/baselines/reference/typeGuardOfFormTypeOfString.types +++ b/tests/baselines/reference/typeGuardOfFormTypeOfString.types @@ -46,7 +46,7 @@ var c: C; // - when false, removes the primitive type from the type of x. if (typeof strOrNum === "string") { >typeof strOrNum === "string" : boolean ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number >"string" : "string" @@ -63,7 +63,7 @@ else { } if (typeof strOrBool === "string") { >typeof strOrBool === "string" : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >"string" : "string" @@ -80,7 +80,7 @@ else { } if (typeof strOrNumOrBool === "string") { >typeof strOrNumOrBool === "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" @@ -97,7 +97,7 @@ else { } if (typeof strOrC === "string") { >typeof strOrC === "string" : boolean ->typeof strOrC : string +>typeof strOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrC : string | C >"string" : "string" @@ -115,7 +115,7 @@ else { if (typeof numOrBool === "string") { >typeof numOrBool === "string" : boolean ->typeof numOrBool : string +>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrBool : number | boolean >"string" : "string" @@ -134,7 +134,7 @@ else { // - when false, narrows the type of x by typeof x === s when true. if (typeof strOrNum !== "string") { >typeof strOrNum !== "string" : boolean ->typeof strOrNum : string +>typeof strOrNum : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNum : string | number >"string" : "string" @@ -151,7 +151,7 @@ else { } if (typeof strOrBool !== "string") { >typeof strOrBool !== "string" : boolean ->typeof strOrBool : string +>typeof strOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrBool : string | boolean >"string" : "string" @@ -168,7 +168,7 @@ else { } if (typeof strOrNumOrBool !== "string") { >typeof strOrNumOrBool !== "string" : boolean ->typeof strOrNumOrBool : string +>typeof strOrNumOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrNumOrBool : string | number | boolean >"string" : "string" @@ -185,7 +185,7 @@ else { } if (typeof strOrC !== "string") { >typeof strOrC !== "string" : boolean ->typeof strOrC : string +>typeof strOrC : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >strOrC : string | C >"string" : "string" @@ -203,7 +203,7 @@ else { if (typeof numOrBool !== "string") { >typeof numOrBool !== "string" : boolean ->typeof numOrBool : string +>typeof numOrBool : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >numOrBool : number | boolean >"string" : "string" diff --git a/tests/baselines/reference/typeGuardRedundancy.types b/tests/baselines/reference/typeGuardRedundancy.types index 80de5f54acea7..2023defbb43ca 100644 --- a/tests/baselines/reference/typeGuardRedundancy.types +++ b/tests/baselines/reference/typeGuardRedundancy.types @@ -7,11 +7,11 @@ var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed; >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 +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string >"string" : "string" >x.substr : (from: number, length?: number) => string @@ -28,11 +28,11 @@ var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.subst >(typeof x === "string" && typeof x === "string") : boolean >typeof x === "string" && typeof x === "string" : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string >"string" : "string" >x.toFixed : (fractionDigits?: number) => string @@ -47,11 +47,11 @@ var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed; >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 +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number >"string" : "string" >x.substr : (from: number, length?: number) => string @@ -68,11 +68,11 @@ var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.subst >(typeof x === "string" || typeof x === "string") : boolean >typeof x === "string" || typeof x === "string" : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number >"string" : "string" >x.toFixed : (fractionDigits?: number) => string diff --git a/tests/baselines/reference/typeGuardTautologicalConsistiency.types b/tests/baselines/reference/typeGuardTautologicalConsistiency.types index 0a6524dd26f23..136b09674d891 100644 --- a/tests/baselines/reference/typeGuardTautologicalConsistiency.types +++ b/tests/baselines/reference/typeGuardTautologicalConsistiency.types @@ -4,13 +4,13 @@ let stringOrNumber: string | number; if (typeof stringOrNumber === "number") { >typeof stringOrNumber === "number" : boolean ->typeof stringOrNumber : string +>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >stringOrNumber : string | number >"number" : "number" if (typeof stringOrNumber !== "number") { >typeof stringOrNumber !== "number" : boolean ->typeof stringOrNumber : string +>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >stringOrNumber : number >"number" : "number" @@ -22,11 +22,11 @@ if (typeof stringOrNumber === "number") { if (typeof stringOrNumber === "number" && typeof stringOrNumber !== "number") { >typeof stringOrNumber === "number" && typeof stringOrNumber !== "number" : boolean >typeof stringOrNumber === "number" : boolean ->typeof stringOrNumber : string +>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >stringOrNumber : string | number >"number" : "number" >typeof stringOrNumber !== "number" : boolean ->typeof stringOrNumber : string +>typeof stringOrNumber : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >stringOrNumber : number >"number" : "number" diff --git a/tests/baselines/reference/typeGuardTypeOfUndefined.types b/tests/baselines/reference/typeGuardTypeOfUndefined.types index 520d045d9e0d1..a28dab044907a 100644 --- a/tests/baselines/reference/typeGuardTypeOfUndefined.types +++ b/tests/baselines/reference/typeGuardTypeOfUndefined.types @@ -6,13 +6,13 @@ function test1(a: any) { if (typeof a !== "undefined") { >typeof a !== "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : any >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : any >"boolean" : "boolean" @@ -36,13 +36,13 @@ function test2(a: any) { if (typeof a === "undefined") { >typeof a === "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : any >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : undefined >"boolean" : "boolean" @@ -67,11 +67,11 @@ function test3(a: any) { if (typeof a === "undefined" || typeof a === "boolean") { >typeof a === "undefined" || typeof a === "boolean" : boolean >typeof a === "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : any >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : any >"boolean" : "boolean" @@ -91,11 +91,11 @@ function test4(a: any) { if (typeof a !== "undefined" && typeof a === "boolean") { >typeof a !== "undefined" && typeof a === "boolean" : boolean >typeof a !== "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : any >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : any >"boolean" : "boolean" @@ -114,13 +114,13 @@ function test5(a: boolean | void) { if (typeof a !== "undefined") { >typeof a !== "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean | void >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean >"boolean" : "boolean" @@ -144,13 +144,13 @@ function test6(a: boolean | void) { if (typeof a === "undefined") { >typeof a === "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean | void >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean | void >"boolean" : "boolean" @@ -175,11 +175,11 @@ function test7(a: boolean | void) { if (typeof a === "undefined" || typeof a === "boolean") { >typeof a === "undefined" || typeof a === "boolean" : boolean >typeof a === "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean | void >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean >"boolean" : "boolean" @@ -199,11 +199,11 @@ function test8(a: boolean | void) { if (typeof a !== "undefined" && typeof a === "boolean") { >typeof a !== "undefined" && typeof a === "boolean" : boolean >typeof a !== "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean | void >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : boolean >"boolean" : "boolean" @@ -222,13 +222,13 @@ function test9(a: boolean | number) { if (typeof a !== "undefined") { >typeof a !== "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"boolean" : "boolean" @@ -252,13 +252,13 @@ function test10(a: boolean | number) { if (typeof a === "undefined") { >typeof a === "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"boolean" : "boolean" @@ -283,11 +283,11 @@ function test11(a: boolean | number) { if (typeof a === "undefined" || typeof a === "boolean") { >typeof a === "undefined" || typeof a === "boolean" : boolean >typeof a === "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"boolean" : "boolean" @@ -307,11 +307,11 @@ function test12(a: boolean | number) { if (typeof a !== "undefined" && typeof a === "boolean") { >typeof a !== "undefined" && typeof a === "boolean" : boolean >typeof a !== "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"boolean" : "boolean" @@ -330,13 +330,13 @@ function test13(a: boolean | number | void) { if (typeof a !== "undefined") { >typeof a !== "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean | void >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"boolean" : "boolean" @@ -360,13 +360,13 @@ function test14(a: boolean | number | void) { if (typeof a === "undefined") { >typeof a === "undefined" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean | void >"undefined" : "undefined" if (typeof a === "boolean") { >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean | void >"boolean" : "boolean" @@ -391,11 +391,11 @@ function test15(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 +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean | void >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"boolean" : "boolean" @@ -415,11 +415,11 @@ function test16(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 +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean | void >"undefined" : "undefined" >typeof a === "boolean" : boolean ->typeof a : string +>typeof a : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >a : number | boolean >"boolean" : "boolean" diff --git a/tests/baselines/reference/typeGuardsAsAssertions.types b/tests/baselines/reference/typeGuardsAsAssertions.types index bdda2eafefd9d..06dda2691be8e 100644 --- a/tests/baselines/reference/typeGuardsAsAssertions.types +++ b/tests/baselines/reference/typeGuardsAsAssertions.types @@ -118,7 +118,7 @@ function foo1() { >x : string | number | boolean >typeof x === "string" ? x.slice() : "abc" : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >x.slice() : string @@ -152,7 +152,7 @@ function foo2() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -211,7 +211,7 @@ function f2() { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : undefined >"string" : "string" @@ -254,7 +254,7 @@ function f4() { if (typeof x === "boolean") { >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : undefined >"boolean" : "boolean" @@ -272,11 +272,11 @@ function f5(x: string | number) { if (typeof x === "string" && typeof x === "number") { >typeof x === "string" && typeof x === "number" : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string >"number" : "number" diff --git a/tests/baselines/reference/typeGuardsInClassAccessors.types b/tests/baselines/reference/typeGuardsInClassAccessors.types index 2250657e453a9..71e427124c47c 100644 --- a/tests/baselines/reference/typeGuardsInClassAccessors.types +++ b/tests/baselines/reference/typeGuardsInClassAccessors.types @@ -26,7 +26,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -42,7 +42,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -63,7 +63,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -76,7 +76,7 @@ class ClassWithAccessors { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -92,7 +92,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -109,7 +109,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -125,7 +125,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -146,7 +146,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -159,7 +159,7 @@ class ClassWithAccessors { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -175,7 +175,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -192,7 +192,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -208,7 +208,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -229,7 +229,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -242,7 +242,7 @@ class ClassWithAccessors { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -258,7 +258,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -275,7 +275,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -291,7 +291,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -312,7 +312,7 @@ class ClassWithAccessors { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -325,7 +325,7 @@ class ClassWithAccessors { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -341,7 +341,7 @@ class ClassWithAccessors { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number diff --git a/tests/baselines/reference/typeGuardsInClassMethods.types b/tests/baselines/reference/typeGuardsInClassMethods.types index 600e3e36ab0f2..3a45abcf1556d 100644 --- a/tests/baselines/reference/typeGuardsInClassMethods.types +++ b/tests/baselines/reference/typeGuardsInClassMethods.types @@ -21,7 +21,7 @@ class C1 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -37,7 +37,7 @@ class C1 { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -50,7 +50,7 @@ class C1 { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -68,7 +68,7 @@ class C1 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -84,7 +84,7 @@ class C1 { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -97,7 +97,7 @@ class C1 { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -115,7 +115,7 @@ class C1 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -131,7 +131,7 @@ class C1 { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -144,7 +144,7 @@ class C1 { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -162,7 +162,7 @@ class C1 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -178,7 +178,7 @@ class C1 { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -191,7 +191,7 @@ class C1 { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -209,7 +209,7 @@ class C1 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -225,7 +225,7 @@ class C1 { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -238,7 +238,7 @@ class C1 { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number diff --git a/tests/baselines/reference/typeGuardsInConditionalExpression.types b/tests/baselines/reference/typeGuardsInConditionalExpression.types index 165eecd3514f3..85d5380675d20 100644 --- a/tests/baselines/reference/typeGuardsInConditionalExpression.types +++ b/tests/baselines/reference/typeGuardsInConditionalExpression.types @@ -13,7 +13,7 @@ function foo(x: number | string) { return typeof x === "string" >typeof x === "string" ? x.length // string : x++ : number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -33,7 +33,7 @@ function foo2(x: number | string) { return typeof x === "string" >typeof x === "string" ? ((x = "hello") && x) // string : x : string | number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -56,7 +56,7 @@ function foo3(x: number | string) { return typeof x === "string" >typeof x === "string" ? ((x = 10) && x) // number : x : number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -79,7 +79,7 @@ function foo4(x: number | string) { return typeof x === "string" >typeof x === "string" ? x // string : ((x = 10) && x) : string | number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -102,7 +102,7 @@ function foo5(x: number | string) { return typeof x === "string" >typeof x === "string" ? x // string : ((x = "hello") && x) : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -126,7 +126,7 @@ function foo6(x: number | string) { return typeof x === "string" >typeof x === "string" ? ((x = 10) && x) // number : ((x = "hello") && x) : string | number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -155,7 +155,7 @@ function foo7(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x === "hello" // boolean : typeof x === "boolean" ? x // boolean : x == 10 : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -167,7 +167,7 @@ function foo7(x: number | string | boolean) { : typeof x === "boolean" >typeof x === "boolean" ? x // boolean : x == 10 : boolean >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" @@ -189,7 +189,7 @@ function foo8(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x === "hello" : ((b = x) && // number | boolean (typeof x === "boolean" ? x // boolean : x == 10)) : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -210,7 +210,7 @@ function foo8(x: number | string | boolean) { >(typeof x === "boolean" ? x // boolean : x == 10) : boolean >typeof x === "boolean" ? x // boolean : x == 10 : boolean >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" @@ -234,7 +234,7 @@ function foo9(x: number | string) { return typeof x === "string" >typeof x === "string" ? ((y = x.length) && x === "hello") // boolean : x === 10 : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -267,7 +267,7 @@ function foo10(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x // string : ((b = x) // x is number | boolean && typeof x === "number" && x.toString()) : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -285,7 +285,7 @@ function foo10(x: number | string | boolean) { && typeof x === "number" >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -306,7 +306,7 @@ function foo11(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x // string : ((b = x) // x is number | boolean && typeof x === "number" && (x = 10) // assignment to x && x) : string | number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -325,7 +325,7 @@ function foo11(x: number | string | boolean) { && typeof x === "number" >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -349,7 +349,7 @@ function foo12(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? ((x = 10) && x.toString().length) // number : ((b = x) // x is number | boolean && typeof x === "number" && x) : number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -378,7 +378,7 @@ function foo12(x: number | string | boolean) { && typeof x === "number" >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" diff --git a/tests/baselines/reference/typeGuardsInDoStatement.types b/tests/baselines/reference/typeGuardsInDoStatement.types index fe14cff375fc2..c663ebbea54a7 100644 --- a/tests/baselines/reference/typeGuardsInDoStatement.types +++ b/tests/baselines/reference/typeGuardsInDoStatement.types @@ -22,7 +22,7 @@ function a(x: string | number | boolean) { } while (typeof x === "string") >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -52,7 +52,7 @@ function b(x: string | number | boolean) { } while (typeof x === "string") >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -82,7 +82,7 @@ function c(x: string | number) { } while (typeof x === "string") >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" diff --git a/tests/baselines/reference/typeGuardsInExternalModule.types b/tests/baselines/reference/typeGuardsInExternalModule.types index a0c33af455742..86b47f9b5c626 100644 --- a/tests/baselines/reference/typeGuardsInExternalModule.types +++ b/tests/baselines/reference/typeGuardsInExternalModule.types @@ -11,7 +11,7 @@ var var1: string | number; if (typeof var1 === "string") { >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" @@ -38,7 +38,7 @@ export var var2: string | number; if (typeof var2 === "string") { >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" diff --git a/tests/baselines/reference/typeGuardsInForStatement.types b/tests/baselines/reference/typeGuardsInForStatement.types index 1d600d52d132e..4ad1a283d40cb 100644 --- a/tests/baselines/reference/typeGuardsInForStatement.types +++ b/tests/baselines/reference/typeGuardsInForStatement.types @@ -11,7 +11,7 @@ function a(x: string | number) { >x : string | number >undefined : undefined >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"number" : "number" >x = undefined : undefined @@ -33,7 +33,7 @@ function b(x: string | number) { >x : string | number >undefined : undefined >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"number" : "number" >x = undefined : undefined @@ -58,7 +58,7 @@ function c(x: string | number) { >x : string | number >undefined : undefined >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"number" : "number" >x = undefined : undefined diff --git a/tests/baselines/reference/typeGuardsInFunction.types b/tests/baselines/reference/typeGuardsInFunction.types index 6a007dd7c955e..a7dca0f709b30 100644 --- a/tests/baselines/reference/typeGuardsInFunction.types +++ b/tests/baselines/reference/typeGuardsInFunction.types @@ -20,7 +20,7 @@ function f(param: string | number) { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -36,7 +36,7 @@ function f(param: string | number) { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -49,7 +49,7 @@ function f(param: string | number) { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -74,7 +74,7 @@ function f1(param: string | number) { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -87,7 +87,7 @@ function f1(param: string | number) { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -100,7 +100,7 @@ function f1(param: string | number) { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -116,7 +116,7 @@ function f1(param: string | number) { >num : number >typeof var3 === "string" && var3.length : number >typeof var3 === "string" : boolean ->typeof var3 : string +>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var3 : string | number >"string" : "string" >var3.length : number @@ -128,7 +128,7 @@ function f1(param: string | number) { >num : number >typeof param1 === "string" && param1.length : number >typeof param1 === "string" : boolean ->typeof param1 : string +>typeof param1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param1 : string | number >"string" : "string" >param1.length : number @@ -158,7 +158,7 @@ function f2(param: string | number) { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -171,7 +171,7 @@ function f2(param: string | number) { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -184,7 +184,7 @@ function f2(param: string | number) { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -200,7 +200,7 @@ function f2(param: string | number) { >num : number >typeof var3 === "string" && var3.length : number >typeof var3 === "string" : boolean ->typeof var3 : string +>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var3 : string | number >"string" : "string" >var3.length : number @@ -212,7 +212,7 @@ function f2(param: string | number) { >num : number >typeof param1 === "string" && param1.length : number >typeof param1 === "string" : boolean ->typeof param1 : string +>typeof param1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param1 : string | number >"string" : "string" >param1.length : number @@ -245,7 +245,7 @@ function f3(param: string | number) { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -258,7 +258,7 @@ function f3(param: string | number) { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -271,7 +271,7 @@ function f3(param: string | number) { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -287,7 +287,7 @@ function f3(param: string | number) { >num : number >typeof var3 === "string" && var3.length : number >typeof var3 === "string" : boolean ->typeof var3 : string +>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var3 : string | number >"string" : "string" >var3.length : number @@ -299,7 +299,7 @@ function f3(param: string | number) { >num : number >typeof param1 === "string" && param1.length : number >typeof param1 === "string" : boolean ->typeof param1 : string +>typeof param1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param1 : string | number >"string" : "string" >param1.length : number @@ -329,7 +329,7 @@ strOrNum = typeof f4() === "string" && f4(); // string | number >strOrNum : string | number >typeof f4() === "string" && f4() : string | number >typeof f4() === "string" : boolean ->typeof f4() : string +>typeof f4() : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >f4() : string | number >f4 : () => string | number >"string" : "string" diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types index 0cb312ffb1a86..a425e4d632eba 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types @@ -8,7 +8,7 @@ function foo(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x : function f() { var b = x; // number | boolean return typeof x === "boolean" ? x.toString() // boolean : x.toString(); // number } () : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -27,7 +27,7 @@ function foo(x: number | string | boolean) { return typeof x === "boolean" >typeof x === "boolean" ? x.toString() // boolean : x.toString() : string >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" @@ -52,7 +52,7 @@ function foo2(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x : function f(a: number | boolean) { var b = x; // new scope - number | boolean return typeof x === "boolean" ? x.toString() // boolean : x.toString(); // number } (x) : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -72,7 +72,7 @@ function foo2(x: number | string | boolean) { return typeof x === "boolean" >typeof x === "boolean" ? x.toString() // boolean : x.toString() : string >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" @@ -98,7 +98,7 @@ function foo3(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x : (() => { var b = x; // new scope - number | boolean return typeof x === "boolean" ? x.toString() // boolean : x.toString(); // number })() : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -117,7 +117,7 @@ function foo3(x: number | string | boolean) { return typeof x === "boolean" >typeof x === "boolean" ? x.toString() // boolean : x.toString() : string >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" @@ -142,7 +142,7 @@ function foo4(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" ? x : ((a: number | boolean) => { var b = x; // new scope - number | boolean return typeof x === "boolean" ? x.toString() // boolean : x.toString(); // number })(x) : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -162,7 +162,7 @@ function foo4(x: number | string | boolean) { return typeof x === "boolean" >typeof x === "boolean" ? x.toString() // boolean : x.toString() : string >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" @@ -188,7 +188,7 @@ function foo5(x: number | string | boolean) { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -223,7 +223,7 @@ module m { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -238,7 +238,7 @@ module m { >y : string >typeof x === "boolean" ? x.toString() // boolean : x.toString() : string >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" @@ -275,7 +275,7 @@ module m1 { if (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -290,7 +290,7 @@ module m1 { >y : string >typeof x === "boolean" ? x.toString() // boolean : x.toString() : string >typeof x === "boolean" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"boolean" : "boolean" diff --git a/tests/baselines/reference/typeGuardsInGlobal.types b/tests/baselines/reference/typeGuardsInGlobal.types index 7935c05411e2e..7ccc2defe27ba 100644 --- a/tests/baselines/reference/typeGuardsInGlobal.types +++ b/tests/baselines/reference/typeGuardsInGlobal.types @@ -11,7 +11,7 @@ var var1: string | number; if (typeof var1 === "string") { >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" diff --git a/tests/baselines/reference/typeGuardsInModule.types b/tests/baselines/reference/typeGuardsInModule.types index f1efc45a2484f..a14c47e3ccaa4 100644 --- a/tests/baselines/reference/typeGuardsInModule.types +++ b/tests/baselines/reference/typeGuardsInModule.types @@ -22,7 +22,7 @@ module m1 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -35,7 +35,7 @@ module m1 { if (typeof var2 === "string") { >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" @@ -59,7 +59,7 @@ module m1 { if (typeof var3 === "string") { >typeof var3 === "string" : boolean ->typeof var3 : string +>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var3 : string | number >"string" : "string" @@ -94,7 +94,7 @@ module m2 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -107,7 +107,7 @@ module m2 { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -120,7 +120,7 @@ module m2 { >strOrNum : string | number >typeof var3 === "string" && var3 : string >typeof var3 === "string" : boolean ->typeof var3 : string +>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var3 : string | number >"string" : "string" >var3 : string @@ -131,7 +131,7 @@ module m2 { if (typeof var4 === "string") { >typeof var4 === "string" : boolean ->typeof var4 : string +>typeof var4 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var4 : string | number >"string" : "string" @@ -155,7 +155,7 @@ module m2 { if (typeof var5 === "string") { >typeof var5 === "string" : boolean ->typeof var5 : string +>typeof var5 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var5 : string | number >"string" : "string" @@ -183,7 +183,7 @@ module m3.m4 { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -196,7 +196,7 @@ module m3.m4 { if (typeof var2 === "string") { >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" @@ -220,7 +220,7 @@ module m3.m4 { if (typeof var3 === "string") { >typeof var3 === "string" : boolean ->typeof var3 : string +>typeof var3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var3 : string | number >"string" : "string" diff --git a/tests/baselines/reference/typeGuardsInProperties.types b/tests/baselines/reference/typeGuardsInProperties.types index 1f8151dff7133..d40de30bd97b0 100644 --- a/tests/baselines/reference/typeGuardsInProperties.types +++ b/tests/baselines/reference/typeGuardsInProperties.types @@ -33,7 +33,7 @@ class C1 { >strOrNum : string | number >typeof this.pp1 === "string" && this.pp1 : string >typeof this.pp1 === "string" : boolean ->typeof this.pp1 : string +>typeof this.pp1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >this.pp1 : string | number >this : this >pp1 : string | number @@ -47,7 +47,7 @@ class C1 { >strOrNum : string | number >typeof this.pp2 === "string" && this.pp2 : string >typeof this.pp2 === "string" : boolean ->typeof this.pp2 : string +>typeof this.pp2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >this.pp2 : string | number >this : this >pp2 : string | number @@ -61,7 +61,7 @@ class C1 { >strOrNum : string | number >typeof this.pp3 === "string" && this.pp3 : string >typeof this.pp3 === "string" : boolean ->typeof this.pp3 : string +>typeof this.pp3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >this.pp3 : string | number >this : this >pp3 : string | number @@ -80,7 +80,7 @@ strOrNum = typeof c1.pp2 === "string" && c1.pp2; // string | number >strOrNum : string | number >typeof c1.pp2 === "string" && c1.pp2 : string >typeof c1.pp2 === "string" : boolean ->typeof c1.pp2 : string +>typeof c1.pp2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >c1.pp2 : string | number >c1 : C1 >pp2 : string | number @@ -94,7 +94,7 @@ strOrNum = typeof c1.pp3 === "string" && c1.pp3; // string | number >strOrNum : string | number >typeof c1.pp3 === "string" && c1.pp3 : string >typeof c1.pp3 === "string" : boolean ->typeof c1.pp3 : string +>typeof c1.pp3 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >c1.pp3 : string | number >c1 : C1 >pp3 : string | number @@ -115,7 +115,7 @@ strOrNum = typeof obj1.x === "string" && obj1.x; // string | number >strOrNum : string | number >typeof obj1.x === "string" && obj1.x : string >typeof obj1.x === "string" : boolean ->typeof obj1.x : string +>typeof obj1.x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >obj1.x : string | number >obj1 : { x: string | number; } >x : string | number diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types index 54c1d0270b5b9..7235a1d80c23e 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types +++ b/tests/baselines/reference/typeGuardsInRightOperandOfAndAndOperator.types @@ -8,7 +8,7 @@ function foo(x: number | string) { return typeof x === "string" && x.length === 10; // string >typeof x === "string" && x.length === 10 : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >x.length === 10 : boolean @@ -25,7 +25,7 @@ function foo2(x: number | string) { return typeof x === "string" && ((x = 10) && x); // string | number >typeof x === "string" && ((x = 10) && x) : number >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >((x = 10) && x) : number @@ -44,7 +44,7 @@ function foo3(x: number | string) { return typeof x === "string" && ((x = "hello") && x); // string | number >typeof x === "string" && ((x = "hello") && x) : string >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >((x = "hello") && x) : string @@ -63,13 +63,13 @@ function foo4(x: number | string | boolean) { >typeof x !== "string" // string | number | boolean && typeof x !== "number" // number | boolean && x : boolean >typeof x !== "string" // string | number | boolean && typeof x !== "number" : boolean >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" && typeof x !== "number" // number | boolean >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -87,7 +87,7 @@ function foo5(x: number | string | boolean) { return typeof x !== "string" // string | number | boolean >typeof x !== "string" // string | number | boolean && ((b = x) && (typeof x !== "number" // number | boolean && x)) : boolean >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -101,7 +101,7 @@ function foo5(x: number | string | boolean) { >(typeof x !== "number" // number | boolean && x) : boolean >typeof x !== "number" // number | boolean && x : boolean >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -116,7 +116,7 @@ function foo6(x: number | string | boolean) { return typeof x !== "string" // string | number | boolean >typeof x !== "string" // string | number | boolean && (typeof x !== "number" // number | boolean ? x // boolean : x === 10) : boolean >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -124,7 +124,7 @@ function foo6(x: number | string | boolean) { >(typeof x !== "number" // number | boolean ? x // boolean : x === 10) : boolean >typeof x !== "number" // number | boolean ? x // boolean : x === 10 : boolean >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -150,7 +150,7 @@ function foo7(x: number | string | boolean) { return typeof x !== "string" >typeof x !== "string" && ((z = x) // number | boolean && (typeof x === "number" // change value of x ? ((x = 10) && x.toString()) // x is number // do not change value : ((y = x) && x.toString()))) : string >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -166,7 +166,7 @@ function foo7(x: number | string | boolean) { >(typeof x === "number" // change value of x ? ((x = 10) && x.toString()) // x is number // do not change value : ((y = x) && x.toString())) : string >typeof x === "number" // change value of x ? ((x = 10) && x.toString()) // x is number // do not change value : ((y = x) && x.toString()) : string >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" diff --git a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types index e8548ab1ef6b8..d8d807bad7032 100644 --- a/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types +++ b/tests/baselines/reference/typeGuardsInRightOperandOfOrOrOperator.types @@ -9,7 +9,7 @@ function foo(x: number | string) { return typeof x !== "string" || x.length === 10; // string >typeof x !== "string" || x.length === 10 : boolean >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >x.length === 10 : boolean @@ -26,7 +26,7 @@ function foo2(x: number | string) { return typeof x !== "string" || ((x = 10) || x); // string | number >typeof x !== "string" || ((x = 10) || x) : number | true >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >((x = 10) || x) : number @@ -45,7 +45,7 @@ function foo3(x: number | string) { return typeof x !== "string" || ((x = "hello") || x); // string | number >typeof x !== "string" || ((x = "hello") || x) : string | true >typeof x !== "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" >((x = "hello") || x) : string @@ -64,13 +64,13 @@ function foo4(x: number | string | boolean) { >typeof x === "string" // string | number | boolean || typeof x === "number" // number | boolean || x : boolean >typeof x === "string" // string | number | boolean || typeof x === "number" : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" || typeof x === "number" // number | boolean >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -88,7 +88,7 @@ function foo5(x: number | string | boolean) { return typeof x === "string" // string | number | boolean >typeof x === "string" // string | number | boolean || ((b = x) || (typeof x === "number" // number | boolean || x)) : number | boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -102,7 +102,7 @@ function foo5(x: number | string | boolean) { >(typeof x === "number" // number | boolean || x) : boolean >typeof x === "number" // number | boolean || x : boolean >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -117,7 +117,7 @@ function foo6(x: number | string | boolean) { return typeof x === "string" // string | number | boolean >typeof x === "string" // string | number | boolean || (typeof x !== "number" // number | boolean ? x // boolean : x === 10) : boolean >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -125,7 +125,7 @@ function foo6(x: number | string | boolean) { >(typeof x !== "number" // number | boolean ? x // boolean : x === 10) : boolean >typeof x !== "number" // number | boolean ? x // boolean : x === 10 : boolean >typeof x !== "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" @@ -151,7 +151,7 @@ function foo7(x: number | string | boolean) { return typeof x === "string" >typeof x === "string" || ((z = x) // number | boolean || (typeof x === "number" // change value of x ? ((x = 10) && x.toString()) // number | boolean | string // do not change value : ((y = x) && x.toString()))) : string | number | true >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number | boolean >"string" : "string" @@ -167,7 +167,7 @@ function foo7(x: number | string | boolean) { >(typeof x === "number" // change value of x ? ((x = 10) && x.toString()) // number | boolean | string // do not change value : ((y = x) && x.toString())) : string >typeof x === "number" // change value of x ? ((x = 10) && x.toString()) // number | boolean | string // do not change value : ((y = x) && x.toString()) : string >typeof x === "number" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : number | boolean >"number" : "number" diff --git a/tests/baselines/reference/typeGuardsInWhileStatement.types b/tests/baselines/reference/typeGuardsInWhileStatement.types index b0ea7959ec59c..cdcff209c0816 100644 --- a/tests/baselines/reference/typeGuardsInWhileStatement.types +++ b/tests/baselines/reference/typeGuardsInWhileStatement.types @@ -8,7 +8,7 @@ function a(x: string | number) { while (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -29,7 +29,7 @@ function b(x: string | number) { while (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" @@ -53,7 +53,7 @@ function c(x: string | number) { while (typeof x === "string") { >typeof x === "string" : boolean ->typeof x : string +>typeof x : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >x : string | number >"string" : "string" diff --git a/tests/baselines/reference/typeGuardsNestedAssignments.types b/tests/baselines/reference/typeGuardsNestedAssignments.types index 32ac85e270b34..ba26f6c07aa83 100644 --- a/tests/baselines/reference/typeGuardsNestedAssignments.types +++ b/tests/baselines/reference/typeGuardsNestedAssignments.types @@ -103,7 +103,7 @@ function f4() { if (typeof (x = getStringOrNumberOrNull()) === "number") { >typeof (x = getStringOrNumberOrNull()) === "number" : boolean ->typeof (x = getStringOrNumberOrNull()) : string +>typeof (x = getStringOrNumberOrNull()) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >(x = getStringOrNumberOrNull()) : string | number | null >x = getStringOrNumberOrNull() : string | number | null >x : string | number | null diff --git a/tests/baselines/reference/typeGuardsObjectMethods.types b/tests/baselines/reference/typeGuardsObjectMethods.types index 5a795c336e257..4f3e888d76e85 100644 --- a/tests/baselines/reference/typeGuardsObjectMethods.types +++ b/tests/baselines/reference/typeGuardsObjectMethods.types @@ -28,7 +28,7 @@ var obj1 = { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -44,7 +44,7 @@ var obj1 = { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -57,7 +57,7 @@ var obj1 = { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -77,7 +77,7 @@ var obj1 = { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -93,7 +93,7 @@ var obj1 = { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -114,7 +114,7 @@ var obj1 = { >num : number >typeof var1 === "string" && var1.length : number >typeof var1 === "string" : boolean ->typeof var1 : string +>typeof var1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var1 : string | number >"string" : "string" >var1.length : number @@ -130,7 +130,7 @@ var obj1 = { >num : number >typeof var2 === "string" && var2.length : number >typeof var2 === "string" : boolean ->typeof var2 : string +>typeof var2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >var2 : string | number >"string" : "string" >var2.length : number @@ -143,7 +143,7 @@ var obj1 = { >num : number >typeof param === "string" && param.length : number >typeof param === "string" : boolean ->typeof param : string +>typeof param : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >param : string | number >"string" : "string" >param.length : number @@ -157,7 +157,7 @@ strOrNum = typeof obj1.method(strOrNum) === "string" && obj1.method(strOrNum); >strOrNum : string | number >typeof obj1.method(strOrNum) === "string" && obj1.method(strOrNum) : string | number >typeof obj1.method(strOrNum) === "string" : boolean ->typeof obj1.method(strOrNum) : string +>typeof obj1.method(strOrNum) : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >obj1.method(strOrNum) : string | number >obj1.method : (param: string | number) => string | number >obj1 : { method(param: string | number): string | number; prop: string | number; } @@ -176,7 +176,7 @@ strOrNum = typeof obj1.prop === "string" && obj1.prop; >strOrNum : string | number >typeof obj1.prop === "string" && obj1.prop : string >typeof obj1.prop === "string" : boolean ->typeof obj1.prop : string +>typeof obj1.prop : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >obj1.prop : string | number >obj1 : { method(param: string | number): string | number; prop: string | number; } >prop : string | number diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.types b/tests/baselines/reference/typeGuardsOnClassProperty.types index 1b663ef209ff1..f4c3542344f2f 100644 --- a/tests/baselines/reference/typeGuardsOnClassProperty.types +++ b/tests/baselines/reference/typeGuardsOnClassProperty.types @@ -22,7 +22,7 @@ class D { return typeof data === "string" ? data : data.join(" "); >typeof data === "string" ? data : data.join(" ") : string >typeof data === "string" : boolean ->typeof data : string +>typeof data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >data : string | string[] >"string" : "string" >data : string @@ -39,7 +39,7 @@ class D { return typeof this.data === "string" ? this.data : this.data.join(" "); >typeof this.data === "string" ? this.data : this.data.join(" ") : string >typeof this.data === "string" : boolean ->typeof this.data : string +>typeof this.data : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >this.data : string | string[] >this : this >data : string | string[] @@ -81,7 +81,7 @@ var o: { if (typeof o.prop1 === "string" && o.prop1.toLowerCase()) {} >typeof o.prop1 === "string" && o.prop1.toLowerCase() : string >typeof o.prop1 === "string" : boolean ->typeof o.prop1 : string +>typeof o.prop1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >o.prop1 : string | number >o : { prop1: string | number; prop2: string | boolean; } >prop1 : string | number @@ -102,7 +102,7 @@ var prop1 = o.prop1; if (typeof prop1 === "string" && prop1.toLocaleLowerCase()) { } >typeof prop1 === "string" && prop1.toLocaleLowerCase() : string >typeof prop1 === "string" : boolean ->typeof prop1 : string +>typeof prop1 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function" >prop1 : string | number >"string" : "string" >prop1.toLocaleLowerCase() : string diff --git a/tests/baselines/reference/typeOfOperator1.errors.txt b/tests/baselines/reference/typeOfOperator1.errors.txt index 764463a308723..75fc25d243cfb 100644 --- a/tests/baselines/reference/typeOfOperator1.errors.txt +++ b/tests/baselines/reference/typeOfOperator1.errors.txt @@ -1,4 +1,5 @@ -tests/cases/compiler/typeOfOperator1.ts(3,5): error TS2322: Type 'string' is not assignable to type 'number'. +tests/cases/compiler/typeOfOperator1.ts(3,5): error TS2322: Type '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' is not assignable to type 'number'. + Type '"string"' is not assignable to type 'number'. ==== tests/cases/compiler/typeOfOperator1.ts (1 errors) ==== @@ -6,4 +7,5 @@ tests/cases/compiler/typeOfOperator1.ts(3,5): error TS2322: Type 'string' is not var y: string = typeof x; var z: number = typeof x; ~ -!!! error TS2322: Type 'string' is not assignable to type 'number'. \ No newline at end of file +!!! error TS2322: Type '"string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"' is not assignable to type 'number'. +!!! error TS2322: Type '"string"' is not assignable to type 'number'. \ No newline at end of file diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts index 44b064c321941..92b3103723e57 100644 --- a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts +++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts @@ -36,6 +36,12 @@ if (typeof boolOrC === "Object") { else { var r4: boolean = boolOrC; // boolean } +if (typeof strOrC === "Object" as string) { // comparison is OK with cast + c = strOrC; // error: but no narrowing to C +} +else { + var r5: string = strOrC; // error: no narrowing to string +} if (typeof strOrNumOrBool === "Object") { let q1: {} = strOrNumOrBool; // {} From 01bc4efc82105043cb98e1aa9105354a78ea5424 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 31 Jan 2017 10:34:44 -0800 Subject: [PATCH 026/116] Add arrayFromMap utility function --- src/compiler/checker.ts | 4 +--- src/compiler/core.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 47811d6ccaf53..ba4e8c6993d6b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14609,9 +14609,7 @@ namespace ts { function checkTypeOfExpression(node: TypeOfExpression): Type { checkExpression(node.expression); - const types: Type[] = []; - typeofEQFacts.forEach((_, s) => types.push(getLiteralTypeForText(TypeFlags.StringLiteral, s))); - return getUnionType(types); + return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s))); } function checkVoidExpression(node: VoidExpression): Type { diff --git a/src/compiler/core.ts b/src/compiler/core.ts index de3472afd8845..486dd5b42c839 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -895,6 +895,14 @@ namespace ts { return result; } + export function arrayFromMap(iterator: Iterator, f: (value: T) => U) { + const result: U[] = []; + for (let { value, done } = iterator.next(); !done; { value, done } = iterator.next()) { + result.push(f(value)); + } + return result; + } + /** * Calls `callback` for each entry in the map, returning the first truthy result. * Use `map.forEach` instead for normal iteration. From 78bc368c2293068197feed9391a4b1af2d67eb29 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 31 Jan 2017 14:14:48 -0800 Subject: [PATCH 027/116] Fix duplicate identifier reporting in classes Previously declarations in the order method-property would not report an error, but the order property-method would. Now both orders report "Duplicate identifier '{0}'." --- src/compiler/checker.ts | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 26c27cb3be2e3..c1b9a7ac0e3cd 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15780,19 +15780,20 @@ namespace ts { } function checkClassForDuplicateDeclarations(node: ClassLikeDeclaration) { - const enum Accessor { + const enum Declaration { Getter = 1, Setter = 2, + Method = 4, Property = Getter | Setter } - const instanceNames = createMap(); - const staticNames = createMap(); + const instanceNames = createMap(); + const staticNames = createMap(); for (const member of node.members) { if (member.kind === SyntaxKind.Constructor) { for (const param of (member as ConstructorDeclaration).parameters) { if (isParameterPropertyDeclaration(param)) { - addName(instanceNames, param.name, (param.name as Identifier).text, Accessor.Property); + addName(instanceNames, param.name, (param.name as Identifier).text, Declaration.Property); } } } @@ -15804,25 +15805,34 @@ namespace ts { if (memberName) { switch (member.kind) { case SyntaxKind.GetAccessor: - addName(names, member.name, memberName, Accessor.Getter); + addName(names, member.name, memberName, Declaration.Getter); break; case SyntaxKind.SetAccessor: - addName(names, member.name, memberName, Accessor.Setter); + addName(names, member.name, memberName, Declaration.Setter); break; case SyntaxKind.PropertyDeclaration: - addName(names, member.name, memberName, Accessor.Property); + addName(names, member.name, memberName, Declaration.Property); + break; + + case SyntaxKind.MethodDeclaration: + addName(names, member.name, memberName, Declaration.Method); break; } } } } - function addName(names: Map, location: Node, name: string, meaning: Accessor) { + function addName(names: Map, location: Node, name: string, meaning: Declaration) { const prev = names.get(name); if (prev) { - if (prev & meaning) { + if (prev & Declaration.Method) { + if (meaning !== Declaration.Method) { + error(location, Diagnostics.Duplicate_identifier_0, getTextOfNode(location)); + } + } + else if (prev & meaning) { error(location, Diagnostics.Duplicate_identifier_0, getTextOfNode(location)); } else { From ce629f03a7334963ac724146a680aa758e517049 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 31 Jan 2017 14:16:25 -0800 Subject: [PATCH 028/116] Test duplicate identifier reporting in classes --- .../classWithDuplicateIdentifier.errors.txt | 31 +++++++++++++++++ .../reference/classWithDuplicateIdentifier.js | 33 +++++++++++++++++++ .../compiler/classWithDuplicateIdentifier.ts | 12 +++++++ 3 files changed, 76 insertions(+) create mode 100644 tests/baselines/reference/classWithDuplicateIdentifier.errors.txt create mode 100644 tests/baselines/reference/classWithDuplicateIdentifier.js create mode 100644 tests/cases/compiler/classWithDuplicateIdentifier.ts diff --git a/tests/baselines/reference/classWithDuplicateIdentifier.errors.txt b/tests/baselines/reference/classWithDuplicateIdentifier.errors.txt new file mode 100644 index 0000000000000..325db86d47d50 --- /dev/null +++ b/tests/baselines/reference/classWithDuplicateIdentifier.errors.txt @@ -0,0 +1,31 @@ +tests/cases/compiler/classWithDuplicateIdentifier.ts(3,5): error TS2300: Duplicate identifier 'a'. +tests/cases/compiler/classWithDuplicateIdentifier.ts(6,5): error TS2300: Duplicate identifier 'b'. +tests/cases/compiler/classWithDuplicateIdentifier.ts(7,5): error TS2300: Duplicate identifier 'b'. +tests/cases/compiler/classWithDuplicateIdentifier.ts(11,5): error TS2300: Duplicate identifier 'c'. +tests/cases/compiler/classWithDuplicateIdentifier.ts(11,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'c' must be of type 'number', but here has type 'string'. + + +==== tests/cases/compiler/classWithDuplicateIdentifier.ts (5 errors) ==== + class C { + a(): number { return 0; } // error: duplicate identifier + a: number; + ~ +!!! error TS2300: Duplicate identifier 'a'. + } + class K { + b: number; // error: duplicate identifier + ~ +!!! error TS2300: Duplicate identifier 'b'. + b(): number { return 0; } + ~ +!!! error TS2300: Duplicate identifier 'b'. + } + class D { + c: number; + c: string; + ~ +!!! error TS2300: Duplicate identifier 'c'. + ~ +!!! error TS2403: Subsequent variable declarations must have the same type. Variable 'c' must be of type 'number', but here has type 'string'. + } + \ No newline at end of file diff --git a/tests/baselines/reference/classWithDuplicateIdentifier.js b/tests/baselines/reference/classWithDuplicateIdentifier.js new file mode 100644 index 0000000000000..515b1749aa3d5 --- /dev/null +++ b/tests/baselines/reference/classWithDuplicateIdentifier.js @@ -0,0 +1,33 @@ +//// [classWithDuplicateIdentifier.ts] +class C { + a(): number { return 0; } // error: duplicate identifier + a: number; +} +class K { + b: number; // error: duplicate identifier + b(): number { return 0; } +} +class D { + c: number; + c: string; +} + + +//// [classWithDuplicateIdentifier.js] +var C = (function () { + function C() { + } + C.prototype.a = function () { return 0; }; // error: duplicate identifier + return C; +}()); +var K = (function () { + function K() { + } + K.prototype.b = function () { return 0; }; + return K; +}()); +var D = (function () { + function D() { + } + return D; +}()); diff --git a/tests/cases/compiler/classWithDuplicateIdentifier.ts b/tests/cases/compiler/classWithDuplicateIdentifier.ts new file mode 100644 index 0000000000000..1612bd3f378f5 --- /dev/null +++ b/tests/cases/compiler/classWithDuplicateIdentifier.ts @@ -0,0 +1,12 @@ +class C { + a(): number { return 0; } // error: duplicate identifier + a: number; +} +class K { + b: number; // error: duplicate identifier + b(): number { return 0; } +} +class D { + c: number; + c: string; +} From 2ce64f2bad67b3422423dddc8ad4e3d05030c64f Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 31 Jan 2017 14:39:10 -0800 Subject: [PATCH 029/116] Create typeof's string literal union type once This changes the print order of string literal unions slightly. I think this is because 'string', 'symbol', etc are added to a union very early on in the creation of the checker. --- src/compiler/checker.ts | 9 ++++++--- .../reference/intersectionTypeNormalization.types | 4 ++-- .../reference/modularizeLibrary_Dom.iterable.types | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ba4e8c6993d6b..8a5e51dd110ec 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -326,7 +326,6 @@ namespace ts { "object": TypeFacts.TypeofEQObject, "function": TypeFacts.TypeofEQFunction }); - const typeofNEFacts = createMapFromTemplate({ "string": TypeFacts.TypeofNEString, "number": TypeFacts.TypeofNENumber, @@ -336,7 +335,6 @@ namespace ts { "object": TypeFacts.TypeofNEObject, "function": TypeFacts.TypeofNEFunction }); - const typeofTypesByName = createMapFromTemplate({ "string": stringType, "number": numberType, @@ -344,6 +342,7 @@ namespace ts { "symbol": esSymbolType, "undefined": undefinedType }); + const typeofType = createTypeofType(); let jsxElementType: Type; let _jsxNamespace: string; @@ -1725,6 +1724,10 @@ namespace ts { return type; } + function createTypeofType() { + return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s))); + } + // A reserved member name starts with two underscores, but the third character cannot be an underscore // or the @ symbol. A third underscore indicates an escaped form of an identifer that started // with at least two underscores. The @ character indicates that the name is denoted by a well known ES @@ -14609,7 +14612,7 @@ namespace ts { function checkTypeOfExpression(node: TypeOfExpression): Type { checkExpression(node.expression); - return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s))); + return typeofType; } function checkVoidExpression(node: VoidExpression): Type { diff --git a/tests/baselines/reference/intersectionTypeNormalization.types b/tests/baselines/reference/intersectionTypeNormalization.types index 3ffe7484afecd..7d8ba117eec32 100644 --- a/tests/baselines/reference/intersectionTypeNormalization.types +++ b/tests/baselines/reference/intersectionTypeNormalization.types @@ -227,9 +227,9 @@ function getValueAsString(value: IntersectionFail): string { if (value.kind === 'int') { >value.kind === 'int' : boolean ->value.kind : "int" | "string" +>value.kind : "string" | "int" >value : IntersectionFail ->kind : "int" | "string" +>kind : "string" | "int" >'int' : "int" return '' + value.num; diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types index 054923fb5eed7..d681322e2a78b 100644 --- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types +++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types @@ -3,9 +3,9 @@ for (const element of document.getElementsByTagName("a")) { >element : HTMLAnchorElement >document.getElementsByTagName("a") : NodeListOf ->document.getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } +>document.getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } >document : Document ->getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } +>getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } >"a" : "a" element.href; From 6f7c984c420b08d3ac633c7c2a3c010f0861580e Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 1 Feb 2017 09:41:44 -0800 Subject: [PATCH 030/116] Address PR comments 1. Add undefined only when an initialized parameter is required (not optional). 2. Create isRequiredInitializedParameter helper function 3. Call this function only once from declarationEmitter --- src/compiler/checker.ts | 22 ++++++++++------------ src/compiler/declarationEmitter.ts | 20 ++++++++++++-------- src/compiler/types.ts | 4 +++- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 199cb60c3c753..ab4f961e3a019 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2695,7 +2695,7 @@ namespace ts { writeSpace(writer); let type = getTypeOfSymbol(p); - if (strictNullChecks && parameterNode.initializer && !(getModifierFlags(parameterNode) & ModifierFlags.ParameterPropertyModifier)) { + if (isRequiredInitializedParameter(parameterNode)) { type = includeFalsyTypes(type, TypeFlags.Undefined); } buildTypeDisplay(type, writer, enclosingDeclaration, flags, symbolStack); @@ -3182,12 +3182,6 @@ namespace ts { } return parentType; } - // In strict null checking mode, a default value of a binding pattern adds undefined, - // which should be removed to get the type of the elements - const func = getContainingFunction(declaration); - if (strictNullChecks && func && !func.body && getFalsyFlags(parentType) & TypeFlags.Undefined) { - parentType = getTypeWithFacts(parentType, TypeFacts.NEUndefined); - } let type: Type; if (pattern.kind === SyntaxKind.ObjectBindingPattern) { @@ -20554,6 +20548,13 @@ namespace ts { return false; } + function isRequiredInitializedParameter(parameter: ParameterDeclaration) { + return strictNullChecks && + !isOptionalParameter(parameter) && + parameter.initializer && + !(getModifierFlags(parameter) & ModifierFlags.ParameterPropertyModifier); + } + function getNodeCheckFlags(node: Node): NodeCheckFlags { node = getParseTreeNode(node); return node ? getNodeLinks(node).flags : undefined; @@ -20648,13 +20649,9 @@ namespace ts { let type = symbol && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature)) ? getWidenedLiteralType(getTypeOfSymbol(symbol)) : unknownType; - if (strictNullChecks && - declaration.kind === SyntaxKind.Parameter && - (declaration as ParameterDeclaration).initializer && - !(getModifierFlags(declaration) & ModifierFlags.ParameterPropertyModifier)) { + if (flags & TypeFormatFlags.AddUndefined) { type = includeFalsyTypes(type, TypeFlags.Undefined); } - getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); } @@ -20753,6 +20750,7 @@ namespace ts { isTopLevelValueImportEqualsWithEntityName, isDeclarationVisible, isImplementationOfOverload, + isRequiredInitializedParameter, writeTypeOfDeclaration, writeReturnTypeOfSignatureDeclaration, writeTypeOfExpression, diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 93c4e9578f2e4..95a56b12dd3b9 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -322,13 +322,22 @@ namespace ts { function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic; write(": "); - if (type) { + + // use the checker's type, not the declared type, + // for non-optional initialized parameters that aren't a parameter property + const shouldUseResolverType = declaration.kind === SyntaxKind.Parameter && + resolver.isRequiredInitializedParameter(declaration as ParameterDeclaration); + if (type && !shouldUseResolverType) { // Write the type emitType(type); } else { errorNameNode = declaration.name; - resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction | TypeFormatFlags.UseTypeAliasValue, writer); + let format = TypeFormatFlags.UseTypeOfFunction | TypeFormatFlags.UseTypeAliasValue; + if (shouldUseResolverType) { + format |= TypeFormatFlags.AddUndefined; + } + resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, format, writer); errorNameNode = undefined; } } @@ -1594,12 +1603,7 @@ namespace ts { emitTypeOfVariableDeclarationFromTypeLiteral(node); } else if (!hasModifier(node.parent, ModifierFlags.Private)) { - // use the checker's type, not the declared type, - // for optional parameters and initialized ones that aren't a parameter property - const typeShouldAddUndefined = resolver.isOptionalParameter(node) || - node.initializer && !(getModifierFlags(node) & ModifierFlags.ParameterPropertyModifier); - const typeNode = typeShouldAddUndefined ? undefined : node.type; - writeTypeOfDeclaration(node, typeNode, getParameterDeclarationTypeVisibilityError); + writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError); } function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 8b49af402cf6c..48feb6bb0922f 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2466,7 +2466,8 @@ InFirstTypeArgument = 0x00000100, // Writing first type argument of the instantiated type InTypeAlias = 0x00000200, // Writing type in type alias declaration UseTypeAliasValue = 0x00000400, // Serialize the type instead of using type-alias. This is needed when we emit declaration file. - SuppressAnyReturnType = 0x00000800, // If the return type is any-like, don't offer a return type. + SuppressAnyReturnType = 0x00000800, // If the return type is any-like, don't offer a return type. + AddUndefined = 0x00001000, // Add undefined to types of initialized, non-optional parameters } export const enum SymbolFormatFlags { @@ -2571,6 +2572,7 @@ isDeclarationVisible(node: Declaration): boolean; collectLinkedAliases(node: Identifier): Node[]; isImplementationOfOverload(node: FunctionLikeDeclaration): boolean; + isRequiredInitializedParameter(node: ParameterDeclaration): boolean; writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; From 6328e6cfe2c7bed9d0f128b1548863668442c1f8 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 1 Feb 2017 09:43:02 -0800 Subject: [PATCH 031/116] Update baselines --- ...aultParameterAddsUndefinedWithStrictNullChecks.js | 4 ++-- ...tParameterAddsUndefinedWithStrictNullChecks.types | 12 ++++++------ .../reference/destructureOptionalParameter.js | 12 ++++++------ .../reference/destructureOptionalParameter.types | 2 +- tests/baselines/reference/optionalMethods.js | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js index cb556cc2cec3a..329c2fb19ce01 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js @@ -100,13 +100,13 @@ function removeNothing(y) { //// [defaultParameterAddsUndefinedWithStrictNullChecks.d.ts] -declare function f(addUndefined1?: string | undefined, addUndefined2?: number | undefined): number; +declare function f(addUndefined1?: string, addUndefined2?: number): number; declare function g(addUndefined: string | undefined, addDefined: number): number; declare let total: number; declare function foo1(x: string | undefined, b: number): void; declare function foo2(x: string | undefined, b: number): void; declare function foo3(x: string | undefined, b: number): void; declare function foo4(x: string | undefined, b: number): void; -declare function removeUndefinedButNotFalse(x?: boolean | undefined): false | undefined; +declare function removeUndefinedButNotFalse(x?: boolean): false | undefined; declare const cond: boolean; declare function removeNothing(y?: boolean | undefined): boolean; diff --git a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types index 21ff19fc6593e..d95f925989173 100644 --- a/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types +++ b/tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types @@ -1,6 +1,6 @@ === tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts === function f(addUndefined1 = "J", addUndefined2?: number) { ->f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number >addUndefined1 : string >"J" : "J" >addUndefined2 : number | undefined @@ -34,16 +34,16 @@ let total = f() + f('a', 1) + f('b') + f(undefined, 2); >f() + f('a', 1) + f('b') : number >f() + f('a', 1) : number >f() : number ->f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number >f('a', 1) : number ->f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number >'a' : "a" >1 : 1 >f('b') : number ->f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number >'b' : "b" >f(undefined, 2) : number ->f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number +>f : (addUndefined1?: string, addUndefined2?: number | undefined) => number >undefined : undefined >2 : 2 @@ -135,7 +135,7 @@ foo4(undefined, 1); function removeUndefinedButNotFalse(x = true) { ->removeUndefinedButNotFalse : (x?: boolean | undefined) => false | undefined +>removeUndefinedButNotFalse : (x?: boolean) => false | undefined >x : boolean >true : true diff --git a/tests/baselines/reference/destructureOptionalParameter.js b/tests/baselines/reference/destructureOptionalParameter.js index f375c41dbed51..b937d58412f9a 100644 --- a/tests/baselines/reference/destructureOptionalParameter.js +++ b/tests/baselines/reference/destructureOptionalParameter.js @@ -36,11 +36,11 @@ function f2(_a) { declare function f1({a, b}?: { a: number; b: string; -} | undefined): void; +}): void; declare function f2({a, b}?: { a: number; b: number; -} | undefined): void; +}): void; interface Type { t: void; } @@ -49,11 +49,11 @@ interface QueryMetadata { } interface QueryMetadataFactory { (selector: Type | string, {descendants, read}?: { - descendants?: boolean | undefined; + descendants?: boolean; read?: any; - } | undefined): ParameterDecorator; + }): ParameterDecorator; new (selector: Type | string, {descendants, read}?: { - descendants?: boolean | undefined; + descendants?: boolean; read?: any; - } | undefined): QueryMetadata; + }): QueryMetadata; } diff --git a/tests/baselines/reference/destructureOptionalParameter.types b/tests/baselines/reference/destructureOptionalParameter.types index c068e3b569c59..a72b03f59397f 100644 --- a/tests/baselines/reference/destructureOptionalParameter.types +++ b/tests/baselines/reference/destructureOptionalParameter.types @@ -8,7 +8,7 @@ declare function f1({ a, b }?: { a: number, b: string }): void; >b : string function f2({ a, b }: { a: number, b: number } = { a: 0, b: 0 }) { ->f2 : ({a, b}?: { a: number; b: number; } | undefined) => void +>f2 : ({a, b}?: { a: number; b: number; }) => void >a : number >b : number >a : number diff --git a/tests/baselines/reference/optionalMethods.js b/tests/baselines/reference/optionalMethods.js index 47d651d7509bb..a3685175f6675 100644 --- a/tests/baselines/reference/optionalMethods.js +++ b/tests/baselines/reference/optionalMethods.js @@ -137,7 +137,7 @@ declare class Bar { a: number; b?: number; c?: number | undefined; - constructor(d?: number | undefined, e?: number); + constructor(d?: number, e?: number); f(): number; g?(): number; h?(): number; From d23f692734a38ee6c5a7764c432f65c4e4cb7564 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 1 Feb 2017 13:11:16 -0800 Subject: [PATCH 032/116] rename arrayFromMap -> convertToArray --- src/compiler/checker.ts | 2 +- src/compiler/core.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8a5e51dd110ec..69d019688b1ee 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1725,7 +1725,7 @@ namespace ts { } function createTypeofType() { - return getUnionType(arrayFromMap(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s))); + return getUnionType(convertToArray(typeofEQFacts.keys(), s => getLiteralTypeForText(TypeFlags.StringLiteral, s))); } // A reserved member name starts with two underscores, but the third character cannot be an underscore diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 486dd5b42c839..d11f9925c0511 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -895,7 +895,7 @@ namespace ts { return result; } - export function arrayFromMap(iterator: Iterator, f: (value: T) => U) { + export function convertToArray(iterator: Iterator, f: (value: T) => U) { const result: U[] = []; for (let { value, done } = iterator.next(); !done; { value, done } = iterator.next()) { result.push(f(value)); From 8372a1d1c12556fdf77cb22afd6bd62b2901d7be Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Wed, 1 Feb 2017 16:15:14 -0800 Subject: [PATCH 033/116] Update baselines from a-c --- tests/baselines/reference/APISample_compile.js | 1 + tests/baselines/reference/APISample_linter.js | 1 + tests/baselines/reference/APISample_parseConfig.js | 1 + tests/baselines/reference/aliasAssignments.js | 1 + tests/baselines/reference/aliasUsageInAccessorsOfClass.js | 2 ++ tests/baselines/reference/aliasUsageInArray.js | 2 ++ tests/baselines/reference/aliasUsageInFunctionExpression.js | 2 ++ tests/baselines/reference/aliasUsageInGenericFunction.js | 2 ++ tests/baselines/reference/aliasUsageInIndexerOfClass.js | 2 ++ tests/baselines/reference/aliasUsageInObjectLiteral.js | 2 ++ tests/baselines/reference/aliasUsageInOrExpression.js | 2 ++ .../reference/aliasUsageInTypeArgumentOfExtendsClause.js | 2 ++ tests/baselines/reference/aliasUsageInVarAssignment.js | 2 ++ tests/baselines/reference/aliasUsedAsNameValue.js | 2 ++ tests/baselines/reference/allowSyntheticDefaultImports1.js | 2 ++ tests/baselines/reference/allowSyntheticDefaultImports4.js | 1 + tests/baselines/reference/alwaysStrictModule4.js | 1 + tests/baselines/reference/alwaysStrictModule6.js | 1 + tests/baselines/reference/ambientShorthand_reExport.js | 2 ++ tests/baselines/reference/amdImportNotAsPrimaryExpression.js | 1 + tests/baselines/reference/anonymousDefaultExportsAmd.js | 4 ++-- tests/baselines/reference/anonymousDefaultExportsCommonjs.js | 4 ++-- tests/baselines/reference/anonymousDefaultExportsUmd.js | 4 ++-- tests/baselines/reference/asOperator4.js | 1 + tests/baselines/reference/asyncImportedPromise_es5.js | 1 + tests/baselines/reference/asyncImportedPromise_es6.js | 1 + tests/baselines/reference/augmentedTypesExternalModule1.js | 1 + tests/baselines/reference/cacheResolutions.js | 3 +++ tests/baselines/reference/circularReferenceInImport.js | 1 + tests/baselines/reference/classAbstractManyKeywords.js | 2 +- tests/baselines/reference/classExtendsAcrossFiles.js | 2 ++ .../reference/classMemberInitializerWithLamdaScoping3.js | 1 + .../reference/classMemberInitializerWithLamdaScoping4.js | 1 + tests/baselines/reference/collisionExportsRequireAndAlias.js | 3 +++ .../reference/collisionExportsRequireAndAmbientModule.js | 1 + tests/baselines/reference/collisionExportsRequireAndClass.js | 1 + .../baselines/reference/collisionExportsRequireAndFunction.js | 1 + tests/baselines/reference/collisionExportsRequireAndModule.js | 1 + .../collisionExportsRequireAndUninstantiatedModule.js | 1 + tests/baselines/reference/collisionExportsRequireAndVar.js | 1 + tests/baselines/reference/commentsExternalModules2.js | 1 + tests/baselines/reference/commentsExternalModules3.js | 1 + tests/baselines/reference/commentsOnRequireStatement.js | 3 +++ .../baselines/reference/commonJSImportAsPrimaryExpression.js | 1 + .../reference/commonJSImportNotAsPrimaryExpression.js | 1 + tests/baselines/reference/commonSourceDir5.js | 3 +++ tests/baselines/reference/commonSourceDir6.js | 3 +++ tests/baselines/reference/commonSourceDirectory_dts.js | 1 + tests/baselines/reference/commonjsSafeImport.js | 1 + tests/baselines/reference/complexNarrowingWithAny.js | 1 + tests/baselines/reference/constDeclarations-access5.js | 1 + tests/baselines/reference/controlFlowPropertyDeclarations.js | 1 + tests/baselines/reference/controlFlowSelfReferentialLoop.js | 2 +- .../reference/crashIntypeCheckInvocationExpression.js | 1 + .../reference/crashIntypeCheckObjectCreationExpression.js | 1 + 55 files changed, 81 insertions(+), 8 deletions(-) diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 5f55c04c9f9c5..3738308298325 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -60,3 +60,4 @@ compile(process.argv.slice(2), { noEmitOnError: true, noImplicitAny: true, target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS }); +exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 1421b53a00caf..cc57b18496006 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -117,3 +117,4 @@ fileNames.forEach(function (fileName) { // delint it delint(sourceFile); }); +exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js index 75ab80d3f232a..d97acbdc14f0e 100644 --- a/tests/baselines/reference/APISample_parseConfig.js +++ b/tests/baselines/reference/APISample_parseConfig.js @@ -68,3 +68,4 @@ function createProgram(rootFiles, compilerOptionsJson) { return ts.createProgram(rootFiles, settings.options); } exports.createProgram = createProgram; +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js index 7aef6de22e6df..7a69de02cfe1e 100644 --- a/tests/baselines/reference/aliasAssignments.js +++ b/tests/baselines/reference/aliasAssignments.js @@ -21,6 +21,7 @@ var someClass = (function () { return someClass; }()); exports.someClass = someClass; +exports.__esModule = true; //// [aliasAssignments_1.js] "use strict"; var moduleA = require("./aliasAssignments_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js index 41a2bb066641c..0b05a0c3c637b 100644 --- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js +++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js @@ -35,6 +35,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +Object.defineProperty(exports, "__esModule", { value: true }); //// [aliasUsage1_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -56,6 +57,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +Object.defineProperty(exports, "__esModule", { value: true }); //// [aliasUsage1_main.js] "use strict"; var moduleA = require("./aliasUsage1_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js index 1f3e14903325c..5e864df3d0f67 100644 --- a/tests/baselines/reference/aliasUsageInArray.js +++ b/tests/baselines/reference/aliasUsageInArray.js @@ -29,6 +29,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInArray_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -50,6 +51,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInArray_main.js] "use strict"; var moduleA = require("./aliasUsageInArray_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js index a6fc0e97f6828..d84253f7992ce 100644 --- a/tests/baselines/reference/aliasUsageInFunctionExpression.js +++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js @@ -28,6 +28,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInFunctionExpression_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -49,6 +50,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInFunctionExpression_main.js] "use strict"; var moduleA = require("./aliasUsageInFunctionExpression_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js index a991207971c4a..53e702ba2271a 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.js +++ b/tests/baselines/reference/aliasUsageInGenericFunction.js @@ -32,6 +32,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInGenericFunction_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInGenericFunction_main.js] "use strict"; var moduleA = require("./aliasUsageInGenericFunction_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js index d57b2f6379d1a..0a53d6605dde5 100644 --- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js +++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js @@ -34,6 +34,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInIndexerOfClass_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -55,6 +56,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInIndexerOfClass_main.js] "use strict"; var moduleA = require("./aliasUsageInIndexerOfClass_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js index 15818c82cb931..f9202b0206740 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.js +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js @@ -29,6 +29,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInObjectLiteral_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -50,6 +51,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInObjectLiteral_main.js] "use strict"; var moduleA = require("./aliasUsageInObjectLiteral_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js index 99360ea648de2..a40d3679b63f3 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.js +++ b/tests/baselines/reference/aliasUsageInOrExpression.js @@ -32,6 +32,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInOrExpression_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInOrExpression_main.js] "use strict"; var moduleA = require("./aliasUsageInOrExpression_moduleA"); diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js index 47f0c30d28b08..de566b4dd539e 100644 --- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js +++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js @@ -32,6 +32,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -53,6 +54,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInTypeArgumentOfExtendsClause_main.js] "use strict"; var __extends = (this && this.__extends) || (function () { diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js index 666e32e154690..dbee55622665e 100644 --- a/tests/baselines/reference/aliasUsageInVarAssignment.js +++ b/tests/baselines/reference/aliasUsageInVarAssignment.js @@ -28,6 +28,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [aliasUsageInVarAssignment_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -49,6 +50,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [aliasUsageInVarAssignment_main.js] "use strict"; var i; diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js index 9495f8890b66b..5febf4b90e7a5 100644 --- a/tests/baselines/reference/aliasUsedAsNameValue.js +++ b/tests/baselines/reference/aliasUsedAsNameValue.js @@ -24,6 +24,7 @@ export var a = function () { "use strict"; function b(a) { return null; } exports.b = b; +exports.__esModule = true; //// [aliasUsedAsNameValue_2.js] "use strict"; /// @@ -34,3 +35,4 @@ exports.a = function () { //var x = mod.id; // TODO needed hack that mod is loaded b.b(mod); }; +exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js index 3789410a54b5a..dceecdd40014d 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports1.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js @@ -18,7 +18,9 @@ var Foo = (function () { return Foo; }()); exports.Foo = Foo; +exports.__esModule = true; //// [a.js] "use strict"; var b_1 = require("./b"); exports.x = new b_1["default"].Foo(); +exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js index 747f59dc904fd..69bfedadc4991 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports4.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js @@ -15,3 +15,4 @@ export var x = new Foo(); "use strict"; var b_1 = require("./b"); exports.x = new b_1["default"](); +exports.__esModule = true; diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js index 1444f351bbd43..7ca68d8500028 100644 --- a/tests/baselines/reference/alwaysStrictModule4.js +++ b/tests/baselines/reference/alwaysStrictModule4.js @@ -7,3 +7,4 @@ export const a = 1 "use strict"; // Module commonjs exports.a = 1; +exports.__esModule = true; diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js index 9a60392616977..161e341ba7967 100644 --- a/tests/baselines/reference/alwaysStrictModule6.js +++ b/tests/baselines/reference/alwaysStrictModule6.js @@ -7,3 +7,4 @@ export const a = 1; "use strict"; // Targeting ES5 exports.a = 1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js index bdfc0ee082139..0d9a14c0f153e 100644 --- a/tests/baselines/reference/ambientShorthand_reExport.js +++ b/tests/baselines/reference/ambientShorthand_reExport.js @@ -20,12 +20,14 @@ x($); "use strict"; var jquery_1 = require("jquery"); exports.x = jquery_1.x; +exports.__esModule = true; //// [reExportAll.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } __export(require("jquery")); +exports.__esModule = true; //// [reExportUser.js] "use strict"; var reExportX_1 = require("./reExportX"); diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index a0bd7c83d64e5..781142b406174 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -48,6 +48,7 @@ define(["require", "exports"], function (require, exports) { E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); + exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js index bb5cd587a8336..a3b8b7cd98a80 100644 --- a/tests/baselines/reference/anonymousDefaultExportsAmd.js +++ b/tests/baselines/reference/anonymousDefaultExportsAmd.js @@ -11,13 +11,13 @@ define(["require", "exports"], function (require, exports) { "use strict"; class default_1 { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; function default_1() { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js index 754ffdb7c9b73..dbfdfd0f420f8 100644 --- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js +++ b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js @@ -10,10 +10,10 @@ export default function() {} "use strict"; class default_1 { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; function default_1() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js index 85ed1d30444fc..a8984434c9cd7 100644 --- a/tests/baselines/reference/anonymousDefaultExportsUmd.js +++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js @@ -19,8 +19,8 @@ export default function() {} "use strict"; class default_1 { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] (function (factory) { @@ -34,6 +34,6 @@ export default function() {} })(function (require, exports) { "use strict"; function default_1() { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js index 41edf92416b1e..672d311a70265 100644 --- a/tests/baselines/reference/asOperator4.js +++ b/tests/baselines/reference/asOperator4.js @@ -16,6 +16,7 @@ import { foo } from './foo'; "use strict"; function foo() { } exports.foo = foo; +exports.__esModule = true; //// [bar.js] "use strict"; var foo_1 = require("./foo"); diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js index 280e8a879167f..ceabda5889995 100644 --- a/tests/baselines/reference/asyncImportedPromise_es5.js +++ b/tests/baselines/reference/asyncImportedPromise_es5.js @@ -29,6 +29,7 @@ var Task = (function (_super) { return Task; }(Promise)); exports.Task = Task; +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js index 6c6e34e7b1d27..923af2e55cd63 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.js +++ b/tests/baselines/reference/asyncImportedPromise_es6.js @@ -14,6 +14,7 @@ class Test { class Task extends Promise { } exports.Task = Task; +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js index 65525e8187eea..321118461620c 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.js +++ b/tests/baselines/reference/augmentedTypesExternalModule1.js @@ -13,4 +13,5 @@ define(["require", "exports"], function (require, exports) { c5.prototype.foo = function () { }; return c5; }()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js index 1d0f918bf98db..1c8c6ec016873 100644 --- a/tests/baselines/reference/cacheResolutions.js +++ b/tests/baselines/reference/cacheResolutions.js @@ -14,14 +14,17 @@ export let x = 1; define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [lib1.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [lib2.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js index a9cf0925c34d0..28f43fa798539 100644 --- a/tests/baselines/reference/circularReferenceInImport.js +++ b/tests/baselines/reference/circularReferenceInImport.js @@ -21,6 +21,7 @@ function foo() { return new Object(); } exports.foo = foo; +exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js index 8ba50dcee1c62..298395a232c9c 100644 --- a/tests/baselines/reference/classAbstractManyKeywords.js +++ b/tests/baselines/reference/classAbstractManyKeywords.js @@ -6,7 +6,6 @@ import abstract class D {} //// [classAbstractManyKeywords.js] "use strict"; -exports.__esModule = true; exports["default"] = abstract; var A = (function () { function A() { @@ -30,3 +29,4 @@ var D = (function () { } return D; }()); +exports.__esModule = true; diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js index 6fcce5c5982d7..8a648cc62cd49 100644 --- a/tests/baselines/reference/classExtendsAcrossFiles.js +++ b/tests/baselines/reference/classExtendsAcrossFiles.js @@ -49,6 +49,7 @@ exports.b = { a_1.a.f(); } }; +Object.defineProperty(exports, "__esModule", { value: true }); //// [a.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -79,3 +80,4 @@ exports.a = { b_1.b.f(); } }; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js index d310ccd53bc8f..ce46e75bed8c0 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js @@ -33,3 +33,4 @@ var Test1 = (function () { return Test1; }()); exports.Test1 = Test1; +exports.__esModule = true; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js index 161bceca04d0a..49f5f916cd306 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js @@ -29,3 +29,4 @@ var Test1 = (function () { return Test1; }()); exports.Test1 = Test1; +exports.__esModule = true; diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js index d7785dc73cfeb..b6d3159b0f98d 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js @@ -23,6 +23,7 @@ define(["require", "exports"], function (require, exports) { function bar() { } exports.bar = bar; + exports.__esModule = true; }); //// [collisionExportsRequireAndAlias_file3333.js] define(["require", "exports"], function (require, exports) { @@ -30,6 +31,7 @@ define(["require", "exports"], function (require, exports) { function bar2() { } exports.bar2 = bar2; + exports.__esModule = true; }); //// [collisionExportsRequireAndAlias_file2.js] define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) { @@ -42,4 +44,5 @@ define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisio exports.bar2(); } exports.foo2 = foo2; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js index 7f0a5c82d9a7b..045e7dcb796c2 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js @@ -109,6 +109,7 @@ define(["require", "exports"], function (require, exports) { (function (m2) { var a = 10; })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientModule_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js index 962df0344ed3b..ca16128e9cd33 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndClass.js @@ -79,6 +79,7 @@ define(["require", "exports"], function (require, exports) { }()); m2.exports = exports; })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndClass_globalFile.js] var require = (function () { diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js index 0fe5405cfb34b..7e538d462b2f3 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js @@ -53,4 +53,5 @@ define(["require", "exports"], function (require, exports) { } m2.require = require; })(m2 || (m2 = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js index b29364aebe33c..d1ca4d3a75cc3 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndModule.js @@ -162,6 +162,7 @@ define(["require", "exports"], function (require, exports) { exports.C = C; })(exports = m2.exports || (m2.exports = {})); })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndModule_globalFile.js] var require; diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js index 6270cf65c027c..ba1926dd965b2 100644 --- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js @@ -25,4 +25,5 @@ define(["require", "exports"], function (require, exports) { return null; } exports.foo2 = foo2; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js index 0686b9329211d..9c7a24b176f7b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndVar.js @@ -44,6 +44,7 @@ define(["require", "exports"], function (require, exports) { m2.exports = 0; m2.require = "require"; })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndVar_globalFile.js] var exports = 0; diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index 18f3564ec7f82..7b40306119988 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -132,6 +132,7 @@ define(["require", "exports", "commentsExternalModules2_0"], function (require, exports.newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); exports.newVar2 = new extMod.m4.m2.c(); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index 85fbcfe019fca..68ec3be48bdc8 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -131,6 +131,7 @@ extMod.m1.fooExport(); exports.newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); exports.newVar2 = new extMod.m4.m2.c(); +Object.defineProperty(exports, "__esModule", { value: true }); //// [commentsExternalModules2_0.d.ts] diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js index 9cfd75c021111..6feff1bd813ac 100644 --- a/tests/baselines/reference/commentsOnRequireStatement.js +++ b/tests/baselines/reference/commentsOnRequireStatement.js @@ -20,9 +20,11 @@ export {subject1} from './1'; //// [0.js] "use strict"; exports.subject = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [1.js] "use strict"; exports.subject1 = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [2.js] "use strict"; /* blah0 */ @@ -34,3 +36,4 @@ exports.subject = _0_1.subject; /* blah1 */ var _1_1 = require("./1"); exports.subject1 = _1_1.subject1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index b8cf42ea7622a..212f5869744c6 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -23,6 +23,7 @@ var C1 = (function () { }()); C1.s1 = true; exports.C1 = C1; +exports.__esModule = true; //// [foo_1.js] "use strict"; var foo = require("./foo_0"); diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index eb77d1baa3cb5..76610c2d56da7 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -47,6 +47,7 @@ var E1; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); +exports.__esModule = true; //// [foo_1.js] "use strict"; var i; diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js index 1e404b26e137d..f1ec275cf73f7 100644 --- a/tests/baselines/reference/commonSourceDir5.js +++ b/tests/baselines/reference/commonSourceDir5.js @@ -21,13 +21,16 @@ define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, "use strict"; exports.pi = Math.PI; exports.y = bar_1.x * foo_1.i; + exports.__esModule = true; }); define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) { "use strict"; exports.i = Math.sqrt(-1); exports.z = baz_1.pi * baz_1.pi; + exports.__esModule = true; }); define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) { "use strict"; exports.x = foo_2.z + foo_2.z; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js index 88f5828a50085..d52fde52cf2a0 100644 --- a/tests/baselines/reference/commonSourceDir6.js +++ b/tests/baselines/reference/commonSourceDir6.js @@ -20,13 +20,16 @@ define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, expor "use strict"; exports.pi = Math.PI; exports.y = bar_1.x * foo_1.i; + exports.__esModule = true; }); define("a/foo", ["require", "exports", "baz"], function (require, exports, baz_1) { "use strict"; exports.i = Math.sqrt(-1); exports.z = baz_1.pi * baz_1.pi; + exports.__esModule = true; }); define("a/bar", ["require", "exports", "a/foo"], function (require, exports, foo_2) { "use strict"; exports.x = foo_2.z + foo_2.z; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js index 8aa0bd04e11d7..e49192dbe2f67 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.js +++ b/tests/baselines/reference/commonSourceDirectory_dts.js @@ -14,6 +14,7 @@ export const x = y; "use strict"; /// exports.x = y; +exports.__esModule = true; //# sourceMappingURL=/app/myMapRoot/index.js.map //// [/app/bin/index.d.ts] diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js index 93439a418f624..5af2c56b5ef23 100644 --- a/tests/baselines/reference/commonjsSafeImport.js +++ b/tests/baselines/reference/commonjsSafeImport.js @@ -14,6 +14,7 @@ Foo(); "use strict"; function Foo() { } exports.Foo = Foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; var _10_lib_1 = require("./10_lib"); diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js index 0a137f5d793ec..5c665a52cb304 100644 --- a/tests/baselines/reference/complexNarrowingWithAny.js +++ b/tests/baselines/reference/complexNarrowingWithAny.js @@ -1025,3 +1025,4 @@ function viewFactory_AppComponent0(viewUtils, parentInjector, declarationEl) { return new _View_AppComponent0(viewUtils, parentInjector, declarationEl); } exports.viewFactory_AppComponent0 = viewFactory_AppComponent0; +exports.__esModule = true; diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js index 1da0cf40fcddd..282581fbdb8e0 100644 --- a/tests/baselines/reference/constDeclarations-access5.js +++ b/tests/baselines/reference/constDeclarations-access5.js @@ -52,6 +52,7 @@ m.x.toString(); define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 0; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [constDeclarations_access_2.js] define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) { diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js index 748f63ea858da..be61fc2c75a58 100644 --- a/tests/baselines/reference/controlFlowPropertyDeclarations.js +++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js @@ -289,3 +289,4 @@ var StyleParser = (function () { return StyleParser; }()); exports.StyleParser = StyleParser; +exports.__esModule = true; diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js index f7dbc0a23243a..d1422112fff8f 100644 --- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js +++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js @@ -203,5 +203,5 @@ function md5(string) { b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391); } } -exports.__esModule = true; exports["default"] = md5; +exports.__esModule = true; diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js index 549d7948fcbdf..67eba038d46e5 100644 --- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js @@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) { var folder = path.join(), fileset = nake.fileSetSync(folder); return doCompile(fileset, moduleType); }); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js index 00f4dbdc3770e..48fe4dad45fe0 100644 --- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js @@ -22,4 +22,5 @@ define(["require", "exports"], function (require, exports) { return BuildWorkspaceService; }()); exports.BuildWorkspaceService = BuildWorkspaceService; + exports.__esModule = true; }); From 2ff2850ffa48d31b3b89b8e439ceceb892034bfd Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Wed, 1 Feb 2017 16:16:53 -0800 Subject: [PATCH 034/116] Emit __esModule when emitting ES6 Module --- src/compiler/transformers/module/module.ts | 77 ++++++++++++---------- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index 0adea4fd5407b..7318e03b3520c 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -45,6 +45,7 @@ namespace ts { let currentSourceFile: SourceFile; // The current file. let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file. let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored. + let shouldAppendUnderscoreUnderscoreEsModule: boolean; // A boolean indicating whether "__esModule" should be emitted return transformSourceFile; @@ -62,6 +63,7 @@ namespace ts { currentSourceFile = node; currentModuleInfo = collectExternalModuleInfo(node, resolver, compilerOptions); + shouldAppendUnderscoreUnderscoreEsModule = false; moduleInfoMap[getOriginalNodeId(node)] = currentModuleInfo; // Perform the transformation. @@ -88,11 +90,14 @@ namespace ts { addRange(statements, endLexicalEnvironment()); addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); + if (shouldAppendUnderscoreUnderscoreEsModule) { + append(statements, createUnderscoreUnderscoreESModule()); + } + const updated = updateSourceFileNode(node, createNodeArray(statements, node.statements)); if (currentModuleInfo.hasExportStarsToExportValues) { addEmitHelper(updated, exportStarHelper); } - return updated; } @@ -378,6 +383,10 @@ namespace ts { // Append the 'export =' statement if provided. addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true); + if (shouldAppendUnderscoreUnderscoreEsModule) { + append(statements, createUnderscoreUnderscoreESModule()); + } + const body = createBlock(statements, /*location*/ undefined, /*multiLine*/ true); if (currentModuleInfo.hasExportStarsToExportValues) { // If we have any `export * from ...` declarations @@ -657,6 +666,8 @@ namespace ts { } const generatedName = getGeneratedNameForNode(node); + shouldAppendUnderscoreUnderscoreEsModule = true; + if (node.exportClause) { const statements: Statement[] = []; // export { x, y } from "mod"; @@ -834,6 +845,7 @@ namespace ts { variables = append(variables, variable); } else if (variable.initializer) { + shouldAppendUnderscoreUnderscoreEsModule = true; expressions = append(expressions, transformInitializedVariable(variable)); } } @@ -1107,43 +1119,40 @@ namespace ts { * @param allowComments Whether to allow comments on the export. */ function appendExportStatement(statements: Statement[] | undefined, exportName: Identifier, expression: Expression, location?: TextRange, allowComments?: boolean): Statement[] | undefined { - if (exportName.text === "default") { - const sourceFile = getOriginalNode(currentSourceFile, isSourceFile); - if (sourceFile && !sourceFile.symbol.exports.get("___esModule")) { - if (languageVersion === ScriptTarget.ES3) { - statements = append(statements, - createStatement( - createExportExpression( - createIdentifier("__esModule"), - createLiteral(true) - ) - ) - ); - } - else { - statements = append(statements, - createStatement( - createCall( - createPropertyAccess(createIdentifier("Object"), "defineProperty"), - /*typeArguments*/ undefined, - [ - createIdentifier("exports"), - createLiteral("__esModule"), - createObjectLiteral([ - createPropertyAssignment("value", createLiteral(true)) - ]) - ] - ) - ) - ); - } - } - } - + shouldAppendUnderscoreUnderscoreEsModule = true; statements = append(statements, createExportStatement(exportName, expression, location, allowComments)); return statements; } + function createUnderscoreUnderscoreESModule() { + let statement: Statement; + if (languageVersion === ScriptTarget.ES3) { + statement = createStatement( + createExportExpression( + createIdentifier("__esModule"), + createLiteral(true) + ) + ) + } + else { + statement = createStatement( + createCall( + createPropertyAccess(createIdentifier("Object"), "defineProperty"), + /*typeArguments*/ undefined, + [ + createIdentifier("exports"), + createLiteral("__esModule"), + createObjectLiteral([ + createPropertyAssignment("value", createLiteral(true)) + ]) + ] + ) + ); + } + setEmitFlags(statement, EmitFlags.CustomPrologue); + return statement; + } + /** * Creates a call to the current file's export function to export a value. * From ff4c72de00335109af3d31094139b23be840892e Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 1 Feb 2017 16:36:10 -0800 Subject: [PATCH 035/116] Make most current Node factory functions public --- src/compiler/factory.ts | 2372 ++++++++++---------- src/compiler/program.ts | 9 +- src/compiler/transformers/destructuring.ts | 23 +- src/compiler/transformers/es2015.ts | 363 +-- src/compiler/transformers/es2016.ts | 48 +- src/compiler/transformers/es2017.ts | 41 +- src/compiler/transformers/es5.ts | 4 +- src/compiler/transformers/esnext.ts | 28 +- src/compiler/transformers/generators.ts | 216 +- src/compiler/transformers/jsx.ts | 6 +- src/compiler/transformers/module/es2015.ts | 2 +- src/compiler/transformers/module/module.ts | 452 ++-- src/compiler/transformers/module/system.ts | 141 +- src/compiler/transformers/ts.ts | 257 ++- src/compiler/types.ts | 6 +- src/compiler/utilities.ts | 8 + src/compiler/visitor.ts | 28 +- 17 files changed, 2131 insertions(+), 1873 deletions(-) diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index f2a8de3a93b4d..ec1e0dafb795e 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -1,28 +1,18 @@ /// /// -/* @internal */ namespace ts { - let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node; - let SourceFileConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node; - - function createNode(kind: SyntaxKind, location?: TextRange, flags?: NodeFlags): Node { - const ConstructorForKind = kind === SyntaxKind.SourceFile - ? (SourceFileConstructor || (SourceFileConstructor = objectAllocator.getSourceFileConstructor())) - : (NodeConstructor || (NodeConstructor = objectAllocator.getNodeConstructor())); - - const node = location - ? new ConstructorForKind(kind, location.pos, location.end) - : new ConstructorForKind(kind, /*pos*/ -1, /*end*/ -1); - - node.flags = flags | NodeFlags.Synthesized; - + function createSynthesizedNode(kind: SyntaxKind): Node { + const node = createNode(kind, -1, -1); + node.flags |= NodeFlags.Synthesized; return node; } + /* @internal */ export function updateNode(updated: T, original: T): T { if (updated !== original) { setOriginalNode(updated, original); + setTextRange(updated, original); if (original.startsOnNewLine) { updated.startsOnNewLine = true; } @@ -31,7 +21,10 @@ namespace ts { return updated; } - export function createNodeArray(elements?: T[], location?: TextRange, hasTrailingComma?: boolean): NodeArray { + /** + * Make `elements` into a `NodeArray`. If `elements` is `undefined`, returns an empty `NodeArray`. + */ + export function createNodeArray(elements?: T[], hasTrailingComma?: boolean): NodeArray { if (elements) { if (isNodeArray(elements)) { return elements; @@ -42,40 +35,22 @@ namespace ts { } const array = >elements; - if (location) { - array.pos = location.pos; - array.end = location.end; - } - else { - array.pos = -1; - array.end = -1; - } - - if (hasTrailingComma) { - array.hasTrailingComma = true; - } - + array.pos = -1; + array.end = -1; + array.hasTrailingComma = hasTrailingComma; return array; } - export function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node { - const node = createNode(kind, /*location*/ undefined); - node.startsOnNewLine = startsOnNewLine; - return node; - } - - export function createSynthesizedNodeArray(elements?: T[]): NodeArray { - return createNodeArray(elements, /*location*/ undefined); - } - /** * Creates a shallow, memberwise clone of a node with no source map location. */ + /* @internal */ export function getSynthesizedClone(node: T): 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 = createNode(node.kind, /*location*/ undefined, node.flags); + const clone = createSynthesizedNode(node.kind); + clone.flags |= node.flags; setOriginalNode(clone, node); for (const key in node) { @@ -89,63 +64,62 @@ namespace ts { return clone; } - /** - * Creates a shallow, memberwise clone of a node for mutation. - */ - export function getMutableClone(node: T): T { - const clone = getSynthesizedClone(node); - clone.pos = node.pos; - clone.end = node.end; - clone.parent = node.parent; - return clone; - } - // Literals - export function createLiteral(textSource: StringLiteral | NumericLiteral | Identifier, location?: TextRange): StringLiteral; - export function createLiteral(value: string, location?: TextRange): StringLiteral; - export function createLiteral(value: number, location?: TextRange): NumericLiteral; - export function createLiteral(value: boolean, location?: TextRange): BooleanLiteral; - export function createLiteral(value: string | number | boolean, location?: TextRange): PrimaryExpression; - export function createLiteral(value: string | number | boolean | StringLiteral | NumericLiteral | Identifier, location?: TextRange): PrimaryExpression { + export function createLiteral(value: string): StringLiteral; + export function createLiteral(value: number): NumericLiteral; + export function createLiteral(value: boolean): BooleanLiteral; + /** Create a string literal whose source text is read from a source node during emit. */ + export function createLiteral(sourceNode: StringLiteral | NumericLiteral | Identifier): StringLiteral; + export function createLiteral(value: string | number | boolean): PrimaryExpression; + export function createLiteral(value: string | number | boolean | StringLiteral | NumericLiteral | Identifier): PrimaryExpression { if (typeof value === "number") { - const node = createNode(SyntaxKind.NumericLiteral, location, /*flags*/ undefined); - node.text = value.toString(); - return node; - } - else if (typeof value === "boolean") { - return createNode(value ? SyntaxKind.TrueKeyword : SyntaxKind.FalseKeyword, location, /*flags*/ undefined); + return createNumericLiteral(value + ""); } - else if (typeof value === "string") { - const node = createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined); - node.text = value; - return node; + if (typeof value === "boolean") { + return value ? createTrue() : createFalse(); } - else if (value) { - const node = createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined); - node.textSourceNode = value; - node.text = value.text; - return node; + if (typeof value === "string") { + return createStringLiteral(value); } + return createLiteralFromNode(value); } - // Identifiers + export function createNumericLiteral(value: string): NumericLiteral { + const node = createSynthesizedNode(SyntaxKind.NumericLiteral); + node.text = value; + return node; + } - let nextAutoGenerateId = 0; + function createStringLiteral(text: string): StringLiteral { + const node = createSynthesizedNode(SyntaxKind.StringLiteral); + node.text = text; + return node; + } - export function createIdentifier(text: string, location?: TextRange): Identifier { - const node = createNode(SyntaxKind.Identifier, location); - node.text = escapeIdentifier(text); - node.originalKeywordKind = stringToToken(text); + function createLiteralFromNode(sourceNode: StringLiteral | NumericLiteral | Identifier): StringLiteral { + const node = createStringLiteral(sourceNode.text); + node.textSourceNode = sourceNode; + return node; + } + + + // Identifiers + + export function createIdentifier(text: string): Identifier { + const node = createSynthesizedNode(SyntaxKind.Identifier); + node.text = text ? escapeIdentifier(text) : undefined; + node.originalKeywordKind = text ? stringToToken(text) : SyntaxKind.Unknown; node.autoGenerateKind = GeneratedIdentifierKind.None; node.autoGenerateId = 0; return node; } - export function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined, location?: TextRange): Identifier { - const name = createNode(SyntaxKind.Identifier, location); - name.text = ""; - name.originalKeywordKind = SyntaxKind.Unknown; + let nextAutoGenerateId = 0; + + /** Create a unique temporary variable. */ + export function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined): Identifier { + const name = createIdentifier(""); name.autoGenerateKind = GeneratedIdentifierKind.Auto; name.autoGenerateId = nextAutoGenerateId; nextAutoGenerateId++; @@ -155,33 +129,31 @@ namespace ts { return name; } - export function createLoopVariable(location?: TextRange): Identifier { - const name = createNode(SyntaxKind.Identifier, location); - name.text = ""; - name.originalKeywordKind = SyntaxKind.Unknown; + /** Create a unique temporary variable for use in a loop. */ + export function createLoopVariable(): Identifier { + const name = createIdentifier(""); name.autoGenerateKind = GeneratedIdentifierKind.Loop; name.autoGenerateId = nextAutoGenerateId; nextAutoGenerateId++; return name; } - export function createUniqueName(text: string, location?: TextRange): Identifier { - const name = createNode(SyntaxKind.Identifier, location); + /** Create a unique name based on the supplied text. */ + export function createUniqueName(text: string): Identifier { + const name = createIdentifier(""); name.text = text; - name.originalKeywordKind = SyntaxKind.Unknown; name.autoGenerateKind = GeneratedIdentifierKind.Unique; name.autoGenerateId = nextAutoGenerateId; nextAutoGenerateId++; return name; } - export function getGeneratedNameForNode(node: Node, location?: TextRange): Identifier { - const name = createNode(SyntaxKind.Identifier, location); - name.original = node; - name.text = ""; - name.originalKeywordKind = SyntaxKind.Unknown; + /** Create a unique name generated for a node. */ + export function getGeneratedNameForNode(node: Node): Identifier { + const name = createIdentifier(""); name.autoGenerateKind = GeneratedIdentifierKind.Node; name.autoGenerateId = nextAutoGenerateId; + name.original = node; nextAutoGenerateId++; return name; } @@ -189,49 +161,53 @@ namespace ts { // Punctuation export function createToken(token: TKind) { - return >createNode(token); + return >createSynthesizedNode(token); } // Reserved words export function createSuper() { - const node = createNode(SyntaxKind.SuperKeyword); - return node; + return createSynthesizedNode(SyntaxKind.SuperKeyword); } - export function createThis(location?: TextRange) { - const node = createNode(SyntaxKind.ThisKeyword, location); - return node; + export function createThis() { + return createSynthesizedNode(SyntaxKind.ThisKeyword); } export function createNull() { - const node = createNode(SyntaxKind.NullKeyword); - return node; + return createSynthesizedNode(SyntaxKind.NullKeyword); + } + + export function createTrue() { + return createSynthesizedNode(SyntaxKind.TrueKeyword); + } + + export function createFalse() { + return createSynthesizedNode(SyntaxKind.FalseKeyword); } // Names - export function createComputedPropertyName(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ComputedPropertyName, location); + export function createComputedPropertyName(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.ComputedPropertyName); node.expression = expression; return node; } export function updateComputedPropertyName(node: ComputedPropertyName, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createComputedPropertyName(expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createComputedPropertyName(expression), node) + : node; } // Signature elements - export function createParameter(decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: string | Identifier | BindingPattern, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.Parameter, location, flags); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + export function createParameter(decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: string | Identifier | BindingPattern, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression) { + const node = createSynthesizedNode(SyntaxKind.Parameter); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); node.dotDotDotToken = dotDotDotToken; - node.name = typeof name === "string" ? createIdentifier(name) : name; + node.name = asName(name); node.questionToken = questionToken; node.type = type; node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined; @@ -239,20 +215,35 @@ namespace ts { } export function updateParameter(node: ParameterDeclaration, decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: BindingName, type: TypeNode, initializer: Expression) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.dotDotDotToken !== dotDotDotToken || node.name !== name || node.type !== type || node.initializer !== initializer) { - return updateNode(createParameter(decorators, modifiers, dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node); - } - + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.dotDotDotToken !== dotDotDotToken + || node.name !== name + || node.type !== type + || node.initializer !== initializer + ? updateNode(createParameter(decorators, modifiers, dotDotDotToken, name, node.questionToken, type, initializer), node) + : node; + } + + export function createDecorator(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.Decorator); + node.expression = parenthesizeForAccess(expression); return node; } + export function updateDecorator(node: Decorator, expression: Expression) { + return node.expression !== expression + ? updateNode(createDecorator(expression), node) + : node; + } + // Type members - export function createProperty(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, questionToken: QuestionToken, type: TypeNode, initializer: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.PropertyDeclaration, location); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; - node.name = typeof name === "string" ? createIdentifier(name) : name; + export function createProperty(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, questionToken: QuestionToken, type: TypeNode, initializer: Expression) { + const node = createSynthesizedNode(SyntaxKind.PropertyDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.name = asName(name); node.questionToken = questionToken; node.type = type; node.initializer = initializer; @@ -260,19 +251,22 @@ namespace ts { } export function updateProperty(node: PropertyDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, type: TypeNode, initializer: Expression) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) { - return updateNode(createProperty(decorators, modifiers, name, node.questionToken, type, initializer, node), node); - } - return node; - } - - export function createMethod(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.MethodDeclaration, location, flags); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.type !== type + || node.initializer !== initializer + ? updateNode(createProperty(decorators, modifiers, name, node.questionToken, type, initializer), node) + : node; + } + + export function createMethod(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) { + const node = createSynthesizedNode(SyntaxKind.MethodDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); node.asteriskToken = asteriskToken; - node.name = typeof name === "string" ? createIdentifier(name) : name; - node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined; + node.name = asName(name); + node.typeParameters = asNodeArray(typeParameters); node.parameters = createNodeArray(parameters); node.type = type; node.body = body; @@ -280,16 +274,21 @@ namespace ts { } export function updateMethod(node: MethodDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) { - return updateNode(createMethod(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node); - } - return node; - } - - export function createConstructor(decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.Constructor, location, flags); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateNode(createMethod(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body), node) + : node; + } + + export function createConstructor(decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block) { + const node = createSynthesizedNode(SyntaxKind.Constructor); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); node.typeParameters = undefined; node.parameters = createNodeArray(parameters); node.type = undefined; @@ -298,17 +297,19 @@ namespace ts { } export function updateConstructor(node: ConstructorDeclaration, decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.parameters !== parameters || node.body !== body) { - return updateNode(createConstructor(decorators, modifiers, parameters, body, /*location*/ node, node.flags), node); - } - return node; - } - - export function createGetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.GetAccessor, location, flags); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; - node.name = typeof name === "string" ? createIdentifier(name) : name; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.parameters !== parameters + || node.body !== body + ? updateNode(createConstructor(decorators, modifiers, parameters, body), node) + : node; + } + + export function createGetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block) { + const node = createSynthesizedNode(SyntaxKind.GetAccessor); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.name = asName(name); node.typeParameters = undefined; node.parameters = createNodeArray(parameters); node.type = type; @@ -317,17 +318,21 @@ namespace ts { } export function updateGetAccessor(node: GetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.parameters !== parameters || node.type !== type || node.body !== body) { - return updateNode(createGetAccessor(decorators, modifiers, name, parameters, type, body, /*location*/ node, node.flags), node); - } - return node; - } - - export function createSetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.SetAccessor, location, flags); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; - node.name = typeof name === "string" ? createIdentifier(name) : name; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateNode(createGetAccessor(decorators, modifiers, name, parameters, type, body), node) + : node; + } + + export function createSetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block) { + const node = createSynthesizedNode(SyntaxKind.SetAccessor); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.name = asName(name); node.typeParameters = undefined; node.parameters = createNodeArray(parameters); node.body = body; @@ -335,60 +340,63 @@ namespace ts { } export function updateSetAccessor(node: SetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], body: Block) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.parameters !== parameters || node.body !== body) { - return updateNode(createSetAccessor(decorators, modifiers, name, parameters, body, /*location*/ node, node.flags), node); - } - return node; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.parameters !== parameters + || node.body !== body + ? updateNode(createSetAccessor(decorators, modifiers, name, parameters, body), node) + : node; } // Binding Patterns - export function createObjectBindingPattern(elements: BindingElement[], location?: TextRange) { - const node = createNode(SyntaxKind.ObjectBindingPattern, location); + export function createObjectBindingPattern(elements: BindingElement[]) { + const node = createSynthesizedNode(SyntaxKind.ObjectBindingPattern); node.elements = createNodeArray(elements); return node; } export function updateObjectBindingPattern(node: ObjectBindingPattern, elements: BindingElement[]) { - if (node.elements !== elements) { - return updateNode(createObjectBindingPattern(elements, node), node); - } - return node; + return node.elements !== elements + ? updateNode(createObjectBindingPattern(elements), node) + : node; } - export function createArrayBindingPattern(elements: ArrayBindingElement[], location?: TextRange) { - const node = createNode(SyntaxKind.ArrayBindingPattern, location); + export function createArrayBindingPattern(elements: ArrayBindingElement[]) { + const node = createSynthesizedNode(SyntaxKind.ArrayBindingPattern); node.elements = createNodeArray(elements); return node; } export function updateArrayBindingPattern(node: ArrayBindingPattern, elements: ArrayBindingElement[]) { - if (node.elements !== elements) { - return updateNode(createArrayBindingPattern(elements, node), node); - } - return node; + return node.elements !== elements + ? updateNode(createArrayBindingPattern(elements), node) + : node; } - export function createBindingElement(propertyName: string | PropertyName, dotDotDotToken: DotDotDotToken, name: string | BindingName, initializer?: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.BindingElement, location); - node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName; + export function createBindingElement(propertyName: string | PropertyName, dotDotDotToken: DotDotDotToken, name: string | BindingName, initializer?: Expression) { + const node = createSynthesizedNode(SyntaxKind.BindingElement); + node.propertyName = asName(propertyName); node.dotDotDotToken = dotDotDotToken; - node.name = typeof name === "string" ? createIdentifier(name) : name; + node.name = asName(name); node.initializer = initializer; return node; } export function updateBindingElement(node: BindingElement, dotDotDotToken: DotDotDotToken, propertyName: PropertyName, name: BindingName, initializer: Expression) { - if (node.propertyName !== propertyName || node.dotDotDotToken !== dotDotDotToken || node.name !== name || node.initializer !== initializer) { - return updateNode(createBindingElement(propertyName, dotDotDotToken, name, initializer, node), node); - } - return node; + return node.propertyName !== propertyName + || node.dotDotDotToken !== dotDotDotToken + || node.name !== name + || node.initializer !== initializer + ? updateNode(createBindingElement(propertyName, dotDotDotToken, name, initializer), node) + : node; } // Expression - export function createArrayLiteral(elements?: Expression[], location?: TextRange, multiLine?: boolean) { - const node = createNode(SyntaxKind.ArrayLiteralExpression, location); + export function createArrayLiteral(elements?: Expression[], multiLine?: boolean) { + const node = createSynthesizedNode(SyntaxKind.ArrayLiteralExpression); node.elements = parenthesizeListElements(createNodeArray(elements)); if (multiLine) { node.multiLine = true; @@ -398,14 +406,13 @@ namespace ts { } export function updateArrayLiteral(node: ArrayLiteralExpression, elements: Expression[]) { - if (node.elements !== elements) { - return updateNode(createArrayLiteral(elements, node, node.multiLine), node); - } - return node; + return node.elements !== elements + ? updateNode(createArrayLiteral(elements, node.multiLine), node) + : node; } - export function createObjectLiteral(properties?: ObjectLiteralElementLike[], location?: TextRange, multiLine?: boolean) { - const node = createNode(SyntaxKind.ObjectLiteralExpression, location); + export function createObjectLiteral(properties?: ObjectLiteralElementLike[], multiLine?: boolean) { + const node = createSynthesizedNode(SyntaxKind.ObjectLiteralExpression); node.properties = createNodeArray(properties); if (multiLine) { node.multiLine = true; @@ -414,110 +421,106 @@ namespace ts { } export function updateObjectLiteral(node: ObjectLiteralExpression, properties: ObjectLiteralElementLike[]) { - if (node.properties !== properties) { - return updateNode(createObjectLiteral(properties, node, node.multiLine), node); - } - return node; + return node.properties !== properties + ? updateNode(createObjectLiteral(properties, node.multiLine), node) + : node; } - export function createPropertyAccess(expression: Expression, name: string | Identifier, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.PropertyAccessExpression, location, flags); + export function createPropertyAccess(expression: Expression, name: string | Identifier) { + const node = createSynthesizedNode(SyntaxKind.PropertyAccessExpression); node.expression = parenthesizeForAccess(expression); - (node.emitNode || (node.emitNode = {})).flags |= EmitFlags.NoIndentation; - node.name = typeof name === "string" ? createIdentifier(name) : name; + node.name = asName(name); + setEmitFlags(node, EmitFlags.NoIndentation); return node; } export function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier) { - if (node.expression !== expression || node.name !== name) { - const propertyAccess = createPropertyAccess(expression, name, /*location*/ node, node.flags); - // Because we are updating existed propertyAccess we want to inherit its emitFlags instead of using default from createPropertyAccess - (propertyAccess.emitNode || (propertyAccess.emitNode = {})).flags = getEmitFlags(node); - return updateNode(propertyAccess, node); - } - return node; + // Because we are updating existed propertyAccess we want to inherit its emitFlags + // instead of using the default from createPropertyAccess + return node.expression !== expression + || node.name !== name + ? updateNode(setEmitFlags(createPropertyAccess(expression, name), getEmitFlags(node)), node) + : node; } - export function createElementAccess(expression: Expression, index: number | Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ElementAccessExpression, location); + export function createElementAccess(expression: Expression, index: number | Expression) { + const node = createSynthesizedNode(SyntaxKind.ElementAccessExpression); node.expression = parenthesizeForAccess(expression); - node.argumentExpression = typeof index === "number" ? createLiteral(index) : index; + node.argumentExpression = asExpression(index); return node; } export function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression) { - if (node.expression !== expression || node.argumentExpression !== argumentExpression) { - return updateNode(createElementAccess(expression, argumentExpression, node), node); - } - return node; + return node.expression !== expression + || node.argumentExpression !== argumentExpression + ? updateNode(createElementAccess(expression, argumentExpression), node) + : node; } - export function createCall(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.CallExpression, location, flags); + export function createCall(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) { + const node = createSynthesizedNode(SyntaxKind.CallExpression); node.expression = parenthesizeForAccess(expression); - if (typeArguments) { - node.typeArguments = createNodeArray(typeArguments); - } - + node.typeArguments = asNodeArray(typeArguments); node.arguments = parenthesizeListElements(createNodeArray(argumentsArray)); return node; } export function updateCall(node: CallExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) { - if (expression !== node.expression || typeArguments !== node.typeArguments || argumentsArray !== node.arguments) { - return updateNode(createCall(expression, typeArguments, argumentsArray, /*location*/ node, node.flags), node); - } - return node; + return expression !== node.expression + || typeArguments !== node.typeArguments + || argumentsArray !== node.arguments + ? updateNode(createCall(expression, typeArguments, argumentsArray), node) + : node; } - export function createNew(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.NewExpression, location, flags); + export function createNew(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) { + const node = createSynthesizedNode(SyntaxKind.NewExpression); node.expression = parenthesizeForNew(expression); - node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined; + node.typeArguments = asNodeArray(typeArguments); node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined; return node; } export function updateNew(node: NewExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]) { - if (node.expression !== expression || node.typeArguments !== typeArguments || node.arguments !== argumentsArray) { - return updateNode(createNew(expression, typeArguments, argumentsArray, /*location*/ node, node.flags), node); - } - return node; + return node.expression !== expression + || node.typeArguments !== typeArguments + || node.arguments !== argumentsArray + ? updateNode(createNew(expression, typeArguments, argumentsArray), node) + : node; } - export function createTaggedTemplate(tag: Expression, template: TemplateLiteral, location?: TextRange) { - const node = createNode(SyntaxKind.TaggedTemplateExpression, location); + export function createTaggedTemplate(tag: Expression, template: TemplateLiteral) { + const node = createSynthesizedNode(SyntaxKind.TaggedTemplateExpression); node.tag = parenthesizeForAccess(tag); node.template = template; return node; } export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral) { - if (node.tag !== tag || node.template !== template) { - return updateNode(createTaggedTemplate(tag, template, node), node); - } - return node; + return node.tag !== tag + || node.template !== template + ? updateNode(createTaggedTemplate(tag, template), node) + : node; } - export function createParen(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ParenthesizedExpression, location); + export function createParen(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.ParenthesizedExpression); node.expression = expression; return node; } export function updateParen(node: ParenthesizedExpression, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createParen(expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createParen(expression), node) + : node; } - export function createFunctionExpression(modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.FunctionExpression, location, flags); - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + export function createFunctionExpression(modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) { + const node = createSynthesizedNode(SyntaxKind.FunctionExpression); + node.modifiers = asNodeArray(modifiers); node.asteriskToken = asteriskToken; - node.name = typeof name === "string" ? createIdentifier(name) : name; - node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined; + node.name = asName(name); + node.typeParameters = asNodeArray(typeParameters); node.parameters = createNodeArray(parameters); node.type = type; node.body = body; @@ -525,16 +528,20 @@ namespace ts { } export function updateFunctionExpression(node: FunctionExpression, modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) { - if (node.name !== name || node.modifiers !== modifiers || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) { - return updateNode(createFunctionExpression(modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node); - } - return node; - } - - export function createArrowFunction(modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, equalsGreaterThanToken: EqualsGreaterThanToken, body: ConciseBody, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.ArrowFunction, location, flags); - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; - node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined; + return node.name !== name + || node.modifiers !== modifiers + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateNode(createFunctionExpression(modifiers, node.asteriskToken, name, typeParameters, parameters, type, body), node) + : node; + } + + export function createArrowFunction(modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, equalsGreaterThanToken: EqualsGreaterThanToken, body: ConciseBody) { + const node = createSynthesizedNode(SyntaxKind.ArrowFunction); + node.modifiers = asNodeArray(modifiers); + node.typeParameters = asNodeArray(typeParameters); node.parameters = createNodeArray(parameters); node.type = type; node.equalsGreaterThanToken = equalsGreaterThanToken || createToken(SyntaxKind.EqualsGreaterThanToken); @@ -543,96 +550,93 @@ namespace ts { } export function updateArrowFunction(node: ArrowFunction, modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: ConciseBody) { - if (node.modifiers !== modifiers || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) { - return updateNode(createArrowFunction(modifiers, typeParameters, parameters, type, node.equalsGreaterThanToken, body, /*location*/ node, node.flags), node); - } - return node; + return node.modifiers !== modifiers + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateNode(createArrowFunction(modifiers, typeParameters, parameters, type, node.equalsGreaterThanToken, body), node) + : node; } - export function createDelete(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.DeleteExpression, location); + export function createDelete(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.DeleteExpression); node.expression = parenthesizePrefixOperand(expression); return node; } export function updateDelete(node: DeleteExpression, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createDelete(expression, node), expression); - } - return node; + return node.expression !== expression + ? updateNode(createDelete(expression), node) + : node; } - export function createTypeOf(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.TypeOfExpression, location); + export function createTypeOf(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.TypeOfExpression); node.expression = parenthesizePrefixOperand(expression); return node; } export function updateTypeOf(node: TypeOfExpression, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createTypeOf(expression, node), expression); - } - return node; + return node.expression !== expression + ? updateNode(createTypeOf(expression), node) + : node; } - export function createVoid(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.VoidExpression, location); + export function createVoid(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.VoidExpression); node.expression = parenthesizePrefixOperand(expression); return node; } export function updateVoid(node: VoidExpression, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createVoid(expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createVoid(expression), node) + : node; } - export function createAwait(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.AwaitExpression, location); + export function createAwait(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.AwaitExpression); node.expression = parenthesizePrefixOperand(expression); return node; } export function updateAwait(node: AwaitExpression, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createAwait(expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createAwait(expression), node) + : node; } - export function createPrefix(operator: PrefixUnaryOperator, operand: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.PrefixUnaryExpression, location); + export function createPrefix(operator: PrefixUnaryOperator, operand: Expression) { + const node = createSynthesizedNode(SyntaxKind.PrefixUnaryExpression); node.operator = operator; node.operand = parenthesizePrefixOperand(operand); return node; } export function updatePrefix(node: PrefixUnaryExpression, operand: Expression) { - if (node.operand !== operand) { - return updateNode(createPrefix(node.operator, operand, node), node); - } - return node; + return node.operand !== operand + ? updateNode(createPrefix(node.operator, operand), node) + : node; } - export function createPostfix(operand: Expression, operator: PostfixUnaryOperator, location?: TextRange) { - const node = createNode(SyntaxKind.PostfixUnaryExpression, location); + export function createPostfix(operand: Expression, operator: PostfixUnaryOperator) { + const node = createSynthesizedNode(SyntaxKind.PostfixUnaryExpression); node.operand = parenthesizePostfixOperand(operand); node.operator = operator; return node; } export function updatePostfix(node: PostfixUnaryExpression, operand: Expression) { - if (node.operand !== operand) { - return updateNode(createPostfix(operand, node.operator, node), node); - } - return node; + return node.operand !== operand + ? updateNode(createPostfix(operand, node.operator), node) + : node; } - export function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression, location?: TextRange) { - const operatorToken = typeof operator === "number" ? createToken(operator) : operator; + export function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression) { + const node = createSynthesizedNode(SyntaxKind.BinaryExpression); + const operatorToken = asToken(operator); const operatorKind = operatorToken.kind; - const node = createNode(SyntaxKind.BinaryExpression, location); node.left = parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined); node.operatorToken = operatorToken; node.right = parenthesizeBinaryOperand(operatorKind, right, /*isLeftSideOfBinary*/ false, node.left); @@ -640,218 +644,205 @@ namespace ts { } export function updateBinary(node: BinaryExpression, left: Expression, right: Expression) { - if (node.left !== left || node.right !== right) { - return updateNode(createBinary(left, node.operatorToken, right, /*location*/ node), node); - } - return node; + return node.left !== left + || node.right !== right + ? updateNode(createBinary(left, node.operatorToken, right), node) + : node; } - export function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression, location?: TextRange): ConditionalExpression; - export function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression, location?: TextRange): ConditionalExpression; - export function createConditional(condition: Expression, questionTokenOrWhenTrue: QuestionToken | Expression, whenTrueOrWhenFalse: Expression, colonTokenOrLocation?: ColonToken | TextRange, whenFalse?: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ConditionalExpression, whenFalse ? location : colonTokenOrLocation); + export function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression; + export function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression; + export function createConditional(condition: Expression, questionTokenOrWhenTrue: QuestionToken | Expression, whenTrueOrWhenFalse: Expression, colonToken?: ColonToken, whenFalse?: Expression) { + const node = createSynthesizedNode(SyntaxKind.ConditionalExpression); node.condition = parenthesizeForConditionalHead(condition); - if (whenFalse) { - // second overload - node.questionToken = questionTokenOrWhenTrue; - node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse); - node.colonToken = colonTokenOrLocation; - node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenFalse); - } - else { - // first overload - node.questionToken = createToken(SyntaxKind.QuestionToken); - node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(questionTokenOrWhenTrue); - node.colonToken = createToken(SyntaxKind.ColonToken); - node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse); - } + node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(SyntaxKind.QuestionToken); + node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue); + node.colonToken = whenFalse ? colonToken : createToken(SyntaxKind.ColonToken); + node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenFalse : whenTrueOrWhenFalse); return node; } export function updateConditional(node: ConditionalExpression, condition: Expression, whenTrue: Expression, whenFalse: Expression) { - if (node.condition !== condition || node.whenTrue !== whenTrue || node.whenFalse !== whenFalse) { - return updateNode(createConditional(condition, node.questionToken, whenTrue, node.colonToken, whenFalse, node), node); - } - return node; + return node.condition !== condition + || node.whenTrue !== whenTrue + || node.whenFalse !== whenFalse + ? updateNode(createConditional(condition, node.questionToken, whenTrue, node.colonToken, whenFalse), node) + : node; } - export function createTemplateExpression(head: TemplateHead, templateSpans: TemplateSpan[], location?: TextRange) { - const node = createNode(SyntaxKind.TemplateExpression, location); + export function createTemplateExpression(head: TemplateHead, templateSpans: TemplateSpan[]) { + const node = createSynthesizedNode(SyntaxKind.TemplateExpression); node.head = head; node.templateSpans = createNodeArray(templateSpans); return node; } export function updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: TemplateSpan[]) { - if (node.head !== head || node.templateSpans !== templateSpans) { - return updateNode(createTemplateExpression(head, templateSpans, node), node); - } - return node; + return node.head !== head + || node.templateSpans !== templateSpans + ? updateNode(createTemplateExpression(head, templateSpans), node) + : node; } - export function createYield(asteriskToken: AsteriskToken, expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.YieldExpression, location); - node.asteriskToken = asteriskToken; - node.expression = expression; + export function createYield(expression?: Expression): YieldExpression; + export function createYield(asteriskToken: AsteriskToken, expression: Expression): YieldExpression; + export function createYield(asteriskTokenOrExpression?: AsteriskToken | Expression, expression?: Expression) { + const node = createSynthesizedNode(SyntaxKind.YieldExpression); + node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === SyntaxKind.AsteriskToken ? asteriskTokenOrExpression : undefined; + node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== SyntaxKind.AsteriskToken ? asteriskTokenOrExpression : expression; return node; } export function updateYield(node: YieldExpression, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createYield(node.asteriskToken, expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createYield(node.asteriskToken, expression), node) + : node; } - export function createSpread(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.SpreadElement, location); + export function createSpread(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.SpreadElement); node.expression = parenthesizeExpressionForList(expression); return node; } export function updateSpread(node: SpreadElement, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createSpread(expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createSpread(expression), node) + : node; } - export function createClassExpression(modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange) { - const node = createNode(SyntaxKind.ClassExpression, location); + export function createClassExpression(modifiers: Modifier[], name: string | Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) { + const node = createSynthesizedNode(SyntaxKind.ClassExpression); node.decorators = undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; - node.name = name; - node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined; - node.heritageClauses = createNodeArray(heritageClauses); + node.modifiers = asNodeArray(modifiers); + node.name = asName(name); + node.typeParameters = asNodeArray(typeParameters); + node.heritageClauses = asNodeArray(heritageClauses); node.members = createNodeArray(members); return node; } export function updateClassExpression(node: ClassExpression, modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) { - if (node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.heritageClauses !== heritageClauses || node.members !== members) { - return updateNode(createClassExpression(modifiers, name, typeParameters, heritageClauses, members, node), node); - } - return node; + return node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.heritageClauses !== heritageClauses + || node.members !== members + ? updateNode(createClassExpression(modifiers, name, typeParameters, heritageClauses, members), node) + : node; } - export function createOmittedExpression(location?: TextRange) { - const node = createNode(SyntaxKind.OmittedExpression, location); - return node; + export function createOmittedExpression() { + return createSynthesizedNode(SyntaxKind.OmittedExpression); } - export function createExpressionWithTypeArguments(typeArguments: TypeNode[], expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ExpressionWithTypeArguments, location); - node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined; + export function createExpressionWithTypeArguments(typeArguments: TypeNode[], expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.ExpressionWithTypeArguments); node.expression = parenthesizeForAccess(expression); + node.typeArguments = asNodeArray(typeArguments); return node; } export function updateExpressionWithTypeArguments(node: ExpressionWithTypeArguments, typeArguments: TypeNode[], expression: Expression) { - if (node.typeArguments !== typeArguments || node.expression !== expression) { - return updateNode(createExpressionWithTypeArguments(typeArguments, expression, node), node); - } - return node; + return node.typeArguments !== typeArguments + || node.expression !== expression + ? updateNode(createExpressionWithTypeArguments(typeArguments, expression), node) + : node; } - // Misc - export function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail, location?: TextRange) { - const node = createNode(SyntaxKind.TemplateSpan, location); + export function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail) { + const node = createSynthesizedNode(SyntaxKind.TemplateSpan); node.expression = expression; node.literal = literal; return node; } export function updateTemplateSpan(node: TemplateSpan, expression: Expression, literal: TemplateMiddle | TemplateTail) { - if (node.expression !== expression || node.literal !== literal) { - return updateNode(createTemplateSpan(expression, literal, node), node); - } - return node; + return node.expression !== expression + || node.literal !== literal + ? updateNode(createTemplateSpan(expression, literal), node) + : node; } // Element - export function createBlock(statements: Statement[], location?: TextRange, multiLine?: boolean, flags?: NodeFlags): Block { - const block = createNode(SyntaxKind.Block, location, flags); + export function createBlock(statements: Statement[], multiLine?: boolean): Block { + const block = createSynthesizedNode(SyntaxKind.Block); block.statements = createNodeArray(statements); - if (multiLine) { - block.multiLine = true; - } + if (multiLine) block.multiLine = multiLine; return block; } export function updateBlock(node: Block, statements: Statement[]) { - if (statements !== node.statements) { - return updateNode(createBlock(statements, /*location*/ node, node.multiLine, node.flags), node); - } - - return node; + return statements !== node.statements + ? updateNode(createBlock(statements, node.multiLine), node) + : node; } - export function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList | VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableStatement { - const node = createNode(SyntaxKind.VariableStatement, location, flags); + export function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList | VariableDeclaration[]): VariableStatement { + const node = createSynthesizedNode(SyntaxKind.VariableStatement); node.decorators = undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + node.modifiers = asNodeArray(modifiers); node.declarationList = isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList; return node; } export function updateVariableStatement(node: VariableStatement, modifiers: Modifier[], declarationList: VariableDeclarationList): VariableStatement { - if (node.modifiers !== modifiers || node.declarationList !== declarationList) { - return updateNode(createVariableStatement(modifiers, declarationList, /*location*/ node, node.flags), node); - } - return node; + return node.modifiers !== modifiers + || node.declarationList !== declarationList + ? updateNode(createVariableStatement(modifiers, declarationList), node) + : node; } - export function createVariableDeclarationList(declarations: VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableDeclarationList { - const node = createNode(SyntaxKind.VariableDeclarationList, location, flags); + export function createVariableDeclarationList(declarations: VariableDeclaration[], flags?: NodeFlags): VariableDeclarationList { + const node = createSynthesizedNode(SyntaxKind.VariableDeclarationList); + node.flags |= flags; node.declarations = createNodeArray(declarations); return node; } export function updateVariableDeclarationList(node: VariableDeclarationList, declarations: VariableDeclaration[]) { - if (node.declarations !== declarations) { - return updateNode(createVariableDeclarationList(declarations, /*location*/ node, node.flags), node); - } - return node; + return node.declarations !== declarations + ? updateNode(createVariableDeclarationList(declarations, node.flags), node) + : node; } - export function createVariableDeclaration(name: string | BindingPattern | Identifier, type?: TypeNode, initializer?: Expression, location?: TextRange, flags?: NodeFlags): VariableDeclaration { - const node = createNode(SyntaxKind.VariableDeclaration, location, flags); - node.name = typeof name === "string" ? createIdentifier(name) : name; + export function createVariableDeclaration(name: string | BindingName, type?: TypeNode, initializer?: Expression): VariableDeclaration { + const node = createSynthesizedNode(SyntaxKind.VariableDeclaration); + node.name = asName(name); node.type = type; node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined; return node; } export function updateVariableDeclaration(node: VariableDeclaration, name: BindingName, type: TypeNode, initializer: Expression) { - if (node.name !== name || node.type !== type || node.initializer !== initializer) { - return updateNode(createVariableDeclaration(name, type, initializer, /*location*/ node, node.flags), node); - } - return node; + return node.name !== name + || node.type !== type + || node.initializer !== initializer + ? updateNode(createVariableDeclaration(name, type, initializer), node) + : node; } - export function createEmptyStatement(location: TextRange) { - return createNode(SyntaxKind.EmptyStatement, location); + export function createEmptyStatement() { + return createSynthesizedNode(SyntaxKind.EmptyStatement); } - export function createStatement(expression: Expression, location?: TextRange, flags?: NodeFlags): ExpressionStatement { - const node = createNode(SyntaxKind.ExpressionStatement, location, flags); + export function createStatement(expression: Expression): ExpressionStatement { + const node = createSynthesizedNode(SyntaxKind.ExpressionStatement); node.expression = parenthesizeExpressionForExpressionStatement(expression); return node; } export function updateStatement(node: ExpressionStatement, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createStatement(expression, /*location*/ node, node.flags), node); - } - - return node; + return node.expression !== expression + ? updateNode(createStatement(expression), node) + : node; } - export function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement, location?: TextRange) { - const node = createNode(SyntaxKind.IfStatement, location); + export function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement) { + const node = createSynthesizedNode(SyntaxKind.IfStatement); node.expression = expression; node.thenStatement = thenStatement; node.elseStatement = elseStatement; @@ -859,42 +850,43 @@ namespace ts { } export function updateIf(node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement) { - if (node.expression !== expression || node.thenStatement !== thenStatement || node.elseStatement !== elseStatement) { - return updateNode(createIf(expression, thenStatement, elseStatement, /*location*/ node), node); - } - return node; + return node.expression !== expression + || node.thenStatement !== thenStatement + || node.elseStatement !== elseStatement + ? updateNode(createIf(expression, thenStatement, elseStatement), node) + : node; } - export function createDo(statement: Statement, expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.DoStatement, location); + export function createDo(statement: Statement, expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.DoStatement); node.statement = statement; node.expression = expression; return node; } export function updateDo(node: DoStatement, statement: Statement, expression: Expression) { - if (node.statement !== statement || node.expression !== expression) { - return updateNode(createDo(statement, expression, node), node); - } - return node; + return node.statement !== statement + || node.expression !== expression + ? updateNode(createDo(statement, expression), node) + : node; } - export function createWhile(expression: Expression, statement: Statement, location?: TextRange) { - const node = createNode(SyntaxKind.WhileStatement, location); + export function createWhile(expression: Expression, statement: Statement) { + const node = createSynthesizedNode(SyntaxKind.WhileStatement); node.expression = expression; node.statement = statement; return node; } export function updateWhile(node: WhileStatement, expression: Expression, statement: Statement) { - if (node.expression !== expression || node.statement !== statement) { - return updateNode(createWhile(expression, statement, node), node); - } - return node; + return node.expression !== expression + || node.statement !== statement + ? updateNode(createWhile(expression, statement), node) + : node; } - export function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement, location?: TextRange) { - const node = createNode(SyntaxKind.ForStatement, location, /*flags*/ undefined); + export function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement) { + const node = createSynthesizedNode(SyntaxKind.ForStatement); node.initializer = initializer; node.condition = condition; node.incrementor = incrementor; @@ -903,14 +895,16 @@ namespace ts { } export function updateFor(node: ForStatement, initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement) { - if (node.initializer !== initializer || node.condition !== condition || node.incrementor !== incrementor || node.statement !== statement) { - return updateNode(createFor(initializer, condition, incrementor, statement, node), node); - } - return node; + return node.initializer !== initializer + || node.condition !== condition + || node.incrementor !== incrementor + || node.statement !== statement + ? updateNode(createFor(initializer, condition, incrementor, statement), node) + : node; } - export function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange) { - const node = createNode(SyntaxKind.ForInStatement, location); + export function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement) { + const node = createSynthesizedNode(SyntaxKind.ForInStatement); node.initializer = initializer; node.expression = expression; node.statement = statement; @@ -918,14 +912,15 @@ namespace ts { } export function updateForIn(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement) { - if (node.initializer !== initializer || node.expression !== expression || node.statement !== statement) { - return updateNode(createForIn(initializer, expression, statement, node), node); - } - return node; + return node.initializer !== initializer + || node.expression !== expression + || node.statement !== statement + ? updateNode(createForIn(initializer, expression, statement), node) + : node; } - export function createForOf(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange) { - const node = createNode(SyntaxKind.ForOfStatement, location); + export function createForOf(initializer: ForInitializer, expression: Expression, statement: Statement) { + const node = createSynthesizedNode(SyntaxKind.ForOfStatement); node.initializer = initializer; node.expression = expression; node.statement = statement; @@ -933,112 +928,105 @@ namespace ts { } export function updateForOf(node: ForOfStatement, initializer: ForInitializer, expression: Expression, statement: Statement) { - if (node.initializer !== initializer || node.expression !== expression || node.statement !== statement) { - return updateNode(createForOf(initializer, expression, statement, node), node); - } - return node; + return node.initializer !== initializer + || node.expression !== expression + || node.statement !== statement + ? updateNode(createForOf(initializer, expression, statement), node) + : node; } - export function createContinue(label?: Identifier, location?: TextRange): ContinueStatement { - const node = createNode(SyntaxKind.ContinueStatement, location); - if (label) { - node.label = label; - } + export function createContinue(label?: string | Identifier): ContinueStatement { + const node = createSynthesizedNode(SyntaxKind.ContinueStatement); + node.label = asName(label); return node; } export function updateContinue(node: ContinueStatement, label: Identifier) { - if (node.label !== label) { - return updateNode(createContinue(label, node), node); - } - return node; + return node.label !== label + ? updateNode(createContinue(label), node) + : node; } - export function createBreak(label?: Identifier, location?: TextRange): BreakStatement { - const node = createNode(SyntaxKind.BreakStatement, location); - if (label) { - node.label = label; - } + export function createBreak(label?: string | Identifier): BreakStatement { + const node = createSynthesizedNode(SyntaxKind.BreakStatement); + node.label = asName(label); return node; } export function updateBreak(node: BreakStatement, label: Identifier) { - if (node.label !== label) { - return updateNode(createBreak(label, node), node); - } - return node; + return node.label !== label + ? updateNode(createBreak(label), node) + : node; } - export function createReturn(expression?: Expression, location?: TextRange): ReturnStatement { - const node = createNode(SyntaxKind.ReturnStatement, location); + export function createReturn(expression?: Expression): ReturnStatement { + const node = createSynthesizedNode(SyntaxKind.ReturnStatement); node.expression = expression; return node; } export function updateReturn(node: ReturnStatement, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createReturn(expression, /*location*/ node), node); - } - return node; + return node.expression !== expression + ? updateNode(createReturn(expression), node) + : node; } - export function createWith(expression: Expression, statement: Statement, location?: TextRange) { - const node = createNode(SyntaxKind.WithStatement, location); + export function createWith(expression: Expression, statement: Statement) { + const node = createSynthesizedNode(SyntaxKind.WithStatement); node.expression = expression; node.statement = statement; return node; } export function updateWith(node: WithStatement, expression: Expression, statement: Statement) { - if (node.expression !== expression || node.statement !== statement) { - return updateNode(createWith(expression, statement, node), node); - } - return node; + return node.expression !== expression + || node.statement !== statement + ? updateNode(createWith(expression, statement), node) + : node; } - export function createSwitch(expression: Expression, caseBlock: CaseBlock, location?: TextRange): SwitchStatement { - const node = createNode(SyntaxKind.SwitchStatement, location); + export function createSwitch(expression: Expression, caseBlock: CaseBlock): SwitchStatement { + const node = createSynthesizedNode(SyntaxKind.SwitchStatement); node.expression = parenthesizeExpressionForList(expression); node.caseBlock = caseBlock; return node; } export function updateSwitch(node: SwitchStatement, expression: Expression, caseBlock: CaseBlock) { - if (node.expression !== expression || node.caseBlock !== caseBlock) { - return updateNode(createSwitch(expression, caseBlock, node), node); - } - return node; + return node.expression !== expression + || node.caseBlock !== caseBlock + ? updateNode(createSwitch(expression, caseBlock), node) + : node; } - export function createLabel(label: string | Identifier, statement: Statement, location?: TextRange) { - const node = createNode(SyntaxKind.LabeledStatement, location); - node.label = typeof label === "string" ? createIdentifier(label) : label; + export function createLabel(label: string | Identifier, statement: Statement) { + const node = createSynthesizedNode(SyntaxKind.LabeledStatement); + node.label = asName(label); node.statement = statement; return node; } export function updateLabel(node: LabeledStatement, label: Identifier, statement: Statement) { - if (node.label !== label || node.statement !== statement) { - return updateNode(createLabel(label, statement, node), node); - } - return node; + return node.label !== label + || node.statement !== statement + ? updateNode(createLabel(label, statement), node) + : node; } - export function createThrow(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ThrowStatement, location); + export function createThrow(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.ThrowStatement); node.expression = expression; return node; } export function updateThrow(node: ThrowStatement, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createThrow(expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createThrow(expression), node) + : node; } - export function createTry(tryBlock: Block, catchClause: CatchClause, finallyBlock: Block, location?: TextRange) { - const node = createNode(SyntaxKind.TryStatement, location); + export function createTry(tryBlock: Block, catchClause: CatchClause, finallyBlock: Block) { + const node = createSynthesizedNode(SyntaxKind.TryStatement); node.tryBlock = tryBlock; node.catchClause = catchClause; node.finallyBlock = finallyBlock; @@ -1046,32 +1034,32 @@ namespace ts { } export function updateTry(node: TryStatement, tryBlock: Block, catchClause: CatchClause, finallyBlock: Block) { - if (node.tryBlock !== tryBlock || node.catchClause !== catchClause || node.finallyBlock !== finallyBlock) { - return updateNode(createTry(tryBlock, catchClause, finallyBlock, node), node); - } - return node; + return node.tryBlock !== tryBlock + || node.catchClause !== catchClause + || node.finallyBlock !== finallyBlock + ? updateNode(createTry(tryBlock, catchClause, finallyBlock), node) + : node; } - export function createCaseBlock(clauses: CaseOrDefaultClause[], location?: TextRange): CaseBlock { - const node = createNode(SyntaxKind.CaseBlock, location); + export function createCaseBlock(clauses: CaseOrDefaultClause[]): CaseBlock { + const node = createSynthesizedNode(SyntaxKind.CaseBlock); node.clauses = createNodeArray(clauses); return node; } export function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]) { - if (node.clauses !== clauses) { - return updateNode(createCaseBlock(clauses, node), node); - } - return node; + return node.clauses !== clauses + ? updateNode(createCaseBlock(clauses), node) + : node; } - export function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags) { - const node = createNode(SyntaxKind.FunctionDeclaration, location, flags); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + export function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) { + const node = createSynthesizedNode(SyntaxKind.FunctionDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); node.asteriskToken = asteriskToken; - node.name = typeof name === "string" ? createIdentifier(name) : name; - node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined; + node.name = asName(name); + node.typeParameters = asNodeArray(typeParameters); node.parameters = createNodeArray(parameters); node.type = type; node.body = body; @@ -1079,163 +1067,172 @@ namespace ts { } export function updateFunctionDeclaration(node: FunctionDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.parameters !== parameters || node.type !== type || node.body !== body) { - return updateNode(createFunctionDeclaration(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body, /*location*/ node, node.flags), node); - } - return node; - } - - export function createClassDeclaration(decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange) { - const node = createNode(SyntaxKind.ClassDeclaration, location); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; - node.name = name; - node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined; - node.heritageClauses = createNodeArray(heritageClauses); + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateNode(createFunctionDeclaration(decorators, modifiers, node.asteriskToken, name, typeParameters, parameters, type, body), node) + : node; + } + + export function createClassDeclaration(decorators: Decorator[], modifiers: Modifier[], name: string | Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) { + const node = createSynthesizedNode(SyntaxKind.ClassDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.name = asName(name); + node.typeParameters = asNodeArray(typeParameters); + node.heritageClauses = asNodeArray(heritageClauses); node.members = createNodeArray(members); return node; } export function updateClassDeclaration(node: ClassDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.typeParameters !== typeParameters || node.heritageClauses !== heritageClauses || node.members !== members) { - return updateNode(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, node), node); - } - return node; - } - - export function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression, location?: TextRange): ImportDeclaration { - const node = createNode(SyntaxKind.ImportDeclaration, location); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.heritageClauses !== heritageClauses + || node.members !== members + ? updateNode(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node) + : node; + } + + export function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression): ImportDeclaration { + const node = createSynthesizedNode(SyntaxKind.ImportDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); node.importClause = importClause; node.moduleSpecifier = moduleSpecifier; return node; } export function updateImportDeclaration(node: ImportDeclaration, decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier: Expression) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.importClause !== importClause || node.moduleSpecifier !== moduleSpecifier) { - return updateNode(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, node), node); - } - return node; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.importClause !== importClause || node.moduleSpecifier !== moduleSpecifier + ? updateNode(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier), node) + : node; } - export function createImportClause(name: Identifier, namedBindings: NamedImportBindings, location?: TextRange): ImportClause { - const node = createNode(SyntaxKind.ImportClause, location); + export function createImportClause(name: Identifier, namedBindings: NamedImportBindings): ImportClause { + const node = createSynthesizedNode(SyntaxKind.ImportClause); node.name = name; node.namedBindings = namedBindings; return node; } export function updateImportClause(node: ImportClause, name: Identifier, namedBindings: NamedImportBindings) { - if (node.name !== name || node.namedBindings !== namedBindings) { - return updateNode(createImportClause(name, namedBindings, node), node); - } - return node; + return node.name !== name + || node.namedBindings !== namedBindings + ? updateNode(createImportClause(name, namedBindings), node) + : node; } - export function createNamespaceImport(name: Identifier, location?: TextRange): NamespaceImport { - const node = createNode(SyntaxKind.NamespaceImport, location); + export function createNamespaceImport(name: Identifier): NamespaceImport { + const node = createSynthesizedNode(SyntaxKind.NamespaceImport); node.name = name; return node; } export function updateNamespaceImport(node: NamespaceImport, name: Identifier) { - if (node.name !== name) { - return updateNode(createNamespaceImport(name, node), node); - } - return node; + return node.name !== name + ? updateNode(createNamespaceImport(name), node) + : node; } - export function createNamedImports(elements: ImportSpecifier[], location?: TextRange): NamedImports { - const node = createNode(SyntaxKind.NamedImports, location); + export function createNamedImports(elements: ImportSpecifier[]): NamedImports { + const node = createSynthesizedNode(SyntaxKind.NamedImports); node.elements = createNodeArray(elements); return node; } export function updateNamedImports(node: NamedImports, elements: ImportSpecifier[]) { - if (node.elements !== elements) { - return updateNode(createNamedImports(elements, node), node); - } - return node; + return node.elements !== elements + ? updateNode(createNamedImports(elements), node) + : node; } - export function createImportSpecifier(propertyName: Identifier, name: Identifier, location?: TextRange) { - const node = createNode(SyntaxKind.ImportSpecifier, location); + export function createImportSpecifier(propertyName: Identifier, name: Identifier) { + const node = createSynthesizedNode(SyntaxKind.ImportSpecifier); node.propertyName = propertyName; node.name = name; return node; } export function updateImportSpecifier(node: ImportSpecifier, propertyName: Identifier, name: Identifier) { - if (node.propertyName !== propertyName || node.name !== name) { - return updateNode(createImportSpecifier(propertyName, name, node), node); - } - return node; + return node.propertyName !== propertyName + || node.name !== name + ? updateNode(createImportSpecifier(propertyName, name), node) + : node; } - export function createExportAssignment(decorators: Decorator[], modifiers: Modifier[], isExportEquals: boolean, expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ExportAssignment, location); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + export function createExportAssignment(decorators: Decorator[], modifiers: Modifier[], isExportEquals: boolean, expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.ExportAssignment); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); node.isExportEquals = isExportEquals; node.expression = expression; return node; } export function updateExportAssignment(node: ExportAssignment, decorators: Decorator[], modifiers: Modifier[], expression: Expression) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.expression !== expression) { - return updateNode(createExportAssignment(decorators, modifiers, node.isExportEquals, expression, node), node); - } - return node; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.expression !== expression + ? updateNode(createExportAssignment(decorators, modifiers, node.isExportEquals, expression), node) + : node; } - export function createExportDeclaration(decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier?: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ExportDeclaration, location); - node.decorators = decorators ? createNodeArray(decorators) : undefined; - node.modifiers = modifiers ? createNodeArray(modifiers) : undefined; + export function createExportDeclaration(decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier?: Expression) { + const node = createSynthesizedNode(SyntaxKind.ExportDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); node.exportClause = exportClause; node.moduleSpecifier = moduleSpecifier; return node; } export function updateExportDeclaration(node: ExportDeclaration, decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier: Expression) { - if (node.decorators !== decorators || node.modifiers !== modifiers || node.exportClause !== exportClause || node.moduleSpecifier !== moduleSpecifier) { - return updateNode(createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, node), node); - } - return node; + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.exportClause !== exportClause + || node.moduleSpecifier !== moduleSpecifier + ? updateNode(createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier), node) + : node; } - export function createNamedExports(elements: ExportSpecifier[], location?: TextRange) { - const node = createNode(SyntaxKind.NamedExports, location); + export function createNamedExports(elements: ExportSpecifier[]) { + const node = createSynthesizedNode(SyntaxKind.NamedExports); node.elements = createNodeArray(elements); return node; } export function updateNamedExports(node: NamedExports, elements: ExportSpecifier[]) { - if (node.elements !== elements) { - return updateNode(createNamedExports(elements, node), node); - } - return node; + return node.elements !== elements + ? updateNode(createNamedExports(elements), node) + : node; } - export function createExportSpecifier(name: string | Identifier, propertyName?: string | Identifier, location?: TextRange) { - const node = createNode(SyntaxKind.ExportSpecifier, location); - node.name = typeof name === "string" ? createIdentifier(name) : name; - node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName; + export function createExportSpecifier(name: string | Identifier, propertyName?: string | Identifier) { + const node = createSynthesizedNode(SyntaxKind.ExportSpecifier); + node.name = asName(name); + node.propertyName = asName(propertyName); return node; } export function updateExportSpecifier(node: ExportSpecifier, name: Identifier, propertyName: Identifier) { - if (node.name !== name || node.propertyName !== propertyName) { - return updateNode(createExportSpecifier(name, propertyName, node), node); - } - return node; + return node.name !== name || node.propertyName !== propertyName + ? updateNode(createExportSpecifier(name, propertyName), node) + : node; } // JSX - export function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement, location?: TextRange) { - const node = createNode(SyntaxKind.JsxElement, location); + export function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement) { + const node = createSynthesizedNode(SyntaxKind.JsxElement); node.openingElement = openingElement; node.children = createNodeArray(children); node.closingElement = closingElement; @@ -1243,98 +1240,96 @@ namespace ts { } export function updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement) { - if (node.openingElement !== openingElement || node.children !== children || node.closingElement !== closingElement) { - return updateNode(createJsxElement(openingElement, children, closingElement, node), node); - } - return node; + return node.openingElement !== openingElement + || node.children !== children + || node.closingElement !== closingElement + ? updateNode(createJsxElement(openingElement, children, closingElement), node) + : node; } - export function createJsxSelfClosingElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange) { - const node = createNode(SyntaxKind.JsxSelfClosingElement, location); + export function createJsxSelfClosingElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) { + const node = createSynthesizedNode(SyntaxKind.JsxSelfClosingElement); node.tagName = tagName; node.attributes = createNodeArray(attributes); return node; } export function updateJsxSelfClosingElement(node: JsxSelfClosingElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) { - if (node.tagName !== tagName || node.attributes !== attributes) { - return updateNode(createJsxSelfClosingElement(tagName, attributes, node), node); - } - return node; + return node.tagName !== tagName + || node.attributes !== attributes + ? updateNode(createJsxSelfClosingElement(tagName, attributes), node) + : node; } - export function createJsxOpeningElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange) { - const node = createNode(SyntaxKind.JsxOpeningElement, location); + export function createJsxOpeningElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) { + const node = createSynthesizedNode(SyntaxKind.JsxOpeningElement); node.tagName = tagName; node.attributes = createNodeArray(attributes); return node; } export function updateJsxOpeningElement(node: JsxOpeningElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]) { - if (node.tagName !== tagName || node.attributes !== attributes) { - return updateNode(createJsxOpeningElement(tagName, attributes, node), node); - } - return node; + return node.tagName !== tagName + || node.attributes !== attributes + ? updateNode(createJsxOpeningElement(tagName, attributes), node) + : node; } - export function createJsxClosingElement(tagName: JsxTagNameExpression, location?: TextRange) { - const node = createNode(SyntaxKind.JsxClosingElement, location); + export function createJsxClosingElement(tagName: JsxTagNameExpression) { + const node = createSynthesizedNode(SyntaxKind.JsxClosingElement); node.tagName = tagName; return node; } export function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression) { - if (node.tagName !== tagName) { - return updateNode(createJsxClosingElement(tagName, node), node); - } - return node; + return node.tagName !== tagName + ? updateNode(createJsxClosingElement(tagName), node) + : node; } - export function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression, location?: TextRange) { - const node = createNode(SyntaxKind.JsxAttribute, location); + export function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression) { + const node = createSynthesizedNode(SyntaxKind.JsxAttribute); node.name = name; node.initializer = initializer; return node; } export function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression) { - if (node.name !== name || node.initializer !== initializer) { - return updateNode(createJsxAttribute(name, initializer, node), node); - } - return node; + return node.name !== name + || node.initializer !== initializer + ? updateNode(createJsxAttribute(name, initializer), node) + : node; } - export function createJsxSpreadAttribute(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.JsxSpreadAttribute, location); + export function createJsxSpreadAttribute(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.JsxSpreadAttribute); node.expression = expression; return node; } export function updateJsxSpreadAttribute(node: JsxSpreadAttribute, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createJsxSpreadAttribute(expression, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createJsxSpreadAttribute(expression), node) + : node; } - export function createJsxExpression(expression: Expression, dotDotDotToken: Token, location?: TextRange) { - const node = createNode(SyntaxKind.JsxExpression, location); + export function createJsxExpression(expression: Expression, dotDotDotToken: DotDotDotToken) { + const node = createSynthesizedNode(SyntaxKind.JsxExpression); node.dotDotDotToken = dotDotDotToken; node.expression = expression; return node; } export function updateJsxExpression(node: JsxExpression, expression: Expression) { - if (node.expression !== expression) { - return updateNode(createJsxExpression(expression, node.dotDotDotToken, node), node); - } - return node; + return node.expression !== expression + ? updateNode(createJsxExpression(expression, node.dotDotDotToken), node) + : node; } // Clauses - export function createHeritageClause(token: SyntaxKind, types: ExpressionWithTypeArguments[], location?: TextRange) { - const node = createNode(SyntaxKind.HeritageClause, location); + export function createHeritageClause(token: SyntaxKind, types: ExpressionWithTypeArguments[]) { + const node = createSynthesizedNode(SyntaxKind.HeritageClause); node.token = token; node.types = createNodeArray(types); return node; @@ -1342,13 +1337,13 @@ namespace ts { export function updateHeritageClause(node: HeritageClause, types: ExpressionWithTypeArguments[]) { if (node.types !== types) { - return updateNode(createHeritageClause(node.token, types, node), node); + return updateNode(createHeritageClause(node.token, types), node); } return node; } - export function createCaseClause(expression: Expression, statements: Statement[], location?: TextRange) { - const node = createNode(SyntaxKind.CaseClause, location); + export function createCaseClause(expression: Expression, statements: Statement[]) { + const node = createSynthesizedNode(SyntaxKind.CaseClause); node.expression = parenthesizeExpressionForList(expression); node.statements = createNodeArray(statements); return node; @@ -1356,26 +1351,26 @@ namespace ts { export function updateCaseClause(node: CaseClause, expression: Expression, statements: Statement[]) { if (node.expression !== expression || node.statements !== statements) { - return updateNode(createCaseClause(expression, statements, node), node); + return updateNode(createCaseClause(expression, statements), node); } return node; } - export function createDefaultClause(statements: Statement[], location?: TextRange) { - const node = createNode(SyntaxKind.DefaultClause, location); + export function createDefaultClause(statements: Statement[]) { + const node = createSynthesizedNode(SyntaxKind.DefaultClause); node.statements = createNodeArray(statements); return node; } export function updateDefaultClause(node: DefaultClause, statements: Statement[]) { if (node.statements !== statements) { - return updateNode(createDefaultClause(statements, node), node); + return updateNode(createDefaultClause(statements), node); } return node; } - export function createCatchClause(variableDeclaration: string | VariableDeclaration, block: Block, location?: TextRange) { - const node = createNode(SyntaxKind.CatchClause, location); + export function createCatchClause(variableDeclaration: string | VariableDeclaration, block: Block) { + const node = createSynthesizedNode(SyntaxKind.CatchClause); node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration; node.block = block; return node; @@ -1383,16 +1378,16 @@ namespace ts { export function updateCatchClause(node: CatchClause, variableDeclaration: VariableDeclaration, block: Block) { if (node.variableDeclaration !== variableDeclaration || node.block !== block) { - return updateNode(createCatchClause(variableDeclaration, block, node), node); + return updateNode(createCatchClause(variableDeclaration, block), node); } return node; } // Property assignments - export function createPropertyAssignment(name: string | PropertyName, initializer: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.PropertyAssignment, location); - node.name = typeof name === "string" ? createIdentifier(name) : name; + export function createPropertyAssignment(name: string | PropertyName, initializer: Expression) { + const node = createSynthesizedNode(SyntaxKind.PropertyAssignment); + node.name = asName(name); node.questionToken = undefined; node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined; return node; @@ -1400,34 +1395,34 @@ namespace ts { export function updatePropertyAssignment(node: PropertyAssignment, name: PropertyName, initializer: Expression) { if (node.name !== name || node.initializer !== initializer) { - return updateNode(createPropertyAssignment(name, initializer, node), node); + return updateNode(createPropertyAssignment(name, initializer), node); } return node; } - export function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.ShorthandPropertyAssignment, location); - node.name = typeof name === "string" ? createIdentifier(name) : name; + export function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer: Expression) { + const node = createSynthesizedNode(SyntaxKind.ShorthandPropertyAssignment); + node.name = asName(name); node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined; return node; } - export function createSpreadAssignment(expression: Expression, location?: TextRange) { - const node = createNode(SyntaxKind.SpreadAssignment, location); + export function createSpreadAssignment(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.SpreadAssignment); node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined; return node; } export function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression) { if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) { - return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node); + return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer), node); } return node; } export function updateSpreadAssignment(node: SpreadAssignment, expression: Expression) { if (node.expression !== expression) { - return updateNode(createSpreadAssignment(expression, node), node); + return updateNode(createSpreadAssignment(expression), node); } return node; } @@ -1436,7 +1431,8 @@ namespace ts { export function updateSourceFileNode(node: SourceFile, statements: Statement[]) { if (node.statements !== statements) { - const updated = createNode(SyntaxKind.SourceFile, /*location*/ node, node.flags); + const updated = createSynthesizedNode(SyntaxKind.SourceFile); + updated.flags |= node.flags; updated.statements = createNodeArray(statements); updated.endOfFileToken = node.endOfFileToken; updated.fileName = node.fileName; @@ -1472,17 +1468,29 @@ namespace ts { return node; } - // Transformation nodes - /** - * Creates a synthetic statement to act as a placeholder for a not-emitted statement in - * order to preserve comments. - * - * @param original The original statement. + * Creates a shallow, memberwise clone of a node for mutation. + */ + export function getMutableClone(node: T): T { + const clone = getSynthesizedClone(node); + clone.pos = node.pos; + clone.end = node.end; + clone.parent = node.parent; + return clone; + } + + // Transformation nodes + + /** + * Creates a synthetic statement to act as a placeholder for a not-emitted statement in + * order to preserve comments. + * + * @param original The original statement. */ export function createNotEmittedStatement(original: Node) { - const node = createNode(SyntaxKind.NotEmittedStatement, /*location*/ original); + const node = createSynthesizedNode(SyntaxKind.NotEmittedStatement); node.original = original; + setTextRange(node, original); return node; } @@ -1490,8 +1498,9 @@ namespace ts { * Creates a synthetic element to act as a placeholder for the end of an emitted declaration in * order to properly emit exports. */ + /* @internal */ export function createEndOfDeclarationMarker(original: Node) { - const node = createNode(SyntaxKind.EndOfDeclarationMarker); + const node = createSynthesizedNode(SyntaxKind.EndOfDeclarationMarker); node.emitNode = {}; node.original = original; return node; @@ -1501,8 +1510,9 @@ namespace ts { * Creates a synthetic element to act as a placeholder for the beginning of a merged declaration in * order to properly emit exports. */ + /* @internal */ export function createMergeDeclarationMarker(original: Node) { - const node = createNode(SyntaxKind.MergeDeclarationMarker); + const node = createSynthesizedNode(SyntaxKind.MergeDeclarationMarker); node.emitNode = {}; node.original = original; return node; @@ -1516,16 +1526,17 @@ namespace ts { * @param original The original outer expression. * @param location The location for the expression. Defaults to the positions from "original" if provided. */ - export function createPartiallyEmittedExpression(expression: Expression, original?: Node, location?: TextRange) { - const node = createNode(SyntaxKind.PartiallyEmittedExpression, /*location*/ location || original); + export function createPartiallyEmittedExpression(expression: Expression, original?: Node) { + const node = createSynthesizedNode(SyntaxKind.PartiallyEmittedExpression); node.expression = expression; node.original = original; + setTextRange(node, original); return node; } export function updatePartiallyEmittedExpression(node: PartiallyEmittedExpression, expression: Expression) { if (node.expression !== expression) { - return updateNode(createPartiallyEmittedExpression(expression, node.original, node), node); + return updateNode(createPartiallyEmittedExpression(expression, node.original), node); } return node; } @@ -1549,14 +1560,14 @@ namespace ts { return createBinary(left, SyntaxKind.CommaToken, right); } - export function createLessThan(left: Expression, right: Expression, location?: TextRange) { - return createBinary(left, SyntaxKind.LessThanToken, right, location); + export function createLessThan(left: Expression, right: Expression) { + return createBinary(left, SyntaxKind.LessThanToken, right); } - export function createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression, location?: TextRange): DestructuringAssignment; - export function createAssignment(left: Expression, right: Expression, location?: TextRange): BinaryExpression; - export function createAssignment(left: Expression, right: Expression, location?: TextRange) { - return createBinary(left, SyntaxKind.EqualsToken, right, location); + export function createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression): DestructuringAssignment; + export function createAssignment(left: Expression, right: Expression): BinaryExpression; + export function createAssignment(left: Expression, right: Expression) { + return createBinary(left, SyntaxKind.EqualsToken, right); } export function createStrictEquality(left: Expression, right: Expression) { @@ -1575,8 +1586,8 @@ namespace ts { return createBinary(left, SyntaxKind.MinusToken, right); } - export function createPostfixIncrement(operand: Expression, location?: TextRange) { - return createPostfix(operand, SyntaxKind.PlusPlusToken, location); + export function createPostfixIncrement(operand: Expression) { + return createPostfix(operand, SyntaxKind.PlusPlusToken); } export function createLogicalAnd(left: Expression, right: Expression) { @@ -1595,6 +1606,321 @@ namespace ts { return createVoid(createLiteral(0)); } + export function createExportDefault(expression: Expression) { + return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression); + } + + export function createExternalModuleExport(exportName: Identifier) { + return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(exportName)])); + } + + // Utilities + + function asName(name: string): Identifier; + function asName(name: Identifier): Identifier; + function asName(name: string | Identifier): Identifier; + function asName(name: string | BindingName): BindingName; + function asName(name: string | PropertyName): PropertyName; + function asName(name: string | Identifier | BindingName | PropertyName) { + return typeof name === "string" ? createIdentifier(name) : name; + } + + function asExpression(value: string | number | Expression) { + return typeof value === "string" || typeof value === "number" ? createLiteral(value) : value; + } + + function asNodeArray(array: T[] | undefined): NodeArray | undefined { + return array ? createNodeArray(array) : undefined; + } + + function asToken(value: TKind | Token): Token { + return typeof value === "number" ? createToken(value) : value; + } + + /** + * Clears any EmitNode entries from parse-tree nodes. + * @param sourceFile A source file. + */ + export function disposeEmitNodes(sourceFile: SourceFile) { + // During transformation we may need to annotate a parse tree node with transient + // transformation properties. As parse tree nodes live longer than transformation + // nodes, we need to make sure we reclaim any memory allocated for custom ranges + // from these nodes to ensure we do not hold onto entire subtrees just for position + // information. We also need to reset these nodes to a pre-transformation state + // for incremental parsing scenarios so that we do not impact later emit. + sourceFile = getSourceFileOfNode(getParseTreeNode(sourceFile)); + const emitNode = sourceFile && sourceFile.emitNode; + const annotatedNodes = emitNode && emitNode.annotatedNodes; + if (annotatedNodes) { + for (const node of annotatedNodes) { + node.emitNode = undefined; + } + } + } + + /** + * Associates a node with the current transformation, initializing + * various transient transformation properties. + * + * @param node The node. + */ + /* @internal */ + export function getOrCreateEmitNode(node: Node) { + if (!node.emitNode) { + if (isParseTreeNode(node)) { + // To avoid holding onto transformation artifacts, we keep track of any + // parse tree node we are annotating. This allows us to clean them up after + // all transformations have completed. + if (node.kind === SyntaxKind.SourceFile) { + return node.emitNode = { annotatedNodes: [node] }; + } + + const sourceFile = getSourceFileOfNode(node); + getOrCreateEmitNode(sourceFile).annotatedNodes.push(node); + } + + node.emitNode = {}; + } + + return node.emitNode; + } + + export function setTextRange(range: T, location: TextRange | undefined): T { + if (location) { + range.pos = location.pos; + range.end = location.end; + } + return range; + } + + /** + * Gets flags that control emit behavior of a node. + * + * @param node The node. + */ + export function getEmitFlags(node: Node) { + const emitNode = node.emitNode; + return emitNode && emitNode.flags; + } + + /** + * Sets flags that control emit behavior of a node. + * + * @param node The node. + * @param emitFlags The NodeEmitFlags for the node. + */ + export function setEmitFlags(node: T, emitFlags: EmitFlags) { + getOrCreateEmitNode(node).flags = emitFlags; + return node; + } + + /** + * Gets a custom text range to use when emitting source maps. + * + * @param node The node. + */ + export function getSourceMapRange(node: Node) { + const emitNode = node.emitNode; + return (emitNode && emitNode.sourceMapRange) || node; + } + + /** + * Sets a custom text range to use when emitting source maps. + * + * @param node The node. + * @param range The text range. + */ + export function setSourceMapRange(node: T, range: TextRange) { + getOrCreateEmitNode(node).sourceMapRange = range; + return node; + } + + /** + * Gets the TextRange to use for source maps for a token of a node. + * + * @param node The node. + * @param token The token. + */ + export function getTokenSourceMapRange(node: Node, token: SyntaxKind) { + const emitNode = node.emitNode; + const tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges; + return tokenSourceMapRanges && tokenSourceMapRanges[token]; + } + + /** + * Sets the TextRange to use for source maps for a token of a node. + * + * @param node The node. + * @param token The token. + * @param range The text range. + */ + export function setTokenSourceMapRange(node: T, token: SyntaxKind, range: TextRange) { + const emitNode = getOrCreateEmitNode(node); + const tokenSourceMapRanges = emitNode.tokenSourceMapRanges || (emitNode.tokenSourceMapRanges = []); + tokenSourceMapRanges[token] = range; + return node; + } + + /** + * Gets a custom text range to use when emitting comments. + * + * @param node The node. + */ + export function getCommentRange(node: Node) { + const emitNode = node.emitNode; + return (emitNode && emitNode.commentRange) || node; + } + + /** + * Sets a custom text range to use when emitting comments. + */ + export function setCommentRange(node: T, range: TextRange) { + getOrCreateEmitNode(node).commentRange = range; + return node; + } + + /** + * Gets the constant value to emit for an expression. + */ + export function getConstantValue(node: PropertyAccessExpression | ElementAccessExpression) { + const emitNode = node.emitNode; + return emitNode && emitNode.constantValue; + } + + /** + * Sets the constant value to emit for an expression. + */ + export function setConstantValue(node: PropertyAccessExpression | ElementAccessExpression, value: number) { + const emitNode = getOrCreateEmitNode(node); + emitNode.constantValue = value; + return node; + } + + /** + * Adds an EmitHelper to a node. + */ + export function addEmitHelper(node: T, helper: EmitHelper): T { + const emitNode = getOrCreateEmitNode(node); + emitNode.helpers = append(emitNode.helpers, helper); + return node; + } + + /** + * Add EmitHelpers to a node. + */ + export function addEmitHelpers(node: T, helpers: EmitHelper[] | undefined): T { + if (some(helpers)) { + const emitNode = getOrCreateEmitNode(node); + for (const helper of helpers) { + if (!contains(emitNode.helpers, helper)) { + emitNode.helpers = append(emitNode.helpers, helper); + } + } + } + return node; + } + + /** + * Removes an EmitHelper from a node. + */ + export function removeEmitHelper(node: Node, helper: EmitHelper): boolean { + const emitNode = node.emitNode; + if (emitNode) { + const helpers = emitNode.helpers; + if (helpers) { + return orderedRemoveItem(helpers, helper); + } + } + return false; + } + + /** + * Gets the EmitHelpers of a node. + */ + export function getEmitHelpers(node: Node): EmitHelper[] | undefined { + const emitNode = node.emitNode; + return emitNode && emitNode.helpers; + } + + /** + * Moves matching emit helpers from a source node to a target node. + */ + export function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean) { + const sourceEmitNode = source.emitNode; + const sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers; + if (!some(sourceEmitHelpers)) return; + + const targetEmitNode = getOrCreateEmitNode(target); + let helpersRemoved = 0; + for (let i = 0; i < sourceEmitHelpers.length; i++) { + const helper = sourceEmitHelpers[i]; + if (predicate(helper)) { + helpersRemoved++; + if (!contains(targetEmitNode.helpers, helper)) { + targetEmitNode.helpers = append(targetEmitNode.helpers, helper); + } + } + else if (helpersRemoved > 0) { + sourceEmitHelpers[i - helpersRemoved] = helper; + } + } + + if (helpersRemoved > 0) { + sourceEmitHelpers.length -= helpersRemoved; + } + } + + /* @internal */ + export function compareEmitHelpers(x: EmitHelper, y: EmitHelper) { + if (x === y) return Comparison.EqualTo; + if (x.priority === y.priority) return Comparison.EqualTo; + if (x.priority === undefined) return Comparison.GreaterThan; + if (y.priority === undefined) return Comparison.LessThan; + return compareValues(x.priority, y.priority); + } + + export function setOriginalNode(node: T, original: Node): T { + node.original = original; + if (original) { + const emitNode = original.emitNode; + if (emitNode) node.emitNode = mergeEmitNode(emitNode, node.emitNode); + } + return node; + } + + function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode) { + const { + flags, + commentRange, + sourceMapRange, + tokenSourceMapRanges, + constantValue, + helpers + } = sourceEmitNode; + if (!destEmitNode) destEmitNode = {}; + if (flags) destEmitNode.flags = flags; + if (commentRange) destEmitNode.commentRange = commentRange; + if (sourceMapRange) destEmitNode.sourceMapRange = sourceMapRange; + if (tokenSourceMapRanges) destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges); + if (constantValue !== undefined) destEmitNode.constantValue = constantValue; + if (helpers) destEmitNode.helpers = addRange(destEmitNode.helpers, helpers); + return destEmitNode; + } + + function mergeTokenSourceMapRanges(sourceRanges: TextRange[], destRanges: TextRange[]) { + if (!destRanges) destRanges = []; + for (const key in sourceRanges) { + destRanges[key] = sourceRanges[key]; + } + return destRanges; + } +} + +/* @internal */ +namespace ts { + + // Compound nodes + export type TypeOfTag = "undefined" | "number" | "boolean" | "string" | "symbol" | "object" | "function"; export function createTypeCheck(value: Expression, tag: TypeOfTag) { @@ -1605,35 +1931,43 @@ namespace ts { export function createMemberAccessForPropertyName(target: Expression, memberName: PropertyName, location?: TextRange): MemberExpression { if (isComputedPropertyName(memberName)) { - return createElementAccess(target, memberName.expression, location); + return setTextRange(createElementAccess(target, memberName.expression), location); } else { - const expression = isIdentifier(memberName) ? createPropertyAccess(target, memberName, location) : createElementAccess(target, memberName, location); - (expression.emitNode || (expression.emitNode = {})).flags |= EmitFlags.NoNestedSourceMaps; + const expression = setTextRange( + isIdentifier(memberName) + ? createPropertyAccess(target, memberName) + : createElementAccess(target, memberName), + memberName + ); + getOrCreateEmitNode(expression).flags |= EmitFlags.NoNestedSourceMaps; return expression; } } export function createFunctionCall(func: Expression, thisArg: Expression, argumentsList: Expression[], location?: TextRange) { - return createCall( - createPropertyAccess(func, "call"), - /*typeArguments*/ undefined, - [ - thisArg, - ...argumentsList - ], + return setTextRange( + createCall( + createPropertyAccess(func, "call"), + /*typeArguments*/ undefined, + [ + thisArg, + ...argumentsList + ]), location ); } export function createFunctionApply(func: Expression, thisArg: Expression, argumentsExpression: Expression, location?: TextRange) { - return createCall( - createPropertyAccess(func, "apply"), - /*typeArguments*/ undefined, - [ - thisArg, - argumentsExpression - ], + return setTextRange( + createCall( + createPropertyAccess(func, "apply"), + /*typeArguments*/ undefined, + [ + thisArg, + argumentsExpression + ] + ), location ); } @@ -1656,10 +1990,12 @@ namespace ts { } export function createMathPow(left: Expression, right: Expression, location?: TextRange) { - return createCall( - createPropertyAccess(createIdentifier("Math"), "pow"), - /*typeArguments*/ undefined, - [left, right], + return setTextRange( + createCall( + createPropertyAccess(createIdentifier("Math"), "pow"), + /*typeArguments*/ undefined, + [left, right] + ), location ); } @@ -1679,7 +2015,7 @@ namespace ts { function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression { if (isQualifiedName(jsxFactory)) { const left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent); - const right = createSynthesizedNode(SyntaxKind.Identifier); + const right = createIdentifier(jsxFactory.right.text); right.text = jsxFactory.right.text; return createPropertyAccess(left, right); } @@ -1719,34 +2055,16 @@ namespace ts { } } - return createCall( - createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), - /*typeArguments*/ undefined, - argumentsList, + return setTextRange( + createCall( + createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), + /*typeArguments*/ undefined, + argumentsList + ), location ); } - export function createExportDefault(expression: Expression) { - return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression); - } - - export function createExternalModuleExport(exportName: Identifier) { - return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(exportName)])); - } - - export function createLetStatement(name: Identifier, initializer: Expression, location?: TextRange) { - return createVariableStatement(/*modifiers*/ undefined, createLetDeclarationList([createVariableDeclaration(name, /*type*/ undefined, initializer)]), location); - } - - export function createLetDeclarationList(declarations: VariableDeclaration[], location?: TextRange) { - return createVariableDeclarationList(declarations, location, NodeFlags.Let); - } - - export function createConstDeclarationList(declarations: VariableDeclaration[], location?: TextRange) { - return createVariableDeclarationList(declarations, location, NodeFlags.Const); - } - // Helpers export function getHelperName(name: string) { @@ -1809,7 +2127,9 @@ namespace ts { } else if (callee.kind === SyntaxKind.SuperKeyword) { thisArg = createThis(); - target = languageVersion < ScriptTarget.ES2015 ? createIdentifier("_super", /*location*/ callee) : callee; + target = languageVersion < ScriptTarget.ES2015 + ? setTextRange(createIdentifier("_super"), callee) + : callee; } else { switch (callee.kind) { @@ -1818,14 +2138,16 @@ namespace ts { // for `a.b()` target is `(_a = a).b` and thisArg is `_a` thisArg = createTempVariable(recordTempVariable); target = createPropertyAccess( - createAssignment( - thisArg, - (callee).expression, - /*location*/ (callee).expression + setTextRange( + createAssignment( + thisArg, + (callee).expression + ), + (callee).expression ), - (callee).name, - /*location*/ callee + (callee).name ); + setTextRange(target, callee); } else { thisArg = (callee).expression; @@ -1839,14 +2161,16 @@ namespace ts { // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a` thisArg = createTempVariable(recordTempVariable); target = createElementAccess( - createAssignment( - thisArg, - (callee).expression, - /*location*/ (callee).expression + setTextRange( + createAssignment( + thisArg, + (callee).expression + ), + (callee).expression ), - (callee).argumentExpression, - /*location*/ callee + (callee).argumentExpression ); + setTextRange(target, callee); } else { thisArg = (callee).expression; @@ -1876,7 +2200,7 @@ namespace ts { if (isQualifiedName(node)) { const left = createExpressionFromEntityName(node.left); const right = getMutableClone(node.right); - return createPropertyAccess(left, right, /*location*/ node); + return setTextRange(createPropertyAccess(left, right), node); } else { return getMutableClone(node); @@ -1885,7 +2209,7 @@ namespace ts { export function createExpressionForPropertyName(memberName: PropertyName): Expression { if (isIdentifier(memberName)) { - return createLiteral(memberName, /*location*/ undefined); + return createLiteral(memberName); } else if (isComputedPropertyName(memberName)) { return getMutableClone(memberName.expression); @@ -1921,9 +2245,9 @@ namespace ts { /*typeParameters*/ undefined, getAccessor.parameters, /*type*/ undefined, - getAccessor.body, - /*location*/ getAccessor + getAccessor.body ); + setTextRange(getterFunction, getAccessor); setOriginalNode(getterFunction, getAccessor); const getter = createPropertyAssignment("get", getterFunction); properties.push(getter); @@ -1937,25 +2261,27 @@ namespace ts { /*typeParameters*/ undefined, setAccessor.parameters, /*type*/ undefined, - setAccessor.body, - /*location*/ setAccessor + setAccessor.body ); + setTextRange(setterFunction, setAccessor); setOriginalNode(setterFunction, setAccessor); const setter = createPropertyAssignment("set", setterFunction); properties.push(setter); } - properties.push(createPropertyAssignment("enumerable", createLiteral(true))); - properties.push(createPropertyAssignment("configurable", createLiteral(true))); - - const expression = createCall( - createPropertyAccess(createIdentifier("Object"), "defineProperty"), - /*typeArguments*/ undefined, - [ - receiver, - createExpressionForPropertyName(property.name), - createObjectLiteral(properties, /*location*/ undefined, multiLine) - ], + properties.push(createPropertyAssignment("enumerable", createTrue())); + properties.push(createPropertyAssignment("configurable", createTrue())); + + const expression = setTextRange( + createCall( + createPropertyAccess(createIdentifier("Object"), "defineProperty"), + /*typeArguments*/ undefined, + [ + receiver, + createExpressionForPropertyName(property.name), + createObjectLiteral(properties, multiLine) + ] + ), /*location*/ firstAccessor ); @@ -1968,12 +2294,14 @@ namespace ts { function createExpressionForPropertyAssignment(property: PropertyAssignment, receiver: Expression) { return aggregateTransformFlags( setOriginalNode( - createAssignment( - createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), - property.initializer, - /*location*/ property + setTextRange( + createAssignment( + createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), + property.initializer + ), + property ), - /*original*/ property + property ) ); } @@ -1981,9 +2309,11 @@ namespace ts { function createExpressionForShorthandPropertyAssignment(property: ShorthandPropertyAssignment, receiver: Expression) { return aggregateTransformFlags( setOriginalNode( - createAssignment( - createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), - getSynthesizedClone(property.name), + setTextRange( + createAssignment( + createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), + getSynthesizedClone(property.name) + ), /*location*/ property ), /*original*/ property @@ -1994,20 +2324,24 @@ namespace ts { function createExpressionForMethodDeclaration(method: MethodDeclaration, receiver: Expression) { return aggregateTransformFlags( setOriginalNode( - createAssignment( - createMemberAccessForPropertyName(receiver, method.name, /*location*/ method.name), - setOriginalNode( - createFunctionExpression( - method.modifiers, - method.asteriskToken, - /*name*/ undefined, - /*typeParameters*/ undefined, - method.parameters, - /*type*/ undefined, - method.body, - /*location*/ method - ), - /*original*/ method + setTextRange( + createAssignment( + createMemberAccessForPropertyName(receiver, method.name, /*location*/ method.name), + setOriginalNode( + setTextRange( + createFunctionExpression( + method.modifiers, + method.asteriskToken, + /*name*/ undefined, + /*typeParameters*/ undefined, + method.parameters, + /*type*/ undefined, + method.body + ), + /*location*/ method + ), + /*original*/ method + ) ), /*location*/ method ), @@ -2109,7 +2443,8 @@ namespace ts { * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. */ export function getNamespaceMemberName(ns: Identifier, name: Identifier, allowComments?: boolean, allowSourceMaps?: boolean): PropertyAccessExpression { - const qualifiedName = createPropertyAccess(ns, nodeIsSynthesized(name) ? name : getSynthesizedClone(name), /*location*/ name); + const qualifiedName = createPropertyAccess(ns, nodeIsSynthesized(name) ? name : getSynthesizedClone(name)); + setTextRange(qualifiedName, name); let emitFlags: EmitFlags; if (!allowSourceMaps) emitFlags |= EmitFlags.NoSourceMap; if (!allowComments) emitFlags |= EmitFlags.NoComments; @@ -2118,7 +2453,7 @@ namespace ts { } export function convertToFunctionBody(node: ConciseBody, multiLine?: boolean) { - return isBlock(node) ? node : createBlock([createReturn(node, /*location*/ node)], /*location*/ node, multiLine); + return isBlock(node) ? node : setTextRange(createBlock([setTextRange(createReturn(node), node)], multiLine), node); } function isUseStrictPrologue(node: ExpressionStatement): boolean { @@ -2197,10 +2532,13 @@ namespace ts { } if (!foundUseStrict) { - return createNodeArray([ - startOnNewLine(createStatement(createLiteral("use strict"))), - ...statements - ], statements); + return setTextRange( + createNodeArray([ + startOnNewLine(createStatement(createLiteral("use strict"))), + ...statements + ]), + statements + ); } return statements; @@ -2393,7 +2731,7 @@ namespace ts { return condition; } - function parenthesizeSubexpressionOfConditionalExpression(e: Expression): Expression { + export function parenthesizeSubexpressionOfConditionalExpression(e: Expression): Expression { // per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions // so in case when comma expression is introduced as a part of previous transformations // if should be wrapped in parens since comma operator has the lowest precedence @@ -2445,22 +2783,22 @@ namespace ts { return expression; } - return createParen(expression, /*location*/ expression); + return setTextRange(createParen(expression), expression); } export function parenthesizePostfixOperand(operand: Expression) { return isLeftHandSideExpression(operand) ? operand - : createParen(operand, /*location*/ operand); + : setTextRange(createParen(operand), operand); } export function parenthesizePrefixOperand(operand: Expression) { return isUnaryExpression(operand) ? operand - : createParen(operand, /*location*/ operand); + : setTextRange(createParen(operand), operand); } - function parenthesizeListElements(elements: NodeArray) { + export function parenthesizeListElements(elements: NodeArray) { let result: Expression[]; for (let i = 0; i < elements.length; i++) { const element = parenthesizeExpressionForList(elements[i]); @@ -2474,7 +2812,7 @@ namespace ts { } if (result !== undefined) { - return createNodeArray(result, elements, elements.hasTrailingComma); + return setTextRange(createNodeArray(result, elements.hasTrailingComma), elements); } return elements; @@ -2486,7 +2824,7 @@ namespace ts { const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken); return expressionPrecedence > commaPrecedence ? expression - : createParen(expression, /*location*/ expression); + : setTextRange(createParen(expression), expression); } export function parenthesizeExpressionForExpressionStatement(expression: Expression) { @@ -2496,14 +2834,14 @@ namespace ts { const kind = skipPartiallyEmittedExpressions(callee).kind; if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) { const mutableCall = getMutableClone(emittedExpression); - mutableCall.expression = createParen(callee, /*location*/ callee); + mutableCall.expression = setTextRange(createParen(callee), callee); return recreatePartiallyEmittedExpressions(expression, mutableCall); } } else { const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind; if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) { - return createParen(expression, /*location*/ expression); + return setTextRange(createParen(expression), expression); } } @@ -2551,269 +2889,83 @@ namespace ts { node = (node).expression; continue; } - - return node; - } - } - - export function parenthesizeConciseBody(body: ConciseBody): ConciseBody { - const emittedBody = skipPartiallyEmittedExpressions(body); - if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) { - return createParen(body, /*location*/ body); - } - - return body; - } - - export const enum OuterExpressionKinds { - Parentheses = 1 << 0, - Assertions = 1 << 1, - PartiallyEmittedExpressions = 1 << 2, - - All = Parentheses | Assertions | PartiallyEmittedExpressions - } - - export function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression; - export function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node; - export function skipOuterExpressions(node: Node, kinds = OuterExpressionKinds.All) { - let previousNode: Node; - do { - previousNode = node; - if (kinds & OuterExpressionKinds.Parentheses) { - node = skipParentheses(node); - } - - if (kinds & OuterExpressionKinds.Assertions) { - node = skipAssertions(node); - } - - if (kinds & OuterExpressionKinds.PartiallyEmittedExpressions) { - node = skipPartiallyEmittedExpressions(node); - } - } - while (previousNode !== node); - - return node; - } - - export function skipParentheses(node: Expression): Expression; - export function skipParentheses(node: Node): Node; - export function skipParentheses(node: Node): Node { - while (node.kind === SyntaxKind.ParenthesizedExpression) { - node = (node).expression; - } - - return node; - } - - export function skipAssertions(node: Expression): Expression; - export function skipAssertions(node: Node): Node; - export function skipAssertions(node: Node): Node { - while (isAssertionExpression(node)) { - node = (node).expression; - } - - return node; - } - - export function skipPartiallyEmittedExpressions(node: Expression): Expression; - export function skipPartiallyEmittedExpressions(node: Node): Node; - export function skipPartiallyEmittedExpressions(node: Node) { - while (node.kind === SyntaxKind.PartiallyEmittedExpression) { - node = (node).expression; - } - - return node; - } - - export function startOnNewLine(node: T): T { - node.startsOnNewLine = true; - return node; - } - - export function setOriginalNode(node: T, original: Node): T { - node.original = original; - if (original) { - const emitNode = original.emitNode; - if (emitNode) node.emitNode = mergeEmitNode(emitNode, node.emitNode); - } - return node; - } - - function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode) { - const { - flags, - commentRange, - sourceMapRange, - tokenSourceMapRanges, - constantValue, - helpers - } = sourceEmitNode; - if (!destEmitNode) destEmitNode = {}; - if (flags) destEmitNode.flags = flags; - if (commentRange) destEmitNode.commentRange = commentRange; - if (sourceMapRange) destEmitNode.sourceMapRange = sourceMapRange; - if (tokenSourceMapRanges) destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges); - if (constantValue !== undefined) destEmitNode.constantValue = constantValue; - if (helpers) destEmitNode.helpers = addRange(destEmitNode.helpers, helpers); - return destEmitNode; - } - - function mergeTokenSourceMapRanges(sourceRanges: TextRange[], destRanges: TextRange[]) { - if (!destRanges) destRanges = []; - for (const key in sourceRanges) { - destRanges[key] = sourceRanges[key]; - } - return destRanges; - } - - /** - * Clears any EmitNode entries from parse-tree nodes. - * @param sourceFile A source file. - */ - export function disposeEmitNodes(sourceFile: SourceFile) { - // During transformation we may need to annotate a parse tree node with transient - // transformation properties. As parse tree nodes live longer than transformation - // nodes, we need to make sure we reclaim any memory allocated for custom ranges - // from these nodes to ensure we do not hold onto entire subtrees just for position - // information. We also need to reset these nodes to a pre-transformation state - // for incremental parsing scenarios so that we do not impact later emit. - sourceFile = getSourceFileOfNode(getParseTreeNode(sourceFile)); - const emitNode = sourceFile && sourceFile.emitNode; - const annotatedNodes = emitNode && emitNode.annotatedNodes; - if (annotatedNodes) { - for (const node of annotatedNodes) { - node.emitNode = undefined; - } + + return node; } } - /** - * Associates a node with the current transformation, initializing - * various transient transformation properties. - * - * @param node The node. - */ - export function getOrCreateEmitNode(node: Node) { - if (!node.emitNode) { - if (isParseTreeNode(node)) { - // To avoid holding onto transformation artifacts, we keep track of any - // parse tree node we are annotating. This allows us to clean them up after - // all transformations have completed. - if (node.kind === SyntaxKind.SourceFile) { - return node.emitNode = { annotatedNodes: [node] }; - } - - const sourceFile = getSourceFileOfNode(node); - getOrCreateEmitNode(sourceFile).annotatedNodes.push(node); - } - - node.emitNode = {}; + export function parenthesizeConciseBody(body: ConciseBody): ConciseBody { + const emittedBody = skipPartiallyEmittedExpressions(body); + if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) { + return setTextRange(createParen(body), body); } - return node.emitNode; + return body; } - /** - * Gets flags that control emit behavior of a node. - * - * @param node The node. - */ - export function getEmitFlags(node: Node) { - const emitNode = node.emitNode; - return emitNode && emitNode.flags; - } + export const enum OuterExpressionKinds { + Parentheses = 1 << 0, + Assertions = 1 << 1, + PartiallyEmittedExpressions = 1 << 2, - /** - * Sets flags that control emit behavior of a node. - * - * @param node The node. - * @param emitFlags The NodeEmitFlags for the node. - */ - export function setEmitFlags(node: T, emitFlags: EmitFlags) { - getOrCreateEmitNode(node).flags = emitFlags; - return node; + All = Parentheses | Assertions | PartiallyEmittedExpressions } - /** - * Gets a custom text range to use when emitting source maps. - * - * @param node The node. - */ - export function getSourceMapRange(node: Node) { - const emitNode = node.emitNode; - return (emitNode && emitNode.sourceMapRange) || node; - } + export function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression; + export function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node; + export function skipOuterExpressions(node: Node, kinds = OuterExpressionKinds.All) { + let previousNode: Node; + do { + previousNode = node; + if (kinds & OuterExpressionKinds.Parentheses) { + node = skipParentheses(node); + } + + if (kinds & OuterExpressionKinds.Assertions) { + node = skipAssertions(node); + } + + if (kinds & OuterExpressionKinds.PartiallyEmittedExpressions) { + node = skipPartiallyEmittedExpressions(node); + } + } + while (previousNode !== node); - /** - * Sets a custom text range to use when emitting source maps. - * - * @param node The node. - * @param range The text range. - */ - export function setSourceMapRange(node: T, range: TextRange) { - getOrCreateEmitNode(node).sourceMapRange = range; return node; } - /** - * Gets the TextRange to use for source maps for a token of a node. - * - * @param node The node. - * @param token The token. - */ - export function getTokenSourceMapRange(node: Node, token: SyntaxKind) { - const emitNode = node.emitNode; - const tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges; - return tokenSourceMapRanges && tokenSourceMapRanges[token]; - } + export function skipParentheses(node: Expression): Expression; + export function skipParentheses(node: Node): Node; + export function skipParentheses(node: Node): Node { + while (node.kind === SyntaxKind.ParenthesizedExpression) { + node = (node).expression; + } - /** - * Sets the TextRange to use for source maps for a token of a node. - * - * @param node The node. - * @param token The token. - * @param range The text range. - */ - export function setTokenSourceMapRange(node: T, token: SyntaxKind, range: TextRange) { - const emitNode = getOrCreateEmitNode(node); - const tokenSourceMapRanges = emitNode.tokenSourceMapRanges || (emitNode.tokenSourceMapRanges = []); - tokenSourceMapRanges[token] = range; return node; } - /** - * Gets a custom text range to use when emitting comments. - * - * @param node The node. - */ - export function getCommentRange(node: Node) { - const emitNode = node.emitNode; - return (emitNode && emitNode.commentRange) || node; - } + export function skipAssertions(node: Expression): Expression; + export function skipAssertions(node: Node): Node; + export function skipAssertions(node: Node): Node { + while (isAssertionExpression(node)) { + node = (node).expression; + } - /** - * Sets a custom text range to use when emitting comments. - */ - export function setCommentRange(node: T, range: TextRange) { - getOrCreateEmitNode(node).commentRange = range; return node; } - /** - * Gets the constant value to emit for an expression. - */ - export function getConstantValue(node: PropertyAccessExpression | ElementAccessExpression) { - const emitNode = node.emitNode; - return emitNode && emitNode.constantValue; + export function skipPartiallyEmittedExpressions(node: Expression): Expression; + export function skipPartiallyEmittedExpressions(node: Node): Node; + export function skipPartiallyEmittedExpressions(node: Node) { + while (node.kind === SyntaxKind.PartiallyEmittedExpression) { + node = (node).expression; + } + + return node; } - /** - * Sets the constant value to emit for an expression. - */ - export function setConstantValue(node: PropertyAccessExpression | ElementAccessExpression, value: number) { - const emitNode = getOrCreateEmitNode(node); - emitNode.constantValue = value; + export function startOnNewLine(node: T): T { + node.startsOnNewLine = true; return node; } @@ -2842,110 +2994,6 @@ namespace ts { } } } - /** - * Adds an EmitHelper to a node. - */ - export function addEmitHelper(node: T, helper: EmitHelper): T { - const emitNode = getOrCreateEmitNode(node); - emitNode.helpers = append(emitNode.helpers, helper); - return node; - } - - /** - * Adds an EmitHelper to a node. - */ - export function addEmitHelpers(node: T, helpers: EmitHelper[] | undefined): T { - if (some(helpers)) { - const emitNode = getOrCreateEmitNode(node); - for (const helper of helpers) { - if (!contains(emitNode.helpers, helper)) { - emitNode.helpers = append(emitNode.helpers, helper); - } - } - } - return node; - } - - /** - * Removes an EmitHelper from a node. - */ - export function removeEmitHelper(node: Node, helper: EmitHelper): boolean { - const emitNode = node.emitNode; - if (emitNode) { - const helpers = emitNode.helpers; - if (helpers) { - return orderedRemoveItem(helpers, helper); - } - } - return false; - } - - /** - * Gets the EmitHelpers of a node. - */ - export function getEmitHelpers(node: Node): EmitHelper[] | undefined { - const emitNode = node.emitNode; - return emitNode && emitNode.helpers; - } - - /** - * Moves matching emit helpers from a source node to a target node. - */ - export function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean) { - const sourceEmitNode = source.emitNode; - const sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers; - if (!some(sourceEmitHelpers)) return; - - const targetEmitNode = getOrCreateEmitNode(target); - let helpersRemoved = 0; - for (let i = 0; i < sourceEmitHelpers.length; i++) { - const helper = sourceEmitHelpers[i]; - if (predicate(helper)) { - helpersRemoved++; - if (!contains(targetEmitNode.helpers, helper)) { - targetEmitNode.helpers = append(targetEmitNode.helpers, helper); - } - } - else if (helpersRemoved > 0) { - sourceEmitHelpers[i - helpersRemoved] = helper; - } - } - - if (helpersRemoved > 0) { - sourceEmitHelpers.length -= helpersRemoved; - } - } - - export function compareEmitHelpers(x: EmitHelper, y: EmitHelper) { - if (x === y) return Comparison.EqualTo; - if (x.priority === y.priority) return Comparison.EqualTo; - if (x.priority === undefined) return Comparison.GreaterThan; - if (y.priority === undefined) return Comparison.LessThan; - return compareValues(x.priority, y.priority); - } - - export function setTextRange(node: T, location: TextRange): T { - if (location) { - node.pos = location.pos; - node.end = location.end; - } - return node; - } - - export function setNodeFlags(node: T, flags: NodeFlags): T { - node.flags = flags; - return node; - } - - export function setMultiLine(node: T, multiLine: boolean): T { - node.multiLine = multiLine; - return node; - } - - export function setHasTrailingComma(nodes: NodeArray, hasTrailingComma: boolean): NodeArray { - nodes.hasTrailingComma = hasTrailingComma; - return nodes; - } /** * Get the name of that target module from an import or export declaration @@ -3223,10 +3271,18 @@ namespace ts { if (isBindingElement(element)) { if (element.dotDotDotToken) { Debug.assertNode(element.name, isIdentifier); - return setOriginalNode(createSpread(element.name, element), element); + return setOriginalNode(setTextRange(createSpread(element.name), element), element); } const expression = convertToAssignmentElementTarget(element.name); - return element.initializer ? setOriginalNode(createAssignment(expression, element.initializer, element), element) : expression; + return element.initializer + ? setOriginalNode( + setTextRange( + createAssignment(expression, element.initializer), + element + ), + element + ) + : expression; } Debug.assertNode(element, isExpression); return element; @@ -3236,14 +3292,14 @@ namespace ts { if (isBindingElement(element)) { if (element.dotDotDotToken) { Debug.assertNode(element.name, isIdentifier); - return setOriginalNode(createSpreadAssignment(element.name, element), element); + return setOriginalNode(setTextRange(createSpreadAssignment(element.name), element), element); } if (element.propertyName) { const expression = convertToAssignmentElementTarget(element.name); - return setOriginalNode(createPropertyAssignment(element.propertyName, element.initializer ? createAssignment(expression, element.initializer) : expression, element), element); + return setOriginalNode(setTextRange(createPropertyAssignment(element.propertyName, element.initializer ? createAssignment(expression, element.initializer) : expression), element), element); } Debug.assertNode(element.name, isIdentifier); - return setOriginalNode(createShorthandPropertyAssignment(element.name, element.initializer, element), element); + return setOriginalNode(setTextRange(createShorthandPropertyAssignment(element.name, element.initializer), element), element); } Debug.assertNode(element, isObjectLiteralElementLike); return element; @@ -3263,7 +3319,13 @@ namespace ts { export function convertToObjectAssignmentPattern(node: ObjectBindingOrAssignmentPattern) { if (isObjectBindingPattern(node)) { - return setOriginalNode(createObjectLiteral(map(node.elements, convertToObjectAssignmentElement), node), node); + return setOriginalNode( + setTextRange( + createObjectLiteral(map(node.elements, convertToObjectAssignmentElement)), + node + ), + node + ); } Debug.assertNode(node, isObjectLiteralExpression); return node; @@ -3271,7 +3333,13 @@ namespace ts { export function convertToArrayAssignmentPattern(node: ArrayBindingOrAssignmentPattern) { if (isArrayBindingPattern(node)) { - return setOriginalNode(createArrayLiteral(map(node.elements, convertToArrayAssignmentElement), node), node); + return setOriginalNode( + setTextRange( + createArrayLiteral(map(node.elements, convertToArrayAssignmentElement)), + node + ), + node + ); } Debug.assertNode(node, isArrayLiteralExpression); return node; diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 650711afc790a..62f3c06644276 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1152,13 +1152,10 @@ namespace ts { && (options.isolatedModules || isExternalModuleFile) && !file.isDeclarationFile) { // synthesize 'import "tslib"' declaration - const externalHelpersModuleReference = createSynthesizedNode(SyntaxKind.StringLiteral); - externalHelpersModuleReference.text = externalHelpersModuleNameText; - const importDecl = createSynthesizedNode(SyntaxKind.ImportDeclaration); - - importDecl.parent = file; + const externalHelpersModuleReference = createLiteral(externalHelpersModuleNameText); + const importDecl = createImportDeclaration(undefined, undefined, undefined); externalHelpersModuleReference.parent = importDecl; - + importDecl.parent = file; imports = [externalHelpersModuleReference]; } diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts index 8e32259ff0f2d..b4473e6a261e9 100644 --- a/src/compiler/transformers/destructuring.ts +++ b/src/compiler/transformers/destructuring.ts @@ -112,7 +112,10 @@ namespace ts { Debug.assertNode(target, createAssignmentCallback ? isIdentifier : isExpression); const expression = createAssignmentCallback ? createAssignmentCallback(target, value, location) - : createAssignment(visitNode(target, visitor, isExpression), value, location); + : setTextRange( + createAssignment(visitNode(target, visitor, isExpression), value), + location + ); expression.original = original; emitExpression(expression); } @@ -174,9 +177,10 @@ namespace ts { const variable = createVariableDeclaration( name, /*type*/ undefined, - pendingExpressions ? inlineExpressions(append(pendingExpressions, value)) : value, - location); + pendingExpressions ? inlineExpressions(append(pendingExpressions, value)) : value + ); variable.original = original; + setTextRange(variable, location); if (isIdentifier(name)) { setEmitFlags(variable, EmitFlags.NoNestedSourceMaps); } @@ -416,7 +420,7 @@ namespace ts { const temp = createTempVariable(/*recordTempVariable*/ undefined); if (flattenContext.hoistTempVariables) { flattenContext.context.hoistVariableDeclaration(temp); - flattenContext.emitExpression(createAssignment(temp, value, location)); + flattenContext.emitExpression(setTextRange(createAssignment(temp, value), location)); } else { flattenContext.emitBindingOrAssignment(temp, value, location, /*original*/ undefined); @@ -492,6 +496,15 @@ namespace ts { } } } - return createCall(getHelperName("__rest"), undefined, [value, createArrayLiteral(propertyNames, location)]); + return createCall( + getHelperName("__rest"), + undefined, + [ + value, + setTextRange( + createArrayLiteral(propertyNames), + location + ) + ]); } } diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts index 10ebe648fe2ed..6d0c9b3c5fa73 100644 --- a/src/compiler/transformers/es2015.ts +++ b/src/compiler/transformers/es2015.ts @@ -514,7 +514,7 @@ namespace ts { exitSubtree(ancestorFacts, HierarchyFacts.None, HierarchyFacts.None); return updateSourceFileNode( node, - createNodeArray(statements, node.statements) + setTextRange(createNodeArray(statements), node.statements) ); } @@ -671,9 +671,10 @@ namespace ts { setOriginalNode(variable, node); const statements: Statement[] = []; - const statement = createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([variable]), /*location*/ node); + const statement = createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([variable])); setOriginalNode(statement, node); + setTextRange(statement, node); startOnNewLine(statement); statements.push(statement); @@ -818,7 +819,7 @@ namespace ts { addRange(statements, endLexicalEnvironment()); - const block = createBlock(createNodeArray(statements, /*location*/ node.members), /*location*/ undefined, /*multiLine*/ true); + const block = createBlock(setTextRange(createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true); setEmitFlags(block, EmitFlags.NoComments); return block; } @@ -833,8 +834,10 @@ namespace ts { function addExtendsHelperIfNeeded(statements: Statement[], node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): void { if (extendsClauseElement) { statements.push( - createStatement( - createExtendsHelper(context, getLocalName(node)), + setTextRange( + createStatement( + createExtendsHelper(context, getLocalName(node)) + ), /*location*/ extendsClauseElement ) ); @@ -854,19 +857,18 @@ namespace ts { const ancestorFacts = enterSubtree(HierarchyFacts.ConstructorExcludes, HierarchyFacts.ConstructorIncludes); const constructor = getFirstConstructorWithBody(node); const hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined); - const constructorFunction = - createFunctionDeclaration( - /*decorators*/ undefined, - /*modifiers*/ undefined, - /*asteriskToken*/ undefined, - getDeclarationName(node), - /*typeParameters*/ undefined, - transformConstructorParameters(constructor, hasSynthesizedSuper), - /*type*/ undefined, - transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), - /*location*/ constructor || node - ); + const constructorFunction = createFunctionDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*asteriskToken*/ undefined, + getDeclarationName(node), + /*typeParameters*/ undefined, + transformConstructorParameters(constructor, hasSynthesizedSuper), + /*type*/ undefined, + transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) + ); + setTextRange(constructorFunction, constructor || node); if (extendsClauseElement) { setEmitFlags(constructorFunction, EmitFlags.CapturesThis); } @@ -962,14 +964,16 @@ namespace ts { } const block = createBlock( - createNodeArray( - statements, + setTextRange( + createNodeArray( + statements + ), /*location*/ constructor ? constructor.body.statements : node.members ), - /*location*/ constructor ? constructor.body : node, /*multiLine*/ true ); + setTextRange(block, constructor ? constructor.body : node); if (!constructor) { setEmitFlags(block, EmitFlags.NoComments); } @@ -1139,14 +1143,16 @@ namespace ts { // Binding patterns are converted into a generated name and are // evaluated inside the function body. return setOriginalNode( - createParameter( - /*decorators*/ undefined, - /*modifiers*/ undefined, - /*dotDotDotToken*/ undefined, - getGeneratedNameForNode(node), - /*questionToken*/ undefined, - /*type*/ undefined, - /*initializer*/ undefined, + setTextRange( + createParameter( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, + getGeneratedNameForNode(node), + /*questionToken*/ undefined, + /*type*/ undefined, + /*initializer*/ undefined + ), /*location*/ node ), /*original*/ node @@ -1155,14 +1161,16 @@ namespace ts { else if (node.initializer) { // Initializers are elided return setOriginalNode( - createParameter( - /*decorators*/ undefined, - /*modifiers*/ undefined, - /*dotDotDotToken*/ undefined, - node.name, - /*questionToken*/ undefined, - /*type*/ undefined, - /*initializer*/ undefined, + setTextRange( + createParameter( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, + node.name, + /*questionToken*/ undefined, + /*type*/ undefined, + /*initializer*/ undefined + ), /*location*/ node ), /*original*/ node @@ -1274,21 +1282,25 @@ namespace ts { const statement = createIf( createTypeCheck(getSynthesizedClone(name), "undefined"), setEmitFlags( - createBlock([ - createStatement( - createAssignment( - setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap), - setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer)), - /*location*/ parameter + setTextRange( + createBlock([ + createStatement( + setTextRange( + createAssignment( + setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap), + setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer)) + ), + parameter + ) ) - ) - ], /*location*/ parameter), + ]), + parameter + ), EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps - ), - /*elseStatement*/ undefined, - /*location*/ parameter + ) ); statement.startsOnNewLine = true; + setTextRange(statement, parameter); setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue); statements.push(statement); } @@ -1332,15 +1344,17 @@ namespace ts { // var param = []; statements.push( setEmitFlags( - createVariableStatement( - /*modifiers*/ undefined, - createVariableDeclarationList([ - createVariableDeclaration( - declarationName, - /*type*/ undefined, - createArrayLiteral([]) - ) - ]), + setTextRange( + createVariableStatement( + /*modifiers*/ undefined, + createVariableDeclarationList([ + createVariableDeclaration( + declarationName, + /*type*/ undefined, + createArrayLiteral([]) + ) + ]) + ), /*location*/ parameter ), EmitFlags.CustomPrologue @@ -1351,26 +1365,33 @@ namespace ts { // param[_i - restIndex] = arguments[_i]; // } const forStatement = createFor( - createVariableDeclarationList([ - createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex)) - ], /*location*/ parameter), - createLessThan( - temp, - createPropertyAccess(createIdentifier("arguments"), "length"), - /*location*/ parameter + setTextRange( + createVariableDeclarationList([ + createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex)) + ]), + parameter + ), + setTextRange( + createLessThan( + temp, + createPropertyAccess(createIdentifier("arguments"), "length") + ), + parameter ), - createPostfixIncrement(temp, /*location*/ parameter), + setTextRange(createPostfixIncrement(temp), parameter), createBlock([ startOnNewLine( - createStatement( - createAssignment( - createElementAccess( - expressionName, - restIndex === 0 - ? temp - : createSubtract(temp, createLiteral(restIndex)) - ), - createElementAccess(createIdentifier("arguments"), temp) + setTextRange( + createStatement( + createAssignment( + createElementAccess( + expressionName, + restIndex === 0 + ? temp + : createSubtract(temp, createLiteral(restIndex)) + ), + createElementAccess(createIdentifier("arguments"), temp) + ) ), /*location*/ parameter ) @@ -1405,11 +1426,10 @@ namespace ts { /*type*/ undefined, initializer ) - ]), - originalStatement + ]) ); - setEmitFlags(captureThisStatement, EmitFlags.NoComments | EmitFlags.CustomPrologue); + setTextRange(captureThisStatement, originalStatement); setSourceMapRange(captureThisStatement, node); statements.push(captureThisStatement); } @@ -1529,7 +1549,7 @@ namespace ts { * @param member The SemicolonClassElement node. */ function transformSemicolonClassElementToStatement(member: SemicolonClassElement) { - return createEmptyStatement(/*location*/ member); + return setTextRange(createEmptyStatement(), member); } /** @@ -1547,8 +1567,10 @@ namespace ts { setEmitFlags(memberFunction, EmitFlags.NoComments); setSourceMapRange(memberFunction, sourceMapRange); - const statement = createStatement( - createAssignment(memberName, memberFunction), + const statement = setTextRange( + createStatement( + createAssignment(memberName, memberFunction) + ), /*location*/ member ); @@ -1571,15 +1593,12 @@ namespace ts { * @param accessors The set of related get/set accessors. */ function transformAccessorsToStatement(receiver: LeftHandSideExpression, accessors: AllAccessorDeclarations, container: Node): Statement { - const statement = createStatement( - transformAccessorsToExpression(receiver, accessors, container, /*startsOnNewLine*/ false), - /*location*/ getSourceMapRange(accessors.firstAccessor) - ); - + const statement = createStatement(transformAccessorsToExpression(receiver, accessors, container, /*startsOnNewLine*/ false)); // The location for the statement is used to emit source maps only. // No comments should be emitted for this statement to align with the // old emitter. setEmitFlags(statement, EmitFlags.NoComments); + setSourceMapRange(statement, getSourceMapRange(accessors.firstAccessor)); return statement; } @@ -1622,8 +1641,8 @@ namespace ts { } properties.push( - createPropertyAssignment("enumerable", createLiteral(true)), - createPropertyAssignment("configurable", createLiteral(true)) + createPropertyAssignment("enumerable", createTrue()), + createPropertyAssignment("configurable", createTrue()) ); const call = createCall( @@ -1632,7 +1651,7 @@ namespace ts { [ target, propertyName, - createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true) + createObjectLiteral(properties, /*multiLine*/ true) ] ); if (startsOnNewLine) { @@ -1662,9 +1681,9 @@ namespace ts { /*typeParameters*/ undefined, visitParameterList(node.parameters, visitor, context), /*type*/ undefined, - transformFunctionBody(node), - node + transformFunctionBody(node) ); + setTextRange(func, node); setOriginalNode(func, node); setEmitFlags(func, EmitFlags.CapturesThis); exitSubtree(ancestorFacts, HierarchyFacts.None, HierarchyFacts.None); @@ -1758,14 +1777,16 @@ namespace ts { exitSubtree(ancestorFacts, HierarchyFacts.PropagateNewTargetMask, HierarchyFacts.None); convertedLoopState = savedConvertedLoopState; return setOriginalNode( - createFunctionExpression( - /*modifiers*/ undefined, - node.asteriskToken, - name, - /*typeParameters*/ undefined, - parameters, - /*type*/ undefined, - body, + setTextRange( + createFunctionExpression( + /*modifiers*/ undefined, + node.asteriskToken, + name, + /*typeParameters*/ undefined, + parameters, + /*type*/ undefined, + body + ), location ), /*original*/ node @@ -1832,7 +1853,8 @@ namespace ts { } const expression = visitNode(body, visitor, isExpression); - const returnStatement = createReturn(expression, /*location*/ body); + const returnStatement = createReturn(expression); + setTextRange(returnStatement, body); setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments); statements.push(returnStatement); @@ -1851,7 +1873,8 @@ namespace ts { multiLine = true; } - const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine); + const block = createBlock(setTextRange(createNodeArray(statements), statementsLocation), multiLine); + setTextRange(block, node.body); if (!multiLine && singleLine) { setEmitFlags(block, EmitFlags.SingleLine); } @@ -1868,8 +1891,10 @@ namespace ts { const updated = visitFunctionBody(node.body, functionBodyVisitor, context); return updateBlock( updated, - createNodeArray( - prependCaptureNewTargetIfNeeded(updated.statements, node, /*copyOnWrite*/ true), + setTextRange( + createNodeArray( + prependCaptureNewTargetIfNeeded(updated.statements, node, /*copyOnWrite*/ true) + ), /*location*/ updated.statements ) ); @@ -1969,7 +1994,7 @@ namespace ts { } } if (assignments) { - updated = createStatement(reduceLeft(assignments, (acc, v) => createBinary(v, SyntaxKind.CommaToken, acc)), node); + updated = setTextRange(createStatement(reduceLeft(assignments, (acc, v) => createBinary(v, SyntaxKind.CommaToken, acc))), node); } else { // none of declarations has initializer - the entire variable statement can be deleted @@ -1999,8 +2024,9 @@ namespace ts { ? visitVariableDeclarationInLetDeclarationList : visitVariableDeclaration)); - const declarationList = createVariableDeclarationList(declarations, /*location*/ node); + const declarationList = createVariableDeclarationList(declarations); setOriginalNode(declarationList, node); + setTextRange(declarationList, node); setCommentRange(declarationList, node); if (node.transformFlags & TransformFlags.ContainsBindingPattern @@ -2248,8 +2274,9 @@ namespace ts { elementAccess ); - const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer); + const declarationList = createVariableDeclarationList(declarations); setOriginalNode(declarationList, initializer); + setTextRange(declarationList, initializer); // Adjust the source map range for the first declaration to align with the old // emitter. @@ -2268,19 +2295,24 @@ namespace ts { // The following call does not include the initializer, so we have // to emit it separately. statements.push( - createVariableStatement( - /*modifiers*/ undefined, - setOriginalNode( - createVariableDeclarationList([ - createVariableDeclaration( - firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined), - /*type*/ undefined, - createElementAccess(rhsReference, counter) - ) - ], /*location*/ moveRangePos(initializer, -1)), - initializer + setTextRange( + createVariableStatement( + /*modifiers*/ undefined, + setOriginalNode( + setTextRange( + createVariableDeclarationList([ + createVariableDeclaration( + firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined), + /*type*/ undefined, + createElementAccess(rhsReference, counter) + ) + ]), + moveRangePos(initializer, -1) + ), + initializer + ) ), - /*location*/ moveRangeEnd(initializer, -1) + moveRangeEnd(initializer, -1) ) ); } @@ -2306,7 +2338,7 @@ namespace ts { // Currently there is not way to check that assignment is binary expression of destructing assignment // so we have to cast never type to binaryExpression (assignment).end = initializer.end; - statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1))); + statements.push(setTextRange(createStatement(assignment), moveRangeEnd(initializer, -1))); } } @@ -2332,33 +2364,38 @@ namespace ts { // The old emitter does not emit source maps for the block. // We add the location to preserve comments. - const body = createBlock( - createNodeArray(statements, /*location*/ statementsLocation), - /*location*/ bodyLocation - ); - + const body = createBlock(setTextRange(createNodeArray(statements), /*location*/ statementsLocation)); + setTextRange(body, bodyLocation); setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps); const forStatement = createFor( setEmitFlags( - createVariableDeclarationList([ - createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)), - createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression) - ], /*location*/ node.expression), + setTextRange( + createVariableDeclarationList([ + setTextRange(createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0)), moveRangePos(node.expression, -1)), + setTextRange(createVariableDeclaration(rhsReference, /*type*/ undefined, expression), node.expression) + ]), + node.expression + ), EmitFlags.NoHoisting ), - createLessThan( - counter, - createPropertyAccess(rhsReference, "length"), - /*location*/ node.expression + setTextRange( + createLessThan( + counter, + createPropertyAccess(rhsReference, "length") + ), + node.expression ), - createPostfixIncrement(counter, /*location*/ node.expression), - body, - /*location*/ node + setTextRange( + createPostfixIncrement(counter), + node.expression + ), + body ); // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter. setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps); + setTextRange(forStatement, node); return restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel); } @@ -2418,7 +2455,6 @@ namespace ts { setEmitFlags( createObjectLiteral( visitNodes(properties, visitor, isObjectLiteralElementLike, 0, numInitialProperties), - /*location*/ undefined, node.multiLine ), EmitFlags.Indented @@ -2546,14 +2582,14 @@ namespace ts { copyOutParameters(loopOutParameters, CopyDirection.ToOutParameter, statements); } addRange(statements, lexicalEnvironment) - loopBody = createBlock(statements, /*location*/ undefined, /*multiline*/ true); + loopBody = createBlock(statements, /*multiline*/ true); } if (isBlock(loopBody)) { loopBody.multiLine = true; } else { - loopBody = createBlock([loopBody], /*location*/ undefined, /*multiline*/ true); + loopBody = createBlock([loopBody], /*multiline*/ true); } const isAsyncBlockContainingAwait = @@ -2687,12 +2723,7 @@ namespace ts { // visit childnodes to transform initializer/condition/incrementor parts clone = visitEachChild(clone, visitor, context); // set loop statement - clone.statement = createBlock( - convertedLoopBodyStatements, - /*location*/ undefined, - /*multiline*/ true - ); - + clone.statement = createBlock(convertedLoopBodyStatements, /*multiline*/ true); // reset and re-aggregate the transform flags clone.transformFlags = 0; aggregateTransformFlags(clone); @@ -2903,9 +2934,9 @@ namespace ts { receiver, visitNode(property.name, visitor, isPropertyName) ), - visitNode(property.initializer, visitor, isExpression), - /*location*/ property + visitNode(property.initializer, visitor, isExpression) ); + setTextRange(expression, property); if (startsOnNewLine) { expression.startsOnNewLine = true; } @@ -2925,9 +2956,9 @@ namespace ts { receiver, visitNode(property.name, visitor, isPropertyName) ), - getSynthesizedClone(property.name), - /*location*/ property + getSynthesizedClone(property.name) ); + setTextRange(expression, property); if (startsOnNewLine) { expression.startsOnNewLine = true; } @@ -2948,9 +2979,9 @@ namespace ts { receiver, visitNode(method.name, visitor, isPropertyName) ), - transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container), - /*location*/ method + transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container) ); + setTextRange(expression, method); if (startsOnNewLine) { expression.startsOnNewLine = true; } @@ -2963,7 +2994,8 @@ namespace ts { let updated: CatchClause; if (isBindingPattern(node.variableDeclaration.name)) { const temp = createTempVariable(undefined); - const newVariableDeclaration = createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration); + const newVariableDeclaration = createVariableDeclaration(temp); + setTextRange(newVariableDeclaration, node.variableDeclaration); const vars = flattenDestructuringBinding( node.variableDeclaration, visitor, @@ -2971,8 +3003,9 @@ namespace ts { FlattenLevel.All, temp ); - const list = createVariableDeclarationList(vars, /*location*/node.variableDeclaration, /*flags*/node.variableDeclaration.flags); - const destructure = createVariableStatement(undefined, list); + const list = createVariableDeclarationList(vars); + setTextRange(list, node.variableDeclaration); + const destructure = createVariableStatement(/*modifiers*/ undefined, list); updated = updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure)); } else { @@ -3001,9 +3034,11 @@ namespace ts { Debug.assert(!isComputedPropertyName(node.name)); const functionExpression = transformFunctionLikeToExpression(node, /*location*/ moveRangePos(node, -1), /*name*/ undefined, /*container*/ undefined); setEmitFlags(functionExpression, EmitFlags.NoLeadingComments | getEmitFlags(functionExpression)); - return createPropertyAssignment( - node.name, - functionExpression, + return setTextRange( + createPropertyAssignment( + node.name, + functionExpression + ), /*location*/ node ); } @@ -3030,9 +3065,11 @@ namespace ts { * @param node A ShorthandPropertyAssignment node. */ function visitShorthandPropertyAssignment(node: ShorthandPropertyAssignment): ObjectLiteralElementLike { - return createPropertyAssignment( - node.name, - getSynthesizedClone(node.name), + return setTextRange( + createPropertyAssignment( + node.name, + getSynthesizedClone(node.name) + ), /*location*/ node ); } @@ -3225,8 +3262,7 @@ namespace ts { function visitSpanOfNonSpreads(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult { return createArrayLiteral( - visitNodes(createNodeArray(chunk, /*location*/ undefined, hasTrailingComma), visitor, isExpression), - /*location*/ undefined, + visitNodes(createNodeArray(chunk, hasTrailingComma), visitor, isExpression), multiLine ); } @@ -3250,7 +3286,7 @@ namespace ts { * @param node A template literal. */ function visitTemplateLiteral(node: LiteralExpression): LeftHandSideExpression { - return createLiteral(node.text, /*location*/ node); + return setTextRange(createLiteral(node.text), node); } /** @@ -3318,7 +3354,7 @@ namespace ts { // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's // and LineTerminatorSequences are normalized to for both TV and TRV. text = text.replace(/\r\n?/g, "\n"); - return createLiteral(text, /*location*/ node); + return setTextRange(createLiteral(text), node); } /** @@ -3342,7 +3378,8 @@ namespace ts { // "abc" + (1 << 2) + "" const expression = reduceLeft(expressions, createAdd); if (nodeIsSynthesized(expression)) { - setTextRange(expression, node); + expression.pos = node.pos; + expression.end = node.end; } return expression; @@ -3580,7 +3617,7 @@ namespace ts { function substituteThisKeyword(node: PrimaryExpression): PrimaryExpression { if (enabledSubstitutions & ES2015SubstitutionFlags.CapturedThis && hierarchyFacts & HierarchyFacts.CapturesThis) { - return createIdentifier("_this", /*location*/ node); + return setTextRange(createIdentifier("_this"), node); } return node; } diff --git a/src/compiler/transformers/es2016.ts b/src/compiler/transformers/es2016.ts index 5959753fcef96..1118e6ad9b672 100644 --- a/src/compiler/transformers/es2016.ts +++ b/src/compiler/transformers/es2016.ts @@ -48,29 +48,37 @@ namespace ts { // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)` const expressionTemp = createTempVariable(hoistVariableDeclaration); const argumentExpressionTemp = createTempVariable(hoistVariableDeclaration); - target = createElementAccess( - createAssignment(expressionTemp, left.expression, /*location*/ left.expression), - createAssignment(argumentExpressionTemp, left.argumentExpression, /*location*/ left.argumentExpression), - /*location*/ left + target = setTextRange( + createElementAccess( + setTextRange(createAssignment(expressionTemp, left.expression), left.expression), + setTextRange(createAssignment(argumentExpressionTemp, left.argumentExpression), left.argumentExpression) + ), + left ); - value = createElementAccess( - expressionTemp, - argumentExpressionTemp, - /*location*/ left + value = setTextRange( + createElementAccess( + expressionTemp, + argumentExpressionTemp + ), + left ); } else if (isPropertyAccessExpression(left)) { // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)` const expressionTemp = createTempVariable(hoistVariableDeclaration); - target = createPropertyAccess( - createAssignment(expressionTemp, left.expression, /*location*/ left.expression), - left.name, - /*location*/ left + target = setTextRange( + createPropertyAccess( + setTextRange(createAssignment(expressionTemp, left.expression), left.expression), + left.name + ), + left ); - value = createPropertyAccess( - expressionTemp, - left.name, - /*location*/ left + value = setTextRange( + createPropertyAccess( + expressionTemp, + left.name + ), + left ); } else { @@ -78,7 +86,13 @@ namespace ts { target = left; value = left; } - return createAssignment(target, createMathPow(value, right, /*location*/ node), /*location*/ node); + return setTextRange( + createAssignment( + target, + createMathPow(value, right, /*location*/ node) + ), + node + ); } function visitExponentiationExpression(node: BinaryExpression) { diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts index a7f7b0da0ea64..b437298656c5d 100644 --- a/src/compiler/transformers/es2017.ts +++ b/src/compiler/transformers/es2017.ts @@ -104,10 +104,12 @@ namespace ts { */ function visitAwaitExpression(node: AwaitExpression): Expression { return setOriginalNode( - createYield( - /*asteriskToken*/ undefined, - visitNode(node.expression, visitor, isExpression), - /*location*/ node + setTextRange( + createYield( + /*asteriskToken*/ undefined, + visitNode(node.expression, visitor, isExpression) + ), + node ), node ); @@ -238,7 +240,8 @@ namespace ts { addRange(statements, endLexicalEnvironment()); - const block = createBlock(statements, /*location*/ node.body, /*multiLine*/ true); + const block = createBlock(statements, /*multiLine*/ true); + setTextRange(block, node.body); // Minor optimization, emit `_super` helper to capture `super` access in an arrow. // This step isn't needed if we eventually transform this to ES5. @@ -266,7 +269,7 @@ namespace ts { const declarations = endLexicalEnvironment(); if (some(declarations)) { const block = convertToFunctionBody(expression); - return updateBlock(block, createNodeArray(concatenate(block.statements, declarations), block.statements)); + return updateBlock(block, setTextRange(createNodeArray(concatenate(block.statements, declarations)), block.statements)); } return expression; @@ -281,7 +284,7 @@ namespace ts { startLexicalEnvironment(); const visited = convertToFunctionBody(visitNode(body, visitor, isConciseBody)); const declarations = endLexicalEnvironment(); - return updateBlock(visited, createNodeArray(concatenate(visited.statements, declarations), visited.statements)); + return updateBlock(visited, setTextRange(createNodeArray(concatenate(visited.statements, declarations)), visited.statements)); } } @@ -431,21 +434,25 @@ namespace ts { function createSuperAccessInAsyncMethod(argumentExpression: Expression, flags: NodeCheckFlags, location: TextRange): LeftHandSideExpression { if (flags & NodeCheckFlags.AsyncMethodWithSuperBinding) { - return createPropertyAccess( - createCall( - createIdentifier("_super"), - /*typeArguments*/ undefined, - [argumentExpression] + return setTextRange( + createPropertyAccess( + createCall( + createIdentifier("_super"), + /*typeArguments*/ undefined, + [argumentExpression] + ), + "value" ), - "value", location ); } else { - return createCall( - createIdentifier("_super"), - /*typeArguments*/ undefined, - [argumentExpression], + return setTextRange( + createCall( + createIdentifier("_super"), + /*typeArguments*/ undefined, + [argumentExpression] + ), location ); } diff --git a/src/compiler/transformers/es5.ts b/src/compiler/transformers/es5.ts index 8b030642a89c6..bcecb86e75d87 100644 --- a/src/compiler/transformers/es5.ts +++ b/src/compiler/transformers/es5.ts @@ -87,7 +87,7 @@ namespace ts { function substitutePropertyAccessExpression(node: PropertyAccessExpression): Expression { const literalName = trySubstituteReservedName(node.name); if (literalName) { - return createElementAccess(node.expression, literalName, /*location*/ node); + return setTextRange(createElementAccess(node.expression, literalName), node); } return node; } @@ -113,7 +113,7 @@ namespace ts { function trySubstituteReservedName(name: Identifier) { const token = name.originalKeywordKind || (nodeIsSynthesized(name) ? stringToToken(name.text) : undefined); if (token >= SyntaxKind.FirstReservedWord && token <= SyntaxKind.LastReservedWord) { - return createLiteral(name, /*location*/ name); + return setTextRange(createLiteral(name), name); } return undefined; } diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index 8b5a095a17ea5..f058e627df701 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -210,36 +210,40 @@ namespace ts { const statement = createVariableStatement( /*modifiers*/ undefined, updateVariableDeclarationList(initializer, declarations), - /*location*/ initializer ); + setTextRange(statement, initializer); leadingStatements = append(leadingStatements, statement); } } else if (isAssignmentPattern(initializer)) { temp = createTempVariable(/*recordTempVariable*/ undefined); const expression = flattenDestructuringAssignment( - aggregateTransformFlags(createAssignment(initializer, temp, /*location*/ node.initializer)), + aggregateTransformFlags( + setTextRange( + createAssignment(initializer, temp), + node.initializer + ) + ), visitor, context, FlattenLevel.ObjectRest ); - leadingStatements = append(leadingStatements, createStatement(expression, /*location*/ node.initializer)); + leadingStatements = append(leadingStatements, setTextRange(createStatement(expression), node.initializer)); } } if (temp) { const expression = visitNode(node.expression, visitor, isExpression); const statement = visitNode(node.statement, visitor, isStatement); const block = isBlock(statement) - ? updateBlock(statement, createNodeArray(concatenate(leadingStatements, statement.statements), statement.statements)) - : createBlock(append(leadingStatements, statement), statement, /*multiLine*/ true); + ? updateBlock(statement, setTextRange(createNodeArray(concatenate(leadingStatements, statement.statements)), statement.statements)) + : setTextRange(createBlock(append(leadingStatements, statement), /*multiLine*/ true), statement); return updateForOf( node, - createVariableDeclarationList( - [ - createVariableDeclaration(temp, /*type*/ undefined, /*initializer*/ undefined, node.initializer) - ], - node.initializer, - NodeFlags.Let + setTextRange( + createVariableDeclarationList([ + setTextRange(createVariableDeclaration(temp), node.initializer) + ], NodeFlags.Let), + node.initializer ), expression, block @@ -380,7 +384,7 @@ namespace ts { const trailingStatements = endLexicalEnvironment(); if (some(leadingStatements) || some(trailingStatements)) { const block = convertToFunctionBody(body, /*multiLine*/ true); - return updateBlock(block, createNodeArray(concatenate(concatenate(leadingStatements, block.statements), trailingStatements), block.statements)); + return updateBlock(block, setTextRange(createNodeArray(concatenate(concatenate(leadingStatements, block.statements), trailingStatements)), block.statements)); } return body; } diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts index ee17bdacbaf5b..cabd5d2a96d01 100644 --- a/src/compiler/transformers/generators.ts +++ b/src/compiler/transformers/generators.ts @@ -450,15 +450,17 @@ namespace ts { // Currently, we only support generators that were originally async functions. if (node.asteriskToken && getEmitFlags(node) & EmitFlags.AsyncFunctionBody) { node = setOriginalNode( - createFunctionDeclaration( - /*decorators*/ undefined, - node.modifiers, - /*asteriskToken*/ undefined, - node.name, - /*typeParameters*/ undefined, - visitParameterList(node.parameters, visitor, context), - /*type*/ undefined, - transformGeneratorFunctionBody(node.body), + setTextRange( + createFunctionDeclaration( + /*decorators*/ undefined, + node.modifiers, + /*asteriskToken*/ undefined, + node.name, + /*typeParameters*/ undefined, + visitParameterList(node.parameters, visitor, context), + /*type*/ undefined, + transformGeneratorFunctionBody(node.body) + ), /*location*/ node ), node @@ -498,14 +500,16 @@ namespace ts { // Currently, we only support generators that were originally async functions. if (node.asteriskToken && getEmitFlags(node) & EmitFlags.AsyncFunctionBody) { node = setOriginalNode( - createFunctionExpression( - /*modifiers*/ undefined, - /*asteriskToken*/ undefined, - node.name, - /*typeParameters*/ undefined, - visitParameterList(node.parameters, visitor, context), - /*type*/ undefined, - transformGeneratorFunctionBody(node.body), + setTextRange( + createFunctionExpression( + /*modifiers*/ undefined, + /*asteriskToken*/ undefined, + node.name, + /*typeParameters*/ undefined, + visitParameterList(node.parameters, visitor, context), + /*type*/ undefined, + transformGeneratorFunctionBody(node.body) + ), /*location*/ node ), node @@ -606,7 +610,7 @@ namespace ts { operationLocations = savedOperationLocations; state = savedState; - return createBlock(statements, /*location*/ body, body.multiLine); + return setTextRange(createBlock(statements, body.multiLine), body); } /** @@ -739,14 +743,17 @@ namespace ts { const operator = node.operatorToken.kind; if (isCompoundAssignment(operator)) { - return createBinary( - target, - SyntaxKind.EqualsToken, - createBinary( - cacheExpression(target), - getOperatorForCompoundAssignment(operator), - visitNode(right, visitor, isExpression), - node + return setTextRange( + createAssignment( + target, + setTextRange( + createBinary( + cacheExpression(target), + getOperatorForCompoundAssignment(operator), + visitNode(right, visitor, isExpression) + ), + node + ) ), node ); @@ -988,8 +995,11 @@ namespace ts { const expressions = reduceLeft(elements, reduceElement, [], numInitialElements); return hasAssignedTemp - ? createArrayConcat(temp, [createArrayLiteral(expressions, /*location*/ undefined, multiLine)]) - : createArrayLiteral(leadingElement ? [leadingElement, ...expressions] : expressions, location, multiLine); + ? createArrayConcat(temp, [createArrayLiteral(expressions, multiLine)]) + : setTextRange( + createArrayLiteral(leadingElement ? [leadingElement, ...expressions] : expressions, multiLine), + location + ); function reduceElement(expressions: Expression[], element: Expression) { if (containsYield(element) && expressions.length > 0) { @@ -998,11 +1008,10 @@ namespace ts { hasAssignedTemp ? createArrayConcat( temp, - [createArrayLiteral(expressions, /*location*/ undefined, multiLine)] + [createArrayLiteral(expressions, multiLine)] ) : createArrayLiteral( leadingElement ? [leadingElement, ...expressions] : expressions, - /*location*/ undefined, multiLine ) ); @@ -1043,7 +1052,6 @@ namespace ts { emitAssignment(temp, createObjectLiteral( visitNodes(properties, visitor, isObjectLiteralElementLike, 0, numInitialProperties), - /*location*/ undefined, multiLine ) ); @@ -1139,18 +1147,20 @@ namespace ts { const { target, thisArg } = createCallBinding(createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration); return setOriginalNode( - createNew( - createFunctionApply( - cacheExpression(visitNode(target, visitor, isExpression)), - thisArg, - visitElements( - node.arguments, - /*leadingElement*/ createVoidZero() - ) + setTextRange( + createNew( + createFunctionApply( + cacheExpression(visitNode(target, visitor, isExpression)), + thisArg, + visitElements( + node.arguments, + /*leadingElement*/ createVoidZero() + ) + ), + /*typeArguments*/ undefined, + [] ), - /*typeArguments*/ undefined, - [], - /*location*/ node + node ), node ); @@ -1423,9 +1433,11 @@ namespace ts { } else { emitStatement( - createStatement( - visitNode(initializer, visitor, isExpression), - /*location*/ initializer + setTextRange( + createStatement( + visitNode(initializer, visitor, isExpression) + ), + initializer ) ); } @@ -1441,9 +1453,11 @@ namespace ts { markLabel(incrementLabel); if (node.incrementor) { emitStatement( - createStatement( - visitNode(node.incrementor, visitor, isExpression), - /*location*/ node.incrementor + setTextRange( + createStatement( + visitNode(node.incrementor, visitor, isExpression) + ), + node.incrementor ) ); } @@ -2417,11 +2431,13 @@ namespace ts { */ function createInlineBreak(label: Label, location?: TextRange): ReturnStatement { Debug.assert(label > 0, `Invalid label: ${label}`); - return createReturn( - createArrayLiteral([ - createInstruction(Instruction.Break), - createLabel(label) - ]), + return setTextRange( + createReturn( + createArrayLiteral([ + createInstruction(Instruction.Break), + createLabel(label) + ]) + ), location ); } @@ -2433,10 +2449,12 @@ namespace ts { * @param location An optional source map location for the statement. */ function createInlineReturn(expression?: Expression, location?: TextRange): ReturnStatement { - return createReturn( - createArrayLiteral(expression - ? [createInstruction(Instruction.Return), expression] - : [createInstruction(Instruction.Return)] + return setTextRange( + createReturn( + createArrayLiteral(expression + ? [createInstruction(Instruction.Return), expression] + : [createInstruction(Instruction.Return)] + ) ), location ); @@ -2446,7 +2464,14 @@ namespace ts { * Creates an expression that can be used to resume from a Yield operation. */ function createGeneratorResume(location?: TextRange): LeftHandSideExpression { - return createCall(createPropertyAccess(state, "sent"), /*typeArguments*/ undefined, [], location); + return setTextRange( + createCall( + createPropertyAccess(state, "sent"), + /*typeArguments*/ undefined, + [] + ), + location + ); } /** @@ -2614,7 +2639,6 @@ namespace ts { /*type*/ undefined, createBlock( buildResult, - /*location*/ undefined, /*multiLine*/ buildResult.length > 0 ) ), @@ -2944,7 +2968,7 @@ namespace ts { * @param operationLocation The source map location for the operation. */ function writeAssign(left: Expression, right: Expression, operationLocation: TextRange): void { - writeStatement(createStatement(createAssignment(left, right), operationLocation)); + writeStatement(setTextRange(createStatement(createAssignment(left, right)), operationLocation)); } /** @@ -2956,7 +2980,7 @@ namespace ts { function writeThrow(expression: Expression, operationLocation: TextRange): void { lastOperationWasAbrupt = true; lastOperationWasCompletion = true; - writeStatement(createThrow(expression, operationLocation)); + writeStatement(setTextRange(createThrow(expression), operationLocation)); } /** @@ -2970,10 +2994,12 @@ namespace ts { lastOperationWasCompletion = true; writeStatement( setEmitFlags( - createReturn( - createArrayLiteral(expression - ? [createInstruction(Instruction.Return), expression] - : [createInstruction(Instruction.Return)] + setTextRange( + createReturn( + createArrayLiteral(expression + ? [createInstruction(Instruction.Return), expression] + : [createInstruction(Instruction.Return)] + ) ), operationLocation ), @@ -2992,11 +3018,13 @@ namespace ts { lastOperationWasAbrupt = true; writeStatement( setEmitFlags( - createReturn( - createArrayLiteral([ - createInstruction(Instruction.Break), - createLabel(label) - ]), + setTextRange( + createReturn( + createArrayLiteral([ + createInstruction(Instruction.Break), + createLabel(label) + ]) + ), operationLocation ), EmitFlags.NoTokenSourceMaps @@ -3017,11 +3045,13 @@ namespace ts { createIf( condition, setEmitFlags( - createReturn( - createArrayLiteral([ - createInstruction(Instruction.Break), - createLabel(label) - ]), + setTextRange( + createReturn( + createArrayLiteral([ + createInstruction(Instruction.Break), + createLabel(label) + ]) + ), operationLocation ), EmitFlags.NoTokenSourceMaps @@ -3045,11 +3075,13 @@ namespace ts { createIf( createLogicalNot(condition), setEmitFlags( - createReturn( - createArrayLiteral([ - createInstruction(Instruction.Break), - createLabel(label) - ]), + setTextRange( + createReturn( + createArrayLiteral([ + createInstruction(Instruction.Break), + createLabel(label) + ]) + ), operationLocation ), EmitFlags.NoTokenSourceMaps @@ -3070,11 +3102,13 @@ namespace ts { lastOperationWasAbrupt = true; writeStatement( setEmitFlags( - createReturn( - createArrayLiteral( - expression - ? [createInstruction(Instruction.Yield), expression] - : [createInstruction(Instruction.Yield)] + setTextRange( + createReturn( + createArrayLiteral( + expression + ? [createInstruction(Instruction.Yield), expression] + : [createInstruction(Instruction.Yield)] + ) ), operationLocation ), @@ -3093,11 +3127,13 @@ namespace ts { lastOperationWasAbrupt = true; writeStatement( setEmitFlags( - createReturn( - createArrayLiteral([ - createInstruction(Instruction.YieldStar), - expression - ]), + setTextRange( + createReturn( + createArrayLiteral([ + createInstruction(Instruction.YieldStar), + expression + ]) + ), operationLocation ), EmitFlags.NoTokenSourceMaps diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts index 1307a7f8551f9..60053d98e57d6 100644 --- a/src/compiler/transformers/jsx.ts +++ b/src/compiler/transformers/jsx.ts @@ -143,15 +143,15 @@ namespace ts { function transformJsxAttributeInitializer(node: StringLiteral | JsxExpression) { if (node === undefined) { - return createLiteral(true); + return createTrue(); } else if (node.kind === SyntaxKind.StringLiteral) { const decoded = tryDecodeEntities((node).text); - return decoded ? createLiteral(decoded, /*location*/ node) : node; + return decoded ? setTextRange(createLiteral(decoded), node) : node; } else if (node.kind === SyntaxKind.JsxExpression) { if (node.expression === undefined) { - return createLiteral(true); + return createTrue(); } return visitJsxExpression(node); } diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts index 86fa1295f7b7d..cc197073c32e5 100644 --- a/src/compiler/transformers/module/es2015.ts +++ b/src/compiler/transformers/module/es2015.ts @@ -37,7 +37,7 @@ namespace ts { addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset)); return updateSourceFileNode( node, - createNodeArray(statements, node.statements)); + setTextRange(createNodeArray(statements), node.statements)); } else { return visitEachChild(node, visitor, context); diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index e072429292aab..f6e51fa9fddff 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -88,7 +88,7 @@ namespace ts { addRange(statements, endLexicalEnvironment()); addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); - const updated = updateSourceFileNode(node, createNodeArray(statements, node.statements)); + const updated = updateSourceFileNode(node, setTextRange(createNodeArray(statements), node.statements)); if (currentModuleInfo.hasExportStarsToExportValues) { addEmitHelper(updated, exportStarHelper); } @@ -131,47 +131,49 @@ namespace ts { // Create an updated SourceFile: // // define(moduleName?, ["module1", "module2"], function ... - return updateSourceFileNode(node, createNodeArray( - [ - createStatement( - createCall( - define, - /*typeArguments*/ undefined, - [ - // Add the module name (if provided). - ...(moduleName ? [moduleName] : []), - - // Add the dependency array argument: - // - // ["require", "exports", module1", "module2", ...] - createArrayLiteral([ - createLiteral("require"), - createLiteral("exports"), - ...aliasedModuleNames, - ...unaliasedModuleNames - ]), + return updateSourceFileNode(node, + setTextRange( + createNodeArray([ + createStatement( + createCall( + define, + /*typeArguments*/ undefined, + [ + // Add the module name (if provided). + ...(moduleName ? [moduleName] : []), - // Add the module body function argument: - // - // function (require, exports, module1, module2) ... - createFunctionExpression( - /*modifiers*/ undefined, - /*asteriskToken*/ undefined, - /*name*/ undefined, - /*typeParameters*/ undefined, - [ - createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"), - createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports"), - ...importAliasNames - ], - /*type*/ undefined, - transformAsynchronousModuleBody(node) - ) - ] + // Add the dependency array argument: + // + // ["require", "exports", module1", "module2", ...] + createArrayLiteral([ + createLiteral("require"), + createLiteral("exports"), + ...aliasedModuleNames, + ...unaliasedModuleNames + ]), + + // Add the module body function argument: + // + // function (require, exports, module1, module2) ... + createFunctionExpression( + /*modifiers*/ undefined, + /*asteriskToken*/ undefined, + /*name*/ undefined, + /*typeParameters*/ undefined, + [ + createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"), + createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports"), + ...importAliasNames + ], + /*type*/ undefined, + transformAsynchronousModuleBody(node) + ) + ] + ) ) - ) - ], - /*location*/ node.statements) + ]), + /*location*/ node.statements + ) ); } @@ -189,74 +191,76 @@ namespace ts { /*typeParameters*/ undefined, [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "factory")], /*type*/ undefined, - createBlock( - [ - createIf( - createLogicalAnd( - createTypeCheck(createIdentifier("module"), "object"), - createTypeCheck(createPropertyAccess(createIdentifier("module"), "exports"), "object") - ), - createBlock([ - createVariableStatement( - /*modifiers*/ undefined, - [ - createVariableDeclaration( - "v", - /*type*/ undefined, + setTextRange( + createBlock( + [ + createIf( + createLogicalAnd( + createTypeCheck(createIdentifier("module"), "object"), + createTypeCheck(createPropertyAccess(createIdentifier("module"), "exports"), "object") + ), + createBlock([ + createVariableStatement( + /*modifiers*/ undefined, + [ + createVariableDeclaration( + "v", + /*type*/ undefined, + createCall( + createIdentifier("factory"), + /*typeArguments*/ undefined, + [ + createIdentifier("require"), + createIdentifier("exports") + ] + ) + ) + ] + ), + setEmitFlags( + createIf( + createStrictInequality( + createIdentifier("v"), + createIdentifier("undefined") + ), + createStatement( + createAssignment( + createPropertyAccess(createIdentifier("module"), "exports"), + createIdentifier("v") + ) + ) + ), + EmitFlags.SingleLine + ) + ]), + createIf( + createLogicalAnd( + createTypeCheck(createIdentifier("define"), "function"), + createPropertyAccess(createIdentifier("define"), "amd") + ), + createBlock([ + createStatement( createCall( - createIdentifier("factory"), + createIdentifier("define"), /*typeArguments*/ undefined, [ - createIdentifier("require"), - createIdentifier("exports") + createArrayLiteral([ + createLiteral("require"), + createLiteral("exports"), + ...aliasedModuleNames, + ...unaliasedModuleNames + ]), + createIdentifier("factory") ] ) ) - ] - ), - setEmitFlags( - createIf( - createStrictInequality( - createIdentifier("v"), - createIdentifier("undefined") - ), - createStatement( - createAssignment( - createPropertyAccess(createIdentifier("module"), "exports"), - createIdentifier("v") - ) - ) - ), - EmitFlags.SingleLine + ]) ) - ]), - createIf( - createLogicalAnd( - createTypeCheck(createIdentifier("define"), "function"), - createPropertyAccess(createIdentifier("define"), "amd") - ), - createBlock([ - createStatement( - createCall( - createIdentifier("define"), - /*typeArguments*/ undefined, - [ - createArrayLiteral([ - createLiteral("require"), - createLiteral("exports"), - ...aliasedModuleNames, - ...unaliasedModuleNames - ]), - createIdentifier("factory") - ] - ) - ) - ]) ) - ) - ], - /*location*/ undefined, - /*multiLine*/ true + ], + /*multiLine*/ true + ), + /*location*/ undefined ) ); @@ -274,8 +278,8 @@ namespace ts { return updateSourceFileNode( node, - createNodeArray( - [ + setTextRange( + createNodeArray([ createStatement( createCall( umdHeader, @@ -300,7 +304,7 @@ namespace ts { ] ) ) - ], + ]), /*location*/ node.statements ) ); @@ -378,7 +382,7 @@ namespace ts { // Append the 'export =' statement if provided. addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true); - const body = createBlock(statements, /*location*/ undefined, /*multiLine*/ true); + const body = createBlock(statements, /*multiLine*/ true); if (currentModuleInfo.hasExportStarsToExportValues) { // If we have any `export * from ...` declarations // we need to inform the emitter to add the __export helper. @@ -399,11 +403,8 @@ namespace ts { function addExportEqualsIfNeeded(statements: Statement[], emitAsReturn: boolean) { if (currentModuleInfo.exportEquals) { if (emitAsReturn) { - const statement = createReturn( - currentModuleInfo.exportEquals.expression, - /*location*/ currentModuleInfo.exportEquals - ); - + const statement = createReturn(currentModuleInfo.exportEquals.expression); + setTextRange(statement, currentModuleInfo.exportEquals); setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoComments); statements.push(statement); } @@ -415,10 +416,10 @@ namespace ts { "exports" ), currentModuleInfo.exportEquals.expression - ), - /*location*/ currentModuleInfo.exportEquals + ) ); + setTextRange(statement, currentModuleInfo.exportEquals); setEmitFlags(statement, EmitFlags.NoComments); statements.push(statement); } @@ -481,7 +482,7 @@ namespace ts { if (moduleKind !== ModuleKind.AMD) { if (!node.importClause) { // import "mod"; - return createStatement(createRequireCall(node), /*location*/ node); + return setTextRange(createStatement(createRequireCall(node)), node); } else { const variables: VariableDeclaration[] = []; @@ -520,12 +521,13 @@ namespace ts { } statements = append(statements, - createVariableStatement( - /*modifiers*/ undefined, - createVariableDeclarationList( - variables, - /*location*/ undefined, - languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None + setTextRange( + createVariableStatement( + /*modifiers*/ undefined, + createVariableDeclarationList( + variables, + languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None + ) ), /*location*/ node ) @@ -539,14 +541,15 @@ namespace ts { /*modifiers*/ undefined, createVariableDeclarationList( [ - createVariableDeclaration( - getSynthesizedClone(namespaceDeclaration.name), - /*type*/ undefined, - getGeneratedNameForNode(node), + setTextRange( + createVariableDeclaration( + getSynthesizedClone(namespaceDeclaration.name), + /*type*/ undefined, + getGeneratedNameForNode(node) + ), /*location*/ node ) ], - /*location*/ undefined, languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None ) ) @@ -592,31 +595,34 @@ namespace ts { if (moduleKind !== ModuleKind.AMD) { if (hasModifier(node, ModifierFlags.Export)) { statements = append(statements, - createStatement( - createExportExpression( - node.name, - createRequireCall(node) + setTextRange( + createStatement( + createExportExpression( + node.name, + createRequireCall(node) + ) ), - /*location*/ node + node ) ); } else { statements = append(statements, - createVariableStatement( - /*modifiers*/ undefined, - createVariableDeclarationList( - [ - createVariableDeclaration( - getSynthesizedClone(node.name), - /*type*/ undefined, - createRequireCall(node) - ) - ], - /*location*/ undefined, - /*flags*/ languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None + setTextRange( + createVariableStatement( + /*modifiers*/ undefined, + createVariableDeclarationList( + [ + createVariableDeclaration( + getSynthesizedClone(node.name), + /*type*/ undefined, + createRequireCall(node) + ) + ], + /*flags*/ languageVersion >= ScriptTarget.ES2015 ? NodeFlags.Const : NodeFlags.None + ) ), - /*location*/ node + node ) ); } @@ -624,9 +630,11 @@ namespace ts { else { if (hasModifier(node, ModifierFlags.Export)) { statements = append(statements, - createStatement( - createExportExpression(getExportName(node), getLocalName(node)), - /*location*/ node + setTextRange( + createStatement( + createExportExpression(getExportName(node), getLocalName(node)) + ), + node ) ); } @@ -662,15 +670,17 @@ namespace ts { // export { x, y } from "mod"; if (moduleKind !== ModuleKind.AMD) { statements.push( - createVariableStatement( - /*modifiers*/ undefined, - createVariableDeclarationList([ - createVariableDeclaration( - generatedName, - /*type*/ undefined, - createRequireCall(node) - ) - ]), + setTextRange( + createVariableStatement( + /*modifiers*/ undefined, + createVariableDeclarationList([ + createVariableDeclaration( + generatedName, + /*type*/ undefined, + createRequireCall(node) + ) + ]) + ), /*location*/ node ) ); @@ -681,9 +691,11 @@ namespace ts { specifier.propertyName || specifier.name ); statements.push( - createStatement( - createExportExpression(getExportName(specifier), exportedValue), - /*location*/ specifier + setTextRange( + createStatement( + createExportExpression(getExportName(specifier), exportedValue) + ), + specifier ) ); } @@ -692,17 +704,19 @@ namespace ts { } else { // export * from "mod"; - return createStatement( - createCall( - createIdentifier("__export"), - /*typeArguments*/ undefined, - [ - moduleKind !== ModuleKind.AMD - ? createRequireCall(node) - : generatedName - ] + return setTextRange( + createStatement( + createCall( + createIdentifier("__export"), + /*typeArguments*/ undefined, + [ + moduleKind !== ModuleKind.AMD + ? createRequireCall(node) + : generatedName + ] + ) ), - /*location*/ node + node ); } } @@ -741,15 +755,17 @@ namespace ts { if (hasModifier(node, ModifierFlags.Export)) { statements = append(statements, setOriginalNode( - createFunctionDeclaration( - /*decorators*/ undefined, - visitNodes(node.modifiers, modifierVisitor, isModifier), - node.asteriskToken, - getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), - /*typeParameters*/ undefined, - node.parameters, - /*type*/ undefined, - node.body, + setTextRange( + createFunctionDeclaration( + /*decorators*/ undefined, + visitNodes(node.modifiers, modifierVisitor, isModifier), + node.asteriskToken, + getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), + /*typeParameters*/ undefined, + node.parameters, + /*type*/ undefined, + node.body + ), /*location*/ node ), /*original*/ node @@ -782,16 +798,18 @@ namespace ts { if (hasModifier(node, ModifierFlags.Export)) { statements = append(statements, setOriginalNode( - createClassDeclaration( - /*decorators*/ undefined, - visitNodes(node.modifiers, modifierVisitor, isModifier), - getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), - /*typeParameters*/ undefined, - node.heritageClauses, - node.members, - /*location*/ node + setTextRange( + createClassDeclaration( + /*decorators*/ undefined, + visitNodes(node.modifiers, modifierVisitor, isModifier), + getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), + /*typeParameters*/ undefined, + node.heritageClauses, + node.members + ), + node ), - /*original*/ node + node ) ); } @@ -843,7 +861,7 @@ namespace ts { } if (expressions) { - statements = append(statements, createStatement(inlineExpressions(expressions), /*location*/ node)); + statements = append(statements, setTextRange(createStatement(inlineExpressions(expressions)), node)); } } else { @@ -880,9 +898,11 @@ namespace ts { } else { return createAssignment( - createPropertyAccess( - createIdentifier("exports"), - node.name, + setTextRange( + createPropertyAccess( + createIdentifier("exports"), + node.name + ), /*location*/ node.name ), node.initializer @@ -1115,7 +1135,7 @@ namespace ts { createStatement( createExportExpression( createIdentifier("__esModule"), - createLiteral(true) + createTrue() ) ) ); @@ -1130,7 +1150,7 @@ namespace ts { createIdentifier("exports"), createLiteral("__esModule"), createObjectLiteral([ - createPropertyAssignment("value", createLiteral(true)) + createPropertyAssignment("value", createTrue()) ]) ] ) @@ -1153,7 +1173,7 @@ namespace ts { * @param allowComments An optional value indicating whether to emit comments for the statement. */ function createExportStatement(name: Identifier, value: Expression, location?: TextRange, allowComments?: boolean) { - const statement = createStatement(createExportExpression(name, value), location); + const statement = setTextRange(createStatement(createExportExpression(name, value)), location); startOnNewLine(statement); if (!allowComments) { setEmitFlags(statement, EmitFlags.NoComments); @@ -1170,12 +1190,14 @@ namespace ts { * @param location The location to use for source maps and comments for the export. */ function createExportExpression(name: Identifier, value: Expression, location?: TextRange) { - return createAssignment( - createPropertyAccess( - createIdentifier("exports"), - getSynthesizedClone(name) + return setTextRange( + createAssignment( + createPropertyAccess( + createIdentifier("exports"), + getSynthesizedClone(name) + ), + value ), - value, location ); } @@ -1268,9 +1290,9 @@ namespace ts { // destructuring assignment if (node.objectAssignmentInitializer) { const initializer = createAssignment(exportedOrImportedName, node.objectAssignmentInitializer); - return createPropertyAssignment(name, initializer, /*location*/ node); + return setTextRange(createPropertyAssignment(name, initializer), node); } - return createPropertyAssignment(name, exportedOrImportedName, /*location*/ node); + return setTextRange(createPropertyAssignment(name, exportedOrImportedName), node); } return node; } @@ -1312,9 +1334,11 @@ namespace ts { if (!isGeneratedIdentifier(node) && !isLocalName(node)) { const exportContainer = resolver.getReferencedExportContainer(node, isExportName(node)); if (exportContainer && exportContainer.kind === SyntaxKind.SourceFile) { - return createPropertyAccess( - createIdentifier("exports"), - getSynthesizedClone(node), + return setTextRange( + createPropertyAccess( + createIdentifier("exports"), + getSynthesizedClone(node) + ), /*location*/ node ); } @@ -1322,17 +1346,21 @@ namespace ts { const importDeclaration = resolver.getReferencedImportDeclaration(node); if (importDeclaration) { if (isImportClause(importDeclaration)) { - return createPropertyAccess( - getGeneratedNameForNode(importDeclaration.parent), - createIdentifier("default"), + return setTextRange( + createPropertyAccess( + getGeneratedNameForNode(importDeclaration.parent), + createIdentifier("default") + ), /*location*/ node ); } else if (isImportSpecifier(importDeclaration)) { const name = importDeclaration.propertyName || importDeclaration.name; - return createPropertyAccess( - getGeneratedNameForNode(importDeclaration.parent.parent.parent), - getSynthesizedClone(name), + return setTextRange( + createPropertyAccess( + getGeneratedNameForNode(importDeclaration.parent.parent.parent), + getSynthesizedClone(name) + ), /*location*/ node ); } @@ -1400,10 +1428,12 @@ namespace ts { const exportedNames = getExports(node.operand); if (exportedNames) { let expression: Expression = node.kind === SyntaxKind.PostfixUnaryExpression - ? createBinary( - node.operand, - createToken(node.operator === SyntaxKind.PlusPlusToken ? SyntaxKind.PlusEqualsToken : SyntaxKind.MinusEqualsToken), - createLiteral(1), + ? setTextRange( + createBinary( + node.operand, + createToken(node.operator === SyntaxKind.PlusPlusToken ? SyntaxKind.PlusEqualsToken : SyntaxKind.MinusEqualsToken), + createLiteral(1) + ), /*location*/ node) : node; for (const exportName of exportedNames) { diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts index 6c59ea194cb0d..b29992015041f 100644 --- a/src/compiler/transformers/module/system.ts +++ b/src/compiler/transformers/module/system.ts @@ -105,17 +105,20 @@ namespace ts { const updated = setEmitFlags( updateSourceFileNode( node, - createNodeArray([ - createStatement( - createCall( - createPropertyAccess(createIdentifier("System"), "register"), - /*typeArguments*/ undefined, - moduleName - ? [moduleName, dependencies, moduleBodyFunction] - : [dependencies, moduleBodyFunction] + setTextRange( + createNodeArray([ + createStatement( + createCall( + createPropertyAccess(createIdentifier("System"), "register"), + /*typeArguments*/ undefined, + moduleName + ? [moduleName, dependencies, moduleBodyFunction] + : [dependencies, moduleBodyFunction] + ) ) - ) - ], node.statements) + ]), + node.statements + ) ), EmitFlags.NoTrailingComments); if (!(compilerOptions.outFile || compilerOptions.out)) { @@ -260,35 +263,26 @@ namespace ts { addRange(statements, endLexicalEnvironment()); const exportStarFunction = addExportStarIfNeeded(statements); - statements.push( - createReturn( - setMultiLine( - createObjectLiteral([ - createPropertyAssignment("setters", - createSettersArray(exportStarFunction, dependencyGroups) - ), - createPropertyAssignment("execute", - createFunctionExpression( - /*modifiers*/ undefined, - /*asteriskToken*/ undefined, - /*name*/ undefined, - /*typeParameters*/ undefined, - /*parameters*/ [], - /*type*/ undefined, - createBlock( - executeStatements, - /*location*/ undefined, - /*multiLine*/ true - ) - ) - ) - ]), - /*multiLine*/ true + const moduleObject = createObjectLiteral([ + createPropertyAssignment("setters", + createSettersArray(exportStarFunction, dependencyGroups) + ), + createPropertyAssignment("execute", + createFunctionExpression( + /*modifiers*/ undefined, + /*asteriskToken*/ undefined, + /*name*/ undefined, + /*typeParameters*/ undefined, + /*parameters*/ [], + /*type*/ undefined, + createBlock(executeStatements, /*multiLine*/ true) ) ) - ); + ]); - return createBlock(statements, /*location*/ undefined, /*multiLine*/ true); + moduleObject.multiLine = true; + statements.push(createReturn(moduleObject)); + return createBlock(statements, /*multiLine*/ true); } /** @@ -337,7 +331,7 @@ namespace ts { exportedNames.push( createPropertyAssignment( createLiteral(exportedLocalName), - createLiteral(true) + createTrue() ) ); } @@ -359,7 +353,7 @@ namespace ts { exportedNames.push( createPropertyAssignment( createLiteral((element.name || element.propertyName).text), - createLiteral(true) + createTrue() ) ); } @@ -373,7 +367,7 @@ namespace ts { createVariableDeclaration( exportedNamesStorageRef, /*type*/ undefined, - createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true) + createObjectLiteral(exportedNames, /*multiline*/ true) ) ]) ) @@ -456,9 +450,7 @@ namespace ts { [exports] ) ) - ], - /*location*/ undefined, - /*multiline*/ true) + ], /*multiline*/ true) ); } @@ -525,7 +517,7 @@ namespace ts { createCall( exportFunction, /*typeArguments*/ undefined, - [createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)] + [createObjectLiteral(properties, /*multiline*/ true)] ) ) ); @@ -558,12 +550,12 @@ namespace ts { /*typeParameters*/ undefined, [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], /*type*/ undefined, - createBlock(statements, /*location*/ undefined, /*multiLine*/ true) + createBlock(statements, /*multiLine*/ true) ) ); } - return createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true); + return createArrayLiteral(setters, /*multiLine*/ true); } // @@ -713,19 +705,23 @@ namespace ts { // Rewrite the class declaration into an assignment of a class expression. statements = append(statements, - createStatement( - createAssignment( - name, - createClassExpression( - /*modifiers*/ undefined, - node.name, - /*typeParameters*/ undefined, - visitNodes(node.heritageClauses, destructuringVisitor, isHeritageClause), - visitNodes(node.members, destructuringVisitor, isClassElement), - /*location*/ node + setTextRange( + createStatement( + createAssignment( + name, + setTextRange( + createClassExpression( + /*modifiers*/ undefined, + node.name, + /*typeParameters*/ undefined, + visitNodes(node.heritageClauses, destructuringVisitor, isHeritageClause), + visitNodes(node.members, destructuringVisitor, isClassElement) + ), + node + ) ) ), - /*location*/ node + node ) ); @@ -766,7 +762,7 @@ namespace ts { let statements: Statement[]; if (expressions) { - statements = append(statements, createStatement(inlineExpressions(expressions), /*location*/ node)); + statements = append(statements, setTextRange(createStatement(inlineExpressions(expressions)), node)); } if (isMarkedDeclaration) { @@ -864,8 +860,8 @@ namespace ts { function createVariableAssignment(name: Identifier, value: Expression, location: TextRange, isExportedDeclaration: boolean) { hoistVariableDeclaration(getSynthesizedClone(name)); return isExportedDeclaration - ? createExportExpression(name, preventSubstitution(createAssignment(name, value, location))) - : preventSubstitution(createAssignment(name, value, location)); + ? createExportExpression(name, preventSubstitution(setTextRange(createAssignment(name, value), location))) + : preventSubstitution(setTextRange(createAssignment(name, value), location)); } /** @@ -1642,16 +1638,20 @@ namespace ts { const importDeclaration = resolver.getReferencedImportDeclaration(node); if (importDeclaration) { if (isImportClause(importDeclaration)) { - return createPropertyAccess( - getGeneratedNameForNode(importDeclaration.parent), - createIdentifier("default"), + return setTextRange( + createPropertyAccess( + getGeneratedNameForNode(importDeclaration.parent), + createIdentifier("default") + ), /*location*/ node ); } else if (isImportSpecifier(importDeclaration)) { - return createPropertyAccess( - getGeneratedNameForNode(importDeclaration.parent.parent.parent), - getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name), + return setTextRange( + createPropertyAccess( + getGeneratedNameForNode(importDeclaration.parent.parent.parent), + getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name) + ), /*location*/ node ); } @@ -1718,10 +1718,13 @@ namespace ts { const exportedNames = getExports(node.operand); if (exportedNames) { let expression: Expression = node.kind === SyntaxKind.PostfixUnaryExpression - ? createPrefix( - node.operator, - node.operand, - /*location*/ node) + ? setTextRange( + createPrefix( + node.operator, + node.operand + ), + node + ) : node; for (const exportName of exportedNames) { diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts index a61998e8af984..b18ab67381e50 100644 --- a/src/compiler/transformers/ts.ts +++ b/src/compiler/transformers/ts.ts @@ -588,17 +588,17 @@ namespace ts { name, /*typeParameters*/ undefined, visitNodes(node.heritageClauses, visitor, isHeritageClause), - transformClassMembers(node, hasExtendsClause), - node); - - let emitFlags = getEmitFlags(node); + transformClassMembers(node, hasExtendsClause) + ); // To better align with the old emitter, we should not emit a trailing source map // entry if the class has static properties. + let emitFlags = getEmitFlags(node); if (hasStaticProperties) { emitFlags |= EmitFlags.NoTrailingSourceMap; } + setTextRange(classDeclaration, node); setOriginalNode(classDeclaration, node); setEmitFlags(classDeclaration, emitFlags); return classDeclaration; @@ -709,13 +709,24 @@ namespace ts { // } const heritageClauses = visitNodes(node.heritageClauses, visitor, isHeritageClause); const members = transformClassMembers(node, hasExtendsClause); - const classExpression = createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members, location); + const classExpression = createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members); setOriginalNode(classExpression, node); + setTextRange(classExpression, location); // let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference // or decoratedClassAlias if the class contain self-reference. - const statement = createLetStatement(declName, classAlias ? createAssignment(classAlias, classExpression) : classExpression, location); + const statement = createVariableStatement( + /*modifiers*/ undefined, + createVariableDeclarationList([ + createVariableDeclaration( + declName, + /*type*/ undefined, + classAlias ? createAssignment(classAlias, classExpression) : classExpression + ) + ], NodeFlags.Let) + ); setOriginalNode(statement, node); + setTextRange(statement, location); setCommentRange(statement, node); return statement; } @@ -734,18 +745,17 @@ namespace ts { const heritageClauses = visitNodes(node.heritageClauses, visitor, isHeritageClause); const members = transformClassMembers(node, some(heritageClauses, c => c.token === SyntaxKind.ExtendsKeyword)); - const classExpression = setOriginalNode( - createClassExpression( - /*modifiers*/ undefined, - node.name, - /*typeParameters*/ undefined, - heritageClauses, - members, - /*location*/ node - ), - node + const classExpression = createClassExpression( + /*modifiers*/ undefined, + node.name, + /*typeParameters*/ undefined, + heritageClauses, + members ); + setOriginalNode(classExpression, node); + setTextRange(classExpression, node); + if (staticProperties.length > 0) { const expressions: Expression[] = []; const temp = createTempVariable(hoistVariableDeclaration); @@ -781,7 +791,7 @@ namespace ts { } addRange(members, visitNodes(node.members, classElementVisitor, isClassElement)); - return createNodeArray(members, /*location*/ node.members); + return setTextRange(createNodeArray(members), /*location*/ node.members); } /** @@ -812,12 +822,14 @@ namespace ts { // } return startOnNewLine( setOriginalNode( - createConstructor( - /*decorators*/ undefined, - /*modifiers*/ undefined, - parameters, - body, - /*location*/ constructor || node + setTextRange( + createConstructor( + /*decorators*/ undefined, + /*modifiers*/ undefined, + parameters, + body + ), + constructor || node ), constructor ) @@ -919,13 +931,15 @@ namespace ts { // End the lexical environment. addRange(statements, endLexicalEnvironment()); - return createBlock( - createNodeArray( - statements, - /*location*/ constructor ? constructor.body.statements : node.members + return setTextRange( + createBlock( + setTextRange( + createNodeArray(statements), + /*location*/ constructor ? constructor.body.statements : node.members + ), + /*multiLine*/ true ), - /*location*/ constructor ? constructor.body : /*location*/ undefined, - /*multiLine*/ true + /*location*/ constructor ? constructor.body : undefined ); } @@ -991,16 +1005,20 @@ namespace ts { setEmitFlags(localName, EmitFlags.NoComments); return startOnNewLine( - createStatement( - createAssignment( - createPropertyAccess( - createThis(), - propertyName, - /*location*/ node.name - ), - localName + setTextRange( + createStatement( + createAssignment( + setTextRange( + createPropertyAccess( + createThis(), + propertyName + ), + node.name + ), + localName + ) ), - /*location*/ moveRangePos(node, -1) + moveRangePos(node, -1) ) ); } @@ -1504,7 +1522,7 @@ namespace ts { (properties || (properties = [])).push(createPropertyAssignment("returnType", createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, createToken(SyntaxKind.EqualsGreaterThanToken), serializeReturnTypeOfNode(node)))); } if (properties) { - decoratorExpressions.push(createMetadataHelper(context, "design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true))); + decoratorExpressions.push(createMetadataHelper(context, "design:typeinfo", createObjectLiteral(properties, /*multiLine*/ true))); } } } @@ -1939,10 +1957,7 @@ namespace ts { expression = createAssignment(generatedName, expression); } - return setOriginalNode( - createComputedPropertyName(expression, /*location*/ name), - name - ); + return updateComputedPropertyName(name, expression); } else { return name; @@ -1961,9 +1976,11 @@ namespace ts { function visitHeritageClause(node: HeritageClause): HeritageClause { if (node.token === SyntaxKind.ExtendsKeyword) { const types = visitNodes(node.types, visitor, isExpressionWithTypeArguments, 0, 1); - return createHeritageClause( - SyntaxKind.ExtendsKeyword, - types, + return setTextRange( + createHeritageClause( + SyntaxKind.ExtendsKeyword, + types + ), node ); } @@ -1980,11 +1997,10 @@ namespace ts { * @param node The ExpressionWithTypeArguments to transform. */ function visitExpressionWithTypeArguments(node: ExpressionWithTypeArguments): ExpressionWithTypeArguments { - const expression = visitNode(node.expression, visitor, isLeftHandSideExpression); - return createExpressionWithTypeArguments( + return updateExpressionWithTypeArguments( + node, /*typeArguments*/ undefined, - expression, - node + visitNode(node.expression, visitor, isLeftHandSideExpression) ); } @@ -2205,13 +2221,13 @@ namespace ts { visitNode(node.name, visitor, isBindingName), /*questionToken*/ undefined, /*type*/ undefined, - visitNode(node.initializer, visitor, isExpression), - /*location*/ moveRangePastModifiers(node) + visitNode(node.initializer, visitor, isExpression) ); // While we emit the source map for the node after skipping decorators and modifiers, // we need to emit the comments for the original range. setOriginalNode(parameter, node); + setTextRange(parameter, moveRangePastModifiers(node)); setCommentRange(parameter, node); setSourceMapRange(parameter, moveRangePastModifiers(node)); setEmitFlags(parameter.name, EmitFlags.NoTrailingSourceMap); @@ -2233,11 +2249,13 @@ namespace ts { return undefined; } - return createStatement( - inlineExpressions( - map(variables, transformInitializedVariable) + return setTextRange( + createStatement( + inlineExpressions( + map(variables, transformInitializedVariable) + ) ), - /*location*/ node + node ); } else { @@ -2258,9 +2276,11 @@ namespace ts { ); } else { - return createAssignment( - getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), - visitNode(node.initializer, visitor, isExpression), + return setTextRange( + createAssignment( + getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), + visitNode(node.initializer, visitor, isExpression) + ), /*location*/ node ); } @@ -2418,11 +2438,11 @@ namespace ts { ), /*typeArguments*/ undefined, [moduleArg] - ), - /*location*/ node + ) ); setOriginalNode(enumStatement, node); + setTextRange(enumStatement, node); setEmitFlags(enumStatement, emitFlags); statements.push(enumStatement); @@ -2448,8 +2468,7 @@ namespace ts { currentNamespaceContainerName = savedCurrentNamespaceLocalName; return createBlock( - createNodeArray(statements, /*location*/ node.members), - /*location*/ undefined, + setTextRange(createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true ); } @@ -2464,22 +2483,26 @@ namespace ts { // we pass false as 'generateNameForComputedPropertyName' for a backward compatibility purposes // old emitter always generate 'expression' part of the name as-is. const name = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ false); - return createStatement( - createAssignment( - createElementAccess( - currentNamespaceContainerName, + return setTextRange( + createStatement( + setTextRange( createAssignment( createElementAccess( currentNamespaceContainerName, - name + createAssignment( + createElementAccess( + currentNamespaceContainerName, + name + ), + transformEnumMemberDeclarationValue(member) + ) ), - transformEnumMemberDeclarationValue(member) - ) - ), - name, - /*location*/ member + name + ), + member + ) ), - /*location*/ member + member ); } @@ -2697,11 +2720,11 @@ namespace ts { ), /*typeArguments*/ undefined, [moduleArg] - ), - /*location*/ node + ) ); setOriginalNode(moduleStatement, node); + setTextRange(moduleStatement, node); setEmitFlags(moduleStatement, emitFlags); statements.push(moduleStatement); @@ -2756,13 +2779,13 @@ namespace ts { currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName; const block = createBlock( - createNodeArray( - statements, + setTextRange( + createNodeArray(statements), /*location*/ statementsLocation ), - /*location*/ blockLocation, /*multiLine*/ true ); + setTextRange(block, blockLocation); // namespace hello.hi.world { // function foo() {} @@ -2962,18 +2985,20 @@ namespace ts { // export var ${name} = ${moduleReference}; // var ${name} = ${moduleReference}; return setOriginalNode( - createVariableStatement( - visitNodes(node.modifiers, modifierVisitor, isModifier), - createVariableDeclarationList([ - setOriginalNode( - createVariableDeclaration( - node.name, - /*type*/ undefined, - moduleReference - ), - node - ) - ]), + setTextRange( + createVariableStatement( + visitNodes(node.modifiers, modifierVisitor, isModifier), + createVariableDeclarationList([ + setOriginalNode( + createVariableDeclaration( + node.name, + /*type*/ undefined, + moduleReference + ), + node + ) + ]) + ), node ), node @@ -3034,7 +3059,7 @@ namespace ts { * Creates a statement for the provided expression. This is used in calls to `map`. */ function expressionToStatement(expression: Expression) { - return createStatement(expression, /*location*/ undefined); + return createStatement(expression); } function addExportMemberAssignment(statements: Statement[], node: ClassDeclaration | FunctionDeclaration) { @@ -3050,17 +3075,19 @@ namespace ts { } function createNamespaceExport(exportName: Identifier, exportValue: Expression, location?: TextRange) { - return createStatement( - createAssignment( - getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), - exportValue + return setTextRange( + createStatement( + createAssignment( + getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), + exportValue + ) ), location ); } function createNamespaceExportExpression(exportName: Identifier, exportValue: Expression, location?: TextRange) { - return createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue, location); + return setTextRange(createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue), location); } function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name: Identifier) { @@ -3201,9 +3228,9 @@ namespace ts { // destructuring assignment if (node.objectAssignmentInitializer) { const initializer = createAssignment(exportedName, node.objectAssignmentInitializer); - return createPropertyAssignment(name, initializer, /*location*/ node); + return setTextRange(createPropertyAssignment(name, initializer), node); } - return createPropertyAssignment(name, exportedName, /*location*/ node); + return setTextRange(createPropertyAssignment(name, exportedName), node); } } return node; @@ -3263,7 +3290,10 @@ namespace ts { (applicableSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && container.kind === SyntaxKind.ModuleDeclaration) || (applicableSubstitutions & TypeScriptSubstitutionFlags.NonQualifiedEnumMembers && container.kind === SyntaxKind.EnumDeclaration); if (substitute) { - return createPropertyAccess(getGeneratedNameForNode(container), node, /*location*/ node); + return setTextRange( + createPropertyAccess(getGeneratedNameForNode(container), node), + /*location*/ node + ); } } } @@ -3322,13 +3352,15 @@ namespace ts { function createParamHelper(context: TransformationContext, expression: Expression, parameterOffset: number, location?: TextRange) { context.requestEmitHelper(paramHelper); - return createCall( - getHelperName("__param"), - /*typeArguments*/ undefined, - [ - createLiteral(parameterOffset), - expression - ], + return setTextRange( + createCall( + getHelperName("__param"), + /*typeArguments*/ undefined, + [ + createLiteral(parameterOffset), + expression + ] + ), location ); } @@ -3371,7 +3403,7 @@ namespace ts { function createDecorateHelper(context: TransformationContext, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) { context.requestEmitHelper(decorateHelper); const argumentsArray: Expression[] = []; - argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true)); + argumentsArray.push(createArrayLiteral(decoratorExpressions, /*multiLine*/ true)); argumentsArray.push(target); if (memberName) { argumentsArray.push(memberName); @@ -3380,6 +3412,13 @@ namespace ts { } } - return createCall(getHelperName("__decorate"), /*typeArguments*/ undefined, argumentsArray, location); + return setTextRange( + createCall( + getHelperName("__decorate"), + /*typeArguments*/ undefined, + argumentsArray + ), + location + ); } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 8660e6138cdad..ae678f429f133 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -958,8 +958,7 @@ } // Represents an expression that is elided as part of a transformation to emit comments on a - // not-emitted node. The 'expression' property of a NotEmittedExpression should be emitted. - // @internal + // not-emitted node. The 'expression' property of a PartiallyEmittedExpression should be emitted. export interface PartiallyEmittedExpression extends LeftHandSideExpression { kind: SyntaxKind.PartiallyEmittedExpression; expression: Expression; @@ -1538,7 +1537,6 @@ // Represents a statement that is elided as part of a transformation to emit comments on a // not-emitted node. - // @internal export interface NotEmittedStatement extends Statement { kind: SyntaxKind.NotEmittedStatement; } @@ -3730,7 +3728,6 @@ helpers?: EmitHelper[]; // Emit helpers for the node } - /* @internal */ export const enum EmitFlags { SingleLine = 1 << 0, // The contents of this node should be emitted on a single line. AdviseOnEmitNode = 1 << 1, // The printer should invoke the onEmitNode callback when printing this node. @@ -3759,7 +3756,6 @@ HasEndOfDeclarationMarker = 1 << 21, // Declaration has an associated NotEmittedStatement to mark the end of the declaration } - /* @internal */ export interface EmitHelper { readonly name: string; // A unique name for this helper. readonly scoped: boolean; // Indicates whether ther helper MUST be emitted in the current scope. diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 01cfcb08047ed..6004bee466a0f 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -3331,6 +3331,14 @@ namespace ts { } } + export function getRangePos(range: TextRange | undefined) { + return range ? range.pos : -1; + } + + export function getRangeEnd(range: TextRange | undefined) { + return range ? range.end : -1; + } + /** * Increases (or decreases) a position by the provided amount. * diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts index f3efc040e3595..b6e0adc129417 100644 --- a/src/compiler/visitor.ts +++ b/src/compiler/visitor.ts @@ -627,8 +627,7 @@ namespace ts { // If we are not visiting all of the original nodes, we must always create a new array. // Since this is a fragment of a node array, we do not copy over the previous location // and will only copy over `hasTrailingComma` if we are including the last element. - updated = createNodeArray([], /*location*/ undefined, - /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length); + updated = createNodeArray([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length); } // Visit each original node. @@ -639,7 +638,8 @@ namespace ts { if (updated !== undefined || visited === undefined || visited !== node) { if (updated === undefined) { // Ensure we have a copy of `nodes`, up to the current index. - updated = createNodeArray(nodes.slice(0, i), /*location*/ nodes, nodes.hasTrailingComma); + updated = createNodeArray(nodes.slice(0, i), nodes.hasTrailingComma); + setTextRange(updated, nodes); } if (visited) { if (isArray(visited)) { @@ -675,10 +675,10 @@ namespace ts { context.startLexicalEnvironment(); statements = visitNodes(statements, visitor, isStatement, start); if (ensureUseStrict && !startsWithUseStrict(statements)) { - statements = createNodeArray([createStatement(createLiteral("use strict")), ...statements], statements); + statements = setTextRange(createNodeArray([createStatement(createLiteral("use strict")), ...statements]), statements); } const declarations = context.endLexicalEnvironment(); - return createNodeArray(concatenate(statements, declarations), statements); + return setTextRange(createNodeArray(concatenate(statements, declarations)), statements); } /** @@ -1228,7 +1228,7 @@ namespace ts { return statements; } return isNodeArray(statements) - ? createNodeArray(concatenate(statements, declarations), statements) + ? setTextRange(createNodeArray(concatenate(statements, declarations)), statements) : addRange(statements, declarations); } @@ -1252,13 +1252,19 @@ namespace ts { export function mergeFunctionBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody { if (body && declarations !== undefined && declarations.length > 0) { if (isBlock(body)) { - return updateBlock(body, createNodeArray(concatenate(body.statements, declarations), body.statements)); + return updateBlock(body, setTextRange(createNodeArray(concatenate(body.statements, declarations)), body.statements)); } else { - return createBlock( - createNodeArray([createReturn(body, /*location*/ body), ...declarations], body), - /*location*/ body, - /*multiLine*/ true); + return setTextRange( + createBlock( + setTextRange( + createNodeArray([setTextRange(createReturn(body), body), ...declarations]), + body + ), + /*multiLine*/ true + ), + /*location*/ body + ); } } return body; From a72abc8ebc5c4c76122126b2212449fafa1277db Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 1 Feb 2017 19:41:28 -0800 Subject: [PATCH 036/116] Make getOriginalNode/getParseTreeNode public --- src/compiler/utilities.ts | 102 +++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 6004bee466a0f..66efce4fef84a 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2042,57 +2042,6 @@ namespace ts { || positionIsSynthesized(node.end); } - export function getOriginalNode(node: Node): Node; - export function getOriginalNode(node: Node, nodeTest: (node: Node) => node is T): T; - export function getOriginalNode(node: Node, nodeTest?: (node: Node) => boolean): Node { - if (node) { - while (node.original !== undefined) { - node = node.original; - } - } - - return !nodeTest || nodeTest(node) ? node : undefined; - } - - /** - * Gets a value indicating whether a node originated in the parse tree. - * - * @param node The node to test. - */ - export function isParseTreeNode(node: Node): boolean { - return (node.flags & NodeFlags.Synthesized) === 0; - } - - /** - * Gets the original parse tree node for a node. - * - * @param node The original node. - * @returns The original parse tree node if found; otherwise, undefined. - */ - export function getParseTreeNode(node: Node): Node; - - /** - * Gets the original parse tree node for a node. - * - * @param node The original node. - * @param nodeTest A callback used to ensure the correct type of parse tree node is returned. - * @returns The original parse tree node if found; otherwise, undefined. - */ - export function getParseTreeNode(node: Node, nodeTest?: (node: Node) => node is T): T; - export function getParseTreeNode(node: Node, nodeTest?: (node: Node) => boolean): Node { - if (isParseTreeNode(node)) { - return node; - } - - node = getOriginalNode(node); - - if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) { - return node; - } - - return undefined; - } - export function getOriginalSourceFileOrBundle(sourceFileOrBundle: SourceFile | Bundle) { if (sourceFileOrBundle.kind === SyntaxKind.Bundle) { return updateBundle(sourceFileOrBundle, sameMap(sourceFileOrBundle.sourceFiles, getOriginalSourceFile)); @@ -4530,4 +4479,55 @@ namespace ts { return true; } } + + export function getOriginalNode(node: Node): Node; + export function getOriginalNode(node: Node, nodeTest: (node: Node) => node is T): T; + export function getOriginalNode(node: Node, nodeTest?: (node: Node) => boolean): Node { + if (node) { + while (node.original !== undefined) { + node = node.original; + } + } + + return !nodeTest || nodeTest(node) ? node : undefined; + } + + /** + * Gets a value indicating whether a node originated in the parse tree. + * + * @param node The node to test. + */ + export function isParseTreeNode(node: Node): boolean { + return (node.flags & NodeFlags.Synthesized) === 0; + } + + /** + * Gets the original parse tree node for a node. + * + * @param node The original node. + * @returns The original parse tree node if found; otherwise, undefined. + */ + export function getParseTreeNode(node: Node): Node; + + /** + * Gets the original parse tree node for a node. + * + * @param node The original node. + * @param nodeTest A callback used to ensure the correct type of parse tree node is returned. + * @returns The original parse tree node if found; otherwise, undefined. + */ + export function getParseTreeNode(node: Node, nodeTest?: (node: Node) => node is T): T; + export function getParseTreeNode(node: Node, nodeTest?: (node: Node) => boolean): Node { + if (isParseTreeNode(node)) { + return node; + } + + node = getOriginalNode(node); + + if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) { + return node; + } + + return undefined; + } } From 5f1fafce5e76311cc8ef0f3c76f8b4a9008687f7 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Thu, 2 Feb 2017 15:25:05 -0800 Subject: [PATCH 037/116] routine lib files update --- src/lib/dom.generated.d.ts | 1927 +++++++++++++---- src/lib/webworker.generated.d.ts | 795 +++++-- .../modularizeLibrary_Dom.iterable.types | 4 +- 3 files changed, 2200 insertions(+), 526 deletions(-) diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts index d9825897ebca1..b4217c131f966 100644 --- a/src/lib/dom.generated.d.ts +++ b/src/lib/dom.generated.d.ts @@ -3,18 +3,50 @@ /// IE DOM APIs ///////////////////////////// +interface Account { + rpDisplayName?: string; + displayName?: string; + id?: string; + name?: string; + imageURL?: string; +} + interface Algorithm { name: string; } -interface AriaRequestEventInit extends EventInit { - attributeName?: string; - attributeValue?: string; +interface AnimationEventInit extends EventInit { + animationName?: string; + elapsedTime?: number; +} + +interface AssertionOptions { + timeoutSeconds?: number; + rpId?: USVString; + allowList?: ScopedCredentialDescriptor[]; + extensions?: WebAuthnExtensions; +} + +interface CacheQueryOptions { + ignoreSearch?: boolean; + ignoreMethod?: boolean; + ignoreVary?: boolean; + cacheName?: string; +} + +interface ClientData { + challenge?: string; + origin?: string; + rpId?: string; + hashAlg?: string | Algorithm; + tokenBinding?: string; + extensions?: WebAuthnExtensions; } -interface CommandEventInit extends EventInit { - commandName?: string; - detail?: string; +interface CloseEventInit extends EventInit { + wasClean?: boolean; + code?: number; + reason?: string; } interface CompositionEventInit extends UIEventInit { @@ -54,6 +86,13 @@ interface CustomEventInit extends EventInit { detail?: any; } +interface DOMRectInit { + x?: any; + y?: any; + width?: any; + height?: any; +} + interface DeviceAccelerationDict { x?: number; y?: number; @@ -64,6 +103,20 @@ interface DeviceLightEventInit extends EventInit { value?: number; } +interface DeviceMotionEventInit extends EventInit { + acceleration?: DeviceAccelerationDict; + accelerationIncludingGravity?: DeviceAccelerationDict; + rotationRate?: DeviceRotationRateDict; + interval?: number; +} + +interface DeviceOrientationEventInit extends EventInit { + alpha?: number; + beta?: number; + gamma?: number; + absolute?: boolean; +} + interface DeviceRotationRateDict { alpha?: number; beta?: number; @@ -75,6 +128,14 @@ interface DoubleRange { min?: number; } +interface ErrorEventInit extends EventInit { + message?: string; + filename?: string; + lineno?: number; + colno?: number; + error?: any; +} + interface EventInit { scoped?: boolean; bubbles?: boolean; @@ -107,6 +168,29 @@ interface FocusEventInit extends UIEventInit { relatedTarget?: EventTarget; } +interface FocusNavigationEventInit extends EventInit { + navigationReason?: string; + originLeft?: number; + originTop?: number; + originWidth?: number; + originHeight?: number; +} + +interface FocusNavigationOrigin { + originLeft?: number; + originTop?: number; + originWidth?: number; + originHeight?: number; +} + +interface GamepadEventInit extends EventInit { + gamepad?: Gamepad; +} + +interface GetNotificationOptions { + tag?: string; +} + interface HashChangeEventInit extends EventInit { newURL?: string; oldURL?: string; @@ -122,6 +206,20 @@ interface IDBObjectStoreParameters { keyPath?: IDBKeyPath; } +interface IntersectionObserverEntryInit { + time?: number; + rootBounds?: DOMRectInit; + boundingClientRect?: DOMRectInit; + intersectionRect?: DOMRectInit; + target?: Element; +} + +interface IntersectionObserverInit { + root?: Element; + rootMargin?: string; + threshold?: number | number[]; +} + interface KeyAlgorithm { name?: string; } @@ -324,6 +422,11 @@ interface MSPayloadBase extends RTCStats { payloadDescription?: string; } +interface MSPortRange { + min?: number; + max?: number; +} + interface MSRelayAddress { relayAddress?: string; port?: number; @@ -374,7 +477,7 @@ interface MSUtilization { } interface MSVideoPayload extends MSPayloadBase { - resoluton?: string; + resolution?: string; videoBitRateAvg?: number; videoBitRateMax?: number; videoFrameRateAvg?: number; @@ -457,6 +560,10 @@ interface MediaStreamErrorEventInit extends EventInit { error?: MediaStreamError; } +interface MediaStreamEventInit extends EventInit { + stream?: MediaStream; +} + interface MediaStreamTrackEventInit extends EventInit { track?: MediaStreamTrack; } @@ -521,6 +628,15 @@ interface MediaTrackSupportedConstraints { groupId?: boolean; } +interface MessageEventInit extends EventInit { + lastEventId?: string; + channel?: string; + data?: any; + origin?: string; + source?: Window; + ports?: MessagePort[]; +} + interface MouseEventInit extends EventModifierInit { screenX?: number; screenY?: number; @@ -550,10 +666,68 @@ interface MutationObserverInit { attributeFilter?: string[]; } +interface NotificationOptions { + dir?: string; + lang?: string; + body?: string; + tag?: string; + icon?: string; +} + interface ObjectURLOptions { oneTimeOnly?: boolean; } +interface PaymentCurrencyAmount { + currency?: string; + value?: string; + currencySystem?: string; +} + +interface PaymentDetails { + total?: PaymentItem; + displayItems?: PaymentItem[]; + shippingOptions?: PaymentShippingOption[]; + modifiers?: PaymentDetailsModifier[]; + error?: string; +} + +interface PaymentDetailsModifier { + supportedMethods?: string[]; + total?: PaymentItem; + additionalDisplayItems?: PaymentItem[]; + data?: any; +} + +interface PaymentItem { + label?: string; + amount?: PaymentCurrencyAmount; + pending?: boolean; +} + +interface PaymentMethodData { + supportedMethods?: string[]; + data?: any; +} + +interface PaymentOptions { + requestPayerName?: boolean; + requestPayerEmail?: boolean; + requestPayerPhone?: boolean; + requestShipping?: boolean; + shippingType?: string; +} + +interface PaymentRequestUpdateEventInit extends EventInit { +} + +interface PaymentShippingOption { + id?: string; + label?: string; + amount?: PaymentCurrencyAmount; + selected?: boolean; +} + interface PeriodicWaveConstraints { disableNormalization?: boolean; } @@ -569,12 +743,34 @@ interface PointerEventInit extends MouseEventInit { isPrimary?: boolean; } +interface PopStateEventInit extends EventInit { + state?: any; +} + interface PositionOptions { enableHighAccuracy?: boolean; timeout?: number; maximumAge?: number; } +interface ProgressEventInit extends EventInit { + lengthComputable?: boolean; + loaded?: number; + total?: number; +} + +interface PushSubscriptionOptionsInit { + userVisibleOnly?: boolean; + applicationServerKey?: any; +} + +interface RTCConfiguration { + iceServers?: RTCIceServer[]; + iceTransportPolicy?: string; + bundlePolicy?: string; + peerIdentity?: string; +} + interface RTCDTMFToneChangeEventInit extends EventInit { tone?: string; } @@ -589,7 +785,19 @@ interface RTCDtlsParameters { fingerprints?: RTCDtlsFingerprint[]; } -interface RTCIceCandidate { +interface RTCIceCandidateAttributes extends RTCStats { + ipAddress?: string; + portNumber?: number; + transport?: string; + candidateType?: string; + priority?: number; + addressSourceUrl?: string; +} + +interface RTCIceCandidateComplete { +} + +interface RTCIceCandidateDictionary { foundation?: string; priority?: number; ip?: string; @@ -599,23 +807,18 @@ interface RTCIceCandidate { tcpType?: string; relatedAddress?: string; relatedPort?: number; + msMTurnSessionId?: string; } -interface RTCIceCandidateAttributes extends RTCStats { - ipAddress?: string; - portNumber?: number; - transport?: string; - candidateType?: string; - priority?: number; - addressSourceUrl?: string; -} - -interface RTCIceCandidateComplete { +interface RTCIceCandidateInit { + candidate?: string; + sdpMid?: string; + sdpMLineIndex?: number; } interface RTCIceCandidatePair { - local?: RTCIceCandidate; - remote?: RTCIceCandidate; + local?: RTCIceCandidateDictionary; + remote?: RTCIceCandidateDictionary; } interface RTCIceCandidatePairStats extends RTCStats { @@ -637,11 +840,13 @@ interface RTCIceCandidatePairStats extends RTCStats { interface RTCIceGatherOptions { gatherPolicy?: string; iceservers?: RTCIceServer[]; + portRange?: MSPortRange; } interface RTCIceParameters { usernameFragment?: string; password?: string; + iceLite?: boolean; } interface RTCIceServer { @@ -675,6 +880,13 @@ interface RTCMediaStreamTrackStats extends RTCStats { echoReturnLossEnhancement?: number; } +interface RTCOfferOptions { + offerToReceiveVideo?: number; + offerToReceiveAudio?: number; + voiceActivityDetection?: boolean; + iceRestart?: boolean; +} + interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats { packetsSent?: number; bytesSent?: number; @@ -682,6 +894,10 @@ interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats { roundTripTime?: number; } +interface RTCPeerConnectionIceEventInit extends EventInit { + candidate?: RTCIceCandidate; +} + interface RTCRTPStreamStats extends RTCStats { ssrc?: string; associateStatsId?: string; @@ -719,6 +935,7 @@ interface RTCRtpCodecCapability { clockRate?: number; preferredPayloadType?: number; maxptime?: number; + ptime?: number; numChannels?: number; rtcpFeedback?: RTCRtcpFeedback[]; parameters?: any; @@ -733,6 +950,7 @@ interface RTCRtpCodecParameters { payloadType?: any; clockRate?: number; maxptime?: number; + ptime?: number; numChannels?: number; rtcpFeedback?: RTCRtcpFeedback[]; parameters?: any; @@ -752,9 +970,9 @@ interface RTCRtpEncodingParameters { priority?: number; maxBitrate?: number; minQuality?: number; - framerateBias?: number; resolutionScale?: number; framerateScale?: number; + maxFramerate?: number; active?: boolean; encodingId?: string; dependencyEncodingIds?: string[]; @@ -785,6 +1003,7 @@ interface RTCRtpParameters { headerExtensions?: RTCRtpHeaderExtensionParameters[]; encodings?: RTCRtpEncodingParameters[]; rtcp?: RTCRtcpParameters; + degradationPreference?: string; } interface RTCRtpRtxParameters { @@ -797,6 +1016,11 @@ interface RTCRtpUnhandled { muxId?: string; } +interface RTCSessionDescriptionInit { + type?: string; + sdp?: string; +} + interface RTCSrtpKeyParam { keyMethod?: string; keySalt?: string; @@ -837,6 +1061,64 @@ interface RTCTransportStats extends RTCStats { remoteCertificateId?: string; } +interface RegistrationOptions { + scope?: string; +} + +interface RequestInit { + method?: string; + headers?: any; + body?: any; + referrer?: string; + referrerPolicy?: string; + mode?: string; + credentials?: string; + cache?: string; + redirect?: string; + integrity?: string; + keepalive?: boolean; + window?: any; +} + +interface ResponseInit { + status?: number; + statusText?: string; + headers?: any; +} + +interface ScopedCredentialDescriptor { + type?: string; + id?: any; + transports?: string[]; +} + +interface ScopedCredentialOptions { + timeoutSeconds?: number; + rpId?: USVString; + excludeList?: ScopedCredentialDescriptor[]; + extensions?: WebAuthnExtensions; +} + +interface ScopedCredentialParameters { + type?: string; + algorithm?: string | Algorithm; +} + +interface ServiceWorkerMessageEventInit extends EventInit { + data?: any; + origin?: string; + lastEventId?: string; + source?: ServiceWorker | MessagePort; + ports?: MessagePort[]; +} + +interface SpeechSynthesisEventInit extends EventInit { + utterance?: SpeechSynthesisUtterance; + charIndex?: number; + elapsedTime?: number; + name?: string; +} + interface StoreExceptionsInformation extends ExceptionInformation { siteName?: string; explanationString?: string; @@ -847,11 +1129,23 @@ interface StoreSiteSpecificExceptionsInformation extends StoreExceptionsInformat arrayOfDomainStrings?: string[]; } +interface TrackEventInit extends EventInit { + track?: VideoTrack | AudioTrack | TextTrack; +} + +interface TransitionEventInit extends EventInit { + propertyName?: string; + elapsedTime?: number; +} + interface UIEventInit extends EventInit { view?: Window; detail?: number; } +interface WebAuthnExtensions { +} + interface WebGLContextAttributes { failIfMajorPerformanceCaveat?: boolean; alpha?: boolean; @@ -877,6 +1171,18 @@ interface EventListener { (evt: Event): void; } +interface WebKitEntriesCallback { + (evt: Event): void; +} + +interface WebKitErrorCallback { + (evt: Event): void; +} + +interface WebKitFileCallback { + (evt: Event): void; +} + interface ANGLE_instanced_arrays { drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void; drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void; @@ -915,14 +1221,14 @@ interface AnimationEvent extends Event { declare var AnimationEvent: { prototype: AnimationEvent; - new(): AnimationEvent; + new(typeArg: string, eventInitDict?: AnimationEventInit): AnimationEvent; } interface ApplicationCacheEventMap { "cached": Event; "checking": Event; "downloading": Event; - "error": ErrorEvent; + "error": Event; "noupdate": Event; "obsolete": Event; "progress": ProgressEvent; @@ -933,7 +1239,7 @@ interface ApplicationCache extends EventTarget { oncached: (this: ApplicationCache, ev: Event) => any; onchecking: (this: ApplicationCache, ev: Event) => any; ondownloading: (this: ApplicationCache, ev: Event) => any; - onerror: (this: ApplicationCache, ev: ErrorEvent) => any; + onerror: (this: ApplicationCache, ev: Event) => any; onnoupdate: (this: ApplicationCache, ev: Event) => any; onobsolete: (this: ApplicationCache, ev: Event) => any; onprogress: (this: ApplicationCache, ev: ProgressEvent) => any; @@ -963,16 +1269,6 @@ declare var ApplicationCache: { readonly UPDATEREADY: number; } -interface AriaRequestEvent extends Event { - readonly attributeName: string; - attributeValue: string | null; -} - -declare var AriaRequestEvent: { - prototype: AriaRequestEvent; - new(type: string, eventInitDict?: AriaRequestEventInit): AriaRequestEvent; -} - interface Attr extends Node { readonly name: string; readonly ownerElement: Element; @@ -1024,12 +1320,18 @@ declare var AudioBufferSourceNode: { new(): AudioBufferSourceNode; } -interface AudioContext extends EventTarget { +interface AudioContextEventMap { + "statechange": Event; +} + +interface AudioContextBase extends EventTarget { readonly currentTime: number; readonly destination: AudioDestinationNode; readonly listener: AudioListener; + onstatechange: (this: AudioContext, ev: Event) => any; readonly sampleRate: number; - state: string; + readonly state: string; + close(): PromiseLike; createAnalyser(): AnalyserNode; createBiquadFilter(): BiquadFilterNode; createBuffer(numberOfChannels: number, length: number, sampleRate: number): AudioBuffer; @@ -1040,6 +1342,7 @@ interface AudioContext extends EventTarget { createDelay(maxDelayTime?: number): DelayNode; createDynamicsCompressor(): DynamicsCompressorNode; createGain(): GainNode; + createIIRFilter(feedforward: number[], feedback: number[]): IIRFilterNode; createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode; createMediaStreamSource(mediaStream: MediaStream): MediaStreamAudioSourceNode; createOscillator(): OscillatorNode; @@ -1049,6 +1352,13 @@ interface AudioContext extends EventTarget { createStereoPanner(): StereoPannerNode; createWaveShaper(): WaveShaperNode; decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): PromiseLike; + resume(): PromiseLike; + addEventListener(type: K, listener: (this: AudioContext, ev: AudioContextEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +interface AudioContext extends AudioContextBase { + suspend(): PromiseLike; } declare var AudioContext: { @@ -1085,7 +1395,7 @@ interface AudioNode extends EventTarget { readonly context: AudioContext; readonly numberOfInputs: number; readonly numberOfOutputs: number; - connect(destination: AudioNode, output?: number, input?: number): void; + connect(destination: AudioNode, output?: number, input?: number): AudioNode; disconnect(output?: number): void; disconnect(destination: AudioNode, output?: number, input?: number): void; disconnect(destination: AudioParam, output?: number): void; @@ -1099,12 +1409,12 @@ declare var AudioNode: { interface AudioParam { readonly defaultValue: number; value: number; - cancelScheduledValues(startTime: number): void; - exponentialRampToValueAtTime(value: number, endTime: number): void; - linearRampToValueAtTime(value: number, endTime: number): void; - setTargetAtTime(target: number, startTime: number, timeConstant: number): void; - setValueAtTime(value: number, startTime: number): void; - setValueCurveAtTime(values: Float32Array, startTime: number, duration: number): void; + cancelScheduledValues(startTime: number): AudioParam; + exponentialRampToValueAtTime(value: number, endTime: number): AudioParam; + linearRampToValueAtTime(value: number, endTime: number): AudioParam; + setTargetAtTime(target: number, startTime: number, timeConstant: number): AudioParam; + setValueAtTime(value: number, startTime: number): AudioParam; + setValueCurveAtTime(values: Float32Array, startTime: number, duration: number): AudioParam; } declare var AudioParam: { @@ -1481,10 +1791,16 @@ interface CSSStyleDeclaration { imeMode: string | null; justifyContent: string | null; kerning: string | null; + layoutGrid: string | null; + layoutGridChar: string | null; + layoutGridLine: string | null; + layoutGridMode: string | null; + layoutGridType: string | null; left: string | null; readonly length: number; letterSpacing: string | null; lightingColor: string | null; + lineBreak: string | null; lineHeight: string | null; listStyle: string | null; listStyleImage: string | null; @@ -1556,6 +1872,7 @@ interface CSSStyleDeclaration { orphans: string | null; outline: string | null; outlineColor: string | null; + outlineOffset: string | null; outlineStyle: string | null; outlineWidth: string | null; overflow: string | null; @@ -1576,9 +1893,11 @@ interface CSSStyleDeclaration { position: string | null; quotes: string | null; right: string | null; + rotate: string | null; rubyAlign: string | null; rubyOverhang: string | null; rubyPosition: string | null; + scale: string | null; stopColor: string | null; stopOpacity: string | null; stroke: string | null; @@ -1612,6 +1931,7 @@ interface CSSStyleDeclaration { transitionDuration: string | null; transitionProperty: string | null; transitionTimingFunction: string | null; + translate: string | null; unicodeBidi: string | null; verticalAlign: string | null; visibility: string | null; @@ -1672,6 +1992,9 @@ interface CSSStyleDeclaration { webkitTapHighlightColor: string | null; webkitTextFillColor: string | null; webkitTextSizeAdjust: any; + webkitTextStroke: string | null; + webkitTextStrokeColor: string | null; + webkitTextStrokeWidth: string | null; webkitTransform: string | null; webkitTransformOrigin: string | null; webkitTransformStyle: string | null; @@ -1693,6 +2016,7 @@ interface CSSStyleDeclaration { zIndex: string | null; zoom: string | null; resize: string | null; + userSelect: string | null; getPropertyPriority(propertyName: string): string; getPropertyValue(propertyName: string): string; item(index: number): string; @@ -1720,7 +2044,6 @@ declare var CSSStyleRule: { interface CSSStyleSheet extends StyleSheet { readonly cssRules: CSSRuleList; cssText: string; - readonly href: string; readonly id: string; readonly imports: StyleSheetList; readonly isAlternate: boolean; @@ -1752,6 +2075,34 @@ declare var CSSSupportsRule: { new(): CSSSupportsRule; } +interface Cache { + add(request: RequestInfo): PromiseLike; + addAll(requests: RequestInfo[]): PromiseLike; + delete(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + keys(request?: RequestInfo, options?: CacheQueryOptions): any; + match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + matchAll(request?: RequestInfo, options?: CacheQueryOptions): any; + put(request: RequestInfo, response: Response): PromiseLike; +} + +declare var Cache: { + prototype: Cache; + new(): Cache; +} + +interface CacheStorage { + delete(cacheName: string): PromiseLike; + has(cacheName: string): PromiseLike; + keys(): any; + match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + open(cacheName: string): PromiseLike; +} + +declare var CacheStorage: { + prototype: CacheStorage; + new(): CacheStorage; +} + interface CanvasGradient { addColorStop(offset: number, color: string): void; } @@ -1776,13 +2127,13 @@ interface CanvasRenderingContext2D extends Object, CanvasPathMethods { font: string; globalAlpha: number; globalCompositeOperation: string; + imageSmoothingEnabled: boolean; lineCap: string; lineDashOffset: number; lineJoin: string; lineWidth: number; miterLimit: number; msFillRule: string; - msImageSmoothingEnabled: boolean; shadowBlur: number; shadowColor: string; shadowOffsetX: number; @@ -1800,6 +2151,7 @@ interface CanvasRenderingContext2D extends Object, CanvasPathMethods { createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient; createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern; createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient; + drawFocusIfNeeded(element: Element): void; drawImage(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void; fill(fillRule?: string): void; fillRect(x: number, y: number, w: number, h: number): void; @@ -1815,7 +2167,7 @@ interface CanvasRenderingContext2D extends Object, CanvasPathMethods { scale(x: number, y: number): void; setLineDash(segments: number[]): void; setTransform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void; - stroke(): void; + stroke(path?: Path2D): void; strokeRect(x: number, y: number, w: number, h: number): void; strokeText(text: string, x: number, y: number, maxWidth?: number): void; transform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void; @@ -1901,17 +2253,7 @@ interface CloseEvent extends Event { declare var CloseEvent: { prototype: CloseEvent; - new(): CloseEvent; -} - -interface CommandEvent extends Event { - readonly commandName: string; - readonly detail: string | null; -} - -declare var CommandEvent: { - prototype: CommandEvent; - new(type: string, eventInitDict?: CommandEventInit): CommandEvent; + new(typeArg: string, eventInitDict?: CloseEventInit): CloseEvent; } interface Comment extends CharacterData { @@ -1938,7 +2280,7 @@ interface Console { assert(test?: boolean, message?: string, ...optionalParams: any[]): void; clear(): void; count(countTitle?: string): void; - debug(message?: string, ...optionalParams: any[]): void; + debug(message?: any, ...optionalParams: any[]): void; dir(value?: any, ...optionalParams: any[]): void; dirxml(value: any): void; error(message?: any, ...optionalParams: any[]): void; @@ -2108,9 +2450,9 @@ declare var DOMException: { interface DOMImplementation { createDocument(namespaceURI: string | null, qualifiedName: string | null, doctype: DocumentType): Document; - createDocumentType(qualifiedName: string, publicId: string | null, systemId: string | null): DocumentType; + createDocumentType(qualifiedName: string, publicId: string, systemId: string): DocumentType; createHTMLDocument(title: string): Document; - hasFeature(feature: string | null, version: string | null): boolean; + hasFeature(): boolean; } declare var DOMImplementation: { @@ -2149,7 +2491,7 @@ declare var DOMStringList: { } interface DOMStringMap { - [name: string]: string; + [name: string]: string | undefined; } declare var DOMStringMap: { @@ -2175,7 +2517,7 @@ declare var DOMTokenList: { interface DataCue extends TextTrackCue { data: ArrayBuffer; - addEventListener(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: DataCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -2205,6 +2547,7 @@ interface DataTransferItem { readonly type: string; getAsFile(): File | null; getAsString(_callback: FunctionStringCallback | null): void; + webkitGetAsEntry(): any; } declare var DataTransferItem: { @@ -2265,7 +2608,7 @@ interface DeviceLightEvent extends Event { declare var DeviceLightEvent: { prototype: DeviceLightEvent; - new(type: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent; + new(typeArg: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent; } interface DeviceMotionEvent extends Event { @@ -2278,7 +2621,7 @@ interface DeviceMotionEvent extends Event { declare var DeviceMotionEvent: { prototype: DeviceMotionEvent; - new(): DeviceMotionEvent; + new(typeArg: string, eventInitDict?: DeviceMotionEventInit): DeviceMotionEvent; } interface DeviceOrientationEvent extends Event { @@ -2291,7 +2634,7 @@ interface DeviceOrientationEvent extends Event { declare var DeviceOrientationEvent: { prototype: DeviceOrientationEvent; - new(): DeviceOrientationEvent; + new(typeArg: string, eventInitDict?: DeviceOrientationEventInit): DeviceOrientationEvent; } interface DeviceRotationRate { @@ -2373,7 +2716,7 @@ interface DocumentEventMap extends GlobalEventHandlersEventMap { "pointerlockerror": Event; "progress": ProgressEvent; "ratechange": Event; - "readystatechange": ProgressEvent; + "readystatechange": Event; "reset": Event; "scroll": UIEvent; "seeked": Event; @@ -2444,10 +2787,6 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven readonly compatMode: string; cookie: string; readonly currentScript: HTMLScriptElement | SVGScriptElement; - /** - * Gets the default character set from the current regional language settings. - */ - readonly defaultCharset: string; readonly defaultView: Window; /** * Sets or gets a value that indicates whether the document can be edited. @@ -2754,7 +3093,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven * Fires when the state of the object has changed. * @param ev The event */ - onreadystatechange: (this: Document, ev: ProgressEvent) => any; + onreadystatechange: (this: Document, ev: Event) => any; /** * Fires when the user resets a form. * @param ev The event. @@ -3122,8 +3461,8 @@ interface DocumentType extends Node, ChildNode { readonly internalSubset: string | null; readonly name: string; readonly notations: NamedNodeMap; - readonly publicId: string | null; - readonly systemId: string | null; + readonly publicId: string; + readonly systemId: string; } declare var DocumentType: { @@ -3146,7 +3485,7 @@ interface DynamicsCompressorNode extends AudioNode { readonly attack: AudioParam; readonly knee: AudioParam; readonly ratio: AudioParam; - readonly reduction: AudioParam; + readonly reduction: number; readonly release: AudioParam; readonly threshold: AudioParam; } @@ -3177,8 +3516,8 @@ declare var EXT_texture_filter_anisotropic: { } interface ElementEventMap extends GlobalEventHandlersEventMap { - "ariarequest": AriaRequestEvent; - "command": CommandEvent; + "ariarequest": Event; + "command": Event; "gotpointercapture": PointerEvent; "lostpointercapture": PointerEvent; "MSGestureChange": MSGestureEvent; @@ -3214,10 +3553,11 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec readonly clientTop: number; readonly clientWidth: number; id: string; + innerHTML: string; msContentZoomFactor: number; readonly msRegionOverflow: string; - onariarequest: (this: Element, ev: AriaRequestEvent) => any; - oncommand: (this: Element, ev: CommandEvent) => any; + onariarequest: (this: Element, ev: Event) => any; + oncommand: (this: Element, ev: Event) => any; ongotpointercapture: (this: Element, ev: PointerEvent) => any; onlostpointercapture: (this: Element, ev: PointerEvent) => any; onmsgesturechange: (this: Element, ev: MSGestureEvent) => any; @@ -3243,13 +3583,13 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec ontouchstart: (ev: TouchEvent) => any; onwebkitfullscreenchange: (this: Element, ev: Event) => any; onwebkitfullscreenerror: (this: Element, ev: Event) => any; + outerHTML: string; readonly prefix: string | null; readonly scrollHeight: number; scrollLeft: number; scrollTop: number; readonly scrollWidth: number; readonly tagName: string; - innerHTML: string; readonly assignedSlot: HTMLSlotElement | null; slot: string; readonly shadowRoot: ShadowRoot | null; @@ -3273,7 +3613,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec msSetPointerCapture(pointerId: number): void; msZoomTo(args: MsZoomToOptions): void; releasePointerCapture(pointerId: number): void; - removeAttribute(name?: string): void; + removeAttribute(qualifiedName: string): void; removeAttributeNS(namespaceURI: string, localName: string): void; removeAttributeNode(oldAttr: Attr): Attr; requestFullscreen(): void; @@ -3320,7 +3660,7 @@ interface ErrorEvent extends Event { declare var ErrorEvent: { prototype: ErrorEvent; - new(): ErrorEvent; + new(type: string, errorEventInitDict?: ErrorEventInit): ErrorEvent; } interface Event { @@ -3349,7 +3689,7 @@ interface Event { declare var Event: { prototype: Event; - new(type: string, eventInitDict?: EventInit): Event; + new(typeArg: string, eventInitDict?: EventInit): Event; readonly AT_TARGET: number; readonly BUBBLING_PHASE: number; readonly CAPTURING_PHASE: number; @@ -3366,6 +3706,21 @@ declare var EventTarget: { new(): EventTarget; } +interface ExtensionScriptApis { + extensionIdToShortId(extensionId: string): number; + fireExtensionApiTelemetry(functionName: string, isSucceeded: boolean, isSupported: boolean): void; + genericFunction(routerAddress: any, parameters?: string, callbackId?: number): void; + genericSynchronousFunction(functionId: number, parameters?: string): string; + getExtensionId(): string; + registerGenericFunctionCallbackHandler(callbackHandler: any): void; + registerGenericPersistentCallbackHandler(callbackHandler: any): void; +} + +declare var ExtensionScriptApis: { + prototype: ExtensionScriptApis; + new(): ExtensionScriptApis; +} + interface External { } @@ -3402,7 +3757,7 @@ interface FileReader extends EventTarget, MSBaseReader { readAsBinaryString(blob: Blob): void; readAsDataURL(blob: Blob): void; readAsText(blob: Blob, encoding?: string): void; - addEventListener(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: FileReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3421,6 +3776,20 @@ declare var FocusEvent: { new(typeArg: string, eventInitDict?: FocusEventInit): FocusEvent; } +interface FocusNavigationEvent extends Event { + readonly navigationReason: string; + readonly originHeight: number; + readonly originLeft: number; + readonly originTop: number; + readonly originWidth: number; + requestFocus(): void; +} + +declare var FocusNavigationEvent: { + prototype: FocusNavigationEvent; + new(type: string, eventInitDict?: FocusNavigationEventInit): FocusNavigationEvent; +} + interface FormData { append(name: any, value: any, blobName?: string): void; } @@ -3470,7 +3839,7 @@ interface GamepadEvent extends Event { declare var GamepadEvent: { prototype: GamepadEvent; - new(): GamepadEvent; + new(typeArg: string, eventInitDict?: GamepadEventInit): GamepadEvent; } interface Geolocation { @@ -3484,8 +3853,11 @@ declare var Geolocation: { new(): Geolocation; } -interface HTMLAllCollection extends HTMLCollection { - namedItem(name: string): Element; +interface HTMLAllCollection { + readonly length: number; + item(nameOrIndex?: string): HTMLCollection | Element | null; + namedItem(name: string): HTMLCollection | Element | null; + [index: number]: Element; } declare var HTMLAllCollection: { @@ -3573,7 +3945,7 @@ interface HTMLAnchorElement extends HTMLElement { * Returns a string representation of an object. */ toString(): string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLAnchorElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3647,7 +4019,7 @@ interface HTMLAppletElement extends HTMLElement { useMap: string; vspace: number; width: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLAppletElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3715,7 +4087,7 @@ interface HTMLAreaElement extends HTMLElement { * Returns a string representation of an object. */ toString(): string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLAreaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3724,15 +4096,7 @@ declare var HTMLAreaElement: { new(): HTMLAreaElement; } -interface HTMLAreasCollection extends HTMLCollection { - /** - * Adds an element to the areas, controlRange, or options collection. - */ - add(element: HTMLElement, before?: HTMLElement | number): void; - /** - * Removes an element from the collection. - */ - remove(index?: number): void; +interface HTMLAreasCollection extends HTMLCollectionBase { } declare var HTMLAreasCollection: { @@ -3741,7 +4105,7 @@ declare var HTMLAreasCollection: { } interface HTMLAudioElement extends HTMLMediaElement { - addEventListener(type: K, listener: (this: HTMLMediaElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3755,7 +4119,7 @@ interface HTMLBRElement extends HTMLElement { * Sets or retrieves the side on which floating objects are not to be positioned when any IHTMLBlockElement is inserted into the document. */ clear: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLBRElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3773,7 +4137,7 @@ interface HTMLBaseElement extends HTMLElement { * Sets or retrieves the window or frame at which to target content. */ target: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLBaseElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3791,7 +4155,7 @@ interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty * Sets or retrieves the font size of the object. */ size: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLBaseFontElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3817,6 +4181,7 @@ interface HTMLBodyElementEventMap extends HTMLElementEventMap { "pageshow": PageTransitionEvent; "popstate": PopStateEvent; "resize": UIEvent; + "scroll": UIEvent; "storage": StorageEvent; "unload": Event; } @@ -3844,6 +4209,7 @@ interface HTMLBodyElement extends HTMLElement { onpageshow: (this: HTMLBodyElement, ev: PageTransitionEvent) => any; onpopstate: (this: HTMLBodyElement, ev: PopStateEvent) => any; onresize: (this: HTMLBodyElement, ev: UIEvent) => any; + onscroll: (this: HTMLBodyElement, ev: UIEvent) => any; onstorage: (this: HTMLBodyElement, ev: StorageEvent) => any; onunload: (this: HTMLBodyElement, ev: Event) => any; text: any; @@ -3921,7 +4287,7 @@ interface HTMLButtonElement extends HTMLElement { * @param error Sets a custom error message that is displayed when a form is submitted. */ setCustomValidity(error: string): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLButtonElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3956,7 +4322,7 @@ interface HTMLCanvasElement extends HTMLElement { */ toDataURL(type?: string, ...args: any[]): string; toBlob(callback: (result: Blob | null) => void, type?: string, ...arguments: any[]): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLCanvasElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3965,7 +4331,7 @@ declare var HTMLCanvasElement: { new(): HTMLCanvasElement; } -interface HTMLCollection { +interface HTMLCollectionBase { /** * Sets or retrieves the number of objects in a collection. */ @@ -3974,11 +4340,14 @@ interface HTMLCollection { * Retrieves an object from various collections. */ item(index: number): Element; + [index: number]: Element; +} + +interface HTMLCollection extends HTMLCollectionBase { /** * Retrieves a select object or an object from an options collection. */ - namedItem(name: string): Element; - [index: number]: Element; + namedItem(name: string): Element | null; } declare var HTMLCollection: { @@ -3988,7 +4357,7 @@ declare var HTMLCollection: { interface HTMLDListElement extends HTMLElement { compact: boolean; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLDListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -3997,9 +4366,20 @@ declare var HTMLDListElement: { new(): HTMLDListElement; } +interface HTMLDataElement extends HTMLElement { + value: string; + addEventListener(type: K, listener: (this: HTMLDataElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var HTMLDataElement: { + prototype: HTMLDataElement; + new(): HTMLDataElement; +} + interface HTMLDataListElement extends HTMLElement { options: HTMLCollectionOf; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLDataListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4010,7 +4390,7 @@ declare var HTMLDataListElement: { interface HTMLDirectoryElement extends HTMLElement { compact: boolean; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLDirectoryElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4028,7 +4408,7 @@ interface HTMLDivElement extends HTMLElement { * Sets or retrieves whether the browser automatically performs wordwrap. */ noWrap: boolean; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLDivElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4038,7 +4418,7 @@ declare var HTMLDivElement: { } interface HTMLDocument extends Document { - addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLDocument, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4126,7 +4506,6 @@ interface HTMLElement extends Element { draggable: boolean; hidden: boolean; hideFocus: boolean; - innerHTML: string; innerText: string; readonly isContentEditable: boolean; lang: string; @@ -4202,7 +4581,6 @@ interface HTMLElement extends Element { ontimeupdate: (this: HTMLElement, ev: Event) => any; onvolumechange: (this: HTMLElement, ev: Event) => any; onwaiting: (this: HTMLElement, ev: Event) => any; - outerHTML: string; outerText: string; spellcheck: boolean; readonly style: CSSStyleDeclaration; @@ -4213,7 +4591,6 @@ interface HTMLElement extends Element { dragDrop(): boolean; focus(): void; msGetInputContext(): MSInputMethodContext; - setActive(): void; addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4270,7 +4647,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument { * Sets or retrieves the width of the object. */ width: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLEmbedElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4289,6 +4666,7 @@ interface HTMLFieldSetElement extends HTMLElement { * Retrieves a reference to the form that the object is embedded in. */ readonly form: HTMLFormElement; + name: string; /** * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting. */ @@ -4310,7 +4688,7 @@ interface HTMLFieldSetElement extends HTMLElement { * @param error Sets a custom error message that is displayed when a form is submitted. */ setCustomValidity(error: string): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLFieldSetElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4324,7 +4702,7 @@ interface HTMLFontElement extends HTMLElement, DOML2DeprecatedColorProperty, DOM * Sets or retrieves the current typeface family. */ face: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLFontElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4333,6 +4711,15 @@ declare var HTMLFontElement: { new(): HTMLFontElement; } +interface HTMLFormControlsCollection extends HTMLCollectionBase { + namedItem(name: string): HTMLCollection | Element | null; +} + +declare var HTMLFormControlsCollection: { + prototype: HTMLFormControlsCollection; + new(): HTMLFormControlsCollection; +} + interface HTMLFormElement extends HTMLElement { /** * Sets or retrieves a list of character encodings for input data that must be accepted by the server processing the form. @@ -4349,7 +4736,7 @@ interface HTMLFormElement extends HTMLElement { /** * Retrieves a collection, in source order, of all controls in a given form. */ - readonly elements: HTMLCollection; + readonly elements: HTMLFormControlsCollection; /** * Sets or retrieves the MIME encoding for the form. */ @@ -4400,7 +4787,7 @@ interface HTMLFormElement extends HTMLElement { * Fires when a FORM is about to be submitted. */ submit(): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLFormElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; [name: string]: any; } @@ -4489,6 +4876,7 @@ declare var HTMLFrameElement: { } interface HTMLFrameSetElementEventMap extends HTMLElementEventMap { + "afterprint": Event; "beforeprint": Event; "beforeunload": BeforeUnloadEvent; "blur": FocusEvent; @@ -4502,7 +4890,9 @@ interface HTMLFrameSetElementEventMap extends HTMLElementEventMap { "orientationchange": Event; "pagehide": PageTransitionEvent; "pageshow": PageTransitionEvent; + "popstate": PopStateEvent; "resize": UIEvent; + "scroll": UIEvent; "storage": StorageEvent; "unload": Event; } @@ -4546,7 +4936,9 @@ interface HTMLFrameSetElement extends HTMLElement { onorientationchange: (this: HTMLFrameSetElement, ev: Event) => any; onpagehide: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any; onpageshow: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any; + onpopstate: (this: HTMLFrameSetElement, ev: PopStateEvent) => any; onresize: (this: HTMLFrameSetElement, ev: UIEvent) => any; + onscroll: (this: HTMLFrameSetElement, ev: UIEvent) => any; onstorage: (this: HTMLFrameSetElement, ev: StorageEvent) => any; onunload: (this: HTMLFrameSetElement, ev: Event) => any; /** @@ -4575,7 +4967,7 @@ interface HTMLHRElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2 * Sets or retrieves the width of the object. */ width: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLHRElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4586,7 +4978,7 @@ declare var HTMLHRElement: { interface HTMLHeadElement extends HTMLElement { profile: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4600,7 +4992,7 @@ interface HTMLHeadingElement extends HTMLElement { * Sets or retrieves a value that indicates the table alignment. */ align: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLHeadingElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4614,7 +5006,7 @@ interface HTMLHtmlElement extends HTMLElement { * Sets or retrieves the DTD version that governs the current document. */ version: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLHtmlElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -4633,6 +5025,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument { */ align: string; allowFullscreen: boolean; + allowPaymentRequest: boolean; /** * Specifies the properties of a border drawn around an object. */ @@ -4728,7 +5121,7 @@ interface HTMLImageElement extends HTMLElement { * Retrieves whether the object is fully loaded. */ readonly complete: boolean; - crossOrigin: string; + crossOrigin: string | null; readonly currentSrc: string; /** * Sets or retrieves the height of the object. @@ -4793,14 +5186,13 @@ interface HTMLImageElement extends HTMLElement { readonly x: number; readonly y: number; msGetAsCastingSource(): any; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLImageElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var HTMLImageElement: { prototype: HTMLImageElement; new(): HTMLImageElement; - create(): HTMLImageElement; } interface HTMLInputElement extends HTMLElement { @@ -5006,7 +5398,7 @@ interface HTMLInputElement extends HTMLElement { * @param n Value to increment the value by. */ stepUp(n?: number): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLInputElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5021,7 +5413,7 @@ interface HTMLLIElement extends HTMLElement { * Sets or retrieves the value of a list item. */ value: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLLIElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5039,7 +5431,7 @@ interface HTMLLabelElement extends HTMLElement { * Sets or retrieves the object to which the given label object is assigned. */ htmlFor: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLLabelElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5057,7 +5449,7 @@ interface HTMLLegendElement extends HTMLElement { * Retrieves a reference to the form that the object is embedded in. */ readonly form: HTMLFormElement; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLLegendElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5102,7 +5494,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle { type: string; import?: Document; integrity: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLLinkElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5120,7 +5512,7 @@ interface HTMLMapElement extends HTMLElement { * Sets or retrieves the name of the object. */ name: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLMapElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5183,7 +5575,7 @@ interface HTMLMediaElement extends HTMLElement { * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player). */ controls: boolean; - crossOrigin: string; + crossOrigin: string | null; /** * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement. */ @@ -5355,7 +5747,7 @@ declare var HTMLMediaElement: { interface HTMLMenuElement extends HTMLElement { compact: boolean; type: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLMenuElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5389,7 +5781,7 @@ interface HTMLMetaElement extends HTMLElement { * Sets or retrieves the URL property that will be loaded after the specified time has elapsed. */ url: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLMetaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5405,7 +5797,7 @@ interface HTMLMeterElement extends HTMLElement { min: number; optimum: number; value: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLMeterElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5423,7 +5815,7 @@ interface HTMLModElement extends HTMLElement { * Sets or retrieves the date and time of a modification to the object. */ dateTime: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLModElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5439,7 +5831,7 @@ interface HTMLOListElement extends HTMLElement { */ start: number; type: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLOListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5517,10 +5909,6 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument { * Sets or retrieves the name of the object. */ name: string; - /** - * Retrieves the contained object. - */ - readonly object: any; readonly readyState: number; /** * Sets or retrieves a message to be displayed while an object is loading. @@ -5560,7 +5948,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument { * @param error Sets a custom error message that is displayed when a form is submitted. */ setCustomValidity(error: string): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLObjectElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5599,7 +5987,7 @@ interface HTMLOptGroupElement extends HTMLElement { * Sets or retrieves the value which is returned to the server when the form control is submitted. */ value: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLOptGroupElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5638,14 +6026,13 @@ interface HTMLOptionElement extends HTMLElement { * Sets or retrieves the value which is returned to the server when the form control is submitted. */ value: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLOptionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var HTMLOptionElement: { prototype: HTMLOptionElement; new(): HTMLOptionElement; - create(): HTMLOptionElement; } interface HTMLOptionsCollection extends HTMLCollectionOf { @@ -5660,13 +6047,35 @@ declare var HTMLOptionsCollection: { new(): HTMLOptionsCollection; } +interface HTMLOutputElement extends HTMLElement { + defaultValue: string; + readonly form: HTMLFormElement; + readonly htmlFor: DOMSettableTokenList; + name: string; + readonly type: string; + readonly validationMessage: string; + readonly validity: ValidityState; + value: string; + readonly willValidate: boolean; + checkValidity(): boolean; + reportValidity(): boolean; + setCustomValidity(error: string): void; + addEventListener(type: K, listener: (this: HTMLOutputElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var HTMLOutputElement: { + prototype: HTMLOutputElement; + new(): HTMLOutputElement; +} + interface HTMLParagraphElement extends HTMLElement { /** * Sets or retrieves how the object is aligned with adjacent text. */ align: string; clear: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLParagraphElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5692,7 +6101,7 @@ interface HTMLParamElement extends HTMLElement { * Sets or retrieves the data type of the value attribute. */ valueType: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLParamElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5702,7 +6111,7 @@ declare var HTMLParamElement: { } interface HTMLPictureElement extends HTMLElement { - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLPictureElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5716,7 +6125,7 @@ interface HTMLPreElement extends HTMLElement { * Sets or gets a value that you can use to implement your own width functionality for the object. */ width: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLPreElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5742,7 +6151,7 @@ interface HTMLProgressElement extends HTMLElement { * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value. */ value: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLProgressElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5756,7 +6165,7 @@ interface HTMLQuoteElement extends HTMLElement { * Sets or retrieves reference information about the object. */ cite: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLQuoteElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5771,6 +6180,7 @@ interface HTMLScriptElement extends HTMLElement { * Sets or retrieves the character set used to encode the object. */ charset: string; + crossOrigin: string | null; /** * Sets or retrieves the status of the script. */ @@ -5796,7 +6206,7 @@ interface HTMLScriptElement extends HTMLElement { */ type: string; integrity: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLScriptElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5892,7 +6302,7 @@ interface HTMLSelectElement extends HTMLElement { * @param error Sets a custom error message that is displayed when a form is submitted. */ setCustomValidity(error: string): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLSelectElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; [name: string]: any; } @@ -5918,7 +6328,7 @@ interface HTMLSourceElement extends HTMLElement { * Gets or sets the MIME type of a media resource. */ type: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLSourceElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5928,7 +6338,7 @@ declare var HTMLSourceElement: { } interface HTMLSpanElement extends HTMLElement { - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLSpanElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5947,7 +6357,7 @@ interface HTMLStyleElement extends HTMLElement, LinkStyle { * Retrieves the CSS language in which the style sheet is written. */ type: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLStyleElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -5965,7 +6375,7 @@ interface HTMLTableCaptionElement extends HTMLElement { * Sets or retrieves whether the caption appears at the top or bottom of the table. */ vAlign: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTableCaptionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6020,7 +6430,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment { * Sets or retrieves the width of the object. */ width: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTableCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6042,7 +6452,7 @@ interface HTMLTableColElement extends HTMLElement, HTMLTableAlignment { * Sets or retrieves the width of the object. */ width: any; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTableColElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6052,6 +6462,8 @@ declare var HTMLTableColElement: { } interface HTMLTableDataCellElement extends HTMLTableCellElement { + addEventListener(type: K, listener: (this: HTMLTableDataCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var HTMLTableDataCellElement: { @@ -6163,7 +6575,7 @@ interface HTMLTableElement extends HTMLElement { * @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): HTMLTableRowElement; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTableElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6177,6 +6589,8 @@ interface HTMLTableHeaderCellElement extends HTMLTableCellElement { * Sets or retrieves the group of cells in a table to which the object's information applies. */ scope: string; + addEventListener(type: K, listener: (this: HTMLTableHeaderCellElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var HTMLTableHeaderCellElement: { @@ -6216,7 +6630,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment { * @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): HTMLTableDataCellElement; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTableRowElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6244,7 +6658,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment { * @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): HTMLTableRowElement; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTableSectionElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6255,7 +6669,7 @@ declare var HTMLTableSectionElement: { interface HTMLTemplateElement extends HTMLElement { readonly content: DocumentFragment; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTemplateElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6362,7 +6776,7 @@ interface HTMLTextAreaElement extends HTMLElement { * @param end The offset into the text field for the end of the selection. */ setSelectionRange(start: number, end: number): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTextAreaElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6371,12 +6785,23 @@ declare var HTMLTextAreaElement: { new(): HTMLTextAreaElement; } +interface HTMLTimeElement extends HTMLElement { + dateTime: string; + addEventListener(type: K, listener: (this: HTMLTimeElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var HTMLTimeElement: { + prototype: HTMLTimeElement; + new(): HTMLTimeElement; +} + interface HTMLTitleElement extends HTMLElement { /** * Retrieves or sets the text of the object as a string. */ text: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTitleElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6397,7 +6822,7 @@ interface HTMLTrackElement extends HTMLElement { readonly LOADED: number; readonly LOADING: number; readonly NONE: number; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLTrackElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6413,7 +6838,7 @@ declare var HTMLTrackElement: { interface HTMLUListElement extends HTMLElement { compact: boolean; type: string; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLUListElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6423,7 +6848,7 @@ declare var HTMLUListElement: { } interface HTMLUnknownElement extends HTMLElement { - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: HTMLUnknownElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -6494,7 +6919,21 @@ interface HashChangeEvent extends Event { declare var HashChangeEvent: { prototype: HashChangeEvent; - new(type: string, eventInitDict?: HashChangeEventInit): HashChangeEvent; + new(typeArg: string, eventInitDict?: HashChangeEventInit): HashChangeEvent; +} + +interface Headers { + append(name: string, value: string): void; + delete(name: string): void; + forEach(callback: ForEachCallback): void; + get(name: string): string | null; + has(name: string): boolean; + set(name: string, value: string): void; +} + +declare var Headers: { + prototype: Headers; + new(init?: any): Headers; } interface History { @@ -6548,14 +6987,14 @@ declare var IDBCursorWithValue: { interface IDBDatabaseEventMap { "abort": Event; - "error": ErrorEvent; + "error": Event; } interface IDBDatabase extends EventTarget { readonly name: string; readonly objectStoreNames: DOMStringList; onabort: (this: IDBDatabase, ev: Event) => any; - onerror: (this: IDBDatabase, ev: ErrorEvent) => any; + onerror: (this: IDBDatabase, ev: Event) => any; version: number; onversionchange: (ev: IDBVersionChangeEvent) => any; close(): void; @@ -6658,13 +7097,13 @@ declare var IDBOpenDBRequest: { } interface IDBRequestEventMap { - "error": ErrorEvent; + "error": Event; "success": Event; } interface IDBRequest extends EventTarget { readonly error: DOMError; - onerror: (this: IDBRequest, ev: ErrorEvent) => any; + onerror: (this: IDBRequest, ev: Event) => any; onsuccess: (this: IDBRequest, ev: Event) => any; readonly readyState: string; readonly result: any; @@ -6682,7 +7121,7 @@ declare var IDBRequest: { interface IDBTransactionEventMap { "abort": Event; "complete": Event; - "error": ErrorEvent; + "error": Event; } interface IDBTransaction extends EventTarget { @@ -6691,7 +7130,7 @@ interface IDBTransaction extends EventTarget { readonly mode: string; onabort: (this: IDBTransaction, ev: Event) => any; oncomplete: (this: IDBTransaction, ev: Event) => any; - onerror: (this: IDBTransaction, ev: ErrorEvent) => any; + onerror: (this: IDBTransaction, ev: Event) => any; abort(): void; objectStore(name: string): IDBObjectStore; readonly READ_ONLY: string; @@ -6719,6 +7158,15 @@ declare var IDBVersionChangeEvent: { new(): IDBVersionChangeEvent; } +interface IIRFilterNode extends AudioNode { + getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void; +} + +declare var IIRFilterNode: { + prototype: IIRFilterNode; + new(): IIRFilterNode; +} + interface ImageData { data: Uint8ClampedArray; readonly height: number; @@ -6731,6 +7179,35 @@ declare var ImageData: { new(array: Uint8ClampedArray, width: number, height: number): ImageData; } +interface IntersectionObserver { + readonly root: Element | null; + readonly rootMargin: string; + readonly thresholds: number[]; + disconnect(): void; + observe(target: Element): void; + takeRecords(): IntersectionObserverEntry[]; + unobserve(target: Element): void; +} + +declare var IntersectionObserver: { + prototype: IntersectionObserver; + new(callback: IntersectionObserverCallback, options?: IntersectionObserverInit): IntersectionObserver; +} + +interface IntersectionObserverEntry { + readonly boundingClientRect: ClientRect; + readonly intersectionRatio: number; + readonly intersectionRect: ClientRect; + readonly rootBounds: ClientRect; + readonly target: Element; + readonly time: number; +} + +declare var IntersectionObserverEntry: { + prototype: IntersectionObserverEntry; + new(intersectionObserverEntryInit: IntersectionObserverEntryInit): IntersectionObserverEntry; +} + interface KeyboardEvent extends UIEvent { readonly altKey: boolean; readonly char: string | null; @@ -6832,13 +7309,13 @@ declare var MSApp: MSApp; interface MSAppAsyncOperationEventMap { "complete": Event; - "error": ErrorEvent; + "error": Event; } interface MSAppAsyncOperation extends EventTarget { readonly error: DOMError; oncomplete: (this: MSAppAsyncOperation, ev: Event) => any; - onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any; + onerror: (this: MSAppAsyncOperation, ev: Event) => any; readonly readyState: number; readonly result: any; start(): void; @@ -6995,12 +7472,13 @@ interface MSHTMLWebViewElement extends HTMLElement { goForward(): void; invokeScriptAsync(scriptName: string, ...args: any[]): MSWebViewAsyncOperation; navigate(uri: string): void; + navigateFocus(navigationReason: string, origin: FocusNavigationOrigin): void; navigateToLocalStreamUri(source: string, streamResolver: any): void; navigateToString(contents: string): void; navigateWithHttpRequestMessage(requestMessage: any): void; refresh(): void; stop(): void; - addEventListener(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: MSHTMLWebViewElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -7192,7 +7670,7 @@ interface MSStreamReader extends EventTarget, MSBaseReader { readAsBlob(stream: MSStream, size?: number): void; readAsDataURL(stream: MSStream, size?: number): void; readAsText(stream: MSStream, encoding?: string, size?: number): void; - addEventListener(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: MSStreamReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -7203,13 +7681,13 @@ declare var MSStreamReader: { interface MSWebViewAsyncOperationEventMap { "complete": Event; - "error": ErrorEvent; + "error": Event; } interface MSWebViewAsyncOperation extends EventTarget { readonly error: DOMError; oncomplete: (this: MSWebViewAsyncOperation, ev: Event) => any; - onerror: (this: MSWebViewAsyncOperation, ev: ErrorEvent) => any; + onerror: (this: MSWebViewAsyncOperation, ev: Event) => any; readonly readyState: number; readonly result: any; readonly target: MSHTMLWebViewElement; @@ -7419,18 +7897,18 @@ declare var MediaSource: { interface MediaStreamEventMap { "active": Event; - "addtrack": TrackEvent; + "addtrack": MediaStreamTrackEvent; "inactive": Event; - "removetrack": TrackEvent; + "removetrack": MediaStreamTrackEvent; } interface MediaStream extends EventTarget { readonly active: boolean; readonly id: string; onactive: (this: MediaStream, ev: Event) => any; - onaddtrack: (this: MediaStream, ev: TrackEvent) => any; + onaddtrack: (this: MediaStream, ev: MediaStreamTrackEvent) => any; oninactive: (this: MediaStream, ev: Event) => any; - onremovetrack: (this: MediaStream, ev: TrackEvent) => any; + onremovetrack: (this: MediaStream, ev: MediaStreamTrackEvent) => any; addTrack(track: MediaStreamTrack): void; clone(): MediaStream; getAudioTracks(): MediaStreamTrack[]; @@ -7473,7 +7951,16 @@ interface MediaStreamErrorEvent extends Event { declare var MediaStreamErrorEvent: { prototype: MediaStreamErrorEvent; - new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent; + new(typeArg: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent; +} + +interface MediaStreamEvent extends Event { + readonly stream: MediaStream | null; +} + +declare var MediaStreamEvent: { + prototype: MediaStreamEvent; + new(type: string, eventInitDict: MediaStreamEventInit): MediaStreamEvent; } interface MediaStreamTrackEventMap { @@ -7517,7 +8004,7 @@ interface MediaStreamTrackEvent extends Event { declare var MediaStreamTrackEvent: { prototype: MediaStreamTrackEvent; - new(type: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent; + new(typeArg: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent; } interface MessageChannel { @@ -7550,7 +8037,7 @@ interface MessagePortEventMap { interface MessagePort extends EventTarget { onmessage: (this: MessagePort, ev: MessageEvent) => any; close(): void; - postMessage(message?: any, ports?: any): void; + postMessage(message?: any, transfer?: any[]): void; start(): void; addEventListener(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -7712,9 +8199,10 @@ declare var NavigationEventWithReferrer: { new(): NavigationEventWithReferrer; } -interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorUserMedia { - readonly appCodeName: string; +interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorBeacon, NavigatorConcurrentHardware, NavigatorUserMedia { + readonly authentication: WebAuthentication; readonly cookieEnabled: boolean; + gamepadInputEmulation: string; readonly language: string; readonly maxTouchPoints: number; readonly mimeTypes: MimeTypeArray; @@ -7723,6 +8211,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte readonly msPointerEnabled: boolean; readonly plugins: PluginArray; readonly pointerEnabled: boolean; + readonly serviceWorker: ServiceWorkerContainer; readonly webdriver: boolean; readonly hardwareConcurrency: number; getGamepads(): Gamepad[]; @@ -7754,7 +8243,7 @@ interface Node extends EventTarget { readonly parentNode: Node | null; readonly previousSibling: Node | null; textContent: string | null; - appendChild(newChild: Node): Node; + appendChild(newChild: T): T; cloneNode(deep?: boolean): Node; compareDocumentPosition(other: Node): number; contains(child: Node): boolean; @@ -7861,6 +8350,36 @@ declare var NodeList: { new(): NodeList; } +interface NotificationEventMap { + "click": Event; + "close": Event; + "error": Event; + "show": Event; +} + +interface Notification extends EventTarget { + readonly body: string; + readonly dir: string; + readonly icon: string; + readonly lang: string; + onclick: (this: Notification, ev: Event) => any; + onclose: (this: Notification, ev: Event) => any; + onerror: (this: Notification, ev: Event) => any; + onshow: (this: Notification, ev: Event) => any; + readonly permission: string; + readonly tag: string; + readonly title: string; + close(): void; + addEventListener(type: K, listener: (this: Notification, ev: NotificationEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var Notification: { + prototype: Notification; + new(title: string, options?: NotificationOptions): Notification; + requestPermission(callback?: NotificationPermissionCallback): PromiseLike; +} + interface OES_element_index_uint { } @@ -7895,6 +8414,24 @@ declare var OES_texture_float_linear: { new(): OES_texture_float_linear; } +interface OES_texture_half_float { + readonly HALF_FLOAT_OES: number; +} + +declare var OES_texture_half_float: { + prototype: OES_texture_half_float; + new(): OES_texture_half_float; + readonly HALF_FLOAT_OES: number; +} + +interface OES_texture_half_float_linear { +} + +declare var OES_texture_half_float_linear: { + prototype: OES_texture_half_float_linear; + new(): OES_texture_half_float_linear; +} + interface OfflineAudioCompletionEvent extends Event { readonly renderedBuffer: AudioBuffer; } @@ -7904,13 +8441,15 @@ declare var OfflineAudioCompletionEvent: { new(): OfflineAudioCompletionEvent; } -interface OfflineAudioContextEventMap { - "complete": Event; +interface OfflineAudioContextEventMap extends AudioContextEventMap { + "complete": OfflineAudioCompletionEvent; } -interface OfflineAudioContext extends AudioContext { - oncomplete: (this: OfflineAudioContext, ev: Event) => any; +interface OfflineAudioContext extends AudioContextBase { + readonly length: number; + oncomplete: (this: OfflineAudioContext, ev: OfflineAudioCompletionEvent) => any; startRendering(): PromiseLike; + suspend(suspendTime: number): PromiseLike; addEventListener(type: K, listener: (this: OfflineAudioContext, ev: OfflineAudioContextEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -7986,6 +8525,82 @@ declare var PannerNode: { new(): PannerNode; } +interface Path2D extends Object, CanvasPathMethods { +} + +declare var Path2D: { + prototype: Path2D; + new(path?: Path2D): Path2D; +} + +interface PaymentAddress { + readonly addressLine: string[]; + readonly city: string; + readonly country: string; + readonly dependentLocality: string; + readonly languageCode: string; + readonly organization: string; + readonly phone: string; + readonly postalCode: string; + readonly recipient: string; + readonly region: string; + readonly sortingCode: string; + toJSON(): any; +} + +declare var PaymentAddress: { + prototype: PaymentAddress; + new(): PaymentAddress; +} + +interface PaymentRequestEventMap { + "shippingaddresschange": Event; + "shippingoptionchange": Event; +} + +interface PaymentRequest extends EventTarget { + onshippingaddresschange: (this: PaymentRequest, ev: Event) => any; + onshippingoptionchange: (this: PaymentRequest, ev: Event) => any; + readonly shippingAddress: PaymentAddress | null; + readonly shippingOption: string | null; + readonly shippingType: string | null; + abort(): PromiseLike; + show(): PromiseLike; + addEventListener(type: K, listener: (this: PaymentRequest, ev: PaymentRequestEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var PaymentRequest: { + prototype: PaymentRequest; + new(methodData: PaymentMethodData[], details: PaymentDetails, options?: PaymentOptions): PaymentRequest; +} + +interface PaymentRequestUpdateEvent extends Event { + updateWith(d: PromiseLike): void; +} + +declare var PaymentRequestUpdateEvent: { + prototype: PaymentRequestUpdateEvent; + new(type: string, eventInitDict?: PaymentRequestUpdateEventInit): PaymentRequestUpdateEvent; +} + +interface PaymentResponse { + readonly details: any; + readonly methodName: string; + readonly payerEmail: string | null; + readonly payerName: string | null; + readonly payerPhone: string | null; + readonly shippingAddress: PaymentAddress | null; + readonly shippingOption: string | null; + complete(result?: string): PromiseLike; + toJSON(): any; +} + +declare var PaymentResponse: { + prototype: PaymentResponse; + new(): PaymentResponse; +} + interface PerfWidgetExternal { readonly activeNetworkRequestCount: number; readonly averageFrameTime: number; @@ -8251,7 +8866,7 @@ interface PopStateEvent extends Event { declare var PopStateEvent: { prototype: PopStateEvent; - new(): PopStateEvent; + new(typeArg: string, eventInitDict?: PopStateEventInit): PopStateEvent; } interface Position { @@ -8302,23 +8917,57 @@ declare var ProgressEvent: { new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent; } +interface PushManager { + getSubscription(): PromiseLike; + permissionState(options?: PushSubscriptionOptionsInit): PromiseLike; + subscribe(options?: PushSubscriptionOptionsInit): PromiseLike; +} + +declare var PushManager: { + prototype: PushManager; + new(): PushManager; +} + +interface PushSubscription { + readonly endpoint: USVString; + readonly options: PushSubscriptionOptions; + getKey(name: string): ArrayBuffer | null; + toJSON(): any; + unsubscribe(): PromiseLike; +} + +declare var PushSubscription: { + prototype: PushSubscription; + new(): PushSubscription; +} + +interface PushSubscriptionOptions { + readonly applicationServerKey: ArrayBuffer | null; + readonly userVisibleOnly: boolean; +} + +declare var PushSubscriptionOptions: { + prototype: PushSubscriptionOptions; + new(): PushSubscriptionOptions; +} + interface RTCDTMFToneChangeEvent extends Event { readonly tone: string; } declare var RTCDTMFToneChangeEvent: { prototype: RTCDTMFToneChangeEvent; - new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent; + new(typeArg: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent; } interface RTCDtlsTransportEventMap { "dtlsstatechange": RTCDtlsTransportStateChangedEvent; - "error": ErrorEvent; + "error": Event; } interface RTCDtlsTransport extends RTCStatsProvider { ondtlsstatechange: ((this: RTCDtlsTransport, ev: RTCDtlsTransportStateChangedEvent) => any) | null; - onerror: ((this: RTCDtlsTransport, ev: ErrorEvent) => any) | null; + onerror: ((this: RTCDtlsTransport, ev: Event) => any) | null; readonly state: string; readonly transport: RTCIceTransport; getLocalParameters(): RTCDtlsParameters; @@ -8365,6 +9014,18 @@ declare var RTCDtmfSender: { new(sender: RTCRtpSender): RTCDtmfSender; } +interface RTCIceCandidate { + candidate: string | null; + sdpMLineIndex: number | null; + sdpMid: string | null; + toJSON(): any; +} + +declare var RTCIceCandidate: { + prototype: RTCIceCandidate; + new(candidateInitDict?: RTCIceCandidateInit): RTCIceCandidate; +} + interface RTCIceCandidatePairChangedEvent extends Event { readonly pair: RTCIceCandidatePair; } @@ -8375,16 +9036,16 @@ declare var RTCIceCandidatePairChangedEvent: { } interface RTCIceGathererEventMap { - "error": ErrorEvent; + "error": Event; "localcandidate": RTCIceGathererEvent; } interface RTCIceGatherer extends RTCStatsProvider { readonly component: string; - onerror: ((this: RTCIceGatherer, ev: ErrorEvent) => any) | null; + onerror: ((this: RTCIceGatherer, ev: Event) => any) | null; onlocalcandidate: ((this: RTCIceGatherer, ev: RTCIceGathererEvent) => any) | null; createAssociatedGatherer(): RTCIceGatherer; - getLocalCandidates(): RTCIceCandidate[]; + getLocalCandidates(): RTCIceCandidateDictionary[]; getLocalParameters(): RTCIceParameters; addEventListener(type: K, listener: (this: RTCIceGatherer, ev: RTCIceGathererEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -8396,7 +9057,7 @@ declare var RTCIceGatherer: { } interface RTCIceGathererEvent extends Event { - readonly candidate: RTCIceCandidate | RTCIceCandidateComplete; + readonly candidate: RTCIceCandidateDictionary | RTCIceCandidateComplete; } declare var RTCIceGathererEvent: { @@ -8416,12 +9077,12 @@ interface RTCIceTransport extends RTCStatsProvider { onicestatechange: ((this: RTCIceTransport, ev: RTCIceTransportStateChangedEvent) => any) | null; readonly role: string; readonly state: string; - addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void; + addRemoteCandidate(remoteCandidate: RTCIceCandidateDictionary | RTCIceCandidateComplete): void; createAssociatedTransport(): RTCIceTransport; getNominatedCandidatePair(): RTCIceCandidatePair | null; - getRemoteCandidates(): RTCIceCandidate[]; + getRemoteCandidates(): RTCIceCandidateDictionary[]; getRemoteParameters(): RTCIceParameters | null; - setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void; + setRemoteCandidates(remoteCandidates: RTCIceCandidateDictionary[]): void; start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void; stop(): void; addEventListener(type: K, listener: (this: RTCIceTransport, ev: RTCIceTransportEventMap[K]) => any, useCapture?: boolean): void; @@ -8442,12 +9103,67 @@ declare var RTCIceTransportStateChangedEvent: { new(): RTCIceTransportStateChangedEvent; } +interface RTCPeerConnectionEventMap { + "addstream": MediaStreamEvent; + "icecandidate": RTCPeerConnectionIceEvent; + "iceconnectionstatechange": Event; + "icegatheringstatechange": Event; + "negotiationneeded": Event; + "removestream": MediaStreamEvent; + "signalingstatechange": Event; +} + +interface RTCPeerConnection extends EventTarget { + readonly canTrickleIceCandidates: boolean | null; + readonly iceConnectionState: string; + readonly iceGatheringState: string; + readonly localDescription: RTCSessionDescription | null; + onaddstream: (this: RTCPeerConnection, ev: MediaStreamEvent) => any; + onicecandidate: (this: RTCPeerConnection, ev: RTCPeerConnectionIceEvent) => any; + oniceconnectionstatechange: (this: RTCPeerConnection, ev: Event) => any; + onicegatheringstatechange: (this: RTCPeerConnection, ev: Event) => any; + onnegotiationneeded: (this: RTCPeerConnection, ev: Event) => any; + onremovestream: (this: RTCPeerConnection, ev: MediaStreamEvent) => any; + onsignalingstatechange: (this: RTCPeerConnection, ev: Event) => any; + readonly remoteDescription: RTCSessionDescription | null; + readonly signalingState: string; + addIceCandidate(candidate: RTCIceCandidate, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + addStream(stream: MediaStream): void; + close(): void; + createAnswer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + createOffer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback, options?: RTCOfferOptions): PromiseLike; + getConfiguration(): RTCConfiguration; + getLocalStreams(): MediaStream[]; + getRemoteStreams(): MediaStream[]; + getStats(selector: MediaStreamTrack | null, successCallback?: RTCStatsCallback, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + getStreamById(streamId: string): MediaStream | null; + removeStream(stream: MediaStream): void; + setLocalDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + setRemoteDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + addEventListener(type: K, listener: (this: RTCPeerConnection, ev: RTCPeerConnectionEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var RTCPeerConnection: { + prototype: RTCPeerConnection; + new(configuration: RTCConfiguration): RTCPeerConnection; +} + +interface RTCPeerConnectionIceEvent extends Event { + readonly candidate: RTCIceCandidate; +} + +declare var RTCPeerConnectionIceEvent: { + prototype: RTCPeerConnectionIceEvent; + new(type: string, eventInitDict: RTCPeerConnectionIceEventInit): RTCPeerConnectionIceEvent; +} + interface RTCRtpReceiverEventMap { - "error": ErrorEvent; + "error": Event; } interface RTCRtpReceiver extends RTCStatsProvider { - onerror: ((this: RTCRtpReceiver, ev: ErrorEvent) => any) | null; + onerror: ((this: RTCRtpReceiver, ev: Event) => any) | null; readonly rtcpTransport: RTCDtlsTransport; readonly track: MediaStreamTrack | null; readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport; @@ -8467,12 +9183,12 @@ declare var RTCRtpReceiver: { } interface RTCRtpSenderEventMap { - "error": ErrorEvent; + "error": Event; "ssrcconflict": RTCSsrcConflictEvent; } interface RTCRtpSender extends RTCStatsProvider { - onerror: ((this: RTCRtpSender, ev: ErrorEvent) => any) | null; + onerror: ((this: RTCRtpSender, ev: Event) => any) | null; onssrcconflict: ((this: RTCRtpSender, ev: RTCSsrcConflictEvent) => any) | null; readonly rtcpTransport: RTCDtlsTransport; readonly track: MediaStreamTrack; @@ -8491,12 +9207,23 @@ declare var RTCRtpSender: { getCapabilities(kind?: string): RTCRtpCapabilities; } +interface RTCSessionDescription { + sdp: string | null; + type: string | null; + toJSON(): any; +} + +declare var RTCSessionDescription: { + prototype: RTCSessionDescription; + new(descriptionInitDict?: RTCSessionDescriptionInit): RTCSessionDescription; +} + interface RTCSrtpSdesTransportEventMap { - "error": ErrorEvent; + "error": Event; } interface RTCSrtpSdesTransport extends EventTarget { - onerror: ((this: RTCSrtpSdesTransport, ev: ErrorEvent) => any) | null; + onerror: ((this: RTCSrtpSdesTransport, ev: Event) => any) | null; readonly transport: RTCIceTransport; addEventListener(type: K, listener: (this: RTCSrtpSdesTransport, ev: RTCSrtpSdesTransportEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -8571,9 +9298,69 @@ declare var Range: { readonly START_TO_START: number; } -interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference { +interface ReadableStream { + readonly locked: boolean; + cancel(): PromiseLike; + getReader(): ReadableStreamReader; +} + +declare var ReadableStream: { + prototype: ReadableStream; + new(): ReadableStream; +} + +interface ReadableStreamReader { + cancel(): PromiseLike; + read(): PromiseLike; + releaseLock(): void; +} + +declare var ReadableStreamReader: { + prototype: ReadableStreamReader; + new(): ReadableStreamReader; +} + +interface Request extends Object, Body { + readonly cache: string; + readonly credentials: string; + readonly destination: string; + readonly headers: Headers; + readonly integrity: string; + readonly keepalive: boolean; + readonly method: string; + readonly mode: string; + readonly redirect: string; + readonly referrer: string; + readonly referrerPolicy: string; + readonly type: string; + readonly url: string; + clone(): Request; +} + +declare var Request: { + prototype: Request; + new(input: Request | string, init?: RequestInit): Request; +} + +interface Response extends Object, Body { + readonly body: ReadableStream | null; + readonly headers: Headers; + readonly ok: boolean; + readonly status: number; + readonly statusText: string; + readonly type: string; + readonly url: string; + clone(): Response; +} + +declare var Response: { + prototype: Response; + new(body?: any, init?: ResponseInit): Response; +} + +interface SVGAElement extends SVGGraphicsElement, SVGURIReference { readonly target: SVGAnimatedString; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGAElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8726,11 +9513,11 @@ declare var SVGAnimatedTransformList: { new(): SVGAnimatedTransformList; } -interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { +interface SVGCircleElement extends SVGGraphicsElement { readonly cx: SVGAnimatedLength; readonly cy: SVGAnimatedLength; readonly r: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGCircleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8739,9 +9526,9 @@ declare var SVGCircleElement: { new(): SVGCircleElement; } -interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes { +interface SVGClipPathElement extends SVGGraphicsElement, SVGUnitTypes { readonly clipPathUnits: SVGAnimatedEnumeration; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGClipPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8764,7 +9551,7 @@ interface SVGComponentTransferFunctionElement extends SVGElement { readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number; readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number; readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGComponentTransferFunctionElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8779,8 +9566,8 @@ declare var SVGComponentTransferFunctionElement: { readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number; } -interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGDefsElement extends SVGGraphicsElement { + addEventListener(type: K, listener: (this: SVGDefsElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8789,8 +9576,8 @@ declare var SVGDefsElement: { new(): SVGDefsElement; } -interface SVGDescElement extends SVGElement, SVGStylable, SVGLangSpace { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGDescElement extends SVGElement { + addEventListener(type: K, listener: (this: SVGDescElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8813,6 +9600,7 @@ interface SVGElementEventMap extends ElementEventMap { } interface SVGElement extends Element { + className: any; onclick: (this: SVGElement, ev: MouseEvent) => any; ondblclick: (this: SVGElement, ev: MouseEvent) => any; onfocusin: (this: SVGElement, ev: FocusEvent) => any; @@ -8824,9 +9612,9 @@ interface SVGElement extends Element { onmouseover: (this: SVGElement, ev: MouseEvent) => any; onmouseup: (this: SVGElement, ev: MouseEvent) => any; readonly ownerSVGElement: SVGSVGElement; + readonly style: CSSStyleDeclaration; readonly viewportElement: SVGElement; xmlbase: string; - className: any; addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8862,12 +9650,12 @@ declare var SVGElementInstanceList: { new(): SVGElementInstanceList; } -interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { +interface SVGEllipseElement extends SVGGraphicsElement { readonly cx: SVGAnimatedLength; readonly cy: SVGAnimatedLength; readonly rx: SVGAnimatedLength; readonly ry: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGEllipseElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8897,7 +9685,7 @@ interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttrib readonly SVG_FEBLEND_MODE_SCREEN: number; readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number; readonly SVG_FEBLEND_MODE_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEBlendElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8932,7 +9720,7 @@ interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandard readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number; readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number; readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEColorMatrixElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8948,7 +9736,7 @@ declare var SVGFEColorMatrixElement: { interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { readonly in1: SVGAnimatedString; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEComponentTransferElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8972,7 +9760,7 @@ interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAt readonly SVG_FECOMPOSITE_OPERATOR_OVER: number; readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number; readonly SVG_FECOMPOSITE_OPERATOR_XOR: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFECompositeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9005,7 +9793,7 @@ interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStand readonly SVG_EDGEMODE_NONE: number; readonly SVG_EDGEMODE_UNKNOWN: number; readonly SVG_EDGEMODE_WRAP: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEConvolveMatrixElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9024,7 +9812,7 @@ interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStan readonly kernelUnitLengthX: SVGAnimatedNumber; readonly kernelUnitLengthY: SVGAnimatedNumber; readonly surfaceScale: SVGAnimatedNumber; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEDiffuseLightingElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9044,7 +9832,7 @@ interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStan readonly SVG_CHANNEL_G: number; readonly SVG_CHANNEL_R: number; readonly SVG_CHANNEL_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEDisplacementMapElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9061,7 +9849,7 @@ declare var SVGFEDisplacementMapElement: { interface SVGFEDistantLightElement extends SVGElement { readonly azimuth: SVGAnimatedNumber; readonly elevation: SVGAnimatedNumber; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEDistantLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9071,7 +9859,7 @@ declare var SVGFEDistantLightElement: { } interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEFloodElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9081,6 +9869,8 @@ declare var SVGFEFloodElement: { } interface SVGFEFuncAElement extends SVGComponentTransferFunctionElement { + addEventListener(type: K, listener: (this: SVGFEFuncAElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGFEFuncAElement: { @@ -9089,6 +9879,8 @@ declare var SVGFEFuncAElement: { } interface SVGFEFuncBElement extends SVGComponentTransferFunctionElement { + addEventListener(type: K, listener: (this: SVGFEFuncBElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGFEFuncBElement: { @@ -9097,6 +9889,8 @@ declare var SVGFEFuncBElement: { } interface SVGFEFuncGElement extends SVGComponentTransferFunctionElement { + addEventListener(type: K, listener: (this: SVGFEFuncGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGFEFuncGElement: { @@ -9105,6 +9899,8 @@ declare var SVGFEFuncGElement: { } interface SVGFEFuncRElement extends SVGComponentTransferFunctionElement { + addEventListener(type: K, listener: (this: SVGFEFuncRElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGFEFuncRElement: { @@ -9117,7 +9913,7 @@ interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandar readonly stdDeviationX: SVGAnimatedNumber; readonly stdDeviationY: SVGAnimatedNumber; setStdDeviation(stdDeviationX: number, stdDeviationY: number): void; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEGaussianBlurElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9126,9 +9922,9 @@ declare var SVGFEGaussianBlurElement: { new(): SVGFEGaussianBlurElement; } -interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired { +interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGURIReference { readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEImageElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9138,7 +9934,7 @@ declare var SVGFEImageElement: { } interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEMergeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9149,7 +9945,7 @@ declare var SVGFEMergeElement: { interface SVGFEMergeNodeElement extends SVGElement { readonly in1: SVGAnimatedString; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEMergeNodeElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9166,7 +9962,7 @@ interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardA readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number; readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number; readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEMorphologyElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9182,7 +9978,7 @@ interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttri readonly dx: SVGAnimatedNumber; readonly dy: SVGAnimatedNumber; readonly in1: SVGAnimatedString; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEOffsetElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9195,7 +9991,7 @@ interface SVGFEPointLightElement extends SVGElement { readonly x: SVGAnimatedNumber; readonly y: SVGAnimatedNumber; readonly z: SVGAnimatedNumber; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFEPointLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9211,7 +10007,7 @@ interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveSta readonly specularConstant: SVGAnimatedNumber; readonly specularExponent: SVGAnimatedNumber; readonly surfaceScale: SVGAnimatedNumber; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFESpecularLightingElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9229,7 +10025,7 @@ interface SVGFESpotLightElement extends SVGElement { readonly x: SVGAnimatedNumber; readonly y: SVGAnimatedNumber; readonly z: SVGAnimatedNumber; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFESpotLightElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9240,7 +10036,7 @@ declare var SVGFESpotLightElement: { interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { readonly in1: SVGAnimatedString; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFETileElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9262,7 +10058,7 @@ interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardA readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number; readonly SVG_TURBULENCE_TYPE_TURBULENCE: number; readonly SVG_TURBULENCE_TYPE_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFETurbulenceElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9277,7 +10073,7 @@ declare var SVGFETurbulenceElement: { readonly SVG_TURBULENCE_TYPE_UNKNOWN: number; } -interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired { +interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGURIReference { readonly filterResX: SVGAnimatedInteger; readonly filterResY: SVGAnimatedInteger; readonly filterUnits: SVGAnimatedEnumeration; @@ -9287,7 +10083,7 @@ interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLan readonly x: SVGAnimatedLength; readonly y: SVGAnimatedLength; setFilterRes(filterResX: number, filterResY: number): void; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGFilterElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9296,12 +10092,12 @@ declare var SVGFilterElement: { new(): SVGFilterElement; } -interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { +interface SVGForeignObjectElement extends SVGGraphicsElement { readonly height: SVGAnimatedLength; readonly width: SVGAnimatedLength; readonly x: SVGAnimatedLength; readonly y: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGForeignObjectElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9310,8 +10106,8 @@ declare var SVGForeignObjectElement: { new(): SVGForeignObjectElement; } -interface SVGGElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGGElement extends SVGGraphicsElement { + addEventListener(type: K, listener: (this: SVGGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9320,7 +10116,7 @@ declare var SVGGElement: { new(): SVGGElement; } -interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes { +interface SVGGradientElement extends SVGElement, SVGUnitTypes, SVGURIReference { readonly gradientTransform: SVGAnimatedTransformList; readonly gradientUnits: SVGAnimatedEnumeration; readonly spreadMethod: SVGAnimatedEnumeration; @@ -9328,7 +10124,7 @@ interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourc readonly SVG_SPREADMETHOD_REFLECT: number; readonly SVG_SPREADMETHOD_REPEAT: number; readonly SVG_SPREADMETHOD_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9341,13 +10137,30 @@ declare var SVGGradientElement: { readonly SVG_SPREADMETHOD_UNKNOWN: number; } -interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference { +interface SVGGraphicsElement extends SVGElement, SVGTests { + readonly farthestViewportElement: SVGElement; + readonly nearestViewportElement: SVGElement; + readonly transform: SVGAnimatedTransformList; + getBBox(): SVGRect; + getCTM(): SVGMatrix; + getScreenCTM(): SVGMatrix; + getTransformToElement(element: SVGElement): SVGMatrix; + addEventListener(type: K, listener: (this: SVGGraphicsElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var SVGGraphicsElement: { + prototype: SVGGraphicsElement; + new(): SVGGraphicsElement; +} + +interface SVGImageElement extends SVGGraphicsElement, SVGURIReference { readonly height: SVGAnimatedLength; readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio; readonly width: SVGAnimatedLength; readonly x: SVGAnimatedLength; readonly y: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGImageElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9408,12 +10221,12 @@ declare var SVGLengthList: { new(): SVGLengthList; } -interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { +interface SVGLineElement extends SVGGraphicsElement { readonly x1: SVGAnimatedLength; readonly x2: SVGAnimatedLength; readonly y1: SVGAnimatedLength; readonly y2: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGLineElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9427,6 +10240,8 @@ interface SVGLinearGradientElement extends SVGGradientElement { readonly x2: SVGAnimatedLength; readonly y1: SVGAnimatedLength; readonly y2: SVGAnimatedLength; + addEventListener(type: K, listener: (this: SVGLinearGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGLinearGradientElement: { @@ -9434,7 +10249,7 @@ declare var SVGLinearGradientElement: { new(): SVGLinearGradientElement; } -interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox { +interface SVGMarkerElement extends SVGElement, SVGFitToViewBox { readonly markerHeight: SVGAnimatedLength; readonly markerUnits: SVGAnimatedEnumeration; readonly markerWidth: SVGAnimatedLength; @@ -9450,7 +10265,7 @@ interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExt readonly SVG_MARKER_ORIENT_ANGLE: number; readonly SVG_MARKER_ORIENT_AUTO: number; readonly SVG_MARKER_ORIENT_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGMarkerElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9465,14 +10280,14 @@ declare var SVGMarkerElement: { readonly SVG_MARKER_ORIENT_UNKNOWN: number; } -interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes { +interface SVGMaskElement extends SVGElement, SVGTests, SVGUnitTypes { readonly height: SVGAnimatedLength; readonly maskContentUnits: SVGAnimatedEnumeration; readonly maskUnits: SVGAnimatedEnumeration; readonly width: SVGAnimatedLength; readonly x: SVGAnimatedLength; readonly y: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGMaskElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9507,7 +10322,7 @@ declare var SVGMatrix: { } interface SVGMetadataElement extends SVGElement { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGMetadataElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9541,7 +10356,8 @@ declare var SVGNumberList: { new(): SVGNumberList; } -interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPathData { +interface SVGPathElement extends SVGGraphicsElement { + readonly pathSegList: SVGPathSegList; createSVGPathSegArcAbs(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcAbs; createSVGPathSegArcRel(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcRel; createSVGPathSegClosePath(): SVGPathSegClosePath; @@ -9564,7 +10380,7 @@ interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGT getPathSegAtLength(distance: number): number; getPointAtLength(distance: number): SVGPoint; getTotalLength(): number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9849,7 +10665,7 @@ declare var SVGPathSegMovetoRel: { new(): SVGPathSegMovetoRel; } -interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes { +interface SVGPatternElement extends SVGElement, SVGTests, SVGUnitTypes, SVGFitToViewBox, SVGURIReference { readonly height: SVGAnimatedLength; readonly patternContentUnits: SVGAnimatedEnumeration; readonly patternTransform: SVGAnimatedTransformList; @@ -9857,7 +10673,7 @@ interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSp readonly width: SVGAnimatedLength; readonly x: SVGAnimatedLength; readonly y: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGPatternElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9893,8 +10709,8 @@ declare var SVGPointList: { new(): SVGPointList; } -interface SVGPolygonElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGPolygonElement extends SVGGraphicsElement, SVGAnimatedPoints { + addEventListener(type: K, listener: (this: SVGPolygonElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9903,8 +10719,8 @@ declare var SVGPolygonElement: { new(): SVGPolygonElement; } -interface SVGPolylineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGPolylineElement extends SVGGraphicsElement, SVGAnimatedPoints { + addEventListener(type: K, listener: (this: SVGPolylineElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9957,6 +10773,8 @@ interface SVGRadialGradientElement extends SVGGradientElement { readonly fx: SVGAnimatedLength; readonly fy: SVGAnimatedLength; readonly r: SVGAnimatedLength; + addEventListener(type: K, listener: (this: SVGRadialGradientElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGRadialGradientElement: { @@ -9976,14 +10794,14 @@ declare var SVGRect: { new(): SVGRect; } -interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { +interface SVGRectElement extends SVGGraphicsElement { readonly height: SVGAnimatedLength; readonly rx: SVGAnimatedLength; readonly ry: SVGAnimatedLength; readonly width: SVGAnimatedLength; readonly x: SVGAnimatedLength; readonly y: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGRectElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10001,7 +10819,7 @@ interface SVGSVGElementEventMap extends SVGElementEventMap { "SVGZoom": SVGZoomEvent; } -interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTests, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan { +interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewBox, SVGZoomAndPan { contentScriptType: string; contentStyleType: string; currentScale: number; @@ -10053,9 +10871,9 @@ declare var SVGSVGElement: { new(): SVGSVGElement; } -interface SVGScriptElement extends SVGElement, SVGExternalResourcesRequired, SVGURIReference { +interface SVGScriptElement extends SVGElement, SVGURIReference { type: string; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGScriptElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10064,9 +10882,9 @@ declare var SVGScriptElement: { new(): SVGScriptElement; } -interface SVGStopElement extends SVGElement, SVGStylable { +interface SVGStopElement extends SVGElement { readonly offset: SVGAnimatedNumber; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGStopElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10091,12 +10909,12 @@ declare var SVGStringList: { new(): SVGStringList; } -interface SVGStyleElement extends SVGElement, SVGLangSpace { +interface SVGStyleElement extends SVGElement { disabled: boolean; media: string; title: string; type: string; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGStyleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10105,8 +10923,8 @@ declare var SVGStyleElement: { new(): SVGStyleElement; } -interface SVGSwitchElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGSwitchElement extends SVGGraphicsElement { + addEventListener(type: K, listener: (this: SVGSwitchElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10115,8 +10933,8 @@ declare var SVGSwitchElement: { new(): SVGSwitchElement; } -interface SVGSymbolElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGSymbolElement extends SVGElement, SVGFitToViewBox { + addEventListener(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10126,6 +10944,8 @@ declare var SVGSymbolElement: { } interface SVGTSpanElement extends SVGTextPositioningElement { + addEventListener(type: K, listener: (this: SVGTSpanElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGTSpanElement: { @@ -10133,7 +10953,7 @@ declare var SVGTSpanElement: { new(): SVGTSpanElement; } -interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { +interface SVGTextContentElement extends SVGGraphicsElement { readonly lengthAdjust: SVGAnimatedEnumeration; readonly textLength: SVGAnimatedLength; getCharNumAtPosition(point: SVGPoint): number; @@ -10148,7 +10968,7 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa readonly LENGTHADJUST_SPACING: number; readonly LENGTHADJUST_SPACINGANDGLYPHS: number; readonly LENGTHADJUST_UNKNOWN: number; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGTextContentElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10160,7 +10980,9 @@ declare var SVGTextContentElement: { readonly LENGTHADJUST_UNKNOWN: number; } -interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable { +interface SVGTextElement extends SVGTextPositioningElement { + addEventListener(type: K, listener: (this: SVGTextElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGTextElement: { @@ -10178,6 +11000,8 @@ interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference { readonly TEXTPATH_SPACINGTYPE_AUTO: number; readonly TEXTPATH_SPACINGTYPE_EXACT: number; readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number; + addEventListener(type: K, listener: (this: SVGTextPathElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGTextPathElement: { @@ -10197,6 +11021,8 @@ interface SVGTextPositioningElement extends SVGTextContentElement { readonly rotate: SVGAnimatedNumberList; readonly x: SVGAnimatedLengthList; readonly y: SVGAnimatedLengthList; + addEventListener(type: K, listener: (this: SVGTextPositioningElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } declare var SVGTextPositioningElement: { @@ -10204,8 +11030,8 @@ declare var SVGTextPositioningElement: { new(): SVGTextPositioningElement; } -interface SVGTitleElement extends SVGElement, SVGStylable, SVGLangSpace { - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; +interface SVGTitleElement extends SVGElement { + addEventListener(type: K, listener: (this: SVGTitleElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10270,14 +11096,14 @@ interface SVGUnitTypes { } declare var SVGUnitTypes: SVGUnitTypes; -interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference { +interface SVGUseElement extends SVGGraphicsElement, SVGURIReference { readonly animatedInstanceRoot: SVGElementInstance; readonly height: SVGAnimatedLength; readonly instanceRoot: SVGElementInstance; readonly width: SVGAnimatedLength; readonly x: SVGAnimatedLength; readonly y: SVGAnimatedLength; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGUseElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10286,9 +11112,9 @@ declare var SVGUseElement: { new(): SVGUseElement; } -interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan { +interface SVGViewElement extends SVGElement, SVGZoomAndPan, SVGFitToViewBox { readonly viewTarget: SVGStringList; - addEventListener(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: SVGViewElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -10320,6 +11146,26 @@ declare var SVGZoomEvent: { new(): SVGZoomEvent; } +interface ScopedCredential { + readonly id: ArrayBuffer; + readonly type: string; +} + +declare var ScopedCredential: { + prototype: ScopedCredential; + new(): ScopedCredential; +} + +interface ScopedCredentialInfo { + readonly credential: ScopedCredential; + readonly publicKey: CryptoKey; +} + +declare var ScopedCredentialInfo: { + prototype: ScopedCredentialInfo; + new(): ScopedCredentialInfo; +} + interface ScreenEventMap { "MSOrientationChange": Event; } @@ -10381,6 +11227,10 @@ declare var ScriptProcessorNode: { interface Selection { readonly anchorNode: Node; readonly anchorOffset: number; + readonly baseNode: Node; + readonly baseOffset: number; + readonly extentNode: Node; + readonly extentOffset: number; readonly focusNode: Node; readonly focusOffset: number; readonly isCollapsed: boolean; @@ -10399,6 +11249,7 @@ interface Selection { removeRange(range: Range): void; selectAllChildren(parentNode: Node): void; setBaseAndExtent(baseNode: Node, baseOffset: number, extentNode: Node, extentOffset: number): void; + setPosition(parentNode: Node, offset: number): void; toString(): string; } @@ -10407,6 +11258,84 @@ declare var Selection: { new(): Selection; } +interface ServiceWorkerEventMap extends AbstractWorkerEventMap { + "statechange": Event; +} + +interface ServiceWorker extends EventTarget, AbstractWorker { + onstatechange: (this: ServiceWorker, ev: Event) => any; + readonly scriptURL: USVString; + readonly state: string; + postMessage(message: any, transfer?: any[]): void; + addEventListener(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var ServiceWorker: { + prototype: ServiceWorker; + new(): ServiceWorker; +} + +interface ServiceWorkerContainerEventMap { + "controllerchange": Event; + "message": ServiceWorkerMessageEvent; +} + +interface ServiceWorkerContainer extends EventTarget { + readonly controller: ServiceWorker | null; + oncontrollerchange: (this: ServiceWorkerContainer, ev: Event) => any; + onmessage: (this: ServiceWorkerContainer, ev: ServiceWorkerMessageEvent) => any; + readonly ready: PromiseLike; + getRegistration(clientURL?: USVString): PromiseLike; + getRegistrations(): any; + register(scriptURL: USVString, options?: RegistrationOptions): PromiseLike; + addEventListener(type: K, listener: (this: ServiceWorkerContainer, ev: ServiceWorkerContainerEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var ServiceWorkerContainer: { + prototype: ServiceWorkerContainer; + new(): ServiceWorkerContainer; +} + +interface ServiceWorkerMessageEvent extends Event { + readonly data: any; + readonly lastEventId: string; + readonly origin: string; + readonly ports: MessagePort[] | null; + readonly source: ServiceWorker | MessagePort | null; +} + +declare var ServiceWorkerMessageEvent: { + prototype: ServiceWorkerMessageEvent; + new(type: string, eventInitDict?: ServiceWorkerMessageEventInit): ServiceWorkerMessageEvent; +} + +interface ServiceWorkerRegistrationEventMap { + "updatefound": Event; +} + +interface ServiceWorkerRegistration extends EventTarget { + readonly active: ServiceWorker | null; + readonly installing: ServiceWorker | null; + onupdatefound: (this: ServiceWorkerRegistration, ev: Event) => any; + readonly pushManager: PushManager; + readonly scope: USVString; + readonly sync: SyncManager; + readonly waiting: ServiceWorker | null; + getNotifications(filter?: GetNotificationOptions): any; + showNotification(title: string, options?: NotificationOptions): PromiseLike; + unregister(): PromiseLike; + update(): PromiseLike; + addEventListener(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var ServiceWorkerRegistration: { + prototype: ServiceWorkerRegistration; + new(): ServiceWorkerRegistration; +} + interface SourceBuffer extends EventTarget { appendWindowEnd: number; appendWindowStart: number; @@ -10438,6 +11367,87 @@ declare var SourceBufferList: { new(): SourceBufferList; } +interface SpeechSynthesisEventMap { + "voiceschanged": Event; +} + +interface SpeechSynthesis extends EventTarget { + onvoiceschanged: (this: SpeechSynthesis, ev: Event) => any; + readonly paused: boolean; + readonly pending: boolean; + readonly speaking: boolean; + cancel(): void; + getVoices(): SpeechSynthesisVoice[]; + pause(): void; + resume(): void; + speak(utterance: SpeechSynthesisUtterance): void; + addEventListener(type: K, listener: (this: SpeechSynthesis, ev: SpeechSynthesisEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var SpeechSynthesis: { + prototype: SpeechSynthesis; + new(): SpeechSynthesis; +} + +interface SpeechSynthesisEvent extends Event { + readonly charIndex: number; + readonly elapsedTime: number; + readonly name: string; + readonly utterance: SpeechSynthesisUtterance | null; +} + +declare var SpeechSynthesisEvent: { + prototype: SpeechSynthesisEvent; + new(type: string, eventInitDict?: SpeechSynthesisEventInit): SpeechSynthesisEvent; +} + +interface SpeechSynthesisUtteranceEventMap { + "boundary": Event; + "end": Event; + "error": Event; + "mark": Event; + "pause": Event; + "resume": Event; + "start": Event; +} + +interface SpeechSynthesisUtterance extends EventTarget { + lang: string; + onboundary: (this: SpeechSynthesisUtterance, ev: Event) => any; + onend: (this: SpeechSynthesisUtterance, ev: Event) => any; + onerror: (this: SpeechSynthesisUtterance, ev: Event) => any; + onmark: (this: SpeechSynthesisUtterance, ev: Event) => any; + onpause: (this: SpeechSynthesisUtterance, ev: Event) => any; + onresume: (this: SpeechSynthesisUtterance, ev: Event) => any; + onstart: (this: SpeechSynthesisUtterance, ev: Event) => any; + pitch: number; + rate: number; + text: string; + voice: SpeechSynthesisVoice; + volume: number; + addEventListener(type: K, listener: (this: SpeechSynthesisUtterance, ev: SpeechSynthesisUtteranceEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var SpeechSynthesisUtterance: { + prototype: SpeechSynthesisUtterance; + new(text?: string): SpeechSynthesisUtterance; +} + +interface SpeechSynthesisVoice { + readonly default: boolean; + readonly lang: string; + readonly localService: boolean; + readonly name: string; + readonly voiceURI: string; +} + +declare var SpeechSynthesisVoice: { + prototype: SpeechSynthesisVoice; + new(): SpeechSynthesisVoice; +} + interface StereoPannerNode extends AudioNode { readonly pan: AudioParam; } @@ -10549,6 +11559,16 @@ declare var SubtleCrypto: { new(): SubtleCrypto; } +interface SyncManager { + getTags(): any; + register(tag: string): PromiseLike; +} + +declare var SyncManager: { + prototype: SyncManager; + new(): SyncManager; +} + interface Text extends CharacterData { readonly wholeText: string; readonly assignedSlot: HTMLSlotElement | null; @@ -10603,7 +11623,7 @@ declare var TextMetrics: { interface TextTrackEventMap { "cuechange": Event; - "error": ErrorEvent; + "error": Event; "load": Event; } @@ -10616,7 +11636,7 @@ interface TextTrack extends EventTarget { readonly language: string; mode: any; oncuechange: (this: TextTrack, ev: Event) => any; - onerror: (this: TextTrack, ev: ErrorEvent) => any; + onerror: (this: TextTrack, ev: Event) => any; onload: (this: TextTrack, ev: Event) => any; readonly readyState: number; addCue(cue: TextTrackCue): void; @@ -10728,11 +11748,14 @@ declare var Touch: { interface TouchEvent extends UIEvent { readonly altKey: boolean; readonly changedTouches: TouchList; + readonly charCode: number; readonly ctrlKey: boolean; + readonly keyCode: number; readonly metaKey: boolean; readonly shiftKey: boolean; readonly targetTouches: TouchList; readonly touches: TouchList; + readonly which: number; } declare var TouchEvent: { @@ -10752,12 +11775,12 @@ declare var TouchList: { } interface TrackEvent extends Event { - readonly track: any; + readonly track: VideoTrack | AudioTrack | TextTrack | null; } declare var TrackEvent: { prototype: TrackEvent; - new(): TrackEvent; + new(typeArg: string, eventInitDict?: TrackEventInit): TrackEvent; } interface TransitionEvent extends Event { @@ -10768,7 +11791,7 @@ interface TransitionEvent extends Event { declare var TransitionEvent: { prototype: TransitionEvent; - new(): TransitionEvent; + new(typeArg: string, eventInitDict?: TransitionEventInit): TransitionEvent; } interface TreeWalker { @@ -10799,7 +11822,7 @@ interface UIEvent extends Event { declare var UIEvent: { prototype: UIEvent; - new(type: string, eventInitDict?: UIEventInit): UIEvent; + new(typeArg: string, eventInitDict?: UIEventInit): UIEvent; } interface URL { @@ -10814,6 +11837,7 @@ interface URL { protocol: string; search: string; username: string; + readonly searchparams: URLSearchParams; toString(): string; } @@ -10950,6 +11974,28 @@ declare var WaveShaperNode: { new(): WaveShaperNode; } +interface WebAuthentication { + getAssertion(assertionChallenge: any, options?: AssertionOptions): PromiseLike; + makeCredential(accountInformation: Account, cryptoParameters: ScopedCredentialParameters[], attestationChallenge: any, options?: ScopedCredentialOptions): PromiseLike; +} + +declare var WebAuthentication: { + prototype: WebAuthentication; + new(): WebAuthentication; +} + +interface WebAuthnAssertion { + readonly authenticatorData: ArrayBuffer; + readonly clientData: ArrayBuffer; + readonly credential: ScopedCredential; + readonly signature: ArrayBuffer; +} + +declare var WebAuthnAssertion: { + prototype: WebAuthnAssertion; + new(): WebAuthnAssertion; +} + interface WebGLActiveInfo { readonly name: string; readonly size: number; @@ -10975,7 +12021,7 @@ interface WebGLContextEvent extends Event { declare var WebGLContextEvent: { prototype: WebGLContextEvent; - new(type: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent; + new(typeArg: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent; } interface WebGLFramebuffer extends WebGLObject { @@ -11102,7 +12148,7 @@ interface WebGLRenderingContext { isTexture(texture: WebGLTexture | null): boolean; lineWidth(width: number): void; linkProgram(program: WebGLProgram | null): void; - pixelStorei(pname: number, param: number): void; + pixelStorei(pname: number, param: number | boolean): void; polygonOffset(factor: number, units: number): void; readPixels(x: number, y: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView | null): void; renderbufferStorage(target: number, internalformat: number, width: number, height: number): void; @@ -11828,6 +12874,56 @@ declare var WebKitCSSMatrix: { new(text?: string): WebKitCSSMatrix; } +interface WebKitDirectoryEntry extends WebKitEntry { + createReader(): WebKitDirectoryReader; +} + +declare var WebKitDirectoryEntry: { + prototype: WebKitDirectoryEntry; + new(): WebKitDirectoryEntry; +} + +interface WebKitDirectoryReader { + readEntries(successCallback: WebKitEntriesCallback, errorCallback?: WebKitErrorCallback): void; +} + +declare var WebKitDirectoryReader: { + prototype: WebKitDirectoryReader; + new(): WebKitDirectoryReader; +} + +interface WebKitEntry { + readonly filesystem: WebKitFileSystem; + readonly fullPath: string; + readonly isDirectory: boolean; + readonly isFile: boolean; + readonly name: string; +} + +declare var WebKitEntry: { + prototype: WebKitEntry; + new(): WebKitEntry; +} + +interface WebKitFileEntry extends WebKitEntry { + file(successCallback: WebKitFileCallback, errorCallback?: WebKitErrorCallback): void; +} + +declare var WebKitFileEntry: { + prototype: WebKitFileEntry; + new(): WebKitFileEntry; +} + +interface WebKitFileSystem { + readonly name: string; + readonly root: WebKitDirectoryEntry; +} + +declare var WebKitFileSystem: { + prototype: WebKitFileSystem; + new(): WebKitFileSystem; +} + interface WebKitPoint { x: number; y: number; @@ -11840,7 +12936,7 @@ declare var WebKitPoint: { interface WebSocketEventMap { "close": CloseEvent; - "error": ErrorEvent; + "error": Event; "message": MessageEvent; "open": Event; } @@ -11850,7 +12946,7 @@ interface WebSocket extends EventTarget { readonly bufferedAmount: number; readonly extensions: string; onclose: (this: WebSocket, ev: CloseEvent) => any; - onerror: (this: WebSocket, ev: ErrorEvent) => any; + onerror: (this: WebSocket, ev: Event) => any; onmessage: (this: WebSocket, ev: MessageEvent) => any; onopen: (this: WebSocket, ev: Event) => any; readonly protocol: string; @@ -11987,8 +13083,9 @@ interface WindowEventMap extends GlobalEventHandlersEventMap { "waiting": Event; } -interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 { +interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64, GlobalFetch { readonly applicationCache: ApplicationCache; + readonly caches: CacheStorage; readonly clientInformation: Navigator; readonly closed: boolean; readonly crypto: Crypto; @@ -12003,10 +13100,12 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window readonly history: History; readonly innerHeight: number; readonly innerWidth: number; + readonly isSecureContext: boolean; readonly length: number; readonly location: Location; readonly locationbar: BarProp; readonly menubar: BarProp; + readonly msContentScript: ExtensionScriptApis; readonly msCredentials: MSCredentials; name: string; readonly navigator: Navigator; @@ -12120,6 +13219,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window readonly scrollY: number; readonly scrollbars: BarProp; readonly self: Window; + readonly speechSynthesis: SpeechSynthesis; status: string; readonly statusbar: BarProp; readonly styleMedia: StyleMedia; @@ -12128,12 +13228,14 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window readonly window: Window; URL: typeof URL; Blob: typeof Blob; + customElements: CustomElementRegistry; alert(message?: any): void; blur(): void; cancelAnimationFrame(handle: number): void; captureEvents(): void; close(): void; confirm(message?: string): boolean; + departFocus(navigationReason: string, origin: FocusNavigationOrigin): void; focus(): void; getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration; getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList; @@ -12153,6 +13255,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window scroll(x?: number, y?: number): void; scrollBy(x?: number, y?: number): void; scrollTo(x?: number, y?: number): void; + stop(): void; webkitCancelAnimationFrame(handle: number): void; webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint; webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint; @@ -12175,7 +13278,7 @@ interface WorkerEventMap extends AbstractWorkerEventMap { interface Worker extends EventTarget, AbstractWorker { onmessage: (this: Worker, ev: MessageEvent) => any; - postMessage(message: any, ports?: any): void; + postMessage(message: any, transfer?: any[]): void; terminate(): void; addEventListener(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -12187,7 +13290,7 @@ declare var Worker: { } interface XMLDocument extends Document { - addEventListener(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: XMLDocument, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -12206,14 +13309,14 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget { readonly response: any; readonly responseText: string; responseType: string; - readonly responseXML: any; + readonly responseURL: string; + readonly responseXML: Document | null; readonly status: number; readonly statusText: string; timeout: number; readonly upload: XMLHttpRequestUpload; withCredentials: boolean; msCaching?: string; - readonly responseURL: string; abort(): void; getAllResponseHeaders(): string; getResponseHeader(header: string): string | null; @@ -12241,11 +13344,10 @@ declare var XMLHttpRequest: { readonly LOADING: number; readonly OPENED: number; readonly UNSENT: number; - create(): XMLHttpRequest; } interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget { - addEventListener(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -12345,6 +13447,16 @@ declare var XSLTProcessor: { new(): XSLTProcessor; } +interface webkitRTCPeerConnection extends RTCPeerConnection { + addEventListener(type: K, listener: (this: webkitRTCPeerConnection, ev: RTCPeerConnectionEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var webkitRTCPeerConnection: { + prototype: webkitRTCPeerConnection; + new(configuration: RTCConfiguration): webkitRTCPeerConnection; +} + interface AbstractWorkerEventMap { "error": ErrorEvent; } @@ -12355,6 +13467,14 @@ interface AbstractWorker { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } +interface Body { + readonly bodyUsed: boolean; + arrayBuffer(): PromiseLike; + blob(): PromiseLike; + json(): PromiseLike; + text(): PromiseLike; +} + interface CanvasPathMethods { arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void; arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void; @@ -12381,12 +13501,10 @@ interface DOML2DeprecatedSizeProperty { interface DocumentEvent { createEvent(eventInterface:"AnimationEvent"): AnimationEvent; - createEvent(eventInterface:"AriaRequestEvent"): AriaRequestEvent; createEvent(eventInterface:"AudioProcessingEvent"): AudioProcessingEvent; createEvent(eventInterface:"BeforeUnloadEvent"): BeforeUnloadEvent; createEvent(eventInterface:"ClipboardEvent"): ClipboardEvent; createEvent(eventInterface:"CloseEvent"): CloseEvent; - createEvent(eventInterface:"CommandEvent"): CommandEvent; createEvent(eventInterface:"CompositionEvent"): CompositionEvent; createEvent(eventInterface:"CustomEvent"): CustomEvent; createEvent(eventInterface:"DeviceLightEvent"): DeviceLightEvent; @@ -12397,6 +13515,7 @@ interface DocumentEvent { createEvent(eventInterface:"Event"): Event; createEvent(eventInterface:"Events"): Event; createEvent(eventInterface:"FocusEvent"): FocusEvent; + createEvent(eventInterface:"FocusNavigationEvent"): FocusNavigationEvent; createEvent(eventInterface:"GamepadEvent"): GamepadEvent; createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent; createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent; @@ -12412,6 +13531,7 @@ interface DocumentEvent { createEvent(eventInterface:"MediaEncryptedEvent"): MediaEncryptedEvent; createEvent(eventInterface:"MediaKeyMessageEvent"): MediaKeyMessageEvent; createEvent(eventInterface:"MediaStreamErrorEvent"): MediaStreamErrorEvent; + createEvent(eventInterface:"MediaStreamEvent"): MediaStreamEvent; createEvent(eventInterface:"MediaStreamTrackEvent"): MediaStreamTrackEvent; createEvent(eventInterface:"MessageEvent"): MessageEvent; createEvent(eventInterface:"MouseEvent"): MouseEvent; @@ -12424,6 +13544,7 @@ interface DocumentEvent { createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent; createEvent(eventInterface:"OverflowEvent"): OverflowEvent; createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent; + createEvent(eventInterface:"PaymentRequestUpdateEvent"): PaymentRequestUpdateEvent; createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent; createEvent(eventInterface:"PointerEvent"): PointerEvent; createEvent(eventInterface:"PopStateEvent"): PopStateEvent; @@ -12433,10 +13554,13 @@ interface DocumentEvent { createEvent(eventInterface:"RTCIceCandidatePairChangedEvent"): RTCIceCandidatePairChangedEvent; createEvent(eventInterface:"RTCIceGathererEvent"): RTCIceGathererEvent; createEvent(eventInterface:"RTCIceTransportStateChangedEvent"): RTCIceTransportStateChangedEvent; + createEvent(eventInterface:"RTCPeerConnectionIceEvent"): RTCPeerConnectionIceEvent; createEvent(eventInterface:"RTCSsrcConflictEvent"): RTCSsrcConflictEvent; createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent; createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent; createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent; + createEvent(eventInterface:"ServiceWorkerMessageEvent"): ServiceWorkerMessageEvent; + createEvent(eventInterface:"SpeechSynthesisEvent"): SpeechSynthesisEvent; createEvent(eventInterface:"StorageEvent"): StorageEvent; createEvent(eventInterface:"TextEvent"): TextEvent; createEvent(eventInterface:"TouchEvent"): TouchEvent; @@ -12452,10 +13576,10 @@ interface DocumentEvent { interface ElementTraversal { readonly childElementCount: number; - readonly firstElementChild: Element; - readonly lastElementChild: Element; - readonly nextElementSibling: Element; - readonly previousElementSibling: Element; + readonly firstElementChild: Element | null; + readonly lastElementChild: Element | null; + readonly nextElementSibling: Element | null; + readonly previousElementSibling: Element | null; } interface GetSVGDocument { @@ -12488,6 +13612,10 @@ interface GlobalEventHandlers { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } +interface GlobalFetch { + fetch(input: RequestInfo, init?: RequestInit): PromiseLike; +} + interface HTMLTableAlignment { /** * Sets or retrieves a value that you can use to implement your own ch functionality for the object. @@ -12551,6 +13679,14 @@ interface MSNavigatorDoNotTrack { storeWebWideTrackingException(args: StoreExceptionsInformation): void; } +interface NavigatorBeacon { + sendBeacon(url: USVString, data?: BodyInit): boolean; +} + +interface NavigatorConcurrentHardware { + readonly hardwareConcurrency: number; +} + interface NavigatorContentUtils { } @@ -12559,6 +13695,7 @@ interface NavigatorGeolocation { } interface NavigatorID { + readonly appCodeName: string; readonly appName: string; readonly appVersion: string; readonly platform: string; @@ -12592,20 +13729,12 @@ interface RandomSource { getRandomValues(array: ArrayBufferView): ArrayBufferView; } -interface SVGAnimatedPathData { - readonly pathSegList: SVGPathSegList; -} - interface SVGAnimatedPoints { readonly animatedPoints: SVGPointList; readonly points: SVGPointList; } -interface SVGExternalResourcesRequired { - readonly externalResourcesRequired: SVGAnimatedBoolean; -} - -interface SVGFilterPrimitiveStandardAttributes extends SVGStylable { +interface SVGFilterPrimitiveStandardAttributes { readonly height: SVGAnimatedLength; readonly result: SVGAnimatedString; readonly width: SVGAnimatedLength; @@ -12618,25 +13747,6 @@ interface SVGFitToViewBox { readonly viewBox: SVGAnimatedRect; } -interface SVGLangSpace { - xmllang: string; - xmlspace: string; -} - -interface SVGLocatable { - readonly farthestViewportElement: SVGElement; - readonly nearestViewportElement: SVGElement; - getBBox(): SVGRect; - getCTM(): SVGMatrix; - getScreenCTM(): SVGMatrix; - getTransformToElement(element: SVGElement): SVGMatrix; -} - -interface SVGStylable { - className: any; - readonly style: CSSStyleDeclaration; -} - interface SVGTests { readonly requiredExtensions: SVGStringList; readonly requiredFeatures: SVGStringList; @@ -12644,10 +13754,6 @@ interface SVGTests { hasExtension(extension: string): boolean; } -interface SVGTransformable extends SVGLocatable { - readonly transform: SVGAnimatedTransformList; -} - interface SVGURIReference { readonly href: SVGAnimatedString; } @@ -12706,6 +13812,14 @@ interface XMLHttpRequestEventTarget { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } +interface ErrorEventInit { + message?: string; + filename?: string; + lineno?: number; + conlno?: number; + error?: any; +} + interface StorageEventInit extends EventInit { key?: string; oldValue?: string; @@ -12721,6 +13835,41 @@ interface Canvas2DContextAttributes { [attribute: string]: boolean | string | undefined; } +interface URLSearchParams { + /** + * Appends a specified key/value pair as a new search parameter. + */ + append(name: string, value: string): void; + /** + * Deletes the given search parameter, and its associated value, from the list of all search parameters. + */ + delete(name: string): void; + /** + * Returns the first value associated to the given search parameter. + */ + get(name: string): string | null; + /** + * Returns all the values association with a given search parameter. + */ + getAll(name: string): string[]; + /** + * Returns a Boolean indicating if such a search parameter exists. + */ + has(name: string): boolean; + /** + * Sets the value associated to a given search parameter to the given value. If there were several values, delete the others. + */ + set(name: string, value: string): void; +} + +declare var URLSearchParams: { + prototype: URLSearchParams; + /** + * Constructor returning a URLSearchParams object. + */ + new (init?: string | URLSearchParams): URLSearchParams; +} + interface NodeListOf extends NodeList { length: number; item(index: number): TNode; @@ -12730,7 +13879,6 @@ interface NodeListOf extends NodeList { interface HTMLCollectionOf extends HTMLCollection { item(index: number): T; namedItem(name: string): T; - [index: number]: T; } interface BlobPropertyBag { @@ -12747,15 +13895,6 @@ interface EventListenerObject { handleEvent(evt: Event): void; } -interface MessageEventInit extends EventInit { - data?: any; - origin?: string; - lastEventId?: string; - channel?: string; - source?: any; - ports?: MessagePort[]; -} - interface ProgressEventInit extends EventInit { lengthComputable?: boolean; loaded?: number; @@ -12957,8 +14096,8 @@ interface JsonWebKey { interface ParentNode { readonly children: HTMLCollection; - readonly firstElementChild: Element; - readonly lastElementChild: Element; + readonly firstElementChild: Element | null; + readonly lastElementChild: Element | null; readonly childElementCount: number; } @@ -12989,6 +14128,26 @@ interface AssignedNodesOptions { flatten?: boolean; } +interface ElementDefinitionOptions { + extends: string; +} + +interface CustomElementRegistry { + define(name: string, constructor: Function, options?: ElementDefinitionOptions): void; + get(name: string): any; + whenDefined(name: string): PromiseLike; +} + +interface PromiseRejectionEvent extends Event { + readonly promise: PromiseLike; + readonly reason: any; +} + +interface PromiseRejectionEventInit extends EventInit { + promise: PromiseLike; + reason?: any; +} + declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { @@ -13024,6 +14183,18 @@ interface DecodeSuccessCallback { interface DecodeErrorCallback { (error: DOMException): void; } +interface VoidFunction { + (): void; +} +interface RTCSessionDescriptionCallback { + (sdp: RTCSessionDescription): void; +} +interface RTCPeerConnectionErrorCallback { + (error: DOMError): void; +} +interface RTCStatsCallback { + (report: RTCStatsReport): void; +} interface FunctionStringCallback { (data: string): void; } @@ -13036,6 +14207,12 @@ interface NavigatorUserMediaErrorCallback { interface ForEachCallback { (keyId: any, status: string): void; } +interface NotificationPermissionCallback { + (permission: string): void; +} +interface IntersectionObserverCallback { + (entries: IntersectionObserverEntry[], observer: IntersectionObserver): void; +} interface HTMLElementTagNameMap { "a": HTMLAnchorElement; "applet": HTMLAppletElement; @@ -13051,6 +14228,7 @@ interface HTMLElementTagNameMap { "caption": HTMLTableCaptionElement; "col": HTMLTableColElement; "colgroup": HTMLTableColElement; + "data": HTMLDataElement; "datalist": HTMLDataListElement; "del": HTMLModElement; "dir": HTMLDirectoryElement; @@ -13091,6 +14269,7 @@ interface HTMLElementTagNameMap { "ol": HTMLOListElement; "optgroup": HTMLOptGroupElement; "option": HTMLOptionElement; + "output": HTMLOutputElement; "p": HTMLParagraphElement; "param": HTMLParamElement; "picture": HTMLPictureElement; @@ -13110,6 +14289,7 @@ interface HTMLElementTagNameMap { "tfoot": HTMLTableSectionElement; "th": HTMLTableHeaderCellElement; "thead": HTMLTableSectionElement; + "time": HTMLTimeElement; "title": HTMLTitleElement; "tr": HTMLTableRowElement; "track": HTMLTrackElement; @@ -13147,6 +14327,7 @@ interface ElementTagNameMap { "code": HTMLElement; "col": HTMLTableColElement; "colgroup": HTMLTableColElement; + "data": HTMLDataElement; "datalist": HTMLDataListElement; "dd": HTMLElement; "defs": SVGDefsElement; @@ -13240,6 +14421,7 @@ interface ElementTagNameMap { "ol": HTMLOListElement; "optgroup": HTMLOptGroupElement; "option": HTMLOptionElement; + "output": HTMLOutputElement; "p": HTMLParagraphElement; "param": HTMLParamElement; "path": SVGPathElement; @@ -13282,6 +14464,7 @@ interface ElementTagNameMap { "tfoot": HTMLTableSectionElement; "th": HTMLTableHeaderCellElement; "thead": HTMLTableSectionElement; + "time": HTMLTimeElement; "title": HTMLTitleElement; "tr": HTMLTableRowElement; "track": HTMLTrackElement; @@ -13326,6 +14509,7 @@ interface ElementListTagNameMap { "code": NodeListOf; "col": NodeListOf; "colgroup": NodeListOf; + "data": NodeListOf; "datalist": NodeListOf; "dd": NodeListOf; "defs": NodeListOf; @@ -13419,6 +14603,7 @@ interface ElementListTagNameMap { "ol": NodeListOf; "optgroup": NodeListOf; "option": NodeListOf; + "output": NodeListOf; "p": NodeListOf; "param": NodeListOf; "path": NodeListOf; @@ -13461,6 +14646,7 @@ interface ElementListTagNameMap { "tfoot": NodeListOf; "th": NodeListOf; "thead": NodeListOf; + "time": NodeListOf; "title": NodeListOf; "tr": NodeListOf; "track": NodeListOf; @@ -13481,6 +14667,7 @@ declare var Audio: {new(src?: string): HTMLAudioElement; }; declare var Image: {new(width?: number, height?: number): HTMLImageElement; }; declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; }; declare var applicationCache: ApplicationCache; +declare var caches: CacheStorage; declare var clientInformation: Navigator; declare var closed: boolean; declare var crypto: Crypto; @@ -13495,10 +14682,12 @@ declare var frames: Window; declare var history: History; declare var innerHeight: number; declare var innerWidth: number; +declare var isSecureContext: boolean; declare var length: number; declare var location: Location; declare var locationbar: BarProp; declare var menubar: BarProp; +declare var msContentScript: ExtensionScriptApis; declare var msCredentials: MSCredentials; declare const name: never; declare var navigator: Navigator; @@ -13612,18 +14801,21 @@ declare var scrollX: number; declare var scrollY: number; declare var scrollbars: BarProp; declare var self: Window; +declare var speechSynthesis: SpeechSynthesis; declare var status: string; declare var statusbar: BarProp; declare var styleMedia: StyleMedia; declare var toolbar: BarProp; declare var top: Window; declare var window: Window; +declare var customElements: CustomElementRegistry; declare function alert(message?: any): void; declare function blur(): void; declare function cancelAnimationFrame(handle: number): void; declare function captureEvents(): void; declare function close(): void; declare function confirm(message?: string): boolean; +declare function departFocus(navigationReason: string, origin: FocusNavigationOrigin): void; declare function focus(): void; declare function getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration; declare function getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList; @@ -13643,6 +14835,7 @@ declare function resizeTo(x?: number, y?: number): void; declare function scroll(x?: number, y?: number): void; declare function scrollBy(x?: number, y?: number): void; declare function scrollTo(x?: number, y?: number): void; +declare function stop(): void; declare function webkitCancelAnimationFrame(handle: number): void; declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint; declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint; @@ -13677,10 +14870,13 @@ declare var onwheel: (this: Window, ev: WheelEvent) => any; declare var indexedDB: IDBFactory; declare function atob(encodedString: string): string; declare function btoa(rawString: string): string; +declare function fetch(input: RequestInfo, init?: RequestInit): PromiseLike; declare function addEventListener(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void; declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; type AAGUID = string; type AlgorithmIdentifier = string | Algorithm; +type BodyInit = any; +type ByteString = string; type ConstrainBoolean = boolean | ConstrainBooleanParameters; type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters; type ConstrainDouble = number | ConstrainDoubleRange; @@ -13700,6 +14896,7 @@ type GLsizeiptr = number; type GLubyte = number; type GLuint = number; type GLushort = number; +type HeadersInit = any; type IDBKeyPath = string; type KeyFormat = string; type KeyType = string; @@ -13707,8 +14904,10 @@ type KeyUsage = string; type MSInboundPayload = MSVideoRecvPayload | MSAudioRecvPayload; type MSLocalClientEvent = MSLocalClientEventBase | MSAudioLocalClientEvent; type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload; -type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete; +type RTCIceGatherCandidate = RTCIceCandidateDictionary | RTCIceCandidateComplete; type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport; +type RequestInfo = Request | string; +type USVString = string; type payloadtype = number; type ScrollBehavior = "auto" | "instant" | "smooth"; type ScrollLogicalPosition = "start" | "center" | "end" | "nearest"; diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts index 089d0bdc5d504..e949526641bbd 100644 --- a/src/lib/webworker.generated.d.ts +++ b/src/lib/webworker.generated.d.ts @@ -7,12 +7,29 @@ interface Algorithm { name: string; } +interface CacheQueryOptions { + ignoreSearch?: boolean; + ignoreMethod?: boolean; + ignoreVary?: boolean; + cacheName?: string; +} + +interface CloseEventInit extends EventInit { + wasClean?: boolean; + code?: number; + reason?: string; +} + interface EventInit { scoped?: boolean; bubbles?: boolean; cancelable?: boolean; } +interface GetNotificationOptions { + tag?: string; +} + interface IDBIndexParameters { multiEntry?: boolean; unique?: boolean; @@ -27,10 +44,101 @@ interface KeyAlgorithm { name?: string; } +interface MessageEventInit extends EventInit { + lastEventId?: string; + channel?: string; + data?: any; + origin?: string; + source?: any; + ports?: MessagePort[]; +} + +interface NotificationOptions { + dir?: string; + lang?: string; + body?: string; + tag?: string; + icon?: string; +} + +interface PushSubscriptionOptionsInit { + userVisibleOnly?: boolean; + applicationServerKey?: any; +} + +interface RequestInit { + method?: string; + headers?: any; + body?: any; + referrer?: string; + referrerPolicy?: string; + mode?: string; + credentials?: string; + cache?: string; + redirect?: string; + integrity?: string; + keepalive?: boolean; + window?: any; +} + +interface ResponseInit { + status?: number; + statusText?: string; + headers?: any; +} + +interface ClientQueryOptions { + includeUncontrolled?: boolean; + type?: string; +} + +interface ExtendableEventInit extends EventInit { +} + +interface ExtendableMessageEventInit extends ExtendableEventInit { + data?: any; + origin?: string; + lastEventId?: string; + source?: Client | ServiceWorker | MessagePort; + ports?: MessagePort[]; +} + +interface FetchEventInit extends ExtendableEventInit { + request?: Request; + clientId?: string; + isReload?: boolean; +} + +interface NotificationEventInit extends ExtendableEventInit { + notification?: Notification; + action?: string; +} + +interface PushEventInit extends ExtendableEventInit { + data?: any; +} + +interface SyncEventInit extends ExtendableEventInit { + tag?: string; + lastChance?: boolean; +} + interface EventListener { (evt: Event): void; } +interface WebKitEntriesCallback { + (evt: Event): void; +} + +interface WebKitErrorCallback { + (evt: Event): void; +} + +interface WebKitFileCallback { + (evt: Event): void; +} + interface AudioBuffer { readonly duration: number; readonly length: number; @@ -59,6 +167,34 @@ declare var Blob: { new (blobParts?: any[], options?: BlobPropertyBag): Blob; } +interface Cache { + add(request: RequestInfo): PromiseLike; + addAll(requests: RequestInfo[]): PromiseLike; + delete(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + keys(request?: RequestInfo, options?: CacheQueryOptions): any; + match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + matchAll(request?: RequestInfo, options?: CacheQueryOptions): any; + put(request: RequestInfo, response: Response): PromiseLike; +} + +declare var Cache: { + prototype: Cache; + new(): Cache; +} + +interface CacheStorage { + delete(cacheName: string): PromiseLike; + has(cacheName: string): PromiseLike; + keys(): any; + match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + open(cacheName: string): PromiseLike; +} + +declare var CacheStorage: { + prototype: CacheStorage; + new(): CacheStorage; +} + interface CloseEvent extends Event { readonly code: number; readonly reason: string; @@ -68,14 +204,14 @@ interface CloseEvent extends Event { declare var CloseEvent: { prototype: CloseEvent; - new(): CloseEvent; + new(typeArg: string, eventInitDict?: CloseEventInit): CloseEvent; } interface Console { assert(test?: boolean, message?: string, ...optionalParams: any[]): void; clear(): void; count(countTitle?: string): void; - debug(message?: string, ...optionalParams: any[]): void; + debug(message?: any, ...optionalParams: any[]): void; dir(value?: any, ...optionalParams: any[]): void; dirxml(value: any): void; error(message?: any, ...optionalParams: any[]): void; @@ -227,7 +363,7 @@ interface ErrorEvent extends Event { declare var ErrorEvent: { prototype: ErrorEvent; - new(): ErrorEvent; + new(type: string, errorEventInitDict?: ErrorEventInit): ErrorEvent; } interface Event { @@ -256,7 +392,7 @@ interface Event { declare var Event: { prototype: Event; - new(type: string, eventInitDict?: EventInit): Event; + new(typeArg: string, eventInitDict?: EventInit): Event; readonly AT_TARGET: number; readonly BUBBLING_PHASE: number; readonly CAPTURING_PHASE: number; @@ -301,7 +437,7 @@ interface FileReader extends EventTarget, MSBaseReader { readAsBinaryString(blob: Blob): void; readAsDataURL(blob: Blob): void; readAsText(blob: Blob, encoding?: string): void; - addEventListener(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: FileReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -310,6 +446,20 @@ declare var FileReader: { new(): FileReader; } +interface Headers { + append(name: string, value: string): void; + delete(name: string): void; + forEach(callback: ForEachCallback): void; + get(name: string): string | null; + has(name: string): boolean; + set(name: string, value: string): void; +} + +declare var Headers: { + prototype: Headers; + new(init?: any): Headers; +} + interface IDBCursor { readonly direction: string; key: IDBKeyRange | IDBValidKey; @@ -345,14 +495,14 @@ declare var IDBCursorWithValue: { interface IDBDatabaseEventMap { "abort": Event; - "error": ErrorEvent; + "error": Event; } interface IDBDatabase extends EventTarget { readonly name: string; readonly objectStoreNames: DOMStringList; onabort: (this: IDBDatabase, ev: Event) => any; - onerror: (this: IDBDatabase, ev: ErrorEvent) => any; + onerror: (this: IDBDatabase, ev: Event) => any; version: number; onversionchange: (ev: IDBVersionChangeEvent) => any; close(): void; @@ -455,13 +605,13 @@ declare var IDBOpenDBRequest: { } interface IDBRequestEventMap { - "error": ErrorEvent; + "error": Event; "success": Event; } interface IDBRequest extends EventTarget { readonly error: DOMError; - onerror: (this: IDBRequest, ev: ErrorEvent) => any; + onerror: (this: IDBRequest, ev: Event) => any; onsuccess: (this: IDBRequest, ev: Event) => any; readonly readyState: string; readonly result: any; @@ -479,7 +629,7 @@ declare var IDBRequest: { interface IDBTransactionEventMap { "abort": Event; "complete": Event; - "error": ErrorEvent; + "error": Event; } interface IDBTransaction extends EventTarget { @@ -488,7 +638,7 @@ interface IDBTransaction extends EventTarget { readonly mode: string; onabort: (this: IDBTransaction, ev: Event) => any; oncomplete: (this: IDBTransaction, ev: Event) => any; - onerror: (this: IDBTransaction, ev: ErrorEvent) => any; + onerror: (this: IDBTransaction, ev: Event) => any; abort(): void; objectStore(name: string): IDBObjectStore; readonly READ_ONLY: string; @@ -528,105 +678,6 @@ declare var ImageData: { new(array: Uint8ClampedArray, width: number, height: number): ImageData; } -interface MSApp { - clearTemporaryWebDataAsync(): MSAppAsyncOperation; - createBlobFromRandomAccessStream(type: string, seeker: any): Blob; - createDataPackage(object: any): any; - createDataPackageFromSelection(): any; - createFileFromStorageFile(storageFile: any): File; - createStreamFromInputStream(type: string, inputStream: any): MSStream; - execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void; - execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any; - getCurrentPriority(): string; - getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike; - getViewId(view: any): any; - isTaskScheduledAtPriorityOrHigher(priority: string): boolean; - pageHandlesAllApplicationActivations(enabled: boolean): void; - suppressSubdownloadCredentialPrompts(suppress: boolean): void; - terminateApp(exceptionObject: any): void; - readonly CURRENT: string; - readonly HIGH: string; - readonly IDLE: string; - readonly NORMAL: string; -} -declare var MSApp: MSApp; - -interface MSAppAsyncOperationEventMap { - "complete": Event; - "error": ErrorEvent; -} - -interface MSAppAsyncOperation extends EventTarget { - readonly error: DOMError; - oncomplete: (this: MSAppAsyncOperation, ev: Event) => any; - onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any; - readonly readyState: number; - readonly result: any; - start(): void; - readonly COMPLETED: number; - readonly ERROR: number; - readonly STARTED: number; - addEventListener(type: K, listener: (this: MSAppAsyncOperation, ev: MSAppAsyncOperationEventMap[K]) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var MSAppAsyncOperation: { - prototype: MSAppAsyncOperation; - new(): MSAppAsyncOperation; - readonly COMPLETED: number; - readonly ERROR: number; - readonly STARTED: number; -} - -interface MSBlobBuilder { - append(data: any, endings?: string): void; - getBlob(contentType?: string): Blob; -} - -declare var MSBlobBuilder: { - prototype: MSBlobBuilder; - new(): MSBlobBuilder; -} - -interface MSStream { - readonly type: string; - msClose(): void; - msDetachStream(): any; -} - -declare var MSStream: { - prototype: MSStream; - new(): MSStream; -} - -interface MSStreamReader extends EventTarget, MSBaseReader { - readonly error: DOMError; - readAsArrayBuffer(stream: MSStream, size?: number): void; - readAsBinaryString(stream: MSStream, size?: number): void; - readAsBlob(stream: MSStream, size?: number): void; - readAsDataURL(stream: MSStream, size?: number): void; - readAsText(stream: MSStream, encoding?: string, size?: number): void; - addEventListener(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var MSStreamReader: { - prototype: MSStreamReader; - new(): MSStreamReader; -} - -interface MediaQueryList { - readonly matches: boolean; - readonly media: string; - addListener(listener: MediaQueryListListener): void; - removeListener(listener: MediaQueryListListener): void; -} - -declare var MediaQueryList: { - prototype: MediaQueryList; - new(): MediaQueryList; -} - interface MessageChannel { readonly port1: MessagePort; readonly port2: MessagePort; @@ -657,7 +708,7 @@ interface MessagePortEventMap { interface MessagePort extends EventTarget { onmessage: (this: MessagePort, ev: MessageEvent) => any; close(): void; - postMessage(message?: any, ports?: any): void; + postMessage(message?: any, transfer?: any[]): void; start(): void; addEventListener(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -668,6 +719,109 @@ declare var MessagePort: { new(): MessagePort; } +interface NotificationEventMap { + "click": Event; + "close": Event; + "error": Event; + "show": Event; +} + +interface Notification extends EventTarget { + readonly body: string; + readonly dir: string; + readonly icon: string; + readonly lang: string; + onclick: (this: Notification, ev: Event) => any; + onclose: (this: Notification, ev: Event) => any; + onerror: (this: Notification, ev: Event) => any; + onshow: (this: Notification, ev: Event) => any; + readonly permission: string; + readonly tag: string; + readonly title: string; + close(): void; + addEventListener(type: K, listener: (this: Notification, ev: NotificationEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var Notification: { + prototype: Notification; + new(title: string, options?: NotificationOptions): Notification; + requestPermission(callback?: NotificationPermissionCallback): PromiseLike; +} + +interface Performance { + readonly navigation: PerformanceNavigation; + readonly timing: PerformanceTiming; + clearMarks(markName?: string): void; + clearMeasures(measureName?: string): void; + clearResourceTimings(): void; + getEntries(): any; + getEntriesByName(name: string, entryType?: string): any; + getEntriesByType(entryType: string): any; + getMarks(markName?: string): any; + getMeasures(measureName?: string): any; + mark(markName: string): void; + measure(measureName: string, startMarkName?: string, endMarkName?: string): void; + now(): number; + setResourceTimingBufferSize(maxSize: number): void; + toJSON(): any; +} + +declare var Performance: { + prototype: Performance; + new(): Performance; +} + +interface PerformanceNavigation { + readonly redirectCount: number; + readonly type: number; + toJSON(): any; + readonly TYPE_BACK_FORWARD: number; + readonly TYPE_NAVIGATE: number; + readonly TYPE_RELOAD: number; + readonly TYPE_RESERVED: number; +} + +declare var PerformanceNavigation: { + prototype: PerformanceNavigation; + new(): PerformanceNavigation; + readonly TYPE_BACK_FORWARD: number; + readonly TYPE_NAVIGATE: number; + readonly TYPE_RELOAD: number; + readonly TYPE_RESERVED: number; +} + +interface PerformanceTiming { + readonly connectEnd: number; + readonly connectStart: number; + readonly domComplete: number; + readonly domContentLoadedEventEnd: number; + readonly domContentLoadedEventStart: number; + readonly domInteractive: number; + readonly domLoading: number; + readonly domainLookupEnd: number; + readonly domainLookupStart: number; + readonly fetchStart: number; + readonly loadEventEnd: number; + readonly loadEventStart: number; + readonly msFirstPaint: number; + readonly navigationStart: number; + readonly redirectEnd: number; + readonly redirectStart: number; + readonly requestStart: number; + readonly responseEnd: number; + readonly responseStart: number; + readonly unloadEventEnd: number; + readonly unloadEventStart: number; + readonly secureConnectionStart: number; + toJSON(): any; +} + +declare var PerformanceTiming: { + prototype: PerformanceTiming; + new(): PerformanceTiming; +} + interface Position { readonly coords: Coordinates; readonly timestamp: number; @@ -707,9 +861,156 @@ declare var ProgressEvent: { new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent; } +interface PushManager { + getSubscription(): PromiseLike; + permissionState(options?: PushSubscriptionOptionsInit): PromiseLike; + subscribe(options?: PushSubscriptionOptionsInit): PromiseLike; +} + +declare var PushManager: { + prototype: PushManager; + new(): PushManager; +} + +interface PushSubscription { + readonly endpoint: USVString; + readonly options: PushSubscriptionOptions; + getKey(name: string): ArrayBuffer | null; + toJSON(): any; + unsubscribe(): PromiseLike; +} + +declare var PushSubscription: { + prototype: PushSubscription; + new(): PushSubscription; +} + +interface PushSubscriptionOptions { + readonly applicationServerKey: ArrayBuffer | null; + readonly userVisibleOnly: boolean; +} + +declare var PushSubscriptionOptions: { + prototype: PushSubscriptionOptions; + new(): PushSubscriptionOptions; +} + +interface ReadableStream { + readonly locked: boolean; + cancel(): PromiseLike; + getReader(): ReadableStreamReader; +} + +declare var ReadableStream: { + prototype: ReadableStream; + new(): ReadableStream; +} + +interface ReadableStreamReader { + cancel(): PromiseLike; + read(): PromiseLike; + releaseLock(): void; +} + +declare var ReadableStreamReader: { + prototype: ReadableStreamReader; + new(): ReadableStreamReader; +} + +interface Request extends Object, Body { + readonly cache: string; + readonly credentials: string; + readonly destination: string; + readonly headers: Headers; + readonly integrity: string; + readonly keepalive: boolean; + readonly method: string; + readonly mode: string; + readonly redirect: string; + readonly referrer: string; + readonly referrerPolicy: string; + readonly type: string; + readonly url: string; + clone(): Request; +} + +declare var Request: { + prototype: Request; + new(input: Request | string, init?: RequestInit): Request; +} + +interface Response extends Object, Body { + readonly body: ReadableStream | null; + readonly headers: Headers; + readonly ok: boolean; + readonly status: number; + readonly statusText: string; + readonly type: string; + readonly url: string; + clone(): Response; +} + +declare var Response: { + prototype: Response; + new(body?: any, init?: ResponseInit): Response; +} + +interface ServiceWorkerEventMap extends AbstractWorkerEventMap { + "statechange": Event; +} + +interface ServiceWorker extends EventTarget, AbstractWorker { + onstatechange: (this: ServiceWorker, ev: Event) => any; + readonly scriptURL: USVString; + readonly state: string; + postMessage(message: any, transfer?: any[]): void; + addEventListener(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var ServiceWorker: { + prototype: ServiceWorker; + new(): ServiceWorker; +} + +interface ServiceWorkerRegistrationEventMap { + "updatefound": Event; +} + +interface ServiceWorkerRegistration extends EventTarget { + readonly active: ServiceWorker | null; + readonly installing: ServiceWorker | null; + onupdatefound: (this: ServiceWorkerRegistration, ev: Event) => any; + readonly pushManager: PushManager; + readonly scope: USVString; + readonly sync: SyncManager; + readonly waiting: ServiceWorker | null; + getNotifications(filter?: GetNotificationOptions): any; + showNotification(title: string, options?: NotificationOptions): PromiseLike; + unregister(): PromiseLike; + update(): PromiseLike; + addEventListener(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var ServiceWorkerRegistration: { + prototype: ServiceWorkerRegistration; + new(): ServiceWorkerRegistration; +} + +interface SyncManager { + getTags(): any; + register(tag: string): PromiseLike; +} + +declare var SyncManager: { + prototype: SyncManager; + new(): SyncManager; +} + interface WebSocketEventMap { "close": CloseEvent; - "error": ErrorEvent; + "error": Event; "message": MessageEvent; "open": Event; } @@ -719,7 +1020,7 @@ interface WebSocket extends EventTarget { readonly bufferedAmount: number; readonly extensions: string; onclose: (this: WebSocket, ev: CloseEvent) => any; - onerror: (this: WebSocket, ev: ErrorEvent) => any; + onerror: (this: WebSocket, ev: Event) => any; onmessage: (this: WebSocket, ev: MessageEvent) => any; onopen: (this: WebSocket, ev: Event) => any; readonly protocol: string; @@ -750,7 +1051,7 @@ interface WorkerEventMap extends AbstractWorkerEventMap { interface Worker extends EventTarget, AbstractWorker { onmessage: (this: Worker, ev: MessageEvent) => any; - postMessage(message: any, ports?: any): void; + postMessage(message: any, transfer?: any[]): void; terminate(): void; addEventListener(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -771,6 +1072,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget { readonly response: any; readonly responseText: string; responseType: string; + readonly responseURL: string; readonly responseXML: any; readonly status: number; readonly statusText: string; @@ -778,7 +1080,6 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget { readonly upload: XMLHttpRequestUpload; withCredentials: boolean; msCaching?: string; - readonly responseURL: string; abort(): void; getAllResponseHeaders(): string; getResponseHeader(header: string): string | null; @@ -805,11 +1106,10 @@ declare var XMLHttpRequest: { readonly LOADING: number; readonly OPENED: number; readonly UNSENT: number; - create(): XMLHttpRequest; } interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget { - addEventListener(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: K, listener: (this: XMLHttpRequestUpload, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -828,6 +1128,18 @@ interface AbstractWorker { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } +interface Body { + readonly bodyUsed: boolean; + arrayBuffer(): PromiseLike; + blob(): PromiseLike; + json(): PromiseLike; + text(): PromiseLike; +} + +interface GlobalFetch { + fetch(input: RequestInfo, init?: RequestInit): PromiseLike; +} + interface MSBaseReaderEventMap { "abort": Event; "error": ErrorEvent; @@ -854,7 +1166,16 @@ interface MSBaseReader { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } +interface NavigatorBeacon { + sendBeacon(url: USVString, data?: BodyInit): boolean; +} + +interface NavigatorConcurrentHardware { + readonly hardwareConcurrency: number; +} + interface NavigatorID { + readonly appCodeName: string; readonly appName: string; readonly appVersion: string; readonly platform: string; @@ -900,6 +1221,81 @@ interface XMLHttpRequestEventTarget { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } +interface Client { + readonly frameType: string; + readonly id: string; + readonly url: USVString; + postMessage(message: any, transfer?: any[]): void; +} + +declare var Client: { + prototype: Client; + new(): Client; +} + +interface Clients { + claim(): PromiseLike; + get(id: string): PromiseLike; + matchAll(options?: ClientQueryOptions): any; + openWindow(url: USVString): PromiseLike; +} + +declare var Clients: { + prototype: Clients; + new(): Clients; +} + +interface DedicatedWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap { + "message": MessageEvent; +} + +interface DedicatedWorkerGlobalScope extends WorkerGlobalScope { + onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any; + close(): void; + postMessage(message: any, transfer?: any[]): void; + addEventListener(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var DedicatedWorkerGlobalScope: { + prototype: DedicatedWorkerGlobalScope; + new(): DedicatedWorkerGlobalScope; +} + +interface ExtendableEvent extends Event { + waitUntil(f: PromiseLike): void; +} + +declare var ExtendableEvent: { + prototype: ExtendableEvent; + new(type: string, eventInitDict?: ExtendableEventInit): ExtendableEvent; +} + +interface ExtendableMessageEvent extends ExtendableEvent { + readonly data: any; + readonly lastEventId: string; + readonly origin: string; + readonly ports: MessagePort[] | null; + readonly source: Client | ServiceWorker | MessagePort | null; +} + +declare var ExtendableMessageEvent: { + prototype: ExtendableMessageEvent; + new(type: string, eventInitDict?: ExtendableMessageEventInit): ExtendableMessageEvent; +} + +interface FetchEvent extends ExtendableEvent { + readonly clientId: string | null; + readonly isReload: boolean; + readonly request: Request; + respondWith(r: PromiseLike): void; +} + +declare var FetchEvent: { + prototype: FetchEvent; + new(type: string, eventInitDict: FetchEventInit): FetchEvent; +} + interface FileReaderSync { readAsArrayBuffer(blob: Blob): any; readAsBinaryString(blob: Blob): void; @@ -912,17 +1308,105 @@ declare var FileReaderSync: { new(): FileReaderSync; } -interface WorkerGlobalScopeEventMap extends DedicatedWorkerGlobalScopeEventMap { +interface NotificationEvent extends ExtendableEvent { + readonly action: string; + readonly notification: Notification; +} + +declare var NotificationEvent: { + prototype: NotificationEvent; + new(type: string, eventInitDict: NotificationEventInit): NotificationEvent; +} + +interface PushEvent extends ExtendableEvent { + readonly data: PushMessageData | null; +} + +declare var PushEvent: { + prototype: PushEvent; + new(type: string, eventInitDict?: PushEventInit): PushEvent; +} + +interface PushMessageData { + arrayBuffer(): ArrayBuffer; + blob(): Blob; + json(): JSON; + text(): USVString; +} + +declare var PushMessageData: { + prototype: PushMessageData; + new(): PushMessageData; +} + +interface ServiceWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap { + "activate": ExtendableEvent; + "fetch": FetchEvent; + "install": ExtendableEvent; + "message": ExtendableMessageEvent; + "notificationclick": NotificationEvent; + "notificationclose": NotificationEvent; + "push": PushEvent; + "pushsubscriptionchange": ExtendableEvent; + "sync": SyncEvent; +} + +interface ServiceWorkerGlobalScope extends WorkerGlobalScope { + readonly clients: Clients; + onactivate: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any; + onfetch: (this: ServiceWorkerGlobalScope, ev: FetchEvent) => any; + oninstall: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any; + onmessage: (this: ServiceWorkerGlobalScope, ev: ExtendableMessageEvent) => any; + onnotificationclick: (this: ServiceWorkerGlobalScope, ev: NotificationEvent) => any; + onnotificationclose: (this: ServiceWorkerGlobalScope, ev: NotificationEvent) => any; + onpush: (this: ServiceWorkerGlobalScope, ev: PushEvent) => any; + onpushsubscriptionchange: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any; + onsync: (this: ServiceWorkerGlobalScope, ev: SyncEvent) => any; + readonly registration: ServiceWorkerRegistration; + skipWaiting(): PromiseLike; + addEventListener(type: K, listener: (this: ServiceWorkerGlobalScope, ev: ServiceWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; +} + +declare var ServiceWorkerGlobalScope: { + prototype: ServiceWorkerGlobalScope; + new(): ServiceWorkerGlobalScope; +} + +interface SyncEvent extends ExtendableEvent { + readonly lastChance: boolean; + readonly tag: string; +} + +declare var SyncEvent: { + prototype: SyncEvent; + new(type: string, init: SyncEventInit): SyncEvent; +} + +interface WindowClient extends Client { + readonly focused: boolean; + readonly visibilityState: string; + focus(): PromiseLike; + navigate(url: USVString): PromiseLike; +} + +declare var WindowClient: { + prototype: WindowClient; + new(): WindowClient; +} + +interface WorkerGlobalScopeEventMap { "error": ErrorEvent; } -interface WorkerGlobalScope extends EventTarget, WorkerUtils, DedicatedWorkerGlobalScope, WindowConsole { +interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, GlobalFetch { + readonly caches: CacheStorage; + readonly isSecureContext: boolean; readonly location: WorkerLocation; onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any; + readonly performance: Performance; readonly self: WorkerGlobalScope; - close(): void; msWriteProfilerMark(profilerMarkName: string): void; - toString(): string; addEventListener(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -937,6 +1421,7 @@ interface WorkerLocation { readonly host: string; readonly hostname: string; readonly href: string; + readonly origin: string; readonly pathname: string; readonly port: string; readonly protocol: string; @@ -949,7 +1434,7 @@ declare var WorkerLocation: { new(): WorkerLocation; } -interface WorkerNavigator extends Object, NavigatorID, NavigatorOnLine { +interface WorkerNavigator extends Object, NavigatorID, NavigatorOnLine, NavigatorBeacon, NavigatorConcurrentHardware { readonly hardwareConcurrency: number; } @@ -958,17 +1443,6 @@ declare var WorkerNavigator: { new(): WorkerNavigator; } -interface DedicatedWorkerGlobalScopeEventMap { - "message": MessageEvent; -} - -interface DedicatedWorkerGlobalScope { - onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any; - postMessage(data: any): void; - addEventListener(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - interface WorkerUtils extends Object, WindowBase64 { readonly indexedDB: IDBFactory; readonly msIndexedDB: IDBFactory; @@ -985,6 +1459,14 @@ interface WorkerUtils extends Object, WindowBase64 { setTimeout(handler: any, timeout?: any, ...args: any[]): number; } +interface ErrorEventInit { + message?: string; + filename?: string; + lineno?: number; + conlno?: number; + error?: any; +} + interface BlobPropertyBag { type?: string; endings?: string; @@ -999,15 +1481,6 @@ interface EventListenerObject { handleEvent(evt: Event): void; } -interface MessageEventInit extends EventInit { - data?: any; - origin?: string; - lastEventId?: string; - channel?: string; - source?: any; - ports?: MessagePort[]; -} - interface ProgressEventInit extends EventInit { lengthComputable?: boolean; loaded?: number; @@ -1199,18 +1672,6 @@ interface PositionCallback { interface PositionErrorCallback { (error: PositionError): void; } -interface MediaQueryListListener { - (mql: MediaQueryList): void; -} -interface MSLaunchUriCallback { - (): void; -} -interface MSUnsafeFunctionCallback { - (): any; -} -interface MSExecAtPriorityFunctionCallback { - (...args: any[]): any; -} interface DecodeSuccessCallback { (decodedData: AudioBuffer): void; } @@ -1220,12 +1681,22 @@ interface DecodeErrorCallback { interface FunctionStringCallback { (data: string): void; } +interface ForEachCallback { + (keyId: any, status: string): void; +} +interface NotificationPermissionCallback { + (permission: string): void; +} +declare var onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any; +declare function close(): void; +declare function postMessage(message: any, transfer?: any[]): void; +declare var caches: CacheStorage; +declare var isSecureContext: boolean; declare var location: WorkerLocation; -declare var onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any; +declare var onerror: (this: DedicatedWorkerGlobalScope, ev: ErrorEvent) => any; +declare var performance: Performance; declare var self: WorkerGlobalScope; -declare function close(): void; declare function msWriteProfilerMark(profilerMarkName: string): void; -declare function toString(): string; declare function dispatchEvent(evt: Event): boolean; declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void; declare var indexedDB: IDBFactory; @@ -1243,12 +1714,16 @@ declare function setTimeout(handler: (...args: any[]) => void, timeout: number): declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number; declare function atob(encodedString: string): string; declare function btoa(rawString: string): string; -declare var onmessage: (this: WorkerGlobalScope, ev: MessageEvent) => any; -declare function postMessage(data: any): void; declare var console: Console; -declare function addEventListener(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; +declare function fetch(input: RequestInfo, init?: RequestInit): PromiseLike; +declare function dispatchEvent(evt: Event): boolean; +declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void; +declare function addEventListener(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; type AlgorithmIdentifier = string | Algorithm; +type BodyInit = any; type IDBKeyPath = string; +type RequestInfo = Request | string; +type USVString = string; type IDBValidKey = number | string | Date | IDBArrayKey; type BufferSource = ArrayBuffer | ArrayBufferView; \ No newline at end of file diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types index 054923fb5eed7..b375800891808 100644 --- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types +++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types @@ -3,9 +3,9 @@ for (const element of document.getElementsByTagName("a")) { >element : HTMLAnchorElement >document.getElementsByTagName("a") : NodeListOf ->document.getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } +>document.getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } >document : Document ->getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } +>getElementsByTagName : { (tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf; } >"a" : "a" element.href; From a8db366f6b6afa0ac452c50e061882de555fdb95 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Thu, 2 Feb 2017 17:47:06 -0800 Subject: [PATCH 038/116] Check original variable statement node to check if it contains es6 export --- src/compiler/transformers/module/module.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index 7318e03b3520c..68f49dba42cc8 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -831,6 +831,13 @@ namespace ts { let statements: Statement[]; let variables: VariableDeclaration[]; let expressions: Expression[]; + + const parseTreeNode = getParseTreeNode(node); + if (!shouldAppendUnderscoreUnderscoreEsModule) { + // class declaration get down-level transformed to be variable statement + shouldAppendUnderscoreUnderscoreEsModule = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration) && hasModifier(parseTreeNode, ModifierFlags.Export); + } + if (hasModifier(node, ModifierFlags.Export)) { let modifiers: NodeArray; @@ -845,7 +852,6 @@ namespace ts { variables = append(variables, variable); } else if (variable.initializer) { - shouldAppendUnderscoreUnderscoreEsModule = true; expressions = append(expressions, transformInitializedVariable(variable)); } } From 3f57f01e692298521e4a5faab7bd6967ea8742c9 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Thu, 2 Feb 2017 17:47:33 -0800 Subject: [PATCH 039/116] Update baselines --- tests/baselines/reference/ExportAssignment7.js | 1 + tests/baselines/reference/ExportAssignment8.js | 1 + tests/baselines/reference/aliasUsedAsNameValue.js | 1 + .../reference/classMemberInitializerWithLamdaScoping4.js | 1 + .../baselines/reference/commentsBeforeVariableStatement1.js | 1 + tests/baselines/reference/declFileAccessors.js | 1 + .../reference/declFileAliasUseBeforeDeclaration.js | 2 ++ ...declFileAmbientExternalModuleWithSingleExportedModule.js | 1 + .../declFileClassWithStaticMethodReturningConstructor.js | 1 + tests/baselines/reference/declFileConstructors.js | 1 + .../reference/declFileExportAssignmentOfGenericInterface.js | 1 + tests/baselines/reference/declFileExportImportChain.js | 1 + tests/baselines/reference/declFileExportImportChain2.js | 1 + tests/baselines/reference/declFileForExportedImport.js | 1 + tests/baselines/reference/declFileFunctions.js | 1 + tests/baselines/reference/declFileGenericType.js | 1 + .../reference/declFileImportModuleWithExportAssignment.js | 1 + tests/baselines/reference/declFileMethods.js | 1 + .../reference/declarationEmitClassMemberNameConflict.js | 1 + .../baselines/reference/declarationEmitExportAssignment.js | 1 + .../baselines/reference/declarationEmitExportDeclaration.js | 2 ++ .../reference/declarationEmitExpressionInExtends3.js | 1 + .../reference/declarationEmitIdentifierPredicates01.js | 1 + .../declarationEmitIdentifierPredicatesWithPrivateName01.js | 1 + .../reference/declarationEmitInferedDefaultExportType.js | 2 +- .../baselines/reference/declarationEmitInferedTypeAlias1.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias2.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias3.js | 2 +- .../baselines/reference/declarationEmitInferedTypeAlias5.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias6.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias7.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias9.js | 1 + tests/baselines/reference/declarationEmitPromise.js | 1 + .../baselines/reference/declarationEmitThisPredicates01.js | 1 + .../baselines/reference/declarationEmitThisPredicates02.js | 1 + .../declarationEmitThisPredicatesWithPrivateName01.js | 1 + .../declarationEmitThisPredicatesWithPrivateName02.js | 1 + .../declarationEmitTypeAliasWithTypeParameters1.js | 1 + .../declarationEmitTypeAliasWithTypeParameters2.js | 1 + tests/baselines/reference/declarationEmitUnknownImport.js | 1 + tests/baselines/reference/declarationEmitUnknownImport2.js | 2 +- tests/baselines/reference/declarationMerging2.js | 1 + tests/baselines/reference/decoratedClassExportsCommonJS1.js | 1 + tests/baselines/reference/decoratedClassExportsCommonJS2.js | 1 + .../reference/decoratedDefaultExportsGetExportedAmd.js | 4 ++-- .../reference/decoratedDefaultExportsGetExportedCommonjs.js | 4 ++-- .../reference/decoratedDefaultExportsGetExportedUmd.js | 4 ++-- .../decoratorInstantiateModulesInFunctionBodies.js | 1 + tests/baselines/reference/decoratorMetadata.js | 2 +- .../baselines/reference/decoratorMetadataOnInferredType.js | 1 + .../decoratorMetadataRestParameterWithImportedType.js | 4 ++++ .../reference/decoratorMetadataWithConstructorType.js | 1 + .../decoratorMetadataWithImportDeclarationNameCollision.js | 2 ++ .../decoratorMetadataWithImportDeclarationNameCollision2.js | 2 ++ .../decoratorMetadataWithImportDeclarationNameCollision3.js | 2 ++ .../decoratorMetadataWithImportDeclarationNameCollision4.js | 2 ++ .../decoratorMetadataWithImportDeclarationNameCollision5.js | 3 ++- .../decoratorMetadataWithImportDeclarationNameCollision6.js | 3 ++- .../decoratorMetadataWithImportDeclarationNameCollision7.js | 3 ++- .../decoratorMetadataWithImportDeclarationNameCollision8.js | 2 ++ tests/baselines/reference/decoratorOnClass2.js | 1 + tests/baselines/reference/decoratorOnClassConstructor2.js | 2 ++ tests/baselines/reference/decoratorOnClassConstructor3.js | 2 ++ tests/baselines/reference/decoratorOnImportEquals2.js | 1 + .../baselines/reference/defaultExportInAwaitExpression01.js | 2 +- .../baselines/reference/defaultExportInAwaitExpression02.js | 2 +- tests/baselines/reference/defaultExportWithOverloads01.js | 2 +- tests/baselines/reference/defaultExportsCannotMerge01.js | 2 +- tests/baselines/reference/defaultExportsCannotMerge02.js | 2 +- tests/baselines/reference/defaultExportsCannotMerge03.js | 2 +- tests/baselines/reference/defaultExportsCannotMerge04.js | 2 +- tests/baselines/reference/defaultExportsGetExportedAmd.js | 4 ++-- .../reference/defaultExportsGetExportedCommonjs.js | 4 ++-- tests/baselines/reference/defaultExportsGetExportedUmd.js | 4 ++-- tests/baselines/reference/dependencyViaImportAlias.js | 1 + .../reference/destructuringInVariableDeclarations1.js | 1 + .../reference/destructuringInVariableDeclarations3.js | 1 + .../reference/destructuringInVariableDeclarations5.js | 1 + tests/baselines/reference/downlevelLetConst13.js | 1 + tests/baselines/reference/duplicateLocalVariable1.js | 1 + tests/baselines/reference/duplicateLocalVariable2.js | 1 + tests/baselines/reference/dynamicModuleTypecheckError.js | 1 + tests/baselines/reference/elidingImportNames.js | 2 ++ .../reference/errorForConflictingExportEqualsValue.js | 1 + tests/baselines/reference/es3defaultAliasIsQuoted.js | 2 +- tests/baselines/reference/es5-commonjs.js | 2 +- tests/baselines/reference/es5-commonjs2.js | 2 +- tests/baselines/reference/es5-commonjs5.js | 2 +- tests/baselines/reference/es5-commonjs6.js | 2 +- .../baselines/reference/es5-importHelpersAsyncFunctions.js | 1 + tests/baselines/reference/es5-umd2.js | 1 + tests/baselines/reference/es5-umd3.js | 2 +- .../baselines/reference/es5ExportDefaultClassDeclaration.js | 2 +- .../reference/es5ExportDefaultClassDeclaration2.js | 2 +- .../reference/es5ExportDefaultClassDeclaration3.js | 2 +- tests/baselines/reference/es5ExportDefaultExpression.js | 2 +- .../reference/es5ExportDefaultFunctionDeclaration.js | 2 +- .../reference/es5ExportDefaultFunctionDeclaration2.js | 2 +- .../reference/es5ExportDefaultFunctionDeclaration3.js | 2 +- tests/baselines/reference/es5ExportDefaultIdentifier.js | 2 +- tests/baselines/reference/es5ModuleWithModuleGenAmd.js | 1 + tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js | 1 + .../baselines/reference/es5ModuleWithoutModuleGenTarget.js | 1 + tests/baselines/reference/es6-umd2.js | 1 + tests/baselines/reference/es6ExportAllInEs5.js | 2 ++ tests/baselines/reference/es6ExportClauseInEs5.js | 1 + .../reference/es6ExportClauseWithAssignmentInEs5.js | 1 + .../reference/es6ExportClauseWithoutModuleSpecifierInEs5.js | 2 ++ tests/baselines/reference/es6ExportEqualsInterop.js | 1 + tests/baselines/reference/es6ImportDefaultBindingAmd.js | 2 +- tests/baselines/reference/es6ImportDefaultBindingDts.js | 3 ++- .../es6ImportDefaultBindingFollowedWithNamedImport.js | 2 +- .../es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js | 2 +- ...mportDefaultBindingFollowedWithNamedImport1WithExport.js | 3 ++- .../es6ImportDefaultBindingFollowedWithNamedImportDts.js | 2 ++ .../es6ImportDefaultBindingFollowedWithNamedImportDts1.js | 3 ++- .../es6ImportDefaultBindingFollowedWithNamedImportInEs5.js | 1 + ...ImportDefaultBindingFollowedWithNamedImportWithExport.js | 3 ++- ...mportDefaultBindingFollowedWithNamespaceBinding1InEs5.js | 2 +- ...DefaultBindingFollowedWithNamespaceBinding1WithExport.js | 3 ++- ...s6ImportDefaultBindingFollowedWithNamespaceBindingDts.js | 2 ++ ...6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js | 3 ++- ...ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js | 1 + ...tDefaultBindingFollowedWithNamespaceBindingWithExport.js | 2 ++ .../reference/es6ImportDefaultBindingMergeErrors.js | 2 +- .../reference/es6ImportDefaultBindingNoDefaultProperty.js | 1 + .../reference/es6ImportDefaultBindingWithExport.js | 3 ++- tests/baselines/reference/es6ImportNameSpaceImport.js | 1 + tests/baselines/reference/es6ImportNameSpaceImportAmd.js | 1 + tests/baselines/reference/es6ImportNameSpaceImportDts.js | 2 ++ tests/baselines/reference/es6ImportNameSpaceImportInEs5.js | 1 + .../reference/es6ImportNameSpaceImportMergeErrors.js | 1 + .../reference/es6ImportNameSpaceImportWithExport.js | 2 ++ tests/baselines/reference/es6ImportNamedImport.js | 1 + tests/baselines/reference/es6ImportNamedImportAmd.js | 1 + tests/baselines/reference/es6ImportNamedImportDts.js | 2 ++ tests/baselines/reference/es6ImportNamedImportInEs5.js | 1 + .../reference/es6ImportNamedImportInExportAssignment.js | 1 + .../baselines/reference/es6ImportNamedImportMergeErrors.js | 1 + .../reference/es6ImportNamedImportNoExportMember.js | 1 + tests/baselines/reference/es6ImportNamedImportWithExport.js | 2 ++ .../reference/es6ImportNamedImportWithTypesAndValues.js | 2 ++ tests/baselines/reference/es6ImportWithoutFromClauseAmd.js | 2 ++ .../baselines/reference/es6ImportWithoutFromClauseInEs5.js | 1 + .../reference/es6ImportWithoutFromClauseWithExport.js | 1 + .../baselines/reference/es6ModuleWithModuleGenTargetAmd.js | 1 + .../reference/es6ModuleWithModuleGenTargetCommonjs.js | 1 + tests/baselines/reference/exportAndImport-es3-amd.js | 4 ++-- tests/baselines/reference/exportAndImport-es3.js | 4 ++-- tests/baselines/reference/exportAndImport-es5-amd.js | 4 ++-- tests/baselines/reference/exportAndImport-es5.js | 4 ++-- tests/baselines/reference/exportArrayBindingPattern.js | 1 + tests/baselines/reference/exportAssignDottedName.js | 1 + tests/baselines/reference/exportAssignImportedIdentifier.js | 1 + tests/baselines/reference/exportAssignmentWithExports.js | 1 + .../exportDeclarationWithModuleSpecifierNameOnNextLine1.js | 4 ++++ tests/baselines/reference/exportDefaultProperty.js | 4 ++-- tests/baselines/reference/exportDefaultProperty2.js | 2 +- tests/baselines/reference/exportImport.js | 1 + tests/baselines/reference/exportImportMultipleFiles.js | 1 + .../reference/exportImportNonInstantiatedModule2.js | 1 + .../baselines/reference/exportNonInitializedVariablesAMD.js | 1 + .../reference/exportNonInitializedVariablesCommonJS.js | 1 + .../baselines/reference/exportNonInitializedVariablesUMD.js | 1 + tests/baselines/reference/exportRedeclarationTypeAliases.js | 1 + tests/baselines/reference/exportSameNameFuncVar.js | 1 + tests/baselines/reference/exportSpecifierForAGlobal.js | 1 + tests/baselines/reference/exportStar-amd.js | 5 ++++- tests/baselines/reference/exportStar.js | 5 ++++- tests/baselines/reference/exportStarForValues5.js | 1 + tests/baselines/reference/exportStarForValues7.js | 2 ++ tests/baselines/reference/exportStarForValues8.js | 4 ++++ tests/baselines/reference/exportStarForValues9.js | 2 ++ tests/baselines/reference/exportStarFromEmptyModule.js | 2 ++ tests/baselines/reference/exportToString.js | 1 + tests/baselines/reference/exportVisibility.js | 1 + .../baselines/reference/exportedBlockScopedDeclarations.js | 1 + tests/baselines/reference/exportedVariable1.js | 1 + tests/baselines/reference/exportingContainingVisibleType.js | 1 + tests/baselines/reference/exportsAndImports1-amd.js | 3 +++ tests/baselines/reference/exportsAndImports1-es6.js | 3 +++ tests/baselines/reference/exportsAndImports1.js | 3 +++ tests/baselines/reference/exportsAndImports2-amd.js | 3 +++ tests/baselines/reference/exportsAndImports2-es6.js | 3 +++ tests/baselines/reference/exportsAndImports2.js | 3 +++ tests/baselines/reference/exportsAndImports3-amd.js | 3 +++ tests/baselines/reference/exportsAndImports3-es6.js | 3 +++ tests/baselines/reference/exportsAndImports3.js | 3 +++ tests/baselines/reference/exportsAndImports4-amd.js | 3 ++- tests/baselines/reference/exportsAndImports4-es6.js | 3 ++- tests/baselines/reference/exportsAndImports4.js | 3 ++- .../exportsAndImportsWithContextualKeywordNames01.js | 1 + .../exportsAndImportsWithContextualKeywordNames02.js | 1 + .../reference/exportsAndImportsWithUnderscores1.js | 2 +- .../reference/exportsAndImportsWithUnderscores2.js | 2 +- .../reference/exportsAndImportsWithUnderscores3.js | 2 +- .../reference/exportsAndImportsWithUnderscores4.js | 1 + .../reference/extendingClassFromAliasAndUsageInIndexer.js | 3 +++ tests/baselines/reference/externalModuleAssignToVar.js | 1 + .../baselines/reference/externalModuleImmutableBindings.js | 1 + ...ernalModuleRefernceResolutionOrderInImportDeclaration.js | 1 + tests/baselines/reference/fieldAndGetterWithSameName.js | 1 + .../reference/filesEmittingIntoSameOutputWithOutOption.js | 1 + tests/baselines/reference/functionAndImportNameConflict.js | 2 ++ .../reference/functionLikeInParameterInitializer.js | 1 + tests/baselines/reference/generatorES6InAMDModule.js | 1 + tests/baselines/reference/genericClassesInModule2.js | 1 + .../reference/genericInterfaceFunctionTypeParameter.js | 1 + tests/baselines/reference/genericMemberFunction.js | 1 + tests/baselines/reference/genericReturnTypeFromGetter1.js | 1 + .../reference/genericWithIndexerOfTypeParameterType2.js | 1 + .../reference/getEmitOutputWithDeclarationFile2.baseline | 1 + tests/baselines/reference/giant.js | 1 + tests/baselines/reference/importAsBaseClass.js | 1 + tests/baselines/reference/importDecl.js | 6 ++++++ .../baselines/reference/importDeclarationUsedAsTypeQuery.js | 2 ++ tests/baselines/reference/importHelpers.js | 1 + tests/baselines/reference/importHelpersAmd.js | 2 ++ tests/baselines/reference/importHelpersInIsolatedModules.js | 1 + tests/baselines/reference/importHelpersInTsx.js | 1 + tests/baselines/reference/importHelpersNoHelpers.js | 1 + tests/baselines/reference/importHelpersNoModule.js | 1 + tests/baselines/reference/importHelpersOutFile.js | 3 +++ tests/baselines/reference/importImportOnlyModule.js | 1 + tests/baselines/reference/importTsBeforeDTs.js | 1 + tests/baselines/reference/importUsedInExtendsList1.js | 1 + tests/baselines/reference/importWithTrailingSlash.js | 4 ++-- .../import_var-referencing-an-imported-module-alias.js | 1 + tests/baselines/reference/importsImplicitlyReadonly.js | 1 + tests/baselines/reference/inferenceLimit.js | 1 + tests/baselines/reference/instanceOfInExternalModules.js | 1 + tests/baselines/reference/interfaceDeclaration5.js | 1 + tests/baselines/reference/interfaceImplementation6.js | 1 + .../internalAliasClassInsideLocalModuleWithExport.js | 1 + ...alAliasClassInsideLocalModuleWithoutExportAccessError.js | 1 + .../internalAliasClassInsideTopLevelModuleWithExport.js | 1 + .../internalAliasClassInsideTopLevelModuleWithoutExport.js | 1 + .../internalAliasEnumInsideTopLevelModuleWithExport.js | 1 + .../internalAliasEnumInsideTopLevelModuleWithoutExport.js | 1 + .../internalAliasFunctionInsideTopLevelModuleWithExport.js | 1 + ...nternalAliasFunctionInsideTopLevelModuleWithoutExport.js | 1 + ...alizedModuleInsideLocalModuleWithoutExportAccessError.js | 1 + ...lAliasInitializedModuleInsideTopLevelModuleWithExport.js | 1 + ...iasInitializedModuleInsideTopLevelModuleWithoutExport.js | 1 + .../internalAliasInterfaceInsideTopLevelModuleWithExport.js | 1 + ...ternalAliasInterfaceInsideTopLevelModuleWithoutExport.js | 1 + ...alizedModuleInsideLocalModuleWithoutExportAccessError.js | 1 + ...liasUninitializedModuleInsideTopLevelModuleWithExport.js | 1 + ...sUninitializedModuleInsideTopLevelModuleWithoutExport.js | 1 + ...rnalAliasVarInsideLocalModuleWithoutExportAccessError.js | 1 + .../internalAliasVarInsideTopLevelModuleWithExport.js | 1 + .../internalAliasVarInsideTopLevelModuleWithoutExport.js | 1 + tests/baselines/reference/intersectionTypeInference1.js | 1 + .../reference/isolatedModulesImportExportElision.js | 1 + tests/baselines/reference/isolatedModulesSpecifiedModule.js | 1 + .../baselines/reference/isolatedModulesUnspecifiedModule.js | 1 + .../reference/jsFileCompilationRestParamJsDocFunction.js | 2 +- tests/baselines/reference/jsxEmitWithAttributes.js | 1 + tests/baselines/reference/jsxFactoryAndReactNamespace.js | 1 + tests/baselines/reference/jsxFactoryIdentifier.js | 1 + .../baselines/reference/jsxFactoryIdentifierAsParameter.js | 1 + .../reference/jsxFactoryIdentifierWithAbsentParameter.js | 1 + .../reference/jsxFactoryNotIdentifierOrQualifiedName.js | 1 + .../reference/jsxFactoryNotIdentifierOrQualifiedName2.js | 1 + tests/baselines/reference/jsxFactoryQualifiedName.js | 1 + .../reference/jsxFactoryQualifiedNameResolutionError.js | 1 + tests/baselines/reference/mapOnTupleTypes01.js | 1 + tests/baselines/reference/mapOnTupleTypes02.js | 1 + .../reference/memberAccessMustUseModuleInstances.js | 1 + tests/baselines/reference/mergedDeclarations6.js | 2 ++ tests/baselines/reference/metadataOfEventAlias.js | 1 + tests/baselines/reference/missingFunctionImplementation.js | 1 + .../reference/missingSemicolonInModuleSpecifier.js | 1 + tests/baselines/reference/moduleAliasAsFunctionArgument.js | 1 + .../reference/moduleAugmentationDisallowedExtensions.js | 3 +++ tests/baselines/reference/moduleAugmentationGlobal1.js | 1 + tests/baselines/reference/moduleAugmentationGlobal2.js | 1 + tests/baselines/reference/moduleAugmentationGlobal3.js | 1 + .../reference/moduleAugmentationImportsAndExports1.js | 2 ++ .../reference/moduleAugmentationImportsAndExports2.js | 2 ++ .../reference/moduleAugmentationImportsAndExports3.js | 2 ++ .../reference/moduleAugmentationImportsAndExports4.js | 2 ++ .../reference/moduleAugmentationImportsAndExports5.js | 2 ++ .../reference/moduleAugmentationImportsAndExports6.js | 2 ++ .../reference/moduleAugmentationsBundledOutput1.js | 2 ++ tests/baselines/reference/moduleAugmentationsImports1.js | 2 ++ tests/baselines/reference/moduleAugmentationsImports2.js | 2 ++ tests/baselines/reference/moduleAugmentationsImports3.js | 2 ++ tests/baselines/reference/moduleAugmentationsImports4.js | 2 ++ tests/baselines/reference/moduleCodeGenTest5.js | 1 + tests/baselines/reference/moduleDuplicateIdentifiers.js | 1 + tests/baselines/reference/moduleInTypePosition1.js | 1 + tests/baselines/reference/moduleNoneErrors.js | 1 + tests/baselines/reference/modulePrologueAMD.js | 1 + tests/baselines/reference/modulePrologueCommonjs.js | 1 + tests/baselines/reference/modulePrologueUmd.js | 1 + tests/baselines/reference/moduleResolutionNoResolve.js | 1 + tests/baselines/reference/moduleResolutionNoTs.js | 4 ++-- tests/baselines/reference/moduleResolutionWithExtensions.js | 2 +- .../reference/moduleResolutionWithExtensions_preferTs.js | 2 +- tests/baselines/reference/moduleResolutionWithSymlinks.js | 2 ++ .../moduleResolutionWithSymlinks_notInNodeModules.js | 2 ++ .../reference/moduleResolutionWithSymlinks_withOutDir.js | 2 ++ .../reference/moduleSameValueDuplicateExportedBindings1.js | 3 +++ .../reference/moduleSameValueDuplicateExportedBindings2.js | 2 ++ tests/baselines/reference/moduleScoping.js | 1 + tests/baselines/reference/multipleDefaultExports01.js | 4 +--- tests/baselines/reference/multipleDefaultExports02.js | 3 +-- tests/baselines/reference/multipleDefaultExports03.js | 3 +-- tests/baselines/reference/multipleDefaultExports04.js | 3 +-- tests/baselines/reference/multipleExportDefault1.js | 3 +-- tests/baselines/reference/multipleExportDefault2.js | 3 +-- tests/baselines/reference/multipleExportDefault3.js | 3 +-- tests/baselines/reference/multipleExportDefault4.js | 3 +-- tests/baselines/reference/multipleExportDefault5.js | 3 +-- tests/baselines/reference/multipleExportDefault6.js | 3 +-- 316 files changed, 431 insertions(+), 99 deletions(-) diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js index 461631e0e7d0d..66cb590907592 100644 --- a/tests/baselines/reference/ExportAssignment7.js +++ b/tests/baselines/reference/ExportAssignment7.js @@ -12,3 +12,4 @@ var C = (function () { return C; }()); module.exports = B; +exports.__esModule = true; diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js index d09630080125a..8e29d7914fd6d 100644 --- a/tests/baselines/reference/ExportAssignment8.js +++ b/tests/baselines/reference/ExportAssignment8.js @@ -12,3 +12,4 @@ var C = (function () { return C; }()); module.exports = B; +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js index 5febf4b90e7a5..b86051d7b198e 100644 --- a/tests/baselines/reference/aliasUsedAsNameValue.js +++ b/tests/baselines/reference/aliasUsedAsNameValue.js @@ -20,6 +20,7 @@ export var a = function () { //// [aliasUsedAsNameValue_0.js] "use strict"; +exports.__esModule = true; //// [aliasUsedAsNameValue_1.js] "use strict"; function b(a) { return null; } diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js index 49f5f916cd306..890d2bbd500b2 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js @@ -17,6 +17,7 @@ export class Test1 { //// [classMemberInitializerWithLamdaScoping3_0.js] "use strict"; +exports.__esModule = true; //// [classMemberInitializerWithLamdaScoping3_1.js] "use strict"; var Test1 = (function () { diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.js b/tests/baselines/reference/commentsBeforeVariableStatement1.js index f172c40cc0df8..9a06a3e7c228c 100644 --- a/tests/baselines/reference/commentsBeforeVariableStatement1.js +++ b/tests/baselines/reference/commentsBeforeVariableStatement1.js @@ -6,4 +6,5 @@ export var b: number; //// [commentsBeforeVariableStatement1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js index 2bd51bfbfb2dd..b0cc0c8fbaa56 100644 --- a/tests/baselines/reference/declFileAccessors.js +++ b/tests/baselines/reference/declFileAccessors.js @@ -185,6 +185,7 @@ var c1 = (function () { return c1; }()); exports.c1 = c1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileAccessors_1.js] /** This is comment for c2 - the global class*/ var c2 = (function () { diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js index e521950832949..f89863a302971 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js @@ -16,10 +16,12 @@ var Foo = (function () { return Foo; }()); exports.Foo = Foo; +exports.__esModule = true; //// [declFileAliasUseBeforeDeclaration_test.js] "use strict"; function bar(a) { } exports.bar = bar; +exports.__esModule = true; //// [declFileAliasUseBeforeDeclaration_foo.d.ts] diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js index f98e2f6aafb7d..6d626e2963df8 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js @@ -21,6 +21,7 @@ export var x: SubModule.m.m3.c; //// [declFileAmbientExternalModuleWithSingleExportedModule_0.js] //// [declFileAmbientExternalModuleWithSingleExportedModule_1.js] "use strict"; +exports.__esModule = true; //// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts] diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js index 844559232e49f..218157185afaf 100644 --- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js +++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js @@ -17,6 +17,7 @@ var Enhancement = (function () { return Enhancement; }()); exports.Enhancement = Enhancement; +exports.__esModule = true; //// [declFileClassWithStaticMethodReturningConstructor.d.ts] diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js index 44e816712fbcd..87cf77e733ede 100644 --- a/tests/baselines/reference/declFileConstructors.js +++ b/tests/baselines/reference/declFileConstructors.js @@ -162,6 +162,7 @@ var ConstructorWithParameterInitializer = (function () { return ConstructorWithParameterInitializer; }()); exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileConstructors_1.js] var GlobalSimpleConstructor = (function () { /** This comment should appear for foo*/ diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js index c54c3c7e73111..4103ac6976e27 100644 --- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js +++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js @@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports"], function (require, exports) { "use strict"; exports.x.a; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index 99affd5eb4d80..5f583d2b6e122 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -59,6 +59,7 @@ define(["require", "exports", "declFileExportImportChain_b1"], function (require //// [declFileExportImportChain_d.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 27c61e9e43dcb..5fe546663e4bf 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -51,6 +51,7 @@ define(["require", "exports", "declFileExportImportChain2_b"], function (require //// [declFileExportImportChain2_d.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js index 6870e16f9417a..8e07b99c8af5f 100644 --- a/tests/baselines/reference/declFileForExportedImport.js +++ b/tests/baselines/reference/declFileForExportedImport.js @@ -13,6 +13,7 @@ var z = b.x; //// [declFileForExportedImport_0.js] "use strict"; +exports.__esModule = true; //// [declFileForExportedImport_1.js] "use strict"; /// diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js index e4f674d43c0f4..c93dee4e30ea0 100644 --- a/tests/baselines/reference/declFileFunctions.js +++ b/tests/baselines/reference/declFileFunctions.js @@ -145,6 +145,7 @@ function nonExportedFooWithRestParameters(a) { function nonExportedFooWithOverloads(a) { return a; } +Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileFunctions_1.js] /** This comment should appear for foo*/ function globalfoo() { diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index c17463a6d1585..ab3fc63f450e3 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -102,6 +102,7 @@ var h = (function (_super) { }(C.A)); exports.h = h; exports.j = C.F6; +exports.__esModule = true; //// [declFileGenericType.d.ts] diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index a733e1332a769..d1d9589e8c753 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -36,6 +36,7 @@ module.exports = m2; var a1 = require("./declFileImportModuleWithExportAssignment_0"); exports.a = a1; exports.a.test1(null, null, null); +exports.__esModule = true; //// [declFileImportModuleWithExportAssignment_0.d.ts] diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js index 4a317a4e72026..dee10473f2cac 100644 --- a/tests/baselines/reference/declFileMethods.js +++ b/tests/baselines/reference/declFileMethods.js @@ -274,6 +274,7 @@ var c1 = (function () { return c1; }()); exports.c1 = c1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileMethods_1.js] var c2 = (function () { function c2() { diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js index 23c83276201da..35a861a60469b 100644 --- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js @@ -91,6 +91,7 @@ var C4 = (function () { return C4; }()); exports.C4 = C4; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declarationEmitClassMemberNameConflict.d.ts] diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js index 8c97ef8eb077d..5557ff7102049 100644 --- a/tests/baselines/reference/declarationEmitExportAssignment.js +++ b/tests/baselines/reference/declarationEmitExportAssignment.js @@ -16,6 +16,7 @@ function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; +Object.defineProperty(exports, "__esModule", { value: true }); //// [index.js] "use strict"; var utils_1 = require("./utils"); diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js index dfbed90742d43..e019203030ee4 100644 --- a/tests/baselines/reference/declarationEmitExportDeclaration.js +++ b/tests/baselines/reference/declarationEmitExportDeclaration.js @@ -19,12 +19,14 @@ function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; +Object.defineProperty(exports, "__esModule", { value: true }); //// [index.js] "use strict"; var utils_1 = require("./utils"); exports.bar = utils_1.bar; utils_1.foo(); var obj; +Object.defineProperty(exports, "__esModule", { value: true }); //// [utils.d.ts] diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js index 960a7af67805b..a1e3aac882358 100644 --- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js @@ -104,3 +104,4 @@ var MyClass4 = (function (_super) { return MyClass4; }(getExportedClass(undefined))); exports.MyClass4 = MyClass4; +exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js index 73141eb9af9ba..87141cfb69943 100644 --- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js +++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js @@ -10,6 +10,7 @@ function f(x) { return typeof x === "number"; } exports.f = f; +exports.__esModule = true; //// [declarationEmitIdentifierPredicates01.d.ts] diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js index 234542d8d996f..f20654d508c53 100644 --- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js +++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js @@ -14,3 +14,4 @@ function f(x) { return typeof x.a === "number"; } exports.f = f; +exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js index 608f172cd1f7f..555006528303f 100644 --- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js +++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js @@ -9,13 +9,13 @@ export default { //// [declarationEmitInferedDefaultExportType.js] "use strict"; -exports.__esModule = true; // test.ts exports["default"] = { foo: [], bar: undefined, baz: null }; +exports.__esModule = true; //// [declarationEmitInferedDefaultExportType.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js index 05ce74e3bad77..5afadf8723a02 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js @@ -21,6 +21,7 @@ export { v } "use strict"; var v = "str" || true; exports.v = v; +exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js index 307a9b82d6772..130122ac84024 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js @@ -28,6 +28,7 @@ function bar() { return v; } exports.bar = bar; +exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js index c99e5c429dda4..44d086abac6af 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js @@ -20,8 +20,8 @@ export default x; //// [1.js] "use strict"; var x = "hi" || 5; -exports.__esModule = true; exports["default"] = x; +exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js index 79d28d3d181e3..3c136865c5372 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js @@ -19,6 +19,7 @@ var obj = true; //let v2: Z.Data; var v = "str" || true; exports.v = v; +exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js index 924f73d0ed98a..d5d455c35e38c 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js @@ -21,6 +21,7 @@ export { v } "use strict"; var v = "str" || true; exports.v = v; +exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js index 2fba057fc913d..e349376207242 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js @@ -16,6 +16,7 @@ var obj = true; "use strict"; var v = "str" || true; exports.v = v; +exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js index 667acdff49c0e..70560f5a54d5b 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js @@ -14,6 +14,7 @@ function returnSomeGlobalValue() { return x; } exports.returnSomeGlobalValue = returnSomeGlobalValue; +exports.__esModule = true; //// [declarationEmitInferedTypeAlias9.d.ts] diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js index 9e820a789c9c2..4f56ad9186497 100644 --- a/tests/baselines/reference/declarationEmitPromise.js +++ b/tests/baselines/reference/declarationEmitPromise.js @@ -53,6 +53,7 @@ function runSampleBreaks(a, b, c, d, e) { }); } exports.runSampleBreaks = runSampleBreaks; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declarationEmitPromise.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js index 04c49422c5c59..2845a120b7485 100644 --- a/tests/baselines/reference/declarationEmitThisPredicates01.js +++ b/tests/baselines/reference/declarationEmitThisPredicates01.js @@ -38,6 +38,7 @@ var D = (function (_super) { return D; }(C)); exports.D = D; +exports.__esModule = true; //// [declarationEmitThisPredicates01.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js index e938a615b6d9f..b9a81b2fb8e4d 100644 --- a/tests/baselines/reference/declarationEmitThisPredicates02.js +++ b/tests/baselines/reference/declarationEmitThisPredicates02.js @@ -21,6 +21,7 @@ exports.obj = { return dis.a != null && dis.b != null && dis.c != null; } }; +exports.__esModule = true; //// [declarationEmitThisPredicates02.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js index 79156f795ea10..16ae267bc3c16 100644 --- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js +++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js @@ -37,3 +37,4 @@ var D = (function (_super) { } return D; }(C)); +exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js index df0d5b7903acb..fcc373ccbe8bb 100644 --- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js +++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js @@ -21,3 +21,4 @@ exports.obj = { return dis.a != null && dis.b != null && dis.c != null; } }; +exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js index 6079de359643c..303959f55042e 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js @@ -7,6 +7,7 @@ export const y = (x: Foo) => 1 //// [declarationEmitTypeAliasWithTypeParameters1.js] "use strict"; exports.y = function (x) { return 1; }; +exports.__esModule = true; //// [declarationEmitTypeAliasWithTypeParameters1.d.ts] diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js index d5bf31bd755aa..52f696a9448d8 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js @@ -8,6 +8,7 @@ export const y = (x: Baa) => 1 //// [declarationEmitTypeAliasWithTypeParameters2.js] "use strict"; exports.y = function (x) { return 1; }; +exports.__esModule = true; //// [declarationEmitTypeAliasWithTypeParameters2.d.ts] diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js index bccf2337e08de..686ed8dce2c9d 100644 --- a/tests/baselines/reference/declarationEmitUnknownImport.js +++ b/tests/baselines/reference/declarationEmitUnknownImport.js @@ -7,3 +7,4 @@ export {Foo} "use strict"; var Foo = SomeNonExistingName; exports.Foo = Foo; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js index 08afa34f8c819..10b8b1b98867a 100644 --- a/tests/baselines/reference/declarationEmitUnknownImport2.js +++ b/tests/baselines/reference/declarationEmitUnknownImport2.js @@ -7,5 +7,5 @@ export default Foo "use strict"; var Foo = From; './Foo'; // Syntax error -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js index 3157445fa36f8..5e03b2d9b516d 100644 --- a/tests/baselines/reference/declarationMerging2.js +++ b/tests/baselines/reference/declarationMerging2.js @@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); //// [b.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js index 7ef4369f975df..d0e8504713dd0 100644 --- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js +++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js @@ -22,3 +22,4 @@ Testing123 = Testing123_1 = __decorate([ ], Testing123); exports.Testing123 = Testing123; var Testing123_1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js index 994178cbb79cd..3e24af5f427ad 100644 --- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js +++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js @@ -20,3 +20,4 @@ Testing123 = Testing123_1 = __decorate([ ], Testing123); exports.Testing123 = Testing123; var Testing123_1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js index 14ede865a2f05..bf5e9e5dcfc23 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js @@ -28,8 +28,8 @@ define(["require", "exports"], function (require, exports) { Foo = __decorate([ decorator ], Foo); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -46,6 +46,6 @@ define(["require", "exports"], function (require, exports) { default_1 = __decorate([ decorator ], default_1); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js index ecc04859234c9..fe62d15c27fdb 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js @@ -27,8 +27,8 @@ let Foo = class Foo { Foo = __decorate([ decorator ], Foo); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -43,5 +43,5 @@ let default_1 = class { default_1 = __decorate([ decorator ], default_1); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js index 47f9a52443200..e6f4773df7dec 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js @@ -36,8 +36,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, Foo = __decorate([ decorator ], Foo); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -62,6 +62,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, default_1 = __decorate([ decorator ], default_1); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js index fc8dc1c55150a..8c7f16c3743d2 100644 --- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js +++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js @@ -25,6 +25,7 @@ class Wat { "use strict"; // from #3108 exports.test = 'abc'; +Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js index cb253d43c16fa..8076c72e391ef 100644 --- a/tests/baselines/reference/decoratorMetadata.js +++ b/tests/baselines/reference/decoratorMetadata.js @@ -25,8 +25,8 @@ var Service = (function () { } return Service; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Service; +Object.defineProperty(exports, "__esModule", { value: true }); //// [component.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js index 43cdaa79ab8c4..653bc911ed492 100644 --- a/tests/baselines/reference/decoratorMetadataOnInferredType.js +++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js @@ -38,3 +38,4 @@ __decorate([ __metadata("design:type", Object) ], B.prototype, "x", void 0); exports.B = B; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js index be249800d578a..9cbc514d932e0 100644 --- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js +++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js @@ -48,6 +48,7 @@ var SomeClass = (function () { return SomeClass; }()); exports.SomeClass = SomeClass; +Object.defineProperty(exports, "__esModule", { value: true }); //// [aux1.js] "use strict"; var SomeClass1 = (function () { @@ -56,6 +57,7 @@ var SomeClass1 = (function () { return SomeClass1; }()); exports.SomeClass1 = SomeClass1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [aux2.js] "use strict"; var SomeClass2 = (function () { @@ -64,6 +66,7 @@ var SomeClass2 = (function () { return SomeClass2; }()); exports.SomeClass2 = SomeClass2; +Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -110,3 +113,4 @@ ClassA = __decorate([ __metadata("design:paramtypes", [aux_1.SomeClass]) ], ClassA); exports.ClassA = ClassA; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js index 2c14c9b5bdabb..91c3814774ccb 100644 --- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js +++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js @@ -38,3 +38,4 @@ __decorate([ __metadata("design:type", A) ], B.prototype, "x", void 0); exports.B = B; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js index 258635a5f3ab9..e2cd357f14a32 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js @@ -33,6 +33,7 @@ var db = (function () { return db; }()); exports.db = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var db_1 = require("./db"); @@ -51,3 +52,4 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.db]) ], MyClass); exports.MyClass = MyClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js index 104e449bc0cad..19c8bafa4c199 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js @@ -33,6 +33,7 @@ var db = (function () { return db; }()); exports.db = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var db_1 = require("./db"); @@ -51,3 +52,4 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.db]) ], MyClass); exports.MyClass = MyClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js index 2925cad6afe81..63177201f1d0a 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js @@ -33,6 +33,7 @@ var db = (function () { return db; }()); exports.db = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var db = require("./db"); @@ -51,3 +52,4 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db.db]) ], MyClass); exports.MyClass = MyClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js index 33eb93f380f39..1979adf9c82ae 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js @@ -33,6 +33,7 @@ var db = (function () { return db; }()); exports.db = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var db_1 = require("./db"); // error no default export @@ -52,3 +53,4 @@ MyClass = __decorate([ ], MyClass); exports.MyClass = MyClass; var _a; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js index b99621fd7e2c8..f3f82342fad31 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js @@ -32,8 +32,8 @@ var db = (function () { }; return db; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var db_1 = require("./db"); @@ -52,3 +52,4 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.default]) ], MyClass); exports.MyClass = MyClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js index 4970dca320180..34f63af38eaa3 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js @@ -32,8 +32,8 @@ var db = (function () { }; return db; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var db_1 = require("./db"); @@ -52,3 +52,4 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.default]) ], MyClass); exports.MyClass = MyClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js index 28d403044bbc1..4b0d77b9d2f92 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js @@ -32,8 +32,8 @@ var db = (function () { }; return db; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var db_1 = require("./db"); @@ -52,3 +52,4 @@ MyClass = __decorate([ __metadata("design:paramtypes", [Object]) ], MyClass); exports.MyClass = MyClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js index dd5cee66f8b5c..a587baf1d05f4 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js @@ -33,6 +33,7 @@ var db = (function () { return db; }()); exports.db = db; +Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; var database = require("./db"); @@ -51,3 +52,4 @@ MyClass = __decorate([ __metadata("design:paramtypes", [database.db]) ], MyClass); exports.MyClass = MyClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js index 4d9c2007ad0f2..6ec7a58da6627 100644 --- a/tests/baselines/reference/decoratorOnClass2.js +++ b/tests/baselines/reference/decoratorOnClass2.js @@ -22,3 +22,4 @@ C = __decorate([ dec ], C); exports.C = C; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js index dd6209b6d64ef..0e289d51c7117 100644 --- a/tests/baselines/reference/decoratorOnClassConstructor2.js +++ b/tests/baselines/reference/decoratorOnClassConstructor2.js @@ -24,6 +24,7 @@ var base = (function () { exports.base = base; function foo(target, propertyKey, parameterIndex) { } exports.foo = foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [2.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -58,3 +59,4 @@ C = __decorate([ __param(0, _0_ts_2.foo) ], C); exports.C = C; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js index a1a3e331f36ec..518ddee0a813a 100644 --- a/tests/baselines/reference/decoratorOnClassConstructor3.js +++ b/tests/baselines/reference/decoratorOnClassConstructor3.js @@ -26,6 +26,7 @@ var base = (function () { exports.base = base; function foo(target, propertyKey, parameterIndex) { } exports.foo = foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [2.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -61,3 +62,4 @@ C = __decorate([ __param(0, _0_2.foo) ], C); exports.C = C; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js index 5e6b6b4a62322..b506f474b0bda 100644 --- a/tests/baselines/reference/decoratorOnImportEquals2.js +++ b/tests/baselines/reference/decoratorOnImportEquals2.js @@ -11,5 +11,6 @@ declare function dec(target: T): T; //// [decoratorOnImportEquals2_0.js] "use strict"; +exports.__esModule = true; //// [decoratorOnImportEquals2_1.js] "use strict"; diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js index 66d100ad07d33..1b60362377623 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression01.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js @@ -24,8 +24,8 @@ import x from './a'; })(function (require, exports) { "use strict"; const x = new Promise((resolve, reject) => { resolve({}); }); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = x; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js index 8499164f675f0..d57f4c7ad9e0c 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression02.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js @@ -15,8 +15,8 @@ import x from './a'; //// [a.js] "use strict"; const x = new Promise((resolve, reject) => { resolve({}); }); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = x; +Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js index 770b685378da6..d74cc416e28d5 100644 --- a/tests/baselines/reference/defaultExportWithOverloads01.js +++ b/tests/baselines/reference/defaultExportWithOverloads01.js @@ -13,5 +13,5 @@ function f() { args[_i] = arguments[_i]; } } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js index 24a37cad2c371..28b30b5989b78 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge01.js +++ b/tests/baselines/reference/defaultExportsCannotMerge01.js @@ -35,13 +35,13 @@ Entity.y; function Decl() { return 0; } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Decl; var Decl; (function (Decl) { Decl.x = 10; Decl.y = 20; })(Decl = exports.Decl || (exports.Decl = {})); +Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; var m1_1 = require("m1"); diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js index f327c62e5714e..e686b58a4cac0 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge02.js +++ b/tests/baselines/reference/defaultExportsCannotMerge02.js @@ -32,8 +32,8 @@ var Decl = (function () { } return Decl; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Decl; +Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; var m1_1 = require("m1"); diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js index 4369392c6e90a..d2662c1256f1b 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge03.js +++ b/tests/baselines/reference/defaultExportsCannotMerge03.js @@ -32,8 +32,8 @@ var Decl = (function () { } return Decl; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Decl; +Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; var m1_1 = require("m1"); diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js index 7c9bd88bc16df..baade8572964f 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge04.js +++ b/tests/baselines/reference/defaultExportsCannotMerge04.js @@ -17,8 +17,8 @@ export interface Foo { "use strict"; function Foo() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; var Foo; (function (Foo) { })(Foo || (Foo = {})); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js index fc0385254c0de..214522a56c8db 100644 --- a/tests/baselines/reference/defaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js @@ -12,13 +12,13 @@ define(["require", "exports"], function (require, exports) { "use strict"; class Foo { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; function foo() { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js index 1290404099d1e..c31174a5acd1d 100644 --- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js @@ -11,10 +11,10 @@ export default function foo() {} "use strict"; class Foo { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; function foo() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = foo; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js index 71aa347ce323f..8eb92f872bbe4 100644 --- a/tests/baselines/reference/defaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js @@ -20,8 +20,8 @@ export default function foo() {} "use strict"; class Foo { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] (function (factory) { @@ -35,6 +35,6 @@ export default function foo() {} })(function (require, exports) { "use strict"; function foo() { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js index 8e12bb9bd2c1d..fd2f277c71adc 100644 --- a/tests/baselines/reference/dependencyViaImportAlias.js +++ b/tests/baselines/reference/dependencyViaImportAlias.js @@ -19,6 +19,7 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); //// [B.js] define(["require", "exports", "A"], function (require, exports, a) { diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js index 707218b41e295..37eed7110670e 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations1.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js @@ -11,3 +11,4 @@ exports.toString = (1).toString; { let { toFixed } = 1; } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js index 8da039fe98edc..11e242da1a2e5 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations3.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { { let { toFixed } = 1; } + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js index 94530d8d258ce..6c799d10803f0 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations5.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js @@ -20,4 +20,5 @@ export let { toString } = 1; { let { toFixed } = 1; } + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index b6baf85080027..b1983c82d15ce 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -37,3 +37,4 @@ var M; M.bar7 = { a: 1 }.a; M.bar8 = { a: 1 }.a; })(M = exports.M || (exports.M = {})); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index 734b01eaed72d..c348443fb2917 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -636,3 +636,4 @@ exports.tests = (function () { }, "Codepoint at index: 3 has control value: 8")); return testRunner; })(); +exports.__esModule = true; diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js index d6f5c26d628c9..3e89e88fd3c32 100644 --- a/tests/baselines/reference/duplicateLocalVariable2.js +++ b/tests/baselines/reference/duplicateLocalVariable2.js @@ -77,4 +77,5 @@ define(["require", "exports"], function (require, exports) { })); return testRunner; })(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js index ef39270c9d1c9..9fc3f4404145b 100644 --- a/tests/baselines/reference/dynamicModuleTypecheckError.js +++ b/tests/baselines/reference/dynamicModuleTypecheckError.js @@ -14,3 +14,4 @@ exports.x = 1; for (var i = 0; i < 30; i++) { exports.x = i * 1000; // should not be an error here } +exports.__esModule = true; diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js index 94fa1f7e8524f..2fff5988d8981 100644 --- a/tests/baselines/reference/elidingImportNames.js +++ b/tests/baselines/reference/elidingImportNames.js @@ -18,9 +18,11 @@ export var main = 10; //// [elidingImportNames_main.js] "use strict"; exports.main = 10; +exports.__esModule = true; //// [elidingImportNames_main1.js] "use strict"; exports.main = 10; +exports.__esModule = true; //// [elidingImportNames_test.js] "use strict"; var a = require("./elidingImportNames_main"); // alias used in typeof diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.js b/tests/baselines/reference/errorForConflictingExportEqualsValue.js index 88762e7e84675..58ab920d177df 100644 --- a/tests/baselines/reference/errorForConflictingExportEqualsValue.js +++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.js @@ -6,3 +6,4 @@ export = {}; //// [errorForConflictingExportEqualsValue.js] "use strict"; module.exports = {}; +exports.__esModule = true; diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js index 89fd0c47a7e94..de92a5e40c31e 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.js +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js @@ -27,8 +27,8 @@ function assert(value) { if (!value) throw new Error("Assertion failed!"); } -exports.__esModule = true; exports["default"] = assert; +exports.__esModule = true; //// [es3defaultAliasQuoted_file1.js] "use strict"; var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0"); diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js index 6a301f9a2acd6..72c954b02f2a4 100644 --- a/tests/baselines/reference/es5-commonjs.js +++ b/tests/baselines/reference/es5-commonjs.js @@ -24,5 +24,5 @@ var A = (function () { }; return A; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = A; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js index 2c38edef6ae44..ce15d3a5ce43d 100644 --- a/tests/baselines/reference/es5-commonjs2.js +++ b/tests/baselines/reference/es5-commonjs2.js @@ -5,5 +5,5 @@ export default 1; //// [es5-commonjs2.js] "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = 1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js index 73c859bb7780f..93a0ed94a5c5a 100644 --- a/tests/baselines/reference/es5-commonjs5.js +++ b/tests/baselines/reference/es5-commonjs5.js @@ -10,5 +10,5 @@ export default function () { function default_1() { return "test"; } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js index 87d2f7d62a6fd..33015271d7a04 100644 --- a/tests/baselines/reference/es5-commonjs6.js +++ b/tests/baselines/reference/es5-commonjs6.js @@ -6,6 +6,6 @@ var __esModule = 1; //// [es5-commonjs6.js] "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "test"; var __esModule = 1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js index 71c4af8d559b0..5bb6f87e4e5f5 100644 --- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js +++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js @@ -28,6 +28,7 @@ function foo() { }); } exports.foo = foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { return new (P || (P = Promise))(function (resolve, reject) { diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js index 76333572abe2f..6f129f5e58dad 100644 --- a/tests/baselines/reference/es5-umd2.js +++ b/tests/baselines/reference/es5-umd2.js @@ -34,4 +34,5 @@ export class A return A; }()); exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js index 0689ef19da31a..1291c739fcb32 100644 --- a/tests/baselines/reference/es5-umd3.js +++ b/tests/baselines/reference/es5-umd3.js @@ -33,6 +33,6 @@ export default class A }; return A; }()); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js index fc8acfb95eacb..f6817129fb34f 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js @@ -13,8 +13,8 @@ var C = (function () { C.prototype.method = function () { }; return C; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js index 0f60a104a7e28..5cf3405c43716 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js @@ -13,8 +13,8 @@ var default_1 = (function () { default_1.prototype.method = function () { }; return default_1; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration2.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js index 00af2676a0dfd..d28148d1416e2 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js @@ -25,10 +25,10 @@ var C = (function () { }; return C; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; var after = new C(); var t = C; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration3.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js index 0821543134c8f..6ebab2a4b0dd2 100644 --- a/tests/baselines/reference/es5ExportDefaultExpression.js +++ b/tests/baselines/reference/es5ExportDefaultExpression.js @@ -5,8 +5,8 @@ export default (1 + 2); //// [es5ExportDefaultExpression.js] "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = (1 + 2); +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultExpression.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js index 55de6b62b8366..1060607886a76 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js @@ -6,8 +6,8 @@ export default function f() { } //// [es5ExportDefaultFunctionDeclaration.js] "use strict"; function f() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js index e6007cc914751..13f9e014be6b5 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js @@ -6,8 +6,8 @@ export default function () { } //// [es5ExportDefaultFunctionDeclaration2.js] "use strict"; function default_1() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = default_1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration2.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js index 54a2658470ecf..47ed66880e66a 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js @@ -14,9 +14,9 @@ var before = func(); function func() { return func; } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = func; var after = func(); +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration3.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js index b3840caf14589..1102eab997d1b 100644 --- a/tests/baselines/reference/es5ExportDefaultIdentifier.js +++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js @@ -9,8 +9,8 @@ export default f; "use strict"; function f() { } exports.f = f; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultIdentifier.d.ts] diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js index 7060153f0d088..02774139add51 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js @@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js index e5f995fb5e0a4..4c58c0bd20f81 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js @@ -22,3 +22,4 @@ var A = (function () { return A; }()); exports.A = A; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js index 34ad74818b23e..4479259a5234b 100644 --- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js +++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js @@ -22,3 +22,4 @@ var A = (function () { return A; }()); exports.A = A; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js index dc094122d9d08..6f1d083ebe8f6 100644 --- a/tests/baselines/reference/es6-umd2.js +++ b/tests/baselines/reference/es6-umd2.js @@ -32,4 +32,5 @@ export class A } } exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index 73de2e7cce36e..80d31b41695fd 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -29,12 +29,14 @@ var m; m.x = 10; })(m = exports.m || (exports.m = {})); exports.x = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } __export(require("./server")); +Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index f602f1ff609fb..98940523143d9 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -32,6 +32,7 @@ var m; exports.instantiatedModule = m; var x = 10; exports.x = x; +Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js index 5add71a06f297..f1cb97ad0f674 100644 --- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js @@ -34,3 +34,4 @@ exports.bizz = bizz; exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1 exports.bizz = bizz -= 1; // similarly exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index ab9bd3d98c814..5891de5731084 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -33,6 +33,7 @@ var m; m.x = 10; })(m = exports.m || (exports.m = {})); exports.x = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; var server_1 = require("./server"); @@ -43,6 +44,7 @@ var server_3 = require("./server"); exports.instantiatedModule = server_3.m; var server_4 = require("./server"); exports.x = server_4.x; +Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js index 49a8a7e435a40..c84c76839ee76 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.js +++ b/tests/baselines/reference/es6ExportEqualsInterop.js @@ -304,3 +304,4 @@ __export(require("function")); __export(require("function-module")); __export(require("class")); __export(require("class-module")); +exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js index 9de16453c6e1c..3148d9b028dca 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js +++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js @@ -15,8 +15,8 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import define(["require", "exports"], function (require, exports) { "use strict"; var a = 10; - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [es6ImportDefaultBindingAmd_1.js] define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) { diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js index dbc90cb80a3ce..6f4836a668054 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js @@ -18,12 +18,13 @@ var c = (function () { } return c; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = c; +Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; var server_1 = require("./server"); exports.x = new server_1.default(); +Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js index 4bff2abf82d56..703e0a7a7bbc3 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js @@ -27,8 +27,8 @@ var x1: number = m; exports.a = 10; exports.x = exports.a; exports.m = exports.a; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = {}; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js] "use strict"; const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index fde7556edea25..58d5399c99d36 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -23,8 +23,8 @@ var x: number = defaultBinding6; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js] "use strict"; var a = 10; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js] "use strict"; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js index 6131ff4062453..5d2518bb7742d 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js @@ -23,8 +23,8 @@ export var x1: number = defaultBinding6; //// [server.js] "use strict"; var a = 10; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; var server_1 = require("./server"); @@ -39,6 +39,7 @@ var server_5 = require("./server"); exports.x1 = server_5.default; var server_6 = require("./server"); exports.x1 = server_6.default; +Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js index a0916932d4ccf..0556d87248006 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js @@ -62,6 +62,7 @@ var x11 = (function () { return x11; }()); exports.x11 = x11; +exports.__esModule = true; //// [client.js] "use strict"; var server_1 = require("./server"); @@ -75,6 +76,7 @@ var server_4 = require("./server"); exports.x3 = new server_4.x11(); var server_5 = require("./server"); exports.x6 = new server_5.m(); +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index b588c9516e9f4..f52c590f44e80 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -26,8 +26,8 @@ var a = (function () { } return a; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; var server_1 = require("./server"); @@ -42,6 +42,7 @@ var server_5 = require("./server"); exports.x5 = new server_5.default(); var server_6 = require("./server"); exports.x6 = new server_6.default(); +Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js index c075c5c934fe6..c6887efba36a6 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js @@ -26,6 +26,7 @@ var x1: number = m; exports.a = 10; exports.x = exports.a; exports.m = exports.a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js] "use strict"; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js index aa89c8d438080..247c64c3e7f41 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js @@ -28,8 +28,8 @@ define(["require", "exports"], function (require, exports) { exports.a = 10; exports.x = exports.a; exports.m = exports.a; - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = {}; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) { @@ -40,6 +40,7 @@ define(["require", "exports", "server", "server", "server", "server", "server"], exports.x1 = server_3.a; exports.x1 = server_4.x; exports.x1 = server_5.m; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js index 0a0e028b696ea..95c1485e5c18d 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js @@ -12,8 +12,8 @@ var x: number = defaultBinding; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] "use strict"; var a = 10; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js index 5f2cb4e97e093..fbd045e81de42 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js @@ -13,13 +13,14 @@ export var x: number = defaultBinding; define(["require", "exports"], function (require, exports) { "use strict"; var a = 10; - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; exports.x = server_1.default; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index 60bdc6548423b..8b430e2cf46d5 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -16,10 +16,12 @@ var a = (function () { return a; }()); exports.a = a; +exports.__esModule = true; //// [client.js] "use strict"; var nameSpaceBinding = require("./server"); exports.x = new nameSpaceBinding.a(); +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js index 8752157eddd39..09caf0db18ae2 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js @@ -17,13 +17,14 @@ define(["require", "exports"], function (require, exports) { } return a; }()); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; exports.x = new server_1.default(); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index 9d11e1547550e..385e65f3f679e 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -11,6 +11,7 @@ var x: number = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] "use strict"; exports.a = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js index e16ebf99957a2..0b5670b18a976 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js @@ -11,10 +11,12 @@ export var x: number = nameSpaceBinding.a; //// [server.js] "use strict"; exports.a = 10; +exports.__esModule = true; //// [client.js] "use strict"; var nameSpaceBinding = require("./server"); exports.x = nameSpaceBinding.a; +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js index e686c3f33c9c6..e6daf77e4e91c 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js +++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js @@ -19,8 +19,8 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould //// [es6ImportDefaultBindingMergeErrors_0.js] "use strict"; var a = 10; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingMergeErrors_1.js] "use strict"; var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js index 5513ae565f222..a40dff3c31772 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js +++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js @@ -11,5 +11,6 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0"; //// [es6ImportDefaultBindingNoDefaultProperty_0.js] "use strict"; exports.a = 10; +exports.__esModule = true; //// [es6ImportDefaultBindingNoDefaultProperty_1.js] "use strict"; diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js index cc90d28091478..6ea0812d40b9a 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js @@ -14,13 +14,14 @@ export import defaultBinding2 from "server"; // non referenced define(["require", "exports"], function (require, exports) { "use strict"; var a = 10; - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = a; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; exports.x = server_1.default; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js index 8e109779f45fb..8ef828435f062 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImport.js @@ -13,6 +13,7 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this //// [es6ImportNameSpaceImport_0.js] "use strict"; exports.a = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImport_1.js] "use strict"; const nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js index 093e8385baed2..0e795db4c01b6 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js @@ -14,6 +14,7 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi define(["require", "exports"], function (require, exports) { "use strict"; exports.a = 10; + exports.__esModule = true; }); //// [es6ImportNameSpaceImportAmd_1.js] define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) { diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js index cf66c08331e3a..20b9d3af20bc8 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js @@ -18,10 +18,12 @@ var c = (function () { }()); exports.c = c; ; +exports.__esModule = true; //// [client.js] "use strict"; var nameSpaceBinding = require("./server"); exports.x = new nameSpaceBinding.c(); +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js index 252d131f82447..9e05e95244ef6 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js @@ -13,6 +13,7 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide //// [es6ImportNameSpaceImportInEs5_0.js] "use strict"; exports.a = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImportInEs5_1.js] "use strict"; var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js index 9bdd0318310c2..357f0f05e7fa2 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js @@ -18,6 +18,7 @@ var nameSpaceBinding3 = 10; //// [es6ImportNameSpaceImportMergeErrors_0.js] "use strict"; exports.a = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImportMergeErrors_1.js] "use strict"; var nameSpaceBinding3 = 10; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js index e21ab603f82de..1663d7ec9238a 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js @@ -14,11 +14,13 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports define(["require", "exports"], function (require, exports) { "use strict"; exports.a = 10; + exports.__esModule = true; }); //// [client.js] define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) { "use strict"; exports.x = nameSpaceBinding.a; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js index 8dbdf7ce6f195..f60477a73cb87 100644 --- a/tests/baselines/reference/es6ImportNamedImport.js +++ b/tests/baselines/reference/es6ImportNamedImport.js @@ -51,6 +51,7 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImport_1.js] "use strict"; const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js index 278e4ee07d28f..33ea02fd94fe5 100644 --- a/tests/baselines/reference/es6ImportNamedImportAmd.js +++ b/tests/baselines/reference/es6ImportNamedImportAmd.js @@ -52,6 +52,7 @@ define(["require", "exports"], function (require, exports) { exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; + exports.__esModule = true; }); //// [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) { diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js index 7fdf620164b07..f8fdf4616445c 100644 --- a/tests/baselines/reference/es6ImportNamedImportDts.js +++ b/tests/baselines/reference/es6ImportNamedImportDts.js @@ -132,6 +132,7 @@ var aaaa1 = (function () { return aaaa1; }()); exports.aaaa1 = aaaa1; +exports.__esModule = true; //// [client.js] "use strict"; var server_1 = require("./server"); @@ -155,6 +156,7 @@ var server_8 = require("./server"); exports.z111 = new server_8.z1(); var server_9 = require("./server"); exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js index 3f3e4694758f7..859522473950a 100644 --- a/tests/baselines/reference/es6ImportNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js @@ -51,6 +51,7 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImportInEs5_1.js] "use strict"; var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js index 38766d32cd900..0743f1658b49f 100644 --- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js @@ -11,6 +11,7 @@ export = a; //// [es6ImportNamedImportInExportAssignment_0.js] "use strict"; exports.a = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImportInExportAssignment_1.js] "use strict"; const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js index 002aa5a49ce71..f3f76ff01845e 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js @@ -26,6 +26,7 @@ exports.a = 10; exports.x = exports.a; exports.z = exports.a; exports.z1 = exports.a; +exports.__esModule = true; //// [es6ImportNamedImportMergeErrors_1.js] "use strict"; var x = 10; diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js index 71159983b9afb..a3bd672c6f3d9 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js +++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js @@ -13,5 +13,6 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0"; "use strict"; exports.a = 10; exports.x = exports.a; +exports.__esModule = true; //// [es6ImportNamedImport_1.js] "use strict"; diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js index 21ccb29a57bbf..7377f737e470c 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js @@ -50,6 +50,7 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; +exports.__esModule = true; //// [client.js] "use strict"; var server_1 = require("./server"); @@ -73,6 +74,7 @@ var server_8 = require("./server"); exports.z111 = server_8.z1; var server_9 = require("./server"); exports.z2 = server_9.z2; // z2 shouldn't give redeclare error +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js index 583a008f0aca2..1bbab226ae8e2 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js @@ -36,10 +36,12 @@ var C2 = (function () { return C2; }()); exports.C2 = C2; +exports.__esModule = true; //// [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(); +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js index ea533a9a963cc..726efa849c218 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js @@ -17,11 +17,13 @@ var _b = 10; define(["require", "exports"], function (require, exports) { "use strict"; exports.a = 10; + exports.__esModule = true; }); //// [es6ImportWithoutFromClauseAmd_1.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.b = 10; + exports.__esModule = true; }); //// [es6ImportWithoutFromClauseAmd_2.js] define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) { diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js index d0f7c9fbe657a..9d844a8ca8f89 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js @@ -10,6 +10,7 @@ import "es6ImportWithoutFromClauseInEs5_0"; //// [es6ImportWithoutFromClauseInEs5_0.js] "use strict"; exports.a = 10; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportWithoutFromClauseInEs5_1.js] "use strict"; require("es6ImportWithoutFromClauseInEs5_0"); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index 5ff5b62d8ecda..b78466485f9b5 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -10,6 +10,7 @@ export import "server"; //// [server.js] "use strict"; exports.a = 10; +exports.__esModule = true; //// [client.js] "use strict"; require("server"); diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js index 172ce2a8729d1..bd45a62e2f400 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js @@ -22,4 +22,5 @@ define(["require", "exports"], function (require, exports) { } } exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js index f932bb7072ff6..a7cf0599e5435 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js @@ -21,3 +21,4 @@ class A { } } exports.A = A; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js index 5f37f0f022030..b2a01bbb552d5 100644 --- a/tests/baselines/reference/exportAndImport-es3-amd.js +++ b/tests/baselines/reference/exportAndImport-es3-amd.js @@ -17,8 +17,8 @@ define(["require", "exports"], function (require, exports) { "use strict"; function f1() { } - exports.__esModule = true; exports["default"] = f1; + exports.__esModule = true; }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { @@ -26,6 +26,6 @@ define(["require", "exports", "./m1"], function (require, exports, m1_1) { function f2() { m1_1["default"](); } - exports.__esModule = true; exports["default"] = f2; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js index ee1f562258f2b..898261ef7fea6 100644 --- a/tests/baselines/reference/exportAndImport-es3.js +++ b/tests/baselines/reference/exportAndImport-es3.js @@ -16,13 +16,13 @@ export default function f2() { "use strict"; function f1() { } -exports.__esModule = true; exports["default"] = f1; +exports.__esModule = true; //// [m2.js] "use strict"; var m1_1 = require("./m1"); function f2() { m1_1["default"](); } -exports.__esModule = true; exports["default"] = f2; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js index 0e2cb890d2a7c..fcc918bb8cead 100644 --- a/tests/baselines/reference/exportAndImport-es5-amd.js +++ b/tests/baselines/reference/exportAndImport-es5-amd.js @@ -17,8 +17,8 @@ define(["require", "exports"], function (require, exports) { "use strict"; function f1() { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f1; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { @@ -26,6 +26,6 @@ define(["require", "exports", "./m1"], function (require, exports, m1_1) { function f2() { m1_1.default(); } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f2; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js index 1d2511735c7f9..fa1652c603e3b 100644 --- a/tests/baselines/reference/exportAndImport-es5.js +++ b/tests/baselines/reference/exportAndImport-es5.js @@ -16,13 +16,13 @@ export default function f2() { "use strict"; function f1() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; var m1_1 = require("./m1"); function f2() { m1_1.default(); } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f2; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js index 386419e5725eb..641500fa09d5e 100644 --- a/tests/baselines/reference/exportArrayBindingPattern.js +++ b/tests/baselines/reference/exportArrayBindingPattern.js @@ -9,3 +9,4 @@ export { a, b }; var _a = [1, 2, 3], a = _a[0], b = _a[2]; exports.a = a; exports.b = b; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js index c9c3ffa80c453..a39a7aa04cd23 100644 --- a/tests/baselines/reference/exportAssignDottedName.js +++ b/tests/baselines/reference/exportAssignDottedName.js @@ -16,6 +16,7 @@ function x() { return true; } exports.x = x; +exports.__esModule = true; //// [foo2.js] "use strict"; var foo1 = require("./foo1"); diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js index a469e90b619b6..265d082ca358e 100644 --- a/tests/baselines/reference/exportAssignImportedIdentifier.js +++ b/tests/baselines/reference/exportAssignImportedIdentifier.js @@ -20,6 +20,7 @@ function x() { return true; } exports.x = x; +exports.__esModule = true; //// [foo2.js] "use strict"; var foo1 = require("./foo1"); diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js index 8441b7b4320d9..0aea8ec80fc44 100644 --- a/tests/baselines/reference/exportAssignmentWithExports.js +++ b/tests/baselines/reference/exportAssignmentWithExports.js @@ -16,3 +16,4 @@ var D = (function () { return D; }()); module.exports = D; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js index 19f872bad270e..9a03aaae595fd 100644 --- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js +++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js @@ -23,17 +23,21 @@ export { x as a, } from //// [t1.js] "use strict"; exports.x = "x"; +exports.__esModule = true; //// [t2.js] "use strict"; var t1_1 = require("./t1"); exports.x = t1_1.x; +exports.__esModule = true; //// [t3.js] "use strict"; //// [t4.js] "use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; +exports.__esModule = true; //// [t5.js] "use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js index 2dcef41d76104..4ccdba88556fc 100644 --- a/tests/baselines/reference/exportDefaultProperty.js +++ b/tests/baselines/reference/exportDefaultProperty.js @@ -55,12 +55,12 @@ var A; B.b = 0; })(B = A.B || (A.B = {})); })(A || (A = {})); -exports.__esModule = true; exports["default"] = A.B; +exports.__esModule = true; //// [b.js] "use strict"; -exports.__esModule = true; exports["default"] = "foo".length; +exports.__esModule = true; //// [index.js] "use strict"; /// diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js index 2b0a5dce526d7..b5d3e2c053b55 100644 --- a/tests/baselines/reference/exportDefaultProperty2.js +++ b/tests/baselines/reference/exportDefaultProperty2.js @@ -25,8 +25,8 @@ var C = (function () { } return C; }()); -exports.__esModule = true; exports["default"] = C.B; +exports.__esModule = true; //// [b.js] "use strict"; var a_1 = require("./a"); diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js index 8f78528208057..6ca5b6411ff13 100644 --- a/tests/baselines/reference/exportImport.js +++ b/tests/baselines/reference/exportImport.js @@ -38,6 +38,7 @@ define(["require", "exports", "./exporter"], function (require, exports, e) { return new e.w(); } exports.w = w; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js index 345d2a6885a14..e84e661517bcb 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.js +++ b/tests/baselines/reference/exportImportMultipleFiles.js @@ -17,6 +17,7 @@ define(["require", "exports"], function (require, exports) { "use strict"; function add(a, b) { return a + b; } exports.add = add; + exports.__esModule = true; }); //// [exportImportMultipleFiles_library.js] define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) { diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js index 401183a5ead58..adcdeda785018 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js @@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) { return { name: 'value' }; } exports.w = w; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js index d8dd17a562cce..ba7f938086597 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js @@ -67,4 +67,5 @@ define(["require", "exports"], function (require, exports) { exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js index f986ef7f36b72..bf30e45f1ca33 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js @@ -66,3 +66,4 @@ exports.e1 = new D; exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js index 796818c650c74..1b26cfe3c1aea 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js @@ -75,4 +75,5 @@ export let h1: D = new D; exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js index b1e2e200634dc..a9ec4591c6c89 100644 --- a/tests/baselines/reference/exportRedeclarationTypeAliases.js +++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js @@ -7,3 +7,4 @@ export function Foo(): any {} "use strict"; function Foo() { } exports.Foo = Foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js index 2bc77e079fbd1..e5fa8913ffd63 100644 --- a/tests/baselines/reference/exportSameNameFuncVar.js +++ b/tests/baselines/reference/exportSameNameFuncVar.js @@ -10,4 +10,5 @@ define(["require", "exports"], function (require, exports) { function a() { } exports.a = a; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js index ac79a9bf69dac..b117972450eec 100644 --- a/tests/baselines/reference/exportSpecifierForAGlobal.js +++ b/tests/baselines/reference/exportSpecifierForAGlobal.js @@ -19,6 +19,7 @@ function f() { return x; } exports.f = f; +exports.__esModule = true; //// [b.d.ts] diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js index bd4c112ff2e6a..2ef8560a38aa4 100644 --- a/tests/baselines/reference/exportStar-amd.js +++ b/tests/baselines/reference/exportStar-amd.js @@ -34,14 +34,15 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; exports.y = 2; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports"], function (require, exports) { "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } exports.foo = foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports"], function (require, exports) { @@ -52,6 +53,7 @@ define(["require", "exports"], function (require, exports) { exports.y = y; var z = "z"; exports.z = z; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t4.js] define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) { @@ -62,6 +64,7 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export __export(t1_1); __export(t2_1); __export(t3_1); + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [main.js] define(["require", "exports", "./t4"], function (require, exports, t4_1) { diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js index a2bc44720fb69..460984a2b13d9 100644 --- a/tests/baselines/reference/exportStar.js +++ b/tests/baselines/reference/exportStar.js @@ -33,12 +33,13 @@ foo; "use strict"; exports.x = 1; exports.y = 2; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } exports.foo = foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; var x = "x"; @@ -47,6 +48,7 @@ var y = "y"; exports.y = y; var z = "z"; exports.z = z; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t4.js] "use strict"; function __export(m) { @@ -55,6 +57,7 @@ function __export(m) { __export(require("./t1")); __export(require("./t2")); __export(require("./t3")); +Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; var t4_1 = require("./t4"); diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js index dc4d4c8b68edf..21f2b4c2f0910 100644 --- a/tests/baselines/reference/exportStarForValues5.js +++ b/tests/baselines/reference/exportStarForValues5.js @@ -15,4 +15,5 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js index 39a152fdc896f..d0c1f85582cdf 100644 --- a/tests/baselines/reference/exportStarForValues7.js +++ b/tests/baselines/reference/exportStarForValues7.js @@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports, file2_1) { @@ -29,4 +30,5 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { } __export(file2_1); exports.x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js index f8e7678a40ca0..cb3f66fbaf626 100644 --- a/tests/baselines/reference/exportStarForValues8.js +++ b/tests/baselines/reference/exportStarForValues8.js @@ -32,11 +32,13 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [file4.js] define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) { @@ -47,6 +49,7 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil __export(file2_1); __export(file3_1); exports.x = 1; + exports.__esModule = true; }); //// [file5.js] define(["require", "exports", "file4"], function (require, exports, file4_1) { @@ -56,4 +59,5 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) { } __export(file4_1); exports.x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js index e057e4d4027f3..fdcb0e5583ad5 100644 --- a/tests/baselines/reference/exportStarForValues9.js +++ b/tests/baselines/reference/exportStarForValues9.js @@ -28,6 +28,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { } __export(file2_1); exports.x = 1; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "file3"], function (require, exports, file3_1) { @@ -37,4 +38,5 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) { } __export(file3_1); exports.x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index afb4d2f10c1bc..bb9867725b075 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -31,6 +31,7 @@ var A = (function () { return A; }()); exports.A = A; +Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module2.js] // empty //// [exportStarFromEmptyModule_module3.js] @@ -46,6 +47,7 @@ var A = (function () { return A; }()); exports.A = A; +Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module4.js] "use strict"; var X = require("./exportStarFromEmptyModule_module3"); diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js index 190d1693c248c..ee9482c655ff5 100644 --- a/tests/baselines/reference/exportToString.js +++ b/tests/baselines/reference/exportToString.js @@ -7,3 +7,4 @@ export { toString }; "use strict"; var toString = 0; exports.toString = toString; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js index a49cd744441d5..d66cf54312488 100644 --- a/tests/baselines/reference/exportVisibility.js +++ b/tests/baselines/reference/exportVisibility.js @@ -22,3 +22,4 @@ function test(foo) { return true; } exports.test = test; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js index 3e77c3c684b4c..357e7dc25f448 100644 --- a/tests/baselines/reference/exportedBlockScopedDeclarations.js +++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js @@ -38,4 +38,5 @@ define(["require", "exports"], function (require, exports) { (function (NS1) { NS1.bar1 = NS1.bar1; // should be compile error })(NS1 || (NS1 = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js index da472fc879014..11737e21e734f 100644 --- a/tests/baselines/reference/exportedVariable1.js +++ b/tests/baselines/reference/exportedVariable1.js @@ -8,4 +8,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.foo = { name: "Bill" }; var upper = exports.foo.name.toUpperCase(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js index f2d78fe9a8884..5e9d0f2edf251 100644 --- a/tests/baselines/reference/exportingContainingVisibleType.js +++ b/tests/baselines/reference/exportingContainingVisibleType.js @@ -27,4 +27,5 @@ define(["require", "exports"], function (require, exports) { return Foo; }()); exports.x = 5; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js index 9e04b3485d205..f6456368e33b0 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.js +++ b/tests/baselines/reference/exportsAndImports1-amd.js @@ -60,6 +60,7 @@ define(["require", "exports"], function (require, exports) { exports.M = M; var a = M.x; exports.a = a; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { @@ -70,6 +71,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) { exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { @@ -80,4 +82,5 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) { exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js index 3ac5aeb0dc5e9..968cd18537872 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.js +++ b/tests/baselines/reference/exportsAndImports1-es6.js @@ -56,6 +56,7 @@ var M; exports.M = M; var a = M.x; exports.a = a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; var t1_1 = require("./t1"); @@ -65,6 +66,7 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; const t1_1 = require("./t1"); @@ -74,3 +76,4 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index 46eda0656ad8c..a6f97be067729 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -59,6 +59,7 @@ var M; exports.M = M; var a = M.x; exports.a = a; +exports.__esModule = true; //// [t2.js] "use strict"; var t1_1 = require("./t1"); @@ -68,6 +69,7 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; +exports.__esModule = true; //// [t3.js] "use strict"; var t1_1 = require("./t1"); @@ -77,3 +79,4 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js index 18803de4004a7..d67dd92707d94 100644 --- a/tests/baselines/reference/exportsAndImports2-amd.js +++ b/tests/baselines/reference/exportsAndImports2-amd.js @@ -18,16 +18,19 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.x = "x"; exports.y = "y"; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; exports.y = t1_1.x; exports.x = t1_1.y; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; exports.y = t1_1.x; exports.x = t1_1.y; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js index 56639bdbecf2e..59ee55defd830 100644 --- a/tests/baselines/reference/exportsAndImports2-es6.js +++ b/tests/baselines/reference/exportsAndImports2-es6.js @@ -17,13 +17,16 @@ export { x as y, y as x }; "use strict"; exports.x = "x"; exports.y = "y"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; const t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js index 3790510979c85..672d7161e74f4 100644 --- a/tests/baselines/reference/exportsAndImports2.js +++ b/tests/baselines/reference/exportsAndImports2.js @@ -17,13 +17,16 @@ export { x as y, y as x }; "use strict"; exports.x = "x"; exports.y = "y"; +exports.__esModule = true; //// [t2.js] "use strict"; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; +exports.__esModule = true; //// [t3.js] "use strict"; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js index cbf30735182db..1f74addddec17 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.js +++ b/tests/baselines/reference/exportsAndImports3-amd.js @@ -62,6 +62,7 @@ define(["require", "exports"], function (require, exports) { exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { @@ -72,6 +73,7 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) { exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { @@ -82,4 +84,5 @@ define(["require", "exports", "./t1"], function (require, exports, t1_1) { exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js index 85daa3f0f5ccd..b4152cab77867 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.js +++ b/tests/baselines/reference/exportsAndImports3-es6.js @@ -58,6 +58,7 @@ var M; exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; var t1_1 = require("./t1"); @@ -67,6 +68,7 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; const t1_1 = require("./t1"); @@ -76,3 +78,4 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index dbcd94862153c..2bc4c828fe1c6 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -61,6 +61,7 @@ var M; exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; +exports.__esModule = true; //// [t2.js] "use strict"; var t1_1 = require("./t1"); @@ -70,6 +71,7 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; +exports.__esModule = true; //// [t3.js] "use strict"; var t1_1 = require("./t1"); @@ -79,3 +81,4 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js index 3ed3f9bf9107b..ddacb1eec94b0 100644 --- a/tests/baselines/reference/exportsAndImports4-amd.js +++ b/tests/baselines/reference/exportsAndImports4-amd.js @@ -42,8 +42,8 @@ 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"; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) { @@ -65,4 +65,5 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f exports.f2 = t1_4.default; t1_4.default; t1_4.default; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js index 8a8d4f812254e..5f0c37ab04fd1 100644 --- a/tests/baselines/reference/exportsAndImports4-es6.js +++ b/tests/baselines/reference/exportsAndImports4-es6.js @@ -41,8 +41,8 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; const a = require("./t1"); @@ -67,3 +67,4 @@ exports.f1 = t1_4.default; exports.f2 = t1_4.default; t1_4.default; t1_4.default; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js index 361d1305bdab1..6a78862e55e09 100644 --- a/tests/baselines/reference/exportsAndImports4.js +++ b/tests/baselines/reference/exportsAndImports4.js @@ -41,8 +41,8 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] "use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; var a = require("./t1"); @@ -67,3 +67,4 @@ exports.f1 = t1_4.default; exports.f2 = t1_4.default; t1_4.default; t1_4.default; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js index fb6946ce928a1..838a6ae9326cd 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js @@ -28,6 +28,7 @@ var set = { exports.set = set; var get = 10; exports.get = get; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; //// [t3.js] diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js index 219916b304750..4af17d7165315 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js @@ -22,6 +22,7 @@ import { as } from "./t1"; var as = 100; exports.return = as; exports.as = as; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; var as = require("./t1"); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js index d14eab3c25136..7cdfbe79ebee6 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js @@ -17,12 +17,12 @@ const { __, _, ___ } = R; //// [m1.js] "use strict"; var R; -exports.__esModule = true; exports["default"] = R = { "__": 20, "_": 10, "___": 30 }; +exports.__esModule = true; //// [m2.js] "use strict"; var m1_1 = require("./m1"); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js index 5d1dcbb93226d..890e32937a1fe 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js @@ -16,11 +16,11 @@ const { __esmodule, __proto__ } = R; //// [m1.js] "use strict"; var R; -exports.__esModule = true; exports["default"] = R = { "__esmodule": true, "__proto__": {} }; +exports.__esModule = true; //// [m2.js] "use strict"; var m1_1 = require("./m1"); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js index 477f870742daa..3514652db6594 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js @@ -17,12 +17,12 @@ const { ___, ___hello, _hi } = R; //// [m1.js] "use strict"; var R; -exports.__esModule = true; exports["default"] = R = { "___": 30, "___hello": 21, "_hi": 40 }; +exports.__esModule = true; //// [m2.js] "use strict"; var m1_1 = require("./m1"); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js index 22cd7c2e71a79..25130664b7477 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js @@ -64,6 +64,7 @@ function ___hello() { console.log("___hello"); } exports.___hello = ___hello; +exports.__esModule = true; //// [m2.js] "use strict"; var m1_1 = require("./m1"); diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js index 2d1add18ae0c4..2e26d67db3977 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js @@ -40,6 +40,7 @@ var Model = (function () { return Model; }()); exports.Model = Model; +exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -61,6 +62,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -82,6 +84,7 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; +exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_main.js] "use strict"; var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA"); diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js index 47958ddd2ffe7..4d60625115bea 100644 --- a/tests/baselines/reference/externalModuleAssignToVar.js +++ b/tests/baselines/reference/externalModuleAssignToVar.js @@ -35,6 +35,7 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; + exports.__esModule = true; }); //// [externalModuleAssignToVar_core_require2.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js index b50845024f48d..646b447185950 100644 --- a/tests/baselines/reference/externalModuleImmutableBindings.js +++ b/tests/baselines/reference/externalModuleImmutableBindings.js @@ -54,6 +54,7 @@ for ((stuff[n]) of []) {} //// [f1.js] "use strict"; exports.x = 1; +exports.__esModule = true; //// [f2.js] "use strict"; // all mutations below are illegal and should be fixed diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js index 5b0de7324ac90..9c9861d7c28a2 100644 --- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js +++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js @@ -23,6 +23,7 @@ file1.bar(); function foo() { } exports.foo = foo; ; +exports.__esModule = true; //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js] "use strict"; /// diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js index eb5171acd75cb..959a3ffffcf37 100644 --- a/tests/baselines/reference/fieldAndGetterWithSameName.js +++ b/tests/baselines/reference/fieldAndGetterWithSameName.js @@ -18,4 +18,5 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js index 0c6f1c8034dc1..793f4ab6c0605 100644 --- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js +++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js @@ -18,6 +18,7 @@ define("a", ["require", "exports"], function (require, exports) { return c; }()); exports.c = c; + exports.__esModule = true; }); function foo() { } diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js index 8391823aa3abc..3b1644e7ac11b 100644 --- a/tests/baselines/reference/functionAndImportNameConflict.js +++ b/tests/baselines/reference/functionAndImportNameConflict.js @@ -14,8 +14,10 @@ export function f() { function f() { } exports.f = f; +exports.__esModule = true; //// [f2.js] "use strict"; function f() { } exports.f = f; +exports.__esModule = true; diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js index bf1d887b43573..d794cded0f4f8 100644 --- a/tests/baselines/reference/functionLikeInParameterInitializer.js +++ b/tests/baselines/reference/functionLikeInParameterInitializer.js @@ -50,3 +50,4 @@ function baz3(func) { var foo = "in"; } exports.baz3 = baz3; +exports.__esModule = true; diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js index 594d2c3263c9a..426697dfa8dc8 100644 --- a/tests/baselines/reference/generatorES6InAMDModule.js +++ b/tests/baselines/reference/generatorES6InAMDModule.js @@ -10,4 +10,5 @@ define(["require", "exports"], function (require, exports) { yield; } exports.foo = foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js index a17d9272c5b49..1b008c90860da 100644 --- a/tests/baselines/reference/genericClassesInModule2.js +++ b/tests/baselines/reference/genericClassesInModule2.js @@ -41,4 +41,5 @@ define(["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js index 4f3895a33b865..2cbb4485e3181 100644 --- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js +++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js @@ -14,4 +14,5 @@ define(["require", "exports"], function (require, exports) { foo(fn); // Invocation is necessary to repro (!) } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js index c15868e20c470..9704fe5d148a2 100644 --- a/tests/baselines/reference/genericMemberFunction.js +++ b/tests/baselines/reference/genericMemberFunction.js @@ -59,4 +59,5 @@ define(["require", "exports"], function (require, exports) { return BuildResult; }()); exports.BuildResult = BuildResult; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js index 56367ca9c5e89..457158faee1c5 100644 --- a/tests/baselines/reference/genericReturnTypeFromGetter1.js +++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js @@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) { return DbSet; }()); exports.DbSet = DbSet; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js index 5498d3d1fad4c..0ed35307d2d5d 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js @@ -56,4 +56,5 @@ define(["require", "exports"], function (require, exports) { return ListItem; }(CollectionItem)); exports.ListItem = ListItem; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline index 5c865321691b8..783ec2bf947a6 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline @@ -9,6 +9,7 @@ var Foo = (function () { return Foo; }()); exports.Foo = Foo; +Object.defineProperty(exports, "__esModule", { value: true }); EmitSkipped: false FileName : /tests/cases/fourslash/inputFile3.js diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 149a975d413a2..434835a59d3a2 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -1107,6 +1107,7 @@ define(["require", "exports"], function (require, exports) { ; })(eM = exports.eM || (exports.eM = {})); ; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js index 75d6e68d4c510..c676d8caa6216 100644 --- a/tests/baselines/reference/importAsBaseClass.js +++ b/tests/baselines/reference/importAsBaseClass.js @@ -19,6 +19,7 @@ var Greeter = (function () { return Greeter; }()); exports.Greeter = Greeter; +exports.__esModule = true; //// [importAsBaseClass_1.js] "use strict"; var __extends = (this && this.__extends) || (function () { diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index 47bf5a1b2a133..a33b758df7d1e 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -91,6 +91,7 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; +exports.__esModule = true; //// [importDecl_require1.js] "use strict"; var d = (function () { @@ -102,6 +103,7 @@ exports.d = d; var x; function foo() { return null; } exports.foo = foo; +exports.__esModule = true; //// [importDecl_require2.js] "use strict"; var d = (function () { @@ -112,6 +114,7 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; +exports.__esModule = true; //// [importDecl_require3.js] "use strict"; var d = (function () { @@ -122,10 +125,12 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; +exports.__esModule = true; //// [importDecl_require4.js] "use strict"; function foo2() { return null; } exports.foo2 = foo2; +exports.__esModule = true; //// [importDecl_1.js] "use strict"; /// @@ -169,6 +174,7 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); +exports.__esModule = true; //// [importDecl_require.d.ts] diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js index c2cc0b8ea7a3b..ee4e8f1dc8c39 100644 --- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js +++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js @@ -19,8 +19,10 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; //// [importDeclarationUsedAsTypeQuery_1.js] "use strict"; +exports.__esModule = true; //// [importDeclarationUsedAsTypeQuery_require.d.ts] diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js index fea4ee2db2732..7f2c4ad4036ee 100644 --- a/tests/baselines/reference/importHelpers.js +++ b/tests/baselines/reference/importHelpers.js @@ -66,6 +66,7 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); +Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js index 6054e14738607..03a4e6393d7fa 100644 --- a/tests/baselines/reference/importHelpersAmd.js +++ b/tests/baselines/reference/importHelpersAmd.js @@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) { @@ -37,4 +38,5 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib return B; }(a_1.A)); exports.B = B; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js index 429a71c1ab814..52e5aac62e0cf 100644 --- a/tests/baselines/reference/importHelpersInIsolatedModules.js +++ b/tests/baselines/reference/importHelpersInIsolatedModules.js @@ -66,6 +66,7 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); +Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] "use strict"; var tslib_1 = require("tslib"); diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js index 29e43e191e8aa..2883a7aaa53ad 100644 --- a/tests/baselines/reference/importHelpersInTsx.js +++ b/tests/baselines/reference/importHelpersInTsx.js @@ -23,6 +23,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge "use strict"; var tslib_1 = require("tslib"); exports.x = React.createElement("span", tslib_1.__assign({}, o)); +Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __assign = (this && this.__assign) || Object.assign || function(t) { for (var s, i = 1, n = arguments.length; i < n; i++) { diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js index 53b4b32681977..4747e017ff513 100644 --- a/tests/baselines/reference/importHelpersNoHelpers.js +++ b/tests/baselines/reference/importHelpersNoHelpers.js @@ -68,6 +68,7 @@ C = tslib_1.__decorate([ var o = { a: 1 }; var y = tslib_1.__assign({}, o); var x = tslib_1.__rest(y, []); +Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js index f84666ae1984f..efcd4827257be 100644 --- a/tests/baselines/reference/importHelpersNoModule.js +++ b/tests/baselines/reference/importHelpersNoModule.js @@ -58,6 +58,7 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); +Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js index 572115ba4bb99..233b12208c13d 100644 --- a/tests/baselines/reference/importHelpersOutFile.js +++ b/tests/baselines/reference/importHelpersOutFile.js @@ -29,6 +29,7 @@ define("a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) { "use strict"; @@ -40,6 +41,7 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts return B; }(a_1.A)); exports.B = B; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) { "use strict"; @@ -51,4 +53,5 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts return C; }(a_2.A)); exports.C = C; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js index 013999321f959..2d3713ffaf407 100644 --- a/tests/baselines/reference/importImportOnlyModule.js +++ b/tests/baselines/reference/importImportOnlyModule.js @@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) { }()); C1.s1 = true; exports.C1 = C1; + exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js index b57df50499354..e15a3337dfdf0 100644 --- a/tests/baselines/reference/importTsBeforeDTs.js +++ b/tests/baselines/reference/importTsBeforeDTs.js @@ -16,6 +16,7 @@ var z2 = foo.y + 10; // Should resolve //// [foo_0.js] "use strict"; exports.y = 42; +exports.__esModule = true; //// [foo_1.js] "use strict"; var foo = require("./foo_0"); diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js index 4075719c9c5b0..de5ee2a22bd34 100644 --- a/tests/baselines/reference/importUsedInExtendsList1.js +++ b/tests/baselines/reference/importUsedInExtendsList1.js @@ -19,6 +19,7 @@ var Super = (function () { return Super; }()); exports.Super = Super; +exports.__esModule = true; //// [importUsedInExtendsList1_1.js] "use strict"; var __extends = (this && this.__extends) || (function () { diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js index 7118dd95bb821..807d684b5b11f 100644 --- a/tests/baselines/reference/importWithTrailingSlash.js +++ b/tests/baselines/reference/importWithTrailingSlash.js @@ -22,12 +22,12 @@ aIndex.aIndex; //// [a.js] "use strict"; -exports.__esModule = true; exports["default"] = { a: 0 }; +exports.__esModule = true; //// [index.js] "use strict"; -exports.__esModule = true; exports["default"] = { aIndex: 0 }; +exports.__esModule = true; //// [test.js] "use strict"; var _1 = require("."); 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 d67c53c63491e..423a3546d31b1 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 @@ -19,6 +19,7 @@ define(["require", "exports"], function (require, exports) { return Host; }()); exports.Host = Host; + exports.__esModule = true; }); //// [consumer.js] define(["require", "exports", "host"], function (require, exports, host) { diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js index 4630de598cc46..632483866be2b 100644 --- a/tests/baselines/reference/importsImplicitlyReadonly.js +++ b/tests/baselines/reference/importsImplicitlyReadonly.js @@ -26,6 +26,7 @@ a3.y = 1; exports.x = 1; var y = 1; exports.y = y; +exports.__esModule = true; //// [b.js] "use strict"; var a_1 = require("./a"); diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js index 84f0989e9874b..7a530fdb1df80 100644 --- a/tests/baselines/reference/inferenceLimit.js +++ b/tests/baselines/reference/inferenceLimit.js @@ -79,3 +79,4 @@ class BrokenClass { } } exports.BrokenClass = BrokenClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js index 540549aef5235..da0be4c0e953f 100644 --- a/tests/baselines/reference/instanceOfInExternalModules.js +++ b/tests/baselines/reference/instanceOfInExternalModules.js @@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) { return Foo; }()); exports.Foo = Foo; + exports.__esModule = true; }); //// [instanceOfInExternalModules_1.js] define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) { diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js index 6726971d208bb..dde6b1632f1c6 100644 --- a/tests/baselines/reference/interfaceDeclaration5.js +++ b/tests/baselines/reference/interfaceDeclaration5.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return C1; }()); exports.C1 = C1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js index 642300d9160fc..5fb3996134b15 100644 --- a/tests/baselines/reference/interfaceImplementation6.js +++ b/tests/baselines/reference/interfaceImplementation6.js @@ -50,4 +50,5 @@ define(["require", "exports"], function (require, exports) { return Test; }()); exports.Test = Test; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index aa274838529d0..20ce33035e6e2 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -41,6 +41,7 @@ var m2; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); exports.d = new m2.m3.c(); +exports.__esModule = true; //// [internalAliasClassInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js index c15ca69e13fcc..d9f47a05d9e9c 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js @@ -41,3 +41,4 @@ var m2; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); exports.d = new m2.m3.c(); +exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index f881032fa1eb5..52a2e0b3fed87 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -28,6 +28,7 @@ var x; exports.xc = x.c; exports.cProp = new exports.xc(); var cReturnVal = exports.cProp.foo(10); +exports.__esModule = true; //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index ac5004a7606a1..640b533f1518c 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -28,6 +28,7 @@ var x; var xc = x.c; exports.cProp = new xc(); var cReturnVal = exports.cProp.foo(10); +exports.__esModule = true; //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index 8e11f60dcc71c..d3e9fdf8349c5 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); exports.b = a.weekend; exports.bVal = exports.b.Sunday; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index 8ec0dcea81575..99b9156c0c9d2 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -25,6 +25,7 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); var b = a.weekend; exports.bVal = b.Sunday; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index be096720e5e10..88765f267e635 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -23,6 +23,7 @@ define(["require", "exports"], function (require, exports) { exports.b = a.foo; exports.bVal = exports.b(10); exports.bVal2 = exports.b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index ec702b7e0218b..160b404784919 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -22,6 +22,7 @@ var a; var b = a.foo; exports.bVal = b(10); exports.bVal2 = b; +exports.__esModule = true; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js index 02181f04f8d4c..77dbbab235a05 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -33,3 +33,4 @@ var c; c.x = new b.c(); })(c = exports.c || (exports.c = {})); exports.d = new c.b.c(); +exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index 26915043496b1..05fe46f1eb525 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -25,6 +25,7 @@ var a; })(a = exports.a || (exports.a = {})); exports.b = a.b; exports.x = new exports.b.c(); +exports.__esModule = true; //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index a8a1d9ee0471c..63f6b8c14226a 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); var b = a.b; exports.x = new b.c(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js index 1d6cb8c07e968..4434670366c56 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js @@ -10,6 +10,7 @@ export var x: b; //// [internalAliasInterfaceInsideTopLevelModuleWithExport.js] "use strict"; +exports.__esModule = true; //// [internalAliasInterfaceInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js index fb666a9cad20f..5645c76ed2ad5 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js @@ -11,6 +11,7 @@ export var x: b; //// [internalAliasInterfaceInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js index 1015e2a1d63a0..efbb156bed8d9 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) { (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js index dac3821a30d5e..ac52f94db72d7 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js @@ -16,6 +16,7 @@ x.foo(); define(["require", "exports"], function (require, exports) { "use strict"; exports.x.foo(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index dc1029c666410..45af45361514e 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -15,6 +15,7 @@ x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js] "use strict"; exports.x.foo(); +exports.__esModule = true; //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js index aa61fc77216b7..962e34c4a3e9a 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js @@ -22,3 +22,4 @@ var c; c.bVal = b; })(c = exports.c || (exports.c = {})); exports.z = c.b; +exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js index 5427dbf026f1f..732257b93e5b2 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js @@ -17,6 +17,7 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); exports.b = a.x; exports.bVal = exports.b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js index 7c7c2cd327e7f..f0d02aa709ce4 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js @@ -16,6 +16,7 @@ var a; })(a = exports.a || (exports.a = {})); var b = a.x; exports.bVal = b; +exports.__esModule = true; //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js index f4ad4da608b3a..27a75a64be615 100644 --- a/tests/baselines/reference/intersectionTypeInference1.js +++ b/tests/baselines/reference/intersectionTypeInference1.js @@ -15,3 +15,4 @@ function alert(s) { } var parameterFn = function (props) { return alert(props.store); }; var brokenFunction = function (f) { return function (o) { return o; }; }; exports.Form3 = brokenFunction(parameterFn)({ store: "hello" }); +exports.__esModule = true; diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js index 80f47941e600b..f9590d70dd3c3 100644 --- a/tests/baselines/reference/isolatedModulesImportExportElision.js +++ b/tests/baselines/reference/isolatedModulesImportExportElision.js @@ -40,3 +40,4 @@ var y = ns.value; var module_3 = require("module"); exports.c1 = module_3.c1; exports.z = x; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/isolatedModulesSpecifiedModule.js b/tests/baselines/reference/isolatedModulesSpecifiedModule.js index 89547811855f7..895c47e250490 100644 --- a/tests/baselines/reference/isolatedModulesSpecifiedModule.js +++ b/tests/baselines/reference/isolatedModulesSpecifiedModule.js @@ -3,3 +3,4 @@ export var x; //// [file1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js index 89547811855f7..895c47e250490 100644 --- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.js +++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.js @@ -3,3 +3,4 @@ export var x; //// [file1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js index e1675ff713166..cbb97e43d7239 100644 --- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js +++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js @@ -46,6 +46,6 @@ define("_apply", ["require", "exports"], function (require, exports) { } return func.apply(thisArg, args); } - exports.__esModule = true; exports["default"] = apply; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js index 1acead2801dea..f47b1b52cc634 100644 --- a/tests/baselines/reference/jsxEmitWithAttributes.js +++ b/tests/baselines/reference/jsxEmitWithAttributes.js @@ -67,6 +67,7 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; const Element_1 = require("./Element"); diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js index 0a6402ca70cb2..a9a925c3e4f91 100644 --- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js +++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js @@ -67,6 +67,7 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; const Element_1 = require("./Element"); diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js index 82c8f6410e65b..592675086b192 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js +++ b/tests/baselines/reference/jsxFactoryIdentifier.js @@ -67,6 +67,7 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=Element.js.map//// [test.js] "use strict"; const Element_1 = require("./Element"); diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js index ffec40ff7b654..3ab40dee5eb31 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js @@ -21,4 +21,5 @@ class AppComponent { } } exports.AppComponent = AppComponent; +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js index 23f6f44e0c7a2..12ea8b96602c3 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js @@ -21,4 +21,5 @@ class AppComponent { } } exports.AppComponent = AppComponent; +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js index 90bb675442ac6..e2fe0c52c903a 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js @@ -67,6 +67,7 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; let c; diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js index 0bc0c6e57c54c..a9a718a4b2af5 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js @@ -67,6 +67,7 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; let c; diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js index 80a77d35302c3..4d1cc513918bd 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js @@ -67,6 +67,7 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=Element.js.map//// [test.js] "use strict"; const Element_1 = require("./Element"); diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js index 6714b68a09397..60c8ca80212fd 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js @@ -20,4 +20,5 @@ class AppComponent { } } exports.AppComponent = AppComponent; +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js index cb1de5fdc6170..731e0e2e70b4f 100644 --- a/tests/baselines/reference/mapOnTupleTypes01.js +++ b/tests/baselines/reference/mapOnTupleTypes01.js @@ -67,6 +67,7 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; }); // Length 6 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6]; exports.h = numNumNumNumNum.map(function (n) { return n * n; }); +exports.__esModule = true; //// [mapOnTupleTypes01.d.ts] diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js index 97ffc9510db5d..0906c6df189ee 100644 --- a/tests/baselines/reference/mapOnTupleTypes02.js +++ b/tests/baselines/reference/mapOnTupleTypes02.js @@ -12,6 +12,7 @@ function increment(point) { return point.map(function (d) { return d + 1; }); } exports.increment = increment; +exports.__esModule = true; //// [mapOnTupleTypes02.d.ts] diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js index 00f913219a417..94f651681982c 100644 --- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js +++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js @@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) { return Promise; }()); exports.Promise = Promise; + exports.__esModule = true; }); //// [memberAccessMustUseModuleInstances_1.js] define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) { diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js index 4452165c3e6d3..17aeccbc769f5 100644 --- a/tests/baselines/reference/mergedDeclarations6.js +++ b/tests/baselines/reference/mergedDeclarations6.js @@ -35,6 +35,7 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); //// [b.js] var __extends = (this && this.__extends) || (function () { @@ -59,4 +60,5 @@ define(["require", "exports", "./a"], function (require, exports, a_1) { return B; }(a_1.A)); exports.B = B; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js index 8a22a90bc2e69..fa93f2f2143b6 100644 --- a/tests/baselines/reference/metadataOfEventAlias.js +++ b/tests/baselines/reference/metadataOfEventAlias.js @@ -36,3 +36,4 @@ __decorate([ __metadata("design:type", Object) ], SomeClass.prototype, "event", void 0); exports.SomeClass = SomeClass; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js index d9ab942cfc8cd..87e1fdd8f58e0 100644 --- a/tests/baselines/reference/missingFunctionImplementation.js +++ b/tests/baselines/reference/missingFunctionImplementation.js @@ -162,3 +162,4 @@ var N12; function m(a) { } N12.m = m; })(N12 || (N12 = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js index 069849ffb83d4..76138193938e0 100644 --- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js +++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js @@ -11,6 +11,7 @@ import {x} from "./a" //// [a.js] "use strict"; exports.x = 1; +exports.__esModule = true; //// [b.js] "use strict"; (function () { return 1; }()); diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js index b75161da45866..c6fb35e37375f 100644 --- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js +++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js @@ -17,6 +17,7 @@ fn(a); // Error: property 'x' is missing from 'a' //// [moduleAliasAsFunctionArgument_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [moduleAliasAsFunctionArgument_1.js] define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) { diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js index 8c497d63c4255..0f884f267566c 100644 --- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js +++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js @@ -50,6 +50,7 @@ import "./x"; //// [x0.js] "use strict"; exports.a = 1; +exports.__esModule = true; //// [x.js] "use strict"; var N1; @@ -59,9 +60,11 @@ var N1; //// [observable.js] "use strict"; exports.x = 1; +exports.__esModule = true; //// [test.js] "use strict"; exports.b = 1; +exports.__esModule = true; //// [main.js] "use strict"; require("./x"); diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js index 99351642a18e2..4f1eb3bde6bf0 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal1.js +++ b/tests/baselines/reference/moduleAugmentationGlobal1.js @@ -26,6 +26,7 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; //// [f2.js] "use strict"; var x = [1]; diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js index 90e8373302e2c..03334d17cb8bc 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal2.js +++ b/tests/baselines/reference/moduleAugmentationGlobal2.js @@ -27,6 +27,7 @@ var A = (function () { }()); exports.A = A; ; +exports.__esModule = true; //// [f2.js] "use strict"; var x = [1]; diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js index caa080a558ccf..21be25c63738a 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal3.js +++ b/tests/baselines/reference/moduleAugmentationGlobal3.js @@ -30,6 +30,7 @@ var A = (function () { }()); exports.A = A; ; +exports.__esModule = true; //// [f2.js] "use strict"; //// [f3.js] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js index 8e0b7dad19d0c..d0b1592da399a 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js @@ -35,6 +35,7 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; //// [f2.js] "use strict"; var B = (function () { @@ -43,6 +44,7 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; //// [f3.js] "use strict"; var f1_1 = require("./f1"); diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js index 498df8ab90ec3..dfb71d81497d1 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js @@ -47,6 +47,7 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; //// [f2.js] "use strict"; var B = (function () { @@ -55,6 +56,7 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; //// [f3.js] "use strict"; var f1_1 = require("./f1"); diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js index 8d9e69c507665..312a56792b697 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js @@ -45,6 +45,7 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; //// [f2.js] "use strict"; var B = (function () { @@ -53,6 +54,7 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; //// [f3.js] "use strict"; var f1_1 = require("./f1"); diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js index 5309555581503..690ec91226aca 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js @@ -47,6 +47,7 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; //// [f2.js] "use strict"; var B = (function () { @@ -55,6 +56,7 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; //// [f3.js] "use strict"; var f1_1 = require("./f1"); diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js index c3cba4c01f877..efb3fc04f9ffb 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js @@ -47,6 +47,7 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; //// [f2.js] "use strict"; var B = (function () { @@ -55,6 +56,7 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; //// [f3.js] "use strict"; var f1_1 = require("./f1"); diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js index f5aff705eb4bc..228320ec9c6d6 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js @@ -47,6 +47,7 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; //// [f2.js] "use strict"; var B = (function () { @@ -55,6 +56,7 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; //// [f3.js] "use strict"; var f1_1 = require("./f1"); diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js index 504c015bcb833..a55585e6acedd 100644 --- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js +++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js @@ -64,6 +64,7 @@ define("m1", ["require", "exports"], function (require, exports) { return Cls; }()); exports.Cls = Cls; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) { "use strict"; @@ -84,6 +85,7 @@ define("m3", ["require", "exports"], function (require, exports) { return C2; }()); exports.C2 = C2; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) { "use strict"; diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js index 922bb61d95214..26a0492844058 100644 --- a/tests/baselines/reference/moduleAugmentationsImports1.js +++ b/tests/baselines/reference/moduleAugmentationsImports1.js @@ -51,6 +51,7 @@ define("a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; @@ -60,6 +61,7 @@ define("b", ["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); /// define("d", ["require", "exports", "a"], function (require, exports, a_1) { diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js index 605a07e29e191..82858bcada028 100644 --- a/tests/baselines/reference/moduleAugmentationsImports2.js +++ b/tests/baselines/reference/moduleAugmentationsImports2.js @@ -56,6 +56,7 @@ define("a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; @@ -65,6 +66,7 @@ define("b", ["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); /// define("d", ["require", "exports", "a"], function (require, exports, a_1) { diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js index 0a946f42be376..8bdbb647421f0 100644 --- a/tests/baselines/reference/moduleAugmentationsImports3.js +++ b/tests/baselines/reference/moduleAugmentationsImports3.js @@ -55,6 +55,7 @@ define("a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; @@ -64,6 +65,7 @@ define("b", ["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); define("e", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js index a48bbb0463174..82b8624c35c44 100644 --- a/tests/baselines/reference/moduleAugmentationsImports4.js +++ b/tests/baselines/reference/moduleAugmentationsImports4.js @@ -56,6 +56,7 @@ define("a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; @@ -65,6 +66,7 @@ define("b", ["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); define("main", ["require", "exports", "D", "E"], function (require, exports) { "use strict"; diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js index 6a7113c03688e..8c396d4fcdd5e 100644 --- a/tests/baselines/reference/moduleCodeGenTest5.js +++ b/tests/baselines/reference/moduleCodeGenTest5.js @@ -53,3 +53,4 @@ var E2; E2[E2["B"] = 0] = "B"; })(E2 || (E2 = {})); var v = E2.B; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js index 64b82f82500ee..1af231a9a6224 100644 --- a/tests/baselines/reference/moduleDuplicateIdentifiers.js +++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js @@ -76,3 +76,4 @@ var Utensils; (function (Utensils) { Utensils[Utensils["Spork"] = 3] = "Spork"; })(Utensils = exports.Utensils || (exports.Utensils = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js index a590e23f71e15..8c18060d506cb 100644 --- a/tests/baselines/reference/moduleInTypePosition1.js +++ b/tests/baselines/reference/moduleInTypePosition1.js @@ -19,6 +19,7 @@ var Promise = (function () { return Promise; }()); exports.Promise = Promise; +exports.__esModule = true; //// [moduleInTypePosition1_1.js] "use strict"; var x = function (w1) { }; diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js index c18f11d24b30b..3ed09d2cd7aa6 100644 --- a/tests/baselines/reference/moduleNoneErrors.js +++ b/tests/baselines/reference/moduleNoneErrors.js @@ -12,3 +12,4 @@ var Foo = (function () { return Foo; }()); exports.Foo = Foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js index c3512734f94f5..cb53b78f03819 100644 --- a/tests/baselines/reference/modulePrologueAMD.js +++ b/tests/baselines/reference/modulePrologueAMD.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return Foo; }()); exports.Foo = Foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js index 4a9594d254be5..2f2cf9d91488f 100644 --- a/tests/baselines/reference/modulePrologueCommonjs.js +++ b/tests/baselines/reference/modulePrologueCommonjs.js @@ -11,3 +11,4 @@ var Foo = (function () { return Foo; }()); exports.Foo = Foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js index 18edf1ef4af2c..7b39a9d12e312 100644 --- a/tests/baselines/reference/modulePrologueUmd.js +++ b/tests/baselines/reference/modulePrologueUmd.js @@ -20,4 +20,5 @@ export class Foo {} return Foo; }()); exports.Foo = Foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js index c73be6b6981f1..e3c323bba714b 100644 --- a/tests/baselines/reference/moduleResolutionNoResolve.js +++ b/tests/baselines/reference/moduleResolutionNoResolve.js @@ -13,3 +13,4 @@ export var c = ''; //// [b.js] "use strict"; exports.c = ''; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js index a17f108d87238..554f81109945e 100644 --- a/tests/baselines/reference/moduleResolutionNoTs.js +++ b/tests/baselines/reference/moduleResolutionNoTs.js @@ -23,11 +23,11 @@ import z2 from "./z"; //// [x.js] "use strict"; -exports.__esModule = true; exports["default"] = 0; +exports.__esModule = true; //// [y.jsx] "use strict"; -exports.__esModule = true; exports["default"] = 0; +exports.__esModule = true; //// [user.js] "use strict"; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js index 16d176872cac1..1f241c1ed96d0 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions.js @@ -27,8 +27,8 @@ import j from "./jquery.js" //// [a.js] "use strict"; -exports.__esModule = true; exports["default"] = 0; +exports.__esModule = true; // No extension: '.ts' added //// [b.js] "use strict"; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js index 177321c7d0819..afd5ce5a5785a 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js @@ -12,7 +12,7 @@ import b from "./b"; //// [index.js] "use strict"; -exports.__esModule = true; exports["default"] = 0; +exports.__esModule = true; //// [a.js] "use strict"; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js index fbf97fa3ba06b..f326ab9231a3d 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js @@ -49,10 +49,12 @@ var MyClass = (function () { return MyClass; }()); exports.MyClass = MyClass; +exports.__esModule = true; //// [/src/library-b/index.js] "use strict"; var library_a_1 = require("library-a"); exports.MyClass2 = library_a_1.MyClass; +exports.__esModule = true; //// [/src/app.js] "use strict"; var x; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js index a927a496a9661..f88665c68081f 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js @@ -19,12 +19,14 @@ x + x2; // See GH#10364. "use strict"; exports.x = 0; +exports.__esModule = true; //// [/src/bin/shared2/abc.js] // When symlinked files are not in node_modules, realpath is not used. // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files. // See GH#10364. "use strict"; exports.x = 0; +exports.__esModule = true; //// [/src/bin/app.js] "use strict"; var abc_1 = require("./shared/abc"); diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js index 312bcf4c174e7..7d7789425241e 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js @@ -28,10 +28,12 @@ var MyClass = (function () { return MyClass; }()); exports.MyClass = MyClass; +exports.__esModule = true; //// [/src/bin/library-b/index.js] "use strict"; var library_a_1 = require("library-a"); exports.MyClass2 = library_a_1.MyClass; +exports.__esModule = true; //// [/src/bin/app.js] "use strict"; var x; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js index 4061a32b49f1f..0b50be0e5e419 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js @@ -13,12 +13,14 @@ export var foo = 42; //// [c.js] "use strict"; exports.foo = 42; +exports.__esModule = true; //// [b.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } __export(require("./c")); +exports.__esModule = true; //// [a.js] "use strict"; function __export(m) { @@ -26,3 +28,4 @@ function __export(m) { } __export(require("./b")); __export(require("./c")); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js index 208e90c69d8c8..7411123a8727b 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js @@ -25,6 +25,7 @@ var Animals; "use strict"; var c_1 = require("./c"); exports.Animals = c_1.Animals; +exports.__esModule = true; //// [a.js] "use strict"; function __export(m) { @@ -32,3 +33,4 @@ function __export(m) { } __export(require("./b")); __export(require("./c")); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js index f987c0c652dc4..20a518e25113d 100644 --- a/tests/baselines/reference/moduleScoping.js +++ b/tests/baselines/reference/moduleScoping.js @@ -31,6 +31,7 @@ var v4 = function () { return 5; }; "use strict"; exports.v3 = true; var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope +exports.__esModule = true; //// [file4.js] "use strict"; var file3 = require("./file3"); diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js index e15f8fc879c15..a0e06a40da517 100644 --- a/tests/baselines/reference/multipleDefaultExports01.js +++ b/tests/baselines/reference/multipleDefaultExports01.js @@ -25,15 +25,13 @@ var foo = (function () { } return foo; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = foo; function bar() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = bar; var x = 10; -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = x; +Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; var m1_1 = require("./m1"); diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js index 0e9fed272cde6..210fa21e803ef 100644 --- a/tests/baselines/reference/multipleDefaultExports02.js +++ b/tests/baselines/reference/multipleDefaultExports02.js @@ -19,12 +19,11 @@ Entity(); "use strict"; function foo() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = foo; function bar() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = bar; +Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; var m1_1 = require("./m1"); diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js index 748837baceb56..436232c145ed7 100644 --- a/tests/baselines/reference/multipleDefaultExports03.js +++ b/tests/baselines/reference/multipleDefaultExports03.js @@ -13,12 +13,11 @@ var C = (function () { } return C; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; var C = (function () { function C() { } return C; }()); -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = C; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js index 020f9b758bb27..b2c37ec5f0ef3 100644 --- a/tests/baselines/reference/multipleDefaultExports04.js +++ b/tests/baselines/reference/multipleDefaultExports04.js @@ -10,9 +10,8 @@ export default function f() { "use strict"; function f() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; function f() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js index bec4fb489699f..4817012ab75dc 100644 --- a/tests/baselines/reference/multipleExportDefault1.js +++ b/tests/baselines/reference/multipleExportDefault1.js @@ -12,9 +12,8 @@ export default { "use strict"; function Foo() { } -exports.__esModule = true; exports["default"] = Foo; -exports.__esModule = true; exports["default"] = { uhoh: "another default" }; +exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js index dc82500a1d905..e979b96fe7174 100644 --- a/tests/baselines/reference/multipleExportDefault2.js +++ b/tests/baselines/reference/multipleExportDefault2.js @@ -9,10 +9,9 @@ export default function Foo() { } //// [multipleExportDefault2.js] "use strict"; -exports.__esModule = true; exports["default"] = { uhoh: "another default" }; function Foo() { } -exports.__esModule = true; exports["default"] = Foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js index 5d7ad48e0ca04..e889edc907a9f 100644 --- a/tests/baselines/reference/multipleExportDefault3.js +++ b/tests/baselines/reference/multipleExportDefault3.js @@ -9,7 +9,6 @@ export default class C { } //// [multipleExportDefault3.js] "use strict"; -exports.__esModule = true; exports["default"] = { uhoh: "another default" }; @@ -18,5 +17,5 @@ var C = (function () { } return C; }()); -exports.__esModule = true; exports["default"] = C; +exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js index 1199fa91c9c2f..d46cda4d8b3a4 100644 --- a/tests/baselines/reference/multipleExportDefault4.js +++ b/tests/baselines/reference/multipleExportDefault4.js @@ -12,9 +12,8 @@ var C = (function () { } return C; }()); -exports.__esModule = true; exports["default"] = C; -exports.__esModule = true; exports["default"] = { uhoh: "another default" }; +exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js index 7ae33aee9f4d1..5c10a1be95abe 100644 --- a/tests/baselines/reference/multipleExportDefault5.js +++ b/tests/baselines/reference/multipleExportDefault5.js @@ -5,12 +5,11 @@ export default class C {} //// [multipleExportDefault5.js] "use strict"; function bar() { } -exports.__esModule = true; exports["default"] = bar; var C = (function () { function C() { } return C; }()); -exports.__esModule = true; exports["default"] = C; +exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js index a8b93459e4eaa..3d990277993f6 100644 --- a/tests/baselines/reference/multipleExportDefault6.js +++ b/tests/baselines/reference/multipleExportDefault6.js @@ -9,11 +9,10 @@ export default { //// [multipleExportDefault6.js] "use strict"; -exports.__esModule = true; exports["default"] = { lol: 1 }; -exports.__esModule = true; exports["default"] = { lol: 2 }; +exports.__esModule = true; From 4331de3338f4f5720544335b6c708b5e569f49a2 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 3 Feb 2017 11:55:34 -0800 Subject: [PATCH 040/116] Update baselines (2) --- tests/baselines/reference/nameDelimitedBySlashes.js | 1 + tests/baselines/reference/nameWithFileExtension.js | 1 + tests/baselines/reference/nameWithRelativePaths.js | 2 ++ .../baselines/reference/narrowingConstrainedTypeParameter.js | 1 + tests/baselines/reference/nestedLoops.js | 1 + ...rUsingImportExportModuleAugmentationInDeclarationFile2.js | 1 + ...rUsingImportExportModuleAugmentationInDeclarationFile3.js | 1 + .../reference/noImplicitAnyDestructuringInPrivateMethod.js | 1 + tests/baselines/reference/noImplicitUseStrict_amd.js | 1 + tests/baselines/reference/noImplicitUseStrict_commonjs.js | 1 + tests/baselines/reference/noImplicitUseStrict_umd.js | 1 + tests/baselines/reference/nodeResolution1.js | 1 + tests/baselines/reference/nodeResolution4.js | 1 + tests/baselines/reference/nonMergedOverloads.js | 1 + tests/baselines/reference/outFilerootDirModuleNamesAmd.js | 4 ++-- tests/baselines/reference/outModuleConcatAmd.js | 2 ++ tests/baselines/reference/outModuleTripleSlashRefs.js | 2 ++ 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 | 1 + tests/baselines/reference/parser618973.js | 1 + tests/baselines/reference/parserArgumentList1.js | 1 + tests/baselines/reference/parserClass1.js | 1 + tests/baselines/reference/parserClass2.js | 1 + tests/baselines/reference/parserExportAssignment7.js | 1 + tests/baselines/reference/parserExportAssignment8.js | 1 + .../baselines/reference/parserModifierOnStatementInBlock1.js | 1 + .../baselines/reference/parserModifierOnStatementInBlock3.js | 1 + .../reference/pathMappingBasedModuleResolution1_classic.js | 1 + .../reference/pathMappingBasedModuleResolution1_node.js | 1 + .../reference/pathMappingBasedModuleResolution2_classic.js | 1 + .../reference/pathMappingBasedModuleResolution2_node.js | 1 + .../reference/pathMappingBasedModuleResolution3_classic.js | 3 +++ .../reference/pathMappingBasedModuleResolution3_node.js | 2 ++ .../reference/pathMappingBasedModuleResolution4_classic.js | 3 +++ .../reference/pathMappingBasedModuleResolution4_node.js | 2 ++ .../reference/pathMappingBasedModuleResolution5_classic.js | 4 ++++ .../reference/pathMappingBasedModuleResolution5_node.js | 3 +++ .../reference/pathMappingBasedModuleResolution6_classic.js | 1 + .../reference/pathMappingBasedModuleResolution6_node.js | 1 + .../reference/pathMappingBasedModuleResolution7_classic.js | 2 ++ .../reference/pathMappingBasedModuleResolution7_node.js | 2 ++ .../pathMappingBasedModuleResolution_withExtension.js | 2 ++ tests/baselines/reference/prespecializedGenericMembers1.js | 1 + tests/baselines/reference/privacyAccessorDeclFile.js | 1 + .../baselines/reference/privacyCannotNameAccessorDeclFile.js | 3 +++ .../baselines/reference/privacyCannotNameVarTypeDeclFile.js | 3 +++ .../reference/privacyCheckAnonymousFunctionParameter.js | 1 + .../reference/privacyCheckAnonymousFunctionParameter2.js | 1 + ...acyCheckOnTypeParameterReferenceInConstructorParameter.js | 1 + tests/baselines/reference/privacyCheckTypeOfFunction.js | 1 + tests/baselines/reference/privacyClass.js | 1 + .../baselines/reference/privacyClassExtendsClauseDeclFile.js | 1 + .../reference/privacyClassImplementsClauseDeclFile.js | 1 + .../privacyFunctionCannotNameParameterTypeDeclFile.js | 3 +++ .../reference/privacyFunctionCannotNameReturnTypeDeclFile.js | 3 +++ .../baselines/reference/privacyFunctionParameterDeclFile.js | 1 + .../baselines/reference/privacyFunctionReturnTypeDeclFile.js | 1 + tests/baselines/reference/privacyGetter.js | 1 + tests/baselines/reference/privacyGloFunc.js | 1 + tests/baselines/reference/privacyImport.js | 1 + tests/baselines/reference/privacyImportParseErrors.js | 1 + tests/baselines/reference/privacyInterface.js | 1 + .../privacyTopLevelAmbientExternalModuleImportWithExport.js | 3 +++ ...rivacyTopLevelAmbientExternalModuleImportWithoutExport.js | 3 +++ .../privacyTopLevelInternalReferenceImportWithExport.js | 1 + .../privacyTopLevelInternalReferenceImportWithoutExport.js | 1 + tests/baselines/reference/privacyTypeParameterOfFunction.js | 1 + .../reference/privacyTypeParameterOfFunctionDeclFile.js | 1 + tests/baselines/reference/privacyTypeParametersOfClass.js | 1 + .../reference/privacyTypeParametersOfClassDeclFile.js | 1 + .../baselines/reference/privacyTypeParametersOfInterface.js | 1 + .../reference/privacyTypeParametersOfInterfaceDeclFile.js | 1 + tests/baselines/reference/privacyVar.js | 1 + tests/baselines/reference/privacyVarDeclFile.js | 1 + tests/baselines/reference/privatePropertyUsingObjectType.js | 1 + tests/baselines/reference/protoAsIndexInIndexExpression.js | 1 + tests/baselines/reference/reExportDefaultExport.js | 2 +- tests/baselines/reference/reExportUndefined2.js | 1 + .../recursiveExportAssignmentAndFindAliasedType1.js | 1 + .../recursiveExportAssignmentAndFindAliasedType2.js | 1 + .../recursiveExportAssignmentAndFindAliasedType3.js | 1 + .../recursiveExportAssignmentAndFindAliasedType4.js | 1 + .../recursiveExportAssignmentAndFindAliasedType5.js | 1 + .../recursiveExportAssignmentAndFindAliasedType6.js | 1 + .../recursiveExportAssignmentAndFindAliasedType7.js | 1 + .../baselines/reference/relativeNamesInClassicResolution.js | 1 + .../baselines/reference/requireAsFunctionInExternalModule.js | 3 ++- tests/baselines/reference/scannerClass2.js | 1 + .../shorthandOfExportedEntity01_targetES2015_CommonJS.js | 1 + .../shorthandOfExportedEntity02_targetES5_CommonJS.js | 1 + .../reference/shorthandPropertyAssignmentInES6Module.js | 1 + tests/baselines/reference/staticInstanceResolution3.js | 1 + tests/baselines/reference/staticInstanceResolution5.js | 1 + .../staticMethodWithTypeParameterExtendsClauseDeclFile.js | 1 + tests/baselines/reference/topLevelExports.js | 1 + tests/baselines/reference/topLevelFileModule.js | 1 + tests/baselines/reference/tsxAttributeResolution10.js | 1 + tests/baselines/reference/tsxAttributeResolution9.js | 1 + .../reference/tsxCorrectlyParseLessThanComparison1.js | 1 + tests/baselines/reference/tsxDefaultImports.js | 2 +- tests/baselines/reference/tsxDynamicTagName5.js | 1 + tests/baselines/reference/tsxDynamicTagName7.js | 1 + tests/baselines/reference/tsxDynamicTagName8.js | 1 + tests/baselines/reference/tsxDynamicTagName9.js | 1 + tests/baselines/reference/tsxElementResolution19.js | 1 + tests/baselines/reference/tsxExternalModuleEmit1.js | 2 ++ ...bjectCreationExpressionWithUndefinedCallResolutionData.js | 1 + tests/baselines/reference/typeGuardsAsAssertions.js | 1 + tests/baselines/reference/typeGuardsInExternalModule.js | 1 + tests/baselines/reference/typeInferenceLiteralUnion.js | 1 + tests/baselines/reference/typePredicateInLoop.js | 1 + tests/baselines/reference/typeReferenceDirectives7.js | 1 + tests/baselines/reference/typeReferenceDirectives8.js | 2 ++ tests/baselines/reference/typeReferenceDirectives9.js | 2 ++ tests/baselines/reference/typeofANonExportedType.js | 1 + tests/baselines/reference/typeofAmbientExternalModules.js | 1 + tests/baselines/reference/typeofAnExportedType.js | 1 + tests/baselines/reference/typeofExternalModules.js | 1 + tests/baselines/reference/typingsLookup4.js | 1 + tests/baselines/reference/umd-errors.js | 1 + tests/baselines/reference/unclosedExportClause01.js | 5 +++++ tests/baselines/reference/unclosedExportClause02.js | 1 + tests/baselines/reference/unusedImports1.js | 1 + tests/baselines/reference/unusedImports11.js | 2 +- tests/baselines/reference/unusedImports12.js | 2 +- tests/baselines/reference/unusedImports13.js | 1 + tests/baselines/reference/unusedImports14.js | 1 + tests/baselines/reference/unusedImports15.js | 1 + tests/baselines/reference/unusedImports16.js | 1 + tests/baselines/reference/unusedImports2.js | 1 + tests/baselines/reference/unusedImports3.js | 1 + tests/baselines/reference/unusedImports4.js | 1 + tests/baselines/reference/unusedImports5.js | 1 + tests/baselines/reference/unusedImports6.js | 2 +- tests/baselines/reference/unusedImports7.js | 2 +- tests/baselines/reference/unusedImports8.js | 1 + tests/baselines/reference/unusedImports9.js | 1 + tests/baselines/reference/unusedLocalsAndObjectSpread2.js | 1 + .../reference/unusedLocalsAndParametersOverloadSignatures.js | 1 + tests/baselines/reference/unusedVariablesinModules1.js | 1 + tests/baselines/reference/useStrictLikePrologueString01.js | 1 + tests/baselines/reference/varArgsOnConstructorTypes.js | 1 + tests/baselines/reference/visibilityOfTypeParameters.js | 1 + tests/baselines/reference/voidAsNonAmbiguousReturnType.js | 1 + tests/baselines/reference/withExportDecl.js | 1 + tests/baselines/reference/withImportDecl.js | 1 + 148 files changed, 186 insertions(+), 9 deletions(-) diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js index 93cf4e29d4940..36b8e0e8d278c 100644 --- a/tests/baselines/reference/nameDelimitedBySlashes.js +++ b/tests/baselines/reference/nameDelimitedBySlashes.js @@ -11,6 +11,7 @@ var x = foo.foo + 42; //// [foo_0.js] "use strict"; exports.foo = 42; +exports.__esModule = true; //// [foo_1.js] "use strict"; var foo = require("./test/foo_0"); diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js index 156d1b03a1a0c..86c384cdbdf90 100644 --- a/tests/baselines/reference/nameWithFileExtension.js +++ b/tests/baselines/reference/nameWithFileExtension.js @@ -11,6 +11,7 @@ var x = foo.foo + 42; //// [foo_0.js] "use strict"; exports.foo = 42; +exports.__esModule = true; //// [foo_1.js] "use strict"; var foo = require("./foo_0.js"); diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js index d8b0eed43cfd8..57ff852ec35a8 100644 --- a/tests/baselines/reference/nameWithRelativePaths.js +++ b/tests/baselines/reference/nameWithRelativePaths.js @@ -26,12 +26,14 @@ if(foo2.M2.x){ //// [foo_0.js] "use strict"; exports.foo = 42; +exports.__esModule = true; //// [foo_1.js] "use strict"; function f() { return 42; } exports.f = f; +exports.__esModule = true; //// [foo_2.js] "use strict"; var M2; diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.js b/tests/baselines/reference/narrowingConstrainedTypeParameter.js index 3107585d941f8..f148dc22ea1ec 100644 --- a/tests/baselines/reference/narrowingConstrainedTypeParameter.js +++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.js @@ -30,3 +30,4 @@ function speak(pet, voice) { return voice(pet); } exports.speak = speak; +exports.__esModule = true; diff --git a/tests/baselines/reference/nestedLoops.js b/tests/baselines/reference/nestedLoops.js index c29311c38de95..f4aae6dc91ced 100644 --- a/tests/baselines/reference/nestedLoops.js +++ b/tests/baselines/reference/nestedLoops.js @@ -45,3 +45,4 @@ var Test = (function () { return Test; }()); exports.Test = Test; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js index b56988de44cbb..7c4e218549699 100644 --- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js +++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js @@ -11,3 +11,4 @@ declare var a: number; //// [1.js] "use strict"; exports.j = "hello"; // error +exports.__esModule = true; diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js index 8c75af240346e..ed00183359438 100644 --- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js +++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js @@ -12,3 +12,4 @@ export var j = "hello"; // error //// [1.js] "use strict"; exports.j = "hello"; // error +exports.__esModule = true; diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js index 2d7d930703c7b..85553b5265f8c 100644 --- a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js +++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js @@ -23,6 +23,7 @@ var Bar = (function () { return Bar; }()); exports.Bar = Bar; +exports.__esModule = true; //// [noImplicitAnyDestructuringInPrivateMethod.d.ts] diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js index ac15f548c4741..8b3e7628e4e2d 100644 --- a/tests/baselines/reference/noImplicitUseStrict_amd.js +++ b/tests/baselines/reference/noImplicitUseStrict_amd.js @@ -5,4 +5,5 @@ export var x = 0; //// [noImplicitUseStrict_amd.js] define(["require", "exports"], function (require, exports) { exports.x = 0; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js index 9c726938f043a..30d507c8fc2bb 100644 --- a/tests/baselines/reference/noImplicitUseStrict_commonjs.js +++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js @@ -4,3 +4,4 @@ export var x = 0; //// [noImplicitUseStrict_commonjs.js] exports.x = 0; +exports.__esModule = true; diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js index eafb8246bf735..b48c5fde9a50c 100644 --- a/tests/baselines/reference/noImplicitUseStrict_umd.js +++ b/tests/baselines/reference/noImplicitUseStrict_umd.js @@ -13,4 +13,5 @@ export var x = 0; } })(function (require, exports) { exports.x = 0; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js index deda55cef0f59..a48eb71c8bcd1 100644 --- a/tests/baselines/reference/nodeResolution1.js +++ b/tests/baselines/reference/nodeResolution1.js @@ -10,5 +10,6 @@ import y = require("./a"); //// [a.js] "use strict"; exports.x = 1; +exports.__esModule = true; //// [b.js] "use strict"; diff --git a/tests/baselines/reference/nodeResolution4.js b/tests/baselines/reference/nodeResolution4.js index 7678b7c1c5cf8..7aac08fe6d021 100644 --- a/tests/baselines/reference/nodeResolution4.js +++ b/tests/baselines/reference/nodeResolution4.js @@ -15,5 +15,6 @@ import y = require("./a"); var x = 1; //// [a.js] "use strict"; +exports.__esModule = true; //// [b.js] "use strict"; diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js index a577329f1cf26..8183e02d0f201 100644 --- a/tests/baselines/reference/nonMergedOverloads.js +++ b/tests/baselines/reference/nonMergedOverloads.js @@ -11,3 +11,4 @@ var f = 10; function f() { } exports.f = f; +exports.__esModule = true; diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js index 5b99f76a5b9e1..47d356e3bf142 100644 --- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js +++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js @@ -14,14 +14,14 @@ export default function foo() { new Foo(); } define("b", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; function foo() { new a_1.default(); } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("a", ["require", "exports", "b"], function (require, exports, b_1) { "use strict"; class Foo { } - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = Foo; b_1.default(); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js index b30cf93786c03..0c2618e2a9e3c 100644 --- a/tests/baselines/reference/outModuleConcatAmd.js +++ b/tests/baselines/reference/outModuleConcatAmd.js @@ -27,6 +27,7 @@ define("ref/a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { "use strict"; @@ -38,6 +39,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { return B; }(a_1.A)); exports.B = B; + Object.defineProperty(exports, "__esModule", { value: true }); }); //# sourceMappingURL=all.js.map diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js index 33e970af54b75..aee6038f988b9 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.js +++ b/tests/baselines/reference/outModuleTripleSlashRefs.js @@ -56,6 +56,7 @@ define("ref/a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { "use strict"; @@ -67,6 +68,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { return B; }(a_1.A)); exports.B = B; + Object.defineProperty(exports, "__esModule", { value: true }); }); //# sourceMappingURL=all.js.map diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js index 333b64811c8f1..85a743c6faa93 100644 --- a/tests/baselines/reference/parser0_004152.js +++ b/tests/baselines/reference/parser0_004152.js @@ -14,3 +14,4 @@ var Game = (function () { return Game; }()); exports.Game = Game; +exports.__esModule = true; diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js index ceaf9b3572c44..4b95b2719e65e 100644 --- a/tests/baselines/reference/parser509546.js +++ b/tests/baselines/reference/parser509546.js @@ -12,3 +12,4 @@ var Logger = (function () { return Logger; }()); exports.Logger = Logger; +exports.__esModule = true; diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js index 9d07172c50933..2b3afe47ac92f 100644 --- a/tests/baselines/reference/parser509546_1.js +++ b/tests/baselines/reference/parser509546_1.js @@ -12,3 +12,4 @@ var Logger = (function () { return Logger; }()); exports.Logger = Logger; +exports.__esModule = true; diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js index b8822b525419a..071c57efb877c 100644 --- a/tests/baselines/reference/parser509546_2.js +++ b/tests/baselines/reference/parser509546_2.js @@ -14,3 +14,4 @@ var Logger = (function () { return Logger; }()); exports.Logger = Logger; +exports.__esModule = true; diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js index df9b2e4433a39..2898281f4938d 100644 --- a/tests/baselines/reference/parser618973.js +++ b/tests/baselines/reference/parser618973.js @@ -14,3 +14,4 @@ var Foo = (function () { return Foo; }()); exports.Foo = Foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserArgumentList1.js b/tests/baselines/reference/parserArgumentList1.js index 222b2c5ac89ec..167903245c1af 100644 --- a/tests/baselines/reference/parserArgumentList1.js +++ b/tests/baselines/reference/parserArgumentList1.js @@ -13,3 +13,4 @@ function removeClass(node, className) { }); } exports.removeClass = removeClass; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js index 50d2fb179dc92..97b8a7b056254 100644 --- a/tests/baselines/reference/parserClass1.js +++ b/tests/baselines/reference/parserClass1.js @@ -24,3 +24,4 @@ var NullLogger = (function () { return NullLogger; }()); exports.NullLogger = NullLogger; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js index c1d3b87e892eb..d1df19e61632d 100644 --- a/tests/baselines/reference/parserClass2.js +++ b/tests/baselines/reference/parserClass2.js @@ -17,3 +17,4 @@ var LoggerAdapter = (function () { return LoggerAdapter; }()); exports.LoggerAdapter = LoggerAdapter; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserExportAssignment7.js b/tests/baselines/reference/parserExportAssignment7.js index dd6750bec323c..8f9d4fe84d941 100644 --- a/tests/baselines/reference/parserExportAssignment7.js +++ b/tests/baselines/reference/parserExportAssignment7.js @@ -12,3 +12,4 @@ var C = (function () { return C; }()); module.exports = B; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserExportAssignment8.js b/tests/baselines/reference/parserExportAssignment8.js index 07ff257fb6193..1334db7782a87 100644 --- a/tests/baselines/reference/parserExportAssignment8.js +++ b/tests/baselines/reference/parserExportAssignment8.js @@ -12,3 +12,4 @@ var C = (function () { return C; }()); module.exports = B; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.js b/tests/baselines/reference/parserModifierOnStatementInBlock1.js index 352ee0cc511fb..e07e3ee904338 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock1.js +++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.js @@ -10,3 +10,4 @@ function foo() { export var x = this; } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.js b/tests/baselines/reference/parserModifierOnStatementInBlock3.js index 9f2cdf6850f8b..8d4f29558c881 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock3.js +++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.js @@ -12,3 +12,4 @@ function foo() { } } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js index 1a1bd387dce94..58199832ee60f 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js @@ -6,4 +6,5 @@ export var x = 1; define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js index 5fcaa23b976df..d6692582fedb2 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js @@ -5,3 +5,4 @@ export var x = 1; //// [f1.js] "use strict"; exports.x = 1; +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js index 52dab845bb296..3e6e3a22d5c5f 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js @@ -5,4 +5,5 @@ export var x = 1; define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js index 8c8b5c9a926fe..955fb4cf7ae96 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js @@ -4,3 +4,4 @@ export var x = 1; //// [file1.js] "use strict"; exports.x = 1; +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js index 15867b085eae9..9713cae56f506 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js @@ -23,16 +23,19 @@ export var y = 100; define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.y = 100; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) { "use strict"; exports.x = file3_1.x + file4_1.y; + exports.__esModule = true; }); //// [file1.js] // baseUrl set via command line diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js index cbff608753010..966f50202c048 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js @@ -22,11 +22,13 @@ export var y: number; //// [file3.js] "use strict"; exports.x = 1; +exports.__esModule = true; //// [file2.js] "use strict"; var file3_1 = require("./file3"); // found with baseurl var file4_1 = require("file4"); // found with fallback exports.x = file3_1.x + file4_1.y; +exports.__esModule = true; //// [file1.js] // baseUrl set via command line "use strict"; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js index c1de8cea6c91a..25ca74cc848a7 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js @@ -20,16 +20,19 @@ export var y = 100; define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.y = 100; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) { "use strict"; exports.x = file3_1.x + file4_1.y; + exports.__esModule = true; }); //// [file1.js] define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js index c5a08d55d8bbe..8f8fe447550a4 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js @@ -19,11 +19,13 @@ export var y: number; //// [file3.js] "use strict"; exports.x = 1; +exports.__esModule = true; //// [file2.js] "use strict"; var file3_1 = require("./file3"); // found with baseurl var file4_1 = require("file4"); // found with fallback exports.x = file3_1.x + file4_1.y; +exports.__esModule = true; //// [file1.js] "use strict"; var file2_1 = require("folder2/file2"); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js index 24297f85e35bc..9b9054390ed48 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js @@ -29,21 +29,25 @@ export var z1 = 1; define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.y = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.z = 1; + exports.__esModule = true; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.z1 = 1; + exports.__esModule = true; }); //// [file1.js] define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js index 1958800f91893..fdf2c8edbafcf 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js @@ -28,12 +28,15 @@ export var z1 = 1; //// [file1.js] "use strict"; exports.x = 1; +exports.__esModule = true; //// [file2.js] "use strict"; exports.y = 1; +exports.__esModule = true; //// [file4.js] "use strict"; exports.z1 = 1; +exports.__esModule = true; //// [file1.js] "use strict"; var file1_1 = require("folder2/file1"); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js index 1e8f8807e2cf0..c871f804b05ca 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js @@ -15,6 +15,7 @@ export {x} from "../file2"; define(["require", "exports", "../file2"], function (require, exports, file2_1) { "use strict"; exports.x = file2_1.x; + exports.__esModule = true; }); //// [file1.js] define(["require", "exports", "./project/file3"], function (require, exports, file3_1) { diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js index 6db3fecf83fad..5ae4aa284c0d0 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js @@ -15,6 +15,7 @@ export {x} from "../file2"; "use strict"; var file2_1 = require("../file2"); exports.x = file2_1.x; +exports.__esModule = true; //// [file1.js] "use strict"; var file3_1 = require("./project/file3"); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js index 5670f41be0f11..3acc7ca874018 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js @@ -31,11 +31,13 @@ export let y: number; //// [module2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "module1", "templates/module2", "../file3"], function (require, exports, module1_1, module2_1, file3_1) { "use strict"; exports.x = module1_1.a + module2_1.b + file3_1.x; + exports.__esModule = true; }); //// [file1.js] define(["require", "exports", "./project/file2", "module3"], function (require, exports, file2_1, module3_1) { diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js index 3be48cfc85c76..a9870d0cbc6ce 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js @@ -30,12 +30,14 @@ export let y: number; //// [module2.js] "use strict"; +exports.__esModule = true; //// [file2.js] "use strict"; var module1_1 = require("module1"); var module2_1 = require("templates/module2"); var file3_1 = require("../file3"); exports.x = module1_1.a + module2_1.b + file3_1.x; +exports.__esModule = true; //// [file1.js] "use strict"; var file2_1 = require("./project/file2"); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js index 06f6b50e4a003..55ffb41de13fa 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js @@ -16,9 +16,11 @@ import { bar } from "bar"; "use strict"; function foo() { } exports.foo = foo; +exports.__esModule = true; //// [bar.js] "use strict"; function bar() { } exports.bar = bar; +exports.__esModule = true; //// [a.js] "use strict"; diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js index dd6bd2a2dc673..cdfcaad87437e 100644 --- a/tests/baselines/reference/prespecializedGenericMembers1.js +++ b/tests/baselines/reference/prespecializedGenericMembers1.js @@ -39,3 +39,4 @@ var catThing = { barry: cat }; var catBag = new CatBag(catThing); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index 6fed8b8f08286..a85eb6de60c17 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -2498,6 +2498,7 @@ var privateModule; return privateClassWithPrivateModuleSetAccessorTypes; }()); })(privateModule || (privateModule = {})); +Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyAccessorDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index 4121dbdd51d1f..cbec9edb15460 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -164,6 +164,7 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyCannotNameAccessorDeclFile_exporter.js] "use strict"; /// @@ -185,6 +186,7 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; +Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyCannotNameAccessorDeclFile_consumer.js] "use strict"; var exporter = require("./privacyCannotNameAccessorDeclFile_exporter"); @@ -378,6 +380,7 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () { }); return privateClassWithPrivateModuleGetAccessorTypes; }()); +Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index c139b6279fd1d..7f3ef5512ae29 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -128,6 +128,7 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +exports.__esModule = true; //// [privacyCannotNameVarTypeDeclFile_exporter.js] "use strict"; /// @@ -149,6 +150,7 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; +exports.__esModule = true; //// [privacyCannotNameVarTypeDeclFile_consumer.js] "use strict"; var exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); @@ -206,6 +208,7 @@ privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.cre privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); +exports.__esModule = true; //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js index 92be6f737ccf1..e150564b747ee 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js @@ -31,6 +31,7 @@ var Query; }); } })(Query || (Query = {})); +exports.__esModule = true; //// [privacyCheckAnonymousFunctionParameter.d.ts] diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js index 1da2ec03ed718..3dee88c4f718b 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js @@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) { Q.foo(null); } })(Q || (Q = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js index 7d4db36ee9943..faa22fe190f28 100644 --- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js +++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js @@ -26,6 +26,7 @@ define(["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js index b810dafcca70e..40cff7997a74b 100644 --- a/tests/baselines/reference/privacyCheckTypeOfFunction.js +++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js @@ -10,3 +10,4 @@ export var b = foo; function foo() { } exports.b = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js index 4e79f019e5d2e..4b08cf22e4f3b 100644 --- a/tests/baselines/reference/privacyClass.js +++ b/tests/baselines/reference/privacyClass.js @@ -430,3 +430,4 @@ var glo_C12_public = (function (_super) { return glo_C12_public; }(glo_c_private)); exports.glo_C12_public = glo_C12_public; +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index 3e5b20923df97..0c500f0ed2838 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -289,6 +289,7 @@ var publicClassExtendingFromPrivateModuleClass = (function (_super) { return publicClassExtendingFromPrivateModuleClass; }(privateModule.publicClassInPrivateModule)); exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass; +exports.__esModule = true; //// [privacyClassExtendsClauseDeclFile_GlobalFile.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index 15de9a1667460..595889593cd6d 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -207,6 +207,7 @@ var publicClassImplementingFromPrivateModuleInterface = (function () { return publicClassImplementingFromPrivateModuleInterface; }()); exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface; +exports.__esModule = true; //// [privacyClassImplementsClauseDeclFile_GlobalFile.js] var publicModuleInGlobal; (function (publicModuleInGlobal) { diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js index d8bfef7060e22..3304fbd1df373 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -184,6 +184,7 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +exports.__esModule = true; //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js] "use strict"; /// @@ -205,6 +206,7 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; +exports.__esModule = true; //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js] "use strict"; var exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); @@ -392,6 +394,7 @@ function privateFunctionWithPrivateModuleParameterTypes(param) { function privateFunctionWithPrivateModuleParameterTypes1(param) { if (param === void 0) { param = exporter.createExportedWidget4(); } } +exports.__esModule = true; //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js index 3b1ffb487ffa9..c354ed6832107 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -191,6 +191,7 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_exporter.js] "use strict"; /// @@ -212,6 +213,7 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; +exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_consumer.js] "use strict"; var exporter = require("./privacyFunctionReturnTypeDeclFile_exporter"); @@ -349,6 +351,7 @@ function privateFunctionWithPrivateModuleReturnTypes() { function privateFunctionWithPrivateModuleReturnTypes1() { return exporter.createExportedWidget4(); } +exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index e8fff791a0e4d..c4968d843714d 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -1027,6 +1027,7 @@ var privateModule; function privateFunctionWithPrivateModuleParameterTypes(param) { } })(privateModule || (privateModule = {})); +exports.__esModule = true; //// [privacyFunctionParameterDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index d4265b1c3524e..132c9e6a30c1f 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -1819,6 +1819,7 @@ var privateModule; return new privateModule.publicClass(); } })(privateModule || (privateModule = {})); +exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js index 37d89442e628c..fd8b8a3c68440 100644 --- a/tests/baselines/reference/privacyGetter.js +++ b/tests/baselines/reference/privacyGetter.js @@ -504,4 +504,5 @@ define(["require", "exports"], function (require, exports) { }); return C8_private; }()); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js index 153fa57e3d3d1..8059f3da545d8 100644 --- a/tests/baselines/reference/privacyGloFunc.js +++ b/tests/baselines/reference/privacyGloFunc.js @@ -983,4 +983,5 @@ define(["require", "exports"], function (require, exports) { return new C5_private(); //error } exports.f12_public = f12_public; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 2915b6e5f248b..3dcb212af95d5 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -701,3 +701,4 @@ var m3; //import m2 = require("use_glo_M1_public"); })(m4 || (m4 = {})); })(m3 = exports.m3 || (exports.m3 = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js index b705bbe11704a..b7cfd54247025 100644 --- a/tests/baselines/reference/privacyImportParseErrors.js +++ b/tests/baselines/reference/privacyImportParseErrors.js @@ -575,3 +575,4 @@ var m3; var a = 10; })(m4 || (m4 = {})); })(m3 = exports.m3 || (exports.m3 = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js index 59e10aca7ff49..4b78192dc97db 100644 --- a/tests/baselines/reference/privacyInterface.js +++ b/tests/baselines/reference/privacyInterface.js @@ -311,3 +311,4 @@ var C6_private = (function () { } return C6_private; }()); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js index d8bf7c85d129a..ae53d1bc51cec 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js @@ -59,6 +59,7 @@ var c_public = (function () { return c_public; }()); exports.c_public = c_public; +exports.__esModule = true; //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js] "use strict"; var c_public = (function () { @@ -67,6 +68,7 @@ var c_public = (function () { return c_public; }()); exports.c_public = c_public; +exports.__esModule = true; //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js] "use strict"; /// @@ -85,6 +87,7 @@ var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private() exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); +exports.__esModule = true; //// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts] diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js index 7f44dbe6257bf..af8b2fd9eae29 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js @@ -60,6 +60,7 @@ define(["require", "exports"], function (require, exports) { return c_public; }()); exports.c_public = c_public; + exports.__esModule = true; }); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js] define(["require", "exports"], function (require, exports) { @@ -70,6 +71,7 @@ define(["require", "exports"], function (require, exports) { return c_public; }()); exports.c_public = c_public; + exports.__esModule = true; }); //// [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) { @@ -83,6 +85,7 @@ define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleIm exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public(); var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js index a01f1ef611f88..d26782ef2dd32 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js @@ -198,4 +198,5 @@ define(["require", "exports"], function (require, exports) { var privateUse_im_public_mi_public = new exports.im_public_mi_public.c(); exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c(); var privateUse_im_public_mu_public; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index 2554085b94b41..402e30c17a789 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -199,4 +199,5 @@ define(["require", "exports"], function (require, exports) { var privateUse_im_private_mi_public = new im_private_mi_public.c(); exports.publicUse_im_private_mi_public = new im_private_mi_public.c(); var privateUse_im_private_mu_public; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js index 84034362fac87..71683805c05c7 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunction.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js @@ -244,3 +244,4 @@ function publicFunctionWithPublicTypeParametersWithoutExtends() { exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends; function privateFunctionWithPublicTypeParametersWithoutExtends() { } +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index 3eb6027b05006..bc1be54d2e50c 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -815,3 +815,4 @@ var privateModule; function privateFunctionWithPublicTypeParametersWithoutExtends() { } })(privateModule || (privateModule = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js index 3d28e145b3202..50fe3b8b45634 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClass.js +++ b/tests/baselines/reference/privacyTypeParametersOfClass.js @@ -108,3 +108,4 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () { }; return privateClassWithPublicTypeParametersWithoutExtends; }()); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index 3ccdec46d7c4a..6f012c1b34e7e 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -382,3 +382,4 @@ var privateModule; return privateClassWithPublicTypeParametersWithoutExtends; }()); })(privateModule || (privateModule = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js index a330ea76e13d5..e7fb531c77309 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterface.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js @@ -82,3 +82,4 @@ var publicClassT = (function () { return publicClassT; }()); exports.publicClassT = publicClassT; +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index 7c92ed701d974..d4929d9b329c6 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -264,3 +264,4 @@ var privateModule; }()); privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT; })(privateModule || (privateModule = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js index 0d133743709c4..f5ed884807ae9 100644 --- a/tests/baselines/reference/privacyVar.js +++ b/tests/baselines/reference/privacyVar.js @@ -332,3 +332,4 @@ var glo_v21_private = new glo_C1_public(); exports.glo_v22_public = new glo_C1_public(); var glo_v23_private = new glo_C2_private(); exports.glo_v24_public = new glo_C2_private(); // error +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index 102aeea58a4d4..ab62eccebc968 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -574,6 +574,7 @@ var privateModule; }()); var privateVarWithPrivateModulePropertyTypes; })(privateModule || (privateModule = {})); +exports.__esModule = true; //// [privacyVarDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js index 0c16d8bafffe3..2b058047aaaba 100644 --- a/tests/baselines/reference/privatePropertyUsingObjectType.js +++ b/tests/baselines/reference/privatePropertyUsingObjectType.js @@ -18,4 +18,5 @@ define(["require", "exports"], function (require, exports) { return FilterManager; }()); exports.FilterManager = FilterManager; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.js b/tests/baselines/reference/protoAsIndexInIndexExpression.js index 2c9b0f7a7c743..7805cebbee32d 100644 --- a/tests/baselines/reference/protoAsIndexInIndexExpression.js +++ b/tests/baselines/reference/protoAsIndexInIndexExpression.js @@ -21,6 +21,7 @@ class C { //// [protoAsIndexInIndexExpression_0.js] "use strict"; +exports.__esModule = true; //// [protoAsIndexInIndexExpression_1.js] /// var EntityPrototype = undefined; diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js index da50a3a711580..fdf24fbeb167b 100644 --- a/tests/baselines/reference/reExportDefaultExport.js +++ b/tests/baselines/reference/reExportDefaultExport.js @@ -18,9 +18,9 @@ foo(); "use strict"; function f() { } -Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f; exports.f = f; +Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; var m1_1 = require("./m1"); diff --git a/tests/baselines/reference/reExportUndefined2.js b/tests/baselines/reference/reExportUndefined2.js index 53b78599cbe62..5054ea672c9f0 100644 --- a/tests/baselines/reference/reExportUndefined2.js +++ b/tests/baselines/reference/reExportUndefined2.js @@ -14,6 +14,7 @@ use(undefined); "use strict"; var undefined; exports.undefined = undefined; +exports.__esModule = true; //// [b.js] "use strict"; var a_1 = require("./a"); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js index d759bc2f296a7..87ef9fe86710f 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js @@ -29,4 +29,5 @@ define(["require", "exports"], function (require, exports) { //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js index 7704b38f68ddb..c38c38ea325c6 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js @@ -33,4 +33,5 @@ define(["require", "exports"], function (require, exports) { //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js index a46be3bdafc94..178d8b3b3eed8 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js @@ -37,4 +37,5 @@ define(["require", "exports"], function (require, exports) { //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js index 8ccd6ecf5603c..893c4ec990fb1 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js @@ -31,4 +31,5 @@ define(["require", "exports"], function (require, exports) { //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js index 4602ed554e59d..39cb223d1a0f2 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js @@ -40,4 +40,5 @@ define(["require", "exports"], function (require, exports) { //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js index d3487519218f7..d8541df0c2c1a 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js @@ -49,4 +49,5 @@ define(["require", "exports"], function (require, exports) { //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js index 9a29c2bf9498c..01f818d5bb27b 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js @@ -51,4 +51,5 @@ define(["require", "exports"], function (require, exports) { //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js index a6c5a06ea3d0d..3d24d8428f51c 100644 --- a/tests/baselines/reference/relativeNamesInClassicResolution.js +++ b/tests/baselines/reference/relativeNamesInClassicResolution.js @@ -15,4 +15,5 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports"], function (require, exports) { "use strict"; exports.x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js index a8b14db31388b..52b4060860836 100644 --- a/tests/baselines/reference/requireAsFunctionInExternalModule.js +++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js @@ -19,10 +19,10 @@ hello(); //// [c.js] "use strict"; function require(a) { } -exports.__esModule = true; exports["default"] = require; function has(a) { return true; } exports.has = has; +exports.__esModule = true; //// [m.js] "use strict"; var c_1 = require("./c"); @@ -31,6 +31,7 @@ exports.hello = hello; if (c_1.has('ember-debug')) { c_1["default"]('ember-debug'); } +exports.__esModule = true; //// [m2.js] "use strict"; var m_1 = require("./m"); diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js index 640f0952bb976..96dd8c0b28310 100644 --- a/tests/baselines/reference/scannerClass2.js +++ b/tests/baselines/reference/scannerClass2.js @@ -17,3 +17,4 @@ var LoggerAdapter = (function () { return LoggerAdapter; }()); exports.LoggerAdapter = LoggerAdapter; +exports.__esModule = true; diff --git a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js index c1728d68e9bbf..2e90d3a447484 100644 --- a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js +++ b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js @@ -14,6 +14,7 @@ function foo() { const x = { test: exports.test }; } exports.foo = foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [shorthandOfExportedEntity01_targetES2015_CommonJS.d.ts] diff --git a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js index e89a413463e25..09130120de40e 100644 --- a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js +++ b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js @@ -14,6 +14,7 @@ function foo() { var x = { test: exports.test }; } exports.foo = foo; +Object.defineProperty(exports, "__esModule", { value: true }); //// [shorthandOfExportedEntity02_targetES5_CommonJS.d.ts] diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js index fad9c37ea8f33..be20fb287abbc 100644 --- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js @@ -18,6 +18,7 @@ use(foo); //// [existingModule.js] "use strict"; exports.x = 1; +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; const existingModule_1 = require("./existingModule"); diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js index c480fd3328544..f77980caf2f9a 100644 --- a/tests/baselines/reference/staticInstanceResolution3.js +++ b/tests/baselines/reference/staticInstanceResolution3.js @@ -23,6 +23,7 @@ var Promise = (function () { return Promise; }()); exports.Promise = Promise; +exports.__esModule = true; //// [staticInstanceResolution3_1.js] "use strict"; /// diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js index b3514e00aad87..3ec3256665876 100644 --- a/tests/baselines/reference/staticInstanceResolution5.js +++ b/tests/baselines/reference/staticInstanceResolution5.js @@ -28,6 +28,7 @@ define(["require", "exports"], function (require, exports) { return Promise; }()); exports.Promise = Promise; + exports.__esModule = true; }); //// [staticInstanceResolution5_1.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js index 9b8987659c5fc..e1694f4ed5f62 100644 --- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js +++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js @@ -52,6 +52,7 @@ var publicClassWithWithPrivateTypeParameters = (function () { return publicClassWithWithPrivateTypeParameters; }()); exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters; +exports.__esModule = true; //// [staticMethodWithTypeParameterExtendsClauseDeclFile.d.ts] diff --git a/tests/baselines/reference/topLevelExports.js b/tests/baselines/reference/topLevelExports.js index bf274fcf5584d..8cb7a7cfe4e6f 100644 --- a/tests/baselines/reference/topLevelExports.js +++ b/tests/baselines/reference/topLevelExports.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { exports.foo = 3; function log(n) { return n; } void log(exports.foo).toString(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js index c893a9b467593..b8ff23c13bd1a 100644 --- a/tests/baselines/reference/topLevelFileModule.js +++ b/tests/baselines/reference/topLevelFileModule.js @@ -14,6 +14,7 @@ var z = foo.x + fum.y; //// [foo_0.js] "use strict"; +exports.__esModule = true; //// [foo_1.js] "use strict"; var foo = require("./vs/foo_0"); diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js index 798bbb4c7af0d..64f18cd24e0ea 100644 --- a/tests/baselines/reference/tsxAttributeResolution10.js +++ b/tests/baselines/reference/tsxAttributeResolution10.js @@ -48,4 +48,5 @@ define(["require", "exports"], function (require, exports) { ; // Should be ok ; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js index cd6946636a63f..2375e5e32ff10 100644 --- a/tests/baselines/reference/tsxAttributeResolution9.js +++ b/tests/baselines/reference/tsxAttributeResolution9.js @@ -40,4 +40,5 @@ define(["require", "exports"], function (require, exports) { exports.MyComponent = MyComponent; ; // ok ; // should be an error + exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js index 8135af8731f2c..96f400740c3f6 100644 --- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js +++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js @@ -44,3 +44,4 @@ var ShortDetails = (function (_super) { return ShortDetails; }(React.Component)); exports.ShortDetails = ShortDetails; +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js index 46a94dea92fcf..f9488552e6dbe 100644 --- a/tests/baselines/reference/tsxDefaultImports.js +++ b/tests/baselines/reference/tsxDefaultImports.js @@ -26,8 +26,8 @@ var SomeClass = (function () { return SomeClass; }()); SomeClass.E = SomeEnum; -exports.__esModule = true; exports["default"] = SomeClass; +exports.__esModule = true; //// [b.js] "use strict"; var a_1 = require("./a"); diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js index 00ecc95586540..5c87d9a5eb997 100644 --- a/tests/baselines/reference/tsxDynamicTagName5.js +++ b/tests/baselines/reference/tsxDynamicTagName5.js @@ -45,3 +45,4 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js index 2e7802ea94f8c..8f1b47e2d107d 100644 --- a/tests/baselines/reference/tsxDynamicTagName7.js +++ b/tests/baselines/reference/tsxDynamicTagName7.js @@ -46,3 +46,4 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js index 3b2e43fede7a8..ab57998ad3cd9 100644 --- a/tests/baselines/reference/tsxDynamicTagName8.js +++ b/tests/baselines/reference/tsxDynamicTagName8.js @@ -45,3 +45,4 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js index 1b13845dc18a6..90608ed48f1fa 100644 --- a/tests/baselines/reference/tsxDynamicTagName9.js +++ b/tests/baselines/reference/tsxDynamicTagName9.js @@ -45,3 +45,4 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js index f8c3f4b25bebb..95cb3555d306c 100644 --- a/tests/baselines/reference/tsxElementResolution19.js +++ b/tests/baselines/reference/tsxElementResolution19.js @@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) { return MyClass; }()); exports.MyClass = MyClass; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) { diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js index 5b27360d14c6f..e7135b49528f4 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit1.js +++ b/tests/baselines/reference/tsxExternalModuleEmit1.js @@ -55,6 +55,7 @@ var Button = (function (_super) { return Button; }(React.Component)); exports.Button = Button; +exports.__esModule = true; //// [app.jsx] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -81,3 +82,4 @@ var App = (function (_super) { return App; }(React.Component)); exports.App = App; +exports.__esModule = true; diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js index 5590dac249f75..42ee240740367 100644 --- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js +++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js @@ -18,6 +18,7 @@ function foo() { return new classes(null); } exports.foo = foo; +exports.__esModule = true; //// [file2.js] "use strict"; var f = require("./file1"); diff --git a/tests/baselines/reference/typeGuardsAsAssertions.js b/tests/baselines/reference/typeGuardsAsAssertions.js index 84fc996c3ab50..955b0b573f08d 100644 --- a/tests/baselines/reference/typeGuardsAsAssertions.js +++ b/tests/baselines/reference/typeGuardsAsAssertions.js @@ -227,3 +227,4 @@ function f6() { x = ""; x.slice(); } +exports.__esModule = true; diff --git a/tests/baselines/reference/typeGuardsInExternalModule.js b/tests/baselines/reference/typeGuardsInExternalModule.js index 76624440d248a..2039b875cfaae 100644 --- a/tests/baselines/reference/typeGuardsInExternalModule.js +++ b/tests/baselines/reference/typeGuardsInExternalModule.js @@ -45,3 +45,4 @@ if (typeof exports.var2 === "string") { else { strOrNum = exports.var2; // number | string } +exports.__esModule = true; diff --git a/tests/baselines/reference/typeInferenceLiteralUnion.js b/tests/baselines/reference/typeInferenceLiteralUnion.js index 07776d26061ab..9147b05a29eb9 100644 --- a/tests/baselines/reference/typeInferenceLiteralUnion.js +++ b/tests/baselines/reference/typeInferenceLiteralUnion.js @@ -57,3 +57,4 @@ function extent(array) { exports.extent = extent; var extentMixed; extentMixed = extent([new NumCoercible(10), 13, '12', true]); +exports.__esModule = true; diff --git a/tests/baselines/reference/typePredicateInLoop.js b/tests/baselines/reference/typePredicateInLoop.js index 0a1e621cb50ad..15175a99b3d48 100644 --- a/tests/baselines/reference/typePredicateInLoop.js +++ b/tests/baselines/reference/typePredicateInLoop.js @@ -36,3 +36,4 @@ function y(arg) { } } exports.y = y; +exports.__esModule = true; diff --git a/tests/baselines/reference/typeReferenceDirectives7.js b/tests/baselines/reference/typeReferenceDirectives7.js index 6a15180d3e70f..485f48ae0133c 100644 --- a/tests/baselines/reference/typeReferenceDirectives7.js +++ b/tests/baselines/reference/typeReferenceDirectives7.js @@ -20,6 +20,7 @@ export let y = () => x "use strict"; exports.$ = 1; exports.y = function () { return exports.x; }; +exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/typeReferenceDirectives8.js b/tests/baselines/reference/typeReferenceDirectives8.js index cfa22c4228cd3..436b04d5ce3e7 100644 --- a/tests/baselines/reference/typeReferenceDirectives8.js +++ b/tests/baselines/reference/typeReferenceDirectives8.js @@ -18,10 +18,12 @@ export const bar = foo(); "use strict"; function foo() { return { x: 1 }; } exports.foo = foo; +exports.__esModule = true; //// [mod2.js] "use strict"; var mod1_1 = require("./mod1"); exports.bar = mod1_1.foo(); +exports.__esModule = true; //// [mod1.d.ts] diff --git a/tests/baselines/reference/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js index 5fd17ea16d38b..c4de6646675bc 100644 --- a/tests/baselines/reference/typeReferenceDirectives9.js +++ b/tests/baselines/reference/typeReferenceDirectives9.js @@ -41,6 +41,7 @@ var Cls = (function () { return Cls; }()); exports.Cls = Cls; +exports.__esModule = true; //// [mod1.js] /// "use strict"; @@ -53,6 +54,7 @@ require("./mod1"); exports.cls = main_1.Cls; exports.foo = new main_1.Cls().foo(); exports.bar = main_1.Cls.bar(); +exports.__esModule = true; //// [main.d.ts] diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js index 5c99948e9c901..a7528ade883e5 100644 --- a/tests/baselines/reference/typeofANonExportedType.js +++ b/tests/baselines/reference/typeofANonExportedType.js @@ -86,3 +86,4 @@ function foo() { } }()); foo.C = C; })(foo || (foo = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js index de158544d0d75..621ec74ebc46c 100644 --- a/tests/baselines/reference/typeofAmbientExternalModules.js +++ b/tests/baselines/reference/typeofAmbientExternalModules.js @@ -26,6 +26,7 @@ var C = (function () { return C; }()); exports.C = C; +exports.__esModule = true; //// [typeofAmbientExternalModules_1.js] "use strict"; var D = (function () { diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js index 69602d3e4c339..ab40a7c91a026 100644 --- a/tests/baselines/reference/typeofAnExportedType.js +++ b/tests/baselines/reference/typeofAnExportedType.js @@ -89,3 +89,4 @@ exports.foo = foo; }()); foo.C = C; })(foo = exports.foo || (exports.foo = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js index 1c43d28be8b44..9ec889e067655 100644 --- a/tests/baselines/reference/typeofExternalModules.js +++ b/tests/baselines/reference/typeofExternalModules.js @@ -24,6 +24,7 @@ var C = (function () { return C; }()); exports.C = C; +exports.__esModule = true; //// [typeofExternalModules_exportAssign.js] "use strict"; var D = (function () { diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js index c11bc13c6138b..e466124a48dd4 100644 --- a/tests/baselines/reference/typingsLookup4.js +++ b/tests/baselines/reference/typingsLookup4.js @@ -28,6 +28,7 @@ j + k + l; //// [lquery.js] "use strict"; exports.l = 2; +exports.__esModule = true; //// [a.js] "use strict"; var jquery_1 = require("jquery"); diff --git a/tests/baselines/reference/umd-errors.js b/tests/baselines/reference/umd-errors.js index 7423c81f9ed29..a8b789294bd3c 100644 --- a/tests/baselines/reference/umd-errors.js +++ b/tests/baselines/reference/umd-errors.js @@ -34,3 +34,4 @@ export as namespace C2; //// [err5.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js index 1fe59e24a51f1..d83ed700a296e 100644 --- a/tests/baselines/reference/unclosedExportClause01.js +++ b/tests/baselines/reference/unclosedExportClause01.js @@ -19,22 +19,27 @@ export { x as a, from "./t1" //// [t1.js] "use strict"; exports.x = "x"; +exports.__esModule = true; //// [t2.js] "use strict"; var t1_1 = require("./t1"); exports.x = t1_1.x; exports.from = t1_1.from; +exports.__esModule = true; //// [t3.js] "use strict"; var t1_1 = require("./t1"); exports.from = t1_1.from; +exports.__esModule = true; //// [t4.js] "use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; exports.from = t1_1.from; +exports.__esModule = true; //// [t5.js] "use strict"; var t1_1 = require("./t1"); exports.a = t1_1.x; exports.from = t1_1.from; +exports.__esModule = true; diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js index 188c8e9d18e7b..680ab9be46de5 100644 --- a/tests/baselines/reference/unclosedExportClause02.js +++ b/tests/baselines/reference/unclosedExportClause02.js @@ -23,6 +23,7 @@ export { x as a, from //// [t1.js] "use strict"; exports.x = "x"; +exports.__esModule = true; //// [t2.js] "use strict"; "./t1"; diff --git a/tests/baselines/reference/unusedImports1.js b/tests/baselines/reference/unusedImports1.js index afd6eb80843f6..33d4ab267f7f9 100644 --- a/tests/baselines/reference/unusedImports1.js +++ b/tests/baselines/reference/unusedImports1.js @@ -17,5 +17,6 @@ var Calculator = (function () { return Calculator; }()); exports.Calculator = Calculator; +exports.__esModule = true; //// [file2.js] "use strict"; diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js index 109c2e5a88675..2597aed867014 100644 --- a/tests/baselines/reference/unusedImports11.js +++ b/tests/baselines/reference/unusedImports11.js @@ -26,8 +26,8 @@ var Member = (function () { return Member; }()); exports.Member = Member; -exports.__esModule = true; exports["default"] = Member; +exports.__esModule = true; //// [a.js] "use strict"; var b_1 = require("./b"); diff --git a/tests/baselines/reference/unusedImports12.js b/tests/baselines/reference/unusedImports12.js index ece9b105bc90f..9ec3e8aa17a3c 100644 --- a/tests/baselines/reference/unusedImports12.js +++ b/tests/baselines/reference/unusedImports12.js @@ -21,7 +21,7 @@ var Member = (function () { return Member; }()); exports.Member = Member; -exports.__esModule = true; exports["default"] = Member; +exports.__esModule = true; //// [a.js] "use strict"; diff --git a/tests/baselines/reference/unusedImports13.js b/tests/baselines/reference/unusedImports13.js index 01e91abc14b80..2db07a7f9cbcb 100644 --- a/tests/baselines/reference/unusedImports13.js +++ b/tests/baselines/reference/unusedImports13.js @@ -25,3 +25,4 @@ declare global { "use strict"; var React = require("react"); exports.FooComponent =
; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports14.js b/tests/baselines/reference/unusedImports14.js index f3c51590e490b..e85a5d330457d 100644 --- a/tests/baselines/reference/unusedImports14.js +++ b/tests/baselines/reference/unusedImports14.js @@ -25,3 +25,4 @@ declare global { "use strict"; var React = require("react"); exports.FooComponent = React.createElement("div", null); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports15.js b/tests/baselines/reference/unusedImports15.js index 01be756e0e50a..faacbaf71c9c9 100644 --- a/tests/baselines/reference/unusedImports15.js +++ b/tests/baselines/reference/unusedImports15.js @@ -25,3 +25,4 @@ declare global { "use strict"; var Element = require("react"); exports.FooComponent =
; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports16.js b/tests/baselines/reference/unusedImports16.js index 1ce802d869ab7..884770ab22270 100644 --- a/tests/baselines/reference/unusedImports16.js +++ b/tests/baselines/reference/unusedImports16.js @@ -25,3 +25,4 @@ declare global { "use strict"; var Element = require("react"); exports.FooComponent = Element.createElement("div", null); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports2.js b/tests/baselines/reference/unusedImports2.js index f8918db5ab1e5..a1477dbc3232b 100644 --- a/tests/baselines/reference/unusedImports2.js +++ b/tests/baselines/reference/unusedImports2.js @@ -29,6 +29,7 @@ exports.Calculator = Calculator; function test() { } exports.test = test; +exports.__esModule = true; //// [file2.js] "use strict"; var file1_1 = require("./file1"); diff --git a/tests/baselines/reference/unusedImports3.js b/tests/baselines/reference/unusedImports3.js index 5c0a3edf16bf1..7516825aa5089 100644 --- a/tests/baselines/reference/unusedImports3.js +++ b/tests/baselines/reference/unusedImports3.js @@ -35,6 +35,7 @@ exports.test = test; function test2() { } exports.test2 = test2; +exports.__esModule = true; //// [file2.js] "use strict"; var file1_1 = require("./file1"); diff --git a/tests/baselines/reference/unusedImports4.js b/tests/baselines/reference/unusedImports4.js index e95938091aed4..350fb3301ac45 100644 --- a/tests/baselines/reference/unusedImports4.js +++ b/tests/baselines/reference/unusedImports4.js @@ -36,6 +36,7 @@ exports.test = test; function test2() { } exports.test2 = test2; +exports.__esModule = true; //// [file2.js] "use strict"; var file1_1 = require("./file1"); diff --git a/tests/baselines/reference/unusedImports5.js b/tests/baselines/reference/unusedImports5.js index cf92d01eb7524..3861d2a9cfff8 100644 --- a/tests/baselines/reference/unusedImports5.js +++ b/tests/baselines/reference/unusedImports5.js @@ -36,6 +36,7 @@ exports.test = test; function test2() { } exports.test2 = test2; +exports.__esModule = true; //// [file2.js] "use strict"; var file1_1 = require("./file1"); diff --git a/tests/baselines/reference/unusedImports6.js b/tests/baselines/reference/unusedImports6.js index 2e203a62a1bad..61d17fdf17f33 100644 --- a/tests/baselines/reference/unusedImports6.js +++ b/tests/baselines/reference/unusedImports6.js @@ -35,7 +35,7 @@ function test() { exports.test = test; function test2() { } -exports.__esModule = true; exports["default"] = test2; +exports.__esModule = true; //// [file2.js] "use strict"; diff --git a/tests/baselines/reference/unusedImports7.js b/tests/baselines/reference/unusedImports7.js index 67524fcd22a45..2bee99f3ba42a 100644 --- a/tests/baselines/reference/unusedImports7.js +++ b/tests/baselines/reference/unusedImports7.js @@ -33,7 +33,7 @@ function test() { exports.test = test; function test2() { } -exports.__esModule = true; exports["default"] = test2; +exports.__esModule = true; //// [file2.js] "use strict"; diff --git a/tests/baselines/reference/unusedImports8.js b/tests/baselines/reference/unusedImports8.js index 2554472e6cebe..b47ae034e373b 100644 --- a/tests/baselines/reference/unusedImports8.js +++ b/tests/baselines/reference/unusedImports8.js @@ -36,6 +36,7 @@ exports.test = test; function test2() { } exports.test2 = test2; +exports.__esModule = true; //// [file2.js] "use strict"; var file1_1 = require("./file1"); diff --git a/tests/baselines/reference/unusedImports9.js b/tests/baselines/reference/unusedImports9.js index cd19e167b1971..8b83697fa5525 100644 --- a/tests/baselines/reference/unusedImports9.js +++ b/tests/baselines/reference/unusedImports9.js @@ -32,5 +32,6 @@ exports.test = test; function test2() { } exports.test2 = test2; +exports.__esModule = true; //// [file2.js] "use strict"; diff --git a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js index e6cd890abb7c9..a7121ec9d2494 100644 --- a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js +++ b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js @@ -35,3 +35,4 @@ function foo() { var children = props.children, _a = props.active, rest = __rest(props, ["children", "active"]); } exports.asdf = 123; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js index 221d49a0fdf2d..410620751feab 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js +++ b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js @@ -43,3 +43,4 @@ function genericFunc(details, message) { return details + message; } exports.genericFunc = genericFunc; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedVariablesinModules1.js b/tests/baselines/reference/unusedVariablesinModules1.js index 18622a32ba9f0..1320bb574484c 100644 --- a/tests/baselines/reference/unusedVariablesinModules1.js +++ b/tests/baselines/reference/unusedVariablesinModules1.js @@ -9,3 +9,4 @@ export var y: string; //// [unusedVariablesinModules1.js] "use strict"; var x; +exports.__esModule = true; diff --git a/tests/baselines/reference/useStrictLikePrologueString01.js b/tests/baselines/reference/useStrictLikePrologueString01.js index 56df03abfe564..bf5e88ba46cfa 100644 --- a/tests/baselines/reference/useStrictLikePrologueString01.js +++ b/tests/baselines/reference/useStrictLikePrologueString01.js @@ -12,3 +12,4 @@ export function f() { function f() { } exports.f = f; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js index c859b4f8260d8..fbadbc6ad31dc 100644 --- a/tests/baselines/reference/varArgsOnConstructorTypes.js +++ b/tests/baselines/reference/varArgsOnConstructorTypes.js @@ -56,4 +56,5 @@ define(["require", "exports"], function (require, exports) { exports.B = B; var reg; reg.register(B); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js index e9cd9f4deda95..922324c9c6046 100644 --- a/tests/baselines/reference/visibilityOfTypeParameters.js +++ b/tests/baselines/reference/visibilityOfTypeParameters.js @@ -17,6 +17,7 @@ var MyClass = (function () { return MyClass; }()); exports.MyClass = MyClass; +exports.__esModule = true; //// [visibilityOfTypeParameters.d.ts] diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js index 7a31dcb97d0f3..5e5af215fb530 100644 --- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js +++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js @@ -17,6 +17,7 @@ function main() { "use strict"; function mkdirSync(path, mode) { } exports.mkdirSync = mkdirSync; +exports.__esModule = true; //// [voidAsNonAmbiguousReturnType_1.js] "use strict"; /// diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index efb5454c261a2..49cac46d21296 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -99,6 +99,7 @@ define(["require", "exports"], function (require, exports) { exports.eVar2 = 10; var eVar22; exports.eVar3 = 10; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index 92a90cb217762..d3fefee6c4155 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -52,6 +52,7 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); //// [withImportDecl_1.js] define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) { From 7a539d0b85bbf5da197660f0ad4246820c4dbe59 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Fri, 3 Feb 2017 12:40:39 -0800 Subject: [PATCH 041/116] Identifier escaping/unescaping for unique names --- src/compiler/emitter.ts | 20 ++++++++++---------- src/compiler/factory.ts | 5 ++--- src/compiler/transformers/es2015.ts | 4 ++-- src/compiler/transformers/ts.ts | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 498f65ad36658..700102a706962 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2565,7 +2565,7 @@ namespace ts { // Node names generate unique names based on their original node // and are cached based on that node's id. const node = getNodeForGeneratedName(name); - return generateNameCached(node, getTextOfNode); + return generateNameCached(node); } else { // Auto, Loop, and Unique names are cached based on their unique @@ -2575,9 +2575,9 @@ namespace ts { } } - function generateNameCached(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) { + function generateNameCached(node: Node) { const nodeId = getNodeId(node); - return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node, getTextOfNode))); + return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = unescapeIdentifier(generateNameForNode(node))); } /** @@ -2659,7 +2659,7 @@ namespace ts { /** * Generates a unique name for a ModuleDeclaration or EnumDeclaration. */ - function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) { + function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) { const name = getTextOfNode(node.name); // Use module/enum name itself if it is unique, otherwise make a unique variation return isUniqueLocalName(name, node) ? name : makeUniqueName(name); @@ -2689,9 +2689,9 @@ namespace ts { return makeUniqueName("class"); } - function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration, getTextOfNode: (node: Node, includeTrivia?: boolean) => string) { + function generateNameForMethodOrAccessor(node: MethodDeclaration | AccessorDeclaration) { if (isIdentifier(node.name)) { - return generateNameCached(node.name, getTextOfNode); + return generateNameCached(node.name); } return makeTempVariableName(TempFlags.Auto); } @@ -2699,13 +2699,13 @@ namespace ts { /** * Generates a unique name from a node. */ - function generateNameForNode(node: Node, getTextOfNode: (node: Node, includeTrivia?: boolean) => string): string { + function generateNameForNode(node: Node): string { switch (node.kind) { case SyntaxKind.Identifier: return makeUniqueName(getTextOfNode(node)); case SyntaxKind.ModuleDeclaration: case SyntaxKind.EnumDeclaration: - return generateNameForModuleOrEnum(node, getTextOfNode); + return generateNameForModuleOrEnum(node); case SyntaxKind.ImportDeclaration: case SyntaxKind.ExportDeclaration: return generateNameForImportOrExportDeclaration(node); @@ -2718,7 +2718,7 @@ namespace ts { case SyntaxKind.MethodDeclaration: case SyntaxKind.GetAccessor: case SyntaxKind.SetAccessor: - return generateNameForMethodOrAccessor(node, getTextOfNode); + return generateNameForMethodOrAccessor(node); default: return makeTempVariableName(TempFlags.Auto); } @@ -2734,7 +2734,7 @@ namespace ts { case GeneratedIdentifierKind.Loop: return makeTempVariableName(TempFlags._i); case GeneratedIdentifierKind.Unique: - return makeUniqueName(name.text); + return makeUniqueName(unescapeIdentifier(name.text)); } Debug.fail("Unsupported GeneratedIdentifierKind."); diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index ec1e0dafb795e..d5f3d92043698 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -108,7 +108,7 @@ namespace ts { export function createIdentifier(text: string): Identifier { const node = createSynthesizedNode(SyntaxKind.Identifier); - node.text = text ? escapeIdentifier(text) : undefined; + node.text = escapeIdentifier(text); node.originalKeywordKind = text ? stringToToken(text) : SyntaxKind.Unknown; node.autoGenerateKind = GeneratedIdentifierKind.None; node.autoGenerateId = 0; @@ -140,8 +140,7 @@ namespace ts { /** Create a unique name based on the supplied text. */ export function createUniqueName(text: string): Identifier { - const name = createIdentifier(""); - name.text = text; + const name = createIdentifier(text); name.autoGenerateKind = GeneratedIdentifierKind.Unique; name.autoGenerateId = nextAutoGenerateId; nextAutoGenerateId++; diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts index 6d0c9b3c5fa73..e0fd435a90dc6 100644 --- a/src/compiler/transformers/es2015.ts +++ b/src/compiler/transformers/es2015.ts @@ -2251,7 +2251,7 @@ namespace ts { // we don't want to emit a temporary variable for the RHS, just use it directly. const counter = createLoopVariable(); const rhsReference = expression.kind === SyntaxKind.Identifier - ? createUniqueName((expression).text) + ? createUniqueName(unescapeIdentifier((expression).text)) : createTempVariable(/*recordTempVariable*/ undefined); const elementAccess = createElementAccess(rhsReference, counter); @@ -2872,7 +2872,7 @@ namespace ts { else { loopParameters.push(createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name)); if (resolver.getNodeCheckFlags(decl) & NodeCheckFlags.NeedsLoopOutParameter) { - const outParamName = createUniqueName("out_" + name.text); + const outParamName = createUniqueName("out_" + unescapeIdentifier(name.text)); loopOutParameters.push({ originalName: name, outParamName }); } } diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts index b18ab67381e50..4ef3bd5c067d9 100644 --- a/src/compiler/transformers/ts.ts +++ b/src/compiler/transformers/ts.ts @@ -3119,7 +3119,7 @@ namespace ts { function getClassAliasIfNeeded(node: ClassDeclaration) { if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.ClassWithConstructorReference) { enableSubstitutionForClassAliases(); - const classAlias = createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? node.name.text : "default"); + const classAlias = createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? unescapeIdentifier(node.name.text) : "default"); classAliases[getOriginalNodeId(node)] = classAlias; hoistVariableDeclaration(classAlias); return classAlias; From bd98bc97bdf637d5b0c0cf2b90cb9139e3802d81 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Fri, 3 Feb 2017 14:12:50 -0800 Subject: [PATCH 042/116] Add factory functions for rest of NodeEdgeTraversal --- src/compiler/factory.ts | 175 +++++++++++++++++++++-- src/compiler/types.ts | 14 +- src/compiler/utilities.ts | 13 ++ src/compiler/visitor.ts | 285 +++++++++++++++++--------------------- 4 files changed, 315 insertions(+), 172 deletions(-) diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index d5f3d92043698..4c7693dd846f0 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -187,6 +187,20 @@ namespace ts { // Names + export function createQualifiedName(left: EntityName, right: string | Identifier) { + const node = createSynthesizedNode(SyntaxKind.QualifiedName); + node.left = left; + node.right = asName(right); + return node; + } + + export function updateQualifiedName(node: QualifiedName, left: EntityName, right: Identifier) { + return node.left !== left + || node.right !== right + ? updateNode(createQualifiedName(left, right), node) + : node; + } + export function createComputedPropertyName(expression: Expression) { const node = createSynthesizedNode(SyntaxKind.ComputedPropertyName); node.expression = expression; @@ -502,6 +516,20 @@ namespace ts { : node; } + export function createTypeAssertion(type: TypeNode, expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.TypeAssertionExpression); + node.type = type; + node.expression = parenthesizePrefixOperand(expression); + return node; + } + + export function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression) { + return node.type !== type + || node.expression !== expression + ? updateNode(createTypeAssertion(type, expression), node) + : node; + } + export function createParen(expression: Expression) { const node = createSynthesizedNode(SyntaxKind.ParenthesizedExpression); node.expression = expression; @@ -749,6 +777,32 @@ namespace ts { : node; } + export function createAsExpression(expression: Expression, type: TypeNode) { + const node = createSynthesizedNode(SyntaxKind.AsExpression); + node.expression = expression; + node.type = type; + return node; + } + + export function updateAsExpression(node: AsExpression, expression: Expression, type: TypeNode) { + return node.expression !== expression + || node.type !== type + ? updateNode(createAsExpression(expression, type), node) + : node; + } + + export function createNonNullExpression(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.NonNullExpression); + node.expression = parenthesizeForAccess(expression); + return node; + } + + export function updateNonNullExpression(node: NonNullExpression, expression: Expression) { + return node.expression !== expression + ? updateNode(createNonNullExpression(expression), node) + : node; + } + // Misc export function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail) { @@ -1040,18 +1094,6 @@ namespace ts { : node; } - export function createCaseBlock(clauses: CaseOrDefaultClause[]): CaseBlock { - const node = createSynthesizedNode(SyntaxKind.CaseBlock); - node.clauses = createNodeArray(clauses); - return node; - } - - export function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]) { - return node.clauses !== clauses - ? updateNode(createCaseBlock(clauses), node) - : node; - } - export function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block) { const node = createSynthesizedNode(SyntaxKind.FunctionDeclaration); node.decorators = asNodeArray(decorators); @@ -1099,6 +1141,85 @@ namespace ts { : node; } + export function createEnumDeclaration(decorators: Decorator[], modifiers: Modifier[], name: string | Identifier, members: EnumMember[]) { + const node = createSynthesizedNode(SyntaxKind.EnumDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.name = asName(name); + node.members = createNodeArray(members); + return node; + } + + export function updateEnumDeclaration(node: EnumDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, members: EnumMember[]) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.members !== members + ? updateNode(createEnumDeclaration(decorators, modifiers, name, members), node) + : node; + } + + export function createModuleDeclaration(decorators: Decorator[], modifiers: Modifier[], name: ModuleName, body: ModuleBody, flags?: NodeFlags) { + const node = createSynthesizedNode(SyntaxKind.ModuleDeclaration); + node.flags |= flags; + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.name = name; + node.body = body; + return node; + } + + export function updateModuleDeclaration(node: ModuleDeclaration, decorators: Decorator[], modifiers: Modifier[], name: ModuleName, body: ModuleBody) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.body !== body + ? updateNode(createModuleDeclaration(decorators, modifiers, name, body, node.flags), node) + : node; + } + + export function createModuleBlock(statements: Statement[]) { + const node = createSynthesizedNode(SyntaxKind.CaseBlock); + node.statements = createNodeArray(statements); + return node; + } + + export function updateModuleBlock(node: ModuleBlock, statements: Statement[]) { + return node.statements !== statements + ? updateNode(createModuleBlock(statements), node) + : node; + } + + export function createCaseBlock(clauses: CaseOrDefaultClause[]): CaseBlock { + const node = createSynthesizedNode(SyntaxKind.CaseBlock); + node.clauses = createNodeArray(clauses); + return node; + } + + export function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]) { + return node.clauses !== clauses + ? updateNode(createCaseBlock(clauses), node) + : node; + } + + export function createImportEqualsDeclaration(decorators: Decorator[], modifiers: Modifier[], name: string | Identifier, moduleReference: ModuleReference) { + const node = createSynthesizedNode(SyntaxKind.ImportEqualsDeclaration); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.name = asName(name); + node.moduleReference = moduleReference; + return node; + } + + export function updateImportEqualsDeclaration(node: ImportEqualsDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, moduleReference: ModuleReference) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.moduleReference !== moduleReference + ? updateNode(createImportEqualsDeclaration(decorators, modifiers, name, moduleReference), node) + : node; + } + export function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression): ImportDeclaration { const node = createSynthesizedNode(SyntaxKind.ImportDeclaration); node.decorators = asNodeArray(decorators); @@ -1228,6 +1349,20 @@ namespace ts { : node; } + // Module references + + export function createExternalModuleReference(expression: Expression) { + const node = createSynthesizedNode(SyntaxKind.ExternalModuleReference); + node.expression = expression; + return node; + } + + export function updateExternalModuleReference(node: ExternalModuleReference, expression: Expression) { + return node.expression !== expression + ? updateNode(createExternalModuleReference(expression), node) + : node; + } + // JSX export function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement) { @@ -1426,6 +1561,22 @@ namespace ts { return node; } + // Enum + + export function createEnumMember(name: string | PropertyName, initializer?: Expression) { + const node = createSynthesizedNode(SyntaxKind.EnumMember); + node.name = asName(name); + node.initializer = initializer && parenthesizeExpressionForList(initializer); + return node; + } + + export function updateEnumMember(node: EnumMember, name: PropertyName, initializer: Expression | undefined) { + return node.name !== name + || node.initializer !== initializer + ? updateNode(createEnumMember(name, initializer), node) + : node; + } + // Top-level nodes export function updateSourceFileNode(node: SourceFile, statements: Statement[]) { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index ae678f429f133..49e744682bc1d 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1771,24 +1771,28 @@ members: NodeArray; } - export type ModuleBody = ModuleBlock | ModuleDeclaration; - export type ModuleName = Identifier | StringLiteral; + export type ModuleBody = NamespaceBody | JSDocNamespaceBody; + export interface ModuleDeclaration extends DeclarationStatement { kind: SyntaxKind.ModuleDeclaration; name: Identifier | StringLiteral; - body?: ModuleBlock | NamespaceDeclaration | JSDocNamespaceDeclaration | Identifier; + body?: ModuleBody | JSDocNamespaceDeclaration | Identifier; } + export type NamespaceBody = ModuleBlock | NamespaceDeclaration; + export interface NamespaceDeclaration extends ModuleDeclaration { name: Identifier; - body: ModuleBlock | NamespaceDeclaration; + body: NamespaceBody; } + export type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration; + export interface JSDocNamespaceDeclaration extends ModuleDeclaration { name: Identifier; - body: JSDocNamespaceDeclaration | Identifier; + body: JSDocNamespaceBody; } export interface ModuleBlock extends Node, Statement { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 66efce4fef84a..91cd6a89b8b82 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -3887,6 +3887,19 @@ namespace ts { export function isModuleBody(node: Node): node is ModuleBody { const kind = node.kind; return kind === SyntaxKind.ModuleBlock + || kind === SyntaxKind.ModuleDeclaration + || kind === SyntaxKind.Identifier; + } + + export function isNamespaceBody(node: Node): node is NamespaceBody { + const kind = node.kind; + return kind === SyntaxKind.ModuleBlock + || kind === SyntaxKind.ModuleDeclaration; + } + + export function isJSDocNamespaceBody(node: Node): node is JSDocNamespaceBody { + const kind = node.kind; + return kind === SyntaxKind.Identifier || kind === SyntaxKind.ModuleDeclaration; } diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts index b6e0adc129417..63c3726fc103a 100644 --- a/src/compiler/visitor.ts +++ b/src/compiler/visitor.ts @@ -6,97 +6,6 @@ namespace ts { export type VisitResult = T | T[]; - /** - * Describes an edge of a Node, used when traversing a syntax tree. - */ - interface NodeEdge { - /** The property name for the edge. */ - name: string; - - /** Indicates that the result is optional. */ - optional?: boolean; - - /** A callback used to test whether a node is valid. */ - test?: (node: Node) => node is Node; - - /** A callback used to lift a NodeArrayNode into a valid node. */ - lift?: (nodes: NodeArray) => Node; - - /** A callback used to parenthesize a node to preserve the intended order of operations. */ - parenthesize?: (value: Node, parentNode: Node) => Node; - }; - - /** - * Describes the shape of a Node. - */ - type NodeTraversalPath = NodeEdge[]; - - /** - * This map contains information about the shape of each Node in "types.ts" pertaining to how - * each node should be traversed during a transformation. - * - * Each edge corresponds to a property in a Node subtype that should be traversed when visiting - * each child. The properties are assigned in the order in which traversal should occur. - * - * We only add entries for nodes that do not have a create/update pair defined in factory.ts - * - * NOTE: This needs to be kept up to date with changes to nodes in "types.ts". Currently, this - * map is not comprehensive. Only node edges relevant to tree transformation are - * currently defined. We may extend this to be more comprehensive, and eventually - * supplant the existing `forEachChild` implementation if performance is not - * significantly impacted. - */ - function getNodeEdgeTraversal(kind: SyntaxKind): NodeTraversalPath { - switch (kind) { - case SyntaxKind.QualifiedName: return [ - { name: "left", test: isEntityName }, - { name: "right", test: isIdentifier } - ]; - case SyntaxKind.Decorator: return [ - { name: "expression", test: isLeftHandSideExpression } - ]; - case SyntaxKind.TypeAssertionExpression: return [ - { name: "type", test: isTypeNode }, - { name: "expression", test: isUnaryExpression } - ]; - case SyntaxKind.AsExpression: return [ - { name: "expression", test: isExpression }, - { name: "type", test: isTypeNode } - ]; - case SyntaxKind.NonNullExpression: return [ - { name: "expression", test: isLeftHandSideExpression } - ]; - case SyntaxKind.EnumDeclaration: return [ - { name: "decorators", test: isDecorator }, - { name: "modifiers", test: isModifier }, - { name: "name", test: isIdentifier }, - { name: "members", test: isEnumMember } - ]; - case SyntaxKind.ModuleDeclaration: return [ - { name: "decorators", test: isDecorator }, - { name: "modifiers", test: isModifier }, - { name: "name", test: isModuleName }, - { name: "body", test: isModuleBody } - ]; - case SyntaxKind.ModuleBlock: return [ - { name: "statements", test: isStatement } - ]; - case SyntaxKind.ImportEqualsDeclaration: return [ - { name: "decorators", test: isDecorator }, - { name: "modifiers", test: isModifier }, - { name: "name", test: isIdentifier }, - { name: "moduleReference", test: isModuleReference } - ]; - case SyntaxKind.ExternalModuleReference: return [ - { name: "expression", test: isExpression, optional: true } - ]; - case SyntaxKind.EnumMember: return [ - { name: "name", test: isPropertyName }, - { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList } - ]; - } - } - function reduceNode(node: Node, f: (memo: T, node: Node) => T, initial: T) { return node ? f(initial, node) : initial; } @@ -107,8 +16,7 @@ namespace ts { /** * Similar to `reduceLeft`, performs a reduction against each child of a node. - * NOTE: Unlike `forEachChild`, this does *not* visit every node. Only nodes added to the - * `nodeEdgeTraversalMap` above will be visited. + * NOTE: Unlike `forEachChild`, this does *not* visit every node. * * @param node The node containing the children to reduce. * @param initial The initial value to supply to the reduction. @@ -145,6 +53,11 @@ namespace ts { break; // Names + case SyntaxKind.QualifiedName: + result = reduceNode((node).left, cbNode, result); + result = reduceNode((node).right, cbNode, result); + break; + case SyntaxKind.ComputedPropertyName: result = reduceNode((node).expression, cbNode, result); break; @@ -252,6 +165,11 @@ namespace ts { result = reduceNode((node).template, cbNode, result); break; + case SyntaxKind.TypeAssertionExpression: + result = reduceNode((node).type, cbNode, result); + result = reduceNode((node).expression, cbNode, result); + break; + case SyntaxKind.FunctionExpression: result = reduceNodes((node).modifiers, cbNodes, result); result = reduceNode((node).name, cbNode, result); @@ -314,6 +232,15 @@ namespace ts { result = reduceNodes((node).typeArguments, cbNodes, result); break; + case SyntaxKind.AsExpression: + result = reduceNode((node).expression, cbNode, result); + result = reduceNode((node).type, cbNode, result); + break; + + case SyntaxKind.NonNullExpression: + result = reduceNode((node).expression, cbNode, result); + break; + // Misc case SyntaxKind.TemplateSpan: result = reduceNode((node).expression, cbNode, result); @@ -415,10 +342,35 @@ namespace ts { result = reduceNodes((node).members, cbNodes, result); break; + case SyntaxKind.EnumDeclaration: + result = reduceNodes((node).decorators, cbNodes, result); + result = reduceNodes((node).modifiers, cbNodes, result); + result = reduceNode((node).name, cbNode, result); + result = reduceNodes((node).members, cbNodes, result); + break; + + case SyntaxKind.ModuleDeclaration: + result = reduceNodes((node).decorators, cbNodes, result); + result = reduceNodes((node).modifiers, cbNodes, result); + result = reduceNode((node).name, cbNode, result); + result = reduceNode((node).body, cbNode, result); + break; + + case SyntaxKind.ModuleBlock: + result = reduceNodes((node).statements, cbNodes, result); + break; + case SyntaxKind.CaseBlock: result = reduceNodes((node).clauses, cbNodes, result); break; + case SyntaxKind.ImportEqualsDeclaration: + result = reduceNodes((node).decorators, cbNodes, result); + result = reduceNodes((node).modifiers, cbNodes, result); + result = reduceNode((node).name, cbNode, result); + result = reduceNode((node).moduleReference, cbNode, result); + break; + case SyntaxKind.ImportDeclaration: result = reduceNodes((node).decorators, cbNodes, result); result = reduceNodes((node).modifiers, cbNodes, result); @@ -459,6 +411,11 @@ namespace ts { result = reduceNode((node).moduleSpecifier, cbNode, result); break; + // Module references + case SyntaxKind.ExternalModuleReference: + result = reduceNode((node).expression, cbNode, result); + break; + // JSX case SyntaxKind.JsxElement: result = reduceNode((node).openingElement, cbNode, result); @@ -519,30 +476,25 @@ namespace ts { break; case SyntaxKind.SpreadAssignment: - result = reduceNode((node as SpreadAssignment).expression, cbNode, result); + result = reduceNode((node).expression, cbNode, result); break; + // Enum + case SyntaxKind.EnumMember: + result = reduceNode((node).name, cbNode, result); + result = reduceNode((node).initializer, cbNode, result); + // Top-level nodes case SyntaxKind.SourceFile: result = reduceNodes((node).statements, cbNodes, result); break; + // Transformation nodes case SyntaxKind.PartiallyEmittedExpression: result = reduceNode((node).expression, cbNode, result); break; default: - const edgeTraversalPath = getNodeEdgeTraversal(kind); - if (edgeTraversalPath) { - for (const edge of edgeTraversalPath) { - const value = (>node)[edge.name]; - if (value !== undefined) { - result = isArray(value) - ? reduceNodes(>value, cbNodes, result) - : cbNode(result, value); - } - } - } break; } @@ -556,11 +508,9 @@ namespace ts { * @param visitor The callback used to visit the Node. * @param test A callback to execute to verify the Node is valid. * @param optional An optional value indicating whether the Node is itself optional. - * @param lift An optional callback to execute to lift a NodeArrayNode into a valid Node. + * @param lift An optional callback to execute to lift a NodeArray into a valid Node. */ - export function visitNode(node: T, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, optional?: boolean, lift?: (node: NodeArray) => T): T; - export function visitNode(node: T, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, optional: boolean, lift: (node: NodeArray) => T, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): T; - export function visitNode(node: Node, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, optional?: boolean, lift?: (node: Node[]) => Node, parenthesize?: (node: Node, parentNode: Node) => Node, parentNode?: Node): Node { + export function visitNode(node: T, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, optional?: boolean, lift?: (node: NodeArray) => T): T { if (node === undefined || visitor === undefined) { return node; } @@ -586,13 +536,9 @@ namespace ts { visitedNode = visited; } - if (parenthesize !== undefined) { - visitedNode = parenthesize(visitedNode, parentNode); - } - Debug.assertNode(visitedNode, test); aggregateTransformFlags(visitedNode); - return visitedNode; + return visitedNode; } /** @@ -604,14 +550,12 @@ namespace ts { * @param start An optional value indicating the starting offset at which to start visiting. * @param count An optional value indicating the maximum number of nodes to visit. */ - export function visitNodes(nodes: NodeArray, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, start?: number, count?: number): NodeArray; - export function visitNodes(nodes: NodeArray, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, start: number, count: number, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): NodeArray; - export function visitNodes(nodes: NodeArray, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, start?: number, count?: number, parenthesize?: (node: Node, parentNode: Node) => Node, parentNode?: Node): NodeArray { + export function visitNodes(nodes: NodeArray, visitor: (node: Node) => VisitResult, test: (node: Node) => boolean, start?: number, count?: number): NodeArray { if (nodes === undefined) { return undefined; } - let updated: NodeArray; + let updated: NodeArray; // Ensure start and count have valid values const length = nodes.length; @@ -627,7 +571,7 @@ namespace ts { // If we are not visiting all of the original nodes, we must always create a new array. // Since this is a fragment of a node array, we do not copy over the previous location // and will only copy over `hasTrailingComma` if we are including the last element. - updated = createNodeArray([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length); + updated = createNodeArray([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length); } // Visit each original node. @@ -644,21 +588,15 @@ namespace ts { if (visited) { if (isArray(visited)) { for (let visitedNode of visited) { - visitedNode = parenthesize - ? parenthesize(visitedNode, parentNode) - : visitedNode; Debug.assertNode(visitedNode, test); aggregateTransformFlags(visitedNode); - updated.push(visitedNode); + updated.push(visitedNode); } } else { - const visitedNode = parenthesize - ? parenthesize(visited, parentNode) - : visited; - Debug.assertNode(visitedNode, test); - aggregateTransformFlags(visitedNode); - updated.push(visitedNode); + Debug.assertNode(visited, test); + aggregateTransformFlags(visited); + updated.push(visited); } } } @@ -747,6 +685,11 @@ namespace ts { return node; // Names + case SyntaxKind.QualifiedName: + return updateQualifiedName(node, + visitNode((node).left, visitor, isEntityName), + visitNode((node).right, visitor, isIdentifier)); + case SyntaxKind.ComputedPropertyName: return updateComputedPropertyName(node, visitNode((node).expression, visitor, isExpression)); @@ -761,6 +704,10 @@ namespace ts { visitNode((node).type, visitor, isTypeNode, /*optional*/ true), visitNode((node).initializer, visitor, isExpression, /*optional*/ true)); + case SyntaxKind.Decorator: + return updateDecorator(node, + visitNode((node).expression, visitor, isExpression)); + // Type member case SyntaxKind.PropertyDeclaration: return updateProperty(node, @@ -856,6 +803,11 @@ namespace ts { visitNode((node).tag, visitor, isExpression), visitNode((node).template, visitor, isTemplateLiteral)); + case SyntaxKind.TypeAssertionExpression: + return updateTypeAssertion(node, + visitNode((node).type, visitor, isTypeNode), + visitNode((node).expression, visitor, isExpression)); + case SyntaxKind.ParenthesizedExpression: return updateParen(node, visitNode((node).expression, visitor, isExpression)); @@ -938,6 +890,15 @@ namespace ts { visitNodes((node).typeArguments, visitor, isTypeNode), visitNode((node).expression, visitor, isExpression)); + case SyntaxKind.AsExpression: + return updateAsExpression(node, + visitNode((node).expression, visitor, isExpression), + visitNode((node).type, visitor, isTypeNode)); + + case SyntaxKind.NonNullExpression: + return updateNonNullExpression(node, + visitNode((node).expression, visitor, isExpression)); + // Misc case SyntaxKind.TemplateSpan: return updateTemplateSpan(node, @@ -1059,10 +1020,35 @@ namespace ts { visitNodes((node).heritageClauses, visitor, isHeritageClause), visitNodes((node).members, visitor, isClassElement)); + case SyntaxKind.EnumDeclaration: + return updateEnumDeclaration(node, + visitNodes((node).decorators, visitor, isDecorator), + visitNodes((node).modifiers, visitor, isModifier), + visitNode((node).name, visitor, isIdentifier), + visitNodes((node).members, visitor, isEnumMember)); + + case SyntaxKind.ModuleDeclaration: + return updateModuleDeclaration(node, + visitNodes((node).decorators, visitor, isDecorator), + visitNodes((node).modifiers, visitor, isModifier), + visitNode((node).name, visitor, isIdentifier), + visitNode((node).body, visitor, isModuleBody)); + + case SyntaxKind.ModuleBlock: + return updateModuleBlock(node, + visitNodes((node).statements, visitor, isStatement)); + case SyntaxKind.CaseBlock: return updateCaseBlock(node, visitNodes((node).clauses, visitor, isCaseOrDefaultClause)); + case SyntaxKind.ImportEqualsDeclaration: + return updateImportEqualsDeclaration(node, + visitNodes((node).decorators, visitor, isDecorator), + visitNodes((node).modifiers, visitor, isModifier), + visitNode((node).name, visitor, isIdentifier), + visitNode((node).moduleReference, visitor, isModuleReference)); + case SyntaxKind.ImportDeclaration: return updateImportDeclaration(node, visitNodes((node).decorators, visitor, isDecorator), @@ -1110,6 +1096,11 @@ namespace ts { visitNode((node).propertyName, visitor, isIdentifier, /*optional*/ true), visitNode((node).name, visitor, isIdentifier)); + // Module references + case SyntaxKind.ExternalModuleReference: + return updateExternalModuleReference(node, + visitNode((node).expression, visitor, isExpression)); + // JSX case SyntaxKind.JsxElement: return updateJsxElement(node, @@ -1175,10 +1166,16 @@ namespace ts { visitNode((node).objectAssignmentInitializer, visitor, isExpression)); case SyntaxKind.SpreadAssignment: - return updateSpreadAssignment(node as SpreadAssignment, - visitNode((node as SpreadAssignment).expression, visitor, isExpression)); + return updateSpreadAssignment(node, + visitNode((node).expression, visitor, isExpression)); - // Top-level nodes + // Enum + case SyntaxKind.EnumMember: + return updateEnumMember(node, + visitNode((node).name, visitor, isPropertyName), + visitNode((node).initializer, visitor, isExpression, /*optional*/ true)); + + // Top-level nodes case SyntaxKind.SourceFile: return updateSourceFileNode(node, visitLexicalEnvironment((node).statements, visitor, context)); @@ -1189,30 +1186,8 @@ namespace ts { visitNode((node).expression, visitor, isExpression)); default: - let updated: Node & MapLike; - const edgeTraversalPath = getNodeEdgeTraversal(kind); - if (edgeTraversalPath) { - for (const edge of edgeTraversalPath) { - const value = >(>node)[edge.name]; - if (value !== undefined) { - const visited = isArray(value) - ? visitNodes(value, visitor, edge.test, 0, value.length, edge.parenthesize, node) - : visitNode(value, visitor, edge.test, edge.optional, edge.lift, edge.parenthesize, node); - if (updated !== undefined || visited !== value) { - if (updated === undefined) { - updated = getMutableClone(node); - } - if (visited !== value) { - updated[edge.name] = visited; - } - } - } - } - } - return updated ? updateNode(updated, node) : node; + return node; } - - // return node; } /** From c0ac84fdbd36bcfd6b08ccaccbd04adf6b1becf7 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 3 Feb 2017 17:38:17 -0800 Subject: [PATCH 043/116] Give a better name for the boolean variable; emit __esmodule for export import --- src/compiler/transformers/module/module.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index 68f49dba42cc8..ebd004337f9c0 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -45,7 +45,7 @@ namespace ts { let currentSourceFile: SourceFile; // The current file. let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file. let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored. - let shouldAppendUnderscoreUnderscoreEsModule: boolean; // A boolean indicating whether "__esModule" should be emitted + let shouldAppendEsModuleMarker: boolean; // A boolean indicating whether "__esModule" should be emitted return transformSourceFile; @@ -63,7 +63,7 @@ namespace ts { currentSourceFile = node; currentModuleInfo = collectExternalModuleInfo(node, resolver, compilerOptions); - shouldAppendUnderscoreUnderscoreEsModule = false; + shouldAppendEsModuleMarker = false; moduleInfoMap[getOriginalNodeId(node)] = currentModuleInfo; // Perform the transformation. @@ -90,7 +90,7 @@ namespace ts { addRange(statements, endLexicalEnvironment()); addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); - if (shouldAppendUnderscoreUnderscoreEsModule) { + if (shouldAppendEsModuleMarker) { append(statements, createUnderscoreUnderscoreESModule()); } @@ -383,7 +383,7 @@ namespace ts { // Append the 'export =' statement if provided. addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true); - if (shouldAppendUnderscoreUnderscoreEsModule) { + if (shouldAppendEsModuleMarker) { append(statements, createUnderscoreUnderscoreESModule()); } @@ -666,7 +666,7 @@ namespace ts { } const generatedName = getGeneratedNameForNode(node); - shouldAppendUnderscoreUnderscoreEsModule = true; + shouldAppendEsModuleMarker = true; if (node.exportClause) { const statements: Statement[] = []; @@ -833,9 +833,10 @@ namespace ts { let expressions: Expression[]; const parseTreeNode = getParseTreeNode(node); - if (!shouldAppendUnderscoreUnderscoreEsModule) { + if (parseTreeNode && !shouldAppendEsModuleMarker) { // class declaration get down-level transformed to be variable statement - shouldAppendUnderscoreUnderscoreEsModule = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration) && hasModifier(parseTreeNode, ModifierFlags.Export); + shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration) + && hasModifier(parseTreeNode, ModifierFlags.Export); } if (hasModifier(node, ModifierFlags.Export)) { @@ -1125,7 +1126,7 @@ namespace ts { * @param allowComments Whether to allow comments on the export. */ function appendExportStatement(statements: Statement[] | undefined, exportName: Identifier, expression: Expression, location?: TextRange, allowComments?: boolean): Statement[] | undefined { - shouldAppendUnderscoreUnderscoreEsModule = true; + shouldAppendEsModuleMarker = true; statements = append(statements, createExportStatement(exportName, expression, location, allowComments)); return statements; } From 535a001cbb07e8be0c50941e895deb9b7cebcde4 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 3 Feb 2017 17:38:39 -0800 Subject: [PATCH 044/116] Update baselines (3) --- src/harness/unittests/compileOnSave.ts | 2 +- tests/baselines/reference/declFileForExportedImport.js | 1 + tests/baselines/reference/externalModuleQualification.js | 1 + ...rnalModuleReferenceOfImportDeclarationWithExportModifier.js | 1 + tests/baselines/reference/importDeclWithClassModifiers.js | 1 + tests/baselines/reference/importDeclWithDeclareModifier.js | 1 + tests/baselines/reference/importDeclWithExportModifier.js | 1 + .../importDeclWithExportModifierAndExportAssignment.js | 1 + tests/baselines/reference/project/baseline/amd/decl.js | 1 + tests/baselines/reference/project/baseline/node/decl.js | 1 + tests/baselines/reference/project/baseline2/amd/decl.js | 1 + tests/baselines/reference/project/baseline2/node/decl.js | 1 + tests/baselines/reference/project/declarationDir/amd/a.js | 1 + .../reference/project/declarationDir/amd/subfolder/b.js | 1 + .../reference/project/declarationDir/amd/subfolder/c.js | 1 + tests/baselines/reference/project/declarationDir/node/a.js | 1 + .../reference/project/declarationDir/node/subfolder/b.js | 1 + .../reference/project/declarationDir/node/subfolder/c.js | 1 + tests/baselines/reference/project/declarationDir2/amd/out/a.js | 1 + .../reference/project/declarationDir2/amd/out/subfolder/b.js | 1 + .../reference/project/declarationDir2/amd/out/subfolder/c.js | 1 + .../baselines/reference/project/declarationDir2/node/out/a.js | 1 + .../reference/project/declarationDir2/node/out/subfolder/b.js | 1 + .../reference/project/declarationDir2/node/out/subfolder/c.js | 1 + tests/baselines/reference/project/declarationDir3/amd/out.js | 3 +++ .../reference/project/declarationsCascadingImports/amd/m4.js | 1 + .../reference/project/declarationsCascadingImports/node/m4.js | 1 + .../reference/project/declarationsGlobalImport/amd/glo_m4.js | 1 + .../project/declarationsGlobalImport/amd/useModule.js | 1 + .../reference/project/declarationsGlobalImport/node/glo_m4.js | 1 + .../project/declarationsGlobalImport/node/useModule.js | 1 + .../project/declarationsImportedInPrivate/amd/private_m4.js | 1 + .../project/declarationsImportedInPrivate/node/private_m4.js | 1 + .../declarationsImportedUseInFunction/amd/fncOnly_m4.js | 1 + .../project/declarationsImportedUseInFunction/amd/useModule.js | 1 + .../declarationsImportedUseInFunction/node/fncOnly_m4.js | 1 + .../declarationsImportedUseInFunction/node/useModule.js | 1 + .../declarationsIndirectImportShouldResultInError/amd/m4.js | 1 + .../declarationsIndirectImportShouldResultInError/amd/m5.js | 1 + .../amd/useModule.js | 1 + .../declarationsIndirectImportShouldResultInError/node/m4.js | 1 + .../declarationsIndirectImportShouldResultInError/node/m5.js | 1 + .../node/useModule.js | 1 + .../project/declarationsMultipleTimesImport/amd/m4.js | 1 + .../project/declarationsMultipleTimesImport/amd/useModule.js | 1 + .../project/declarationsMultipleTimesImport/node/m4.js | 1 + .../project/declarationsMultipleTimesImport/node/useModule.js | 1 + .../project/declarationsMultipleTimesMultipleImport/amd/m4.js | 1 + .../project/declarationsMultipleTimesMultipleImport/amd/m5.js | 1 + .../declarationsMultipleTimesMultipleImport/amd/useModule.js | 1 + .../project/declarationsMultipleTimesMultipleImport/node/m4.js | 1 + .../project/declarationsMultipleTimesMultipleImport/node/m5.js | 1 + .../declarationsMultipleTimesMultipleImport/node/useModule.js | 1 + .../reference/project/declarationsSimpleImport/amd/m4.js | 1 + .../project/declarationsSimpleImport/amd/useModule.js | 1 + .../reference/project/declarationsSimpleImport/node/m4.js | 1 + .../project/declarationsSimpleImport/node/useModule.js | 1 + .../emitDecoratorMetadataCommonJSISolatedModules/amd/main.js | 1 + .../emitDecoratorMetadataCommonJSISolatedModules/node/main.js | 1 + .../amd/main.js | 1 + .../node/main.js | 1 + .../project/emitDecoratorMetadataSystemJS/amd/main.js | 1 + .../project/emitDecoratorMetadataSystemJS/node/main.js | 1 + .../emitDecoratorMetadataSystemJSISolatedModules/amd/main.js | 1 + .../emitDecoratorMetadataSystemJSISolatedModules/node/main.js | 1 + .../amd/main.js | 1 + .../node/main.js | 1 + .../mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile1.js | 1 + .../mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js | 1 + .../mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js | 1 + .../node/diskFile1.js | 1 + .../node/ref/m1.js | 1 + .../mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js | 1 + .../mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js | 1 + .../project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js | 1 + .../mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js | 1 + .../mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js | 1 + .../mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js | 1 + .../mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile1.js | 1 + .../mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js | 1 + .../mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js | 1 + .../node/diskFile1.js | 1 + .../node/ref/m1.js | 1 + .../mapRootRelativePathModuleMultifolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js | 1 + .../mapRootRelativePathModuleSimpleNoOutdir/amd/test.js | 1 + .../project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js | 1 + .../mapRootRelativePathModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js | 1 + .../mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js | 1 + .../mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js | 1 + .../mapRootRelativePathModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js | 1 + .../project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js | 1 + .../project/maprootUrlModuleMultifolderNoOutdir/amd/test.js | 1 + .../maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js | 1 + .../project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js | 1 + .../project/maprootUrlModuleMultifolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js | 1 + .../project/maprootUrlModuleSimpleNoOutdir/amd/test.js | 1 + .../project/maprootUrlModuleSimpleNoOutdir/node/m1.js | 1 + .../project/maprootUrlModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js | 1 + .../project/maprootUrlModuleSubfolderNoOutdir/amd/test.js | 1 + .../project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js | 1 + .../project/maprootUrlModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 1 + .../node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile1.js | 1 + .../amd/ref/m1.js | 1 + .../amd/test.js | 1 + .../node/diskFile1.js | 1 + .../node/ref/m1.js | 1 + .../node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js | 1 + .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js | 1 + .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js | 1 + .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 1 + .../maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js | 1 + .../node/ref/m1.js | 1 + .../node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- tests/baselines/reference/project/nonRelative/amd/decl.js | 1 + tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js | 1 + tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js | 1 + tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js | 1 + tests/baselines/reference/project/nonRelative/node/decl.js | 1 + .../baselines/reference/project/nonRelative/node/lib/bar/a.js | 1 + .../baselines/reference/project/nonRelative/node/lib/foo/a.js | 1 + .../baselines/reference/project/nonRelative/node/lib/foo/b.js | 1 + .../reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js | 1 + .../amd/bin/outAndOutDirFile.js | 1 + .../project/outModuleMultifolderNoOutdir/amd/diskFile0.js | 1 + .../project/outModuleMultifolderNoOutdir/amd/ref/m1.js | 1 + .../reference/project/outModuleMultifolderNoOutdir/amd/test.js | 1 + .../project/outModuleMultifolderNoOutdir/node/diskFile0.js | 1 + .../project/outModuleMultifolderNoOutdir/node/ref/m1.js | 1 + .../project/outModuleMultifolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../outModuleMultifolderSpecifyOutputFile/amd/bin/test.js | 3 +++ .../reference/project/outModuleSimpleNoOutdir/amd/m1.js | 1 + .../reference/project/outModuleSimpleNoOutdir/amd/test.js | 1 + .../reference/project/outModuleSimpleNoOutdir/node/m1.js | 1 + .../reference/project/outModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js | 2 ++ .../reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js | 1 + .../reference/project/outModuleSubfolderNoOutdir/amd/test.js | 1 + .../project/outModuleSubfolderNoOutdir/node/ref/m1.js | 1 + .../reference/project/outModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../outModuleSubfolderSpecifyOutputFile/amd/bin/test.js | 2 ++ .../sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile1.js | 1 + .../amd/ref/m1.js | 1 + .../amd/test.js | 1 + .../node/diskFile1.js | 1 + .../node/ref/m1.js | 1 + .../node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js | 1 + .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js | 1 + .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js | 1 + .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 1 + .../sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js | 1 + .../node/ref/m1.js | 1 + .../sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile1.js | 1 + .../amd/ref/m1.js | 1 + .../amd/test.js | 1 + .../node/diskFile1.js | 1 + .../node/ref/m1.js | 1 + .../node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js | 1 + .../sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js | 1 + .../sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js | 1 + .../sourceRootRelativePathModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 1 + .../sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js | 1 + .../node/ref/m1.js | 1 + .../sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js | 1 + .../project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js | 1 + .../project/sourcemapModuleMultifolderNoOutdir/amd/test.js | 1 + .../sourcemapModuleMultifolderNoOutdir/node/diskFile1.js | 1 + .../project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js | 1 + .../project/sourcemapModuleMultifolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js | 1 + .../project/sourcemapModuleSimpleNoOutdir/amd/test.js | 1 + .../reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js | 1 + .../project/sourcemapModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js | 2 ++ .../sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map | 2 +- .../project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js | 1 + .../project/sourcemapModuleSubfolderNoOutdir/amd/test.js | 1 + .../project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js | 1 + .../project/sourcemapModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js | 1 + .../project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js | 1 + .../amd/outdir/simple/ref/m2.js | 1 + .../node/outdir/simple/ref/m2.js | 1 + .../amd/bin/test.js | 1 + .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 1 + .../amd/bin/outAndOutDirFile.js.map | 2 +- .../sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js | 1 + .../sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js | 1 + .../project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js | 1 + .../sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js | 1 + .../sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js | 1 + .../sourcerootUrlModuleMultifolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/ref/m1.js | 1 + .../node/outdir/simple/outputdir_module_multifolder/test.js | 1 + .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js | 1 + .../amd/bin/test.js | 3 +++ .../amd/bin/test.js.map | 2 +- .../project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js | 1 + .../project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js | 1 + .../project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js | 1 + .../project/sourcerootUrlModuleSimpleNoOutdir/node/test.js | 1 + .../amd/outdir/simple/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js | 1 + .../project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js | 1 + .../sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js | 1 + .../project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js | 1 + .../amd/outdir/simple/ref/m1.js | 1 + .../amd/outdir/simple/test.js | 1 + .../node/outdir/simple/ref/m1.js | 1 + .../node/outdir/simple/test.js | 1 + .../amd/bin/test.js | 2 ++ .../amd/bin/test.js.map | 2 +- .../project/visibilityOfTypeUsedAcrossModules/amd/fs.js | 1 + .../project/visibilityOfTypeUsedAcrossModules/node/fs.js | 1 + tests/baselines/reference/sourceMapValidationImport.js | 1 + tests/baselines/reference/topLevelLambda4.js | 1 + .../Transpile with emit decorators and emit metadata.js | 1 + 453 files changed, 491 insertions(+), 41 deletions(-) diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts index c8deb9e75541b..706fc45b6daf3 100644 --- a/src/harness/unittests/compileOnSave.ts +++ b/src/harness/unittests/compileOnSave.ts @@ -520,7 +520,7 @@ namespace ts.projectSystem { const expectedEmittedFileName = "/a/b/f1.js"; assert.isTrue(host.fileExists(expectedEmittedFileName)); - assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`); + assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\nexports.__esModule = true;\r\n`); }); it("shoud not emit js files in external projects", () => { diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js index 8e07b99c8af5f..0bb2c7dfe55f3 100644 --- a/tests/baselines/reference/declFileForExportedImport.js +++ b/tests/baselines/reference/declFileForExportedImport.js @@ -21,6 +21,7 @@ exports.a = require("./declFileForExportedImport_0"); var y = exports.a.x; exports.b = exports.a; var z = exports.b.x; +exports.__esModule = true; //// [declFileForExportedImport_0.d.ts] diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js index 26255ac3fcd13..353af42a40847 100644 --- a/tests/baselines/reference/externalModuleQualification.js +++ b/tests/baselines/reference/externalModuleQualification.js @@ -28,3 +28,4 @@ var NavigateAction = (function () { }; return NavigateAction; }()); +exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js index 8a25c3711b2a9..e0e5eaf7bac5b 100644 --- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js +++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js @@ -14,6 +14,7 @@ define(["require", "exports"], function (require, exports) { function foo() { } exports.foo = foo; ; + exports.__esModule = true; }); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js] define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) { diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js index 0af92b1976a64..98e322fb61967 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.js +++ b/tests/baselines/reference/importDeclWithClassModifiers.js @@ -16,4 +16,5 @@ define(["require", "exports"], function (require, exports) { exports.b = x.c; exports.c = x.c; var b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js index 7c3d3782934f0..05c40739a8202 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.js +++ b/tests/baselines/reference/importDeclWithDeclareModifier.js @@ -11,3 +11,4 @@ var b: a; "use strict"; exports.a = x.c; var b; +exports.__esModule = true; diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js index c04bf542b58ec..c23fae4074908 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.js +++ b/tests/baselines/reference/importDeclWithExportModifier.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.a = x.c; var b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js index da41309d56b71..a4102cbfff4d2 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js @@ -9,3 +9,4 @@ export = x; //// [importDeclWithExportModifierAndExportAssignment.js] "use strict"; exports.a = x.c; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js index 2586bbb23bddc..a8a506f23c3ae 100644 --- a/tests/baselines/reference/project/baseline/amd/decl.js +++ b/tests/baselines/reference/project/baseline/amd/decl.js @@ -5,4 +5,5 @@ define(["require", "exports"], function (require, exports) { return { x: x, y: y }; } exports.point = point; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js index f6c19174e54a7..998ffaa559235 100644 --- a/tests/baselines/reference/project/baseline/node/decl.js +++ b/tests/baselines/reference/project/baseline/node/decl.js @@ -4,3 +4,4 @@ function point(x, y) { return { x: x, y: y }; } exports.point = point; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js index 2586bbb23bddc..a8a506f23c3ae 100644 --- a/tests/baselines/reference/project/baseline2/amd/decl.js +++ b/tests/baselines/reference/project/baseline2/amd/decl.js @@ -5,4 +5,5 @@ define(["require", "exports"], function (require, exports) { return { x: x, y: y }; } exports.point = point; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js index f6c19174e54a7..998ffaa559235 100644 --- a/tests/baselines/reference/project/baseline2/node/decl.js +++ b/tests/baselines/reference/project/baseline2/node/decl.js @@ -4,3 +4,4 @@ function point(x, y) { return { x: x, y: y }; } exports.point = point; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js index 331c004bd671b..30c63965136d0 100644 --- a/tests/baselines/reference/project/declarationDir/amd/a.js +++ b/tests/baselines/reference/project/declarationDir/amd/a.js @@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js index e2cdda8530b4b..14c0c78edb83c 100644 --- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js @@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js index 212511f2bf59b..b62647beae072 100644 --- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js @@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js index 35f5adf27f0e8..7480c269a0555 100644 --- a/tests/baselines/reference/project/declarationDir/node/a.js +++ b/tests/baselines/reference/project/declarationDir/node/a.js @@ -5,3 +5,4 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js index 7b46df97ac3e2..3c9a75de66e6d 100644 --- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js @@ -5,3 +5,4 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js index 65238579edced..6f1ce11cdc6f3 100644 --- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js @@ -5,3 +5,4 @@ var C = (function () { return C; }()); exports.C = C; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js index 331c004bd671b..30c63965136d0 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js @@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js index e2cdda8530b4b..14c0c78edb83c 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js @@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js index 212511f2bf59b..b62647beae072 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js @@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js index 35f5adf27f0e8..7480c269a0555 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/a.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js @@ -5,3 +5,4 @@ var A = (function () { return A; }()); exports.A = A; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js index 7b46df97ac3e2..3c9a75de66e6d 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js @@ -5,3 +5,4 @@ var B = (function () { return B; }()); exports.B = B; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js index 65238579edced..6f1ce11cdc6f3 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js @@ -5,3 +5,4 @@ var C = (function () { return C; }()); exports.C = C; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js index 6c49867c908f8..d190c7a5767b1 100644 --- a/tests/baselines/reference/project/declarationDir3/amd/out.js +++ b/tests/baselines/reference/project/declarationDir3/amd/out.js @@ -6,6 +6,7 @@ define("subfolder/b", ["require", "exports"], function (require, exports) { return B; }()); exports.B = B; + exports.__esModule = true; }); define("a", ["require", "exports"], function (require, exports) { "use strict"; @@ -15,6 +16,7 @@ define("a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; + exports.__esModule = true; }); define("subfolder/c", ["require", "exports"], function (require, exports) { "use strict"; @@ -24,4 +26,5 @@ define("subfolder/c", ["require", "exports"], function (require, exports) { return C; }()); exports.C = C; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js index b9390ddc2391f..44111609dca35 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js @@ -3,4 +3,5 @@ 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(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js index d9219f2014872..b3ee7499e44d9 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js @@ -3,3 +3,4 @@ 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(); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js index 7485d0fb22933..b3dc7cc82f223 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js @@ -1,4 +1,5 @@ define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) { "use strict"; exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js index 095acfb7fc983..8d74ebb2b6eb2 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js @@ -1,3 +1,4 @@ "use strict"; var fncOnly_m4 = require("fncOnly_m4"); exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js index 9e8ba0f7ade3e..6f282e2614768 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js @@ -4,4 +4,5 @@ define(["require", "exports", "m4"], function (require, exports, m4) { return new m4.d(); } exports.foo2 = foo2; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js index db9e68fbed929..e9c49cd4ddcec 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js @@ -6,4 +6,5 @@ define(["require", "exports", "m5"], function (require, exports, m5) { return m5.foo2(); } exports.n = n; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js index a7e34c60fe39b..fd0ae21091eee 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js @@ -4,3 +4,4 @@ function foo2() { return new m4.d(); } exports.foo2 = foo2; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js index 2bde79432f7c8..f06725c106869 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js @@ -7,3 +7,4 @@ function n() { return m5.foo2(); } exports.n = n; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js index 0ec3a0d833133..8af4110011c61 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js @@ -15,4 +15,5 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js index 64b9438d96e43..fc6900da8d5d5 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js @@ -17,3 +17,4 @@ 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(); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js index 9e8ba0f7ade3e..6f282e2614768 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js @@ -4,4 +4,5 @@ define(["require", "exports", "m4"], function (require, exports, m4) { return new m4.d(); } exports.foo2 = foo2; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js index cc2eecd22087b..7221b9e2e8f55 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js @@ -13,4 +13,5 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); exports.d = m5.foo2(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js index a7e34c60fe39b..fd0ae21091eee 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js @@ -4,3 +4,4 @@ function foo2() { return new m4.d(); } exports.foo2 = foo2; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js index b4132f79b1ff0..7e7a43ce145d9 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js @@ -15,3 +15,4 @@ var m1; // Do not emit unused import var m5 = require("m5"); exports.d = m5.foo2(); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js index bb607f4b5b089..6b4aa7eeda6a3 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js @@ -11,4 +11,5 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js index 634a988c1b800..1c8e3a5a3082a 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js @@ -12,4 +12,5 @@ define(["require", "exports", "m4"], function (require, exports, m4) { var d3 = m4.d; var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js index 52ecf390373e8..e89a132497cb8 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js @@ -10,3 +10,4 @@ function foo() { return new d(); } exports.foo = foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js index 40df471507c8e..ea2836708d217 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js @@ -12,3 +12,4 @@ var m1; var d3 = m4.d; var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js index 8b73fc550cf0b..eddb9c577a6bc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js @@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js index 3c1d2cd6da654..cbcf36973fddc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js @@ -21,3 +21,4 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js index 8b73fc550cf0b..eddb9c577a6bc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js @@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js index 3c1d2cd6da654..cbcf36973fddc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js @@ -21,3 +21,4 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js index 8b73fc550cf0b..eddb9c577a6bc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js @@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js index 3c1d2cd6da654..cbcf36973fddc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js @@ -21,3 +21,4 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js index 8b73fc550cf0b..eddb9c577a6bc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js @@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js index 3c1d2cd6da654..cbcf36973fddc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js @@ -21,3 +21,4 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js index 8b73fc550cf0b..eddb9c577a6bc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js @@ -21,4 +21,5 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js index 3c1d2cd6da654..cbcf36973fddc 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js @@ -21,3 +21,4 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index 2ccb7d6f77ac0..2ef457654e2f6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index b991eda4382fe..b12b9bfe9bbd3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 2ccb7d6f77ac0..2ef457654e2f6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index b991eda4382fe..b12b9bfe9bbd3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 3dd9960df1406..225b233f3e1bc 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 dce282ee37f08..e924809994328 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index ccf78301cb101..ee9fb6673bed4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 1316ec7465939..9d5330f5c8154 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js index d77e78e375142..62dc8a8d83fa4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js index b663057aeff2e..2d386326fcd6a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index 550fa7b95646b..944360ae9cc37 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js index 76a761b602d2f..e7e1070403f0a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js index 7ad78d4877d27..bd73b1912c293 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index 033b046cfe0d3..aff7400b20fc2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index b663057aeff2e..2d386326fcd6a 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 550fa7b95646b..944360ae9cc37 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index d77e78e375142..62dc8a8d83fa4 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 7ad78d4877d27..bd73b1912c293 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 033b046cfe0d3..aff7400b20fc2 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 76a761b602d2f..e7e1070403f0a 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 29bc22bd61c65..4b75cfaa75405 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 d9151baabe48c..d65b73465ef2b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3017cac2b882f..dd98ae30d59ec 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index 81972e29958d6..c8ece24eda3ad 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js index efdf4bd9a30ef..27d3a9788c460 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js index 5bc656a7470e8..058f9c4c3a524 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index 3017cac2b882f..dd98ae30d59ec 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 81972e29958d6..c8ece24eda3ad 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index efdf4bd9a30ef..27d3a9788c460 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 5bc656a7470e8..058f9c4c3a524 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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 b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js index d3a752a0ee49a..00530261d7682 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 a910ecda80eb3..a30b607676c03 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 13158547401c2..1d0559224b84e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index cc32d33f88f0f..cb628091e33f6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js index 80d76037a7f07..99859780314e2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index 69051eba247e0..541d8dc4c2650 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index 13158547401c2..1d0559224b84e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index cc32d33f88f0f..cb628091e33f6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 80d76037a7f07..99859780314e2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 69051eba247e0..541d8dc4c2650 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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 b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js index d20feb624babc..0f5938617e2c2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 a3532b9e4ce85..173790ea04245 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index d0a6c1f583fae..30cf48ae0ef77 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index b5c226692a074..f7a19e1fa1411 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 961737d6acf96..744aff01a0899 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index d078a80e31c74..edf0e169c568a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 043adb3dd6f17..3f4ebdb191180 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 d8fff48f73ee0..b2efc9bf3d498 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index b40b056b6d90c..f1ed00eb13992 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 bb9e992d47128..95830bd2c255d 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js index bbbb972580d77..9cdad10a9660d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.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 index 7ecd677009dd4..2df791f04e8db 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js index b40eb0dad1266..1d1c53b36cf16 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map \ 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 index 338d724fe93c5..a889d6f19b358 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.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 index 112ae7e706266..83cb52c7f14f8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js index 2786dcd54f30b..9ef0d252f050a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 4d721e1be5dd0..f50e1837a8698 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 6c23883b7abe6..1222f92a7d238 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index a654db8e08792..edafd9055b2df 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index a1d86ff185747..3cfb1b4c03096 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 76f1ae7fa803d..4e054f3269902 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index a98ecd6f1c361..931971b3f841a 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.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 index 01c28031d8a8c..44a6d536eeda7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 ae1d6457599bf..b4f33f056d675 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 826510699a70e..8151fed382b8b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js index f6ab0afdc941f..fe1308aca7eeb 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=../mapFiles/test.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 index 123e89b6c8162..b1a971bd89f12 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js index d96b6cae463a7..e4c81cdfc8e79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=../mapFiles/test.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 index 415eb731ee6bb..df8c82915fbcc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=../../../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 88661b25d1dca..f361c1c091733 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=../../../mapFiles/test.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 index 4c96696726b76..7479c4aebee76 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=../../../mapFiles/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 2e487817c4e0e..7e4f77c1c695b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=../../../mapFiles/test.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 index 1e43585f28104..37af60df3eaca 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 3542da2fe04c7..5721a33f4a544 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index d7fc22ee9b33d..29a43275b499c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js index a9c2e2c54621a..62ec7868d7009 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=../mapFiles/test.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 index 4423220831bd0..debe15abde9f5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js index 291a3630b3ea4..461809c985f5f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=../mapFiles/test.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 index 447f2cb756d9d..09f9886020eb8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index bd2c181d29e92..5eab5555cbe86 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=../../../mapFiles/test.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 index b4b9b2dc7e047..81956eb2903c3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index c162eaa36711e..fd86ae84059f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=../../../mapFiles/test.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 index 23442cdbfa67f..708517a1d9514 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 3096c61023772..a7416c83297ce 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 709115794658e..d1d1f0269e8e3 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index e4c76ba72e2b7..c55d97704369e 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 709115794658e..d1d1f0269e8e3 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index e4c76ba72e2b7..c55d97704369e 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index b1f7d5f7329c3..62e49557aab28 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 eececdeabfdf5..7618a616fa352 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 2cf202bd87109..5df712534f6bf 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 4bdde30882427..6a226fbc86c14 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js index 1e006b165b9a0..587eac860102c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 2141ed5cbb8f2..746d401dc820c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js index 149e213901a1c..e1237d92b8ec9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js index 2e93a073415fc..cfa86d8b53f71 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js index 651782fa42160..e3725479646dd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js index 99135b7b2759a..4737d2e579bc4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 2141ed5cbb8f2..746d401dc820c 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 149e213901a1c..e1237d92b8ec9 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1e006b165b9a0..587eac860102c 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 651782fa42160..e3725479646dd 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 99135b7b2759a..4737d2e579bc4 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 2e93a073415fc..cfa86d8b53f71 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 99da107dfa8df..058227b1276fb 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 6b934e00e04a4..f80ee7e320867 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index b85ad9ab5b153..44d9d5ddc2864 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js index c3300bc7998d5..b4651a0d0dd07 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=http://www.typescriptlang.org/test.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 index 9e79b0167c6eb..5c9cea260f4dd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js index 29b6fee1d6645..693783c4c10d3 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index b85ad9ab5b153..44d9d5ddc2864 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c3300bc7998d5..b4651a0d0dd07 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 9e79b0167c6eb..5c9cea260f4dd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 29b6fee1d6645..693783c4c10d3 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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 b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js index 4b21632bd6cbc..16cec87f1e7e7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 5396cab1d7c10..c7b114195f232 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index c3d36f22356c4..1556b5c5d2f8d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js index 5ec4a04355754..ad7acefc91b45 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js index 8fe6d174601fb..73def0e2583bd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js index 0b258a0b620f3..bb09d33c72bb9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index c3d36f22356c4..1556b5c5d2f8d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 5ec4a04355754..ad7acefc91b45 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 8fe6d174601fb..73def0e2583bd 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 0b258a0b620f3..bb09d33c72bb9 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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 b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js index a58fc69531fe8..cf6d4730e1995 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 308dbbfaa67c8..d1ea7163910a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 709115794658e..d1d1f0269e8e3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index e4c76ba72e2b7..c55d97704369e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 709115794658e..d1d1f0269e8e3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index e4c76ba72e2b7..c55d97704369e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index b1f7d5f7329c3..62e49557aab28 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 26353fdf396cc..33f8f550fbd92 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 2cf202bd87109..5df712534f6bf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 ec57587014d89..a60954292ba87 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js index 1e006b165b9a0..587eac860102c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 2141ed5cbb8f2..746d401dc820c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js index 149e213901a1c..e1237d92b8ec9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js index 2e93a073415fc..cfa86d8b53f71 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js index 651782fa42160..e3725479646dd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js index 99135b7b2759a..4737d2e579bc4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 2141ed5cbb8f2..746d401dc820c 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js index 149e213901a1c..e1237d92b8ec9 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1e006b165b9a0..587eac860102c 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 651782fa42160..e3725479646dd 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js index 99135b7b2759a..4737d2e579bc4 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 2e93a073415fc..cfa86d8b53f71 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 99da107dfa8df..058227b1276fb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 c4facdba9364e..9ca8e953224a8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index b85ad9ab5b153..44d9d5ddc2864 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js index c3300bc7998d5..b4651a0d0dd07 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=http://www.typescriptlang.org/test.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 index 9e79b0167c6eb..5c9cea260f4dd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js index 29b6fee1d6645..693783c4c10d3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js index b85ad9ab5b153..44d9d5ddc2864 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c3300bc7998d5..b4651a0d0dd07 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js index 9e79b0167c6eb..5c9cea260f4dd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 29b6fee1d6645..693783c4c10d3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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 b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js index 4b21632bd6cbc..16cec87f1e7e7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 64c90d05e8808..714b21374005a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index c3d36f22356c4..1556b5c5d2f8d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js index 5ec4a04355754..ad7acefc91b45 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js index 8fe6d174601fb..73def0e2583bd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js index 0b258a0b620f3..bb09d33c72bb9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index c3d36f22356c4..1556b5c5d2f8d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 5ec4a04355754..ad7acefc91b45 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js index 8fe6d174601fb..73def0e2583bd 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# 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/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 0b258a0b620f3..bb09d33c72bb9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# 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 b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js index a58fc69531fe8..cf6d4730e1995 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 6d26d850e1924..a2fff6d9c9070 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js index f2dbc101a5221..90d387773d3e2 100644 --- a/tests/baselines/reference/project/nonRelative/amd/decl.js +++ b/tests/baselines/reference/project/nonRelative/amd/decl.js @@ -4,4 +4,5 @@ define(["require", "exports"], function (require, exports) { return "success"; } exports.call = call; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js index a8619f8826017..4731ff335a3f2 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js @@ -2,4 +2,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; function hello() { } exports.hello = hello; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js index a8619f8826017..4731ff335a3f2 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js @@ -2,4 +2,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; function hello() { } exports.hello = hello; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js index a8619f8826017..4731ff335a3f2 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js @@ -2,4 +2,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; function hello() { } exports.hello = hello; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js index e2d4b03d1c1e1..9bb5f2ac6edff 100644 --- a/tests/baselines/reference/project/nonRelative/node/decl.js +++ b/tests/baselines/reference/project/nonRelative/node/decl.js @@ -3,3 +3,4 @@ function call() { return "success"; } exports.call = call; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js index 182e381bcdec8..819723f983325 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js @@ -1,3 +1,4 @@ "use strict"; function hello() { } exports.hello = hello; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js index 182e381bcdec8..819723f983325 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js @@ -1,3 +1,4 @@ "use strict"; function hello() { } exports.hello = hello; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js index 182e381bcdec8..819723f983325 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js @@ -1,3 +1,4 @@ "use strict"; function hello() { } exports.hello = hello; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js index 125abe99f0e53..e7791f9f3f5f6 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js index 9fdf5b0ad0fcb..90648dbececbc 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,3 +11,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; 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 125abe99f0e53..e7791f9f3f5f6 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 @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); 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 9fdf5b0ad0fcb..90648dbececbc 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 @@ -11,3 +11,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js index 7898180c05028..bc27e650743ab 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 7898180c05028..bc27e650743ab 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js index 125abe99f0e53..e7791f9f3f5f6 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js index 34936dca12554..a56e5f0ea0bdc 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js index ddda2e19133d4..87b3e0b685649 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js @@ -14,4 +14,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js index 9fdf5b0ad0fcb..90648dbececbc 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js @@ -11,3 +11,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js index 5854acba9e287..a355a990939b1 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,3 +11,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js index 77e6fbe68c1b6..313682ec06c76 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js @@ -15,3 +15,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; 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 34936dca12554..a56e5f0ea0bdc 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 @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); 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 index ddda2e19133d4..87b3e0b685649 100644 --- 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 @@ -14,4 +14,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); 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 index 125abe99f0e53..e7791f9f3f5f6 100644 --- 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 @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); 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 5854acba9e287..a355a990939b1 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 @@ -11,3 +11,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; 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 index 77e6fbe68c1b6..313682ec06c76 100644 --- 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 @@ -15,3 +15,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; 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 index 9fdf5b0ad0fcb..90648dbececbc 100644 --- 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 @@ -11,3 +11,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js index ea6ae0a3cd739..5c65bc4968b62 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,4 +46,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js index 34936dca12554..a56e5f0ea0bdc 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js index cd107bb32f2aa..39ac64cda823a 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js @@ -13,4 +13,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js index 5854acba9e287..a355a990939b1 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js @@ -11,3 +11,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js index 912480b74ce98..e12a028abc09b 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js @@ -13,3 +13,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; 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 34936dca12554..a56e5f0ea0bdc 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index cd107bb32f2aa..39ac64cda823a 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,4 +13,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); 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 5854acba9e287..a355a990939b1 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,3 +11,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 912480b74ce98..e12a028abc09b 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,3 +13,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js index 04f9d32831e2d..4c036fa59a178 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,4 +29,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js index 34936dca12554..a56e5f0ea0bdc 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js index 67c8fedf8980e..865896d2602b5 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js @@ -13,4 +13,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js index 5854acba9e287..a355a990939b1 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,3 +11,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js index 0dea10818b9b2..8d4d683ff7c4e 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js @@ -13,3 +13,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; 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 34936dca12554..a56e5f0ea0bdc 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 @@ -12,4 +12,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 67c8fedf8980e..865896d2602b5 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,4 +13,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); 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 5854acba9e287..a355a990939b1 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 @@ -11,3 +11,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 0dea10818b9b2..8d4d683ff7c4e 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,3 +13,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 05ee275fc15e5..7c40db25bb7e4 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,4 +29,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 25cfe0fccb5fa..b89b17f8f86a5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 650c9d1e5d59d..57114f145bd00 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index de21b030c355c..5273d0854a9fe 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 6113c44d85d98..132d98cd87f6f 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# sourceMappingURL=m2.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index efa0bc948ede0..a2caf4c4d27bc 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.js.map \ 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index 84731dff566a8..15438b46b3885 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index efa0bc948ede0..a2caf4c4d27bc 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 41f4a4e252191..1f9e7b8617038 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 121a089af2379..3eb09997f4ff7 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index 84731dff566a8..15438b46b3885 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index eae1115846aec..1ce56f5da036e 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 37064fb583b38..9a2242a8aaac8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 baeea1e93dc19..bd89a9514f26b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index d650b20ae5ffa..7545a7d748117 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 aa0c2ca28b2a1..8718a3a9350e2 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index f55492f4b4988..5f9a96e405e88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 27b41a837a976..af3b647fcab17 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 25cfe0fccb5fa..b89b17f8f86a5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 9a9586bd20ded..5378b914fc796 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index de21b030c355c..5273d0854a9fe 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 16e3437b61c59..cd6b23ddc0f30 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# sourceMappingURL=m2.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js index efa0bc948ede0..a2caf4c4d27bc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.js.map \ 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js index 84731dff566a8..15438b46b3885 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index efa0bc948ede0..a2caf4c4d27bc 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 41f4a4e252191..1f9e7b8617038 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 121a089af2379..3eb09997f4ff7 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index 84731dff566a8..15438b46b3885 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index eae1115846aec..1ce56f5da036e 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 37064fb583b38..9a2242a8aaac8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 4d37f7bfbf5fd..66fd3cfe86711 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index d650b20ae5ffa..7545a7d748117 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 7e83d4cd269e8..a5dcbdc600abe 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index f55492f4b4988..5f9a96e405e88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 223d2cfdad30c..d9e63184a83e2 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 25cfe0fccb5fa..b89b17f8f86a5 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 dce282ee37f08..e924809994328 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index de21b030c355c..5273d0854a9fe 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 1316ec7465939..9d5330f5c8154 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# sourceMappingURL=m2.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js index efa0bc948ede0..a2caf4c4d27bc 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.js.map \ 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js index 84731dff566a8..15438b46b3885 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index efa0bc948ede0..a2caf4c4d27bc 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 41f4a4e252191..1f9e7b8617038 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 121a089af2379..3eb09997f4ff7 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index 84731dff566a8..15438b46b3885 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index eae1115846aec..1ce56f5da036e 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 37064fb583b38..9a2242a8aaac8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 d9151baabe48c..d65b73465ef2b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index d650b20ae5ffa..7545a7d748117 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 a910ecda80eb3..a30b607676c03 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index f55492f4b4988..5f9a96e405e88 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 a3532b9e4ce85..173790ea04245 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# 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 index 25cfe0fccb5fa..b89b17f8f86a5 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 26353fdf396cc..33f8f550fbd92 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index de21b030c355c..5273d0854a9fe 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -22,6 +22,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); /// /// 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 ec57587014d89..a60954292ba87 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js index 41f4a4e252191..1f9e7b8617038 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# sourceMappingURL=m2.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js index efa0bc948ede0..a2caf4c4d27bc 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.js.map \ 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 index eae1115846aec..1ce56f5da036e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js index 84731dff566a8..15438b46b3885 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index efa0bc948ede0..a2caf4c4d27bc 100644 --- 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 @@ -14,5 +14,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 41f4a4e252191..1f9e7b8617038 100644 --- 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 @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); //# 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/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js index 121a089af2379..3eb09997f4ff7 100644 --- 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 @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file 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 index 84731dff566a8..15438b46b3885 100644 --- 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 @@ -15,4 +15,5 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; +exports.__esModule = true; //# 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/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index eae1115846aec..1ce56f5da036e 100644 --- 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 @@ -11,4 +11,5 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; +exports.__esModule = true; //# sourceMappingURL=m2.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 index 37064fb583b38..9a2242a8aaac8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; @@ -27,6 +28,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; + exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; @@ -44,5 +46,6 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; + exports.__esModule = true; }); //# 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 c4facdba9364e..9ca8e953224a8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c4b7f56d76afc..b1cc860a9870b 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index fea4b619aa26a..456acd3a25640 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index d650b20ae5ffa..7545a7d748117 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 64c90d05e8808..714b21374005a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index bb59c6fbd9099..f42866a661398 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -12,5 +12,6 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 0ad51aeb02ec4..601d3a94662be 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -13,5 +13,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# sourceMappingURL=test.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 index 121a089af2379..3eb09997f4ff7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -11,4 +11,5 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; +exports.__esModule = true; //# sourceMappingURL=m1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index ebd5fdb3b3f27..074abf07716b2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -13,4 +13,5 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; +exports.__esModule = true; //# sourceMappingURL=test.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 index f55492f4b4988..5f9a96e405e88 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -12,6 +12,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; + exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; @@ -28,5 +29,6 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; + exports.__esModule = true; }); //# 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 6d26d850e1924..a2fff6d9c9070 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js index a40f7b2f9cdb5..d80da6d9e1b73 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js @@ -15,4 +15,5 @@ define(["require", "exports"], function (require, exports) { return RM; }()); exports.RM = RM; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js index c537ef5435289..a07a323df50fb 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js @@ -14,3 +14,4 @@ var RM = (function () { return RM; }()); exports.RM = RM; +exports.__esModule = true; diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js index d9a75d968488e..8dc10349c9025 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js +++ b/tests/baselines/reference/sourceMapValidationImport.js @@ -23,4 +23,5 @@ var a = m.c; exports.b = m.c; var x = new a(); var y = new exports.b(); +exports.__esModule = true; //# sourceMappingURL=sourceMapValidationImport.js.map \ No newline at end of file diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js index 81d3c4a1e4f05..7cfdf18006354 100644 --- a/tests/baselines/reference/topLevelLambda4.js +++ b/tests/baselines/reference/topLevelLambda4.js @@ -6,4 +6,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; var _this = this; exports.x = function () { return _this.window; }; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js index b6b17292c1261..54ceb0250e182 100644 --- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js +++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js @@ -16,4 +16,5 @@ MyClass = __decorate([ ], MyClass); exports.MyClass = MyClass; var _a; +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=file.js.map \ No newline at end of file From 9a65a6642315d014c8a132a068f80ceaf71b7ac7 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Sat, 4 Feb 2017 22:46:38 -0800 Subject: [PATCH 045/116] Fix linter error --- src/compiler/visitor.ts | 2 +- src/services/transform.ts | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/services/transform.ts diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts index 63c3726fc103a..fd2b0314dda74 100644 --- a/src/compiler/visitor.ts +++ b/src/compiler/visitor.ts @@ -587,7 +587,7 @@ namespace ts { } if (visited) { if (isArray(visited)) { - for (let visitedNode of visited) { + for (const visitedNode of visited) { Debug.assertNode(visitedNode, test); aggregateTransformFlags(visitedNode); updated.push(visitedNode); diff --git a/src/services/transform.ts b/src/services/transform.ts new file mode 100644 index 0000000000000..c9107eea8534d --- /dev/null +++ b/src/services/transform.ts @@ -0,0 +1,29 @@ +/// +/// +namespace ts { + /** + * Transform one or more source files using the supplied transformers. + * @param source A `SourceFile` or an array of `SourceFiles`. + * @param transformers An array of `Transformer` callbacks used to process the transformation. + */ + export function transform(source: SourceFile | SourceFile[], transformers: Transformer[]) { + const diagnostics: Diagnostic[] = []; + const compilerOptions: CompilerOptions = {}; + const sourceFiles = isArray(source) ? source : [source]; + const fileMap = arrayToMap(sourceFiles, sourceFile => sourceFile.fileName); + const emitHost: EmitHost = { + getCompilerOptions: () => compilerOptions, + getCanonicalFileName: fileName => fileName, + getCommonSourceDirectory: () => "", + getCurrentDirectory: () => "", + getNewLine: () => "\n", + getSourceFile: fileName => fileMap.get(fileName), + getSourceFileByPath: fileName => fileMap.get(fileName), + getSourceFiles: () => sourceFiles, + isSourceFileFromExternalLibrary: () => false, + isEmitBlocked: () => false, + writeFile: () => Debug.fail("'writeFile()' is not supported during transformation.") + }; + return transformFiles(/*resolver*/ undefined, emitHost, sourceFiles, transformers); + } +} \ No newline at end of file From b830dea36267bd763a9461b6955f798dd5e0429e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 5 Feb 2017 13:20:10 -0800 Subject: [PATCH 046/116] Clean up SymbolFlags, introduce CheckFlags in TransientSymbol --- src/compiler/checker.ts | 137 +++++++++++++----------------- src/compiler/types.ts | 76 +++++++++-------- src/services/findAllReferences.ts | 2 +- src/services/symbolDisplay.ts | 2 +- 4 files changed, 102 insertions(+), 115 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b5306771dd7f7..a0878b47ebb2d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -60,9 +60,9 @@ namespace ts { const emitResolver = createResolver(); - const undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined"); + const undefinedSymbol = createSymbol(SymbolFlags.Property, "undefined"); undefinedSymbol.declarations = []; - const argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments"); + const argumentsSymbol = createSymbol(SymbolFlags.Property, "arguments"); const checker: TypeChecker = { getNodeCount: () => sum(host.getSourceFiles(), "nodeCount"), @@ -131,8 +131,8 @@ namespace ts { const indexedAccessTypes = createMap(); const evolvingArrayTypes: EvolvingArrayType[] = []; - const unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown"); - const resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__"); + const unknownSymbol = createSymbol(SymbolFlags.Property, "unknown"); + const resolvingSymbol = createSymbol(0, "__resolving__"); const anyType = createIntrinsicType(TypeFlags.Any, "any"); const autoType = createIntrinsicType(TypeFlags.Any, "any"); @@ -154,7 +154,7 @@ namespace ts { const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined); - const emptyTypeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral | SymbolFlags.Transient, "__type"); + const emptyTypeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type"); emptyTypeLiteralSymbol.members = createMap(); const emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined); @@ -416,9 +416,11 @@ namespace ts { diagnostics.add(diagnostic); } - function createSymbol(flags: SymbolFlags, name: string): Symbol { + function createSymbol(flags: SymbolFlags, name: string) { symbolCount++; - return new Symbol(flags, name); + const symbol = (new Symbol(flags | SymbolFlags.Transient, name)); + symbol.checkFlags = 0; + return symbol; } function getExcludedSymbolFlags(flags: SymbolFlags): SymbolFlags { @@ -451,7 +453,7 @@ namespace ts { } function cloneSymbol(symbol: Symbol): Symbol { - const result = createSymbol(symbol.flags | SymbolFlags.Merged, symbol.name); + const result = createSymbol(symbol.flags, symbol.name); result.declarations = symbol.declarations.slice(0); result.parent = symbol.parent; if (symbol.valueDeclaration) result.valueDeclaration = symbol.valueDeclaration; @@ -508,7 +510,7 @@ namespace ts { target.set(id, sourceSymbol); } else { - if (!(targetSymbol.flags & SymbolFlags.Merged)) { + if (!(targetSymbol.flags & SymbolFlags.Transient)) { targetSymbol = cloneSymbol(targetSymbol); target.set(id, targetSymbol); } @@ -545,7 +547,7 @@ namespace ts { if (mainModule.flags & SymbolFlags.Namespace) { // if module symbol has already been merged - it is safe to use it. // otherwise clone it - mainModule = mainModule.flags & SymbolFlags.Merged ? mainModule : cloneSymbol(mainModule); + mainModule = mainModule.flags & SymbolFlags.Transient ? mainModule : cloneSymbol(mainModule); mergeSymbol(mainModule, moduleAugmentation.symbol); } else { @@ -586,6 +588,10 @@ namespace ts { return type.flags & TypeFlags.Object ? (type).objectFlags : 0; } + function getCheckFlags(symbol: Symbol): CheckFlags { + return symbol.flags & SymbolFlags.Transient ? (symbol).checkFlags : 0; + } + function isGlobalSourceFile(node: Node) { return node.kind === SyntaxKind.SourceFile && !isExternalOrCommonJsModule(node); } @@ -594,7 +600,7 @@ namespace ts { if (meaning) { const symbol = symbols.get(name); if (symbol) { - Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here."); + Debug.assert((getCheckFlags(symbol) & CheckFlags.Instantiated) === 0, "Should never get an instantiated symbol here."); if (symbol.flags & meaning) { return symbol; } @@ -1426,7 +1432,7 @@ namespace ts { else { Debug.fail("Unknown entity name kind."); } - Debug.assert((symbol.flags & SymbolFlags.Instantiated) === 0, "Should never get an instantiated symbol here."); + Debug.assert((getCheckFlags(symbol) & CheckFlags.Instantiated) === 0, "Should never get an instantiated symbol here."); return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol); } @@ -1670,23 +1676,7 @@ namespace ts { } function symbolIsValue(symbol: Symbol): boolean { - // If it is an instantiated symbol, then it is a value if the symbol it is an - // instantiation of is a value. - if (symbol.flags & SymbolFlags.Instantiated) { - return symbolIsValue(getSymbolLinks(symbol).target); - } - - // If the symbol has the value flag, it is trivially a value. - if (symbol.flags & SymbolFlags.Value) { - return true; - } - - // If it is an alias, then it is a value if the symbol it resolves to is a value. - if (symbol.flags & SymbolFlags.Alias) { - return (resolveAlias(symbol).flags & SymbolFlags.Value) !== 0; - } - - return false; + return !!(symbol.flags & SymbolFlags.Value || symbol.flags & SymbolFlags.Alias && resolveAlias(symbol).flags & SymbolFlags.Value); } function findConstructorDeclaration(node: ClassLikeDeclaration): ConstructorDeclaration { @@ -2238,7 +2228,7 @@ namespace ts { if (parentSymbol) { // Write type arguments of instantiated class/interface here if (flags & SymbolFormatFlags.WriteTypeParametersOrArguments) { - if (symbol.flags & SymbolFlags.Instantiated) { + if (getCheckFlags(symbol) & CheckFlags.Instantiated) { buildDisplayForTypeArgumentsAndDelimiters(getTypeParametersOfClassOrInterface(parentSymbol), (symbol).mapper, writer, enclosingDeclaration); } @@ -3411,8 +3401,8 @@ namespace ts { } const text = getTextOfPropertyName(name); - const flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0); - const symbol = createSymbol(flags, text); + const flags = SymbolFlags.Property | (e.initializer ? SymbolFlags.Optional : 0); + const symbol = createSymbol(flags, text); symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors); symbol.bindingElement = e; members.set(symbol.name, symbol); @@ -3721,7 +3711,7 @@ namespace ts { } function getTypeOfSymbol(symbol: Symbol): Type { - if (symbol.flags & SymbolFlags.Instantiated) { + if (getCheckFlags(symbol) & CheckFlags.Instantiated) { return getTypeOfInstantiatedSymbol(symbol); } if (symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property)) { @@ -4519,7 +4509,7 @@ namespace ts { s = cloneSignature(signature); if (forEach(unionSignatures, sig => sig.thisParameter)) { const thisType = getUnionType(map(unionSignatures, sig => getTypeOfSymbol(sig.thisParameter) || anyType), /*subtypeReduction*/ true); - s.thisParameter = createTransientSymbol(signature.thisParameter, thisType); + s.thisParameter = createSymbolWithType(signature.thisParameter, thisType); } // Clear resolved return type we possibly got from cloneSignature s.resolvedReturnType = undefined; @@ -4716,9 +4706,9 @@ namespace ts { const propName = (t).text; const modifiersProp = getPropertyOfType(modifiersType, propName); const isOptional = templateOptional || !!(modifiersProp && modifiersProp.flags & SymbolFlags.Optional); - const prop = createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName); + const prop = createSymbol(SymbolFlags.Property | (isOptional ? SymbolFlags.Optional : 0), propName); + prop.checkFlags = templateReadonly || modifiersProp && isReadonlySymbol(modifiersProp) ? CheckFlags.Readonly : 0; prop.type = propType; - prop.isReadonly = templateReadonly || modifiersProp && isReadonlySymbol(modifiersProp); if (propertySymbol) { prop.mappedTypeOrigin = propertySymbol; } @@ -4954,8 +4944,7 @@ namespace ts { let props: Symbol[]; // Flags we want to propagate to the result if they exist in all source symbols let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None; - let isReadonly = false; - let isPartial = false; + let checkFlags = CheckFlags.SyntheticProperty; for (const current of types) { const type = getApparentType(current); if (type !== unknownType) { @@ -4969,25 +4958,23 @@ namespace ts { props.push(prop); } if (isReadonlySymbol(prop)) { - isReadonly = true; + checkFlags |= CheckFlags.Readonly; } - } else if (containingType.flags & TypeFlags.Union) { - isPartial = true; + checkFlags |= CheckFlags.Partial; } } } if (!props) { return undefined; } - if (props.length === 1 && !isPartial) { + if (props.length === 1 && !(checkFlags & CheckFlags.Partial)) { return props[0]; } const propTypes: Type[] = []; const declarations: Declaration[] = []; let commonType: Type = undefined; - let hasNonUniformType = false; for (const prop of props) { if (prop.declarations) { addRange(declarations, prop.declarations); @@ -4997,16 +4984,14 @@ namespace ts { commonType = type; } else if (type !== commonType) { - hasNonUniformType = true; + checkFlags |= CheckFlags.HasNonUniformType; } propTypes.push(type); } - const result = createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | commonFlags, name); + const result = createSymbol(SymbolFlags.Property | commonFlags, name); + result.checkFlags = checkFlags; result.containingType = containingType; - result.hasNonUniformType = hasNonUniformType; - result.isPartial = isPartial; result.declarations = declarations; - result.isReadonly = isReadonly; result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes); return result; } @@ -5031,7 +5016,7 @@ namespace ts { function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: string): Symbol { const property = getUnionOrIntersectionProperty(type, name); // We need to filter out partial properties in union types - return property && !(property.flags & SymbolFlags.SyntheticProperty && (property).isPartial) ? property : undefined; + return property && !(getCheckFlags(property) & CheckFlags.Partial) ? property : undefined; } /** @@ -5835,7 +5820,7 @@ namespace ts { for (let i = 0; i < arity; i++) { const typeParameter = createType(TypeFlags.TypeParameter); typeParameters.push(typeParameter); - const property = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "" + i); + const property = createSymbol(SymbolFlags.Property, "" + i); property.type = typeParameter; properties.push(property); } @@ -6419,13 +6404,13 @@ namespace ts { const rightType = getTypeOfSymbol(rightProp); if (maybeTypeOfKind(rightType, TypeFlags.Undefined) || rightProp.flags & SymbolFlags.Optional) { const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations); - const flags = SymbolFlags.Property | SymbolFlags.Transient | (leftProp.flags & SymbolFlags.Optional); - const result = createSymbol(flags, leftProp.name); + const flags = SymbolFlags.Property | (leftProp.flags & SymbolFlags.Optional); + const result = createSymbol(flags, leftProp.name); + result.checkFlags = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp) ? CheckFlags.Readonly : 0; result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, TypeFacts.NEUndefined)]); result.leftSpread = leftProp; result.rightSpread = rightProp; result.declarations = declarations; - result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp); members.set(leftProp.name, result); } } @@ -6752,7 +6737,7 @@ namespace ts { } function instantiateSymbol(symbol: Symbol, mapper: TypeMapper): Symbol { - if (symbol.flags & SymbolFlags.Instantiated) { + if (getCheckFlags(symbol) & CheckFlags.Instantiated) { const links = getSymbolLinks(symbol); // If symbol being instantiated is itself a instantiation, fetch the original target and combine the // type mappers. This ensures that original type identities are properly preserved and that aliases @@ -6760,10 +6745,10 @@ namespace ts { symbol = links.target; mapper = combineTypeMappers(links.mapper, mapper); } - // Keep the flags from the symbol we're instantiating. Mark that is instantiated, and // also transient so that we can just store data on it directly. - const result = createSymbol(SymbolFlags.Instantiated | SymbolFlags.Transient | symbol.flags, symbol.name); + const result = createSymbol(symbol.flags, symbol.name); + result.checkFlags = CheckFlags.Instantiated; result.declarations = symbol.declarations; result.parent = symbol.parent; result.target = symbol; @@ -6771,7 +6756,6 @@ namespace ts { if (symbol.valueDeclaration) { result.valueDeclaration = symbol.valueDeclaration; } - return result; } @@ -8561,8 +8545,8 @@ namespace ts { getSignaturesOfType(type, SignatureKind.Construct).length === 0; } - function createTransientSymbol(source: Symbol, type: Type) { - const symbol = createSymbol(source.flags | SymbolFlags.Transient, source.name); + function createSymbolWithType(source: Symbol, type: Type) { + const symbol = createSymbol(source.flags, source.name); symbol.declarations = source.declarations; symbol.parent = source.parent; symbol.type = type; @@ -8578,7 +8562,7 @@ namespace ts { for (const property of getPropertiesOfObjectType(type)) { const original = getTypeOfSymbol(property); const updated = f(original); - members.set(property.name, updated === original ? property : createTransientSymbol(property, updated)); + members.set(property.name, updated === original ? property : createSymbolWithType(property, updated)); }; return members; } @@ -8816,10 +8800,10 @@ namespace ts { if (!inferredPropType) { return undefined; } - const inferredProp = createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & optionalMask, prop.name); + const inferredProp = createSymbol(SymbolFlags.Property | prop.flags & optionalMask, prop.name); + inferredProp.checkFlags = readonlyMask && isReadonlySymbol(prop) ? CheckFlags.Readonly : 0; inferredProp.declarations = prop.declarations; inferredProp.type = inferredPropType; - inferredProp.isReadonly = readonlyMask && isReadonlySymbol(prop); members.set(prop.name, inferredProp); } if (indexInfo) { @@ -9301,9 +9285,9 @@ namespace ts { function isDiscriminantProperty(type: Type, name: string) { if (type && type.flags & TypeFlags.Union) { const prop = getUnionOrIntersectionProperty(type, name); - if (prop && prop.flags & SymbolFlags.SyntheticProperty) { + if (prop && getCheckFlags(prop) & CheckFlags.SyntheticProperty) { if ((prop).isDiscriminantProperty === undefined) { - (prop).isDiscriminantProperty = (prop).hasNonUniformType && isLiteralType(getTypeOfSymbol(prop)); + (prop).isDiscriminantProperty = (prop).checkFlags & CheckFlags.HasNonUniformType && isLiteralType(getTypeOfSymbol(prop)); } return (prop).isDiscriminantProperty; } @@ -11760,7 +11744,7 @@ namespace ts { } typeFlags |= type.flags; - const prop = createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name); + const prop = createSymbol(SymbolFlags.Property | member.flags, member.name); if (inDestructuringPattern) { // If object literal is an assignment pattern and if the assignment pattern specifies a default value // for the property, make the property optional. @@ -12533,9 +12517,8 @@ namespace ts { noUnusedIdentifiers && (prop.flags & SymbolFlags.ClassMember) && prop.valueDeclaration && (getModifierFlags(prop.valueDeclaration) & ModifierFlags.Private)) { - if (prop.flags & SymbolFlags.Instantiated) { + if (getCheckFlags(prop) & CheckFlags.Instantiated) { getSymbolLinks(prop).target.isReferenced = true; - } else { prop.isReferenced = true; @@ -14099,7 +14082,7 @@ namespace ts { const parameter = signature.thisParameter; if (!parameter || parameter.valueDeclaration && !(parameter.valueDeclaration).type) { if (!parameter) { - signature.thisParameter = createTransientSymbol(context.thisParameter, undefined); + signature.thisParameter = createSymbolWithType(context.thisParameter, undefined); } assignTypeToParameterAndFixTypeParameters(signature.thisParameter, getTypeOfSymbol(context.thisParameter), mapper); } @@ -14541,11 +14524,11 @@ namespace ts { // Get accessors without matching set accessors // Enum members // Unions and intersections of the above (unions and intersections eagerly set isReadonly on creation) - return symbol.isReadonly || - symbol.flags & SymbolFlags.Property && (getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.Readonly) !== 0 || - symbol.flags & SymbolFlags.Variable && (getDeclarationNodeFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 || + return !!(getCheckFlags(symbol) & CheckFlags.Readonly || + symbol.flags & SymbolFlags.Property && getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.Readonly || + symbol.flags & SymbolFlags.Variable && getDeclarationNodeFlagsFromSymbol(symbol) & NodeFlags.Const || symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor) || - (symbol.flags & SymbolFlags.EnumMember) !== 0; + symbol.flags & SymbolFlags.EnumMember); } function isReferenceToReadonlyEntity(expr: Expression, symbol: Symbol): boolean { @@ -18551,7 +18534,7 @@ namespace ts { function getTargetSymbol(s: Symbol) { // if symbol is instantiated its flags are not copied from the 'target' // so we'll need to get back original 'target' symbol to work with correct set of flags - return s.flags & SymbolFlags.Instantiated ? getSymbolLinks(s).target : s; + return getCheckFlags(s) & CheckFlags.Instantiated ? (s).target : s; } function getClassLikeDeclarationOfSymbol(symbol: Symbol): Declaration { @@ -19129,7 +19112,7 @@ namespace ts { // We can detect if augmentation was applied using following rules: // - augmentation for a global scope is always applied // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). - const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Merged); + const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Transient); if (checkBody && node.body) { // body of ambient external module is always a module block for (const statement of (node.body).statements) { @@ -19208,7 +19191,7 @@ namespace ts { // this is done it two steps // 1. quick check - if symbol for node is not merged - this is local symbol to this augmentation - report error // 2. main check - report error if value declaration of the parent symbol is module augmentation) - let reportError = !(symbol.flags & SymbolFlags.Merged); + let reportError = !(symbol.flags & SymbolFlags.Transient); if (!reportError) { // symbol should not originate in augmentation reportError = isExternalModuleAugmentation(symbol.parent.declarations[0]); @@ -20310,7 +20293,7 @@ namespace ts { } function getRootSymbols(symbol: Symbol): Symbol[] { - if (symbol.flags & SymbolFlags.SyntheticProperty) { + if (getCheckFlags(symbol) & CheckFlags.SyntheticProperty) { const symbols: Symbol[] = []; const name = symbol.name; forEach(getSymbolLinks(symbol).containingType.types, t => { @@ -21061,7 +21044,7 @@ namespace ts { function createThenableType() { // build the thenable type that is used to verify against a non-promise "thenable" operand to `await`. - const thenPropertySymbol = createSymbol(SymbolFlags.Transient | SymbolFlags.Property, "then"); + const thenPropertySymbol = createSymbol(SymbolFlags.Property, "then"); getSymbolLinks(thenPropertySymbol).type = globalFunctionType; const thenableType = createObjectType(ObjectFlags.Anonymous); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 8660e6138cdad..6912931be6577 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2600,37 +2600,34 @@ export const enum SymbolFlags { None = 0, - FunctionScopedVariable = 0x00000001, // Variable (var) or parameter - BlockScopedVariable = 0x00000002, // A block-scoped variable (let or const) - Property = 0x00000004, // Property or enum member - EnumMember = 0x00000008, // Enum member - Function = 0x00000010, // Function - Class = 0x00000020, // Class - Interface = 0x00000040, // Interface - ConstEnum = 0x00000080, // Const enum - RegularEnum = 0x00000100, // Enum - ValueModule = 0x00000200, // Instantiated module - NamespaceModule = 0x00000400, // Uninstantiated module - TypeLiteral = 0x00000800, // Type Literal or mapped type - ObjectLiteral = 0x00001000, // Object Literal - Method = 0x00002000, // Method - Constructor = 0x00004000, // Constructor - GetAccessor = 0x00008000, // Get accessor - SetAccessor = 0x00010000, // Set accessor - Signature = 0x00020000, // Call, construct, or index signature - TypeParameter = 0x00040000, // Type parameter - TypeAlias = 0x00080000, // Type alias - ExportValue = 0x00100000, // Exported value marker (see comment in declareModuleMember in binder) - ExportType = 0x00200000, // Exported type marker (see comment in declareModuleMember in binder) - ExportNamespace = 0x00400000, // Exported namespace marker (see comment in declareModuleMember in binder) - Alias = 0x00800000, // An alias for another symbol (see comment in isAliasSymbolDeclaration in checker) - Instantiated = 0x01000000, // Instantiated symbol - Merged = 0x02000000, // Merged symbol (created during program binding) - Transient = 0x04000000, // Transient symbol (created during type check) - Prototype = 0x08000000, // Prototype property (no source representation) - SyntheticProperty = 0x10000000, // Property in union or intersection type - Optional = 0x20000000, // Optional property - ExportStar = 0x40000000, // Export * declaration + FunctionScopedVariable = 1 << 0, // Variable (var) or parameter + BlockScopedVariable = 1 << 1, // A block-scoped variable (let or const) + Property = 1 << 2, // Property or enum member + EnumMember = 1 << 3, // Enum member + Function = 1 << 4, // Function + Class = 1 << 5, // Class + Interface = 1 << 6, // Interface + ConstEnum = 1 << 7, // Const enum + RegularEnum = 1 << 8, // Enum + ValueModule = 1 << 9, // Instantiated module + NamespaceModule = 1 << 10, // Uninstantiated module + TypeLiteral = 1 << 11, // Type Literal or mapped type + ObjectLiteral = 1 << 12, // Object Literal + Method = 1 << 13, // Method + Constructor = 1 << 14, // Constructor + GetAccessor = 1 << 15, // Get accessor + SetAccessor = 1 << 16, // Set accessor + Signature = 1 << 17, // Call, construct, or index signature + TypeParameter = 1 << 18, // Type parameter + TypeAlias = 1 << 19, // Type alias + ExportValue = 1 << 20, // Exported value marker (see comment in declareModuleMember in binder) + ExportType = 1 << 21, // Exported type marker (see comment in declareModuleMember in binder) + ExportNamespace = 1 << 22, // Exported namespace marker (see comment in declareModuleMember in binder) + Alias = 1 << 23, // An alias for another symbol (see comment in isAliasSymbolDeclaration in checker) + Prototype = 1 << 24, // Prototype property (no source representation) + ExportStar = 1 << 25, // Export * declaration + Optional = 1 << 26, // Optional property + Transient = 1 << 27, // Transient symbol (created during type check) Enum = RegularEnum | ConstEnum, Variable = FunctionScopedVariable | BlockScopedVariable, @@ -2690,11 +2687,9 @@ name: string; // Name of symbol declarations?: Declaration[]; // Declarations associated with this symbol valueDeclaration?: Declaration; // First value declaration of the symbol - members?: SymbolTable; // Class, interface or literal instance members exports?: SymbolTable; // Module exports globalExports?: SymbolTable; // Conditional global UMD exports - /* @internal */ isReadonly?: boolean; // readonly? (set only for intersections and unions) /* @internal */ id?: number; // Unique id (used to look up SymbolLinks) /* @internal */ mergeId?: number; // Merge id (used to look up merged symbol) /* @internal */ parent?: Symbol; // Parent symbol @@ -2719,8 +2714,6 @@ leftSpread?: Symbol; // Left source for synthetic spread property rightSpread?: Symbol; // Right source for synthetic spread property mappedTypeOrigin?: Symbol; // For a property on a mapped type, points back to the orignal 'T' from 'keyof T'. - hasNonUniformType?: boolean; // True if constituents have non-uniform types - isPartial?: boolean; // True if syntheric property of union type occurs in some but not all constituents isDiscriminantProperty?: boolean; // True if discriminant synthetic property resolvedExports?: SymbolTable; // Resolved exports of module exportsChecked?: boolean; // True if exports of external module have been checked @@ -2730,7 +2723,18 @@ } /* @internal */ - export interface TransientSymbol extends Symbol, SymbolLinks { } + export const enum CheckFlags { + Instantiated = 1 << 0, // Instantiated symbol + SyntheticProperty = 1 << 1, // Property in union or intersection type + Readonly = 1 << 2, // Readonly transient symbol + Partial = 1 << 3, // Property present in some but not all constituents + HasNonUniformType = 1 << 4, // Constituents have non-uniform types + } + + /* @internal */ + export interface TransientSymbol extends Symbol, SymbolLinks { + checkFlags: CheckFlags; + } export type SymbolTable = Map; diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index 28474839cf3c9..cbdaff830ce26 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -277,7 +277,7 @@ namespace ts.FindAllReferences { // if this symbol is visible from its parent container, e.g. exported, then bail out // if symbol correspond to the union property - bail out - if (symbol.parent || (symbol.flags & SymbolFlags.SyntheticProperty)) { + if (symbol.parent || (symbol.flags & SymbolFlags.Transient && (symbol).checkFlags & CheckFlags.SyntheticProperty)) { return undefined; } diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts index b32bd8f331d4f..58c83de850993 100644 --- a/src/services/symbolDisplay.ts +++ b/src/services/symbolDisplay.ts @@ -51,7 +51,7 @@ namespace ts.SymbolDisplay { if (flags & SymbolFlags.Constructor) return ScriptElementKind.constructorImplementationElement; if (flags & SymbolFlags.Property) { - if (flags & SymbolFlags.SyntheticProperty) { + if (flags & SymbolFlags.Transient && (symbol).checkFlags & CheckFlags.SyntheticProperty) { // If union property is result of union of non method (property/accessors/variables), it is labeled as property const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => { const rootSymbolFlags = rootSymbol.getFlags(); From 914150f2f19583b40be46663628e9bbe3c66b2f4 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Sun, 5 Feb 2017 15:18:27 -0800 Subject: [PATCH 047/116] Widen special JS property declarations to match regular property declarations --- src/compiler/checker.ts | 40 ++++++++++++------- .../jsFileClassPropertyType.errors.txt | 17 ++++++++ .../jsFileClassPropertyType2.errors.txt | 18 +++++++++ .../reference/multipleDeclarations.types | 2 +- ...naturesUseJSDocForOptionalParameters.types | 30 +++++++------- .../cases/compiler/jsFileClassPropertyType.ts | 13 ++++++ .../compiler/jsFileClassPropertyType2.ts | 14 +++++++ .../getJavaScriptSyntacticDiagnostics24.ts | 2 +- 8 files changed, 104 insertions(+), 32 deletions(-) create mode 100644 tests/baselines/reference/jsFileClassPropertyType.errors.txt create mode 100644 tests/baselines/reference/jsFileClassPropertyType2.errors.txt create mode 100644 tests/cases/compiler/jsFileClassPropertyType.ts create mode 100644 tests/cases/compiler/jsFileClassPropertyType2.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b5306771dd7f7..10c5f5422e3f7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3254,7 +3254,7 @@ namespace ts { type; } - function getTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration) { + function getTypeForDeclarationFromJSDocComment(declaration: Node ) { const jsdocType = getJSDocType(declaration); if (jsdocType) { return getTypeFromTypeNode(jsdocType); @@ -3282,7 +3282,7 @@ namespace ts { // If this is a variable in a JavaScript file, then use the JSDoc type (if it has // one as its type), otherwise fallback to the below standard TS codepaths to // try to figure it out. - const type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration); + const type = getTypeForDeclarationFromJSDocComment(declaration); if (type && type !== unknownType) { return type; } @@ -3377,6 +3377,27 @@ namespace ts { return undefined; } + // Return the inferred type for a variable, parameter, or property declaration + function getWidenedTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type { + const expression = declaration.kind === SyntaxKind.BinaryExpression ? declaration : + declaration.kind === SyntaxKind.PropertyAccessExpression ? getAncestor(declaration, SyntaxKind.BinaryExpression) : + undefined; + + if (!expression) { + return unknownType; + } + + if (expression.flags & NodeFlags.JavaScriptFile) { + // If there is a JSDoc type, use it + const type = getTypeForDeclarationFromJSDocComment(expression.parent); + if (type && type !== unknownType) { + return getWidenedType(type); + } + } + + return getWidenedType(getWidenedLiteralType(checkExpressionCached(expression.right))); + } + // Return the type implied by a binding pattern element. This is the type of the initializer of the element if // one is present. Otherwise, if the element is itself a binding pattern, it is the type implied by the binding // pattern. Otherwise, it is the type any. @@ -3531,18 +3552,7 @@ namespace ts { // * className.prototype.method = expr if (declaration.kind === SyntaxKind.BinaryExpression || declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) { - // Use JS Doc type if present on parent expression statement - if (declaration.flags & NodeFlags.JavaScriptFile) { - const jsdocType = getJSDocType(declaration.parent); - if (jsdocType) { - return links.type = getTypeFromTypeNode(jsdocType); - } - } - const declaredTypes = map(symbol.declarations, - decl => decl.kind === SyntaxKind.BinaryExpression ? - checkExpressionCached((decl).right) : - checkExpressionCached((decl.parent).right)); - type = getUnionType(declaredTypes, /*subtypeReduction*/ true); + type = getUnionType(map(symbol.declarations, getWidenedTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true); } else { type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true); @@ -3585,7 +3595,7 @@ namespace ts { const setter = getDeclarationOfKind(symbol, SyntaxKind.SetAccessor); if (getter && getter.flags & NodeFlags.JavaScriptFile) { - const jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter); + const jsDocType = getTypeForDeclarationFromJSDocComment(getter); if (jsDocType) { return links.type = jsDocType; } diff --git a/tests/baselines/reference/jsFileClassPropertyType.errors.txt b/tests/baselines/reference/jsFileClassPropertyType.errors.txt new file mode 100644 index 0000000000000..f37671757104e --- /dev/null +++ b/tests/baselines/reference/jsFileClassPropertyType.errors.txt @@ -0,0 +1,17 @@ +tests/cases/compiler/bar.ts(2,1): error TS2322: Type '"string"' is not assignable to type 'number'. + + +==== tests/cases/compiler/foo.js (0 errors) ==== + + class C { + constructor () { + this.p = 0; + } + } + +==== tests/cases/compiler/bar.ts (1 errors) ==== + + (new C()).p = "string"; + ~~~~~~~~~~~ +!!! error TS2322: Type '"string"' is not assignable to type 'number'. + \ No newline at end of file diff --git a/tests/baselines/reference/jsFileClassPropertyType2.errors.txt b/tests/baselines/reference/jsFileClassPropertyType2.errors.txt new file mode 100644 index 0000000000000..d0d138f7f4833 --- /dev/null +++ b/tests/baselines/reference/jsFileClassPropertyType2.errors.txt @@ -0,0 +1,18 @@ +tests/cases/compiler/bar.ts(2,18): error TS2345: Argument of type '"string"' is not assignable to parameter of type 'number'. + + +==== tests/cases/compiler/foo.js (0 errors) ==== + + class C { + constructor() { + /** @type {number[]}*/ + this.p = []; + } + } + +==== tests/cases/compiler/bar.ts (1 errors) ==== + + (new C()).p.push("string"); + ~~~~~~~~ +!!! error TS2345: Argument of type '"string"' is not assignable to parameter of type 'number'. + \ No newline at end of file diff --git a/tests/baselines/reference/multipleDeclarations.types b/tests/baselines/reference/multipleDeclarations.types index 195bdc2ad0d61..c11bd13dffe14 100644 --- a/tests/baselines/reference/multipleDeclarations.types +++ b/tests/baselines/reference/multipleDeclarations.types @@ -21,7 +21,7 @@ C.prototype.m = function() { this.nothing(); >this.nothing() : any >this.nothing : any ->this : { m: () => void; } +>this : { m: any; } >nothing : any } class X { diff --git a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types index f882239730660..99bf5e15fa71b 100644 --- a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types +++ b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.types @@ -15,39 +15,39 @@ function MyClass() { * @returns {MyClass} */ MyClass.prototype.optionalParam = function(required, notRequired) { ->MyClass.prototype.optionalParam = function(required, notRequired) { return this;} : (required: string, notRequired?: string) => { prop: null; optionalParam: any; } +>MyClass.prototype.optionalParam = function(required, notRequired) { return this;} : (required: string, notRequired?: string) => { prop: any; optionalParam: any; } >MyClass.prototype.optionalParam : any >MyClass.prototype : any >MyClass : () => void >prototype : any >optionalParam : any ->function(required, notRequired) { return this;} : (required: string, notRequired?: string) => { prop: null; optionalParam: any; } +>function(required, notRequired) { return this;} : (required: string, notRequired?: string) => { prop: any; optionalParam: any; } >required : string >notRequired : string return this; ->this : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>this : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } }; let pInst = new MyClass(); ->pInst : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } ->new MyClass() : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>pInst : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>new MyClass() : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } >MyClass : () => void let c1 = pInst.optionalParam('hello') ->c1 : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } ->pInst.optionalParam('hello') : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } ->pInst.optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; } ->pInst : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } ->optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; } +>c1 : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>pInst.optionalParam('hello') : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>pInst.optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; } +>pInst : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; } >'hello' : "hello" let c2 = pInst.optionalParam('hello', null) ->c2 : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } ->pInst.optionalParam('hello', null) : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } ->pInst.optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; } ->pInst : { prop: null; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } ->optionalParam : (required: string, notRequired?: string) => { prop: null; optionalParam: any; } +>c2 : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>pInst.optionalParam('hello', null) : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>pInst.optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; } +>pInst : { prop: any; optionalParam: (required: string, notRequired?: string) => typeof MyClass; } +>optionalParam : (required: string, notRequired?: string) => { prop: any; optionalParam: any; } >'hello' : "hello" >null : null diff --git a/tests/cases/compiler/jsFileClassPropertyType.ts b/tests/cases/compiler/jsFileClassPropertyType.ts new file mode 100644 index 0000000000000..5354009672143 --- /dev/null +++ b/tests/cases/compiler/jsFileClassPropertyType.ts @@ -0,0 +1,13 @@ +// @allowJs: true +// @noEmit: true + +// @filename: foo.js +class C { + constructor () { + this.p = 0; + } +} + +// @filename: bar.ts + +(new C()).p = "string"; diff --git a/tests/cases/compiler/jsFileClassPropertyType2.ts b/tests/cases/compiler/jsFileClassPropertyType2.ts new file mode 100644 index 0000000000000..82c36f5314723 --- /dev/null +++ b/tests/cases/compiler/jsFileClassPropertyType2.ts @@ -0,0 +1,14 @@ +// @allowJs: true +// @noEmit: true + +// @filename: foo.js +class C { + constructor() { + /** @type {number[]}*/ + this.p = []; + } +} + +// @filename: bar.ts + +(new C()).p.push("string"); diff --git a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts index d93ec4c1914d0..59be947e3a1ba 100644 --- a/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts +++ b/tests/cases/fourslash/getJavaScriptSyntacticDiagnostics24.ts @@ -12,4 +12,4 @@ //// let x = new Person(100); //// x.canVote/**/; -verify.quickInfoAt("", "(property) Person.canVote: true | 23"); +verify.quickInfoAt("", "(property) Person.canVote: number | boolean"); From a34834cb52c9ef9c19715b68256c3c10496b999f Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 6 Feb 2017 11:08:29 -0800 Subject: [PATCH 048/116] Error when users define "__esModule" --- src/compiler/checker.ts | 20 ++++++++++++++++++ src/compiler/diagnosticMessages.json | 4 ++++ src/compiler/transformers/module/module.ts | 2 +- .../reference/es5-commonjs3.errors.txt | 10 +++++++++ tests/baselines/reference/es5-commonjs3.js | 1 + .../reference/es5-commonjs4.errors.txt | 21 +++++++++++++++++++ tests/baselines/reference/es5-commonjs4.js | 1 + 7 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/es5-commonjs3.errors.txt create mode 100644 tests/baselines/reference/es5-commonjs4.errors.txt diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7c8a0b7337f9b..eb78885ea5ea3 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -21909,6 +21909,10 @@ namespace ts { } } + if (hasModifier(node.parent.parent, ModifierFlags.Export) && compilerOptions.module !== ModuleKind.ES2015) { + checkESModuleMarker(node.name); + } + const checkLetConstNames = (isLet(node) || isConst(node)); // 1. LexicalDeclaration : LetOrConst BindingList ; @@ -21921,6 +21925,22 @@ namespace ts { return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name); } + function checkESModuleMarker(name: Identifier | BindingPattern): boolean { + if (name.kind === SyntaxKind.Identifier) { + if (unescapeIdentifier(name.text) === "__esModule") { + return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_a_marker_for_transpiled_ES2015_module); + } + } + else { + const elements = (name).elements; + for (const element of elements) { + if (!isOmittedExpression(element)) { + return checkESModuleMarker(element.name); + } + } + } + } + function checkGrammarNameInLetOrConstDeclarations(name: Identifier | BindingPattern): boolean { if (name.kind === SyntaxKind.Identifier) { if ((name).originalKeywordKind === SyntaxKind.LetKeyword) { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 43a9cce4de6e6..50a91761e8085 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -671,6 +671,10 @@ "category": "Error", "code": 1215 }, + "Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.": { + "category": "Error", + "code": 1216 + }, "Export assignment is not supported when '--module' flag is 'system'.": { "category": "Error", "code": 1218 diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index ebd004337f9c0..7c506be4d588e 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -835,7 +835,7 @@ namespace ts { const parseTreeNode = getParseTreeNode(node); if (parseTreeNode && !shouldAppendEsModuleMarker) { // class declaration get down-level transformed to be variable statement - shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration) + shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement ||parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration) && hasModifier(parseTreeNode, ModifierFlags.Export); } diff --git a/tests/baselines/reference/es5-commonjs3.errors.txt b/tests/baselines/reference/es5-commonjs3.errors.txt new file mode 100644 index 0000000000000..51c5d2cd44d1d --- /dev/null +++ b/tests/baselines/reference/es5-commonjs3.errors.txt @@ -0,0 +1,10 @@ +tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. + + +==== tests/cases/compiler/es5-commonjs3.ts (1 errors) ==== + + export default "test"; + export var __esModule = 1; + ~~~~~~~~~~ +!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. + \ No newline at end of file diff --git a/tests/baselines/reference/es5-commonjs3.js b/tests/baselines/reference/es5-commonjs3.js index b2c1c5d68907b..5fc9462b955d9 100644 --- a/tests/baselines/reference/es5-commonjs3.js +++ b/tests/baselines/reference/es5-commonjs3.js @@ -8,3 +8,4 @@ export var __esModule = 1; "use strict"; exports.default = "test"; exports.__esModule = 1; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs4.errors.txt b/tests/baselines/reference/es5-commonjs4.errors.txt new file mode 100644 index 0000000000000..6a047378bac50 --- /dev/null +++ b/tests/baselines/reference/es5-commonjs4.errors.txt @@ -0,0 +1,21 @@ +tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. + + +==== tests/cases/compiler/es5-commonjs4.ts (1 errors) ==== + + export default class A + { + constructor () + { + + } + + public B() + { + return 42; + } + } + export var __esModule = 1; + ~~~~~~~~~~ +!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. + \ No newline at end of file diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js index b67c771df3cd4..bf28e0645000f 100644 --- a/tests/baselines/reference/es5-commonjs4.js +++ b/tests/baselines/reference/es5-commonjs4.js @@ -27,3 +27,4 @@ var A = (function () { }()); exports.default = A; exports.__esModule = 1; +Object.defineProperty(exports, "__esModule", { value: true }); From 444a55f96f610b20a535865e6a948bdefc3bd509 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 6 Feb 2017 11:08:51 -0800 Subject: [PATCH 049/116] Update sourcemap --- .../commonSourceDirectory_dts.sourcemap.txt | 3 +- .../jsxFactoryIdentifier.sourcemap.txt | 3 +- ...FactoryIdentifierAsParameter.sourcemap.txt | 2 + ...dentifierWithAbsentParameter.sourcemap.txt | 2 + .../jsxFactoryQualifiedName.sourcemap.txt | 3 +- ...QualifiedNameResolutionError.sourcemap.txt | 2 + .../reference/outModuleConcatAmd.js.map | 2 +- .../outModuleConcatAmd.sourcemap.txt | 40 ++++++++++--------- .../reference/outModuleTripleSlashRefs.js.map | 2 +- .../outModuleTripleSlashRefs.sourcemap.txt | 40 ++++++++++--------- .../sourceMapValidationImport.sourcemap.txt | 3 +- 11 files changed, 60 insertions(+), 42 deletions(-) diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt index 90603ae3652c8..ccbbc89465d9c 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt +++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt @@ -24,7 +24,7 @@ sourceFile:index.ts 4 > ^^^ 5 > ^ 6 > ^ -7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^^-> 1 > >export const 2 > @@ -39,4 +39,5 @@ sourceFile:index.ts 5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) 6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0) --- +>>>exports.__esModule = true; >>>//# sourceMappingURL=/app/myMapRoot/index.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt index a4ddc8c050b68..26e68d04f1d9c 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt @@ -333,13 +333,14 @@ sourceFile:Element.ts >>>} 1 > 2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} 1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0) 2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0) --- +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=Element.js.map=================================================================== JsFile: test.js mapUrl: test.js.map diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt index c7867fc54e09d..68f39e67ddd86 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt @@ -75,6 +75,7 @@ sourceFile:test.tsx >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render(createElement) { @@ -84,4 +85,5 @@ sourceFile:test.tsx 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) --- +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt index f1ebaf49870bd..b1b8db46eaace 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt @@ -69,6 +69,7 @@ sourceFile:test.tsx >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render() { @@ -78,4 +79,5 @@ sourceFile:test.tsx 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) --- +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt index 98517620c7375..c075bc5e839af 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt @@ -333,13 +333,14 @@ sourceFile:Element.ts >>>} 1 > 2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} 1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0) 2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0) --- +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=Element.js.map=================================================================== JsFile: test.js mapUrl: test.js.map diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt index 2616efcf63bf0..0e8d7ec51f3f8 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt @@ -75,6 +75,7 @@ sourceFile:test.tsx >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render(createElement) { @@ -84,4 +85,5 @@ sourceFile:test.tsx 1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) 2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) --- +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map index a95ca740a615c..fa822fc1825e7 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":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ 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,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt index a8a11fcadc084..c2d000629a599 100644 --- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt @@ -68,6 +68,7 @@ sourceFile:tests/cases/compiler/ref/a.ts >>> exports.A = A; 1->^^^^ 2 > ^^^^^^^^^^^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > A 1->Emitted(18, 5) Source(2, 14) + SourceIndex(0) @@ -77,29 +78,30 @@ sourceFile:tests/cases/compiler/ref/a.ts emittedFile:all.js sourceFile:tests/cases/compiler/b.ts ------------------------------------------------------------------- +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { >>> "use strict"; >>> var B = (function (_super) { -1 >^^^^ +1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >import {A} from "./ref/a"; +1->import {A} from "./ref/a"; > -1 >Emitted(22, 5) Source(2, 1) + SourceIndex(1) +1->Emitted(23, 5) Source(2, 1) + SourceIndex(1) --- >>> __extends(B, _super); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(23, 9) Source(2, 24) + SourceIndex(1) -2 >Emitted(23, 30) Source(2, 25) + SourceIndex(1) +1->Emitted(24, 9) Source(2, 24) + SourceIndex(1) +2 >Emitted(24, 30) Source(2, 25) + SourceIndex(1) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(24, 9) Source(2, 1) + SourceIndex(1) +1 >Emitted(25, 9) Source(2, 1) + SourceIndex(1) --- >>> return _super !== null && _super.apply(this, arguments) || this; >>> } @@ -108,16 +110,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1->export class B extends A { 2 > } -1->Emitted(26, 9) Source(2, 28) + SourceIndex(1) -2 >Emitted(26, 10) Source(2, 29) + SourceIndex(1) +1->Emitted(27, 9) Source(2, 28) + SourceIndex(1) +2 >Emitted(27, 10) Source(2, 29) + SourceIndex(1) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(27, 9) Source(2, 28) + SourceIndex(1) -2 >Emitted(27, 17) Source(2, 29) + SourceIndex(1) +1->Emitted(28, 9) Source(2, 28) + SourceIndex(1) +2 >Emitted(28, 17) Source(2, 29) + SourceIndex(1) --- >>> }(a_1.A)); 1 >^^^^ @@ -133,20 +135,22 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(28, 5) Source(2, 28) + SourceIndex(1) -2 >Emitted(28, 6) Source(2, 29) + SourceIndex(1) -3 >Emitted(28, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(28, 7) Source(2, 24) + SourceIndex(1) -5 >Emitted(28, 12) Source(2, 25) + SourceIndex(1) -6 >Emitted(28, 15) Source(2, 29) + SourceIndex(1) +1 >Emitted(29, 5) Source(2, 28) + SourceIndex(1) +2 >Emitted(29, 6) Source(2, 29) + SourceIndex(1) +3 >Emitted(29, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(29, 7) Source(2, 24) + SourceIndex(1) +5 >Emitted(29, 12) Source(2, 25) + SourceIndex(1) +6 >Emitted(29, 15) Source(2, 29) + SourceIndex(1) --- >>> exports.B = B; 1->^^^^ 2 > ^^^^^^^^^^^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > B -1->Emitted(29, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(29, 19) Source(2, 15) + SourceIndex(1) +1->Emitted(30, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(30, 19) Source(2, 15) + SourceIndex(1) --- +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>//# sourceMappingURL=all.js.map \ No newline at end of file diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map index e91088c249c8a..a55c177680d7a 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":[],"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,cAAC;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ 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,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt index f2076c344825e..5f71c12c2a34f 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt +++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt @@ -142,6 +142,7 @@ sourceFile:tests/cases/compiler/ref/a.ts >>> exports.A = A; 1->^^^^ 2 > ^^^^^^^^^^^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > A 1->Emitted(25, 5) Source(3, 14) + SourceIndex(1) @@ -151,29 +152,30 @@ sourceFile:tests/cases/compiler/ref/a.ts emittedFile:all.js sourceFile:tests/cases/compiler/b.ts ------------------------------------------------------------------- +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { >>> "use strict"; >>> var B = (function (_super) { -1 >^^^^ +1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 >import {A} from "./ref/a"; +1->import {A} from "./ref/a"; > -1 >Emitted(29, 5) Source(2, 1) + SourceIndex(2) +1->Emitted(30, 5) Source(2, 1) + SourceIndex(2) --- >>> __extends(B, _super); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(30, 9) Source(2, 24) + SourceIndex(2) -2 >Emitted(30, 30) Source(2, 25) + SourceIndex(2) +1->Emitted(31, 9) Source(2, 24) + SourceIndex(2) +2 >Emitted(31, 30) Source(2, 25) + SourceIndex(2) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(31, 9) Source(2, 1) + SourceIndex(2) +1 >Emitted(32, 9) Source(2, 1) + SourceIndex(2) --- >>> return _super !== null && _super.apply(this, arguments) || this; >>> } @@ -182,16 +184,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1->export class B extends A { 2 > } -1->Emitted(33, 9) Source(2, 28) + SourceIndex(2) -2 >Emitted(33, 10) Source(2, 29) + SourceIndex(2) +1->Emitted(34, 9) Source(2, 28) + SourceIndex(2) +2 >Emitted(34, 10) Source(2, 29) + SourceIndex(2) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(34, 9) Source(2, 28) + SourceIndex(2) -2 >Emitted(34, 17) Source(2, 29) + SourceIndex(2) +1->Emitted(35, 9) Source(2, 28) + SourceIndex(2) +2 >Emitted(35, 17) Source(2, 29) + SourceIndex(2) --- >>> }(a_1.A)); 1 >^^^^ @@ -207,20 +209,22 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(35, 5) Source(2, 28) + SourceIndex(2) -2 >Emitted(35, 6) Source(2, 29) + SourceIndex(2) -3 >Emitted(35, 6) Source(2, 1) + SourceIndex(2) -4 >Emitted(35, 7) Source(2, 24) + SourceIndex(2) -5 >Emitted(35, 12) Source(2, 25) + SourceIndex(2) -6 >Emitted(35, 15) Source(2, 29) + SourceIndex(2) +1 >Emitted(36, 5) Source(2, 28) + SourceIndex(2) +2 >Emitted(36, 6) Source(2, 29) + SourceIndex(2) +3 >Emitted(36, 6) Source(2, 1) + SourceIndex(2) +4 >Emitted(36, 7) Source(2, 24) + SourceIndex(2) +5 >Emitted(36, 12) Source(2, 25) + SourceIndex(2) +6 >Emitted(36, 15) Source(2, 29) + SourceIndex(2) --- >>> exports.B = B; 1->^^^^ 2 > ^^^^^^^^^^^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > B -1->Emitted(36, 5) Source(2, 14) + SourceIndex(2) -2 >Emitted(36, 19) Source(2, 15) + SourceIndex(2) +1->Emitted(37, 5) Source(2, 14) + SourceIndex(2) +2 >Emitted(37, 19) Source(2, 15) + SourceIndex(2) --- +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>//# sourceMappingURL=all.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index 15e68b22c9007..235557adfba0b 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -228,7 +228,7 @@ sourceFile:sourceMapValidationImport.ts 6 > ^^^^^^^^^ 7 > ^^ 8 > ^ -9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +9 > ^^^-> 1-> > 2 >var @@ -247,4 +247,5 @@ sourceFile:sourceMapValidationImport.ts 7 >Emitted(14, 24) Source(8, 16) + SourceIndex(0) 8 >Emitted(14, 25) Source(8, 17) + SourceIndex(0) --- +>>>exports.__esModule = true; >>>//# sourceMappingURL=sourceMapValidationImport.js.map \ No newline at end of file From 11cac43c34be1f5ef33326810126e4a15b77b402 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 6 Feb 2017 11:10:51 -0800 Subject: [PATCH 050/116] Fix linting --- src/compiler/transformers/module/module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index 7c506be4d588e..5e2bb3edd69f6 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -835,10 +835,10 @@ namespace ts { const parseTreeNode = getParseTreeNode(node); if (parseTreeNode && !shouldAppendEsModuleMarker) { // class declaration get down-level transformed to be variable statement - shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement ||parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration) + shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration) && hasModifier(parseTreeNode, ModifierFlags.Export); } - + if (hasModifier(node, ModifierFlags.Export)) { let modifiers: NodeArray; From 82a3feaadcfc1c5dedfdb982f8b817d78a2ba4e1 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Sun, 5 Feb 2017 15:18:27 -0800 Subject: [PATCH 051/116] Treat function paramters in a .js file with no JSDoc as optional --- src/compiler/checker.ts | 6 +++- ...jsFileFunctionParametersAsOptional.symbols | 22 +++++++++++++ .../jsFileFunctionParametersAsOptional.types | 32 +++++++++++++++++++ ...leFunctionParametersAsOptional2.errors.txt | 28 ++++++++++++++++ .../jsFileFunctionParametersAsOptional.ts | 12 +++++++ .../jsFileFunctionParametersAsOptional2.ts | 18 +++++++++++ 6 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols create mode 100644 tests/baselines/reference/jsFileFunctionParametersAsOptional.types create mode 100644 tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt create mode 100644 tests/cases/compiler/jsFileFunctionParametersAsOptional.ts create mode 100644 tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b5306771dd7f7..6b49b0bdb939a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5226,6 +5226,7 @@ namespace ts { let hasThisParameter: boolean; const iife = getImmediatelyInvokedFunctionExpression(declaration); const isJSConstructSignature = isJSDocConstructSignature(declaration); + const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration); // If this is a JSDoc construct signature, then skip the first parameter in the // parameter list. The first parameter represents the return type of the construct @@ -5251,10 +5252,13 @@ namespace ts { hasLiteralTypes = true; } + const isUntypedParamInJSFile = isUntypedSignatureInJSFile && !param.type && !getJSDocParameterTags(param); + // Record a new minimum argument count if this is not an optional parameter const isOptionalParameter = param.initializer || param.questionToken || param.dotDotDotToken || iife && parameters.length > iife.arguments.length && !param.type || - isJSDocOptionalParameter(param); + isJSDocOptionalParameter(param) || + isUntypedParamInJSFile; if (!isOptionalParameter) { minArgumentCount = parameters.length; } diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols b/tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols new file mode 100644 index 0000000000000..040b910f378af --- /dev/null +++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/foo.js === + +function f(a, b, c) { } +>f : Symbol(f, Decl(foo.js, 0, 0)) +>a : Symbol(a, Decl(foo.js, 1, 11)) +>b : Symbol(b, Decl(foo.js, 1, 13)) +>c : Symbol(c, Decl(foo.js, 1, 16)) + + +=== tests/cases/compiler/bar.ts === +f(); +>f : Symbol(f, Decl(foo.js, 0, 0)) + +f(1); +>f : Symbol(f, Decl(foo.js, 0, 0)) + +f(1, 2); +>f : Symbol(f, Decl(foo.js, 0, 0)) + +f(1, 2, 3); +>f : Symbol(f, Decl(foo.js, 0, 0)) + diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional.types b/tests/baselines/reference/jsFileFunctionParametersAsOptional.types new file mode 100644 index 0000000000000..d6d8f9b04a4a1 --- /dev/null +++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional.types @@ -0,0 +1,32 @@ +=== tests/cases/compiler/foo.js === + +function f(a, b, c) { } +>f : (a: any, b: any, c: any) => void +>a : any +>b : any +>c : any + + +=== tests/cases/compiler/bar.ts === +f(); +>f() : void +>f : (a: any, b: any, c: any) => void + +f(1); +>f(1) : void +>f : (a: any, b: any, c: any) => void +>1 : 1 + +f(1, 2); +>f(1, 2) : void +>f : (a: any, b: any, c: any) => void +>1 : 1 +>2 : 2 + +f(1, 2, 3); +>f(1, 2, 3) : void +>f : (a: any, b: any, c: any) => void +>1 : 1 +>2 : 2 +>3 : 3 + diff --git a/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt new file mode 100644 index 0000000000000..26ada935eea09 --- /dev/null +++ b/tests/baselines/reference/jsFileFunctionParametersAsOptional2.errors.txt @@ -0,0 +1,28 @@ +tests/cases/compiler/bar.ts(1,1): error TS2346: Supplied parameters do not match any signature of call target. +tests/cases/compiler/bar.ts(2,1): error TS2346: Supplied parameters do not match any signature of call target. +tests/cases/compiler/bar.ts(3,1): error TS2346: Supplied parameters do not match any signature of call target. + + +==== tests/cases/compiler/foo.js (0 errors) ==== + + /** + * @param a + * @param b + * @param c + */ + function f(a, b, c) { } + + +==== tests/cases/compiler/bar.ts (3 errors) ==== + f(); // Error + ~~~ +!!! error TS2346: Supplied parameters do not match any signature of call target. + f(1); // Error + ~~~~ +!!! error TS2346: Supplied parameters do not match any signature of call target. + f(1, 2); // Error + ~~~~~~~ +!!! error TS2346: Supplied parameters do not match any signature of call target. + + f(1, 2, 3); // OK + \ No newline at end of file diff --git a/tests/cases/compiler/jsFileFunctionParametersAsOptional.ts b/tests/cases/compiler/jsFileFunctionParametersAsOptional.ts new file mode 100644 index 0000000000000..f2673f310b8aa --- /dev/null +++ b/tests/cases/compiler/jsFileFunctionParametersAsOptional.ts @@ -0,0 +1,12 @@ +// @allowJs: true +// @noEmit: true + +// @filename: foo.js +function f(a, b, c) { } + + +// @filename: bar.ts +f(); +f(1); +f(1, 2); +f(1, 2, 3); diff --git a/tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts b/tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts new file mode 100644 index 0000000000000..01aebb2971362 --- /dev/null +++ b/tests/cases/compiler/jsFileFunctionParametersAsOptional2.ts @@ -0,0 +1,18 @@ +// @allowJs: true +// @noEmit: true + +// @filename: foo.js +/** + * @param a + * @param b + * @param c + */ +function f(a, b, c) { } + + +// @filename: bar.ts +f(); // Error +f(1); // Error +f(1, 2); // Error + +f(1, 2, 3); // OK From eedc2619dbf343dd9e269eb75afb026e6464f449 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Mon, 6 Feb 2017 15:28:54 -0800 Subject: [PATCH 052/116] Minor PR feedback --- src/compiler/factory.ts | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index 4c7693dd846f0..d5d8482a0babd 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -1766,8 +1766,6 @@ namespace ts { // Utilities - function asName(name: string): Identifier; - function asName(name: Identifier): Identifier; function asName(name: string | Identifier): Identifier; function asName(name: string | BindingName): BindingName; function asName(name: string | PropertyName): PropertyName; @@ -1811,8 +1809,6 @@ namespace ts { /** * Associates a node with the current transformation, initializing * various transient transformation properties. - * - * @param node The node. */ /* @internal */ export function getOrCreateEmitNode(node: Node) { @@ -1845,8 +1841,6 @@ namespace ts { /** * Gets flags that control emit behavior of a node. - * - * @param node The node. */ export function getEmitFlags(node: Node) { const emitNode = node.emitNode; @@ -1855,9 +1849,6 @@ namespace ts { /** * Sets flags that control emit behavior of a node. - * - * @param node The node. - * @param emitFlags The NodeEmitFlags for the node. */ export function setEmitFlags(node: T, emitFlags: EmitFlags) { getOrCreateEmitNode(node).flags = emitFlags; @@ -1866,8 +1857,6 @@ namespace ts { /** * Gets a custom text range to use when emitting source maps. - * - * @param node The node. */ export function getSourceMapRange(node: Node) { const emitNode = node.emitNode; @@ -1876,9 +1865,6 @@ namespace ts { /** * Sets a custom text range to use when emitting source maps. - * - * @param node The node. - * @param range The text range. */ export function setSourceMapRange(node: T, range: TextRange) { getOrCreateEmitNode(node).sourceMapRange = range; @@ -1887,9 +1873,6 @@ namespace ts { /** * Gets the TextRange to use for source maps for a token of a node. - * - * @param node The node. - * @param token The token. */ export function getTokenSourceMapRange(node: Node, token: SyntaxKind) { const emitNode = node.emitNode; @@ -1899,10 +1882,6 @@ namespace ts { /** * Sets the TextRange to use for source maps for a token of a node. - * - * @param node The node. - * @param token The token. - * @param range The text range. */ export function setTokenSourceMapRange(node: T, token: SyntaxKind, range: TextRange) { const emitNode = getOrCreateEmitNode(node); @@ -1913,8 +1892,6 @@ namespace ts { /** * Gets a custom text range to use when emitting comments. - * - * @param node The node. */ export function getCommentRange(node: Node) { const emitNode = node.emitNode; From 4a6b6d0a04d7781d5b24e074d06b5d733dcc8e78 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 6 Feb 2017 15:34:19 -0800 Subject: [PATCH 053/116] Allow export declarations in ambient namespaces --- src/compiler/checker.ts | 4 +++- .../exportDeclarationsInAmbientNamespaces.js | 13 ++++++++++ ...ortDeclarationsInAmbientNamespaces.symbols | 22 +++++++++++++++++ ...xportDeclarationsInAmbientNamespaces.types | 24 +++++++++++++++++++ ...eclarationsInAmbientNamespaces2.errors.txt | 16 +++++++++++++ .../exportDeclarationsInAmbientNamespaces2.js | 13 ++++++++++ .../exportDeclarationsInAmbientNamespaces.ts | 8 +++++++ .../exportDeclarationsInAmbientNamespaces2.ts | 9 +++++++ 8 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/exportDeclarationsInAmbientNamespaces.js create mode 100644 tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols create mode 100644 tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types create mode 100644 tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.errors.txt create mode 100644 tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.js create mode 100644 tests/cases/compiler/exportDeclarationsInAmbientNamespaces.ts create mode 100644 tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b5306771dd7f7..7e2582e2b38cf 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -19372,7 +19372,9 @@ namespace ts { forEach(node.exportClause.elements, checkExportSpecifier); const inAmbientExternalModule = node.parent.kind === SyntaxKind.ModuleBlock && isAmbientModule(node.parent.parent); - if (node.parent.kind !== SyntaxKind.SourceFile && !inAmbientExternalModule) { + const inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === SyntaxKind.ModuleBlock && + !node.moduleSpecifier && isInAmbientContext(node); + if (node.parent.kind !== SyntaxKind.SourceFile && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) { error(node, Diagnostics.Export_declarations_are_not_permitted_in_a_namespace); } } diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.js b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.js new file mode 100644 index 0000000000000..d458433aed43d --- /dev/null +++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.js @@ -0,0 +1,13 @@ +//// [exportDeclarationsInAmbientNamespaces.ts] + +declare namespace Q { + function _try(method: Function, ...args: any[]): any; + export { _try as try }; +} + +Q.try(() => { }); + + + +//// [exportDeclarationsInAmbientNamespaces.js] +Q["try"](function () { }); diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols new file mode 100644 index 0000000000000..99e70fe4595b8 --- /dev/null +++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/exportDeclarationsInAmbientNamespaces.ts === + +declare namespace Q { +>Q : Symbol(Q, Decl(exportDeclarationsInAmbientNamespaces.ts, 0, 0)) + + function _try(method: Function, ...args: any[]): any; +>_try : Symbol(_try, Decl(exportDeclarationsInAmbientNamespaces.ts, 1, 21)) +>method : Symbol(method, Decl(exportDeclarationsInAmbientNamespaces.ts, 2, 18)) +>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>args : Symbol(args, Decl(exportDeclarationsInAmbientNamespaces.ts, 2, 35)) + + export { _try as try }; +>_try : Symbol(try, Decl(exportDeclarationsInAmbientNamespaces.ts, 3, 12)) +>try : Symbol(try, Decl(exportDeclarationsInAmbientNamespaces.ts, 3, 12)) +} + +Q.try(() => { }); +>Q.try : Symbol(Q.try, Decl(exportDeclarationsInAmbientNamespaces.ts, 3, 12)) +>Q : Symbol(Q, Decl(exportDeclarationsInAmbientNamespaces.ts, 0, 0)) +>try : Symbol(Q.try, Decl(exportDeclarationsInAmbientNamespaces.ts, 3, 12)) + + diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types new file mode 100644 index 0000000000000..a46d99454f9e5 --- /dev/null +++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces.types @@ -0,0 +1,24 @@ +=== tests/cases/compiler/exportDeclarationsInAmbientNamespaces.ts === + +declare namespace Q { +>Q : typeof Q + + function _try(method: Function, ...args: any[]): any; +>_try : (method: Function, ...args: any[]) => any +>method : Function +>Function : Function +>args : any[] + + export { _try as try }; +>_try : (method: Function, ...args: any[]) => any +>try : (method: Function, ...args: any[]) => any +} + +Q.try(() => { }); +>Q.try(() => { }) : any +>Q.try : (method: Function, ...args: any[]) => any +>Q : typeof Q +>try : (method: Function, ...args: any[]) => any +>() => { } : () => void + + diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.errors.txt b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.errors.txt new file mode 100644 index 0000000000000..54c04bd9b1d76 --- /dev/null +++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.errors.txt @@ -0,0 +1,16 @@ +tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts(7,23): error TS1194: Export declarations are not permitted in a namespace. + + +==== tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts (1 errors) ==== + + declare module "mod" { + export var x: number; + } + + declare namespace N { + export { x } from "mod"; // Error + ~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + } + + \ No newline at end of file diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.js b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.js new file mode 100644 index 0000000000000..6896f13025d63 --- /dev/null +++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.js @@ -0,0 +1,13 @@ +//// [exportDeclarationsInAmbientNamespaces2.ts] + +declare module "mod" { + export var x: number; +} + +declare namespace N { + export { x } from "mod"; // Error +} + + + +//// [exportDeclarationsInAmbientNamespaces2.js] diff --git a/tests/cases/compiler/exportDeclarationsInAmbientNamespaces.ts b/tests/cases/compiler/exportDeclarationsInAmbientNamespaces.ts new file mode 100644 index 0000000000000..c46325068f080 --- /dev/null +++ b/tests/cases/compiler/exportDeclarationsInAmbientNamespaces.ts @@ -0,0 +1,8 @@ + +declare namespace Q { + function _try(method: Function, ...args: any[]): any; + export { _try as try }; +} + +Q.try(() => { }); + diff --git a/tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts b/tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts new file mode 100644 index 0000000000000..c32c2d01aea4d --- /dev/null +++ b/tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts @@ -0,0 +1,9 @@ + +declare module "mod" { + export var x: number; +} + +declare namespace N { + export { x } from "mod"; // Error +} + From c28edc31c05319157d3371a92a9bf3ced6543b87 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 6 Feb 2017 15:53:00 -0800 Subject: [PATCH 054/116] Error on forward references for property initializers The error only appears when a property initializer references another property before its definition. References to outer variables, etc are still allowed. --- src/compiler/checker.ts | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b5306771dd7f7..4423b574e31bc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -641,7 +641,7 @@ namespace ts { } // declaration is after usage // can be legal if usage is deferred (i.e. inside function or in initializer of instance property) - if (isUsedInFunctionOrNonStaticProperty(usage)) { + if (isUsedInFunctionOrInstanceProperty(usage)) { return true; } const sourceFiles = host.getSourceFiles(); @@ -668,10 +668,12 @@ namespace ts { } - // declaration is after usage - // can be legal if usage is deferred (i.e. inside function or in initializer of instance property) + // declaration is after usage, but it can still be legal if usage is deferred: + // 1. inside a function + // 2. inside an instance property initializer, a reference to a non-instance property const container = getEnclosingBlockScopeContainer(declaration); - return isUsedInFunctionOrNonStaticProperty(usage, container); + const isInstanceProperty = declaration.kind === SyntaxKind.PropertyDeclaration && !(getModifierFlags(declaration) & ModifierFlags.Static); + return isUsedInFunctionOrInstanceProperty(usage, isInstanceProperty, container); function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration: VariableDeclaration, usage: Node): boolean { const container = getEnclosingBlockScopeContainer(declaration); @@ -700,7 +702,7 @@ namespace ts { return false; } - function isUsedInFunctionOrNonStaticProperty(usage: Node, container?: Node): boolean { + function isUsedInFunctionOrInstanceProperty(usage: Node, isDeclarationInstanceProperty?: boolean, container?: Node): boolean { let current = usage; while (current) { if (current === container) { @@ -711,13 +713,13 @@ namespace ts { return true; } - const initializerOfNonStaticProperty = current.parent && + const initializerOfInstanceProperty = current.parent && current.parent.kind === SyntaxKind.PropertyDeclaration && (getModifierFlags(current.parent) & ModifierFlags.Static) === 0 && (current.parent).initializer === current; - if (initializerOfNonStaticProperty) { - return true; + if (initializerOfInstanceProperty) { + return !isDeclarationInstanceProperty; } current = current.parent; @@ -986,10 +988,10 @@ namespace ts { // interface 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 + // The foo at /*1*/ and /*2*/ will share same symbol with two meanings: + // block-scoped variable and namespace module. However, only when we // try to resolve name in /*1*/ which is used in variable position, - // we want to check for block- scoped + // we want to check for block-scoped if (meaning & SymbolFlags.BlockScopedVariable) { const exportOrLocalSymbol = getExportSymbolOfValueSymbolIfExported(result); if (exportOrLocalSymbol.flags & SymbolFlags.BlockScopedVariable) { @@ -1013,7 +1015,7 @@ namespace ts { return false; } - const container = getThisContainer(errorLocation, /* includeArrowFunctions */ true); + const container = getThisContainer(errorLocation, /*includeArrowFunctions*/ true); let location = container; while (location) { if (isClassLike(location.parent)) { @@ -12543,6 +12545,16 @@ namespace ts { } } + function isInPropertyInitializer(node: Node): boolean { + while (node) { + if (node.parent && node.parent.kind === SyntaxKind.PropertyDeclaration && (node.parent as PropertyDeclaration).initializer === node) { + return true; + } + node = node.parent; + } + return false; + } + function checkPropertyAccessExpressionOrQualifiedName(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, right: Identifier) { const type = checkNonNullExpression(left); if (isTypeAny(type) || type === silentNeverType) { @@ -12565,6 +12577,11 @@ namespace ts { } return unknownType; } + if (prop.valueDeclaration && + isInPropertyInitializer(node) && + !isBlockScopedNameDeclaredBeforeUse(prop.valueDeclaration, right)) { + error(right, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, right.text); + } markPropertyAsReferenced(prop); From 669ecab631aa50939e531a3c6df0706125e813fd Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 6 Feb 2017 16:05:40 -0800 Subject: [PATCH 055/116] Test property initialiser forward reference errors --- .../forwardRefInClassProperties.errors.txt | 27 ++++++++++++++++ .../reference/forwardRefInClassProperties.js | 31 +++++++++++++++++++ .../compiler/forwardRefInClassProperties.ts | 14 +++++++++ 3 files changed, 72 insertions(+) create mode 100644 tests/baselines/reference/forwardRefInClassProperties.errors.txt create mode 100644 tests/baselines/reference/forwardRefInClassProperties.js create mode 100644 tests/cases/compiler/forwardRefInClassProperties.ts diff --git a/tests/baselines/reference/forwardRefInClassProperties.errors.txt b/tests/baselines/reference/forwardRefInClassProperties.errors.txt new file mode 100644 index 0000000000000..dcf153076ed63 --- /dev/null +++ b/tests/baselines/reference/forwardRefInClassProperties.errors.txt @@ -0,0 +1,27 @@ +tests/cases/compiler/forwardRefInClassProperties.ts(3,15): error TS2448: Block-scoped variable '_a' used before its declaration. +tests/cases/compiler/forwardRefInClassProperties.ts(6,22): error TS2448: Block-scoped variable '_A' used before its declaration. +tests/cases/compiler/forwardRefInClassProperties.ts(11,17): error TS2448: Block-scoped variable 'b' used before its declaration. + + +==== tests/cases/compiler/forwardRefInClassProperties.ts (3 errors) ==== + class Test + { + _b = this._a; // undefined, no error/warning + ~~ +!!! error TS2448: Block-scoped variable '_a' used before its declaration. + _a = 3; + + static _B = Test._A; // undefined, no error/warning + ~~ +!!! error TS2448: Block-scoped variable '_A' used before its declaration. + static _A = 3; + + method() + { + let a = b; // Block-scoped variable 'b' used before its declaration + ~ +!!! error TS2448: Block-scoped variable 'b' used before its declaration. + let b = 3; + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/forwardRefInClassProperties.js b/tests/baselines/reference/forwardRefInClassProperties.js new file mode 100644 index 0000000000000..1dc455729ab59 --- /dev/null +++ b/tests/baselines/reference/forwardRefInClassProperties.js @@ -0,0 +1,31 @@ +//// [forwardRefInClassProperties.ts] +class Test +{ + _b = this._a; // undefined, no error/warning + _a = 3; + + static _B = Test._A; // undefined, no error/warning + static _A = 3; + + method() + { + let a = b; // Block-scoped variable 'b' used before its declaration + let b = 3; + } +} + + +//// [forwardRefInClassProperties.js] +var Test = (function () { + function Test() { + this._b = this._a; // undefined, no error/warning + this._a = 3; + } + Test.prototype.method = function () { + var a = b; // Block-scoped variable 'b' used before its declaration + var b = 3; + }; + return Test; +}()); +Test._B = Test._A; // undefined, no error/warning +Test._A = 3; diff --git a/tests/cases/compiler/forwardRefInClassProperties.ts b/tests/cases/compiler/forwardRefInClassProperties.ts new file mode 100644 index 0000000000000..80819b1a1756d --- /dev/null +++ b/tests/cases/compiler/forwardRefInClassProperties.ts @@ -0,0 +1,14 @@ +class Test +{ + _b = this._a; // undefined, no error/warning + _a = 3; + + static _B = Test._A; // undefined, no error/warning + static _A = 3; + + method() + { + let a = b; // Block-scoped variable 'b' used before its declaration + let b = 3; + } +} From 188e9df9b55d15b003852632c14425ffe92823e5 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 6 Feb 2017 18:13:17 -0800 Subject: [PATCH 056/116] Emit missing trailing comment of an element in node list --- src/compiler/comments.ts | 6 ++++++ src/compiler/emitter.ts | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts index 200158c2f5ce7..8e17bf2d91b48 100644 --- a/src/compiler/comments.ts +++ b/src/compiler/comments.ts @@ -9,6 +9,7 @@ namespace ts { emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void; emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void; emitTrailingCommentsOfPosition(pos: number): void; + emitLeadingComments(pos: number, isEmittedNode: boolean): void; } export function createCommentWriter(printerOptions: PrinterOptions, emitPos: ((pos: number) => void) | undefined): CommentWriter { @@ -32,6 +33,7 @@ namespace ts { emitNodeWithComments, emitBodyWithDetachedComments, emitTrailingCommentsOfPosition, + emitLeadingComments, }; function emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) { @@ -167,6 +169,10 @@ namespace ts { } function emitLeadingComments(pos: number, isEmittedNode: boolean) { + if (disabled) { + return; + } + hasWrittenComment = false; if (isEmittedNode) { diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 498f65ad36658..d3e46f0827d6a 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -211,6 +211,7 @@ namespace ts { emitNodeWithComments, emitBodyWithDetachedComments, emitTrailingCommentsOfPosition, + emitLeadingComments, } = comments; let currentSourceFile: SourceFile; @@ -2228,6 +2229,15 @@ namespace ts { // Write the delimiter if this is not the first node. if (previousSibling) { + // i.e + // function commentedParameters( + // /* Parameter a */ + // a + // /* End of parameter a */ -> this comment doesn't consider to be trailing comment of parameter "a" due to newline + // , + if (emitLeadingComments && delimiter && previousSibling.end !== parentNode.end) { + emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement); + } write(delimiter); // Write either a line terminator or whitespace to separate the elements. @@ -2274,6 +2284,20 @@ namespace ts { write(","); } + + // Emit any trailing comment of the last element in the list + // i.e + // var array = [... + // 2 + // /* end of element 2 */ + // ]; + if (previousSibling && delimiter && previousSibling.end !== parentNode.end) { + emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement); + if (hasTrailingComma) { + emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement); + } + } + // Decrease the indent, if requested. if (format & ListFormat.Indented) { decreaseIndent(); From 7fd404dbbc20611bca81f8cde3a07c91e69ee13f Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 6 Feb 2017 18:14:08 -0800 Subject: [PATCH 057/116] Add tests and update baselines --- .../reference/arrowFunctionErrorSpan.js | 4 +++- .../reference/commentOnArrayElement1.js | 17 ++++++++++++++++ .../reference/commentOnArrayElement1.symbols | 10 ++++++++++ .../reference/commentOnArrayElement1.types | 15 ++++++++++++++ .../reference/commentOnArrayElement2.js | 15 ++++++++++++++ .../reference/commentOnArrayElement2.symbols | 9 +++++++++ .../reference/commentOnArrayElement2.types | 14 +++++++++++++ .../reference/commentOnArrayElement3.js | 19 ++++++++++++++++++ .../reference/commentOnArrayElement3.symbols | 11 ++++++++++ .../reference/commentOnArrayElement3.types | 18 +++++++++++++++++ .../reference/commentOnParameter1.js | 20 +++++++++++++++++++ .../reference/commentOnParameter1.symbols | 16 +++++++++++++++ .../reference/commentOnParameter1.types | 16 +++++++++++++++ .../reference/commentOnParameter2.js | 18 +++++++++++++++++ .../reference/commentOnParameter2.symbols | 15 ++++++++++++++ .../reference/commentOnParameter2.types | 15 ++++++++++++++ .../reference/commentOnParameter3.js | 9 +++++++++ .../reference/commentOnParameter3.symbols | 12 +++++++++++ .../reference/commentOnParameter3.types | 12 +++++++++++ .../cases/compiler/commentOnArrayElement1.ts | 7 +++++++ .../cases/compiler/commentOnArrayElement2.ts | 6 ++++++ .../cases/compiler/commentOnArrayElement3.ts | 8 ++++++++ tests/cases/compiler/commentOnParameter1.ts | 9 +++++++++ tests/cases/compiler/commentOnParameter2.ts | 8 ++++++++ tests/cases/compiler/commentOnParameter3.ts | 5 +++++ 25 files changed, 307 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/commentOnArrayElement1.js create mode 100644 tests/baselines/reference/commentOnArrayElement1.symbols create mode 100644 tests/baselines/reference/commentOnArrayElement1.types create mode 100644 tests/baselines/reference/commentOnArrayElement2.js create mode 100644 tests/baselines/reference/commentOnArrayElement2.symbols create mode 100644 tests/baselines/reference/commentOnArrayElement2.types create mode 100644 tests/baselines/reference/commentOnArrayElement3.js create mode 100644 tests/baselines/reference/commentOnArrayElement3.symbols create mode 100644 tests/baselines/reference/commentOnArrayElement3.types create mode 100644 tests/baselines/reference/commentOnParameter1.js create mode 100644 tests/baselines/reference/commentOnParameter1.symbols create mode 100644 tests/baselines/reference/commentOnParameter1.types create mode 100644 tests/baselines/reference/commentOnParameter2.js create mode 100644 tests/baselines/reference/commentOnParameter2.symbols create mode 100644 tests/baselines/reference/commentOnParameter2.types create mode 100644 tests/baselines/reference/commentOnParameter3.js create mode 100644 tests/baselines/reference/commentOnParameter3.symbols create mode 100644 tests/baselines/reference/commentOnParameter3.types create mode 100644 tests/cases/compiler/commentOnArrayElement1.ts create mode 100644 tests/cases/compiler/commentOnArrayElement2.ts create mode 100644 tests/cases/compiler/commentOnArrayElement3.ts create mode 100644 tests/cases/compiler/commentOnParameter1.ts create mode 100644 tests/cases/compiler/commentOnParameter2.ts create mode 100644 tests/cases/compiler/commentOnParameter3.ts diff --git a/tests/baselines/reference/arrowFunctionErrorSpan.js b/tests/baselines/reference/arrowFunctionErrorSpan.js index 2557113e89bd4..ca1f966f5178b 100644 --- a/tests/baselines/reference/arrowFunctionErrorSpan.js +++ b/tests/baselines/reference/arrowFunctionErrorSpan.js @@ -83,7 +83,9 @@ f(// comment 1 // comment 2 function () { // comment 4 -}); +} +// comment 5 +); // body is not a block f(function (_) { return 1 + 2; }); diff --git a/tests/baselines/reference/commentOnArrayElement1.js b/tests/baselines/reference/commentOnArrayElement1.js new file mode 100644 index 0000000000000..960df336dbb97 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement1.js @@ -0,0 +1,17 @@ +//// [commentOnArrayElement1.ts] +var array = [ + /* element 1*/ + 1 + /* end of element 1 */, + 2 + /* end of element 2 */ +]; + +//// [commentOnArrayElement1.js] +var array = [ + /* element 1*/ + 1 + /* end of element 1 */ , + 2 + /* end of element 2 */ +]; diff --git a/tests/baselines/reference/commentOnArrayElement1.symbols b/tests/baselines/reference/commentOnArrayElement1.symbols new file mode 100644 index 0000000000000..a504aec5c3265 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement1.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/commentOnArrayElement1.ts === +var array = [ +>array : Symbol(array, Decl(commentOnArrayElement1.ts, 0, 3)) + + /* element 1*/ + 1 + /* end of element 1 */, + 2 + /* end of element 2 */ +]; diff --git a/tests/baselines/reference/commentOnArrayElement1.types b/tests/baselines/reference/commentOnArrayElement1.types new file mode 100644 index 0000000000000..f6b541ec30022 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement1.types @@ -0,0 +1,15 @@ +=== tests/cases/compiler/commentOnArrayElement1.ts === +var array = [ +>array : number[] +>[ /* element 1*/ 1 /* end of element 1 */, 2 /* end of element 2 */] : number[] + + /* element 1*/ + 1 +>1 : 1 + + /* end of element 1 */, + 2 +>2 : 2 + + /* end of element 2 */ +]; diff --git a/tests/baselines/reference/commentOnArrayElement2.js b/tests/baselines/reference/commentOnArrayElement2.js new file mode 100644 index 0000000000000..1c146caed6507 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement2.js @@ -0,0 +1,15 @@ +//// [commentOnArrayElement2.ts] +var array = [ + /* element 1*/ + 1 /* end of element 1 */, + 2 + /* end of element 2 */ +]; + +//// [commentOnArrayElement2.js] +var array = [ + /* element 1*/ + 1 /* end of element 1 */, + 2 + /* end of element 2 */ +]; diff --git a/tests/baselines/reference/commentOnArrayElement2.symbols b/tests/baselines/reference/commentOnArrayElement2.symbols new file mode 100644 index 0000000000000..7a6c231664ba4 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement2.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/commentOnArrayElement2.ts === +var array = [ +>array : Symbol(array, Decl(commentOnArrayElement2.ts, 0, 3)) + + /* element 1*/ + 1 /* end of element 1 */, + 2 + /* end of element 2 */ +]; diff --git a/tests/baselines/reference/commentOnArrayElement2.types b/tests/baselines/reference/commentOnArrayElement2.types new file mode 100644 index 0000000000000..85647da74e07f --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement2.types @@ -0,0 +1,14 @@ +=== tests/cases/compiler/commentOnArrayElement2.ts === +var array = [ +>array : number[] +>[ /* element 1*/ 1 /* end of element 1 */, 2 /* end of element 2 */] : number[] + + /* element 1*/ + 1 /* end of element 1 */, +>1 : 1 + + 2 +>2 : 2 + + /* end of element 2 */ +]; diff --git a/tests/baselines/reference/commentOnArrayElement3.js b/tests/baselines/reference/commentOnArrayElement3.js new file mode 100644 index 0000000000000..e31f8adf26a14 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement3.js @@ -0,0 +1,19 @@ +//// [commentOnArrayElement3.ts] +var array = [ + /* element 1*/ + 1 + /* end of element 1 */, + 2 + /* end of element 2 */, , + /* extra comment */ +]; + +//// [commentOnArrayElement3.js] +var array = [ + /* element 1*/ + 1 + /* end of element 1 */ , + 2 + /* end of element 2 */ , + , +]; diff --git a/tests/baselines/reference/commentOnArrayElement3.symbols b/tests/baselines/reference/commentOnArrayElement3.symbols new file mode 100644 index 0000000000000..a1c61f7155ac5 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement3.symbols @@ -0,0 +1,11 @@ +=== tests/cases/compiler/commentOnArrayElement3.ts === +var array = [ +>array : Symbol(array, Decl(commentOnArrayElement3.ts, 0, 3)) + + /* element 1*/ + 1 + /* end of element 1 */, + 2 + /* end of element 2 */, , + /* extra comment */ +]; diff --git a/tests/baselines/reference/commentOnArrayElement3.types b/tests/baselines/reference/commentOnArrayElement3.types new file mode 100644 index 0000000000000..cd75c5a8db969 --- /dev/null +++ b/tests/baselines/reference/commentOnArrayElement3.types @@ -0,0 +1,18 @@ +=== tests/cases/compiler/commentOnArrayElement3.ts === +var array = [ +>array : number[] +>[ /* element 1*/ 1 /* end of element 1 */, 2 /* end of element 2 */, , /* extra comment */] : number[] + + /* element 1*/ + 1 +>1 : 1 + + /* end of element 1 */, + 2 +>2 : 2 + + /* end of element 2 */, , +> : undefined + + /* extra comment */ +]; diff --git a/tests/baselines/reference/commentOnParameter1.js b/tests/baselines/reference/commentOnParameter1.js new file mode 100644 index 0000000000000..10ae2af1264f4 --- /dev/null +++ b/tests/baselines/reference/commentOnParameter1.js @@ -0,0 +1,20 @@ +//// [commentOnParameter1.ts] +function commentedParameters( +/* Parameter a */ +a +/* End of parameter a */ +/* Parameter b */ +, +b +/* End of parameter b */ +){} + +//// [commentOnParameter1.js] +function commentedParameters( + /* Parameter a */ + a + /* End of parameter a */ + /* Parameter b */ + , b + /* End of parameter b */ +) { } diff --git a/tests/baselines/reference/commentOnParameter1.symbols b/tests/baselines/reference/commentOnParameter1.symbols new file mode 100644 index 0000000000000..13d91ac7abb89 --- /dev/null +++ b/tests/baselines/reference/commentOnParameter1.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/commentOnParameter1.ts === +function commentedParameters( +>commentedParameters : Symbol(commentedParameters, Decl(commentOnParameter1.ts, 0, 0)) + +/* Parameter a */ +a +>a : Symbol(a, Decl(commentOnParameter1.ts, 0, 29)) + +/* End of parameter a */ +/* Parameter b */ +, +b +>b : Symbol(b, Decl(commentOnParameter1.ts, 5, 1)) + +/* End of parameter b */ +){} diff --git a/tests/baselines/reference/commentOnParameter1.types b/tests/baselines/reference/commentOnParameter1.types new file mode 100644 index 0000000000000..2a98a9a3f6fc3 --- /dev/null +++ b/tests/baselines/reference/commentOnParameter1.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/commentOnParameter1.ts === +function commentedParameters( +>commentedParameters : (a: any, b: any) => void + +/* Parameter a */ +a +>a : any + +/* End of parameter a */ +/* Parameter b */ +, +b +>b : any + +/* End of parameter b */ +){} diff --git a/tests/baselines/reference/commentOnParameter2.js b/tests/baselines/reference/commentOnParameter2.js new file mode 100644 index 0000000000000..d0c024a6b3bf9 --- /dev/null +++ b/tests/baselines/reference/commentOnParameter2.js @@ -0,0 +1,18 @@ +//// [commentOnParameter2.ts] +function commentedParameters( +/* Parameter a */ +a /* End of parameter a */ +/* Parameter b */ +, +b +/* End of parameter b */ +){} + +//// [commentOnParameter2.js] +function commentedParameters( + /* Parameter a */ + a /* End of parameter a */ + /* Parameter b */ + , b + /* End of parameter b */ +) { } diff --git a/tests/baselines/reference/commentOnParameter2.symbols b/tests/baselines/reference/commentOnParameter2.symbols new file mode 100644 index 0000000000000..5a6e904ed0bae --- /dev/null +++ b/tests/baselines/reference/commentOnParameter2.symbols @@ -0,0 +1,15 @@ +=== tests/cases/compiler/commentOnParameter2.ts === +function commentedParameters( +>commentedParameters : Symbol(commentedParameters, Decl(commentOnParameter2.ts, 0, 0)) + +/* Parameter a */ +a /* End of parameter a */ +>a : Symbol(a, Decl(commentOnParameter2.ts, 0, 29)) + +/* Parameter b */ +, +b +>b : Symbol(b, Decl(commentOnParameter2.ts, 4, 1)) + +/* End of parameter b */ +){} diff --git a/tests/baselines/reference/commentOnParameter2.types b/tests/baselines/reference/commentOnParameter2.types new file mode 100644 index 0000000000000..2d4c14db809eb --- /dev/null +++ b/tests/baselines/reference/commentOnParameter2.types @@ -0,0 +1,15 @@ +=== tests/cases/compiler/commentOnParameter2.ts === +function commentedParameters( +>commentedParameters : (a: any, b: any) => void + +/* Parameter a */ +a /* End of parameter a */ +>a : any + +/* Parameter b */ +, +b +>b : any + +/* End of parameter b */ +){} diff --git a/tests/baselines/reference/commentOnParameter3.js b/tests/baselines/reference/commentOnParameter3.js new file mode 100644 index 0000000000000..56172af473c79 --- /dev/null +++ b/tests/baselines/reference/commentOnParameter3.js @@ -0,0 +1,9 @@ +//// [commentOnParameter3.ts] +function commentedParameters( +a /* parameter a */, +b /* parameter b */, +/* extra comment */ +) { } + +//// [commentOnParameter3.js] +function commentedParameters(a /* parameter a */, b /* parameter b */) { } diff --git a/tests/baselines/reference/commentOnParameter3.symbols b/tests/baselines/reference/commentOnParameter3.symbols new file mode 100644 index 0000000000000..4dda5f6d0e87c --- /dev/null +++ b/tests/baselines/reference/commentOnParameter3.symbols @@ -0,0 +1,12 @@ +=== tests/cases/compiler/commentOnParameter3.ts === +function commentedParameters( +>commentedParameters : Symbol(commentedParameters, Decl(commentOnParameter3.ts, 0, 0)) + +a /* parameter a */, +>a : Symbol(a, Decl(commentOnParameter3.ts, 0, 29)) + +b /* parameter b */, +>b : Symbol(b, Decl(commentOnParameter3.ts, 1, 20)) + +/* extra comment */ +) { } diff --git a/tests/baselines/reference/commentOnParameter3.types b/tests/baselines/reference/commentOnParameter3.types new file mode 100644 index 0000000000000..f5b23dbceb3fe --- /dev/null +++ b/tests/baselines/reference/commentOnParameter3.types @@ -0,0 +1,12 @@ +=== tests/cases/compiler/commentOnParameter3.ts === +function commentedParameters( +>commentedParameters : (a: any, b: any) => void + +a /* parameter a */, +>a : any + +b /* parameter b */, +>b : any + +/* extra comment */ +) { } diff --git a/tests/cases/compiler/commentOnArrayElement1.ts b/tests/cases/compiler/commentOnArrayElement1.ts new file mode 100644 index 0000000000000..3dc4ce29bf16e --- /dev/null +++ b/tests/cases/compiler/commentOnArrayElement1.ts @@ -0,0 +1,7 @@ +var array = [ + /* element 1*/ + 1 + /* end of element 1 */, + 2 + /* end of element 2 */ +]; \ No newline at end of file diff --git a/tests/cases/compiler/commentOnArrayElement2.ts b/tests/cases/compiler/commentOnArrayElement2.ts new file mode 100644 index 0000000000000..80c7f8fb1a7b8 --- /dev/null +++ b/tests/cases/compiler/commentOnArrayElement2.ts @@ -0,0 +1,6 @@ +var array = [ + /* element 1*/ + 1 /* end of element 1 */, + 2 + /* end of element 2 */ +]; \ No newline at end of file diff --git a/tests/cases/compiler/commentOnArrayElement3.ts b/tests/cases/compiler/commentOnArrayElement3.ts new file mode 100644 index 0000000000000..26de853f3e918 --- /dev/null +++ b/tests/cases/compiler/commentOnArrayElement3.ts @@ -0,0 +1,8 @@ +var array = [ + /* element 1*/ + 1 + /* end of element 1 */, + 2 + /* end of element 2 */, , + /* extra comment */ +]; \ No newline at end of file diff --git a/tests/cases/compiler/commentOnParameter1.ts b/tests/cases/compiler/commentOnParameter1.ts new file mode 100644 index 0000000000000..6a17c90950cad --- /dev/null +++ b/tests/cases/compiler/commentOnParameter1.ts @@ -0,0 +1,9 @@ +function commentedParameters( +/* Parameter a */ +a +/* End of parameter a */ +/* Parameter b */ +, +b +/* End of parameter b */ +){} \ No newline at end of file diff --git a/tests/cases/compiler/commentOnParameter2.ts b/tests/cases/compiler/commentOnParameter2.ts new file mode 100644 index 0000000000000..2722eab554b63 --- /dev/null +++ b/tests/cases/compiler/commentOnParameter2.ts @@ -0,0 +1,8 @@ +function commentedParameters( +/* Parameter a */ +a /* End of parameter a */ +/* Parameter b */ +, +b +/* End of parameter b */ +){} \ No newline at end of file diff --git a/tests/cases/compiler/commentOnParameter3.ts b/tests/cases/compiler/commentOnParameter3.ts new file mode 100644 index 0000000000000..57eda10f33890 --- /dev/null +++ b/tests/cases/compiler/commentOnParameter3.ts @@ -0,0 +1,5 @@ +function commentedParameters( +a /* parameter a */, +b /* parameter b */, +/* extra comment */ +) { } \ No newline at end of file From 41f6c5ef6b758e65b10e62e72198fb6857dede8e Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 6 Feb 2017 20:07:58 -0800 Subject: [PATCH 058/116] Only report an error in non ambient context and with no noEmit flag --- src/compiler/checker.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index eb78885ea5ea3..1564f0c7f6915 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -21909,7 +21909,8 @@ namespace ts { } } - if (hasModifier(node.parent.parent, ModifierFlags.Export) && compilerOptions.module !== ModuleKind.ES2015) { + if (compilerOptions.module !== ModuleKind.ES2015 && !compilerOptions.noEmit && + !isInAmbientContext(node.parent.parent) && hasModifier(node.parent.parent, ModifierFlags.Export)) { checkESModuleMarker(node.name); } From d7371043c4d7d1b1c6cb4a3bda25177c30925c3d Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 6 Feb 2017 20:08:13 -0800 Subject: [PATCH 059/116] Add test and baseline --- tests/baselines/reference/es5-commonjs7.symbols | 6 ++++++ tests/baselines/reference/es5-commonjs7.types | 6 ++++++ tests/baselines/reference/es5-commonjs8.symbols | 6 ++++++ tests/baselines/reference/es5-commonjs8.types | 7 +++++++ tests/cases/compiler/es5-commonjs7.ts | 8 ++++++++ tests/cases/compiler/es5-commonjs8.ts | 8 ++++++++ 6 files changed, 41 insertions(+) create mode 100644 tests/baselines/reference/es5-commonjs7.symbols create mode 100644 tests/baselines/reference/es5-commonjs7.types create mode 100644 tests/baselines/reference/es5-commonjs8.symbols create mode 100644 tests/baselines/reference/es5-commonjs8.types create mode 100644 tests/cases/compiler/es5-commonjs7.ts create mode 100644 tests/cases/compiler/es5-commonjs8.ts diff --git a/tests/baselines/reference/es5-commonjs7.symbols b/tests/baselines/reference/es5-commonjs7.symbols new file mode 100644 index 0000000000000..14c4cc71376cc --- /dev/null +++ b/tests/baselines/reference/es5-commonjs7.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/test.d.ts === + +export default "test"; +export var __esModule; +>__esModule : Symbol(__esModule, Decl(test.d.ts, 2, 10)) + diff --git a/tests/baselines/reference/es5-commonjs7.types b/tests/baselines/reference/es5-commonjs7.types new file mode 100644 index 0000000000000..e2236a61c7b92 --- /dev/null +++ b/tests/baselines/reference/es5-commonjs7.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/test.d.ts === + +export default "test"; +export var __esModule; +>__esModule : any + diff --git a/tests/baselines/reference/es5-commonjs8.symbols b/tests/baselines/reference/es5-commonjs8.symbols new file mode 100644 index 0000000000000..93041cc8b7fb3 --- /dev/null +++ b/tests/baselines/reference/es5-commonjs8.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/es5-commonjs8.ts === + +export default "test"; +export var __esModule = 1; +>__esModule : Symbol(__esModule, Decl(es5-commonjs8.ts, 2, 10)) + diff --git a/tests/baselines/reference/es5-commonjs8.types b/tests/baselines/reference/es5-commonjs8.types new file mode 100644 index 0000000000000..be206bf5162c5 --- /dev/null +++ b/tests/baselines/reference/es5-commonjs8.types @@ -0,0 +1,7 @@ +=== tests/cases/compiler/es5-commonjs8.ts === + +export default "test"; +export var __esModule = 1; +>__esModule : number +>1 : 1 + diff --git a/tests/cases/compiler/es5-commonjs7.ts b/tests/cases/compiler/es5-commonjs7.ts new file mode 100644 index 0000000000000..384feb2263883 --- /dev/null +++ b/tests/cases/compiler/es5-commonjs7.ts @@ -0,0 +1,8 @@ +// @target: ES5 +// @sourcemap: false +// @declaration: false +// @module: commonjs + +// @filename: test.d.ts +export default "test"; +export var __esModule; diff --git a/tests/cases/compiler/es5-commonjs8.ts b/tests/cases/compiler/es5-commonjs8.ts new file mode 100644 index 0000000000000..6926115497c02 --- /dev/null +++ b/tests/cases/compiler/es5-commonjs8.ts @@ -0,0 +1,8 @@ +// @target: ES5 +// @sourcemap: false +// @declaration: false +// @module: commonjs +// @noEmit: true + +export default "test"; +export var __esModule = 1; From b6c97de24e30220994c8591b510df780fe123191 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 7 Feb 2017 07:18:49 -0800 Subject: [PATCH 060/116] Address code review: update error message --- src/compiler/checker.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- tests/baselines/reference/es5-commonjs3.errors.txt | 4 ++-- tests/baselines/reference/es5-commonjs4.errors.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1564f0c7f6915..22e70aaaa93b2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -21929,7 +21929,7 @@ namespace ts { function checkESModuleMarker(name: Identifier | BindingPattern): boolean { if (name.kind === SyntaxKind.Identifier) { if (unescapeIdentifier(name.text) === "__esModule") { - return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_a_marker_for_transpiled_ES2015_module); + return grammarErrorOnNode(name, Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules); } } else { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 50a91761e8085..3e2118f67b7cd 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -671,7 +671,7 @@ "category": "Error", "code": 1215 }, - "Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module.": { + "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.": { "category": "Error", "code": 1216 }, diff --git a/tests/baselines/reference/es5-commonjs3.errors.txt b/tests/baselines/reference/es5-commonjs3.errors.txt index 51c5d2cd44d1d..fddabf56fac10 100644 --- a/tests/baselines/reference/es5-commonjs3.errors.txt +++ b/tests/baselines/reference/es5-commonjs3.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. ==== tests/cases/compiler/es5-commonjs3.ts (1 errors) ==== @@ -6,5 +6,5 @@ tests/cases/compiler/es5-commonjs3.ts(3,12): error TS1216: Identifier expected. export default "test"; export var __esModule = 1; ~~~~~~~~~~ -!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. \ No newline at end of file diff --git a/tests/baselines/reference/es5-commonjs4.errors.txt b/tests/baselines/reference/es5-commonjs4.errors.txt index 6a047378bac50..9a901728cfb99 100644 --- a/tests/baselines/reference/es5-commonjs4.errors.txt +++ b/tests/baselines/reference/es5-commonjs4.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. ==== tests/cases/compiler/es5-commonjs4.ts (1 errors) ==== @@ -17,5 +17,5 @@ tests/cases/compiler/es5-commonjs4.ts(14,12): error TS1216: Identifier expected. } export var __esModule = 1; ~~~~~~~~~~ -!!! error TS1216: Identifier expected. '__esModule' is reserved as a marker for transpiled ES2015 module. +!!! error TS1216: Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules. \ No newline at end of file From e03509affa543c39e24bbbffcd60b3249b18c301 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Tue, 7 Feb 2017 09:47:10 -0800 Subject: [PATCH 061/116] No subtype reduction in includeFalsyTypes It's not really needed and caused #13826. --- src/compiler/checker.ts | 2 +- .../reference/optionalParameterRetainsNull.js | 14 +++++++++ .../optionalParameterRetainsNull.symbols | 25 +++++++++++++++ .../optionalParameterRetainsNull.types | 31 +++++++++++++++++++ .../compiler/optionalParameterRetainsNull.ts | 7 +++++ 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/optionalParameterRetainsNull.js create mode 100644 tests/baselines/reference/optionalParameterRetainsNull.symbols create mode 100644 tests/baselines/reference/optionalParameterRetainsNull.types create mode 100644 tests/cases/compiler/optionalParameterRetainsNull.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4423b574e31bc..383aea994cda5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -8540,7 +8540,7 @@ namespace ts { if (flags & TypeFlags.Void) types.push(voidType); if (flags & TypeFlags.Undefined) types.push(undefinedType); if (flags & TypeFlags.Null) types.push(nullType); - return getUnionType(types, /*subtypeReduction*/ true); + return getUnionType(types); } function removeDefinitelyFalsyTypes(type: Type): Type { diff --git a/tests/baselines/reference/optionalParameterRetainsNull.js b/tests/baselines/reference/optionalParameterRetainsNull.js new file mode 100644 index 0000000000000..b8fb2c1235051 --- /dev/null +++ b/tests/baselines/reference/optionalParameterRetainsNull.js @@ -0,0 +1,14 @@ +//// [optionalParameterRetainsNull.ts] +interface Bar { bar: number; foo: object | null; } + +let a = { + test (a: K, b?: Bar[K] | null) { } +}; +a.test("bar", null); // ok, null is assignable to number | null | undefined + + +//// [optionalParameterRetainsNull.js] +var a = { + test: function (a, b) { } +}; +a.test("bar", null); // ok, null is assignable to number | null | undefined diff --git a/tests/baselines/reference/optionalParameterRetainsNull.symbols b/tests/baselines/reference/optionalParameterRetainsNull.symbols new file mode 100644 index 0000000000000..95786c1bdcac3 --- /dev/null +++ b/tests/baselines/reference/optionalParameterRetainsNull.symbols @@ -0,0 +1,25 @@ +=== tests/cases/compiler/optionalParameterRetainsNull.ts === +interface Bar { bar: number; foo: object | null; } +>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0)) +>bar : Symbol(Bar.bar, Decl(optionalParameterRetainsNull.ts, 0, 15)) +>foo : Symbol(Bar.foo, Decl(optionalParameterRetainsNull.ts, 0, 29)) + +let a = { +>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3)) + + test (a: K, b?: Bar[K] | null) { } +>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9)) +>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7)) +>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0)) +>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 3, 29)) +>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7)) +>b : Symbol(b, Decl(optionalParameterRetainsNull.ts, 3, 34)) +>Bar : Symbol(Bar, Decl(optionalParameterRetainsNull.ts, 0, 0)) +>K : Symbol(K, Decl(optionalParameterRetainsNull.ts, 3, 7)) + +}; +a.test("bar", null); // ok, null is assignable to number | null | undefined +>a.test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9)) +>a : Symbol(a, Decl(optionalParameterRetainsNull.ts, 2, 3)) +>test : Symbol(test, Decl(optionalParameterRetainsNull.ts, 2, 9)) + diff --git a/tests/baselines/reference/optionalParameterRetainsNull.types b/tests/baselines/reference/optionalParameterRetainsNull.types new file mode 100644 index 0000000000000..30b7d61f76cba --- /dev/null +++ b/tests/baselines/reference/optionalParameterRetainsNull.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/optionalParameterRetainsNull.ts === +interface Bar { bar: number; foo: object | null; } +>Bar : Bar +>bar : number +>foo : object | null +>null : null + +let a = { +>a : { test(a: K, b?: Bar[K] | null | undefined): void; } +>{ test (a: K, b?: Bar[K] | null) { }} : { test(a: K, b?: Bar[K] | null | undefined): void; } + + test (a: K, b?: Bar[K] | null) { } +>test : (a: K, b?: Bar[K] | null | undefined) => void +>K : K +>Bar : Bar +>a : K +>K : K +>b : Bar[K] | null | undefined +>Bar : Bar +>K : K +>null : null + +}; +a.test("bar", null); // ok, null is assignable to number | null | undefined +>a.test("bar", null) : void +>a.test : (a: K, b?: Bar[K] | null | undefined) => void +>a : { test(a: K, b?: Bar[K] | null | undefined): void; } +>test : (a: K, b?: Bar[K] | null | undefined) => void +>"bar" : "bar" +>null : null + diff --git a/tests/cases/compiler/optionalParameterRetainsNull.ts b/tests/cases/compiler/optionalParameterRetainsNull.ts new file mode 100644 index 0000000000000..a3b50a82d2cdd --- /dev/null +++ b/tests/cases/compiler/optionalParameterRetainsNull.ts @@ -0,0 +1,7 @@ +// @strictNullChecks: true +interface Bar { bar: number; foo: object | null; } + +let a = { + test (a: K, b?: Bar[K] | null) { } +}; +a.test("bar", null); // ok, null is assignable to number | null | undefined From a7728f8fa133513200e2e5f6136810e463b1aa4f Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 7 Feb 2017 11:24:05 -0800 Subject: [PATCH 062/116] Clean up extraneous file --- src/services/transform.ts | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/services/transform.ts diff --git a/src/services/transform.ts b/src/services/transform.ts deleted file mode 100644 index c9107eea8534d..0000000000000 --- a/src/services/transform.ts +++ /dev/null @@ -1,29 +0,0 @@ -/// -/// -namespace ts { - /** - * Transform one or more source files using the supplied transformers. - * @param source A `SourceFile` or an array of `SourceFiles`. - * @param transformers An array of `Transformer` callbacks used to process the transformation. - */ - export function transform(source: SourceFile | SourceFile[], transformers: Transformer[]) { - const diagnostics: Diagnostic[] = []; - const compilerOptions: CompilerOptions = {}; - const sourceFiles = isArray(source) ? source : [source]; - const fileMap = arrayToMap(sourceFiles, sourceFile => sourceFile.fileName); - const emitHost: EmitHost = { - getCompilerOptions: () => compilerOptions, - getCanonicalFileName: fileName => fileName, - getCommonSourceDirectory: () => "", - getCurrentDirectory: () => "", - getNewLine: () => "\n", - getSourceFile: fileName => fileMap.get(fileName), - getSourceFileByPath: fileName => fileMap.get(fileName), - getSourceFiles: () => sourceFiles, - isSourceFileFromExternalLibrary: () => false, - isEmitBlocked: () => false, - writeFile: () => Debug.fail("'writeFile()' is not supported during transformation.") - }; - return transformFiles(/*resolver*/ undefined, emitHost, sourceFiles, transformers); - } -} \ No newline at end of file From 80eae169ee2d2b114ed25f9af275923f5e4c511f Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 7 Feb 2017 11:56:44 -0800 Subject: [PATCH 063/116] Emit leading comment before brace token --- src/compiler/emitter.ts | 2 ++ .../reference/amdImportAsPrimaryExpression.js | 1 + tests/baselines/reference/argsInScope.js | 1 + .../reference/commentLeadingCloseBrace.js | 24 +++++++++++++ .../commentLeadingCloseBrace.symbols | 21 ++++++++++++ .../reference/commentLeadingCloseBrace.types | 30 ++++++++++++++++ .../commonJSImportAsPrimaryExpression.js | 1 + .../reference/duplicateLocalVariable1.js | 1 + .../jsFileCompilationLetBeingRenamed.js | 1 + .../narrowExceptionVariableInCatchClause.js | 1 + tests/baselines/reference/noCatchBlock.js | 2 ++ tests/baselines/reference/noCatchBlock.js.map | 2 +- .../reference/noCatchBlock.sourcemap.txt | 34 ++++++++++++++----- tests/baselines/reference/objectRestForOf.js | 1 + .../baselines/reference/parserRealSource14.js | 1 + tests/baselines/reference/recursiveReturns.js | 1 + .../reference/sourceMap-SkippedNode.js | 2 ++ .../reference/sourceMap-SkippedNode.js.map | 2 +- .../sourceMap-SkippedNode.sourcemap.txt | 34 ++++++++++++++----- .../compiler/commentLeadingCloseBrace.ts | 11 ++++++ 20 files changed, 155 insertions(+), 18 deletions(-) create mode 100644 tests/baselines/reference/commentLeadingCloseBrace.js create mode 100644 tests/baselines/reference/commentLeadingCloseBrace.symbols create mode 100644 tests/baselines/reference/commentLeadingCloseBrace.types create mode 100644 tests/cases/compiler/commentLeadingCloseBrace.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d3e46f0827d6a..7adac106e8c4d 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1347,6 +1347,8 @@ namespace ts { else { writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node); emitBlockStatements(node); + // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted + emitLeadingComments(node.statements.end, /*isEmittedNode*/true); writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node); } } diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js index 3c2e9c041fac0..25f390c0b320d 100644 --- a/tests/baselines/reference/amdImportAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js @@ -26,5 +26,6 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; if (foo.E1.A === 0) { + // Should cause runtime import - interesting optimization possibility, as gets inlined to 0. } }); diff --git a/tests/baselines/reference/argsInScope.js b/tests/baselines/reference/argsInScope.js index 90906426d240e..27405a47d8700 100644 --- a/tests/baselines/reference/argsInScope.js +++ b/tests/baselines/reference/argsInScope.js @@ -17,6 +17,7 @@ var C = (function () { } C.prototype.P = function (ii, j, k) { for (var i = 0; i < arguments.length; i++) { + // WScript.Echo("param: " + arguments[i]); } }; return C; diff --git a/tests/baselines/reference/commentLeadingCloseBrace.js b/tests/baselines/reference/commentLeadingCloseBrace.js new file mode 100644 index 0000000000000..9fc696219e1e1 --- /dev/null +++ b/tests/baselines/reference/commentLeadingCloseBrace.js @@ -0,0 +1,24 @@ +//// [commentLeadingCloseBrace.ts] +declare function commentedParameters(...args): any; + +function ifelse() { + if (commentedParameters(1, 2)) { + /*comment1*/ + commentedParameters(3, 4); + /*comment2*/ + } else { + commentedParameters(5, 6); + } +} + +//// [commentLeadingCloseBrace.js] +function ifelse() { + if (commentedParameters(1, 2)) { + /*comment1*/ + commentedParameters(3, 4); + /*comment2*/ + } + else { + commentedParameters(5, 6); + } +} diff --git a/tests/baselines/reference/commentLeadingCloseBrace.symbols b/tests/baselines/reference/commentLeadingCloseBrace.symbols new file mode 100644 index 0000000000000..72dcfb1e04710 --- /dev/null +++ b/tests/baselines/reference/commentLeadingCloseBrace.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/commentLeadingCloseBrace.ts === +declare function commentedParameters(...args): any; +>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0)) +>args : Symbol(args, Decl(commentLeadingCloseBrace.ts, 0, 37)) + +function ifelse() { +>ifelse : Symbol(ifelse, Decl(commentLeadingCloseBrace.ts, 0, 51)) + + if (commentedParameters(1, 2)) { +>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0)) + + /*comment1*/ + commentedParameters(3, 4); +>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0)) + + /*comment2*/ + } else { + commentedParameters(5, 6); +>commentedParameters : Symbol(commentedParameters, Decl(commentLeadingCloseBrace.ts, 0, 0)) + } +} diff --git a/tests/baselines/reference/commentLeadingCloseBrace.types b/tests/baselines/reference/commentLeadingCloseBrace.types new file mode 100644 index 0000000000000..444320737a6be --- /dev/null +++ b/tests/baselines/reference/commentLeadingCloseBrace.types @@ -0,0 +1,30 @@ +=== tests/cases/compiler/commentLeadingCloseBrace.ts === +declare function commentedParameters(...args): any; +>commentedParameters : (...args: any[]) => any +>args : any[] + +function ifelse() { +>ifelse : () => void + + if (commentedParameters(1, 2)) { +>commentedParameters(1, 2) : any +>commentedParameters : (...args: any[]) => any +>1 : 1 +>2 : 2 + + /*comment1*/ + commentedParameters(3, 4); +>commentedParameters(3, 4) : any +>commentedParameters : (...args: any[]) => any +>3 : 3 +>4 : 4 + + /*comment2*/ + } else { + commentedParameters(5, 6); +>commentedParameters(5, 6) : any +>commentedParameters : (...args: any[]) => any +>5 : 5 +>6 : 6 + } +} diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index b8cf42ea7622a..1eb7b5ff214fc 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -27,4 +27,5 @@ exports.C1 = C1; "use strict"; var foo = require("./foo_0"); if (foo.C1.s1) { +// Should cause runtime import } diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index 734b01eaed72d..432830d85b647 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -391,6 +391,7 @@ var TestRunner = (function () { } } if (testResult === false) { + //console.log(e.message); } } if ((testcase.errorMessageRegEx !== undefined) && !exception) { diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js index c9e16f359816d..bb2aa10dc95fd 100644 --- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js +++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js @@ -9,5 +9,6 @@ function foo(a) { //// [out.js] function foo(a) { for (var a_1 = 0; a_1 < 10; a_1++) { + // do something } } diff --git a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js index 5808ed7682683..18344df599426 100644 --- a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js +++ b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js @@ -27,6 +27,7 @@ function tryCatch() { //// [narrowExceptionVariableInCatchClause.js] function tryCatch() { try { + // do stuff... } catch (err) { if (isFooError(err)) { diff --git a/tests/baselines/reference/noCatchBlock.js b/tests/baselines/reference/noCatchBlock.js index 7b0404c3cadd7..158ac1257f31b 100644 --- a/tests/baselines/reference/noCatchBlock.js +++ b/tests/baselines/reference/noCatchBlock.js @@ -8,7 +8,9 @@ try { //// [noCatchBlock.js] try { +// ... } finally { +// N.B. No 'catch' block } //# sourceMappingURL=noCatchBlock.js.map \ No newline at end of file diff --git a/tests/baselines/reference/noCatchBlock.js.map b/tests/baselines/reference/noCatchBlock.js.map index 149a2167f46c6..ddac2894e0bbb 100644 --- a/tests/baselines/reference/noCatchBlock.js.map +++ b/tests/baselines/reference/noCatchBlock.js.map @@ -1,2 +1,2 @@ //// [noCatchBlock.js.map] -{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;AAEL,CAAC;QAAS,CAAC;AAEX,CAAC"} \ No newline at end of file +{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;AACJ,MAAM;AACP,CAAC;QAAS,CAAC;AACV,wBAAwB;AACzB,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/noCatchBlock.sourcemap.txt b/tests/baselines/reference/noCatchBlock.sourcemap.txt index 18cb0d5a479c0..a75c119ca9fac 100644 --- a/tests/baselines/reference/noCatchBlock.sourcemap.txt +++ b/tests/baselines/reference/noCatchBlock.sourcemap.txt @@ -12,6 +12,7 @@ sourceFile:noCatchBlock.ts 1 > 2 >^^^^ 3 > ^ +4 > ^^-> 1 > > 2 >try @@ -20,34 +21,51 @@ sourceFile:noCatchBlock.ts 2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) 3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) --- +>>>// ... +1-> +2 >^^^^^^ +1-> + > +2 >// ... +1->Emitted(2, 1) Source(3, 2) + SourceIndex(0) +2 >Emitted(2, 7) Source(3, 8) + SourceIndex(0) +--- >>>} 1 > 2 >^ 3 > ^^^^^^^^^-> 1 > - > // ... > 2 >} -1 >Emitted(2, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(2, 2) Source(4, 2) + SourceIndex(0) +1 >Emitted(3, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(3, 2) Source(4, 2) + SourceIndex(0) --- >>>finally { 1->^^^^^^^^ 2 > ^ +3 > ^^^^^^^^^^^^^^^^-> 1-> finally 2 > { -1->Emitted(3, 9) Source(4, 11) + SourceIndex(0) -2 >Emitted(3, 10) Source(4, 12) + SourceIndex(0) +1->Emitted(4, 9) Source(4, 11) + SourceIndex(0) +2 >Emitted(4, 10) Source(4, 12) + SourceIndex(0) +--- +>>>// N.B. No 'catch' block +1-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^ +1-> + > +2 >// N.B. No 'catch' block +1->Emitted(5, 1) Source(5, 2) + SourceIndex(0) +2 >Emitted(5, 25) Source(5, 26) + SourceIndex(0) --- >>>} 1 > 2 >^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > - > // N.B. No 'catch' block > 2 >} -1 >Emitted(4, 1) Source(6, 1) + SourceIndex(0) -2 >Emitted(4, 2) Source(6, 2) + SourceIndex(0) +1 >Emitted(6, 1) Source(6, 1) + SourceIndex(0) +2 >Emitted(6, 2) Source(6, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=noCatchBlock.js.map \ No newline at end of file diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js index f8a88fe2868fc..5f0399b2df286 100644 --- a/tests/baselines/reference/objectRestForOf.js +++ b/tests/baselines/reference/objectRestForOf.js @@ -37,4 +37,5 @@ for (let _b of array) { } for (const norest of array.map(a => (Object.assign({}, a, { x: 'a string' })))) { [norest.x, norest.y]; +// x is now a string. who knows why. } diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js index 907efc6f26a1e..4e4e23e81c378 100644 --- a/tests/baselines/reference/parserRealSource14.js +++ b/tests/baselines/reference/parserRealSource14.js @@ -1011,6 +1011,7 @@ var TypeScript; ctx.path.push(cur); } else { + //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack"); } } // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually diff --git a/tests/baselines/reference/recursiveReturns.js b/tests/baselines/reference/recursiveReturns.js index 18c9ed4dd7cab..56762a9ad2d32 100644 --- a/tests/baselines/reference/recursiveReturns.js +++ b/tests/baselines/reference/recursiveReturns.js @@ -23,6 +23,7 @@ function R1() { function R2() { R2(); } function R3(n) { if (n == 0) { + //return; } else { R3(n--); diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js b/tests/baselines/reference/sourceMap-SkippedNode.js index 656b5a244e901..daac27cf49f8b 100644 --- a/tests/baselines/reference/sourceMap-SkippedNode.js +++ b/tests/baselines/reference/sourceMap-SkippedNode.js @@ -7,7 +7,9 @@ try { //// [sourceMap-SkippedNode.js] try { +// ... } finally { +// N.B. No 'catch' block } //# sourceMappingURL=sourceMap-SkippedNode.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js.map b/tests/baselines/reference/sourceMap-SkippedNode.js.map index 77340424640dc..b86b3905a736c 100644 --- a/tests/baselines/reference/sourceMap-SkippedNode.js.map +++ b/tests/baselines/reference/sourceMap-SkippedNode.js.map @@ -1,2 +1,2 @@ //// [sourceMap-SkippedNode.js.map] -{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;AAEL,CAAC;QAAS,CAAC;AAEX,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;AACL,MAAM;AACN,CAAC;QAAS,CAAC;AACX,wBAAwB;AACxB,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt index f68320a531fd1..b48a5f09f4a98 100644 --- a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt @@ -12,6 +12,7 @@ sourceFile:sourceMap-SkippedNode.ts 1 > 2 >^^^^ 3 > ^ +4 > ^^-> 1 > 2 >try 3 > { @@ -19,34 +20,51 @@ sourceFile:sourceMap-SkippedNode.ts 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0) --- +>>>// ... +1-> +2 >^^^^^^ +1-> + > +2 >// ... +1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0) +--- >>>} 1 > 2 >^ 3 > ^^^^^^^^^-> 1 > - >// ... > 2 >} -1 >Emitted(2, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(2, 2) Source(3, 2) + SourceIndex(0) +1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) --- >>>finally { 1->^^^^^^^^ 2 > ^ +3 > ^^^^^^^^^^^^^^^^-> 1-> finally 2 > { -1->Emitted(3, 9) Source(3, 11) + SourceIndex(0) -2 >Emitted(3, 10) Source(3, 12) + SourceIndex(0) +1->Emitted(4, 9) Source(3, 11) + SourceIndex(0) +2 >Emitted(4, 10) Source(3, 12) + SourceIndex(0) +--- +>>>// N.B. No 'catch' block +1-> +2 >^^^^^^^^^^^^^^^^^^^^^^^^ +1-> + > +2 >// N.B. No 'catch' block +1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 25) Source(4, 25) + SourceIndex(0) --- >>>} 1 > 2 >^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > - >// N.B. No 'catch' block > 2 >} -1 >Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 2) Source(5, 2) + SourceIndex(0) +1 >Emitted(6, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(6, 2) Source(5, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMap-SkippedNode.js.map \ No newline at end of file diff --git a/tests/cases/compiler/commentLeadingCloseBrace.ts b/tests/cases/compiler/commentLeadingCloseBrace.ts new file mode 100644 index 0000000000000..bdf7a604a9bcf --- /dev/null +++ b/tests/cases/compiler/commentLeadingCloseBrace.ts @@ -0,0 +1,11 @@ +declare function commentedParameters(...args): any; + +function ifelse() { + if (commentedParameters(1, 2)) { + /*comment1*/ + commentedParameters(3, 4); + /*comment2*/ + } else { + commentedParameters(5, 6); + } +} \ No newline at end of file From bc6860428cb7f7338750ee8e77d6f405da28ec6c Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 7 Feb 2017 14:05:18 -0800 Subject: [PATCH 064/116] Always emit "__esModule" unless there is export = --- src/compiler/transformers/module/module.ts | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index a995df8f752ae..cdd3380b3b787 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -45,7 +45,6 @@ namespace ts { let currentSourceFile: SourceFile; // The current file. let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file. let noSubstitution: boolean[]; // Set of nodes for which substitution rules should be ignored. - let shouldAppendEsModuleMarker: boolean; // A boolean indicating whether "__esModule" should be emitted return transformSourceFile; @@ -63,7 +62,6 @@ namespace ts { currentSourceFile = node; currentModuleInfo = collectExternalModuleInfo(node, resolver, compilerOptions); - shouldAppendEsModuleMarker = false; moduleInfoMap[getOriginalNodeId(node)] = currentModuleInfo; // Perform the transformation. @@ -90,7 +88,7 @@ namespace ts { addRange(statements, endLexicalEnvironment()); addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); - if (shouldAppendEsModuleMarker) { + if (!currentModuleInfo.exportEquals) { append(statements, createUnderscoreUnderscoreESModule()); } @@ -387,7 +385,7 @@ namespace ts { // Append the 'export =' statement if provided. addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true); - if (shouldAppendEsModuleMarker) { + if (!currentModuleInfo.exportEquals) { append(statements, createUnderscoreUnderscoreESModule()); } @@ -674,7 +672,6 @@ namespace ts { } const generatedName = getGeneratedNameForNode(node); - shouldAppendEsModuleMarker = true; if (node.exportClause) { const statements: Statement[] = []; @@ -850,13 +847,6 @@ namespace ts { let variables: VariableDeclaration[]; let expressions: Expression[]; - const parseTreeNode = getParseTreeNode(node); - if (parseTreeNode && !shouldAppendEsModuleMarker) { - // class declaration get down-level transformed to be variable statement - shouldAppendEsModuleMarker = (parseTreeNode.kind === SyntaxKind.VariableStatement || parseTreeNode.kind === SyntaxKind.ClassDeclaration || parseTreeNode.kind === SyntaxKind.ImportEqualsDeclaration) - && hasModifier(parseTreeNode, ModifierFlags.Export); - } - if (hasModifier(node, ModifierFlags.Export)) { let modifiers: NodeArray; @@ -1146,7 +1136,6 @@ namespace ts { * @param allowComments Whether to allow comments on the export. */ function appendExportStatement(statements: Statement[] | undefined, exportName: Identifier, expression: Expression, location?: TextRange, allowComments?: boolean): Statement[] | undefined { - shouldAppendEsModuleMarker = true; statements = append(statements, createExportStatement(exportName, expression, location, allowComments)); return statements; } From ab60d319b2047c26cd1c73a4fd59012cc99a62fb Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 7 Feb 2017 14:07:55 -0800 Subject: [PATCH 065/116] Fix #13932: Change the order of overloads and allow union for `Object.create` --- src/lib/es5.d.ts | 12 +- .../reference/objectCreate-errors.errors.txt | 38 +++++++ .../reference/objectCreate-errors.js | 22 ++++ tests/baselines/reference/objectCreate.js | 28 +++++ .../baselines/reference/objectCreate.symbols | 73 +++++++++++++ tests/baselines/reference/objectCreate.types | 103 ++++++++++++++++++ tests/baselines/reference/objectCreate2.js | 28 +++++ .../baselines/reference/objectCreate2.symbols | 73 +++++++++++++ tests/baselines/reference/objectCreate2.types | 103 ++++++++++++++++++ tests/cases/compiler/objectCreate-errors.ts | 12 ++ tests/cases/compiler/objectCreate.ts | 15 +++ tests/cases/compiler/objectCreate2.ts | 15 +++ 12 files changed, 516 insertions(+), 6 deletions(-) create mode 100644 tests/baselines/reference/objectCreate-errors.errors.txt create mode 100644 tests/baselines/reference/objectCreate-errors.js create mode 100644 tests/baselines/reference/objectCreate.js create mode 100644 tests/baselines/reference/objectCreate.symbols create mode 100644 tests/baselines/reference/objectCreate.types create mode 100644 tests/baselines/reference/objectCreate2.js create mode 100644 tests/baselines/reference/objectCreate2.symbols create mode 100644 tests/baselines/reference/objectCreate2.types create mode 100644 tests/cases/compiler/objectCreate-errors.ts create mode 100644 tests/cases/compiler/objectCreate.ts create mode 100644 tests/cases/compiler/objectCreate2.ts diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts index 038d0344fda72..516bc890d4c08 100644 --- a/src/lib/es5.d.ts +++ b/src/lib/es5.d.ts @@ -137,16 +137,16 @@ interface ObjectConstructor { getOwnPropertyNames(o: any): string[]; /** - * Creates an object that has null prototype. - * @param o Object to use as a prototype. May be null + * Creates an object that has the specified prototype. + * @param o Object to use as a prototype. */ - create(o: null): any; + create(o: T): T; /** - * Creates an object that has the specified prototype, and that optionally contains specified properties. - * @param o Object to use as a prototype. May be null + * Creates an object that has the specified prototype or that has null prototype. + * @param o Object to use as a prototype. May be null. */ - create(o: T): T; + create(o: T | null): T | object; /** * Creates an object that has the specified prototype, and that optionally contains specified properties. diff --git a/tests/baselines/reference/objectCreate-errors.errors.txt b/tests/baselines/reference/objectCreate-errors.errors.txt new file mode 100644 index 0000000000000..38b9158351eb3 --- /dev/null +++ b/tests/baselines/reference/objectCreate-errors.errors.txt @@ -0,0 +1,38 @@ +tests/cases/compiler/objectCreate-errors.ts(2,24): error TS2345: Argument of type '1' is not assignable to parameter of type 'object | null'. +tests/cases/compiler/objectCreate-errors.ts(3,24): error TS2345: Argument of type '"string"' is not assignable to parameter of type 'object | null'. +tests/cases/compiler/objectCreate-errors.ts(4,24): error TS2345: Argument of type 'false' is not assignable to parameter of type 'object | null'. +tests/cases/compiler/objectCreate-errors.ts(5,24): error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'object | null'. +tests/cases/compiler/objectCreate-errors.ts(8,24): error TS2345: Argument of type '1' is not assignable to parameter of type 'object | null'. +tests/cases/compiler/objectCreate-errors.ts(9,24): error TS2345: Argument of type '"string"' is not assignable to parameter of type 'object | null'. +tests/cases/compiler/objectCreate-errors.ts(10,24): error TS2345: Argument of type 'false' is not assignable to parameter of type 'object | null'. +tests/cases/compiler/objectCreate-errors.ts(11,24): error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'object | null'. + + +==== tests/cases/compiler/objectCreate-errors.ts (8 errors) ==== + + var e1 = Object.create(1); // Error + ~ +!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'object | null'. + var e2 = Object.create("string"); // Error + ~~~~~~~~ +!!! error TS2345: Argument of type '"string"' is not assignable to parameter of type 'object | null'. + var e3 = Object.create(false); // Error + ~~~~~ +!!! error TS2345: Argument of type 'false' is not assignable to parameter of type 'object | null'. + var e4 = Object.create(undefined); // Error + ~~~~~~~~~ +!!! error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'object | null'. + + + var e5 = Object.create(1, {}); // Error + ~ +!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'object | null'. + var e6 = Object.create("string", {}); // Error + ~~~~~~~~ +!!! error TS2345: Argument of type '"string"' is not assignable to parameter of type 'object | null'. + var e7 = Object.create(false, {}); // Error + ~~~~~ +!!! error TS2345: Argument of type 'false' is not assignable to parameter of type 'object | null'. + var e8 = Object.create(undefined, {}); // Error + ~~~~~~~~~ +!!! error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'object | null'. \ No newline at end of file diff --git a/tests/baselines/reference/objectCreate-errors.js b/tests/baselines/reference/objectCreate-errors.js new file mode 100644 index 0000000000000..959b2f9473df3 --- /dev/null +++ b/tests/baselines/reference/objectCreate-errors.js @@ -0,0 +1,22 @@ +//// [objectCreate-errors.ts] + +var e1 = Object.create(1); // Error +var e2 = Object.create("string"); // Error +var e3 = Object.create(false); // Error +var e4 = Object.create(undefined); // Error + + +var e5 = Object.create(1, {}); // Error +var e6 = Object.create("string", {}); // Error +var e7 = Object.create(false, {}); // Error +var e8 = Object.create(undefined, {}); // Error + +//// [objectCreate-errors.js] +var e1 = Object.create(1); // Error +var e2 = Object.create("string"); // Error +var e3 = Object.create(false); // Error +var e4 = Object.create(undefined); // Error +var e5 = Object.create(1, {}); // Error +var e6 = Object.create("string", {}); // Error +var e7 = Object.create(false, {}); // Error +var e8 = Object.create(undefined, {}); // Error diff --git a/tests/baselines/reference/objectCreate.js b/tests/baselines/reference/objectCreate.js new file mode 100644 index 0000000000000..728fa8ca21aa0 --- /dev/null +++ b/tests/baselines/reference/objectCreate.js @@ -0,0 +1,28 @@ +//// [objectCreate.ts] + +declare var union: null | { a: number, b: string }; + +var n = Object.create(null); // object +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +var u = Object.create(union); // object | {a: number, b: string } +var e = Object.create({}); // {} +var o = Object.create({}); // object + +var a = Object.create(null, {}); // any +var a = Object.create({ a: 1, b: "" }, {}); +var a = Object.create(union, {}); +var a = Object.create({}, {}); +var a = Object.create({}, {}); + + +//// [objectCreate.js] +var n = Object.create(null); // object +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +var u = Object.create(union); // object | {a: number, b: string } +var e = Object.create({}); // {} +var o = Object.create({}); // object +var a = Object.create(null, {}); // any +var a = Object.create({ a: 1, b: "" }, {}); +var a = Object.create(union, {}); +var a = Object.create({}, {}); +var a = Object.create({}, {}); diff --git a/tests/baselines/reference/objectCreate.symbols b/tests/baselines/reference/objectCreate.symbols new file mode 100644 index 0000000000000..44cee102787e2 --- /dev/null +++ b/tests/baselines/reference/objectCreate.symbols @@ -0,0 +1,73 @@ +=== tests/cases/compiler/objectCreate.ts === + +declare var union: null | { a: number, b: string }; +>union : Symbol(union, Decl(objectCreate.ts, 1, 11)) +>a : Symbol(a, Decl(objectCreate.ts, 1, 27)) +>b : Symbol(b, Decl(objectCreate.ts, 1, 38)) + +var n = Object.create(null); // object +>n : Symbol(n, Decl(objectCreate.ts, 3, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +>t : Symbol(t, Decl(objectCreate.ts, 4, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>a : Symbol(a, Decl(objectCreate.ts, 4, 23)) +>b : Symbol(b, Decl(objectCreate.ts, 4, 29)) + +var u = Object.create(union); // object | {a: number, b: string } +>u : Symbol(u, Decl(objectCreate.ts, 5, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>union : Symbol(union, Decl(objectCreate.ts, 1, 11)) + +var e = Object.create({}); // {} +>e : Symbol(e, Decl(objectCreate.ts, 6, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var o = Object.create({}); // object +>o : Symbol(o, Decl(objectCreate.ts, 7, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var a = Object.create(null, {}); // any +>a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var a = Object.create({ a: 1, b: "" }, {}); +>a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>a : Symbol(a, Decl(objectCreate.ts, 10, 23)) +>b : Symbol(b, Decl(objectCreate.ts, 10, 29)) + +var a = Object.create(union, {}); +>a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>union : Symbol(union, Decl(objectCreate.ts, 1, 11)) + +var a = Object.create({}, {}); +>a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var a = Object.create({}, {}); +>a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/objectCreate.types b/tests/baselines/reference/objectCreate.types new file mode 100644 index 0000000000000..3c698cf54ff41 --- /dev/null +++ b/tests/baselines/reference/objectCreate.types @@ -0,0 +1,103 @@ +=== tests/cases/compiler/objectCreate.ts === + +declare var union: null | { a: number, b: string }; +>union : { a: number; b: string; } | null +>null : null +>a : number +>b : string + +var n = Object.create(null); // object +>n : object +>Object.create(null) : object +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>null : null + +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +>t : { a: number; b: string; } +>Object.create({ a: 1, b: "" }) : { a: number; b: string; } +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>{ a: 1, b: "" } : { a: number; b: string; } +>a : number +>1 : 1 +>b : string +>"" : "" + +var u = Object.create(union); // object | {a: number, b: string } +>u : object | { a: number; b: string; } +>Object.create(union) : object | { a: number; b: string; } +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>union : { a: number; b: string; } | null + +var e = Object.create({}); // {} +>e : {} +>Object.create({}) : {} +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>{} : {} + +var o = Object.create({}); // object +>o : object +>Object.create({}) : object +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>{} : object +>{} : {} + +var a = Object.create(null, {}); // any +>a : any +>Object.create(null, {}) : any +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>null : null +>{} : {} + +var a = Object.create({ a: 1, b: "" }, {}); +>a : any +>Object.create({ a: 1, b: "" }, {}) : any +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>{ a: 1, b: "" } : { a: number; b: string; } +>a : number +>1 : 1 +>b : string +>"" : "" +>{} : {} + +var a = Object.create(union, {}); +>a : any +>Object.create(union, {}) : any +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>union : { a: number; b: string; } | null +>{} : {} + +var a = Object.create({}, {}); +>a : any +>Object.create({}, {}) : any +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>{} : {} +>{} : {} + +var a = Object.create({}, {}); +>a : any +>Object.create({}, {}) : any +>Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>{} : object +>{} : {} +>{} : {} + diff --git a/tests/baselines/reference/objectCreate2.js b/tests/baselines/reference/objectCreate2.js new file mode 100644 index 0000000000000..cfc79c2ef355e --- /dev/null +++ b/tests/baselines/reference/objectCreate2.js @@ -0,0 +1,28 @@ +//// [objectCreate2.ts] + +declare var union: null | { a: number, b: string }; + +var n = Object.create(null); // any +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +var u = Object.create(union); // {a: number, b: string } +var e = Object.create({}); // {} +var o = Object.create({}); // object + +var a = Object.create(null, {}); // any +var a = Object.create({ a: 1, b: "" }, {}); +var a = Object.create(union, {}); +var a = Object.create({}, {}); +var a = Object.create({}, {}); + + +//// [objectCreate2.js] +var n = Object.create(null); // any +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +var u = Object.create(union); // {a: number, b: string } +var e = Object.create({}); // {} +var o = Object.create({}); // object +var a = Object.create(null, {}); // any +var a = Object.create({ a: 1, b: "" }, {}); +var a = Object.create(union, {}); +var a = Object.create({}, {}); +var a = Object.create({}, {}); diff --git a/tests/baselines/reference/objectCreate2.symbols b/tests/baselines/reference/objectCreate2.symbols new file mode 100644 index 0000000000000..e10db7899c158 --- /dev/null +++ b/tests/baselines/reference/objectCreate2.symbols @@ -0,0 +1,73 @@ +=== tests/cases/compiler/objectCreate2.ts === + +declare var union: null | { a: number, b: string }; +>union : Symbol(union, Decl(objectCreate2.ts, 1, 11)) +>a : Symbol(a, Decl(objectCreate2.ts, 1, 27)) +>b : Symbol(b, Decl(objectCreate2.ts, 1, 38)) + +var n = Object.create(null); // any +>n : Symbol(n, Decl(objectCreate2.ts, 3, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +>t : Symbol(t, Decl(objectCreate2.ts, 4, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>a : Symbol(a, Decl(objectCreate2.ts, 4, 23)) +>b : Symbol(b, Decl(objectCreate2.ts, 4, 29)) + +var u = Object.create(union); // {a: number, b: string } +>u : Symbol(u, Decl(objectCreate2.ts, 5, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>union : Symbol(union, Decl(objectCreate2.ts, 1, 11)) + +var e = Object.create({}); // {} +>e : Symbol(e, Decl(objectCreate2.ts, 6, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var o = Object.create({}); // object +>o : Symbol(o, Decl(objectCreate2.ts, 7, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var a = Object.create(null, {}); // any +>a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var a = Object.create({ a: 1, b: "" }, {}); +>a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>a : Symbol(a, Decl(objectCreate2.ts, 10, 23)) +>b : Symbol(b, Decl(objectCreate2.ts, 10, 29)) + +var a = Object.create(union, {}); +>a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>union : Symbol(union, Decl(objectCreate2.ts, 1, 11)) + +var a = Object.create({}, {}); +>a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +var a = Object.create({}, {}); +>a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/objectCreate2.types b/tests/baselines/reference/objectCreate2.types new file mode 100644 index 0000000000000..1066688772bdd --- /dev/null +++ b/tests/baselines/reference/objectCreate2.types @@ -0,0 +1,103 @@ +=== tests/cases/compiler/objectCreate2.ts === + +declare var union: null | { a: number, b: string }; +>union : { a: number; b: string; } +>null : null +>a : number +>b : string + +var n = Object.create(null); // any +>n : any +>Object.create(null) : any +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>null : null + +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +>t : { a: number; b: string; } +>Object.create({ a: 1, b: "" }) : { a: number; b: string; } +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>{ a: 1, b: "" } : { a: number; b: string; } +>a : number +>1 : 1 +>b : string +>"" : "" + +var u = Object.create(union); // {a: number, b: string } +>u : { a: number; b: string; } +>Object.create(union) : { a: number; b: string; } +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>union : { a: number; b: string; } + +var e = Object.create({}); // {} +>e : {} +>Object.create({}) : {} +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>{} : {} + +var o = Object.create({}); // object +>o : object +>Object.create({}) : object +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>{} : object +>{} : {} + +var a = Object.create(null, {}); // any +>a : any +>Object.create(null, {}) : any +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>null : null +>{} : {} + +var a = Object.create({ a: 1, b: "" }, {}); +>a : any +>Object.create({ a: 1, b: "" }, {}) : any +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>{ a: 1, b: "" } : { a: number; b: string; } +>a : number +>1 : 1 +>b : string +>"" : "" +>{} : {} + +var a = Object.create(union, {}); +>a : any +>Object.create(union, {}) : any +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>union : { a: number; b: string; } +>{} : {} + +var a = Object.create({}, {}); +>a : any +>Object.create({}, {}) : any +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>{} : {} +>{} : {} + +var a = Object.create({}, {}); +>a : any +>Object.create({}, {}) : any +>Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object : ObjectConstructor +>create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>{} : object +>{} : {} +>{} : {} + diff --git a/tests/cases/compiler/objectCreate-errors.ts b/tests/cases/compiler/objectCreate-errors.ts new file mode 100644 index 0000000000000..ea7b8bd95abfe --- /dev/null +++ b/tests/cases/compiler/objectCreate-errors.ts @@ -0,0 +1,12 @@ +// @strictNullChecks: true + +var e1 = Object.create(1); // Error +var e2 = Object.create("string"); // Error +var e3 = Object.create(false); // Error +var e4 = Object.create(undefined); // Error + + +var e5 = Object.create(1, {}); // Error +var e6 = Object.create("string", {}); // Error +var e7 = Object.create(false, {}); // Error +var e8 = Object.create(undefined, {}); // Error \ No newline at end of file diff --git a/tests/cases/compiler/objectCreate.ts b/tests/cases/compiler/objectCreate.ts new file mode 100644 index 0000000000000..a497ff6b95b3e --- /dev/null +++ b/tests/cases/compiler/objectCreate.ts @@ -0,0 +1,15 @@ +// @strictNullChecks: true + +declare var union: null | { a: number, b: string }; + +var n = Object.create(null); // object +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +var u = Object.create(union); // object | {a: number, b: string } +var e = Object.create({}); // {} +var o = Object.create({}); // object + +var a = Object.create(null, {}); // any +var a = Object.create({ a: 1, b: "" }, {}); +var a = Object.create(union, {}); +var a = Object.create({}, {}); +var a = Object.create({}, {}); diff --git a/tests/cases/compiler/objectCreate2.ts b/tests/cases/compiler/objectCreate2.ts new file mode 100644 index 0000000000000..d28adaae32e1f --- /dev/null +++ b/tests/cases/compiler/objectCreate2.ts @@ -0,0 +1,15 @@ +// @strictNullChecks: false + +declare var union: null | { a: number, b: string }; + +var n = Object.create(null); // any +var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } +var u = Object.create(union); // {a: number, b: string } +var e = Object.create({}); // {} +var o = Object.create({}); // object + +var a = Object.create(null, {}); // any +var a = Object.create({ a: 1, b: "" }, {}); +var a = Object.create(union, {}); +var a = Object.create({}, {}); +var a = Object.create({}, {}); From 6621096d5f20fda66699d2c779f9368000bfa0b3 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 7 Feb 2017 14:22:55 -0800 Subject: [PATCH 066/116] Update baselines --- tests/baselines/reference/APISample_transform.js | 1 + tests/baselines/reference/APISample_watcher.js | 1 + tests/baselines/reference/ExportAssignment7.js | 1 - tests/baselines/reference/ExportAssignment8.js | 1 - ...ModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js | 2 ++ tests/baselines/reference/aliasAssignments.js | 1 + tests/baselines/reference/aliasOnMergedModuleInterface.js | 1 + tests/baselines/reference/aliasUsageInAccessorsOfClass.js | 1 + tests/baselines/reference/aliasUsageInArray.js | 1 + tests/baselines/reference/aliasUsageInFunctionExpression.js | 1 + tests/baselines/reference/aliasUsageInGenericFunction.js | 1 + tests/baselines/reference/aliasUsageInIndexerOfClass.js | 1 + tests/baselines/reference/aliasUsageInObjectLiteral.js | 1 + tests/baselines/reference/aliasUsageInOrExpression.js | 1 + .../reference/aliasUsageInTypeArgumentOfExtendsClause.js | 1 + tests/baselines/reference/aliasUsageInVarAssignment.js | 1 + ...aliasWithInterfaceExportAssignmentUsedInVarInitializer.js | 2 ++ tests/baselines/reference/allowSyntheticDefaultImports10.js | 1 + tests/baselines/reference/allowSyntheticDefaultImports9.js | 1 + tests/baselines/reference/ambientDeclarationsExternal.js | 1 + tests/baselines/reference/ambientDeclarationsPatterns.js | 1 + .../ambientExternalModuleInsideNonAmbientExternalModule.js | 1 + tests/baselines/reference/ambientExternalModuleMerging.js | 1 + .../ambientExternalModuleWithInternalImportDeclaration.js | 1 + .../ambientExternalModuleWithoutInternalImportDeclaration.js | 1 + .../reference/ambientInsideNonAmbientExternalModule.js | 1 + tests/baselines/reference/ambientNameRestrictions.js | 1 + tests/baselines/reference/ambientShorthand.js | 1 + tests/baselines/reference/ambientShorthand_duplicate.js | 1 + tests/baselines/reference/ambientShorthand_merging.js | 1 + tests/baselines/reference/ambientShorthand_reExport.js | 1 + tests/baselines/reference/amdDependencyComment1.js | 1 + tests/baselines/reference/amdDependencyComment2.js | 1 + tests/baselines/reference/amdDependencyCommentName1.js | 1 + tests/baselines/reference/amdDependencyCommentName2.js | 1 + tests/baselines/reference/amdDependencyCommentName3.js | 1 + tests/baselines/reference/amdDependencyCommentName4.js | 1 + tests/baselines/reference/amdImportAsPrimaryExpression.js | 2 ++ tests/baselines/reference/amdImportNotAsPrimaryExpression.js | 1 + tests/baselines/reference/asOperator4.js | 1 + tests/baselines/reference/asyncAwaitIsolatedModules_es5.js | 1 + tests/baselines/reference/asyncImportedPromise_es5.js | 1 + tests/baselines/reference/asyncImportedPromise_es6.js | 1 + tests/baselines/reference/augmentExportEquals1.js | 2 ++ tests/baselines/reference/augmentExportEquals1_1.js | 2 ++ tests/baselines/reference/augmentExportEquals2.js | 2 ++ tests/baselines/reference/augmentExportEquals2_1.js | 2 ++ tests/baselines/reference/augmentExportEquals3.js | 2 ++ tests/baselines/reference/augmentExportEquals3_1.js | 2 ++ tests/baselines/reference/augmentExportEquals4.js | 2 ++ tests/baselines/reference/augmentExportEquals4_1.js | 2 ++ tests/baselines/reference/augmentExportEquals5.js | 2 ++ tests/baselines/reference/augmentExportEquals6.js | 2 ++ tests/baselines/reference/augmentExportEquals6_1.js | 2 ++ tests/baselines/reference/badExternalModuleReference.js | 1 + tests/baselines/reference/bangInModuleName.js | 1 + tests/baselines/reference/cachedModuleResolution1.js | 2 ++ tests/baselines/reference/cachedModuleResolution2.js | 2 ++ tests/baselines/reference/cachedModuleResolution3.js | 2 ++ tests/baselines/reference/cachedModuleResolution4.js | 2 ++ tests/baselines/reference/cachedModuleResolution5.js | 2 ++ tests/baselines/reference/cachedModuleResolution6.js | 2 ++ tests/baselines/reference/cachedModuleResolution7.js | 2 ++ tests/baselines/reference/cachedModuleResolution8.js | 2 ++ tests/baselines/reference/cachedModuleResolution9.js | 2 ++ tests/baselines/reference/chainedImportAlias.js | 2 ++ tests/baselines/reference/circularReference.js | 2 ++ .../reference/collisionExportsRequireAndAmbientClass.js | 1 + .../reference/collisionExportsRequireAndAmbientEnum.js | 1 + .../reference/collisionExportsRequireAndAmbientFunction.js | 1 + .../reference/collisionExportsRequireAndAmbientVar.js | 1 + tests/baselines/reference/collisionExportsRequireAndEnum.js | 1 + .../collisionExportsRequireAndInternalModuleAlias.js | 1 + tests/baselines/reference/commentOnExportEnumDeclaration.js | 1 + tests/baselines/reference/commentOnImportStatement1.js | 1 + tests/baselines/reference/commentOnImportStatement2.js | 1 + tests/baselines/reference/commentOnImportStatement3.js | 1 + tests/baselines/reference/commentsDottedModuleName.js | 1 + tests/baselines/reference/commentsExternalModules.js | 2 ++ tests/baselines/reference/commentsExternalModules2.js | 1 + tests/baselines/reference/commentsExternalModules3.js | 1 + tests/baselines/reference/commentsMultiModuleMultiFile.js | 2 ++ .../baselines/reference/commonJSImportAsPrimaryExpression.js | 1 + .../reference/commonJSImportNotAsPrimaryExpression.js | 1 + tests/baselines/reference/commonSourceDirectory.js | 1 + .../baselines/reference/commonSourceDirectory.sourcemap.txt | 3 ++- tests/baselines/reference/commonjsSafeImport.js | 1 + tests/baselines/reference/constDeclarations-access5.js | 1 + tests/baselines/reference/constEnumExternalModule.js | 2 ++ tests/baselines/reference/controlFlowBinaryOrExpression.js | 1 + tests/baselines/reference/copyrightWithNewLine1.js | 1 + tests/baselines/reference/copyrightWithoutNewLine1.js | 1 + tests/baselines/reference/declFileCallSignatures.js | 1 + tests/baselines/reference/declFileConstructSignatures.js | 1 + .../reference/declFileExportAssignmentOfGenericInterface.js | 1 + tests/baselines/reference/declFileExportImportChain.js | 2 ++ tests/baselines/reference/declFileExportImportChain2.js | 1 + tests/baselines/reference/declFileIndexSignatures.js | 1 + .../baselines/reference/declarationEmitIndexTypeNotFound.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias1.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias2.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias3.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias5.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias6.js | 1 + .../baselines/reference/declarationEmitInferedTypeAlias7.js | 1 + tests/baselines/reference/declarationEmitInvalidExport.js | 1 + tests/baselines/reference/declarationEmitNameConflicts.js | 1 + .../reference/declarationEmitNameConflictsWithAlias.js | 1 + .../reference/declarationEmitTypeAliasWithTypeParameters5.js | 1 + tests/baselines/reference/declarationMerging2.js | 1 + .../reference/decoratorInstantiateModulesInFunctionBodies.js | 1 + tests/baselines/reference/decoratorMetadata.js | 1 + tests/baselines/reference/decoratorOnImportEquals2.js | 1 + .../baselines/reference/defaultExportInAwaitExpression01.js | 1 + .../baselines/reference/defaultExportInAwaitExpression02.js | 1 + tests/baselines/reference/defaultExportsCannotMerge01.js | 1 + tests/baselines/reference/defaultExportsCannotMerge02.js | 1 + tests/baselines/reference/defaultExportsCannotMerge03.js | 1 + .../reference/destructuringInVariableDeclarations2.js | 1 + .../reference/destructuringInVariableDeclarations4.js | 1 + .../reference/destructuringInVariableDeclarations6.js | 1 + tests/baselines/reference/duplicateStringNamedProperty1.js | 1 + tests/baselines/reference/duplicateSymbolsExportMatching.js | 1 + tests/baselines/reference/elidingImportNames.js | 1 + tests/baselines/reference/emptyModuleName.js | 1 + tests/baselines/reference/enumFromExternalModule.js | 2 ++ .../reference/errorForConflictingExportEqualsValue.js | 1 - tests/baselines/reference/errorsOnImportedSymbol.js | 2 ++ tests/baselines/reference/es3defaultAliasIsQuoted.js | 1 + tests/baselines/reference/es5ModuleInternalNamedImports.js | 1 + tests/baselines/reference/es6ImportDefaultBindingAmd.js | 1 + .../es6ImportDefaultBindingFollowedWithNamedImport.js | 1 + .../es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js | 1 + .../es6ImportDefaultBindingFollowedWithNamedImportInEs5.js | 1 + ...ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js | 1 + ...6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js | 1 + tests/baselines/reference/es6ImportDefaultBindingInEs5.js | 1 + .../reference/es6ImportDefaultBindingMergeErrors.js | 1 + .../reference/es6ImportDefaultBindingNoDefaultProperty.js | 1 + tests/baselines/reference/es6ImportNameSpaceImport.js | 1 + tests/baselines/reference/es6ImportNameSpaceImportAmd.js | 1 + tests/baselines/reference/es6ImportNameSpaceImportInEs5.js | 1 + .../reference/es6ImportNameSpaceImportMergeErrors.js | 1 + .../reference/es6ImportNameSpaceImportNoNamedExports.js | 1 + tests/baselines/reference/es6ImportNamedImport.js | 1 + tests/baselines/reference/es6ImportNamedImportAmd.js | 1 + tests/baselines/reference/es6ImportNamedImportInEs5.js | 1 + .../es6ImportNamedImportInIndirectExportAssignment.js | 1 + tests/baselines/reference/es6ImportNamedImportMergeErrors.js | 1 + .../reference/es6ImportNamedImportNoExportMember.js | 1 + .../reference/es6ImportNamedImportNoNamedExports.js | 1 + tests/baselines/reference/es6ImportWithoutFromClauseAmd.js | 1 + tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js | 1 + .../reference/es6ImportWithoutFromClauseWithExport.js | 1 + tests/baselines/reference/exportAssignClassAndModule.js | 1 + tests/baselines/reference/exportAssignImportedIdentifier.js | 1 + tests/baselines/reference/exportAssignTypes.js | 1 + .../reference/exportAssignedTypeAsTypeAnnotation.js | 2 ++ tests/baselines/reference/exportAssignmentClass.js | 1 + .../reference/exportAssignmentConstrainedGenericType.js | 1 + tests/baselines/reference/exportAssignmentEnum.js | 1 + tests/baselines/reference/exportAssignmentFunction.js | 1 + tests/baselines/reference/exportAssignmentGenericType.js | 1 + tests/baselines/reference/exportAssignmentInterface.js | 2 ++ tests/baselines/reference/exportAssignmentInternalModule.js | 1 + tests/baselines/reference/exportAssignmentMergedInterface.js | 2 ++ tests/baselines/reference/exportAssignmentMergedModule.js | 1 + .../reference/exportAssignmentOfDeclaredExternalModule.js | 2 ++ tests/baselines/reference/exportAssignmentOfGenericType1.js | 1 + tests/baselines/reference/exportAssignmentTopLevelClodule.js | 1 + .../baselines/reference/exportAssignmentTopLevelEnumdule.js | 1 + tests/baselines/reference/exportAssignmentTopLevelFundule.js | 1 + .../reference/exportAssignmentTopLevelIdentifier.js | 1 + tests/baselines/reference/exportAssignmentVariable.js | 1 + tests/baselines/reference/exportAssignmentWithExports.js | 1 - .../exportDeclarationWithModuleSpecifierNameOnNextLine1.js | 1 + tests/baselines/reference/exportDeclareClass1.js | 1 + tests/baselines/reference/exportDeclaredModule.js | 1 + tests/baselines/reference/exportDefaultProperty.js | 1 + tests/baselines/reference/exportDefaultProperty2.js | 1 + tests/baselines/reference/exportEqualCallable.js | 1 + tests/baselines/reference/exportEqualErrorType.js | 1 + tests/baselines/reference/exportEqualMemberMissing.js | 1 + tests/baselines/reference/exportEqualsDefaultProperty.js | 1 + tests/baselines/reference/exportEqualsProperty.js | 1 + tests/baselines/reference/exportEqualsProperty2.js | 1 + tests/baselines/reference/exportImport.js | 1 + tests/baselines/reference/exportImportMultipleFiles.js | 2 ++ .../reference/exportImportNonInstantiatedModule2.js | 2 ++ .../reference/exportSpecifierReferencingOuterDeclaration2.js | 1 + .../reference/exportSpecifierReferencingOuterDeclaration4.js | 1 + tests/baselines/reference/exportStar-amd.js | 1 + tests/baselines/reference/exportStar.js | 1 + tests/baselines/reference/exportStarForValues.js | 2 ++ tests/baselines/reference/exportStarForValues2.js | 3 +++ tests/baselines/reference/exportStarForValues3.js | 5 +++++ tests/baselines/reference/exportStarForValues4.js | 3 +++ tests/baselines/reference/exportStarForValues5.js | 1 + tests/baselines/reference/exportStarForValues7.js | 1 + tests/baselines/reference/exportStarForValues8.js | 1 + tests/baselines/reference/exportStarForValues9.js | 1 + tests/baselines/reference/exportStarFromEmptyModule.js | 1 + .../exportedInterfaceInaccessibleInCallbackInModule.js | 1 + .../exportsAndImportsWithContextualKeywordNames01.js | 3 +++ .../exportsAndImportsWithContextualKeywordNames02.js | 3 +++ .../baselines/reference/exportsAndImportsWithUnderscores1.js | 1 + .../baselines/reference/exportsAndImportsWithUnderscores2.js | 1 + .../baselines/reference/exportsAndImportsWithUnderscores3.js | 1 + .../baselines/reference/exportsAndImportsWithUnderscores4.js | 1 + tests/baselines/reference/extendClassExpressionFromModule.js | 1 + .../reference/extendingClassFromAliasAndUsageInIndexer.js | 1 + tests/baselines/reference/externalModuleAssignToVar.js | 1 + .../reference/externalModuleExportingGenericClass.js | 1 + tests/baselines/reference/externalModuleImmutableBindings.js | 1 + ...alModuleReferenceOfImportDeclarationWithExportModifier.js | 1 + ...ternalModuleRefernceResolutionOrderInImportDeclaration.js | 1 + tests/baselines/reference/externalModuleResolution.js | 1 + tests/baselines/reference/externalModuleResolution2.js | 1 + .../reference/externalModuleWithoutCompilerFlag1.js | 1 + tests/baselines/reference/genericArrayExtenstions.js | 1 + .../reference/genericRecursiveImplicitConstructorErrors1.js | 1 + tests/baselines/reference/genericTypeWithMultipleBases1.js | 1 + tests/baselines/reference/genericTypeWithMultipleBases2.js | 1 + .../reference/getEmitOutputWithEmitterErrors2.baseline | 1 + .../reference/globalAugmentationModuleResolution.js | 1 + .../importAliasAnExternalModuleInsideAnInternalModule.js | 2 ++ tests/baselines/reference/importAsBaseClass.js | 1 + .../importDeclRefereingExternalModuleWithNoResolve.js | 1 + tests/baselines/reference/importHelpersInAmbientContext.js | 1 + tests/baselines/reference/importHelpersInIsolatedModules.js | 1 + tests/baselines/reference/importImportOnlyModule.js | 2 ++ tests/baselines/reference/importInsideModule.js | 1 + tests/baselines/reference/importNonExternalModule.js | 1 + tests/baselines/reference/importNonStringLiteral.js | 1 + tests/baselines/reference/importTsBeforeDTs.js | 1 + tests/baselines/reference/importUsedInExtendsList1.js | 1 + tests/baselines/reference/importWithTrailingSlash.js | 2 ++ .../baselines/reference/importWithTrailingSlash_noResolve.js | 1 + tests/baselines/reference/import_reference-exported-alias.js | 1 + tests/baselines/reference/import_reference-to-type-alias.js | 2 ++ ...ed-require-when-referenecing-aliased-type-throug-array.js | 1 + .../import_var-referencing-an-imported-module-alias.js | 1 + tests/baselines/reference/importedAliasesInTypePositions.js | 2 ++ tests/baselines/reference/importedModuleClassNameClash.js | 1 + tests/baselines/reference/importsImplicitlyReadonly.js | 1 + tests/baselines/reference/inferenceLimit.js | 1 + tests/baselines/reference/instanceOfInExternalModules.js | 1 + tests/baselines/reference/interfaceContextualType.js | 1 + tests/baselines/reference/interfaceDeclaration3.js | 1 + .../internalAliasClassInsideLocalModuleWithoutExport.js | 1 + .../internalAliasEnumInsideLocalModuleWithExport.js | 1 + .../internalAliasEnumInsideLocalModuleWithoutExport.js | 1 + ...rnalAliasEnumInsideLocalModuleWithoutExportAccessError.js | 1 + .../internalAliasFunctionInsideLocalModuleWithExport.js | 1 + .../internalAliasFunctionInsideLocalModuleWithoutExport.js | 1 + ...AliasFunctionInsideLocalModuleWithoutExportAccessError.js | 1 + ...ernalAliasInitializedModuleInsideLocalModuleWithExport.js | 1 + ...alAliasInitializedModuleInsideLocalModuleWithoutExport.js | 1 + .../internalAliasInterfaceInsideLocalModuleWithExport.js | 1 + .../internalAliasInterfaceInsideLocalModuleWithoutExport.js | 1 + ...liasInterfaceInsideLocalModuleWithoutExportAccessError.js | 1 + ...nalAliasUninitializedModuleInsideLocalModuleWithExport.js | 1 + ...AliasUninitializedModuleInsideLocalModuleWithoutExport.js | 1 + .../reference/internalAliasVarInsideLocalModuleWithExport.js | 1 + .../internalAliasVarInsideLocalModuleWithoutExport.js | 1 + tests/baselines/reference/isolatedModulesPlainFile-AMD.js | 1 + .../baselines/reference/isolatedModulesPlainFile-CommonJS.js | 1 + tests/baselines/reference/isolatedModulesPlainFile-UMD.js | 1 + tests/baselines/reference/jsxEmitWithAttributes.js | 1 + tests/baselines/reference/jsxFactoryAndReactNamespace.js | 1 + tests/baselines/reference/jsxFactoryIdentifier.js | 1 + tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt | 3 ++- .../reference/jsxFactoryNotIdentifierOrQualifiedName.js | 1 + .../reference/jsxFactoryNotIdentifierOrQualifiedName2.js | 1 + tests/baselines/reference/jsxFactoryQualifiedName.js | 1 + .../reference/jsxFactoryQualifiedName.sourcemap.txt | 3 ++- tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js | 1 + tests/baselines/reference/jsxImportInAttribute.js | 1 + tests/baselines/reference/jsxViaImport.2.js | 1 + tests/baselines/reference/jsxViaImport.js | 1 + tests/baselines/reference/keepImportsInDts1.js | 1 + tests/baselines/reference/keepImportsInDts2.js | 2 ++ tests/baselines/reference/keepImportsInDts3.js | 2 ++ tests/baselines/reference/keepImportsInDts4.js | 2 ++ tests/baselines/reference/localAliasExportAssignment.js | 1 + .../reference/memberAccessMustUseModuleInstances.js | 1 + tests/baselines/reference/mergeWithImportedNamespace.js | 2 ++ tests/baselines/reference/mergeWithImportedType.js | 2 ++ tests/baselines/reference/mergedDeclarations7.js | 1 + tests/baselines/reference/mergedModuleDeclarationCodeGen.js | 1 + tests/baselines/reference/metadataOfEventAlias.js | 1 + tests/baselines/reference/missingFunctionImplementation2.js | 2 ++ .../baselines/reference/missingSemicolonInModuleSpecifier.js | 1 + tests/baselines/reference/moduleAliasAsFunctionArgument.js | 1 + .../moduleAugmentationCollidingNamesInAugmentation1.js | 4 ++++ .../reference/moduleAugmentationDeclarationEmit1.js | 3 +++ .../reference/moduleAugmentationDeclarationEmit2.js | 3 +++ .../reference/moduleAugmentationDisallowedExtensions.js | 2 ++ .../reference/moduleAugmentationExtendAmbientModule1.js | 2 ++ .../reference/moduleAugmentationExtendAmbientModule2.js | 2 ++ .../reference/moduleAugmentationExtendFileModule1.js | 3 +++ .../reference/moduleAugmentationExtendFileModule2.js | 3 +++ tests/baselines/reference/moduleAugmentationGlobal1.js | 1 + tests/baselines/reference/moduleAugmentationGlobal2.js | 1 + tests/baselines/reference/moduleAugmentationGlobal3.js | 2 ++ tests/baselines/reference/moduleAugmentationGlobal4.js | 3 +++ tests/baselines/reference/moduleAugmentationGlobal5.js | 1 + tests/baselines/reference/moduleAugmentationGlobal8.js | 1 + tests/baselines/reference/moduleAugmentationGlobal8_1.js | 1 + .../reference/moduleAugmentationImportsAndExports1.js | 2 ++ .../reference/moduleAugmentationImportsAndExports2.js | 2 ++ .../reference/moduleAugmentationImportsAndExports3.js | 2 ++ .../reference/moduleAugmentationImportsAndExports4.js | 2 ++ .../reference/moduleAugmentationImportsAndExports5.js | 2 ++ .../reference/moduleAugmentationImportsAndExports6.js | 2 ++ .../reference/moduleAugmentationInAmbientModule1.js | 1 + .../reference/moduleAugmentationInAmbientModule2.js | 1 + .../reference/moduleAugmentationInAmbientModule3.js | 1 + .../reference/moduleAugmentationInAmbientModule4.js | 1 + .../reference/moduleAugmentationInAmbientModule5.js | 1 + tests/baselines/reference/moduleAugmentationInDependency.js | 1 + tests/baselines/reference/moduleAugmentationInDependency2.js | 2 ++ tests/baselines/reference/moduleAugmentationNoNewNames.js | 3 +++ .../baselines/reference/moduleAugmentationsBundledOutput1.js | 3 +++ tests/baselines/reference/moduleAugmentationsImports1.js | 2 ++ tests/baselines/reference/moduleAugmentationsImports2.js | 3 +++ tests/baselines/reference/moduleAugmentationsImports3.js | 2 ++ tests/baselines/reference/moduleAugmentationsImports4.js | 1 + tests/baselines/reference/moduleCodegenTest4.js | 1 + tests/baselines/reference/moduleExports1.js | 1 + .../reference/moduleImportedForTypeArgumentPosition.js | 2 ++ tests/baselines/reference/moduleInTypePosition1.js | 1 + tests/baselines/reference/moduleMergeConstructor.js | 1 + tests/baselines/reference/moduleResolutionNoResolve.js | 1 + tests/baselines/reference/moduleResolutionNoTs.js | 1 + tests/baselines/reference/moduleResolutionWithExtensions.js | 3 +++ .../reference/moduleResolutionWithExtensions_notSupported.js | 1 + .../moduleResolutionWithExtensions_notSupported2.js | 1 + .../moduleResolutionWithExtensions_notSupported3.js | 1 + .../reference/moduleResolutionWithExtensions_preferTs.js | 1 + .../reference/moduleResolutionWithExtensions_unexpected.js | 1 + .../reference/moduleResolutionWithExtensions_unexpected2.js | 1 + .../moduleResolutionWithExtensions_withAmbientPresent.js | 1 + tests/baselines/reference/moduleResolutionWithSymlinks.js | 1 + .../moduleResolutionWithSymlinks_notInNodeModules.js | 1 + .../reference/moduleResolutionWithSymlinks_withOutDir.js | 1 + .../reference/moduleSameValueDuplicateExportedBindings2.js | 1 + tests/baselines/reference/moduleScoping.js | 1 + tests/baselines/reference/multiImportExport.js | 2 ++ tests/baselines/reference/multipleDefaultExports01.js | 1 + tests/baselines/reference/multipleDefaultExports02.js | 1 + tests/baselines/reference/multipleExports.js | 1 + tests/baselines/reference/nameDelimitedBySlashes.js | 1 + tests/baselines/reference/nameWithFileExtension.js | 1 + tests/baselines/reference/nameWithRelativePaths.js | 2 ++ tests/baselines/reference/nodeResolution1.js | 1 + tests/baselines/reference/nodeResolution2.js | 1 + tests/baselines/reference/nodeResolution3.js | 1 + tests/baselines/reference/nodeResolution4.js | 1 + tests/baselines/reference/nodeResolution5.js | 1 + tests/baselines/reference/nodeResolution6.js | 1 + tests/baselines/reference/nodeResolution7.js | 1 + tests/baselines/reference/nodeResolution8.js | 1 + tests/baselines/reference/nounusedTypeParameterConstraint.js | 2 ++ tests/baselines/reference/objectIndexer.js | 1 + tests/baselines/reference/overloadModifiersMustAgree.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 + tests/baselines/reference/parserExportAssignment7.js | 1 - tests/baselines/reference/parserExportAssignment8.js | 1 - tests/baselines/reference/parserInterfaceDeclaration6.js | 1 + tests/baselines/reference/parserInterfaceDeclaration7.js | 1 + tests/baselines/reference/parserModule1.js | 1 + .../reference/pathMappingBasedModuleResolution3_classic.js | 1 + .../reference/pathMappingBasedModuleResolution3_node.js | 1 + .../reference/pathMappingBasedModuleResolution4_classic.js | 1 + .../reference/pathMappingBasedModuleResolution4_node.js | 1 + .../reference/pathMappingBasedModuleResolution5_classic.js | 1 + .../reference/pathMappingBasedModuleResolution5_node.js | 1 + .../reference/pathMappingBasedModuleResolution6_classic.js | 1 + .../reference/pathMappingBasedModuleResolution6_node.js | 1 + .../reference/pathMappingBasedModuleResolution7_classic.js | 1 + .../reference/pathMappingBasedModuleResolution7_node.js | 1 + .../pathMappingBasedModuleResolution_withExtension.js | 1 + ...appingBasedModuleResolution_withExtension_failedLookup.js | 1 + ...privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js | 1 + ...ivacyCheckExternalModuleExportAssignmentOfGenericClass.js | 1 + .../reference/privacyInterfaceExtendsClauseDeclFile.js | 1 + .../privacyLocalInternalReferenceImportWithExport.js | 1 + .../privacyLocalInternalReferenceImportWithoutExport.js | 1 + tests/baselines/reference/project/baseline/amd/emit.js | 1 + tests/baselines/reference/project/baseline/node/emit.js | 1 + tests/baselines/reference/project/baseline2/amd/dont_emit.js | 1 + .../baselines/reference/project/baseline2/node/dont_emit.js | 1 + .../reference/project/baseline3/amd/nestedModule.js | 1 + .../reference/project/baseline3/node/nestedModule.js | 1 + .../project/declarationsImportedInPrivate/amd/useModule.js | 1 + .../project/declarationsImportedInPrivate/node/useModule.js | 1 + .../project/nodeModulesImportHigher/amd/importHigher/root.js | 1 + .../nodeModulesImportHigher/node/importHigher/root.js | 1 + .../amd/maxDepthExceeded/built/root.js | 1 + .../node/maxDepthExceeded/built/root.js | 1 + .../amd/maxDepthIncreased/root.js | 1 + .../node/maxDepthIncreased/root.js | 1 + tests/baselines/reference/project/nonRelative/amd/consume.js | 1 + .../baselines/reference/project/nonRelative/node/consume.js | 1 + .../visibilityOfTypeUsedAcrossModules/amd/commands.js | 1 + .../project/visibilityOfTypeUsedAcrossModules/amd/server.js | 1 + .../visibilityOfTypeUsedAcrossModules/node/commands.js | 1 + .../project/visibilityOfTypeUsedAcrossModules/node/server.js | 1 + .../reference/propertyIdentityWithPrivacyMismatch.js | 1 + tests/baselines/reference/reExportDefaultExport.js | 1 + tests/baselines/reference/reExportGlobalDeclaration1.js | 1 + tests/baselines/reference/reExportGlobalDeclaration2.js | 1 + tests/baselines/reference/reExportGlobalDeclaration3.js | 1 + tests/baselines/reference/reExportGlobalDeclaration4.js | 1 + tests/baselines/reference/reExportUndefined1.js | 1 + tests/baselines/reference/reExportUndefined2.js | 1 + tests/baselines/reference/reactNamespaceImportPresevation.js | 1 + tests/baselines/reference/recursiveMods.js | 1 + tests/baselines/reference/reexportClassDefinition.js | 1 + .../baselines/reference/relativeNamesInClassicResolution.js | 1 + tests/baselines/reference/relativePathMustResolve.js | 1 + tests/baselines/reference/relativePathToDeclarationFile.js | 1 + .../baselines/reference/requireAsFunctionInExternalModule.js | 1 + tests/baselines/reference/requireEmitSemicolon.js | 2 ++ tests/baselines/reference/requireOfAnEmptyFile1.js | 1 + tests/baselines/reference/reservedWords2.js | 1 + tests/baselines/reference/reuseInnerModuleMember.js | 2 ++ tests/baselines/reference/scannerEnum1.js | 1 + tests/baselines/reference/shebangBeforeReferences.js | 1 + tests/baselines/reference/shorthand-property-es6-amd.js | 1 + .../reference/shorthandPropertyAssignmentInES6Module.js | 1 + tests/baselines/reference/staticInstanceResolution3.js | 1 + tests/baselines/reference/staticInstanceResolution5.js | 1 + .../strictModeReservedWordInImportEqualDeclaration.js | 1 + tests/baselines/reference/topLevelAmbientModule.js | 1 + tests/baselines/reference/topLevelFileModule.js | 1 + tests/baselines/reference/topLevelFileModuleMissing.js | 1 + .../baselines/reference/topLevelModuleDeclarationAndFile.js | 1 + .../baselines/reference/transformNestedGeneratorsWithTry.js | 1 + ...serialize metadata when transpile with CommonJS option.js | 1 + .../transpile/Does not generate semantic diagnostics.js | 1 + .../transpile/Generates expected syntactic diagnostics.js | 1 + .../baselines/reference/transpile/Generates module output.js | 1 + .../Generates no diagnostics for missing file references.js | 1 + .../Generates no diagnostics for missing module imports.js | 1 + .../transpile/Generates no diagnostics with valid inputs.js | 1 + .../transpile/No extra errors for file without extension.js | 1 + .../reference/transpile/Rename dependencies - AMD.js | 1 + .../reference/transpile/Rename dependencies - UMD.js | 1 + ...rror when compiler-options module-kind is out-of-range.js | 1 + ...or when compiler-options target-script is out-of-range.js | 1 + .../reference/transpile/Support options with lib values.js | 1 + .../reference/transpile/Support options with types values.js | 1 + .../reference/transpile/Supports backslashes in file name.js | 1 + .../reference/transpile/Supports setting allowJs.js | 1 + .../Supports setting allowSyntheticDefaultImports.js | 1 + .../transpile/Supports setting allowUnreachableCode.js | 1 + .../transpile/Supports setting allowUnusedLabels.js | 1 + .../reference/transpile/Supports setting alwaysStrict.js | 1 + .../reference/transpile/Supports setting baseUrl.js | 1 + .../reference/transpile/Supports setting charset.js | 1 + .../reference/transpile/Supports setting declaration.js | 1 + .../reference/transpile/Supports setting declarationDir.js | 1 + .../reference/transpile/Supports setting emitBOM.js | 1 + .../transpile/Supports setting emitDecoratorMetadata.js | 1 + .../transpile/Supports setting experimentalDecorators.js | 1 + .../Supports setting forceConsistentCasingInFileNames.js | 1 + .../reference/transpile/Supports setting isolatedModules.js | 1 + tests/baselines/reference/transpile/Supports setting jsx.js | 1 + .../reference/transpile/Supports setting jsxFactory.js | 1 + tests/baselines/reference/transpile/Supports setting lib.js | 1 + .../baselines/reference/transpile/Supports setting locale.js | 1 + .../baselines/reference/transpile/Supports setting module.js | 1 + .../reference/transpile/Supports setting moduleResolution.js | 1 + .../reference/transpile/Supports setting newLine.js | 1 + .../baselines/reference/transpile/Supports setting noEmit.js | 1 + .../reference/transpile/Supports setting noEmitHelpers.js | 1 + .../reference/transpile/Supports setting noEmitOnError.js | 1 + .../transpile/Supports setting noErrorTruncation.js | 1 + .../transpile/Supports setting noFallthroughCasesInSwitch.js | 1 + .../reference/transpile/Supports setting noImplicitAny.js | 1 + .../transpile/Supports setting noImplicitReturns.js | 1 + .../reference/transpile/Supports setting noImplicitThis.js | 1 + .../transpile/Supports setting noImplicitUseStrict.js | 1 + .../baselines/reference/transpile/Supports setting noLib.js | 1 + .../reference/transpile/Supports setting noResolve.js | 1 + tests/baselines/reference/transpile/Supports setting out.js | 1 + .../baselines/reference/transpile/Supports setting outDir.js | 1 + .../reference/transpile/Supports setting outFile.js | 1 + .../baselines/reference/transpile/Supports setting paths.js | 1 + .../transpile/Supports setting preserveConstEnums.js | 1 + .../reference/transpile/Supports setting reactNamespace.js | 1 + .../reference/transpile/Supports setting removeComments.js | 1 + .../reference/transpile/Supports setting rootDir.js | 1 + .../reference/transpile/Supports setting rootDirs.js | 1 + .../transpile/Supports setting skipDefaultLibCheck.js | 1 + .../reference/transpile/Supports setting skipLibCheck.js | 1 + .../reference/transpile/Supports setting strictNullChecks.js | 1 + .../reference/transpile/Supports setting stripInternal.js | 1 + .../Supports setting suppressExcessPropertyErrors.js | 1 + .../Supports setting suppressImplicitAnyIndexErrors.js | 1 + .../reference/transpile/Supports setting typeRoots.js | 1 + .../baselines/reference/transpile/Supports setting types.js | 1 + .../reference/transpile/Supports urls in file name.js | 1 + .../reference/transpile/Uses correct newLine character.js | 1 + tests/baselines/reference/transpile/transpile .js files.js | 1 + .../transpile/transpile file as tsx if jsx is specified.js | 1 + tests/baselines/reference/tsxDefaultImports.js | 1 + tests/baselines/reference/tsxElementResolution17.js | 1 + tests/baselines/reference/tsxElementResolution19.js | 1 + tests/baselines/reference/tsxExternalModuleEmit2.js | 1 + tests/baselines/reference/tsxPreserveEmit1.js | 1 + tests/baselines/reference/tsxPreserveEmit3.js | 1 + tests/baselines/reference/tsxReactEmit5.js | 1 + tests/baselines/reference/tsxStatelessFunctionComponents2.js | 1 + tests/baselines/reference/tsxStatelessFunctionComponents3.js | 1 + tests/baselines/reference/tsxUnionTypeComponent1.js | 1 + tests/baselines/reference/tsxUnionTypeComponent2.js | 1 + tests/baselines/reference/typeAliasDeclarationEmit.js | 1 + tests/baselines/reference/typeAliasDeclarationEmit2.js | 1 + ...bjectCreationExpressionWithUndefinedCallResolutionData.js | 1 + .../typeParameterCompatibilityAccrossDeclarations.js | 1 + tests/baselines/reference/typeReferenceDirectives10.js | 1 + tests/baselines/reference/typeReferenceDirectives13.js | 1 + tests/baselines/reference/typeReferenceDirectives5.js | 1 + tests/baselines/reference/typeReferenceDirectives9.js | 1 + tests/baselines/reference/typeResolution.js | 1 + tests/baselines/reference/typeResolution.sourcemap.txt | 1 + .../reference/typeRootsFromMultipleNodeModulesDirectories.js | 1 + .../reference/typeRootsFromNodeModulesInParentDirectory.js | 1 + tests/baselines/reference/typeUsedAsValueError2.js | 3 +++ tests/baselines/reference/typeofAmbientExternalModules.js | 1 + tests/baselines/reference/typeofExternalModules.js | 1 + .../reference/typesOnlyExternalModuleStillHasInstance.js | 2 ++ tests/baselines/reference/typingsLookup4.js | 1 + tests/baselines/reference/typingsLookupAmd.js | 1 + tests/baselines/reference/umd-augmentation-1.js | 1 + tests/baselines/reference/umd-augmentation-3.js | 1 + tests/baselines/reference/umd3.js | 1 + tests/baselines/reference/umd4.js | 1 + tests/baselines/reference/umd5.js | 1 + tests/baselines/reference/umd8.js | 1 + tests/baselines/reference/umdDependencyComment2.js | 1 + tests/baselines/reference/umdDependencyCommentName1.js | 1 + tests/baselines/reference/umdDependencyCommentName2.js | 1 + tests/baselines/reference/umdGlobalConflict.js | 1 + tests/baselines/reference/unclosedExportClause02.js | 4 ++++ tests/baselines/reference/undeclaredModuleError.js | 1 + tests/baselines/reference/untypedModuleImport.js | 3 +++ tests/baselines/reference/untypedModuleImport_allowJs.js | 1 + .../baselines/reference/untypedModuleImport_noImplicitAny.js | 1 + .../reference/untypedModuleImport_noLocalImports.js | 1 + tests/baselines/reference/untypedModuleImport_vsAmbient.js | 1 + .../reference/untypedModuleImport_withAugmentation.js | 1 + .../reference/untypedModuleImport_withAugmentation2.js | 1 + tests/baselines/reference/unusedImportDeclaration.js | 1 + tests/baselines/reference/unusedImports1.js | 1 + tests/baselines/reference/unusedImports11.js | 1 + tests/baselines/reference/unusedImports12.js | 1 + tests/baselines/reference/unusedImports2.js | 1 + tests/baselines/reference/unusedImports3.js | 1 + tests/baselines/reference/unusedImports4.js | 1 + tests/baselines/reference/unusedImports5.js | 1 + tests/baselines/reference/unusedImports6.js | 1 + tests/baselines/reference/unusedImports7.js | 1 + tests/baselines/reference/unusedImports8.js | 1 + tests/baselines/reference/unusedImports9.js | 1 + tests/baselines/reference/unusedLocalsAndParameters.js | 1 + .../baselines/reference/unusedLocalsAndParametersDeferred.js | 1 + .../reference/unusedLocalsAndParametersTypeAliases.js | 1 + .../reference/unusedLocalsAndParametersTypeAliases2.js | 1 + .../baselines/reference/visibilityOfCrossModuleTypeUsage.js | 3 +++ tests/baselines/reference/voidAsNonAmbiguousReturnType.js | 1 + tests/baselines/reference/withImportDecl.js | 1 + 578 files changed, 686 insertions(+), 9 deletions(-) diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index b0783d42a0615..1156d6433543e 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -27,3 +27,4 @@ var ts = require("typescript"); var source = "let x: string = 'string'"; var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS }); console.log(JSON.stringify(result)); +exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index cb7fc3a4c5c92..d877071a228f2 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -189,3 +189,4 @@ var currentDirectoryFiles = fs.readdirSync(process.cwd()). filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; }); // Start the watcher watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS }); +exports.__esModule = true; diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js index 66cb590907592..461631e0e7d0d 100644 --- a/tests/baselines/reference/ExportAssignment7.js +++ b/tests/baselines/reference/ExportAssignment7.js @@ -12,4 +12,3 @@ var C = (function () { return C; }()); module.exports = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js index 8e29d7914fd6d..d09630080125a 100644 --- a/tests/baselines/reference/ExportAssignment8.js +++ b/tests/baselines/reference/ExportAssignment8.js @@ -12,4 +12,3 @@ var C = (function () { return C; }()); module.exports = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js index 03a504a888aed..8fa171ed05a96 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js @@ -42,6 +42,7 @@ var A; })(Utils = A.Utils || (A.Utils = {})); A.Origin = { x: 0, y: 0 }; })(A = exports.A || (exports.A = {})); +exports.__esModule = true; //// [part2.js] "use strict"; var A; @@ -60,3 +61,4 @@ var A; Utils.Plane = Plane; })(Utils = A.Utils || (A.Utils = {})); })(A = exports.A || (exports.A = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js index 7a69de02cfe1e..84e20daa7c7f3 100644 --- a/tests/baselines/reference/aliasAssignments.js +++ b/tests/baselines/reference/aliasAssignments.js @@ -29,3 +29,4 @@ var x = moduleA; x = 1; // Should be error var y = 1; y = moduleA; // should be error +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js index ee9562e7b7751..8fbeaf78d9547 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.js +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js @@ -27,3 +27,4 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err 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 +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js index 0b05a0c3c637b..03888704e70fa 100644 --- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js +++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js @@ -76,3 +76,4 @@ var C2 = (function () { }); return C2; }()); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js index 5e864df3d0f67..5be50e00f30a5 100644 --- a/tests/baselines/reference/aliasUsageInArray.js +++ b/tests/baselines/reference/aliasUsageInArray.js @@ -57,3 +57,4 @@ exports.__esModule = true; var moduleA = require("./aliasUsageInArray_moduleA"); var xs = [moduleA]; var xs2 = [moduleA]; +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js index d84253f7992ce..0f15ecda6ac7c 100644 --- a/tests/baselines/reference/aliasUsageInFunctionExpression.js +++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js @@ -56,3 +56,4 @@ exports.__esModule = true; var moduleA = require("./aliasUsageInFunctionExpression_moduleA"); var f = function (x) { return x; }; f = function (x) { return moduleA; }; +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js index 53e702ba2271a..8c61ddeefb8c5 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.js +++ b/tests/baselines/reference/aliasUsageInGenericFunction.js @@ -63,3 +63,4 @@ function foo(x) { } var r = foo({ a: moduleA }); var r2 = foo({ a: null }); +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js index 0a53d6605dde5..acd4dd1f533f5 100644 --- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js +++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js @@ -71,3 +71,4 @@ var N2 = (function () { } return N2; }()); +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js index f9202b0206740..10dcc50083c20 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.js +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js @@ -58,3 +58,4 @@ var moduleA = require("./aliasUsageInObjectLiteral_moduleA"); var a = { x: moduleA }; var b = { x: moduleA }; var c = { y: { z: moduleA } }; +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js index a40d3679b63f3..07dea7ea22da8 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.js +++ b/tests/baselines/reference/aliasUsageInOrExpression.js @@ -64,3 +64,4 @@ var d2 = i || moduleA; var d2 = moduleA || i; var e = null || { x: moduleA }; var f = null ? { x: moduleA } : null; +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js index de566b4dd539e..509797bd2608b 100644 --- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js +++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js @@ -82,3 +82,4 @@ var D = (function (_super) { } return D; }(C)); +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js index dbee55622665e..e5c7af13078fd 100644 --- a/tests/baselines/reference/aliasUsageInVarAssignment.js +++ b/tests/baselines/reference/aliasUsageInVarAssignment.js @@ -55,3 +55,4 @@ exports.__esModule = true; "use strict"; var i; var m = i; +exports.__esModule = true; diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js index 8304be3a036d3..9cc8372a0bb69 100644 --- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js +++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js @@ -12,6 +12,8 @@ var d = b.q3; //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.js] "use strict"; +exports.__esModule = true; //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js] "use strict"; var d = b.q3; +exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js index 396cd75b57461..09e80cc799f1f 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports10.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports10.js @@ -15,3 +15,4 @@ Foo.default.default.foo(); var Foo = require("./b"); Foo["default"].bar(); Foo["default"]["default"].foo(); +exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js index 15810ccaaf703..a455f0e757001 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports9.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js @@ -15,3 +15,4 @@ Foo.foo(); var b_1 = require("./b"); b_1["default"].bar(); b_1["default"].foo(); +exports.__esModule = true; diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js index b92993128abdd..7f8741d3baf4c 100644 --- a/tests/baselines/reference/ambientDeclarationsExternal.js +++ b/tests/baselines/reference/ambientDeclarationsExternal.js @@ -32,3 +32,4 @@ var n: number; var imp3 = require("equ2"); var n = imp3.x; var n; +exports.__esModule = true; diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js index 143f26550e997..fac34990e5e9b 100644 --- a/tests/baselines/reference/ambientDeclarationsPatterns.js +++ b/tests/baselines/reference/ambientDeclarationsPatterns.js @@ -42,3 +42,4 @@ foobarbaz_1.foo(foosball_1.foos); // Works with relative file name var file_text_1 = require("./file!text"); foobarbaz_1.foo(file_text_1["default"]); +exports.__esModule = true; diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js index bb0d3a907ae7c..401af4b5214b1 100644 --- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js +++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js @@ -4,4 +4,5 @@ export declare module "M" { } //// [ambientExternalModuleInsideNonAmbientExternalModule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js index 217d7cb90c1a0..0dddb3a307c73 100644 --- a/tests/baselines/reference/ambientExternalModuleMerging.js +++ b/tests/baselines/reference/ambientExternalModuleMerging.js @@ -22,5 +22,6 @@ define(["require", "exports", "M"], function (require, exports, M) { // Should be strings var x = M.x; var y = M.y; + exports.__esModule = true; }); //// [ambientExternalModuleMerging_declare.js] diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js index c91adaff864c0..537c765a482c4 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js @@ -23,4 +23,5 @@ var c = new A(); define(["require", "exports", "M"], function (require, exports, A) { "use strict"; var c = new A(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js index 4c70a338bc32f..692c57073324f 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js @@ -22,4 +22,5 @@ var c = new A(); define(["require", "exports", "M"], function (require, exports, A) { "use strict"; var c = new A(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js index 0e2d08ae07b17..689cd6a12420b 100644 --- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js +++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.js @@ -8,4 +8,5 @@ export declare module M { } //// [ambientInsideNonAmbientExternalModule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/ambientNameRestrictions.js b/tests/baselines/reference/ambientNameRestrictions.js index cd4fbf29371f0..b35f1241b2d15 100644 --- a/tests/baselines/reference/ambientNameRestrictions.js +++ b/tests/baselines/reference/ambientNameRestrictions.js @@ -6,3 +6,4 @@ export declare namespace Foo { //// [ambientNameRestrictions.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js index 109264fc91b14..5dd15c8e0efd5 100644 --- a/tests/baselines/reference/ambientShorthand.js +++ b/tests/baselines/reference/ambientShorthand.js @@ -20,3 +20,4 @@ var jquery_1 = require("jquery"); var baz = require("fs"); var boom = require("jquery"); jquery_1["default"](jquery_1.bar, baz, boom); +exports.__esModule = true; diff --git a/tests/baselines/reference/ambientShorthand_duplicate.js b/tests/baselines/reference/ambientShorthand_duplicate.js index d99eb3d27dc35..08d03c83ed0e6 100644 --- a/tests/baselines/reference/ambientShorthand_duplicate.js +++ b/tests/baselines/reference/ambientShorthand_duplicate.js @@ -14,3 +14,4 @@ import foo from "foo"; //// [user.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/ambientShorthand_merging.js b/tests/baselines/reference/ambientShorthand_merging.js index f0aaefc636626..15714a48997e8 100644 --- a/tests/baselines/reference/ambientShorthand_merging.js +++ b/tests/baselines/reference/ambientShorthand_merging.js @@ -16,3 +16,4 @@ import foo, {bar} from "foo"; //// [user.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js index 0d9a14c0f153e..6818cca28d3d8 100644 --- a/tests/baselines/reference/ambientShorthand_reExport.js +++ b/tests/baselines/reference/ambientShorthand_reExport.js @@ -34,3 +34,4 @@ var reExportX_1 = require("./reExportX"); var $ = require("./reExportAll"); // '$' is not callable, it is an object. reExportX_1.x($); +exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js index 2c0bdd551fa0a..1c5594ea7c309 100644 --- a/tests/baselines/reference/amdDependencyComment1.js +++ b/tests/baselines/reference/amdDependencyComment1.js @@ -9,3 +9,4 @@ m1.f(); "use strict"; var m1 = require("m2"); m1.f(); +exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js index 6867b03f60651..db87e4e942205 100644 --- a/tests/baselines/reference/amdDependencyComment2.js +++ b/tests/baselines/reference/amdDependencyComment2.js @@ -9,4 +9,5 @@ m1.f(); define(["require", "exports", "m2", "bar"], function (require, exports, m1) { "use strict"; m1.f(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js index 19024a09f3cd6..e886d4b1579fb 100644 --- a/tests/baselines/reference/amdDependencyCommentName1.js +++ b/tests/baselines/reference/amdDependencyCommentName1.js @@ -9,3 +9,4 @@ m1.f(); "use strict"; var m1 = require("m2"); m1.f(); +exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js index d60207e2becad..bb2fc9a2389ac 100644 --- a/tests/baselines/reference/amdDependencyCommentName2.js +++ b/tests/baselines/reference/amdDependencyCommentName2.js @@ -9,4 +9,5 @@ m1.f(); define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) { "use strict"; m1.f(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js index 1792c0c2aa002..dafbe2463f96c 100644 --- a/tests/baselines/reference/amdDependencyCommentName3.js +++ b/tests/baselines/reference/amdDependencyCommentName3.js @@ -13,4 +13,5 @@ m1.f(); define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) { "use strict"; m1.f(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js index 52b1010036566..d82eab0d12f60 100644 --- a/tests/baselines/reference/amdDependencyCommentName4.js +++ b/tests/baselines/reference/amdDependencyCommentName4.js @@ -31,4 +31,5 @@ define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule aliasedModule2_1.p1; aliasedModule3_1["default"]; ns; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js index 3c2e9c041fac0..b127532206963 100644 --- a/tests/baselines/reference/amdImportAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js @@ -21,10 +21,12 @@ define(["require", "exports"], function (require, exports) { E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); + exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; if (foo.E1.A === 0) { } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index 781142b406174..7f75124dba78e 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -58,4 +58,5 @@ define(["require", "exports"], function (require, exports) { var y = false; var z; var e = 0; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js index 672d311a70265..b19fa3ca14c1e 100644 --- a/tests/baselines/reference/asOperator4.js +++ b/tests/baselines/reference/asOperator4.js @@ -23,3 +23,4 @@ var foo_1 = require("./foo"); // These should emit identically foo_1.foo; foo_1.foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js index 4940426700942..06b9fd1468252 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js @@ -190,3 +190,4 @@ var M; } M.f1 = f1; })(M || (M = {})); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js index ceabda5889995..25a771ffbfbb5 100644 --- a/tests/baselines/reference/asyncImportedPromise_es5.js +++ b/tests/baselines/reference/asyncImportedPromise_es5.js @@ -78,3 +78,4 @@ var Test = (function () { }; return Test; }()); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js index 923af2e55cd63..b3fa2c4b491ee 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.js +++ b/tests/baselines/reference/asyncImportedPromise_es6.js @@ -30,3 +30,4 @@ class Test { return __awaiter(this, void 0, void 0, function* () { return; }); } } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js index 98322c01a34c9..ef176ac90daa3 100644 --- a/tests/baselines/reference/augmentExportEquals1.js +++ b/tests/baselines/reference/augmentExportEquals1.js @@ -28,9 +28,11 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "./file2"], function (require, exports) { "use strict"; var a; // should not work + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js index 08f032ff33f1c..1e094701f79d0 100644 --- a/tests/baselines/reference/augmentExportEquals1_1.js +++ b/tests/baselines/reference/augmentExportEquals1_1.js @@ -25,9 +25,11 @@ let a: x.A; // should not work //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; var a; // should not work + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js index fc373173e3c44..fe55906b65787 100644 --- a/tests/baselines/reference/augmentExportEquals2.js +++ b/tests/baselines/reference/augmentExportEquals2.js @@ -27,9 +27,11 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "./file2"], function (require, exports) { "use strict"; var a; // should not work + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js index 9046157bb2626..5b80ef1d5123c 100644 --- a/tests/baselines/reference/augmentExportEquals2_1.js +++ b/tests/baselines/reference/augmentExportEquals2_1.js @@ -25,9 +25,11 @@ let a: x.A; // should not work //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; var a; // should not work + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js index 94cb0f8ce9557..3e12c9968d22e 100644 --- a/tests/baselines/reference/augmentExportEquals3.js +++ b/tests/baselines/reference/augmentExportEquals3.js @@ -37,10 +37,12 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; x.b = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; var a; var b = x.b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js index fc6b7b1cec35e..9fd08cb8f7f45 100644 --- a/tests/baselines/reference/augmentExportEquals3_1.js +++ b/tests/baselines/reference/augmentExportEquals3_1.js @@ -31,10 +31,12 @@ let b = x.b; define(["require", "exports", "file1"], function (require, exports, x) { "use strict"; x.b = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "file1", "file2"], function (require, exports, x) { "use strict"; var a; var b = x.b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js index ff0cbd44e0b6c..1a83e86f3fcd0 100644 --- a/tests/baselines/reference/augmentExportEquals4.js +++ b/tests/baselines/reference/augmentExportEquals4.js @@ -41,10 +41,12 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; x.b = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; var a; var b = x.b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js index b4ba932d44b4c..e039e7dcda642 100644 --- a/tests/baselines/reference/augmentExportEquals4_1.js +++ b/tests/baselines/reference/augmentExportEquals4_1.js @@ -32,10 +32,12 @@ let b = x.b; define(["require", "exports", "file1"], function (require, exports, x) { "use strict"; x.b = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "file1", "file2"], function (require, exports, x) { "use strict"; var a; var b = x.b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js index 49b6c3fed564a..ee26ddda90e8a 100644 --- a/tests/baselines/reference/augmentExportEquals5.js +++ b/tests/baselines/reference/augmentExportEquals5.js @@ -85,10 +85,12 @@ const y = x.id; //// [augmentation.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [consumer.js] define(["require", "exports", "./augmentation"], function (require, exports) { "use strict"; var x; var y = x.id; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js index 3f9cbbb0af895..2db5bc66e3ca7 100644 --- a/tests/baselines/reference/augmentExportEquals6.js +++ b/tests/baselines/reference/augmentExportEquals6.js @@ -53,6 +53,7 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; x.B.b = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { @@ -60,4 +61,5 @@ define(["require", "exports", "./file1", "./file2"], function (require, exports, var a; var b = a.a; var c = x.B.b; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js index c7c560183cc2d..6ba3534610941 100644 --- a/tests/baselines/reference/augmentExportEquals6_1.js +++ b/tests/baselines/reference/augmentExportEquals6_1.js @@ -29,10 +29,12 @@ let b = a.a; //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; var a; var b = a.a; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/badExternalModuleReference.js b/tests/baselines/reference/badExternalModuleReference.js index 4f9e1aae5078a..c1608b4c57e20 100644 --- a/tests/baselines/reference/badExternalModuleReference.js +++ b/tests/baselines/reference/badExternalModuleReference.js @@ -9,4 +9,5 @@ export declare var a: { //// [badExternalModuleReference.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/bangInModuleName.js b/tests/baselines/reference/bangInModuleName.js index 2fe13e00cf047..f58827e1ae5f1 100644 --- a/tests/baselines/reference/bangInModuleName.js +++ b/tests/baselines/reference/bangInModuleName.js @@ -21,4 +21,5 @@ import * as http from 'intern/dojo/node!http'; /// define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/cachedModuleResolution1.js b/tests/baselines/reference/cachedModuleResolution1.js index 9071b60d6c1bb..d93133cca406e 100644 --- a/tests/baselines/reference/cachedModuleResolution1.js +++ b/tests/baselines/reference/cachedModuleResolution1.js @@ -12,5 +12,7 @@ import {x} from "foo"; //// [app.js] "use strict"; +exports.__esModule = true; //// [lib.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution2.js b/tests/baselines/reference/cachedModuleResolution2.js index 7c84a92abaf5d..c5c3357f65ad1 100644 --- a/tests/baselines/reference/cachedModuleResolution2.js +++ b/tests/baselines/reference/cachedModuleResolution2.js @@ -13,5 +13,7 @@ import {x} from "foo"; //// [lib.js] "use strict"; +exports.__esModule = true; //// [app.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution3.js b/tests/baselines/reference/cachedModuleResolution3.js index 032c1afee0e89..d476eafd2e8c1 100644 --- a/tests/baselines/reference/cachedModuleResolution3.js +++ b/tests/baselines/reference/cachedModuleResolution3.js @@ -12,5 +12,7 @@ import {x} from "foo"; //// [app.js] "use strict"; +exports.__esModule = true; //// [lib.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution4.js b/tests/baselines/reference/cachedModuleResolution4.js index 6089de9706bd6..4cc656d73d34c 100644 --- a/tests/baselines/reference/cachedModuleResolution4.js +++ b/tests/baselines/reference/cachedModuleResolution4.js @@ -13,5 +13,7 @@ import {x} from "foo"; //// [lib.js] "use strict"; +exports.__esModule = true; //// [app.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution5.js b/tests/baselines/reference/cachedModuleResolution5.js index 33561e8eae268..35fad11d90e50 100644 --- a/tests/baselines/reference/cachedModuleResolution5.js +++ b/tests/baselines/reference/cachedModuleResolution5.js @@ -12,5 +12,7 @@ import {x} from "foo"; //// [app.js] "use strict"; +exports.__esModule = true; //// [lib.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution6.js b/tests/baselines/reference/cachedModuleResolution6.js index f21f491a921de..1e6803b115ca5 100644 --- a/tests/baselines/reference/cachedModuleResolution6.js +++ b/tests/baselines/reference/cachedModuleResolution6.js @@ -9,5 +9,7 @@ import {x} from "foo"; //// [app.js] "use strict"; +exports.__esModule = true; //// [lib.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution7.js b/tests/baselines/reference/cachedModuleResolution7.js index 8b86dcd55af4c..044eefff73a62 100644 --- a/tests/baselines/reference/cachedModuleResolution7.js +++ b/tests/baselines/reference/cachedModuleResolution7.js @@ -10,5 +10,7 @@ import {x} from "foo"; //// [lib.js] "use strict"; +exports.__esModule = true; //// [app.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution8.js b/tests/baselines/reference/cachedModuleResolution8.js index 1c00b171f21d2..fe89a8f288f45 100644 --- a/tests/baselines/reference/cachedModuleResolution8.js +++ b/tests/baselines/reference/cachedModuleResolution8.js @@ -9,5 +9,7 @@ import {x} from "foo"; //// [app.js] "use strict"; +exports.__esModule = true; //// [lib.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/cachedModuleResolution9.js b/tests/baselines/reference/cachedModuleResolution9.js index 32f8848736ce1..c27ababcb9547 100644 --- a/tests/baselines/reference/cachedModuleResolution9.js +++ b/tests/baselines/reference/cachedModuleResolution9.js @@ -11,5 +11,7 @@ import {x} from "foo"; //// [lib.js] "use strict"; +exports.__esModule = true; //// [app.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js index a6113d5f24167..3af2cc7a5f934 100644 --- a/tests/baselines/reference/chainedImportAlias.js +++ b/tests/baselines/reference/chainedImportAlias.js @@ -18,8 +18,10 @@ var m; function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); +exports.__esModule = true; //// [chainedImportAlias_file1.js] "use strict"; var x = require("./chainedImportAlias_file0"); var y = x; y.m.foo(); +exports.__esModule = true; diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js index 193b3e1da077a..8d3419f1db6b0 100644 --- a/tests/baselines/reference/circularReference.js +++ b/tests/baselines/reference/circularReference.js @@ -48,6 +48,7 @@ var M1; }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); +exports.__esModule = true; //// [foo2.js] "use strict"; var foo1 = require("./foo1"); @@ -66,3 +67,4 @@ var M1; }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js index 3083e9c586ba0..cbe0104ebce15 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js @@ -43,6 +43,7 @@ define(["require", "exports"], function (require, exports) { var m2; (function (m2) { })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientClass_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js index 7f0f76381a308..b931a6210cf87 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js @@ -66,6 +66,7 @@ define(["require", "exports"], function (require, exports) { var m2; (function (m2) { })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientEnum_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js index 37b1a724c2850..5d462fb1ce2e5 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js @@ -20,4 +20,5 @@ define(["require", "exports"], function (require, exports) { (function (m2) { var a = 10; })(m2 || (m2 = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js index 1e63364a3967c..a75732a65bab1 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js @@ -33,6 +33,7 @@ define(["require", "exports"], function (require, exports) { (function (m2) { var a = 10; })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientVar_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js index 47d127e8a67f7..d6fb21ba60af3 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js @@ -99,6 +99,7 @@ define(["require", "exports"], function (require, exports) { exports[exports["_thisVal2"] = 1] = "_thisVal2"; })(exports = m2.exports || (m2.exports = {})); })(m2 || (m2 = {})); + exports.__esModule = true; }); //// [collisionExportsRequireAndEnum_globalFile.js] var require; diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js index 1842e415d8833..7ac6ba06ed62a 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js @@ -52,4 +52,5 @@ define(["require", "exports"], function (require, exports) { new m2.exports(); new m2.require(); })(m2 || (m2 = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js index 61307b95b1c91..33ea3d7fcfbec 100644 --- a/tests/baselines/reference/commentOnExportEnumDeclaration.js +++ b/tests/baselines/reference/commentOnExportEnumDeclaration.js @@ -17,3 +17,4 @@ var Color; Color[Color["g"] = 1] = "g"; Color[Color["b"] = 2] = "b"; })(Color = exports.Color || (exports.Color = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/commentOnImportStatement1.js b/tests/baselines/reference/commentOnImportStatement1.js index d9506e0072439..a9d68d299ce19 100644 --- a/tests/baselines/reference/commentOnImportStatement1.js +++ b/tests/baselines/reference/commentOnImportStatement1.js @@ -8,4 +8,5 @@ import foo = require('./foo'); /* Copyright */ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/commentOnImportStatement2.js b/tests/baselines/reference/commentOnImportStatement2.js index e7550582dfe11..5156fcdd0d1a5 100644 --- a/tests/baselines/reference/commentOnImportStatement2.js +++ b/tests/baselines/reference/commentOnImportStatement2.js @@ -4,3 +4,4 @@ import foo = require('./foo'); //// [commentOnImportStatement2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/commentOnImportStatement3.js b/tests/baselines/reference/commentOnImportStatement3.js index f716fa32baaa7..c33088408e84f 100644 --- a/tests/baselines/reference/commentOnImportStatement3.js +++ b/tests/baselines/reference/commentOnImportStatement3.js @@ -7,3 +7,4 @@ import foo = require('./foo'); //// [commentOnImportStatement3.js] /* copyright */ "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js index b4819ce9ca34a..cdba9542f544d 100644 --- a/tests/baselines/reference/commentsDottedModuleName.js +++ b/tests/baselines/reference/commentsDottedModuleName.js @@ -24,6 +24,7 @@ define(["require", "exports"], function (require, exports) { InnerModule.b = b; })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {})); })(outerModule = exports.outerModule || (exports.outerModule = {})); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index 1fe24c676a7ba..57cc701941ab0 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -124,6 +124,7 @@ define(["require", "exports"], function (require, exports) { })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules_0"], function (require, exports, extMod) { @@ -132,6 +133,7 @@ define(["require", "exports", "commentsExternalModules_0"], function (require, e var newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); var newVar2 = new extMod.m4.m2.c(); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index 7b40306119988..6ee404269948a 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -124,6 +124,7 @@ define(["require", "exports"], function (require, exports) { })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) { diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index 68ec3be48bdc8..ee48cfde32855 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -123,6 +123,7 @@ var m4; })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); +Object.defineProperty(exports, "__esModule", { value: true }); //// [commentsExternalModules_1.js] "use strict"; /**This is on import declaration*/ diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index 67794577226ec..2c26b93b82df0 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -69,6 +69,7 @@ define(["require", "exports"], function (require, exports) { })(multiM = exports.multiM || (exports.multiM = {})); new multiM.b(); new multiM.c(); + Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsMultiModuleMultiFile_1.js] define(["require", "exports"], function (require, exports) { @@ -92,6 +93,7 @@ define(["require", "exports"], function (require, exports) { multiM.f = f; })(multiM = exports.multiM || (exports.multiM = {})); new multiM.d(); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index 212f5869744c6..c1d2a303d7ad9 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -29,3 +29,4 @@ exports.__esModule = true; var foo = require("./foo_0"); if (foo.C1.s1) { } +exports.__esModule = true; diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index 76610c2d56da7..1f37d83c81580 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -55,3 +55,4 @@ var x = {}; var y = false; var z; var e = 0; +exports.__esModule = true; diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js index 1a863dbecbdce..08e628cac2a94 100644 --- a/tests/baselines/reference/commonSourceDirectory.js +++ b/tests/baselines/reference/commonSourceDirectory.js @@ -23,6 +23,7 @@ x + y; var foo_1 = require("foo"); var bar_1 = require("bar"); foo_1.x + bar_1.y; +exports.__esModule = true; //# sourceMappingURL=/app/myMapRoot/index.js.map //// [/app/bin/index.d.ts] diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt index ac198eaf02c9d..5675c05e34b01 100644 --- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt +++ b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt @@ -42,7 +42,7 @@ sourceFile:index.ts 3 > ^^^ 4 > ^^^^^^^ 5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +6 > ^^^^^^^^^-> 1 > > 2 >x @@ -55,4 +55,5 @@ sourceFile:index.ts 4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0) 5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0) --- +>>>exports.__esModule = true; >>>//# sourceMappingURL=/app/myMapRoot/index.js.map \ No newline at end of file diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js index 5af2c56b5ef23..da7c571061040 100644 --- a/tests/baselines/reference/commonjsSafeImport.js +++ b/tests/baselines/reference/commonjsSafeImport.js @@ -19,6 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); "use strict"; var _10_lib_1 = require("./10_lib"); _10_lib_1.Foo(); +Object.defineProperty(exports, "__esModule", { value: true }); //// [10_lib.d.ts] diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js index 282581fbdb8e0..9c7c78ad6261b 100644 --- a/tests/baselines/reference/constDeclarations-access5.js +++ b/tests/baselines/reference/constDeclarations-access5.js @@ -87,4 +87,5 @@ define(["require", "exports", "constDeclarations_access_1"], function (require, -m.x; +m.x; m.x.toString(); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js index e0a3f46ee89bd..e658dc1734760 100644 --- a/tests/baselines/reference/constEnumExternalModule.js +++ b/tests/baselines/reference/constEnumExternalModule.js @@ -13,9 +13,11 @@ var v = A.V; //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [m2.js] define(["require", "exports"], function (require, exports) { "use strict"; var v = 100 /* V */; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js index fb48c5a23e031..8b65f916dfaba 100644 --- a/tests/baselines/reference/controlFlowBinaryOrExpression.js +++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js @@ -55,3 +55,4 @@ if (isHTMLCollection(sourceObj)) { if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) { sourceObj.length; } +exports.__esModule = true; diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js index 006c29597b973..7fa40a63a1082 100644 --- a/tests/baselines/reference/copyrightWithNewLine1.js +++ b/tests/baselines/reference/copyrightWithNewLine1.js @@ -19,4 +19,5 @@ define(["require", "exports", "./greeter"], function (require, exports, model) { var greeter = new model.Greeter(el); /** things */ greeter.start(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js index 15e3c9f79bece..4b31d5997134b 100644 --- a/tests/baselines/reference/copyrightWithoutNewLine1.js +++ b/tests/baselines/reference/copyrightWithoutNewLine1.js @@ -15,4 +15,5 @@ define(["require", "exports", "./greeter"], function (require, exports, model) { var greeter = new model.Greeter(el); /** things */ greeter.start(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/declFileCallSignatures.js b/tests/baselines/reference/declFileCallSignatures.js index 10b87d4e7770b..8f79ae6341e06 100644 --- a/tests/baselines/reference/declFileCallSignatures.js +++ b/tests/baselines/reference/declFileCallSignatures.js @@ -67,6 +67,7 @@ interface IGlobalCallSignatureWithOwnTypeParametes { //// [declFileCallSignatures_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileCallSignatures_1.js] diff --git a/tests/baselines/reference/declFileConstructSignatures.js b/tests/baselines/reference/declFileConstructSignatures.js index 993c8ea46371c..309f71338733b 100644 --- a/tests/baselines/reference/declFileConstructSignatures.js +++ b/tests/baselines/reference/declFileConstructSignatures.js @@ -67,6 +67,7 @@ interface IGlobalConstructSignatureWithOwnTypeParametes { //// [declFileConstructSignatures_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileConstructSignatures_1.js] diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js index 4103ac6976e27..e9d140ae2e2aa 100644 --- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js +++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js @@ -15,6 +15,7 @@ x.a; //// [declFileExportAssignmentOfGenericInterface_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [declFileExportAssignmentOfGenericInterface_1.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index 5f583d2b6e122..a03fa43afff3e 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -45,6 +45,7 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) { "use strict"; exports.a = a; + exports.__esModule = true; }); //// [declFileExportImportChain_b1.js] define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) { @@ -55,6 +56,7 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require, define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) { "use strict"; exports.b1 = b1; + exports.__esModule = true; }); //// [declFileExportImportChain_d.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 5fe546663e4bf..c7feeec7e8ccb 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -47,6 +47,7 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) { "use strict"; exports.b = b; + exports.__esModule = true; }); //// [declFileExportImportChain2_d.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/declFileIndexSignatures.js b/tests/baselines/reference/declFileIndexSignatures.js index 4d3f3847ca18a..b7b2698b11b91 100644 --- a/tests/baselines/reference/declFileIndexSignatures.js +++ b/tests/baselines/reference/declFileIndexSignatures.js @@ -37,6 +37,7 @@ interface IGlobalIndexSignatureWithTypeParameter { //// [declFileIndexSignatures_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileIndexSignatures_1.js] diff --git a/tests/baselines/reference/declarationEmitIndexTypeNotFound.js b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js index 22100e5cb7229..b1fac7c3cc238 100644 --- a/tests/baselines/reference/declarationEmitIndexTypeNotFound.js +++ b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js @@ -7,3 +7,4 @@ export interface Test { //// [declarationEmitIndexTypeNotFound.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js index 5afadf8723a02..dca7f142dc9cb 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js @@ -17,6 +17,7 @@ export { v } { var obj = true; } +exports.__esModule = true; //// [1.js] "use strict"; var v = "str" || true; diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js index 130122ac84024..9228b766d3ffe 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js @@ -20,6 +20,7 @@ export { v, bar } { var obj = true; } +exports.__esModule = true; //// [1.js] "use strict"; var v = "str" || true; diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js index 44d086abac6af..8b2783a73fdfc 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js @@ -17,6 +17,7 @@ export default x; { var obj = true; } +exports.__esModule = true; //// [1.js] "use strict"; var x = "hi" || 5; diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js index 3c136865c5372..3020721dfc8cc 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js @@ -14,6 +14,7 @@ export { v } //// [0.js] "use strict"; var obj = true; +exports.__esModule = true; //// [1.js] "use strict"; //let v2: Z.Data; diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js index d5d455c35e38c..c7be3aca6b4ec 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js @@ -17,6 +17,7 @@ export { v } { var obj = true; } +exports.__esModule = true; //// [1.js] "use strict"; var v = "str" || true; diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js index e349376207242..2177a17efa548 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js @@ -12,6 +12,7 @@ export { v } //// [0.js] "use strict"; var obj = true; +exports.__esModule = true; //// [1.js] "use strict"; var v = "str" || true; diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js index 18ed73b0a5a38..4188b673b0bd3 100644 --- a/tests/baselines/reference/declarationEmitInvalidExport.js +++ b/tests/baselines/reference/declarationEmitInvalidExport.js @@ -12,3 +12,4 @@ export type MyClass = typeof myClass; if (false) { export var myClass = 0; } +exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js index 6d848b4286997..08747bbe198a4 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.js +++ b/tests/baselines/reference/declarationEmitNameConflicts.js @@ -129,6 +129,7 @@ var M; })(N = Q.N || (Q.N = {})); })(Q = M.Q || (M.Q = {})); })(M = exports.M || (exports.M = {})); +exports.__esModule = true; //// [declarationEmit_nameConflicts_1.d.ts] diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js index b49e3ad314dba..e5c10ab348433 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js @@ -11,6 +11,7 @@ export module M { var M; (function (M) { })(M = exports.M || (exports.M = {})); +exports.__esModule = true; //// [declarationEmitNameConflictsWithAlias.d.ts] diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js index 2f4fff7d72c25..e6ef1234c3a99 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js @@ -15,3 +15,4 @@ function foo() { function foo() { return {}; } +exports.__esModule = true; diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js index 5e03b2d9b516d..a08b36e278195 100644 --- a/tests/baselines/reference/declarationMerging2.js +++ b/tests/baselines/reference/declarationMerging2.js @@ -30,4 +30,5 @@ define(["require", "exports"], function (require, exports) { //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js index 8c7f16c3743d2..8c4bb8c12661b 100644 --- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js +++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js @@ -51,3 +51,4 @@ var Wat = (function () { __decorate([ filter(function () { return a_1.test == 'abc'; }) ], Wat, "whatever", null); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js index 8076c72e391ef..50dbe2cafdc1c 100644 --- a/tests/baselines/reference/decoratorMetadata.js +++ b/tests/baselines/reference/decoratorMetadata.js @@ -57,3 +57,4 @@ MyComponent = __decorate([ decorator, __metadata("design:paramtypes", [service_1.default]) ], MyComponent); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnImportEquals2.js b/tests/baselines/reference/decoratorOnImportEquals2.js index b506f474b0bda..aa8273699e38e 100644 --- a/tests/baselines/reference/decoratorOnImportEquals2.js +++ b/tests/baselines/reference/decoratorOnImportEquals2.js @@ -14,3 +14,4 @@ declare function dec(target: T): T; exports.__esModule = true; //// [decoratorOnImportEquals2_1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js index 1b60362377623..cba3d6e115c5b 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression01.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js @@ -52,4 +52,5 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge const value = yield a_1.default; }); }()); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js index d57f4c7ad9e0c..ea597359a03c6 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression02.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js @@ -33,3 +33,4 @@ const a_1 = require("./a"); const value = yield a_1.default; }); }()); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js index 28b30b5989b78..bd186fa279d73 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge01.js +++ b/tests/baselines/reference/defaultExportsCannotMerge01.js @@ -50,3 +50,4 @@ var x; var y; m1_1.default.x; m1_1.default.y; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js index e686b58a4cac0..7b26a1aa59f12 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge02.js +++ b/tests/baselines/reference/defaultExportsCannotMerge02.js @@ -42,3 +42,4 @@ var x; var y; var z = new m1_1.default(); var sum = z.p1 + z.p2; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js index d2662c1256f1b..1b2e53f03046b 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge03.js +++ b/tests/baselines/reference/defaultExportsCannotMerge03.js @@ -42,3 +42,4 @@ var x; var y; var z = new m1_1.default(); var sum = z.p1 + z.p2; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js index 9c1366bd8e05c..21f272d22a6bc 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations2.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js @@ -12,3 +12,4 @@ let { toString } = 1; { let { toFixed } = 1; } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js index d4b30405143b9..0f25ca3827fba 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations4.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js @@ -13,4 +13,5 @@ define(["require", "exports"], function (require, exports) { { let { toFixed } = 1; } + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js index c16a0a7d0a250..fcdefe72df63c 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations6.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js @@ -21,4 +21,5 @@ export {}; { let { toFixed } = 1; } + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/duplicateStringNamedProperty1.js b/tests/baselines/reference/duplicateStringNamedProperty1.js index 102fba9c3d6ea..5a6d5d7a8db64 100644 --- a/tests/baselines/reference/duplicateStringNamedProperty1.js +++ b/tests/baselines/reference/duplicateStringNamedProperty1.js @@ -6,3 +6,4 @@ export interface Album { //// [duplicateStringNamedProperty1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index 9f977f5fd58f2..05af7a2bac87f 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -103,4 +103,5 @@ define(["require", "exports"], function (require, exports) { var t; })(C = M.C || (M.C = {})); })(M || (M = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js index 2fff5988d8981..ee6fbd2b07f68 100644 --- a/tests/baselines/reference/elidingImportNames.js +++ b/tests/baselines/reference/elidingImportNames.js @@ -30,3 +30,4 @@ var b = a; var x; var a2 = require("./elidingImportNames_main1"); // alias not used in typeof var b2 = a2; +exports.__esModule = true; diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js index 1d8401803a782..e8915e406afe8 100644 --- a/tests/baselines/reference/emptyModuleName.js +++ b/tests/baselines/reference/emptyModuleName.js @@ -23,3 +23,4 @@ var B = (function (_super) { } return B; }(A)); +exports.__esModule = true; diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js index a6e9f6b60762e..9125b5126b23f 100644 --- a/tests/baselines/reference/enumFromExternalModule.js +++ b/tests/baselines/reference/enumFromExternalModule.js @@ -16,8 +16,10 @@ var Mode; (function (Mode) { Mode[Mode["Open"] = 0] = "Open"; })(Mode = exports.Mode || (exports.Mode = {})); +exports.__esModule = true; //// [enumFromExternalModule_1.js] "use strict"; /// var f = require("./enumFromExternalModule_0"); var x = f.Mode.Open; +exports.__esModule = true; diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.js b/tests/baselines/reference/errorForConflictingExportEqualsValue.js index 58ab920d177df..88762e7e84675 100644 --- a/tests/baselines/reference/errorForConflictingExportEqualsValue.js +++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.js @@ -6,4 +6,3 @@ export = {}; //// [errorForConflictingExportEqualsValue.js] "use strict"; module.exports = {}; -exports.__esModule = true; diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js index 4c7dca8274e92..52d144c1e4927 100644 --- a/tests/baselines/reference/errorsOnImportedSymbol.js +++ b/tests/baselines/reference/errorsOnImportedSymbol.js @@ -17,7 +17,9 @@ var y = Sammy.Sammy(); //// [errorsOnImportedSymbol_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [errorsOnImportedSymbol_1.js] "use strict"; var x = new Sammy.Sammy(); var y = Sammy.Sammy(); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js index de92a5e40c31e..0ad02c848fd6b 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.js +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js @@ -33,3 +33,4 @@ exports.__esModule = true; "use strict"; var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0"); es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo"); +exports.__esModule = true; diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js index cc596980889f2..28516a541f5de 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js @@ -65,4 +65,5 @@ define(["require", "exports"], function (require, exports) { // alias M.M_A = M_M; })(M = exports.M || (exports.M = {})); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js index 3148d9b028dca..035a8c0be25bd 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js +++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js @@ -22,6 +22,7 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) { "use strict"; var x = es6ImportDefaultBindingAmd_0_1.default; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js index 703e0a7a7bbc3..66be06536f035 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js @@ -42,6 +42,7 @@ const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportD var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x; const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index 58d5399c99d36..4712a4325032b 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -39,6 +39,7 @@ var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6Imp var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js index c6887efba36a6..dcc2ec2c7859d 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js @@ -40,6 +40,7 @@ var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6Impo var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js index 95c1485e5c18d..db922cb220037 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js @@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); "use strict"; var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index 385e65f3f679e..92e3fe0a33f19 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); "use strict"; var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); var x = nameSpaceBinding.a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js index 257e76bfe028d..f6ea834811830 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js @@ -14,6 +14,7 @@ var a = 10; module.exports = a; //// [es6ImportDefaultBindingInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js index e6daf77e4e91c..b9f73ac47ebb2 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js +++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js @@ -26,3 +26,4 @@ Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); var x = es6ImportDefaultBindingMergeErrors_0_1.default; var defaultBinding2 = "hello world"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js index a40dff3c31772..265be908b8588 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js +++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js @@ -14,3 +14,4 @@ exports.a = 10; exports.__esModule = true; //// [es6ImportDefaultBindingNoDefaultProperty_1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js index 8ef828435f062..510750edc50d0 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImport.js @@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); "use strict"; const nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); var x = nameSpaceBinding.a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js index 0e795db4c01b6..ea2403383168e 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js @@ -20,6 +20,7 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) { "use strict"; var x = nameSpaceBinding.a; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js index 9e05e95244ef6..88bf937c69c79 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js @@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); "use strict"; var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); var x = nameSpaceBinding.a; +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js index 357f0f05e7fa2..696659cb1f756 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js @@ -22,3 +22,4 @@ Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImportMergeErrors_1.js] "use strict"; var nameSpaceBinding3 = 10; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js index 8ece816fd3b6c..0276c44f8ab49 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js @@ -14,3 +14,4 @@ var a = 10; module.exports = a; //// [es6ImportNameSpaceImportNoNamedExports_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js index f60477a73cb87..9719305e62b50 100644 --- a/tests/baselines/reference/es6ImportNamedImport.js +++ b/tests/baselines/reference/es6ImportNamedImport.js @@ -75,6 +75,7 @@ const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0"); var z111 = es6ImportNamedImport_0_8.z1; const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0"); var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js index 33ea02fd94fe5..31582223c52cc 100644 --- a/tests/baselines/reference/es6ImportNamedImportAmd.js +++ b/tests/baselines/reference/es6ImportNamedImportAmd.js @@ -69,6 +69,7 @@ define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImport var xxxx = es6ImportNamedImportAmd_0_7.x1; var z111 = es6ImportNamedImportAmd_0_8.z1; var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error + exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js index 859522473950a..5c6f3573c7fc1 100644 --- a/tests/baselines/reference/es6ImportNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js @@ -75,6 +75,7 @@ var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0"); var z111 = es6ImportNamedImportInEs5_0_8.z1; var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0"); var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index 3e85778de5892..ce878ca021661 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -23,6 +23,7 @@ var a; }()); a.c = c; })(a = exports.a || (exports.a = {})); +exports.__esModule = true; //// [es6ImportNamedImportInIndirectExportAssignment_1.js] "use strict"; var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js index f3f76ff01845e..11bd3b73a9ec7 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js @@ -31,3 +31,4 @@ exports.__esModule = true; "use strict"; var x = 10; var x44 = 10; +exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js index a3bd672c6f3d9..87f3c1d5d072e 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js +++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js @@ -16,3 +16,4 @@ exports.x = exports.a; exports.__esModule = true; //// [es6ImportNamedImport_1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js index 2198df11f7876..a02116b314db6 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js +++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js @@ -15,3 +15,4 @@ var a = 10; module.exports = a; //// [es6ImportNamedImportNoNamedExports_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js index 726efa849c218..c90ea418f26f5 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js @@ -30,6 +30,7 @@ define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWitho "use strict"; var _a = 10; var _b = 10; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js index 9d844a8ca8f89..0262cfdd045f9 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js @@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportWithoutFromClauseInEs5_1.js] "use strict"; require("es6ImportWithoutFromClauseInEs5_0"); +Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportWithoutFromClauseInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index b78466485f9b5..71874fc7b405f 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -14,6 +14,7 @@ exports.__esModule = true; //// [client.js] "use strict"; require("server"); +exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js index bdfceef6b8051..f557bc5d9a45f 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.js +++ b/tests/baselines/reference/exportAssignClassAndModule.js @@ -31,3 +31,4 @@ module.exports = Foo; var z; var zz; zz.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js index 265d082ca358e..09daa469ef48b 100644 --- a/tests/baselines/reference/exportAssignImportedIdentifier.js +++ b/tests/baselines/reference/exportAssignImportedIdentifier.js @@ -30,3 +30,4 @@ module.exports = x; "use strict"; var foo2 = require("./foo2"); var x = foo2(); // should be boolean +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js index 02b34715483a4..645f44545fe91 100644 --- a/tests/baselines/reference/exportAssignTypes.js +++ b/tests/baselines/reference/exportAssignTypes.js @@ -99,3 +99,4 @@ var iAny = require("./expAny"); var v6 = iAny; var iGeneric = require("./expGeneric"); var v7 = iGeneric; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js index 26a43e10c6cf7..e1bdf0d544f0e 100644 --- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js +++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js @@ -17,9 +17,11 @@ var t2: test; // should not raise a 'container type' error //// [exportAssignedTypeAsTypeAnnotation_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [exportAssignedTypeAsTypeAnnotation_1.js] define(["require", "exports"], function (require, exports) { "use strict"; var t2; // should not raise a 'container type' error + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js index 02c74fe1f3967..265afdfd04130 100644 --- a/tests/baselines/reference/exportAssignmentClass.js +++ b/tests/baselines/reference/exportAssignmentClass.js @@ -27,4 +27,5 @@ define(["require", "exports", "exportAssignmentClass_A"], function (require, exp "use strict"; var d = new D(); var x = d.p; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js index c0b8f2b50c11a..003927c251140 100644 --- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js +++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js @@ -28,3 +28,4 @@ var foo = require("./foo_0"); var x = new foo(true); // Should error var y = new foo({ a: "test", b: 42 }); // Should be OK var z = y.test.b; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js index a4ae6898bce75..a30868a18e5a2 100644 --- a/tests/baselines/reference/exportAssignmentEnum.js +++ b/tests/baselines/reference/exportAssignmentEnum.js @@ -31,3 +31,4 @@ var EnumE = require("./exportAssignmentEnum_A"); var a = EnumE.A; var b = EnumE.B; var c = EnumE.C; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js index c8e90571cdbc9..5743490fec308 100644 --- a/tests/baselines/reference/exportAssignmentFunction.js +++ b/tests/baselines/reference/exportAssignmentFunction.js @@ -20,4 +20,5 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) { "use strict"; var n = fooFunc(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js index 390a929ce355e..3ef295639fd27 100644 --- a/tests/baselines/reference/exportAssignmentGenericType.js +++ b/tests/baselines/reference/exportAssignmentGenericType.js @@ -25,3 +25,4 @@ module.exports = Foo; var foo = require("./foo_0"); var x = new foo(); var y = x.test; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js index be3f696b19b75..8f4403cf40a38 100644 --- a/tests/baselines/reference/exportAssignmentInterface.js +++ b/tests/baselines/reference/exportAssignmentInterface.js @@ -17,10 +17,12 @@ var n: number = i.p1; //// [exportAssignmentInterface_A.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [exportAssignmentInterface_B.js] define(["require", "exports"], function (require, exports) { "use strict"; var i; var n = i.p1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js index 7b2443fc26d6f..e4ba7a9f7d8ae 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.js +++ b/tests/baselines/reference/exportAssignmentInternalModule.js @@ -24,4 +24,5 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "exportAssignmentInternalModule_A"], function (require, exports, modM) { "use strict"; var n = modM.x; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js index 97c6941cc338f..ba77f90557f8f 100644 --- a/tests/baselines/reference/exportAssignmentMergedInterface.js +++ b/tests/baselines/reference/exportAssignmentMergedInterface.js @@ -25,6 +25,7 @@ z = x.d; //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { @@ -36,4 +37,5 @@ define(["require", "exports"], function (require, exports) { if (!!x.c) { } var z = { x: 1, y: 2 }; z = x.d; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js index aa2a7082f7639..59008dfc37068 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.js +++ b/tests/baselines/reference/exportAssignmentMergedModule.js @@ -52,3 +52,4 @@ var a = foo.a(); if (!!foo.b) { foo.Test.answer = foo.c(42); } +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js index a2ddd50511ca7..280e93f8c016d 100644 --- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js +++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js @@ -18,6 +18,7 @@ var b = z(); // call signature - no error //// [exportAssignmentOfDeclaredExternalModule_0.js] "use strict"; +exports.__esModule = true; //// [exportAssignmentOfDeclaredExternalModule_1.js] "use strict"; var x = new Sammy(); // error to use as constructor as there is not constructor symbol @@ -25,3 +26,4 @@ var y = Sammy(); // error to use interface name as call target var z; // no error - z is of type interface Sammy from module 'M' var a = new z(); // constructor - no error var b = z(); // call signature - no error +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js index bab7c815f192f..f4417f871e913 100644 --- a/tests/baselines/reference/exportAssignmentOfGenericType1.js +++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js @@ -45,4 +45,5 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req }(q)); var m; var r = m.foo; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js index 9e073462aac03..44afbca1f691e 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js @@ -36,4 +36,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) { if (foo.answer === 42) { var x = new foo(); } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js index 5043a684326b1..a6abc6aa37dd2 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js @@ -38,4 +38,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) { if (color === foo.green) { color = foo.answer; } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js index 0549700e464ae..4c0abd1d650f5 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js @@ -33,4 +33,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) { if (foo.answer === 42) { var x = foo(); } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js index 03b4ae26af9a6..0d31a25623cf8 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js @@ -27,4 +27,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; if (foo.answer === 42) { } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js index 68a195230df60..8f9c02ecfbb02 100644 --- a/tests/baselines/reference/exportAssignmentVariable.js +++ b/tests/baselines/reference/exportAssignmentVariable.js @@ -18,3 +18,4 @@ module.exports = x; "use strict"; var y = require("./exportAssignmentVariable_A"); var n = y; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js index 0aea8ec80fc44..8441b7b4320d9 100644 --- a/tests/baselines/reference/exportAssignmentWithExports.js +++ b/tests/baselines/reference/exportAssignmentWithExports.js @@ -16,4 +16,3 @@ var D = (function () { return D; }()); module.exports = D; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js index 9a03aaae595fd..6c3a951841d2c 100644 --- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js +++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js @@ -31,6 +31,7 @@ exports.x = t1_1.x; exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; //// [t4.js] "use strict"; var t1_1 = require("./t1"); diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js index 18ced8df9d683..23ce59f2402ea 100644 --- a/tests/baselines/reference/exportDeclareClass1.js +++ b/tests/baselines/reference/exportDeclareClass1.js @@ -14,4 +14,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; ; ; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js index 419fecf42e0cc..08d62eb3782c2 100644 --- a/tests/baselines/reference/exportDeclaredModule.js +++ b/tests/baselines/reference/exportDeclaredModule.js @@ -19,3 +19,4 @@ module.exports = M1; "use strict"; var foo1 = require("./foo1"); var x = foo1.b(); +exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js index 4ccdba88556fc..04ad89f9dc042 100644 --- a/tests/baselines/reference/exportDefaultProperty.js +++ b/tests/baselines/reference/exportDefaultProperty.js @@ -73,3 +73,4 @@ var a_1 = require("./a"); var b = new a_1["default"](a_1["default"].b); var b_1 = require("./b"); b_1["default"] + 1; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js index b5d3e2c053b55..861acb7347cd9 100644 --- a/tests/baselines/reference/exportDefaultProperty2.js +++ b/tests/baselines/reference/exportDefaultProperty2.js @@ -31,3 +31,4 @@ exports.__esModule = true; "use strict"; var a_1 = require("./a"); var x = { c: a_1["default"] }; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js index 9138da0d33d37..d8347b62944ec 100644 --- a/tests/baselines/reference/exportEqualCallable.js +++ b/tests/baselines/reference/exportEqualCallable.js @@ -23,4 +23,5 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) { "use strict"; connect(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js index aa715b7d9f223..f8d0afe95da8e 100644 --- a/tests/baselines/reference/exportEqualErrorType.js +++ b/tests/baselines/reference/exportEqualErrorType.js @@ -31,4 +31,5 @@ define(["require", "exports"], function (require, exports) { 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 ''. + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js index 39074e10372b5..3a4982a7434d6 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.js +++ b/tests/baselines/reference/exportEqualMemberMissing.js @@ -30,3 +30,4 @@ module.exports = server; /// var connect = require("./exportEqualMemberMissing_0"); connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. +exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js index 6d75ef5d95d89..3cf456818072a 100644 --- a/tests/baselines/reference/exportEqualsDefaultProperty.js +++ b/tests/baselines/reference/exportEqualsDefaultProperty.js @@ -25,3 +25,4 @@ module.exports = x; "use strict"; var exp_1 = require("./exp"); exp_1["default"].toExponential(2); +exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js index 9acb1ee49b734..feb5e563903ee 100644 --- a/tests/baselines/reference/exportEqualsProperty.js +++ b/tests/baselines/reference/exportEqualsProperty.js @@ -69,3 +69,4 @@ var B = require("./a"); var b = new B(B.b); var fooLength = require("./b"); fooLength + 1; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js index b5d91431722e3..f51a130e572f0 100644 --- a/tests/baselines/reference/exportEqualsProperty2.js +++ b/tests/baselines/reference/exportEqualsProperty2.js @@ -30,3 +30,4 @@ module.exports = C.B; "use strict"; var B = require("./a"); var x = { c: B }; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js index 6ca5b6411ff13..d947393c05f89 100644 --- a/tests/baselines/reference/exportImport.js +++ b/tests/baselines/reference/exportImport.js @@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "./w1"], function (require, exports, w) { "use strict"; exports.w = w; + exports.__esModule = true; }); //// [consumer.js] define(["require", "exports", "./exporter"], function (require, exports, e) { diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js index e84e661517bcb..7defcbac0448b 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.js +++ b/tests/baselines/reference/exportImportMultipleFiles.js @@ -24,9 +24,11 @@ define(["require", "exports", "exportImportMultipleFiles_math"], function (requi "use strict"; exports.math = math; exports.math.add(3, 4); // OK + exports.__esModule = true; }); //// [exportImportMultipleFiles_userCode.js] define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) { "use strict"; lib.math.add(3, 4); // Shouldnt be error + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js index adcdeda785018..77eb0c35ce690 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js @@ -18,10 +18,12 @@ export function w(): e.w { // Should be OK //// [w1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [exporter.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [consumer.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js index cb06a818b08b2..0a8ebd10ee4ad 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.js @@ -10,3 +10,4 @@ export declare function foo(): X.bar; //// [exportSpecifierReferencingOuterDeclaration2_A.js] //// [exportSpecifierReferencingOuterDeclaration2_B.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js index 1badf46999668..f0c6dd55984e6 100644 --- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js +++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js @@ -12,3 +12,4 @@ export declare function bar(): X.bar; // error //// [exportSpecifierReferencingOuterDeclaration2_A.js] //// [exportSpecifierReferencingOuterDeclaration2_B.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js index 2ef8560a38aa4..9a4def0dd7858 100644 --- a/tests/baselines/reference/exportStar-amd.js +++ b/tests/baselines/reference/exportStar-amd.js @@ -74,4 +74,5 @@ define(["require", "exports", "./t4"], function (require, exports, t4_1) { t4_1.y; t4_1.z; t4_1.foo; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js index 460984a2b13d9..4b9ec28f6aa31 100644 --- a/tests/baselines/reference/exportStar.js +++ b/tests/baselines/reference/exportStar.js @@ -66,3 +66,4 @@ t4_1.x; t4_1.y; t4_1.z; t4_1.foo; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js index dd432ecc1d335..3b74564d4d169 100644 --- a/tests/baselines/reference/exportStarForValues.js +++ b/tests/baselines/reference/exportStarForValues.js @@ -11,9 +11,11 @@ var x; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; var x; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js index e45d5bdd3ba35..74b28ef6d00d0 100644 --- a/tests/baselines/reference/exportStarForValues2.js +++ b/tests/baselines/reference/exportStarForValues2.js @@ -15,14 +15,17 @@ var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js index 9efe5ccf8e5d2..52e18851fc990 100644 --- a/tests/baselines/reference/exportStarForValues3.js +++ b/tests/baselines/reference/exportStarForValues3.js @@ -27,24 +27,29 @@ var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); //// [file5.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js index 34b13bb00f37c..7697100842e00 100644 --- a/tests/baselines/reference/exportStarForValues4.js +++ b/tests/baselines/reference/exportStarForValues4.js @@ -19,14 +19,17 @@ var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; var x = 1; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js index 21f2b4c2f0910..37c8d59c91a89 100644 --- a/tests/baselines/reference/exportStarForValues5.js +++ b/tests/baselines/reference/exportStarForValues5.js @@ -11,6 +11,7 @@ export var x; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js index d0c1f85582cdf..1311e215fce77 100644 --- a/tests/baselines/reference/exportStarForValues7.js +++ b/tests/baselines/reference/exportStarForValues7.js @@ -15,6 +15,7 @@ export var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js index cb3f66fbaf626..b6ee3c56ae730 100644 --- a/tests/baselines/reference/exportStarForValues8.js +++ b/tests/baselines/reference/exportStarForValues8.js @@ -27,6 +27,7 @@ export var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js index fdcb0e5583ad5..5d24c558ec06f 100644 --- a/tests/baselines/reference/exportStarForValues9.js +++ b/tests/baselines/reference/exportStarForValues9.js @@ -19,6 +19,7 @@ export var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports, file2_1) { diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index bb9867725b075..44ece87187456 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -54,6 +54,7 @@ var X = require("./exportStarFromEmptyModule_module3"); var s; X.A.q; X.A.r; // Error +Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module1.d.ts] diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js index 6c39978e37d3c..75b9378c3f49f 100644 --- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js +++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.js @@ -15,4 +15,5 @@ export declare class TPromise { //// [exportedInterfaceInaccessibleInCallbackInModule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js index 838a6ae9326cd..0a2ee7d318300 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js @@ -31,7 +31,10 @@ exports.get = get; Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t4.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js index 4af17d7165315..ea7f554d1b351 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js @@ -28,7 +28,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); var as = require("./t1"); var x = as.as; var y = as.return; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [t4.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js index 7cdfbe79ebee6..2b3e9d36f337f 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js @@ -27,3 +27,4 @@ exports.__esModule = true; "use strict"; var m1_1 = require("./m1"); var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js index 890e32937a1fe..3555148f75520 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js @@ -25,3 +25,4 @@ exports.__esModule = true; "use strict"; var m1_1 = require("./m1"); var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js index 3514652db6594..028ca80400fac 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js @@ -27,3 +27,4 @@ exports.__esModule = true; "use strict"; var m1_1 = require("./m1"); var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js index 25130664b7477..fa643c5e7e2a6 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js @@ -74,3 +74,4 @@ m1_1.___hello(); m1_1.__esmodule(); m1_1.__proto(); m1_1._hi(); +exports.__esModule = true; diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js index 7353c6970e8ae..a5900c588ba3d 100644 --- a/tests/baselines/reference/extendClassExpressionFromModule.js +++ b/tests/baselines/reference/extendClassExpressionFromModule.js @@ -40,3 +40,4 @@ var y = (function (_super) { } return y; }(x)); +exports.__esModule = true; diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js index 2e26d67db3977..4f0d5ced7b515 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js @@ -96,3 +96,4 @@ var moduleMap = { }; var moduleName; var visModel = new moduleMap[moduleName].VisualizationModel(); +exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js index 4d60625115bea..41ec58a467df7 100644 --- a/tests/baselines/reference/externalModuleAssignToVar.js +++ b/tests/baselines/reference/externalModuleAssignToVar.js @@ -66,4 +66,5 @@ define(["require", "exports", "externalModuleAssignToVar_core_require", "externa y2 = ext2; // ok var y3 = ext3; y3 = ext3; // ok + exports.__esModule = true; }); diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js index e327e17160e63..ca51181ec3b6c 100644 --- a/tests/baselines/reference/externalModuleExportingGenericClass.js +++ b/tests/baselines/reference/externalModuleExportingGenericClass.js @@ -29,3 +29,4 @@ var a = require("./externalModuleExportingGenericClass_file0"); var v; // this should report error var v2 = (new a()).foo; var v3 = (new a()).foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js index 646b447185950..bd811cd8b5814 100644 --- a/tests/baselines/reference/externalModuleImmutableBindings.js +++ b/tests/baselines/reference/externalModuleImmutableBindings.js @@ -108,3 +108,4 @@ for ((stuff[n]) in []) { } for (var _p = 0, _q = []; _p < _q.length; _p++) { (stuff[n]) = _q[_p]; } +exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js index e0e5eaf7bac5b..75d719670d18e 100644 --- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js +++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js @@ -21,4 +21,5 @@ define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExp "use strict"; exports.file1 = file1; exports.file1.foo(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js index 9c9861d7c28a2..a012d0d37b65d 100644 --- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js +++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js @@ -30,3 +30,4 @@ exports.__esModule = true; var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1"); file1.foo(); file1.bar(); +exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js index 40b320ee37ebd..3d1fe11f88f34 100644 --- a/tests/baselines/reference/externalModuleResolution.js +++ b/tests/baselines/reference/externalModuleResolution.js @@ -27,3 +27,4 @@ module.exports = M2; "use strict"; var x = require("./foo"); x.Y; // .ts should be picked +exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js index 44753c9f16d37..96fb493090fee 100644 --- a/tests/baselines/reference/externalModuleResolution2.js +++ b/tests/baselines/reference/externalModuleResolution2.js @@ -28,3 +28,4 @@ module.exports = M2; "use strict"; var x = require("./foo"); x.X; // .ts should be picked +exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js index 0b1f17612b01d..fa98fbe222353 100644 --- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js +++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.js @@ -6,3 +6,4 @@ //// [externalModuleWithoutCompilerFlag1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/genericArrayExtenstions.js b/tests/baselines/reference/genericArrayExtenstions.js index 63c67a1376074..87a7fba25c114 100644 --- a/tests/baselines/reference/genericArrayExtenstions.js +++ b/tests/baselines/reference/genericArrayExtenstions.js @@ -7,3 +7,4 @@ concat(...items: T[]): T[]; //// [genericArrayExtenstions.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js index f9bcc86194c76..49debc2ca8450 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.js @@ -16,4 +16,5 @@ export declare module TypeScript { //// [genericRecursiveImplicitConstructorErrors1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js index 2ee085ef07ee8..3201344c0de80 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases1.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js @@ -25,3 +25,4 @@ var x; x.p1; x.m1(); x.m2(); +exports.__esModule = true; diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js index 4a31e354de612..a445714400055 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases2.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js @@ -25,4 +25,5 @@ define(["require", "exports"], function (require, exports) { x.p1; x.m1(); x.m2(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index a181526eb27da..74cf137ef37ae 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -13,5 +13,6 @@ define(["require", "exports"], function (require, exports) { (function (M) { M.foo = new C(); })(M = exports.M || (exports.M = {})); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.js b/tests/baselines/reference/globalAugmentationModuleResolution.js index e1a4ebce8c5de..6dd87de81fd3f 100644 --- a/tests/baselines/reference/globalAugmentationModuleResolution.js +++ b/tests/baselines/reference/globalAugmentationModuleResolution.js @@ -8,3 +8,4 @@ declare global { //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js index c7dd59f9ab760..040bdccd515aa 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js @@ -21,6 +21,7 @@ var m; function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); +exports.__esModule = true; //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js] "use strict"; var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0"); @@ -30,3 +31,4 @@ var m_private; m_private.C = r; // no error m_private.C.m.foo(); })(m_private || (m_private = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js index c676d8caa6216..a626d034c7572 100644 --- a/tests/baselines/reference/importAsBaseClass.js +++ b/tests/baselines/reference/importAsBaseClass.js @@ -40,3 +40,4 @@ var Hello = (function (_super) { } return Hello; }(Greeter)); +exports.__esModule = true; diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js index 383c6629ed19f..1aadcb875f08b 100644 --- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js +++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.js @@ -7,3 +7,4 @@ declare module "m1" { //// [importDeclRefereingExternalModuleWithNoResolve.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/importHelpersInAmbientContext.js b/tests/baselines/reference/importHelpersInAmbientContext.js index b9db8c4751fec..d91daa19a907f 100644 --- a/tests/baselines/reference/importHelpersInAmbientContext.js +++ b/tests/baselines/reference/importHelpersInAmbientContext.js @@ -57,3 +57,4 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [b.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js index 52e5aac62e0cf..828c1a5a3601c 100644 --- a/tests/baselines/reference/importHelpersInIsolatedModules.js +++ b/tests/baselines/reference/importHelpersInIsolatedModules.js @@ -98,3 +98,4 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js index 2d3713ffaf407..917c50f3fee3f 100644 --- a/tests/baselines/reference/importImportOnlyModule.js +++ b/tests/baselines/reference/importImportOnlyModule.js @@ -32,9 +32,11 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports"], function (require, exports) { "use strict"; var answer = 42; // No exports + exports.__esModule = true; }); //// [foo_2.js] define(["require", "exports", "./foo_1"], function (require, exports, foo) { "use strict"; var x = foo; // Cause a runtime dependency + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js index d4f12d0c1b622..cfc63f83551ec 100644 --- a/tests/baselines/reference/importInsideModule.js +++ b/tests/baselines/reference/importInsideModule.js @@ -15,3 +15,4 @@ var myModule; (function (myModule) { var a = foo.x; })(myModule = exports.myModule || (exports.myModule = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js index 2a8e679286072..8af20d4be36f0 100644 --- a/tests/baselines/reference/importNonExternalModule.js +++ b/tests/baselines/reference/importNonExternalModule.js @@ -24,4 +24,5 @@ define(["require", "exports", "./foo_0"], function (require, exports, foo) { // Import should fail. foo_0 not an external module if (foo.answer === 42) { } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js index 002092d816222..e5785d928666a 100644 --- a/tests/baselines/reference/importNonStringLiteral.js +++ b/tests/baselines/reference/importNonStringLiteral.js @@ -6,3 +6,4 @@ import foo = require(x); // invalid //// [foo_0.js] "use strict"; var x = "filename"; +exports.__esModule = true; diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js index e15a3337dfdf0..658b464983ad9 100644 --- a/tests/baselines/reference/importTsBeforeDTs.js +++ b/tests/baselines/reference/importTsBeforeDTs.js @@ -22,3 +22,4 @@ exports.__esModule = true; 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 +exports.__esModule = true; diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js index de5ee2a22bd34..d44239cec115a 100644 --- a/tests/baselines/reference/importUsedInExtendsList1.js +++ b/tests/baselines/reference/importUsedInExtendsList1.js @@ -43,3 +43,4 @@ var Sub = (function (_super) { }(foo.Super)); var s; var r = s.foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js index 807d684b5b11f..c5e502f3fdc08 100644 --- a/tests/baselines/reference/importWithTrailingSlash.js +++ b/tests/baselines/reference/importWithTrailingSlash.js @@ -34,9 +34,11 @@ var _1 = require("."); var _2 = require("./"); _1["default"].a; _2["default"].aIndex; +exports.__esModule = true; //// [test.js] "use strict"; var __1 = require(".."); var _1 = require("../"); __1["default"].a; _1["default"].aIndex; +exports.__esModule = true; diff --git a/tests/baselines/reference/importWithTrailingSlash_noResolve.js b/tests/baselines/reference/importWithTrailingSlash_noResolve.js index b523c76af3b43..16a4838ba6287 100644 --- a/tests/baselines/reference/importWithTrailingSlash_noResolve.js +++ b/tests/baselines/reference/importWithTrailingSlash_noResolve.js @@ -5,3 +5,4 @@ import foo from "./foo/"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js index ffc4491e50ac1..16c6f2b95c7af 100644 --- a/tests/baselines/reference/import_reference-exported-alias.js +++ b/tests/baselines/reference/import_reference-exported-alias.js @@ -48,4 +48,5 @@ define(["require", "exports", "file1"], function (require, exports, appJs) { var Services = appJs.Services; var UserServices = Services.UserServices; var x = new UserServices().getUserName(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js index 1d91f10f672ee..5934d9b2f5ead 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.js +++ b/tests/baselines/reference/import_reference-to-type-alias.js @@ -35,10 +35,12 @@ define(["require", "exports"], function (require, exports) { Services.UserServices = UserServices; })(Services = App.Services || (App.Services = {})); })(App = exports.App || (exports.App = {})); + exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { "use strict"; var Services = appJs.App.Services; var x = new Services.UserServices().getUserName(); + exports.__esModule = true; }); 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 157702acd1e1b..7fb4e02d9fd1d 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 @@ -21,4 +21,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; var testData; var p = testData[0].name; + exports.__esModule = true; }); 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 423a3546d31b1..c2ac2416806b1 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 @@ -26,4 +26,5 @@ define(["require", "exports", "host"], function (require, exports, host) { "use strict"; var hostVar = host; var v = new hostVar.Host(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js index 754bac96c2c6b..61b411ea571c4 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.js +++ b/tests/baselines/reference/importedAliasesInTypePositions.js @@ -41,6 +41,7 @@ define(["require", "exports"], function (require, exports) { })(mod = nested.mod || (nested.mod = {})); })(nested = elaborate.nested || (elaborate.nested = {})); })(elaborate = exports.elaborate || (exports.elaborate = {})); + exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { @@ -54,4 +55,5 @@ define(["require", "exports"], function (require, exports) { return UsesReferredType; }()); })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js index 8f9649c676837..52761e7e9db13 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.js +++ b/tests/baselines/reference/importedModuleClassNameClash.js @@ -14,4 +14,5 @@ define(["require", "exports"], function (require, exports) { } return foo; }()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js index 632483866be2b..b85c7145a4716 100644 --- a/tests/baselines/reference/importsImplicitlyReadonly.js +++ b/tests/baselines/reference/importsImplicitlyReadonly.js @@ -41,3 +41,4 @@ a2.x = 1; a2.y = 1; a3.x = 1; a3.y = 1; +exports.__esModule = true; diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js index 7a530fdb1df80..bc20008c2fabe 100644 --- a/tests/baselines/reference/inferenceLimit.js +++ b/tests/baselines/reference/inferenceLimit.js @@ -42,6 +42,7 @@ export interface MyModel { //// [mymodule.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); //// [file1.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js index da0be4c0e953f..9fe669911b269 100644 --- a/tests/baselines/reference/instanceOfInExternalModules.js +++ b/tests/baselines/reference/instanceOfInExternalModules.js @@ -28,4 +28,5 @@ define(["require", "exports", "instanceOfInExternalModules_require"], function ( function IsFoo(value) { return value instanceof Bar.Foo; } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js index 653579c81eb85..7fb7b08a8818f 100644 --- a/tests/baselines/reference/interfaceContextualType.js +++ b/tests/baselines/reference/interfaceContextualType.js @@ -37,3 +37,4 @@ var Bug = (function () { }; return Bug; }()); +exports.__esModule = true; diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js index a4df8926fbae3..01a648055303f 100644 --- a/tests/baselines/reference/interfaceDeclaration3.js +++ b/tests/baselines/reference/interfaceDeclaration3.js @@ -119,4 +119,5 @@ define(["require", "exports"], function (require, exports) { } return C3; }()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 03b3542eca4f7..6868a0511a623 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -38,6 +38,7 @@ var m2; var cReturnVal = m3.cProp.foo(10); })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); +exports.__esModule = true; //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index c7b8bf2cacc32..de2582debefe4 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -29,6 +29,7 @@ var c; c.b = a.weekend; c.bVal = c.b.Sunday; })(c = exports.c || (exports.c = {})); +exports.__esModule = true; //// [internalAliasEnumInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index 267fffc7b7098..6e54ed79afc41 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -29,6 +29,7 @@ var c; var b = a.weekend; c.bVal = b.Sunday; })(c = exports.c || (exports.c = {})); +exports.__esModule = true; //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js index a44298b6864ba..c7b5180fd9346 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js @@ -31,3 +31,4 @@ var c; c.bVal = b.Sunday; })(c = exports.c || (exports.c = {})); var happyFriday = c.b.Friday; +exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index b96586dfa8eb6..4138970da0bb4 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -27,6 +27,7 @@ var c; c.bVal = c.b(10); c.bVal2 = c.b; })(c = exports.c || (exports.c = {})); +exports.__esModule = true; //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index dca4287815782..83cab3c05bbd2 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -27,6 +27,7 @@ var c; var bVal = b(10); c.bVal2 = b; })(c = exports.c || (exports.c = {})); +exports.__esModule = true; //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js index 62e5f622ae7f9..67239e40b1d76 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js @@ -28,3 +28,4 @@ var c; c.bVal2 = b; })(c = exports.c || (exports.c = {})); var d = c.b(11); +exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index 3bd4c7c2fbca1..904c7171818bb 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -31,6 +31,7 @@ define(["require", "exports"], function (require, exports) { c.b = a.b; c.x = new c.b.c(); })(c = exports.c || (exports.c = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index 910319be5e86f..eb59627a4cbf5 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -30,6 +30,7 @@ var c; var b = a.b; c.x = new b.c(); })(c = exports.c || (exports.c = {})); +exports.__esModule = true; //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index 044b393b36775..e2cbdc3b54dd3 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -16,6 +16,7 @@ define(["require", "exports"], function (require, exports) { var c; (function (c) { })(c = exports.c || (exports.c = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index 78bfc72a789bf..15e03818d848b 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -16,6 +16,7 @@ define(["require", "exports"], function (require, exports) { var c; (function (c) { })(c = exports.c || (exports.c = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js index d0c4543c194ec..ed4c6714196ca 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js @@ -18,4 +18,5 @@ define(["require", "exports"], function (require, exports) { (function (c) { })(c = exports.c || (exports.c = {})); var x; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index 38e0c38728652..1b74ded4656fd 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -19,6 +19,7 @@ var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); +exports.__esModule = true; //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index 4912293d48c95..a46d7629ae9b0 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -19,6 +19,7 @@ var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); +exports.__esModule = true; //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js index a2921311e539c..5cd431470f538 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js @@ -21,6 +21,7 @@ define(["require", "exports"], function (require, exports) { c.b = a.x; c.bVal = c.b; })(c = exports.c || (exports.c = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js index 8718dc18fdd29..956c70d7cbb39 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js @@ -21,6 +21,7 @@ define(["require", "exports"], function (require, exports) { var b = a.x; c.bVal = b; })(c = exports.c || (exports.c = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js index 1e45ee159d673..0d4e00b2593c5 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js @@ -8,4 +8,5 @@ run(1); define(["require", "exports"], function (require, exports) { "use strict"; run(1); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js index f40d217368525..5cf8d27759717 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js @@ -7,3 +7,4 @@ run(1); //// [isolatedModulesPlainFile-CommonJS.js] "use strict"; run(1); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js index ece949b9100c6..5886a1908a6a1 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js @@ -16,4 +16,5 @@ run(1); })(function (require, exports) { "use strict"; run(1); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js index f47b1b52cc634..a3259d55cd360 100644 --- a/tests/baselines/reference/jsxEmitWithAttributes.js +++ b/tests/baselines/reference/jsxEmitWithAttributes.js @@ -80,3 +80,4 @@ class A { ]; } } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js index a9a925c3e4f91..32ebf4d5d542c 100644 --- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js +++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js @@ -80,3 +80,4 @@ class A { ]; } } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js index 592675086b192..36b16c62f49cc 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js +++ b/tests/baselines/reference/jsxFactoryIdentifier.js @@ -81,4 +81,5 @@ class A { ]; } } +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt index 26e68d04f1d9c..71dbb45a155a5 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt @@ -513,9 +513,10 @@ sourceFile:test.tsx --- >>>} 1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} 1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0) --- +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js index e2fe0c52c903a..9f408e4db7ae9 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js @@ -79,3 +79,4 @@ class A { ]; } } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js index a9a718a4b2af5..331c7a65d7332 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js @@ -79,3 +79,4 @@ class A { ]; } } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js index 4d1cc513918bd..0a7b7f8d38774 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js @@ -80,4 +80,5 @@ class A { ]; } } +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt index c075bc5e839af..86ed94197d6e3 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt @@ -486,9 +486,10 @@ sourceFile:test.tsx --- >>>} 1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} 1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0) --- +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js index ecf7d13d89dc3..72200aee75c59 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js +++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js @@ -25,3 +25,4 @@ var Component = (function () { return Component; }()); ; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js index c204ea7880d57..59bde766a351b 100644 --- a/tests/baselines/reference/jsxImportInAttribute.js +++ b/tests/baselines/reference/jsxImportInAttribute.js @@ -20,3 +20,4 @@ let x = Test; // emit test_1.default var Test_1 = require("Test"); var x = Test_1["default"]; // emit test_1.default ; // ? +exports.__esModule = true; diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js index 7310da92e9200..626a48d191eda 100644 --- a/tests/baselines/reference/jsxViaImport.2.js +++ b/tests/baselines/reference/jsxViaImport.2.js @@ -47,3 +47,4 @@ var TestComponent = (function (_super) { }; return TestComponent; }(React.Component)); +exports.__esModule = true; diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js index cee60d848abe4..9040455be5695 100644 --- a/tests/baselines/reference/jsxViaImport.js +++ b/tests/baselines/reference/jsxViaImport.js @@ -47,3 +47,4 @@ var TestComponent = (function (_super) { }; return TestComponent; }(React.Component)); +exports.__esModule = true; diff --git a/tests/baselines/reference/keepImportsInDts1.js b/tests/baselines/reference/keepImportsInDts1.js index 8189ce43088f1..3f945a5ebc35b 100644 --- a/tests/baselines/reference/keepImportsInDts1.js +++ b/tests/baselines/reference/keepImportsInDts1.js @@ -9,6 +9,7 @@ import "test" //// [main.js] define(["require", "exports", "test"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/keepImportsInDts2.js b/tests/baselines/reference/keepImportsInDts2.js index 559b4814526ae..acd75a00c87a7 100644 --- a/tests/baselines/reference/keepImportsInDts2.js +++ b/tests/baselines/reference/keepImportsInDts2.js @@ -9,10 +9,12 @@ import "./folder/test" //// [test.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [main.js] define(["require", "exports", "./folder/test"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/keepImportsInDts3.js b/tests/baselines/reference/keepImportsInDts3.js index e48ba6937267c..aec2e544e2f96 100644 --- a/tests/baselines/reference/keepImportsInDts3.js +++ b/tests/baselines/reference/keepImportsInDts3.js @@ -9,9 +9,11 @@ import "test" //// [outputfile.js] define("test", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); define("app/main", ["require", "exports", "test"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/keepImportsInDts4.js b/tests/baselines/reference/keepImportsInDts4.js index badec87984edb..3a959bcbbacbd 100644 --- a/tests/baselines/reference/keepImportsInDts4.js +++ b/tests/baselines/reference/keepImportsInDts4.js @@ -9,9 +9,11 @@ import "./folder/test" //// [outputfile.js] define("folder/test", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); define("main", ["require", "exports", "folder/test"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js index 46ca09c2caad2..3e6b396184fb3 100644 --- a/tests/baselines/reference/localAliasExportAssignment.js +++ b/tests/baselines/reference/localAliasExportAssignment.js @@ -25,3 +25,4 @@ module.exports = server; /// var connect = require("./localAliasExportAssignment_0"); connect(); +exports.__esModule = true; diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js index 94f651681982c..b3c51e66c4bd5 100644 --- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js +++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js @@ -32,4 +32,5 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) { "use strict"; WinJS.Promise.timeout(10); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js index 60f6fedd3f228..c27c5ef86150e 100644 --- a/tests/baselines/reference/mergeWithImportedNamespace.js +++ b/tests/baselines/reference/mergeWithImportedNamespace.js @@ -16,5 +16,7 @@ var N; (function (N) { N.x = 1; })(N = exports.N || (exports.N = {})); +exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js index e8dc5a3c2f37b..21e457b1361ca 100644 --- a/tests/baselines/reference/mergeWithImportedType.js +++ b/tests/baselines/reference/mergeWithImportedType.js @@ -14,5 +14,7 @@ var E; (function (E) { E[E["X"] = 0] = "X"; })(E = exports.E || (exports.E = {})); +exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js index e3d1ddc6e0efc..d1becde5240ae 100644 --- a/tests/baselines/reference/mergedDeclarations7.js +++ b/tests/baselines/reference/mergedDeclarations7.js @@ -26,3 +26,4 @@ let p: Passport = passport.use(); "use strict"; var passport = require("passport"); var p = passport.use(); +exports.__esModule = true; diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js index 573701d407b0a..c4e5c8dfa1056 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js @@ -40,3 +40,4 @@ var X; Y.B = B; })(Y = X.Y || (X.Y = {})); })(X = exports.X || (exports.X = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js index fa93f2f2143b6..ace3445911c51 100644 --- a/tests/baselines/reference/metadataOfEventAlias.js +++ b/tests/baselines/reference/metadataOfEventAlias.js @@ -14,6 +14,7 @@ export class SomeClass { //// [event.js] "use strict"; ; +Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { diff --git a/tests/baselines/reference/missingFunctionImplementation2.js b/tests/baselines/reference/missingFunctionImplementation2.js index 7b3456015c832..dde60611657c0 100644 --- a/tests/baselines/reference/missingFunctionImplementation2.js +++ b/tests/baselines/reference/missingFunctionImplementation2.js @@ -11,5 +11,7 @@ export function f(a?, b?); //// [missingFunctionImplementation2_a.js] "use strict"; +exports.__esModule = true; //// [missingFunctionImplementation2_b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js index 76138193938e0..2d33c5b97684e 100644 --- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js +++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js @@ -15,3 +15,4 @@ exports.__esModule = true; //// [b.js] "use strict"; (function () { return 1; }()); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js index c6fb35e37375f..95ef30bb8d6e3 100644 --- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js +++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js @@ -26,4 +26,5 @@ define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (requ } a.x; // OK fn(a); // Error: property 'x' is missing from 'a' + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js index 2e84e1492beed..76eb8237cc69f 100644 --- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js +++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js @@ -36,21 +36,25 @@ let x: Observable; //// [observable.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [map1.js] define(["require", "exports", "./observable"], function (require, exports, observable_1) { "use strict"; observable_1.Observable.prototype.map = function () { }; + exports.__esModule = true; }); //// [map2.js] define(["require", "exports", "./observable"], function (require, exports, observable_1) { "use strict"; observable_1.Observable.prototype.map = function () { }; + exports.__esModule = true; }); //// [main.js] define(["require", "exports", "./map1", "./map2"], function (require, exports) { "use strict"; var x; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js index 7b44fb7a6379f..92bb6cd1d9982 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js @@ -38,15 +38,18 @@ var Observable; (function (Observable) { var someValue; })(Observable = exports.Observable || (exports.Observable = {})); +exports.__esModule = true; //// [map.js] "use strict"; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; +exports.__esModule = true; //// [main.js] "use strict"; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); +exports.__esModule = true; //// [observable.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js index 547d017c502e4..02d461e642d3f 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js @@ -39,10 +39,12 @@ let z2 = Observable.someAnotherValue.toLowerCase(); var Observable; (function (Observable) { })(Observable = exports.Observable || (exports.Observable = {})); +exports.__esModule = true; //// [map.js] "use strict"; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; +exports.__esModule = true; //// [main.js] "use strict"; var observable_1 = require("./observable"); @@ -51,6 +53,7 @@ var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); +exports.__esModule = true; //// [observable.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js index 0f884f267566c..cae38270898be 100644 --- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js +++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js @@ -57,6 +57,7 @@ var N1; (function (N1) { N1.x = 1; })(N1 || (N1 = {})); +exports.__esModule = true; //// [observable.js] "use strict"; exports.x = 1; @@ -68,3 +69,4 @@ exports.__esModule = true; //// [main.js] "use strict"; require("./x"); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js index 0a8b1b0b4b537..5dc02dc308222 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js @@ -38,8 +38,10 @@ let y = x.map(x => x + 1); "use strict"; var observable_1 = require("observable"); observable_1.Observable.prototype.map = function () { }; +exports.__esModule = true; //// [main.js] "use strict"; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js index 2d65953e2a3ae..28461511dfff2 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js @@ -40,6 +40,7 @@ let z2 = Observable.someAnotherValue.toLowerCase(); "use strict"; var observable_1 = require("observable"); observable_1.Observable.prototype.map = function () { }; +exports.__esModule = true; //// [main.js] "use strict"; /// @@ -49,6 +50,7 @@ var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); +exports.__esModule = true; //// [map.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js index a539100c2ed87..0becae3f0fff5 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js @@ -38,12 +38,15 @@ var Observable; (function (Observable) { var someValue; })(Observable = exports.Observable || (exports.Observable = {})); +exports.__esModule = true; //// [map.js] "use strict"; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; +exports.__esModule = true; //// [main.js] "use strict"; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js index 389f2119abaa2..cdad871ac21c3 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js @@ -39,10 +39,12 @@ let z2 = Observable.someAnotherValue.toLowerCase(); var Observable; (function (Observable) { })(Observable = exports.Observable || (exports.Observable = {})); +exports.__esModule = true; //// [map.js] "use strict"; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; +exports.__esModule = true; //// [main.js] "use strict"; var observable_1 = require("./observable"); @@ -51,3 +53,4 @@ var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js index 4f1eb3bde6bf0..6569631a8d73f 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal1.js +++ b/tests/baselines/reference/moduleAugmentationGlobal1.js @@ -31,6 +31,7 @@ exports.__esModule = true; "use strict"; var x = [1]; var y = x.getA().x; +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js index 03334d17cb8bc..222e337dd6437 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal2.js +++ b/tests/baselines/reference/moduleAugmentationGlobal2.js @@ -32,6 +32,7 @@ exports.__esModule = true; "use strict"; var x = [1]; var y = x.getCountAsString().toLowerCase(); +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js index 21be25c63738a..88e6b2c204d1e 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal3.js +++ b/tests/baselines/reference/moduleAugmentationGlobal3.js @@ -33,11 +33,13 @@ exports.A = A; exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; //// [f3.js] "use strict"; require("./f2"); var x = [1]; var y = x.getCountAsString().toLowerCase(); +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js index 38f186d0e05bd..6d9d76f8aafb1 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal4.js +++ b/tests/baselines/reference/moduleAugmentationGlobal4.js @@ -20,12 +20,15 @@ import "./f2"; //// [f1.js] "use strict"; +exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; //// [f3.js] "use strict"; require("./f1"); require("./f2"); +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js index 70c81893bd843..f25dffba5e83b 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal5.js +++ b/tests/baselines/reference/moduleAugmentationGlobal5.js @@ -27,6 +27,7 @@ import "B"; /// require("A"); require("B"); +exports.__esModule = true; //// [f3.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal8.js b/tests/baselines/reference/moduleAugmentationGlobal8.js index 261dfd21b5806..77b467f9e4d44 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal8.js +++ b/tests/baselines/reference/moduleAugmentationGlobal8.js @@ -10,4 +10,5 @@ export {} //// [moduleAugmentationGlobal8.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/moduleAugmentationGlobal8_1.js b/tests/baselines/reference/moduleAugmentationGlobal8_1.js index 2ac585a711b84..70e9c336e7cc0 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal8_1.js +++ b/tests/baselines/reference/moduleAugmentationGlobal8_1.js @@ -10,4 +10,5 @@ export {} //// [moduleAugmentationGlobal8_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js index d0b1592da399a..6a825dcf34c71 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js @@ -49,11 +49,13 @@ exports.__esModule = true; "use strict"; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; +exports.__esModule = true; //// [f4.js] "use strict"; require("./f3"); var a; var b = a.foo().n; +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js index dfb71d81497d1..4f30d1210ff44 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js @@ -61,11 +61,13 @@ exports.__esModule = true; "use strict"; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; +exports.__esModule = true; //// [f4.js] "use strict"; require("./f3"); var a; var b = a.foo().n; +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js index 312a56792b697..66de9f1c596f8 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js @@ -59,11 +59,13 @@ exports.__esModule = true; "use strict"; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; +exports.__esModule = true; //// [f4.js] "use strict"; require("./f3"); var a; var b = a.foo().n; +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js index 690ec91226aca..0729457fc514e 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js @@ -61,6 +61,7 @@ exports.__esModule = true; "use strict"; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; +exports.__esModule = true; //// [f4.js] "use strict"; require("./f3"); @@ -68,3 +69,4 @@ var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js index efb3fc04f9ffb..7970f65f412c8 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js @@ -61,6 +61,7 @@ exports.__esModule = true; "use strict"; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; +exports.__esModule = true; //// [f4.js] "use strict"; require("./f3"); @@ -68,6 +69,7 @@ var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js index 228320ec9c6d6..3b290b8297512 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js @@ -61,6 +61,7 @@ exports.__esModule = true; "use strict"; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; +exports.__esModule = true; //// [f4.js] "use strict"; require("./f3"); @@ -68,6 +69,7 @@ var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; +exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js index aecb8954d53d3..852d50f8d014b 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js @@ -33,6 +33,7 @@ x.foo().x; "use strict"; var x; x.foo().x; +exports.__esModule = true; //// [main.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js index 5529afc674fb3..1fdb32a55b54d 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js @@ -34,3 +34,4 @@ x.foo().x; require("Map"); var x; x.foo().x; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js index 3a94c50ef1f6a..aa6b33baef3d7 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js @@ -45,3 +45,4 @@ require("Map"); var x; x.foo().x; x.foo2().x2; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js index bf0339d31076e..5f209f753cf96 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js @@ -48,3 +48,4 @@ require("Map"); var x; x.foo().x; x.foo2().x2; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js index 2e6503c47743e..55226da5ee979 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js @@ -29,6 +29,7 @@ let y = x.getA().x; require("array"); var x = [1]; var y = x.getA().x; +exports.__esModule = true; //// [f.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js index 1c5995339c3f7..757b71754d6a7 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency.js +++ b/tests/baselines/reference/moduleAugmentationInDependency.js @@ -11,3 +11,4 @@ import "A" //// [app.js] "use strict"; require("A"); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js index 381f1e72d8f31..53d2e6ede7175 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency2.js +++ b/tests/baselines/reference/moduleAugmentationInDependency2.js @@ -10,6 +10,8 @@ import "A" //// [index.js] "use strict"; +exports.__esModule = true; //// [app.js] "use strict"; require("A"); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js index ccd4a668497fa..6edaf5b9fca98 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.js +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js @@ -30,12 +30,15 @@ let y = x.map(x => x + 1); //// [observable.js] "use strict"; +exports.__esModule = true; //// [map.js] "use strict"; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; +exports.__esModule = true; //// [main.js] "use strict"; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js index a55585e6acedd..d41be36991757 100644 --- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js +++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js @@ -70,6 +70,7 @@ define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) { "use strict"; m1_1.Cls.prototype.foo = function () { return 1; }; m1_1.Cls.prototype.bar = function () { return "1"; }; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("m3", ["require", "exports"], function (require, exports) { "use strict"; @@ -91,6 +92,7 @@ define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) { "use strict"; m1_2.Cls.prototype.baz1 = function () { return undefined; }; m1_2.Cls.prototype.baz2 = function () { return undefined; }; + Object.defineProperty(exports, "__esModule", { value: true }); }); define("test", ["require", "exports", "m2", "m4"], function (require, exports) { "use strict"; @@ -99,6 +101,7 @@ define("test", ["require", "exports", "m2", "m4"], function (require, exports) { c.bar().toLowerCase(); c.baz1().x.toExponential(); c.baz2().x.toLowerCase(); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js index 26a0492844058..4f93e976dfca8 100644 --- a/tests/baselines/reference/moduleAugmentationsImports1.js +++ b/tests/baselines/reference/moduleAugmentationsImports1.js @@ -68,12 +68,14 @@ define("d", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; a_1.A.prototype.getB = function () { return undefined; }; a_1.A.prototype.getCls = function () { return undefined; }; + exports.__esModule = true; }); define("main", ["require", "exports", "d"], function (require, exports) { "use strict"; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js index 82858bcada028..94d418c7fc748 100644 --- a/tests/baselines/reference/moduleAugmentationsImports2.js +++ b/tests/baselines/reference/moduleAugmentationsImports2.js @@ -72,16 +72,19 @@ define("b", ["require", "exports"], function (require, exports) { define("d", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; a_1.A.prototype.getB = function () { return undefined; }; + exports.__esModule = true; }); define("e", ["require", "exports", "a"], function (require, exports, a_2) { "use strict"; a_2.A.prototype.getCls = function () { return undefined; }; + exports.__esModule = true; }); define("main", ["require", "exports", "d", "e"], function (require, exports) { "use strict"; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js index 8bdbb647421f0..71f96df940c84 100644 --- a/tests/baselines/reference/moduleAugmentationsImports3.js +++ b/tests/baselines/reference/moduleAugmentationsImports3.js @@ -70,12 +70,14 @@ define("b", ["require", "exports"], function (require, exports) { define("e", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; a_1.A.prototype.getCls = function () { return undefined; }; + exports.__esModule = true; }); define("main", ["require", "exports", "D", "e"], function (require, exports) { "use strict"; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js index 82b8624c35c44..2883d91d03c4c 100644 --- a/tests/baselines/reference/moduleAugmentationsImports4.js +++ b/tests/baselines/reference/moduleAugmentationsImports4.js @@ -73,6 +73,7 @@ define("main", ["require", "exports", "D", "E"], function (require, exports) { var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js index 362785a5d6805..e66235ca2bcb4 100644 --- a/tests/baselines/reference/moduleCodegenTest4.js +++ b/tests/baselines/reference/moduleCodegenTest4.js @@ -12,3 +12,4 @@ var Baz; })(Baz = exports.Baz || (exports.Baz = {})); Baz.x = "goodbye"; void 0; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js index 130091cd61cd1..7db2ce416ddd8 100644 --- a/tests/baselines/reference/moduleExports1.js +++ b/tests/baselines/reference/moduleExports1.js @@ -36,4 +36,5 @@ define(["require", "exports"], function (require, exports) { void 0; if (!module.exports) module.exports = ""; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js index 26d262a76fe04..9e79d8d81b226 100644 --- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js +++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js @@ -14,6 +14,7 @@ class Test1 extends C1 { //// [moduleImportedForTypeArgumentPosition_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [moduleImportedForTypeArgumentPosition_1.js] var __extends = (this && this.__extends) || (function () { @@ -40,4 +41,5 @@ define(["require", "exports"], function (require, exports) { } return Test1; }(C1)); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js index 8c18060d506cb..314460661b24b 100644 --- a/tests/baselines/reference/moduleInTypePosition1.js +++ b/tests/baselines/reference/moduleInTypePosition1.js @@ -23,3 +23,4 @@ exports.__esModule = true; //// [moduleInTypePosition1_1.js] "use strict"; var x = function (w1) { }; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js index 5ab4ab381e010..edf18bb7d583a 100644 --- a/tests/baselines/reference/moduleMergeConstructor.js +++ b/tests/baselines/reference/moduleMergeConstructor.js @@ -36,4 +36,5 @@ define(["require", "exports", "foo"], function (require, exports, foo) { } return Test; }()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js index e3c323bba714b..685a2ac02331f 100644 --- a/tests/baselines/reference/moduleResolutionNoResolve.js +++ b/tests/baselines/reference/moduleResolutionNoResolve.js @@ -10,6 +10,7 @@ export var c = ''; //// [a.js] "use strict"; +exports.__esModule = true; //// [b.js] "use strict"; exports.c = ''; diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js index 554f81109945e..3921729211785 100644 --- a/tests/baselines/reference/moduleResolutionNoTs.js +++ b/tests/baselines/reference/moduleResolutionNoTs.js @@ -31,3 +31,4 @@ exports["default"] = 0; exports.__esModule = true; //// [user.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js index 1f241c1ed96d0..d2ee65a508a41 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions.js @@ -32,8 +32,11 @@ exports.__esModule = true; // No extension: '.ts' added //// [b.js] "use strict"; +exports.__esModule = true; // '.js' extension: stripped and replaced with '.ts' //// [d.js] "use strict"; +exports.__esModule = true; //// [jquery_user_1.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js index 2e5297bdf65f8..6bce8b8d3c5c9 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.js @@ -15,3 +15,4 @@ import js from "./js"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js index c340f65f251d7..a11d43d56dfe3 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.js @@ -10,3 +10,4 @@ import jsx from "./jsx"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js index f362701bbda71..ca0fa6ca402c9 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.js @@ -10,3 +10,4 @@ import jsx from "./jsx"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js index afd5ce5a5785a..fb8904c5748e6 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js @@ -16,3 +16,4 @@ exports["default"] = 0; exports.__esModule = true; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js index b5d4ae20a4db7..014207d240027 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js @@ -15,3 +15,4 @@ import "normalize.css"; //// [a.js] "use strict"; require("normalize.css"); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js index dc9df79e4dfb7..c53efeb09613b 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js @@ -15,3 +15,4 @@ import "foo"; //// [a.js] "use strict"; require("foo"); +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js index 51d476338c024..3563f7db251ad 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.js @@ -16,3 +16,4 @@ import { x } from "js"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js index f326ab9231a3d..e0aebb04d76b3 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js @@ -61,6 +61,7 @@ var x; var y; x = y; y = x; +exports.__esModule = true; /* # To reproduce in a real project: diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js index f88665c68081f..55317e413bfcc 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js @@ -32,3 +32,4 @@ exports.__esModule = true; var abc_1 = require("./shared/abc"); var abc_2 = require("./shared2/abc"); abc_1.x + abc_2.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js index 7d7789425241e..d4fb798e8c7c8 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js @@ -40,3 +40,4 @@ var x; var y; x = y; y = x; +exports.__esModule = true; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js index 7411123a8727b..7caaf1e55f69a 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js @@ -21,6 +21,7 @@ var Animals; Animals[Animals["Dog"] = 1] = "Dog"; })(Animals = exports.Animals || (exports.Animals = {})); ; +exports.__esModule = true; //// [b.js] "use strict"; var c_1 = require("./c"); diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js index 20a518e25113d..bee7a06ce6ffe 100644 --- a/tests/baselines/reference/moduleScoping.js +++ b/tests/baselines/reference/moduleScoping.js @@ -39,5 +39,6 @@ var t1 = v1; var t2 = v2; var t3 = file3.v3; var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module +exports.__esModule = true; //// [file5.js] var x = v2; // Should be global v2 of type number again diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js index 2cd5440ce6e2d..afc2fa1f5bd58 100644 --- a/tests/baselines/reference/multiImportExport.js +++ b/tests/baselines/reference/multiImportExport.js @@ -45,10 +45,12 @@ module.exports = Math; //// [Drawing.js] "use strict"; exports.Math = require("./Math/Math"); +exports.__esModule = true; //// [consumer.js] "use strict"; var Drawing = require("./Drawing"); var addr = new Drawing.Math.Adder(); +exports.__esModule = true; //// [Adder.d.ts] diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js index a0e06a40da517..4ea2e7cb8f03e 100644 --- a/tests/baselines/reference/multipleDefaultExports01.js +++ b/tests/baselines/reference/multipleDefaultExports01.js @@ -36,3 +36,4 @@ Object.defineProperty(exports, "__esModule", { value: true }); "use strict"; var m1_1 = require("./m1"); m1_1.default(); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js index 210fa21e803ef..5fe294d193976 100644 --- a/tests/baselines/reference/multipleDefaultExports02.js +++ b/tests/baselines/reference/multipleDefaultExports02.js @@ -28,3 +28,4 @@ Object.defineProperty(exports, "__esModule", { value: true }); "use strict"; var m1_1 = require("./m1"); m1_1.default(); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js index fd6ac67e82a05..75a4e125f2119 100644 --- a/tests/baselines/reference/multipleExports.js +++ b/tests/baselines/reference/multipleExports.js @@ -22,3 +22,4 @@ var x = 0; (function (M) { M.v; })(M = exports.M || (exports.M = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js index 36b8e0e8d278c..4677da0df7b89 100644 --- a/tests/baselines/reference/nameDelimitedBySlashes.js +++ b/tests/baselines/reference/nameDelimitedBySlashes.js @@ -16,3 +16,4 @@ exports.__esModule = true; "use strict"; var foo = require("./test/foo_0"); var x = foo.foo + 42; +exports.__esModule = true; diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js index 86c384cdbdf90..de42c5ed60cae 100644 --- a/tests/baselines/reference/nameWithFileExtension.js +++ b/tests/baselines/reference/nameWithFileExtension.js @@ -16,3 +16,4 @@ exports.__esModule = true; "use strict"; var foo = require("./foo_0.js"); var x = foo.foo + 42; +exports.__esModule = true; diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js index 57ff852ec35a8..e7c85322317a4 100644 --- a/tests/baselines/reference/nameWithRelativePaths.js +++ b/tests/baselines/reference/nameWithRelativePaths.js @@ -40,6 +40,7 @@ var M2; (function (M2) { M2.x = true; })(M2 = exports.M2 || (exports.M2 = {})); +exports.__esModule = true; //// [foo_3.js] "use strict"; var foo0 = require("../foo_0"); @@ -48,3 +49,4 @@ var foo2 = require("./.././test/foo_2"); if (foo2.M2.x) { var x = foo0.foo + foo1.f(); } +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js index a48eb71c8bcd1..21f6e259d3d50 100644 --- a/tests/baselines/reference/nodeResolution1.js +++ b/tests/baselines/reference/nodeResolution1.js @@ -13,3 +13,4 @@ exports.x = 1; exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution2.js b/tests/baselines/reference/nodeResolution2.js index a139eaf62cf7b..6d0963c6acbbe 100644 --- a/tests/baselines/reference/nodeResolution2.js +++ b/tests/baselines/reference/nodeResolution2.js @@ -9,3 +9,4 @@ import y = require("a"); //// [b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution3.js b/tests/baselines/reference/nodeResolution3.js index 99b6a69281915..8750e3ff07d71 100644 --- a/tests/baselines/reference/nodeResolution3.js +++ b/tests/baselines/reference/nodeResolution3.js @@ -9,3 +9,4 @@ import y = require("b"); //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution4.js b/tests/baselines/reference/nodeResolution4.js index 7aac08fe6d021..0591dc5a299eb 100644 --- a/tests/baselines/reference/nodeResolution4.js +++ b/tests/baselines/reference/nodeResolution4.js @@ -18,3 +18,4 @@ var x = 1; exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution5.js b/tests/baselines/reference/nodeResolution5.js index 766d4118e97d8..f5a6165906fc5 100644 --- a/tests/baselines/reference/nodeResolution5.js +++ b/tests/baselines/reference/nodeResolution5.js @@ -12,3 +12,4 @@ import y = require("a"); //// [b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution6.js b/tests/baselines/reference/nodeResolution6.js index 196e8ae57cf54..cda821991d003 100644 --- a/tests/baselines/reference/nodeResolution6.js +++ b/tests/baselines/reference/nodeResolution6.js @@ -15,3 +15,4 @@ import y = require("a"); //// [b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution7.js b/tests/baselines/reference/nodeResolution7.js index 028d7ed2e8117..f8cbff14726e5 100644 --- a/tests/baselines/reference/nodeResolution7.js +++ b/tests/baselines/reference/nodeResolution7.js @@ -12,3 +12,4 @@ import y = require("a"); //// [b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nodeResolution8.js b/tests/baselines/reference/nodeResolution8.js index 1d90399ff706e..5facd2edc39ee 100644 --- a/tests/baselines/reference/nodeResolution8.js +++ b/tests/baselines/reference/nodeResolution8.js @@ -14,3 +14,4 @@ import y = require("a"); //// [b.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/nounusedTypeParameterConstraint.js b/tests/baselines/reference/nounusedTypeParameterConstraint.js index aa403187f7acf..f8881e6d0a00e 100644 --- a/tests/baselines/reference/nounusedTypeParameterConstraint.js +++ b/tests/baselines/reference/nounusedTypeParameterConstraint.js @@ -10,5 +10,7 @@ export type DomainEntityConstructor = { new //// [bar.js] "use strict"; +exports.__esModule = true; //// [test.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js index f5bf47e347554..08dda7376dce3 100644 --- a/tests/baselines/reference/objectIndexer.js +++ b/tests/baselines/reference/objectIndexer.js @@ -24,4 +24,5 @@ define(["require", "exports"], function (require, exports) { } return Emitter; }()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js index e7256562e76eb..748854e38e867 100644 --- a/tests/baselines/reference/overloadModifiersMustAgree.js +++ b/tests/baselines/reference/overloadModifiersMustAgree.js @@ -24,3 +24,4 @@ var baz = (function () { return baz; }()); function bar(s) { } +exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum1.js b/tests/baselines/reference/parserEnum1.js index d2c29d847cd79..52971b2b9c2bb 100644 --- a/tests/baselines/reference/parserEnum1.js +++ b/tests/baselines/reference/parserEnum1.js @@ -17,3 +17,4 @@ var SignatureFlags; SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer"; SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer"; })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum2.js b/tests/baselines/reference/parserEnum2.js index f5888addf7539..47d5899990ddc 100644 --- a/tests/baselines/reference/parserEnum2.js +++ b/tests/baselines/reference/parserEnum2.js @@ -17,3 +17,4 @@ var SignatureFlags; SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer"; SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer"; })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum3.js b/tests/baselines/reference/parserEnum3.js index 602171e8d9449..e18a4c2069697 100644 --- a/tests/baselines/reference/parserEnum3.js +++ b/tests/baselines/reference/parserEnum3.js @@ -9,3 +9,4 @@ var SignatureFlags; (function (SignatureFlags) { })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum4.js b/tests/baselines/reference/parserEnum4.js index 6af07b0a1c79a..90c0253e1f988 100644 --- a/tests/baselines/reference/parserEnum4.js +++ b/tests/baselines/reference/parserEnum4.js @@ -10,3 +10,4 @@ var SignatureFlags; (function (SignatureFlags) { })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/parserExportAssignment7.js b/tests/baselines/reference/parserExportAssignment7.js index 8f9d4fe84d941..dd6750bec323c 100644 --- a/tests/baselines/reference/parserExportAssignment7.js +++ b/tests/baselines/reference/parserExportAssignment7.js @@ -12,4 +12,3 @@ var C = (function () { return C; }()); module.exports = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserExportAssignment8.js b/tests/baselines/reference/parserExportAssignment8.js index 1334db7782a87..07ff257fb6193 100644 --- a/tests/baselines/reference/parserExportAssignment8.js +++ b/tests/baselines/reference/parserExportAssignment8.js @@ -12,4 +12,3 @@ var C = (function () { return C; }()); module.exports = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.js b/tests/baselines/reference/parserInterfaceDeclaration6.js index 1ec3325de3443..cbc734b534c53 100644 --- a/tests/baselines/reference/parserInterfaceDeclaration6.js +++ b/tests/baselines/reference/parserInterfaceDeclaration6.js @@ -4,3 +4,4 @@ export export interface I { //// [parserInterfaceDeclaration6.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.js b/tests/baselines/reference/parserInterfaceDeclaration7.js index eed874db1431d..0c52f4639ce07 100644 --- a/tests/baselines/reference/parserInterfaceDeclaration7.js +++ b/tests/baselines/reference/parserInterfaceDeclaration7.js @@ -4,3 +4,4 @@ export interface I { //// [parserInterfaceDeclaration7.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js index 749715a39d1a1..5bd983595dca3 100644 --- a/tests/baselines/reference/parserModule1.js +++ b/tests/baselines/reference/parserModule1.js @@ -59,3 +59,4 @@ var CompilerDiagnostics; } CompilerDiagnostics.assert = assert; })(CompilerDiagnostics = exports.CompilerDiagnostics || (exports.CompilerDiagnostics = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js index 9713cae56f506..e05006539a992 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js @@ -42,4 +42,5 @@ define(["require", "exports", "./file3", "file4"], function (require, exports, f define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { "use strict"; use(file2_1.x.toExponential()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js index 966f50202c048..515f6e517155e 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js @@ -34,3 +34,4 @@ exports.__esModule = true; "use strict"; var file2_1 = require("folder2/file2"); use(file2_1.x.toExponential()); +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js index 25ca74cc848a7..28b3eb8a902dc 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js @@ -38,4 +38,5 @@ define(["require", "exports", "./file3", "file4"], function (require, exports, f define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { "use strict"; use(file2_1.x.toExponential()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js index 8f8fe447550a4..cf9e143ebb02f 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js @@ -30,3 +30,4 @@ exports.__esModule = true; "use strict"; var file2_1 = require("folder2/file2"); use(file2_1.x.toExponential()); +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js index 9b9054390ed48..46244521fabc7 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js @@ -56,4 +56,5 @@ define(["require", "exports", "folder2/file1", "folder3/file2", "components/file use(file2_1.y.toExponential()); use(file3_1.z.toExponential()); use(file4_1.z1.toExponential()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js index fdf2c8edbafcf..69e5e16fe91a5 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js @@ -47,3 +47,4 @@ use(file1_1.x.toExponential()); use(file2_1.y.toExponential()); use(file3_1.z.toExponential()); use(file4_1.z1.toExponential()); +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js index c871f804b05ca..12e8e5dbda5d9 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js @@ -21,4 +21,5 @@ define(["require", "exports", "../file2"], function (require, exports, file2_1) define(["require", "exports", "./project/file3"], function (require, exports, file3_1) { "use strict"; use(file3_1.x.toExponential()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js index 5ae4aa284c0d0..5cc834d071271 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js @@ -20,3 +20,4 @@ exports.__esModule = true; "use strict"; var file3_1 = require("./project/file3"); use(file3_1.x.toFixed()); +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js index 3acc7ca874018..9aa886aeb26a8 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js @@ -44,4 +44,5 @@ define(["require", "exports", "./project/file2", "module3"], function (require, "use strict"; use(file2_1.x.toFixed()); use(module3_1.y.toFixed()); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js index a9870d0cbc6ce..8095c4de6a1ad 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js @@ -44,3 +44,4 @@ var file2_1 = require("./project/file2"); var module3_1 = require("module3"); use(file2_1.x.toFixed()); use(module3_1.y.toFixed()); +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js index 55ffb41de13fa..44a53df492aa9 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js @@ -24,3 +24,4 @@ exports.bar = bar; exports.__esModule = true; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js index 1774876911f26..4fded4a78ad15 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js @@ -5,3 +5,4 @@ import { foo } from "foo"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js index 54ad8acd2f170..98e87342287f6 100644 --- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js +++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js @@ -10,6 +10,7 @@ export interface B extends A { //// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js index ff241a726bf57..b8e8139675bcd 100644 --- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js +++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js @@ -24,6 +24,7 @@ var Foo = (function () { module.exports = Foo; //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js] "use strict"; +exports.__esModule = true; //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.d.ts] diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js index 8b2c4de8bf387..6d2748dd8dccd 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js @@ -96,4 +96,5 @@ interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInter //// [privacyInterfaceExtendsClauseDeclFile_externalModule.js] "use strict"; +exports.__esModule = true; //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.js] diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js index b328e8b303693..5006bab0ad170 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js @@ -294,3 +294,4 @@ var import_private; import_private.publicUse_im_private_mi_public = new import_private.im_private_mi_public.c(); var privateUse_im_private_mu_public; })(import_private || (import_private = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js index 7d4a80a0d29e8..9cc12f1c798f8 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js @@ -295,4 +295,5 @@ define(["require", "exports"], function (require, exports) { import_private.publicUse_im_private_mi_public = new im_private_mi_public.c(); var privateUse_im_private_mu_public; })(import_private || (import_private = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js index b66e5b6e6bad7..5daa18796285e 100644 --- a/tests/baselines/reference/project/baseline/amd/emit.js +++ b/tests/baselines/reference/project/baseline/amd/emit.js @@ -1,4 +1,5 @@ define(["require", "exports", "./decl"], function (require, exports, g) { "use strict"; var p = g.point(10, 20); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js index b33f5d1b198bb..17c96719d0b45 100644 --- a/tests/baselines/reference/project/baseline/node/emit.js +++ b/tests/baselines/reference/project/baseline/node/emit.js @@ -1,3 +1,4 @@ "use strict"; var g = require("./decl"); var p = g.point(10, 20); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js index 523d596dca16a..859d262e9c613 100644 --- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js @@ -1,4 +1,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; var p = { x: 10, y: 20 }; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js index e5a1637efb1ae..c172dcd312fe7 100644 --- a/tests/baselines/reference/project/baseline2/node/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js @@ -1,2 +1,3 @@ "use strict"; var p = { x: 10, y: 20 }; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js index 36eb17665d60f..3fa69311ffa10 100644 --- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js @@ -8,4 +8,5 @@ define(["require", "exports"], function (require, exports) { inner.a = local; })(inner = outer.inner || (outer.inner = {})); })(outer = exports.outer || (exports.outer = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js index 1d5c5c9d534ec..9596b38253ae1 100644 --- a/tests/baselines/reference/project/baseline3/node/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js @@ -7,3 +7,4 @@ var outer; inner.a = local; })(inner = outer.inner || (outer.inner = {})); })(outer = exports.outer || (exports.outer = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js index a5da0ab931427..a6563ac4f7396 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js @@ -6,4 +6,5 @@ define(["require", "exports", "private_m4"], function (require, exports, private var d3 = private_m4.d; var f3 = private_m4.foo(); })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js index 3cc7f82feb705..24526ded58be4 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js @@ -7,3 +7,4 @@ var usePrivate_m4_m1; var d3 = private_m4.d; var f3 = private_m4.foo(); })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js index 5b8a451c78130..b5c401da717e2 100644 --- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js +++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js @@ -3,4 +3,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js index 59944c663e92e..fb163c512b80e 100644 --- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js +++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js @@ -3,3 +3,4 @@ var m1 = require("m1"); m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). +exports.__esModule = true; diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js index 5a3916f07d1fa..432701235d5dc 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js @@ -4,4 +4,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { m1.f2.a = "10"; // Error: Should be number m1.rel = 42; // Error: Should be boolean m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any". + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js index fb4faf236b29a..12d17b6070916 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js @@ -4,3 +4,4 @@ m1.f1("test"); m1.f2.a = "10"; // Error: Should be number m1.rel = 42; // Error: Should be boolean m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any". +exports.__esModule = true; diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js index 9ef3915c85125..81c077dfd9c82 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js @@ -4,4 +4,5 @@ define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) { m1.f2.a = 10; m1.f2.person.age = "10"; // Should error if loaded the .js files correctly var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js index f6783cda79b04..0d06a91c2a62e 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js @@ -5,3 +5,4 @@ m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Should error if loaded the .js files correctly var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file +exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js index 08e0b38c7dfe9..11da1c899c1d4 100644 --- a/tests/baselines/reference/project/nonRelative/amd/consume.js +++ b/tests/baselines/reference/project/nonRelative/amd/consume.js @@ -6,4 +6,5 @@ define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (requi if (str !== "success") { fail(); } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js index 35d658abb62d2..d4f9f6e288d02 100644 --- a/tests/baselines/reference/project/nonRelative/node/consume.js +++ b/tests/baselines/reference/project/nonRelative/node/consume.js @@ -8,3 +8,4 @@ var str = mod.call(); if (str !== "success") { fail(); } +exports.__esModule = true; diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js index 3053eb35cb488..eb08364649a70 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/commands.js @@ -1,3 +1,4 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js index 3053eb35cb488..eb08364649a70 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/server.js @@ -1,3 +1,4 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js index 0c14aab22f752..64cbe53a86127 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/commands.js @@ -1 +1,2 @@ "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js index 0c14aab22f752..64cbe53a86127 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/server.js @@ -1 +1,2 @@ "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js index f62acb89dfd07..b16939b5d8f02 100644 --- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js +++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js @@ -45,4 +45,5 @@ define(["require", "exports"], function (require, exports) { }()); var y; var y; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js index fdf24fbeb167b..bec6247b7ccdf 100644 --- a/tests/baselines/reference/reExportDefaultExport.js +++ b/tests/baselines/reference/reExportDefaultExport.js @@ -27,3 +27,4 @@ var m1_1 = require("./m1"); var m1_2 = require("./m1"); m1_2.f(); m1_1.default(); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/reExportGlobalDeclaration1.js b/tests/baselines/reference/reExportGlobalDeclaration1.js index c0db9a0eaf36b..9ab432fd084db 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration1.js +++ b/tests/baselines/reference/reExportGlobalDeclaration1.js @@ -22,3 +22,4 @@ export {b as b2}; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/reExportGlobalDeclaration2.js b/tests/baselines/reference/reExportGlobalDeclaration2.js index 160a9b28f54a6..52e55bb18c4fd 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration2.js +++ b/tests/baselines/reference/reExportGlobalDeclaration2.js @@ -18,3 +18,4 @@ export {I2 as III2}; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/reExportGlobalDeclaration3.js b/tests/baselines/reference/reExportGlobalDeclaration3.js index e1b85b6b8d5cc..ed111b42197b9 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration3.js +++ b/tests/baselines/reference/reExportGlobalDeclaration3.js @@ -18,3 +18,4 @@ export {NS2 as NNNS2}; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/reExportGlobalDeclaration4.js b/tests/baselines/reference/reExportGlobalDeclaration4.js index 09d6b76079064..a7a0e7525caa4 100644 --- a/tests/baselines/reference/reExportGlobalDeclaration4.js +++ b/tests/baselines/reference/reExportGlobalDeclaration4.js @@ -18,3 +18,4 @@ export {Cls2 as CCCls2}; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/reExportUndefined1.js b/tests/baselines/reference/reExportUndefined1.js index 94729e4f54419..7540901fa3027 100644 --- a/tests/baselines/reference/reExportUndefined1.js +++ b/tests/baselines/reference/reExportUndefined1.js @@ -4,3 +4,4 @@ export { undefined }; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/reExportUndefined2.js b/tests/baselines/reference/reExportUndefined2.js index 5054ea672c9f0..726b25c748d53 100644 --- a/tests/baselines/reference/reExportUndefined2.js +++ b/tests/baselines/reference/reExportUndefined2.js @@ -19,3 +19,4 @@ exports.__esModule = true; "use strict"; var a_1 = require("./a"); use(a_1.undefined); +exports.__esModule = true; diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.js b/tests/baselines/reference/reactNamespaceImportPresevation.js index 5c44674d03137..99eb5a94bacb4 100644 --- a/tests/baselines/reference/reactNamespaceImportPresevation.js +++ b/tests/baselines/reference/reactNamespaceImportPresevation.js @@ -18,3 +18,4 @@ declare var foo: any; "use strict"; var myReactLib = require("my-React-Lib"); // should not be elided ; +exports.__esModule = true; diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js index 6f8304df6582f..87e85e9d20f18 100644 --- a/tests/baselines/reference/recursiveMods.js +++ b/tests/baselines/reference/recursiveMods.js @@ -51,3 +51,4 @@ var Foo; return; } })(Foo = exports.Foo || (exports.Foo = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js index 0242a57d4f51c..9bd5fb62e1ae3 100644 --- a/tests/baselines/reference/reexportClassDefinition.js +++ b/tests/baselines/reference/reexportClassDefinition.js @@ -51,3 +51,4 @@ var x = (function (_super) { } return x; }(foo2.x)); +exports.__esModule = true; diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js index 3d24d8428f51c..68fef5a3e9d5d 100644 --- a/tests/baselines/reference/relativeNamesInClassicResolution.js +++ b/tests/baselines/reference/relativeNamesInClassicResolution.js @@ -10,6 +10,7 @@ export let x = 1; //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [b.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/relativePathMustResolve.js b/tests/baselines/reference/relativePathMustResolve.js index 6986d8ddb6853..a8c841261fdfd 100644 --- a/tests/baselines/reference/relativePathMustResolve.js +++ b/tests/baselines/reference/relativePathMustResolve.js @@ -12,3 +12,4 @@ var z = foo.x + 10; "use strict"; var foo = require("./test/foo"); var z = foo.x + 10; +exports.__esModule = true; diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js index 36673510aefb1..84a784779f65c 100644 --- a/tests/baselines/reference/relativePathToDeclarationFile.js +++ b/tests/baselines/reference/relativePathToDeclarationFile.js @@ -34,3 +34,4 @@ var relMod = require("./sub/relMod"); if (foo.M2.x) { var x = new relMod(other.M2.x.charCodeAt(0)); } +exports.__esModule = true; diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js index 52b4060860836..39a39fb1bbe73 100644 --- a/tests/baselines/reference/requireAsFunctionInExternalModule.js +++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js @@ -36,3 +36,4 @@ exports.__esModule = true; "use strict"; var m_1 = require("./m"); m_1.hello(); +exports.__esModule = true; diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js index 7ac73b6f3dfa9..6ef27122df474 100644 --- a/tests/baselines/reference/requireEmitSemicolon.js +++ b/tests/baselines/reference/requireEmitSemicolon.js @@ -31,6 +31,7 @@ define(["require", "exports"], function (require, exports) { }()); Models.Person = Person; })(Models = exports.Models || (exports.Models = {})); + exports.__esModule = true; }); //// [requireEmitSemicolon_1.js] define(["require", "exports", "requireEmitSemicolon_0"], function (require, exports, P) { @@ -47,4 +48,5 @@ define(["require", "exports", "requireEmitSemicolon_0"], function (require, expo }()); Database.DB = DB; })(Database = exports.Database || (exports.Database = {})); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.js b/tests/baselines/reference/requireOfAnEmptyFile1.js index 5364227219191..a1e6dbbc44730 100644 --- a/tests/baselines/reference/requireOfAnEmptyFile1.js +++ b/tests/baselines/reference/requireOfAnEmptyFile1.js @@ -12,3 +12,4 @@ import fs = require('./requireOfAnEmptyFile1_b'); //// [requireOfAnEmptyFile1_a.js] //requireOfAnEmptyFile1 "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js index d9c8105c35f5b..6b0941349e037 100644 --- a/tests/baselines/reference/reservedWords2.js +++ b/tests/baselines/reference/reservedWords2.js @@ -37,3 +37,4 @@ if () (function () { })( || ( = {})); void {}; +exports.__esModule = true; diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js index a8d254f56c18e..c4d0a7745fa0d 100644 --- a/tests/baselines/reference/reuseInnerModuleMember.js +++ b/tests/baselines/reference/reuseInnerModuleMember.js @@ -17,6 +17,7 @@ module bar { //// [reuseInnerModuleMember_0.js] "use strict"; +exports.__esModule = true; //// [reuseInnerModuleMember_1.js] "use strict"; /// @@ -24,3 +25,4 @@ var bar; (function (bar) { var x; })(bar || (bar = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/scannerEnum1.js b/tests/baselines/reference/scannerEnum1.js index 5d8b506e62f02..17a0b66fde295 100644 --- a/tests/baselines/reference/scannerEnum1.js +++ b/tests/baselines/reference/scannerEnum1.js @@ -11,3 +11,4 @@ var CodeGenTarget; CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3"; CodeGenTarget[CodeGenTarget["ES5"] = 1] = "ES5"; })(CodeGenTarget = exports.CodeGenTarget || (exports.CodeGenTarget = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/shebangBeforeReferences.js b/tests/baselines/reference/shebangBeforeReferences.js index 6c3e1420c4ae9..67f0cbff69044 100644 --- a/tests/baselines/reference/shebangBeforeReferences.js +++ b/tests/baselines/reference/shebangBeforeReferences.js @@ -20,3 +20,4 @@ use(x); "use strict"; var test_1 = require("test"); use(test_1.x); +exports.__esModule = true; diff --git a/tests/baselines/reference/shorthand-property-es6-amd.js b/tests/baselines/reference/shorthand-property-es6-amd.js index 383d5d99e9e69..f1a26e461443f 100644 --- a/tests/baselines/reference/shorthand-property-es6-amd.js +++ b/tests/baselines/reference/shorthand-property-es6-amd.js @@ -10,6 +10,7 @@ define(["require", "exports", "./foo"], function (require, exports, foo_1) { "use strict"; const baz = 42; const bar = { foo: foo_1.foo, baz }; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js index be20fb287abbc..339878ad4a56e 100644 --- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js @@ -26,3 +26,4 @@ const missingModule_1 = require("./missingModule"); const test = { x: existingModule_1.x, foo: missingModule_1.foo }; use(existingModule_1.x); use(missingModule_1.foo); +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js index f77980caf2f9a..823f2bc44ec9d 100644 --- a/tests/baselines/reference/staticInstanceResolution3.js +++ b/tests/baselines/reference/staticInstanceResolution3.js @@ -29,3 +29,4 @@ exports.__esModule = true; /// var WinJS = require("./staticInstanceResolution3_0"); WinJS.Promise.timeout(10); +exports.__esModule = true; diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js index 3ec3256665876..da64e191cc899 100644 --- a/tests/baselines/reference/staticInstanceResolution5.js +++ b/tests/baselines/reference/staticInstanceResolution5.js @@ -37,4 +37,5 @@ define(["require", "exports"], function (require, exports) { var x = function (w1) { }; var y = function (w2) { }; function z(w3) { } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js index 50ed1b4d755ad..409e6f675844a 100644 --- a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js +++ b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.js @@ -5,3 +5,4 @@ import public = require("1"); //// [strictModeReservedWordInImportEqualDeclaration.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/topLevelAmbientModule.js b/tests/baselines/reference/topLevelAmbientModule.js index da5885fafabaa..d496cfc4f852d 100644 --- a/tests/baselines/reference/topLevelAmbientModule.js +++ b/tests/baselines/reference/topLevelAmbientModule.js @@ -17,3 +17,4 @@ var z = foo.x + 10; /// var foo = require("foo"); var z = foo.x + 10; +exports.__esModule = true; diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js index b8ff23c13bd1a..cc97c8e2ffecd 100644 --- a/tests/baselines/reference/topLevelFileModule.js +++ b/tests/baselines/reference/topLevelFileModule.js @@ -20,3 +20,4 @@ exports.__esModule = true; var foo = require("./vs/foo_0"); var fum = require("./vs/fum"); var z = foo.x + fum.y; +exports.__esModule = true; diff --git a/tests/baselines/reference/topLevelFileModuleMissing.js b/tests/baselines/reference/topLevelFileModuleMissing.js index edd090d49ccd1..0861d67389dda 100644 --- a/tests/baselines/reference/topLevelFileModuleMissing.js +++ b/tests/baselines/reference/topLevelFileModuleMissing.js @@ -12,3 +12,4 @@ var z = foo.x + 10; "use strict"; var foo = require("vs/foo"); var z = foo.x + 10; +exports.__esModule = true; diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js index cb32901441272..7ded460030058 100644 --- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js +++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js @@ -23,3 +23,4 @@ var z2 = foo.y() + 10; // Should resolve var foo = require("vs/foo_0"); var z1 = foo.x + 10; // Should error, as declaration should win var z2 = foo.y() + 10; // Should resolve +exports.__esModule = true; diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.js b/tests/baselines/reference/transformNestedGeneratorsWithTry.js index 7c3597ddc4b29..6b3930271bb33 100644 --- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js +++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js @@ -99,3 +99,4 @@ function a() { }); }); } +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js index f1e36ae9b1589..a4356e562e751 100644 --- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js +++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js @@ -20,4 +20,5 @@ MyClass1 = __decorate([ __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object]) ], MyClass1); var _a; +Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js index 61a703e13bbba..7e30c98d6e899 100644 --- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js +++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js @@ -1,3 +1,4 @@ "use strict"; var x = 0; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js index 9d108d6331391..f350f205d5ac9 100644 --- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js +++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js @@ -1,4 +1,5 @@ "use strict"; a; b; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js index 9eadd1f271797..12a13d2aebf39 100644 --- a/tests/baselines/reference/transpile/Generates module output.js +++ b/tests/baselines/reference/transpile/Generates module output.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; var x = 0; + exports.__esModule = true; }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js index 88d98628eee0c..0b3dcfad991dc 100644 --- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js +++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js @@ -1,4 +1,5 @@ "use strict"; /// var x = 0; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js index 1ceb1bcd1464c..e9493d9d5917d 100644 --- a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js +++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js @@ -1,2 +1,3 @@ "use strict"; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js index 61a703e13bbba..7e30c98d6e899 100644 --- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js +++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js @@ -1,3 +1,4 @@ "use strict"; var x = 0; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js index 61a703e13bbba..7e30c98d6e899 100644 --- a/tests/baselines/reference/transpile/No extra errors for file without extension.js +++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js @@ -1,3 +1,4 @@ "use strict"; var x = 0; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js index a0dd948c9fc05..4f5beb97d2cb9 100644 --- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js +++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js @@ -1,5 +1,6 @@ define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) { "use strict"; use(SomeName_1.foo); + exports.__esModule = true; }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js index c2b337076bab7..97215e27b98a3 100644 --- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js +++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js @@ -10,5 +10,6 @@ "use strict"; var SomeName_1 = require("SomeOtherName"); use(SomeName_1.foo); + exports.__esModule = true; }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js index 1ceb1bcd1464c..e9493d9d5917d 100644 --- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js +++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.js @@ -1,2 +1,3 @@ "use strict"; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js index 1ceb1bcd1464c..e9493d9d5917d 100644 --- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js +++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.js @@ -1,2 +1,3 @@ "use strict"; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js index 36c68f08b9f8e..1ac09c54ab802 100644 --- a/tests/baselines/reference/transpile/Support options with lib values.js +++ b/tests/baselines/reference/transpile/Support options with lib values.js @@ -1,3 +1,4 @@ "use strict"; var a = 10; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js index 36c68f08b9f8e..1ac09c54ab802 100644 --- a/tests/baselines/reference/transpile/Support options with types values.js +++ b/tests/baselines/reference/transpile/Support options with types values.js @@ -1,3 +1,4 @@ "use strict"; var a = 10; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js index 942449753b0dc..e109ef9014f68 100644 --- a/tests/baselines/reference/transpile/Supports backslashes in file name.js +++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js @@ -1,3 +1,4 @@ "use strict"; var x; +exports.__esModule = true; //# sourceMappingURL=b.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting allowJs.js +++ b/tests/baselines/reference/transpile/Supports setting allowJs.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js +++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js +++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js +++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js +++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting baseUrl.js +++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting charset.js +++ b/tests/baselines/reference/transpile/Supports setting charset.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting declaration.js +++ b/tests/baselines/reference/transpile/Supports setting declaration.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting declarationDir.js +++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting emitBOM.js +++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js +++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js +++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js +++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js +++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting jsx.js +++ b/tests/baselines/reference/transpile/Supports setting jsx.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js +++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting lib.js +++ b/tests/baselines/reference/transpile/Supports setting lib.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting locale.js +++ b/tests/baselines/reference/transpile/Supports setting locale.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting module.js +++ b/tests/baselines/reference/transpile/Supports setting module.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js +++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting newLine.js +++ b/tests/baselines/reference/transpile/Supports setting newLine.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmit.js +++ b/tests/baselines/reference/transpile/Supports setting noEmit.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js +++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js +++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js +++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js +++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js index 8394371f9081a..5233b2a8e48f9 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js @@ -1,2 +1,3 @@ x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noLib.js +++ b/tests/baselines/reference/transpile/Supports setting noLib.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting noResolve.js +++ b/tests/baselines/reference/transpile/Supports setting noResolve.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting out.js +++ b/tests/baselines/reference/transpile/Supports setting out.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting outDir.js +++ b/tests/baselines/reference/transpile/Supports setting outDir.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting outFile.js +++ b/tests/baselines/reference/transpile/Supports setting outFile.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting paths.js +++ b/tests/baselines/reference/transpile/Supports setting paths.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js +++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js +++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting removeComments.js +++ b/tests/baselines/reference/transpile/Supports setting removeComments.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting rootDir.js +++ b/tests/baselines/reference/transpile/Supports setting rootDir.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting rootDirs.js +++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js +++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js +++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js +++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting stripInternal.js +++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js +++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js +++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting typeRoots.js +++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js index 8d91090453b8a..5487d181a8429 100644 --- a/tests/baselines/reference/transpile/Supports setting types.js +++ b/tests/baselines/reference/transpile/Supports setting types.js @@ -1,3 +1,4 @@ "use strict"; x; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js index 3923d3c9a4176..071466dd65f94 100644 --- a/tests/baselines/reference/transpile/Supports urls in file name.js +++ b/tests/baselines/reference/transpile/Supports urls in file name.js @@ -1,3 +1,4 @@ "use strict"; var x; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js index bab9c3c444332..2c2e8563d24a0 100644 --- a/tests/baselines/reference/transpile/Uses correct newLine character.js +++ b/tests/baselines/reference/transpile/Uses correct newLine character.js @@ -1,3 +1,4 @@ "use strict"; var x = 0; +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js index c17099d84ba28..54832b9592841 100644 --- a/tests/baselines/reference/transpile/transpile .js files.js +++ b/tests/baselines/reference/transpile/transpile .js files.js @@ -1,3 +1,4 @@ "use strict"; var a = 10; +exports.__esModule = true; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js index baa27ee64ce18..ff03528b3e566 100644 --- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js +++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js @@ -1,3 +1,4 @@ "use strict"; var x = React.createElement("div", null); +exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js index f9488552e6dbe..210d92fa8842a 100644 --- a/tests/baselines/reference/tsxDefaultImports.js +++ b/tests/baselines/reference/tsxDefaultImports.js @@ -32,3 +32,4 @@ exports.__esModule = true; "use strict"; var a_1 = require("./a"); var a = a_1["default"].E.one; +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxElementResolution17.js b/tests/baselines/reference/tsxElementResolution17.js index 1f813b7e24b13..9f56d05406e04 100644 --- a/tests/baselines/reference/tsxElementResolution17.js +++ b/tests/baselines/reference/tsxElementResolution17.js @@ -32,4 +32,5 @@ import s2 = require('elements2'); define(["require", "exports", "elements1"], function (require, exports, s1) { "use strict"; ; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js index 95cb3555d306c..921d831809d44 100644 --- a/tests/baselines/reference/tsxElementResolution19.js +++ b/tests/baselines/reference/tsxElementResolution19.js @@ -36,4 +36,5 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) { "use strict"; React.createElement(file1_1.MyClass, null); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js index 6c01a48af7840..ae190baba4cb6 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit2.js +++ b/tests/baselines/reference/tsxExternalModuleEmit2.js @@ -32,3 +32,4 @@ var mod_1 = require("mod"); React.createElement(Foo, { handler: mod_1["default"] }); // Should see mod_1['default'] in emit here React.createElement(Foo, __assign({}, mod_1["default"])); +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js index feb314ee2e665..4e227238f6c5e 100644 --- a/tests/baselines/reference/tsxPreserveEmit1.js +++ b/tests/baselines/reference/tsxPreserveEmit1.js @@ -45,4 +45,5 @@ define(["require", "exports", "react", "react-router"], function (require, expor // Should emit 'M.X' in both opening and closing tags var y = ; })(M || (M = {})); + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/tsxPreserveEmit3.js b/tests/baselines/reference/tsxPreserveEmit3.js index 500b7d26c934c..fdbe8cc2bb4b9 100644 --- a/tests/baselines/reference/tsxPreserveEmit3.js +++ b/tests/baselines/reference/tsxPreserveEmit3.js @@ -21,4 +21,5 @@ import {React} from "./test"; //// [react-consumer.jsx] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js index c3e58d0a0da54..88d9d6aa95e74 100644 --- a/tests/baselines/reference/tsxReactEmit5.js +++ b/tests/baselines/reference/tsxReactEmit5.js @@ -36,3 +36,4 @@ var test_1 = require("./test"); // and React.__spread var foo; var spread1 = test_1.React.createElement("div", __assign({ x: '' }, foo, { y: '' })); +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js index a7507a15d8b6f..a67614a552288 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js +++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js @@ -82,3 +82,4 @@ var g = ; var h =
; // Error - property not on ontextually typed intrinsic ref callback parameter var i =
; +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.js b/tests/baselines/reference/tsxStatelessFunctionComponents3.js index 02ddcc8a58e49..6cc6e6638f2de 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponents3.js +++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.js @@ -34,4 +34,5 @@ define(["require", "exports", "react"], function (require, exports, React) {
); }; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js index b73b1f353613b..5c123cf634f8f 100644 --- a/tests/baselines/reference/tsxUnionTypeComponent1.js +++ b/tests/baselines/reference/tsxUnionTypeComponent1.js @@ -59,3 +59,4 @@ var MyButtonComponent = (function (_super) { return MyButtonComponent; }(React.Component)); React.createElement(MyComponent, { AnyComponent: MyButtonComponent }); +exports.__esModule = true; diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.js b/tests/baselines/reference/tsxUnionTypeComponent2.js index 3cc6f44c6990b..725f3041855b7 100644 --- a/tests/baselines/reference/tsxUnionTypeComponent2.js +++ b/tests/baselines/reference/tsxUnionTypeComponent2.js @@ -16,3 +16,4 @@ const X: Invalid1 = 1; var React = require("react"); var X = 1; React.createElement(X, null); +exports.__esModule = true; diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js index 1f72e1d1b008f..cd0e3af050737 100644 --- a/tests/baselines/reference/typeAliasDeclarationEmit.js +++ b/tests/baselines/reference/typeAliasDeclarationEmit.js @@ -7,6 +7,7 @@ export type CallbackArray = () => T; //// [typeAliasDeclarationEmit.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.js b/tests/baselines/reference/typeAliasDeclarationEmit2.js index b94eb56a2a288..dcf5e7898e768 100644 --- a/tests/baselines/reference/typeAliasDeclarationEmit2.js +++ b/tests/baselines/reference/typeAliasDeclarationEmit2.js @@ -5,6 +5,7 @@ export type A = { value: a }; //// [typeAliasDeclarationEmit2.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js index 42ee240740367..82336a2e6b820 100644 --- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js +++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js @@ -23,6 +23,7 @@ exports.__esModule = true; "use strict"; var f = require("./file1"); f.foo(); +exports.__esModule = true; //// [file1.d.ts] diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js index 87e0075a9428e..0520bf5ac9b72 100644 --- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js +++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js @@ -37,4 +37,5 @@ define(["require", "exports"], function (require, exports) { i = a; // error a2 = i2; // no error i2 = a2; // no error + exports.__esModule = true; }); diff --git a/tests/baselines/reference/typeReferenceDirectives10.js b/tests/baselines/reference/typeReferenceDirectives10.js index e4253bb3a5829..5d56ef0cf8fd7 100644 --- a/tests/baselines/reference/typeReferenceDirectives10.js +++ b/tests/baselines/reference/typeReferenceDirectives10.js @@ -17,6 +17,7 @@ export interface A { //// [app.js] "use strict"; +exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/typeReferenceDirectives13.js b/tests/baselines/reference/typeReferenceDirectives13.js index 9fecdd47f7744..c776a507de41b 100644 --- a/tests/baselines/reference/typeReferenceDirectives13.js +++ b/tests/baselines/reference/typeReferenceDirectives13.js @@ -17,6 +17,7 @@ export interface A { //// [app.js] "use strict"; +exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/typeReferenceDirectives5.js b/tests/baselines/reference/typeReferenceDirectives5.js index 41448cbeab252..d663ded713a7b 100644 --- a/tests/baselines/reference/typeReferenceDirectives5.js +++ b/tests/baselines/reference/typeReferenceDirectives5.js @@ -16,6 +16,7 @@ export interface A { //// [app.js] "use strict"; +exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js index c4de6646675bc..f624eb6e488a5 100644 --- a/tests/baselines/reference/typeReferenceDirectives9.js +++ b/tests/baselines/reference/typeReferenceDirectives9.js @@ -47,6 +47,7 @@ exports.__esModule = true; "use strict"; var main_1 = require("./main"); main_1.Cls.prototype.foo = function () { return undefined; }; +exports.__esModule = true; //// [mod2.js] "use strict"; var main_1 = require("./main"); diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js index cc2bd589bb00e..184abcf3f8763 100644 --- a/tests/baselines/reference/typeResolution.js +++ b/tests/baselines/reference/typeResolution.js @@ -274,5 +274,6 @@ define(["require", "exports"], function (require, exports) { SubModule3.ClassA = ClassA; })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); })(TopLevelModule2 || (TopLevelModule2 = {})); + exports.__esModule = true; }); //# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index 8cfb638991c9b..598d7f17ebefe 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -2969,5 +2969,6 @@ sourceFile:typeResolution.ts 6 >Emitted(163, 43) Source(102, 23) + SourceIndex(0) 7 >Emitted(163, 51) Source(108, 2) + SourceIndex(0) --- +>>> exports.__esModule = true; >>>}); >>>//# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js index a2542ca9cc099..4e4d3810ed298 100644 --- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js +++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js @@ -29,3 +29,4 @@ var xyz_1 = require("xyz"); var pdq_1 = require("pdq"); var abc_1 = require("abc"); xyz_1.x + pdq_1.y + abc_1.z; +exports.__esModule = true; diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js index 9e93755d1f096..d6e50572187a5 100644 --- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js +++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js @@ -15,3 +15,4 @@ x; "use strict"; var xyz_1 = require("xyz"); xyz_1.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/typeUsedAsValueError2.js b/tests/baselines/reference/typeUsedAsValueError2.js index c3bd736cbb7f4..fc247b6443caa 100644 --- a/tests/baselines/reference/typeUsedAsValueError2.js +++ b/tests/baselines/reference/typeUsedAsValueError2.js @@ -24,14 +24,17 @@ HelloNamespace.world; //// [helloInterface.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [helloNamespace.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); //// [world.js] define(["require", "exports"], function (require, exports) { "use strict"; HelloInterface.world; HelloNamespace.world; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js index 621ec74ebc46c..7a11fae8f8ff4 100644 --- a/tests/baselines/reference/typeofAmbientExternalModules.js +++ b/tests/baselines/reference/typeofAmbientExternalModules.js @@ -45,3 +45,4 @@ var y1 = ext; y1 = exp; var y2 = exp; y2 = ext; +exports.__esModule = true; diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js index 9ec889e067655..f28ff7e1033a2 100644 --- a/tests/baselines/reference/typeofExternalModules.js +++ b/tests/baselines/reference/typeofExternalModules.js @@ -41,3 +41,4 @@ var y1 = ext; y1 = exp; var y2 = exp; y2 = ext; +exports.__esModule = true; diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js index 1424f9343aad1..c321e548181f3 100644 --- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js +++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js @@ -22,9 +22,11 @@ var y: {M2: Object} = foo0; //// [foo_0.js] "use strict"; +exports.__esModule = true; //// [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 = {}; var y = foo0; +exports.__esModule = true; diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js index e466124a48dd4..c935d8b67282b 100644 --- a/tests/baselines/reference/typingsLookup4.js +++ b/tests/baselines/reference/typingsLookup4.js @@ -35,3 +35,4 @@ var jquery_1 = require("jquery"); var kquery_1 = require("kquery"); var lquery_1 = require("lquery"); jquery_1.j + kquery_1.k + lquery_1.l; +exports.__esModule = true; diff --git a/tests/baselines/reference/typingsLookupAmd.js b/tests/baselines/reference/typingsLookupAmd.js index 1e99644d48905..2dc19872ad431 100644 --- a/tests/baselines/reference/typingsLookupAmd.js +++ b/tests/baselines/reference/typingsLookupAmd.js @@ -15,4 +15,5 @@ import {B} from "b"; //// [foo.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; }); diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js index ee4c143486cd4..5665f5b202464 100644 --- a/tests/baselines/reference/umd-augmentation-1.js +++ b/tests/baselines/reference/umd-augmentation-1.js @@ -48,3 +48,4 @@ var magnitude = m.getLength(v); var p = v.translate(5, 5); p = v.reverse(); var t = p.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js index e9abf724881fb..4cdd28a9552af 100644 --- a/tests/baselines/reference/umd-augmentation-3.js +++ b/tests/baselines/reference/umd-augmentation-3.js @@ -54,3 +54,4 @@ var magnitude = m.getLength(v); var p = v.translate(5, 5); p = v.reverse(); var t = p.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js index 03e15be2ecfc0..563b73ec5084f 100644 --- a/tests/baselines/reference/umd3.js +++ b/tests/baselines/reference/umd3.js @@ -20,3 +20,4 @@ var Foo = require("./foo"); Foo.fn(); var x; var y = x.n; +exports.__esModule = true; diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js index d06fc3aba931b..dcd720b866ab4 100644 --- a/tests/baselines/reference/umd4.js +++ b/tests/baselines/reference/umd4.js @@ -20,3 +20,4 @@ var Bar = require("./foo"); Bar.fn(); var x; var y = x.n; +exports.__esModule = true; diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js index 95626132f77e9..cd99ace83b317 100644 --- a/tests/baselines/reference/umd5.js +++ b/tests/baselines/reference/umd5.js @@ -24,3 +24,4 @@ var x; var y = x.n; // should error var z = Foo; +exports.__esModule = true; diff --git a/tests/baselines/reference/umd8.js b/tests/baselines/reference/umd8.js index e76b39021568f..0b9109873be13 100644 --- a/tests/baselines/reference/umd8.js +++ b/tests/baselines/reference/umd8.js @@ -27,3 +27,4 @@ var y; // OK in type position y.foo(); var z; // OK in ns position var x = Foo; // Not OK in value position +exports.__esModule = true; diff --git a/tests/baselines/reference/umdDependencyComment2.js b/tests/baselines/reference/umdDependencyComment2.js index 4e784d87fa34b..1039bbac5006e 100644 --- a/tests/baselines/reference/umdDependencyComment2.js +++ b/tests/baselines/reference/umdDependencyComment2.js @@ -19,4 +19,5 @@ m1.f(); "use strict"; var m1 = require("m2"); m1.f(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/umdDependencyCommentName1.js b/tests/baselines/reference/umdDependencyCommentName1.js index 45cae25192a0d..2f7326d8f8129 100644 --- a/tests/baselines/reference/umdDependencyCommentName1.js +++ b/tests/baselines/reference/umdDependencyCommentName1.js @@ -19,4 +19,5 @@ m1.f(); "use strict"; var m1 = require("m2"); m1.f(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/umdDependencyCommentName2.js b/tests/baselines/reference/umdDependencyCommentName2.js index e85d5b99b14be..9814a1d5e384b 100644 --- a/tests/baselines/reference/umdDependencyCommentName2.js +++ b/tests/baselines/reference/umdDependencyCommentName2.js @@ -23,4 +23,5 @@ m1.f(); "use strict"; var m1 = require("m2"); m1.f(); + exports.__esModule = true; }); diff --git a/tests/baselines/reference/umdGlobalConflict.js b/tests/baselines/reference/umdGlobalConflict.js index e8a820e233389..114bdd643e45c 100644 --- a/tests/baselines/reference/umdGlobalConflict.js +++ b/tests/baselines/reference/umdGlobalConflict.js @@ -18,6 +18,7 @@ const p: string = Alpha.x; //// [consumer.js] "use strict"; +exports.__esModule = true; //// [global.js] // Should be OK, first in wins var p = Alpha.x; diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js index 680ab9be46de5..1ff1f585768fe 100644 --- a/tests/baselines/reference/unclosedExportClause02.js +++ b/tests/baselines/reference/unclosedExportClause02.js @@ -27,12 +27,16 @@ exports.__esModule = true; //// [t2.js] "use strict"; "./t1"; +exports.__esModule = true; //// [t3.js] "use strict"; "./t1"; +exports.__esModule = true; //// [t4.js] "use strict"; "./t1"; +exports.__esModule = true; //// [t5.js] "use strict"; "./t1"; +exports.__esModule = true; diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js index 88f5e3ab3522c..b8bec8ceb131a 100644 --- a/tests/baselines/reference/undeclaredModuleError.js +++ b/tests/baselines/reference/undeclaredModuleError.js @@ -35,4 +35,5 @@ define(["require", "exports", "fs"], function (require, exports, fs) { }); }); } + exports.__esModule = true; }); diff --git a/tests/baselines/reference/untypedModuleImport.js b/tests/baselines/reference/untypedModuleImport.js index e3548856411ee..7f088859221a0 100644 --- a/tests/baselines/reference/untypedModuleImport.js +++ b/tests/baselines/reference/untypedModuleImport.js @@ -25,13 +25,16 @@ foo(bar()); "use strict"; var foo = require("foo"); foo.bar(); +exports.__esModule = true; //// [b.js] "use strict"; var foo = require("foo"); foo(); +exports.__esModule = true; //// [c.js] "use strict"; var foo_1 = require("foo"); require("./a"); require("./b"); foo_1["default"](foo_1.bar()); +exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_allowJs.js b/tests/baselines/reference/untypedModuleImport_allowJs.js index 8ca5115a386e2..3948c748286f7 100644 --- a/tests/baselines/reference/untypedModuleImport_allowJs.js +++ b/tests/baselines/reference/untypedModuleImport_allowJs.js @@ -14,3 +14,4 @@ foo.bar(); "use strict"; var foo_1 = require("foo"); foo_1["default"].bar(); +exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js index ab1e1940e3625..86e2ae3c175e7 100644 --- a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js +++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js @@ -11,3 +11,4 @@ import * as foo from "foo"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_noLocalImports.js b/tests/baselines/reference/untypedModuleImport_noLocalImports.js index 8fa67a0857f21..6328101a2ee00 100644 --- a/tests/baselines/reference/untypedModuleImport_noLocalImports.js +++ b/tests/baselines/reference/untypedModuleImport_noLocalImports.js @@ -11,3 +11,4 @@ import * as foo from "./foo"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.js b/tests/baselines/reference/untypedModuleImport_vsAmbient.js index 080cd4433754b..6968f603061fd 100644 --- a/tests/baselines/reference/untypedModuleImport_vsAmbient.js +++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.js @@ -21,3 +21,4 @@ x; /// var foo_1 = require("foo"); foo_1.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.js b/tests/baselines/reference/untypedModuleImport_withAugmentation.js index 17eda95aa8af7..e8fc892f4a0c0 100644 --- a/tests/baselines/reference/untypedModuleImport_withAugmentation.js +++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.js @@ -17,3 +17,4 @@ x; "use strict"; var foo_1 = require("foo"); foo_1.x; +exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.js b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js index f9fa744322474..6a01db5dd251a 100644 --- a/tests/baselines/reference/untypedModuleImport_withAugmentation2.js +++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js @@ -17,3 +17,4 @@ import { } from "augmenter"; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js index ef1d501889268..9cffa5547fef7 100644 --- a/tests/baselines/reference/unusedImportDeclaration.js +++ b/tests/baselines/reference/unusedImportDeclaration.js @@ -29,6 +29,7 @@ var thingy = { me: "A" }; foo("IN " + thingy.me + "!"); +exports.__esModule = true; //// [unusedImportDeclaration_testerB.d.ts] diff --git a/tests/baselines/reference/unusedImports1.js b/tests/baselines/reference/unusedImports1.js index 33d4ab267f7f9..910070b89550a 100644 --- a/tests/baselines/reference/unusedImports1.js +++ b/tests/baselines/reference/unusedImports1.js @@ -20,3 +20,4 @@ exports.Calculator = Calculator; exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js index 2597aed867014..be28b2f8d4018 100644 --- a/tests/baselines/reference/unusedImports11.js +++ b/tests/baselines/reference/unusedImports11.js @@ -39,3 +39,4 @@ new b_2["default"](); new b_2.Member(); new ns.Member(); new r.Member(); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports12.js b/tests/baselines/reference/unusedImports12.js index 9ec3e8aa17a3c..90e6446d48e8e 100644 --- a/tests/baselines/reference/unusedImports12.js +++ b/tests/baselines/reference/unusedImports12.js @@ -25,3 +25,4 @@ exports["default"] = Member; exports.__esModule = true; //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports2.js b/tests/baselines/reference/unusedImports2.js index a1477dbc3232b..d498a242a57c9 100644 --- a/tests/baselines/reference/unusedImports2.js +++ b/tests/baselines/reference/unusedImports2.js @@ -35,3 +35,4 @@ exports.__esModule = true; var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports3.js b/tests/baselines/reference/unusedImports3.js index 7516825aa5089..a3ab3117b673e 100644 --- a/tests/baselines/reference/unusedImports3.js +++ b/tests/baselines/reference/unusedImports3.js @@ -41,3 +41,4 @@ exports.__esModule = true; var file1_1 = require("./file1"); file1_1.test(); file1_1.test2(); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports4.js b/tests/baselines/reference/unusedImports4.js index 350fb3301ac45..53e48513bc930 100644 --- a/tests/baselines/reference/unusedImports4.js +++ b/tests/baselines/reference/unusedImports4.js @@ -43,3 +43,4 @@ var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); file1_1.test2(); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports5.js b/tests/baselines/reference/unusedImports5.js index 3861d2a9cfff8..5856638cd0992 100644 --- a/tests/baselines/reference/unusedImports5.js +++ b/tests/baselines/reference/unusedImports5.js @@ -43,3 +43,4 @@ var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); file1_1.test(); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports6.js b/tests/baselines/reference/unusedImports6.js index 61d17fdf17f33..861862fe7a6bf 100644 --- a/tests/baselines/reference/unusedImports6.js +++ b/tests/baselines/reference/unusedImports6.js @@ -39,3 +39,4 @@ exports["default"] = test2; exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports7.js b/tests/baselines/reference/unusedImports7.js index 2bee99f3ba42a..519511fb9e190 100644 --- a/tests/baselines/reference/unusedImports7.js +++ b/tests/baselines/reference/unusedImports7.js @@ -37,3 +37,4 @@ exports["default"] = test2; exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports8.js b/tests/baselines/reference/unusedImports8.js index b47ae034e373b..aa2aa248ff71f 100644 --- a/tests/baselines/reference/unusedImports8.js +++ b/tests/baselines/reference/unusedImports8.js @@ -43,3 +43,4 @@ var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); file1_1.test(); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports9.js b/tests/baselines/reference/unusedImports9.js index 8b83697fa5525..f6fdc1b9e6ff8 100644 --- a/tests/baselines/reference/unusedImports9.js +++ b/tests/baselines/reference/unusedImports9.js @@ -35,3 +35,4 @@ exports.test2 = test2; exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParameters.js b/tests/baselines/reference/unusedLocalsAndParameters.js index 64ff373db4a91..e538c9754b46e 100644 --- a/tests/baselines/reference/unusedLocalsAndParameters.js +++ b/tests/baselines/reference/unusedLocalsAndParameters.js @@ -166,3 +166,4 @@ var N; (function (N) { var x; })(N || (N = {})); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js index d6e2326842aa2..b3088ac69c742 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js +++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js @@ -323,3 +323,4 @@ var N; }); })(N || (N = {})); N; +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js index b854278a3e30d..20706997d5b65 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js +++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js @@ -33,3 +33,4 @@ var x; x(); var y; y[0](); +exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js index 7da916370ca72..7ab951c984d04 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js +++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js @@ -16,3 +16,4 @@ export {} function foo() { foo(); } +exports.__esModule = true; diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js index c80d65158dcf2..dcc6a1364c2b5 100644 --- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js +++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js @@ -27,11 +27,14 @@ function run(configuration: commands.IConfiguration) { //// [visibilityOfCrossModuleTypeUsage_server.js] "use strict"; +exports.__esModule = true; //// [visibilityOfCrossModuleTypeUsage_commands.js] //visibilityOfCrossModuleTypeUsage "use strict"; +exports.__esModule = true; //// [visibilityOfCrossModuleTypeUsage_fs.js] "use strict"; function run(configuration) { var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server); } +exports.__esModule = true; diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js index 5e5af215fb530..204482e75484d 100644 --- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js +++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js @@ -25,3 +25,4 @@ var fs = require("./voidAsNonAmbiguousReturnType_0"); function main() { fs.mkdirSync('test'); // should not error - return types are the same } +exports.__esModule = true; diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index d3fefee6c4155..feb48648252b4 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -81,6 +81,7 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m })(m1 || (m1 = {})); var b = new m3.A(); b.foo; + exports.__esModule = true; }); From 229ba436647d38bef70c556828a9613f9388eb1a Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 7 Feb 2017 14:23:31 -0800 Subject: [PATCH 067/116] Allow export "__esModule" in system --- src/compiler/checker.ts | 4 ++-- tests/baselines/reference/es5-system2.js | 16 ++++++++++++++++ tests/baselines/reference/es5-system2.symbols | 5 +++++ tests/baselines/reference/es5-system2.types | 6 ++++++ tests/cases/compiler/es5-system2.ts | 6 ++++++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/es5-system2.js create mode 100644 tests/baselines/reference/es5-system2.symbols create mode 100644 tests/baselines/reference/es5-system2.types create mode 100644 tests/cases/compiler/es5-system2.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 43a9590ec1410..57f81fce8ea86 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1,4 +1,4 @@ -/// +/// /// /* @internal */ @@ -22010,7 +22010,7 @@ namespace ts { } } - if (compilerOptions.module !== ModuleKind.ES2015 && !compilerOptions.noEmit && + if (compilerOptions.module !== ModuleKind.ES2015 && compilerOptions.module !== ModuleKind.System && !compilerOptions.noEmit && !isInAmbientContext(node.parent.parent) && hasModifier(node.parent.parent, ModifierFlags.Export)) { checkESModuleMarker(node.name); } diff --git a/tests/baselines/reference/es5-system2.js b/tests/baselines/reference/es5-system2.js new file mode 100644 index 0000000000000..39b5e5daca288 --- /dev/null +++ b/tests/baselines/reference/es5-system2.js @@ -0,0 +1,16 @@ +//// [es5-system2.ts] + +export var __esModule = 1; + +//// [es5-system2.js] +System.register([], function (exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; + var __esModule; + return { + setters: [], + execute: function () { + exports_1("__esModule", __esModule = 1); + } + }; +}); diff --git a/tests/baselines/reference/es5-system2.symbols b/tests/baselines/reference/es5-system2.symbols new file mode 100644 index 0000000000000..2c8779b730b46 --- /dev/null +++ b/tests/baselines/reference/es5-system2.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/es5-system2.ts === + +export var __esModule = 1; +>__esModule : Symbol(__esModule, Decl(es5-system2.ts, 1, 10)) + diff --git a/tests/baselines/reference/es5-system2.types b/tests/baselines/reference/es5-system2.types new file mode 100644 index 0000000000000..e67258a873239 --- /dev/null +++ b/tests/baselines/reference/es5-system2.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/es5-system2.ts === + +export var __esModule = 1; +>__esModule : number +>1 : 1 + diff --git a/tests/cases/compiler/es5-system2.ts b/tests/cases/compiler/es5-system2.ts new file mode 100644 index 0000000000000..0eb77f8b9b943 --- /dev/null +++ b/tests/cases/compiler/es5-system2.ts @@ -0,0 +1,6 @@ +// @target: ES5 +// @sourcemap: false +// @declaration: false +// @module: system + +export var __esModule = 1; \ No newline at end of file From 915ffab8cc2224ebd7e0c8096fa979fb168de2f5 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 7 Feb 2017 14:47:07 -0800 Subject: [PATCH 068/116] disable fs watcher for UNC paths on Windows (#13937) --- src/compiler/sys.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index 71ff4485343c6..8ac797507b19f 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -485,7 +485,10 @@ namespace ts { // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643) let options: any; - if (!directoryExists(directoryName)) { + if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) { + // do nothing if either + // - target folder does not exist + // - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874) return noOpFileWatcher; } @@ -509,6 +512,10 @@ namespace ts { }; } ); + + function isUNCPath(s: string): boolean { + return s.length > 2 && s.charCodeAt(0) === CharacterCodes.slash && s.charCodeAt(1) === CharacterCodes.slash; + } }, resolvePath: function(path: string): string { return _path.resolve(path); From 0a1d75dbd1718216ef7bf2606bea2b54955cd1bf Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 7 Feb 2017 18:14:23 -0800 Subject: [PATCH 069/116] use tsconfig.json files in jake (#13869) --- Jakefile.js | 201 +++++++++------------------------------------------- 1 file changed, 32 insertions(+), 169 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index 0b3a26dbb771e..f422a995725e2 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -6,6 +6,8 @@ var path = require("path"); var child_process = require("child_process"); var fold = require("travis-fold"); var runTestsInParallel = require("./scripts/mocha-parallel").runTestsInParallel; +var ts = require("./lib/typescript"); + // Variables var compilerDirectory = "src/compiler/"; @@ -34,6 +36,25 @@ if (process.env.path !== undefined) { process.env.PATH = nodeModulesPathPrefix + process.env.PATH; } +function filesFromConfig(configPath) { + console.log(configPath); + var configText = fs.readFileSync(configPath).toString(); + var config = ts.parseConfigFileTextToJson(configPath, configText, /*stripComments*/ true); + if (config.error) { + throw new Error(diagnosticsToString([config.error])); + } + const configFileContent = ts.parseJsonConfigFileContent(config.config, ts.sys, path.dirname(configPath)); + if (configFileContent.errors && configFileContent.errors.length) { + throw new Error(diagnosticsToString(configFileContent.errors)); + } + + return configFileContent.fileNames; + + function diagnosticsToString(s) { + return s.map(function(e) { return ts.flattenDiagnosticMessageText(e.messageText, ts.sys.newLine); }).join(ts.sys.newLine); + } +} + function toNs(diff) { return diff[0] * 1e9 + diff[1]; } @@ -56,173 +77,12 @@ function measure(marker) { console.log("travis_time:end:" + marker.id + ":start=" + toNs(marker.stamp) + ",finish=" + toNs(total) + ",duration=" + toNs(diff) + "\r"); } -var compilerSources = [ - "core.ts", - "performance.ts", - "sys.ts", - "types.ts", - "scanner.ts", - "parser.ts", - "utilities.ts", - "binder.ts", - "checker.ts", - "factory.ts", - "visitor.ts", - "transformers/destructuring.ts", - "transformers/ts.ts", - "transformers/jsx.ts", - "transformers/esnext.ts", - "transformers/es2017.ts", - "transformers/es2016.ts", - "transformers/es2015.ts", - "transformers/generators.ts", - "transformers/es5.ts", - "transformers/module/es2015.ts", - "transformers/module/system.ts", - "transformers/module/module.ts", - "transformer.ts", - "sourcemap.ts", - "comments.ts", - "declarationEmitter.ts", - "emitter.ts", - "program.ts", - "commandLineParser.ts", - "tsc.ts", - "diagnosticInformationMap.generated.ts" -].map(function (f) { - return path.join(compilerDirectory, f); -}); - -var servicesSources = [ - "core.ts", - "performance.ts", - "sys.ts", - "types.ts", - "scanner.ts", - "parser.ts", - "utilities.ts", - "binder.ts", - "checker.ts", - "factory.ts", - "visitor.ts", - "transformers/destructuring.ts", - "transformers/ts.ts", - "transformers/jsx.ts", - "transformers/esnext.ts", - "transformers/es2017.ts", - "transformers/es2016.ts", - "transformers/es2015.ts", - "transformers/generators.ts", - "transformers/es5.ts", - "transformers/module/es2015.ts", - "transformers/module/system.ts", - "transformers/module/module.ts", - "transformer.ts", - "sourcemap.ts", - "comments.ts", - "declarationEmitter.ts", - "emitter.ts", - "program.ts", - "commandLineParser.ts", - "diagnosticInformationMap.generated.ts" -].map(function (f) { - return path.join(compilerDirectory, f); -}).concat([ - "types.ts", - "utilities.ts", - "breakpoints.ts", - "classifier.ts", - "completions.ts", - "documentHighlights.ts", - "documentRegistry.ts", - "findAllReferences.ts", - "goToDefinition.ts", - "goToImplementation.ts", - "jsDoc.ts", - "jsTyping.ts", - "navigateTo.ts", - "navigationBar.ts", - "outliningElementsCollector.ts", - "patternMatcher.ts", - "preProcess.ts", - "rename.ts", - "services.ts", - "shims.ts", - "signatureHelp.ts", - "symbolDisplay.ts", - "transpile.ts", - // Formatting - "formatting/formatting.ts", - "formatting/formattingContext.ts", - "formatting/formattingRequestKind.ts", - "formatting/formattingScanner.ts", - "formatting/references.ts", - "formatting/rule.ts", - "formatting/ruleAction.ts", - "formatting/ruleDescriptor.ts", - "formatting/ruleFlag.ts", - "formatting/ruleOperation.ts", - "formatting/ruleOperationContext.ts", - "formatting/rules.ts", - "formatting/rulesMap.ts", - "formatting/rulesProvider.ts", - "formatting/smartIndenter.ts", - "formatting/tokenRange.ts", - // CodeFixes - "codeFixProvider.ts", - "codefixes/fixes.ts", - "codefixes/fixExtendsInterfaceBecomesImplements.ts", - "codefixes/fixClassIncorrectlyImplementsInterface.ts", - "codefixes/fixClassDoesntImplementInheritedAbstractMember.ts", - "codefixes/fixClassSuperMustPrecedeThisAccess.ts", - "codefixes/fixConstructorForDerivedNeedSuperCall.ts", - "codefixes/helpers.ts", - "codefixes/importFixes.ts", - "codefixes/unusedIdentifierFixes.ts" -].map(function (f) { - return path.join(servicesDirectory, f); -})); - -var baseServerCoreSources = [ - "builder.ts", - "editorServices.ts", - "lsHost.ts", - "project.ts", - "protocol.ts", - "scriptInfo.ts", - "scriptVersionCache.ts", - "session.ts", - "shared.ts", - "types.ts", - "typingsCache.ts", - "utilities.ts", -].map(function (f) { - return path.join(serverDirectory, f); -}); - -var serverCoreSources = [ - "server.ts" -].map(function (f) { - return path.join(serverDirectory, f); -}).concat(baseServerCoreSources); - -var cancellationTokenSources = [ - "cancellationToken.ts" -].map(function (f) { - return path.join(cancellationTokenDirectory, f); -}); - -var typingsInstallerSources = [ - "../types.ts", - "../shared.ts", - "typingsInstaller.ts", - "nodeTypingsInstaller.ts" -].map(function (f) { - return path.join(typingsInstallerDirectory, f); -}); - -var serverSources = serverCoreSources.concat(servicesSources); -var languageServiceLibrarySources = baseServerCoreSources.concat(servicesSources); +var compilerSources = filesFromConfig("./src/compiler/tsconfig.json"); +var servicesSources = filesFromConfig("./src/services/tsconfig.json"); +var cancellationTokenSources = filesFromConfig(path.join(serverDirectory, "cancellationToken/tsconfig.json")); +var typingsInstallerSources = filesFromConfig(path.join(serverDirectory, "typingsInstaller/tsconfig.json")); +var serverSources = filesFromConfig(path.join(serverDirectory, "tsconfig.json")) +var languageServiceLibrarySources = filesFromConfig(path.join(serverDirectory, "tsconfig.library.json")); var harnessCoreSources = [ "harness.ts", @@ -1230,13 +1090,16 @@ var lintTargets = compilerSources .concat(harnessSources) // Other harness sources .concat(["instrumenter.ts"].map(function (f) { return path.join(harnessDirectory, f) })) - .concat(serverCoreSources) + .concat(serverSources) .concat(tslintRulesFiles) .concat(servicesSources) .concat(typingsInstallerSources) .concat(cancellationTokenSources) .concat(["Gulpfile.ts"]) - .concat([nodeServerInFile, perftscPath, "tests/perfsys.ts", webhostPath]); + .concat([nodeServerInFile, perftscPath, "tests/perfsys.ts", webhostPath]) + .map(function (p) { return path.resolve(p) }); +// keep only unique items +lintTargets = Array.from(new Set(lintTargets)); function sendNextFile(files, child, callback, failures) { var file = files.pop(); From f4080a4f9e310fbbe24e5d2813bfebc1c362b85b Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 7 Feb 2017 18:23:22 -0800 Subject: [PATCH 070/116] Add test for #13925 --- .../reference/capturedLetConstInLoop13.js | 52 ++++++++++++++++ .../capturedLetConstInLoop13.symbols | 48 +++++++++++++++ .../reference/capturedLetConstInLoop13.types | 59 +++++++++++++++++++ .../compiler/capturedLetConstInLoop13.ts | 22 +++++++ 4 files changed, 181 insertions(+) create mode 100644 tests/baselines/reference/capturedLetConstInLoop13.js create mode 100644 tests/baselines/reference/capturedLetConstInLoop13.symbols create mode 100644 tests/baselines/reference/capturedLetConstInLoop13.types create mode 100644 tests/cases/compiler/capturedLetConstInLoop13.ts diff --git a/tests/baselines/reference/capturedLetConstInLoop13.js b/tests/baselines/reference/capturedLetConstInLoop13.js new file mode 100644 index 0000000000000..a2e0921ab1db9 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop13.js @@ -0,0 +1,52 @@ +//// [capturedLetConstInLoop13.ts] +class Main { + + constructor() { + this.register("a", "b", "c"); + } + + private register(...names: string[]): void { + for (let name of names) { + + this.bar({ + [name + ".a"]: () => { this.foo(name); }, + }); + } + } + + private bar(a: any): void { } + + private foo(name: string): void { } + +} + +new Main(); + +//// [capturedLetConstInLoop13.js] +var Main = (function () { + function Main() { + this.register("a", "b", "c"); + } + Main.prototype.register = function () { + var _this = this; + var names = []; + for (var _i = 0; _i < arguments.length; _i++) { + names[_i] = arguments[_i]; + } + var _loop_1 = function (name) { + this_1.bar((_a = {}, + _a[name + ".a"] = function () { _this.foo(name); }, + _a)); + var _a; + }; + var this_1 = this; + for (var _a = 0, names_1 = names; _a < names_1.length; _a++) { + var name = names_1[_a]; + _loop_1(name); + } + }; + Main.prototype.bar = function (a) { }; + Main.prototype.foo = function (name) { }; + return Main; +}()); +new Main(); diff --git a/tests/baselines/reference/capturedLetConstInLoop13.symbols b/tests/baselines/reference/capturedLetConstInLoop13.symbols new file mode 100644 index 0000000000000..c7a824d26fad4 --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop13.symbols @@ -0,0 +1,48 @@ +=== tests/cases/compiler/capturedLetConstInLoop13.ts === +class Main { +>Main : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0)) + + constructor() { + this.register("a", "b", "c"); +>this.register : Symbol(Main.register, Decl(capturedLetConstInLoop13.ts, 4, 5)) +>this : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0)) +>register : Symbol(Main.register, Decl(capturedLetConstInLoop13.ts, 4, 5)) + } + + private register(...names: string[]): void { +>register : Symbol(Main.register, Decl(capturedLetConstInLoop13.ts, 4, 5)) +>names : Symbol(names, Decl(capturedLetConstInLoop13.ts, 6, 21)) + + for (let name of names) { +>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 7, 16)) +>names : Symbol(names, Decl(capturedLetConstInLoop13.ts, 6, 21)) + + this.bar({ +>this.bar : Symbol(Main.bar, Decl(capturedLetConstInLoop13.ts, 13, 5)) +>this : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0)) +>bar : Symbol(Main.bar, Decl(capturedLetConstInLoop13.ts, 13, 5)) + + [name + ".a"]: () => { this.foo(name); }, +>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 7, 16)) +>this.foo : Symbol(Main.foo, Decl(capturedLetConstInLoop13.ts, 15, 33)) +>this : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0)) +>foo : Symbol(Main.foo, Decl(capturedLetConstInLoop13.ts, 15, 33)) +>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 7, 16)) + + }); + } + } + + private bar(a: any): void { } +>bar : Symbol(Main.bar, Decl(capturedLetConstInLoop13.ts, 13, 5)) +>a : Symbol(a, Decl(capturedLetConstInLoop13.ts, 15, 16)) + + private foo(name: string): void { } +>foo : Symbol(Main.foo, Decl(capturedLetConstInLoop13.ts, 15, 33)) +>name : Symbol(name, Decl(capturedLetConstInLoop13.ts, 17, 16)) + +} + +new Main(); +>Main : Symbol(Main, Decl(capturedLetConstInLoop13.ts, 0, 0)) + diff --git a/tests/baselines/reference/capturedLetConstInLoop13.types b/tests/baselines/reference/capturedLetConstInLoop13.types new file mode 100644 index 0000000000000..e6f97255d752f --- /dev/null +++ b/tests/baselines/reference/capturedLetConstInLoop13.types @@ -0,0 +1,59 @@ +=== tests/cases/compiler/capturedLetConstInLoop13.ts === +class Main { +>Main : Main + + constructor() { + this.register("a", "b", "c"); +>this.register("a", "b", "c") : void +>this.register : (...names: string[]) => void +>this : this +>register : (...names: string[]) => void +>"a" : "a" +>"b" : "b" +>"c" : "c" + } + + private register(...names: string[]): void { +>register : (...names: string[]) => void +>names : string[] + + for (let name of names) { +>name : string +>names : string[] + + this.bar({ +>this.bar({ [name + ".a"]: () => { this.foo(name); }, }) : void +>this.bar : (a: any) => void +>this : this +>bar : (a: any) => void +>{ [name + ".a"]: () => { this.foo(name); }, } : { [x: string]: () => void; } + + [name + ".a"]: () => { this.foo(name); }, +>name + ".a" : string +>name : string +>".a" : ".a" +>() => { this.foo(name); } : () => void +>this.foo(name) : void +>this.foo : (name: string) => void +>this : this +>foo : (name: string) => void +>name : string + + }); + } + } + + private bar(a: any): void { } +>bar : (a: any) => void +>a : any + + private foo(name: string): void { } +>foo : (name: string) => void +>name : string + +} + +new Main(); +>new Main() : Main +>Main : typeof Main + diff --git a/tests/cases/compiler/capturedLetConstInLoop13.ts b/tests/cases/compiler/capturedLetConstInLoop13.ts new file mode 100644 index 0000000000000..0aa00b0e1a0f1 --- /dev/null +++ b/tests/cases/compiler/capturedLetConstInLoop13.ts @@ -0,0 +1,22 @@ +class Main { + + constructor() { + this.register("a", "b", "c"); + } + + private register(...names: string[]): void { + for (let name of names) { + + this.bar({ + [name + ".a"]: () => { this.foo(name); }, + }); + } + } + + private bar(a: any): void { } + + private foo(name: string): void { } + +} + +new Main(); \ No newline at end of file From f4583313d9bf6ff3ed1e5464277c73f5bd124234 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Wed, 8 Feb 2017 06:13:32 -0800 Subject: [PATCH 071/116] Use `!!` to convert to boolean --- src/harness/fourslash.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 3deddf1f2ccf7..c7f455bd75365 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -911,7 +911,7 @@ namespace FourSlash { function rangeToReferenceEntry(r: Range) { let { isWriteAccess, isDefinition } = (r.marker && r.marker.data) || { isWriteAccess: false, isDefinition: false }; - isWriteAccess = isWriteAccess || false; isDefinition = isDefinition || false; + isWriteAccess = !!isWriteAccess; isDefinition = !!isDefinition; return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition } } } From a928ad3bd36e8aea806b307ff0b4b2d683f12ee8 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Wed, 8 Feb 2017 10:17:58 -0800 Subject: [PATCH 072/116] Address code review: move only expose emitLeadingCommentsOfPosition --- src/compiler/comments.ts | 16 ++++++++++------ src/compiler/emitter.ts | 17 +++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts index 8e17bf2d91b48..dcb471dcfcc98 100644 --- a/src/compiler/comments.ts +++ b/src/compiler/comments.ts @@ -9,7 +9,7 @@ namespace ts { emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void; emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void; emitTrailingCommentsOfPosition(pos: number): void; - emitLeadingComments(pos: number, isEmittedNode: boolean): void; + emitLeadingCommentsOfPosition(pos: number): void; } export function createCommentWriter(printerOptions: PrinterOptions, emitPos: ((pos: number) => void) | undefined): CommentWriter { @@ -33,7 +33,7 @@ namespace ts { emitNodeWithComments, emitBodyWithDetachedComments, emitTrailingCommentsOfPosition, - emitLeadingComments, + emitLeadingCommentsOfPosition, }; function emitNodeWithComments(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) { @@ -169,10 +169,6 @@ namespace ts { } function emitLeadingComments(pos: number, isEmittedNode: boolean) { - if (disabled) { - return; - } - hasWrittenComment = false; if (isEmittedNode) { @@ -216,6 +212,14 @@ namespace ts { } } + function emitLeadingCommentsOfPosition(pos: number) { + if (disabled || pos === -1) { + return; + } + + emitLeadingComments(pos, /*isEmittedNode*/ true); + } + function emitTrailingComments(pos: number) { forEachTrailingCommentToEmit(pos, emitTrailingComment); } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 7adac106e8c4d..fcb3fb826c98a 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1,4 +1,4 @@ -/// +/// /// /// /// @@ -211,7 +211,7 @@ namespace ts { emitNodeWithComments, emitBodyWithDetachedComments, emitTrailingCommentsOfPosition, - emitLeadingComments, + emitLeadingCommentsOfPosition, } = comments; let currentSourceFile: SourceFile; @@ -1348,7 +1348,7 @@ namespace ts { writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node); emitBlockStatements(node); // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted - emitLeadingComments(node.statements.end, /*isEmittedNode*/true); + emitLeadingCommentsOfPosition(node.statements.end); writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node); } } @@ -2235,10 +2235,10 @@ namespace ts { // function commentedParameters( // /* Parameter a */ // a - // /* End of parameter a */ -> this comment doesn't consider to be trailing comment of parameter "a" due to newline + // /* End of parameter a */ -> this comment isn't considered to be trailing comment of parameter "a" due to newline // , - if (emitLeadingComments && delimiter && previousSibling.end !== parentNode.end) { - emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement); + if (emitLeadingCommentsOfPosition && delimiter && previousSibling.end !== parentNode.end) { + emitLeadingCommentsOfPosition(previousSibling.end); } write(delimiter); @@ -2294,10 +2294,7 @@ namespace ts { // /* end of element 2 */ // ]; if (previousSibling && delimiter && previousSibling.end !== parentNode.end) { - emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement); - if (hasTrailingComma) { - emitLeadingComments(previousSibling.end, /*isEmittedNode*/ previousSibling.kind !== SyntaxKind.NotEmittedStatement); - } + emitLeadingCommentsOfPosition(previousSibling.end); } // Decrease the indent, if requested. From bb71dcdde8bf95611cfe98d8b33738250f4fb5b8 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 8 Feb 2017 11:01:32 -0800 Subject: [PATCH 073/116] add projectUsesOutFile field to protocol.CompileOnSaveAffectedFileListSingleProject (#13915) --- .../unittests/tsserverProjectSystem.ts | 48 +++++++++++++++++++ src/server/protocol.ts | 5 ++ src/server/session.ts | 3 +- 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts index 5ed0d9815115d..93027675bd64f 100644 --- a/src/harness/unittests/tsserverProjectSystem.ts +++ b/src/harness/unittests/tsserverProjectSystem.ts @@ -3031,6 +3031,54 @@ namespace ts.projectSystem { }); }); + describe("emit with outFile or out setting", () => { + function test(opts: CompilerOptions, expectedUsesOutFile: boolean) { + const f1 = { + path: "/a/a.ts", + content: "let x = 1" + }; + const f2 = { + path: "/a/b.ts", + content: "let y = 1" + }; + const config = { + path: "/a/tsconfig.json", + content: JSON.stringify({ + compilerOptions: opts, + compileOnSave: true + }) + }; + const host = createServerHost([f1, f2, config]); + const session = createSession(host); + session.executeCommand({ + seq: 1, + type: "request", + command: "open", + arguments: { file: f1.path } + }); + checkNumberOfProjects(session.getProjectService(), { configuredProjects: 1 }); + const { response } = session.executeCommand({ + seq: 2, + type: "request", + command: "compileOnSaveAffectedFileList", + arguments: { file: f1.path } + }); + assert.equal((response).length, 1, "expected output for 1 project"); + assert.equal((response)[0].fileNames.length, 2, "expected output for 1 project"); + assert.equal((response)[0].projectUsesOutFile, expectedUsesOutFile, "usesOutFile"); + } + + it ("projectUsesOutFile should not be returned if not set", () => { + test({}, /*expectedUsesOutFile*/ false); + }); + it ("projectUsesOutFile should be true if outFile is set", () => { + test({ outFile: "/a/out.js" }, /*expectedUsesOutFile*/ true); + }); + it ("projectUsesOutFile should be true if out is set", () => { + test({ out: "/a/out.js" }, /*expectedUsesOutFile*/ true); + }); + }); + describe("import helpers", () => { it("should not crash in tsserver", () => { const f1 = { diff --git a/src/server/protocol.ts b/src/server/protocol.ts index e3fe17362d7d0..c1b78e9dbaa3c 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -1239,6 +1239,11 @@ namespace ts.server.protocol { * List of files names that should be recompiled */ fileNames: string[]; + + /** + * true if project uses outFile or out compiler option + */ + projectUsesOutFile: boolean; } /** diff --git a/src/server/session.ts b/src/server/session.ts index 825ad8506d78b..5d745fc796531 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -1040,7 +1040,8 @@ namespace ts.server { if (project.compileOnSaveEnabled && project.languageServiceEnabled) { result.push({ projectFileName: project.getProjectName(), - fileNames: project.getCompileOnSaveAffectedFileList(info) + fileNames: project.getCompileOnSaveAffectedFileList(info), + projectUsesOutFile: !!project.getCompilerOptions().outFile || !!project.getCompilerOptions().out }); } } From 125dd57a757612367bcf495ed3070bb932ae75ed Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 8 Feb 2017 13:28:23 -0800 Subject: [PATCH 074/116] Fix assigned type of assignment nested in literals Fixes #12946 --- src/compiler/checker.ts | 10 +++++- .../reference/assignmentNestedInLiterals.js | 13 +++++++ .../assignmentNestedInLiterals.symbols | 25 +++++++++++++ .../assignmentNestedInLiterals.types | 35 +++++++++++++++++++ .../compiler/assignmentNestedInLiterals.ts | 6 ++++ 5 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/assignmentNestedInLiterals.js create mode 100644 tests/baselines/reference/assignmentNestedInLiterals.symbols create mode 100644 tests/baselines/reference/assignmentNestedInLiterals.types create mode 100644 tests/cases/compiler/assignmentNestedInLiterals.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4423b574e31bc..428a4e6eeef56 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9469,11 +9469,19 @@ namespace ts { } function getAssignedTypeOfBinaryExpression(node: BinaryExpression): Type { - return node.parent.kind === SyntaxKind.ArrayLiteralExpression || node.parent.kind === SyntaxKind.PropertyAssignment ? + const isDestructuringDefaultAssignment = + node.parent.kind === SyntaxKind.ArrayLiteralExpression && isDestructuringAssignmentTarget(node.parent) || + node.parent.kind === SyntaxKind.PropertyAssignment && isDestructuringAssignmentTarget(node.parent.parent); + return isDestructuringDefaultAssignment ? getTypeWithDefault(getAssignedType(node), node.right) : getTypeOfExpression(node.right); } + function isDestructuringAssignmentTarget(parent: Node) { + return parent.parent.kind === SyntaxKind.BinaryExpression && (parent.parent as BinaryExpression).left === parent || + parent.parent.kind === SyntaxKind.ForOfStatement && (parent.parent as ForOfStatement).initializer === parent; + } + function getAssignedTypeOfArrayLiteralElement(node: ArrayLiteralExpression, element: Expression): Type { return getTypeOfDestructuredArrayElement(getAssignedType(node), indexOf(node.elements, element)); } diff --git a/tests/baselines/reference/assignmentNestedInLiterals.js b/tests/baselines/reference/assignmentNestedInLiterals.js new file mode 100644 index 0000000000000..cd4bc6c669981 --- /dev/null +++ b/tests/baselines/reference/assignmentNestedInLiterals.js @@ -0,0 +1,13 @@ +//// [assignmentNestedInLiterals.ts] +var target, x, y; +target = [x = 1, y = x]; + +var aegis, a, b; +aegis = { x: a = 1, y: b = a }; + + +//// [assignmentNestedInLiterals.js] +var target, x, y; +target = [x = 1, y = x]; +var aegis, a, b; +aegis = { x: a = 1, y: b = a }; diff --git a/tests/baselines/reference/assignmentNestedInLiterals.symbols b/tests/baselines/reference/assignmentNestedInLiterals.symbols new file mode 100644 index 0000000000000..90edd9ed04f3f --- /dev/null +++ b/tests/baselines/reference/assignmentNestedInLiterals.symbols @@ -0,0 +1,25 @@ +=== tests/cases/compiler/assignmentNestedInLiterals.ts === +var target, x, y; +>target : Symbol(target, Decl(assignmentNestedInLiterals.ts, 0, 3)) +>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11)) +>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 0, 14)) + +target = [x = 1, y = x]; +>target : Symbol(target, Decl(assignmentNestedInLiterals.ts, 0, 3)) +>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11)) +>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 0, 14)) +>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11)) + +var aegis, a, b; +>aegis : Symbol(aegis, Decl(assignmentNestedInLiterals.ts, 3, 3)) +>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10)) +>b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13)) + +aegis = { x: a = 1, y: b = a }; +>aegis : Symbol(aegis, Decl(assignmentNestedInLiterals.ts, 3, 3)) +>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 4, 9)) +>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10)) +>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 4, 19)) +>b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13)) +>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10)) + diff --git a/tests/baselines/reference/assignmentNestedInLiterals.types b/tests/baselines/reference/assignmentNestedInLiterals.types new file mode 100644 index 0000000000000..8c4d5aadc7d6c --- /dev/null +++ b/tests/baselines/reference/assignmentNestedInLiterals.types @@ -0,0 +1,35 @@ +=== tests/cases/compiler/assignmentNestedInLiterals.ts === +var target, x, y; +>target : any +>x : any +>y : any + +target = [x = 1, y = x]; +>target = [x = 1, y = x] : number[] +>target : any +>[x = 1, y = x] : number[] +>x = 1 : 1 +>x : any +>1 : 1 +>y = x : number +>y : any +>x : number + +var aegis, a, b; +>aegis : any +>a : any +>b : any + +aegis = { x: a = 1, y: b = a }; +>aegis = { x: a = 1, y: b = a } : { x: number; y: number; } +>aegis : any +>{ x: a = 1, y: b = a } : { x: number; y: number; } +>x : number +>a = 1 : 1 +>a : any +>1 : 1 +>y : number +>b = a : number +>b : any +>a : number + diff --git a/tests/cases/compiler/assignmentNestedInLiterals.ts b/tests/cases/compiler/assignmentNestedInLiterals.ts new file mode 100644 index 0000000000000..5b1f52cb45034 --- /dev/null +++ b/tests/cases/compiler/assignmentNestedInLiterals.ts @@ -0,0 +1,6 @@ +// @noImplicitAny: true +var target, x, y; +target = [x = 1, y = x]; + +var aegis, a, b; +aegis = { x: a = 1, y: b = a }; From 8b8c490ff6b5cd89cee0d9049c733e6bbba1a719 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Wed, 8 Feb 2017 13:36:19 -0800 Subject: [PATCH 075/116] Address code review: fix indentation --- src/compiler/emitter.ts | 2 ++ .../reference/amdImportAsPrimaryExpression.js | 2 +- tests/baselines/reference/argsInScope.js | 2 +- .../reference/commentLeadingCloseBrace.js | 2 +- .../commonJSImportAsPrimaryExpression.js | 2 +- .../reference/duplicateLocalVariable1.js | 2 +- .../jsFileCompilationLetBeingRenamed.js | 2 +- .../narrowExceptionVariableInCatchClause.js | 2 +- tests/baselines/reference/noCatchBlock.js | 4 +-- tests/baselines/reference/noCatchBlock.js.map | 2 +- .../reference/noCatchBlock.sourcemap.txt | 28 +++++++++---------- tests/baselines/reference/objectRestForOf.js | 2 +- .../baselines/reference/parserRealSource14.js | 2 +- tests/baselines/reference/recursiveReturns.js | 2 +- .../reference/sourceMap-SkippedNode.js | 4 +-- .../reference/sourceMap-SkippedNode.js.map | 2 +- .../sourceMap-SkippedNode.sourcemap.txt | 28 +++++++++---------- 17 files changed, 46 insertions(+), 44 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index fcb3fb826c98a..03804dfeebe3c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1348,7 +1348,9 @@ namespace ts { writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node); emitBlockStatements(node); // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted + increaseIndent(); emitLeadingCommentsOfPosition(node.statements.end); + decreaseIndent(); writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node); } } diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js index 25f390c0b320d..6ff3216fb58ff 100644 --- a/tests/baselines/reference/amdImportAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js @@ -26,6 +26,6 @@ define(["require", "exports"], function (require, exports) { define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; if (foo.E1.A === 0) { - // Should cause runtime import - interesting optimization possibility, as gets inlined to 0. + // Should cause runtime import - interesting optimization possibility, as gets inlined to 0. } }); diff --git a/tests/baselines/reference/argsInScope.js b/tests/baselines/reference/argsInScope.js index 27405a47d8700..a38bc77803980 100644 --- a/tests/baselines/reference/argsInScope.js +++ b/tests/baselines/reference/argsInScope.js @@ -17,7 +17,7 @@ var C = (function () { } C.prototype.P = function (ii, j, k) { for (var i = 0; i < arguments.length; i++) { - // WScript.Echo("param: " + arguments[i]); + // WScript.Echo("param: " + arguments[i]); } }; return C; diff --git a/tests/baselines/reference/commentLeadingCloseBrace.js b/tests/baselines/reference/commentLeadingCloseBrace.js index 9fc696219e1e1..d5f5afbb88448 100644 --- a/tests/baselines/reference/commentLeadingCloseBrace.js +++ b/tests/baselines/reference/commentLeadingCloseBrace.js @@ -16,7 +16,7 @@ function ifelse() { if (commentedParameters(1, 2)) { /*comment1*/ commentedParameters(3, 4); - /*comment2*/ + /*comment2*/ } else { commentedParameters(5, 6); diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index 1eb7b5ff214fc..0cbb7470dfc77 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -27,5 +27,5 @@ exports.C1 = C1; "use strict"; var foo = require("./foo_0"); if (foo.C1.s1) { -// Should cause runtime import + // Should cause runtime import } diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index 432830d85b647..39848b3bb6add 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -391,7 +391,7 @@ var TestRunner = (function () { } } if (testResult === false) { - //console.log(e.message); + //console.log(e.message); } } if ((testcase.errorMessageRegEx !== undefined) && !exception) { diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js index bb2aa10dc95fd..a87dad3c91400 100644 --- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js +++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js @@ -9,6 +9,6 @@ function foo(a) { //// [out.js] function foo(a) { for (var a_1 = 0; a_1 < 10; a_1++) { - // do something + // do something } } diff --git a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js index 18344df599426..b7dbf717e3497 100644 --- a/tests/baselines/reference/narrowExceptionVariableInCatchClause.js +++ b/tests/baselines/reference/narrowExceptionVariableInCatchClause.js @@ -27,7 +27,7 @@ function tryCatch() { //// [narrowExceptionVariableInCatchClause.js] function tryCatch() { try { - // do stuff... + // do stuff... } catch (err) { if (isFooError(err)) { diff --git a/tests/baselines/reference/noCatchBlock.js b/tests/baselines/reference/noCatchBlock.js index 158ac1257f31b..ecc9c7f8c7ea7 100644 --- a/tests/baselines/reference/noCatchBlock.js +++ b/tests/baselines/reference/noCatchBlock.js @@ -8,9 +8,9 @@ try { //// [noCatchBlock.js] try { -// ... + // ... } finally { -// N.B. No 'catch' block + // N.B. No 'catch' block } //# sourceMappingURL=noCatchBlock.js.map \ No newline at end of file diff --git a/tests/baselines/reference/noCatchBlock.js.map b/tests/baselines/reference/noCatchBlock.js.map index ddac2894e0bbb..392ec58810852 100644 --- a/tests/baselines/reference/noCatchBlock.js.map +++ b/tests/baselines/reference/noCatchBlock.js.map @@ -1,2 +1,2 @@ //// [noCatchBlock.js.map] -{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;AACJ,MAAM;AACP,CAAC;QAAS,CAAC;AACV,wBAAwB;AACzB,CAAC"} \ No newline at end of file +{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;IACJ,MAAM;AACP,CAAC;QAAS,CAAC;IACV,wBAAwB;AACzB,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/noCatchBlock.sourcemap.txt b/tests/baselines/reference/noCatchBlock.sourcemap.txt index a75c119ca9fac..5210f12d734ec 100644 --- a/tests/baselines/reference/noCatchBlock.sourcemap.txt +++ b/tests/baselines/reference/noCatchBlock.sourcemap.txt @@ -12,7 +12,7 @@ sourceFile:noCatchBlock.ts 1 > 2 >^^^^ 3 > ^ -4 > ^^-> +4 > ^^^^^^-> 1 > > 2 >try @@ -21,14 +21,14 @@ sourceFile:noCatchBlock.ts 2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0) 3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0) --- ->>>// ... -1-> -2 >^^^^^^ +>>> // ... +1->^^^^ +2 > ^^^^^^ 1-> > -2 >// ... -1->Emitted(2, 1) Source(3, 2) + SourceIndex(0) -2 >Emitted(2, 7) Source(3, 8) + SourceIndex(0) +2 > // ... +1->Emitted(2, 5) Source(3, 2) + SourceIndex(0) +2 >Emitted(2, 11) Source(3, 8) + SourceIndex(0) --- >>>} 1 > @@ -43,20 +43,20 @@ sourceFile:noCatchBlock.ts >>>finally { 1->^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^-> 1-> finally 2 > { 1->Emitted(4, 9) Source(4, 11) + SourceIndex(0) 2 >Emitted(4, 10) Source(4, 12) + SourceIndex(0) --- ->>>// N.B. No 'catch' block -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^ +>>> // N.B. No 'catch' block +1->^^^^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^ 1-> > -2 >// N.B. No 'catch' block -1->Emitted(5, 1) Source(5, 2) + SourceIndex(0) -2 >Emitted(5, 25) Source(5, 26) + SourceIndex(0) +2 > // N.B. No 'catch' block +1->Emitted(5, 5) Source(5, 2) + SourceIndex(0) +2 >Emitted(5, 29) Source(5, 26) + SourceIndex(0) --- >>>} 1 > diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js index 5f0399b2df286..7ff72db06e59f 100644 --- a/tests/baselines/reference/objectRestForOf.js +++ b/tests/baselines/reference/objectRestForOf.js @@ -37,5 +37,5 @@ for (let _b of array) { } for (const norest of array.map(a => (Object.assign({}, a, { x: 'a string' })))) { [norest.x, norest.y]; -// x is now a string. who knows why. + // x is now a string. who knows why. } diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js index 4e4e23e81c378..635d122db04eb 100644 --- a/tests/baselines/reference/parserRealSource14.js +++ b/tests/baselines/reference/parserRealSource14.js @@ -1011,7 +1011,7 @@ var TypeScript; ctx.path.push(cur); } else { - //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack"); + //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack"); } } // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually diff --git a/tests/baselines/reference/recursiveReturns.js b/tests/baselines/reference/recursiveReturns.js index 56762a9ad2d32..d2619e18796fc 100644 --- a/tests/baselines/reference/recursiveReturns.js +++ b/tests/baselines/reference/recursiveReturns.js @@ -23,7 +23,7 @@ function R1() { function R2() { R2(); } function R3(n) { if (n == 0) { - //return; + //return; } else { R3(n--); diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js b/tests/baselines/reference/sourceMap-SkippedNode.js index daac27cf49f8b..f25c0d75c8246 100644 --- a/tests/baselines/reference/sourceMap-SkippedNode.js +++ b/tests/baselines/reference/sourceMap-SkippedNode.js @@ -7,9 +7,9 @@ try { //// [sourceMap-SkippedNode.js] try { -// ... + // ... } finally { -// N.B. No 'catch' block + // N.B. No 'catch' block } //# sourceMappingURL=sourceMap-SkippedNode.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js.map b/tests/baselines/reference/sourceMap-SkippedNode.js.map index b86b3905a736c..f3444919d41b0 100644 --- a/tests/baselines/reference/sourceMap-SkippedNode.js.map +++ b/tests/baselines/reference/sourceMap-SkippedNode.js.map @@ -1,2 +1,2 @@ //// [sourceMap-SkippedNode.js.map] -{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;AACL,MAAM;AACN,CAAC;QAAS,CAAC;AACX,wBAAwB;AACxB,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;IACL,MAAM;AACN,CAAC;QAAS,CAAC;IACX,wBAAwB;AACxB,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt index b48a5f09f4a98..c54676a697e21 100644 --- a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt @@ -12,7 +12,7 @@ sourceFile:sourceMap-SkippedNode.ts 1 > 2 >^^^^ 3 > ^ -4 > ^^-> +4 > ^^^^^^-> 1 > 2 >try 3 > { @@ -20,14 +20,14 @@ sourceFile:sourceMap-SkippedNode.ts 2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0) 3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0) --- ->>>// ... -1-> -2 >^^^^^^ +>>> // ... +1->^^^^ +2 > ^^^^^^ 1-> > -2 >// ... -1->Emitted(2, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0) +2 > // ... +1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(2, 7) + SourceIndex(0) --- >>>} 1 > @@ -42,20 +42,20 @@ sourceFile:sourceMap-SkippedNode.ts >>>finally { 1->^^^^^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^-> 1-> finally 2 > { 1->Emitted(4, 9) Source(3, 11) + SourceIndex(0) 2 >Emitted(4, 10) Source(3, 12) + SourceIndex(0) --- ->>>// N.B. No 'catch' block -1-> -2 >^^^^^^^^^^^^^^^^^^^^^^^^ +>>> // N.B. No 'catch' block +1->^^^^ +2 > ^^^^^^^^^^^^^^^^^^^^^^^^ 1-> > -2 >// N.B. No 'catch' block -1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(5, 25) Source(4, 25) + SourceIndex(0) +2 > // N.B. No 'catch' block +1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) +2 >Emitted(5, 29) Source(4, 25) + SourceIndex(0) --- >>>} 1 > From dc78d3314f15ab5ac23007488d19ba2b011791e3 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Wed, 8 Feb 2017 15:44:54 -0800 Subject: [PATCH 076/116] Add test --- src/harness/fourslash.ts | 12 ++++++++---- tests/cases/fourslash/fourslash.ts | 2 +- tests/cases/fourslash/unusedImports2FS.ts | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index c7f455bd75365..ad81ace4d5310 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2108,7 +2108,7 @@ namespace FourSlash { * Because codefixes are only applied on the working file, it is unsafe * to apply this more than once (consider a refactoring across files). */ - public verifyRangeAfterCodeFix(expectedText: string, errorCode?: number) { + public verifyRangeAfterCodeFix(expectedText: string, errorCode?: number, includeWhiteSpace?: boolean) { const ranges = this.getRanges(); if (ranges.length !== 1) { this.raiseError("Exactly one range should be specified in the testfile."); @@ -2120,7 +2120,11 @@ namespace FourSlash { const actualText = this.rangeText(ranges[0]); - if (this.removeWhitespace(actualText) !== this.removeWhitespace(expectedText)) { + const result = includeWhiteSpace + ? actualText === expectedText + : this.removeWhitespace(actualText) === this.removeWhitespace(expectedText) + + if (!result) { this.raiseError(`Actual text doesn't match expected text. Actual:\n'${actualText}'\nExpected:\n'${expectedText}'`); } } @@ -3509,8 +3513,8 @@ namespace FourSlashInterface { this.DocCommentTemplate(/*expectedText*/ undefined, /*expectedOffset*/ undefined, /*empty*/ true); } - public rangeAfterCodeFix(expectedText: string, errorCode?: number): void { - this.state.verifyRangeAfterCodeFix(expectedText, errorCode); + public rangeAfterCodeFix(expectedText: string, errorCode?: number, includeWhiteSpace?: boolean): void { + this.state.verifyRangeAfterCodeFix(expectedText, errorCode, includeWhiteSpace); } public importFixAtPosition(expectedTextArray: string[], errorCode?: number): void { diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index c613204f53951..661d7cba6a495 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -225,7 +225,7 @@ declare namespace FourSlashInterface { noMatchingBracePositionInCurrentFile(bracePosition: number): void; DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean): void; noDocCommentTemplate(): void; - rangeAfterCodeFix(expectedText: string, errorCode?: number): void; + rangeAfterCodeFix(expectedText: string, errorCode?: number, includeWhiteSpace?: boolean): void; importFixAtPosition(expectedTextArray: string[], errorCode?: number): void; navigationBar(json: any): void; diff --git a/tests/cases/fourslash/unusedImports2FS.ts b/tests/cases/fourslash/unusedImports2FS.ts index d2062fc49583c..5387569336247 100644 --- a/tests/cases/fourslash/unusedImports2FS.ts +++ b/tests/cases/fourslash/unusedImports2FS.ts @@ -2,8 +2,8 @@ // @noUnusedLocals: true // @Filename: file2.ts -//// [|import {Calculator} from "./file1" -//// import {test} from "./file1"|] +//// [|import {test} from "./file1" +//// import {Calculator} from "./file1"|] //// var x = new Calculator(); //// x.handleChar(); @@ -16,4 +16,4 @@ //// //// } -verify.rangeAfterCodeFix(`import {Calculator} from "./file1"`); +verify.rangeAfterCodeFix(`import {Calculator} from "./file1"`, /*errorCode*/ undefined, /*includeWhiteSpace*/ true); From a46cb033db7ad608c81e2541052cc1e3633ecadc Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Wed, 8 Feb 2017 16:14:36 -0800 Subject: [PATCH 077/116] Add for-of test case --- .../reference/assignmentNestedInLiterals.js | 8 ++++++++ .../reference/assignmentNestedInLiterals.symbols | 12 ++++++++++++ .../reference/assignmentNestedInLiterals.types | 16 ++++++++++++++++ .../cases/compiler/assignmentNestedInLiterals.ts | 4 ++++ 4 files changed, 40 insertions(+) diff --git a/tests/baselines/reference/assignmentNestedInLiterals.js b/tests/baselines/reference/assignmentNestedInLiterals.js index cd4bc6c669981..8a048082565d4 100644 --- a/tests/baselines/reference/assignmentNestedInLiterals.js +++ b/tests/baselines/reference/assignmentNestedInLiterals.js @@ -4,6 +4,10 @@ target = [x = 1, y = x]; var aegis, a, b; aegis = { x: a = 1, y: b = a }; + +var kowloona, c, d; +for (kowloona of [c = 1, d = c]) { +} //// [assignmentNestedInLiterals.js] @@ -11,3 +15,7 @@ var target, x, y; target = [x = 1, y = x]; var aegis, a, b; aegis = { x: a = 1, y: b = a }; +var kowloona, c, d; +for (var _i = 0, _a = [c = 1, d = c]; _i < _a.length; _i++) { + kowloona = _a[_i]; +} diff --git a/tests/baselines/reference/assignmentNestedInLiterals.symbols b/tests/baselines/reference/assignmentNestedInLiterals.symbols index 90edd9ed04f3f..761930ab9ce8d 100644 --- a/tests/baselines/reference/assignmentNestedInLiterals.symbols +++ b/tests/baselines/reference/assignmentNestedInLiterals.symbols @@ -23,3 +23,15 @@ aegis = { x: a = 1, y: b = a }; >b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13)) >a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10)) +var kowloona, c, d; +>kowloona : Symbol(kowloona, Decl(assignmentNestedInLiterals.ts, 6, 3)) +>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13)) +>d : Symbol(d, Decl(assignmentNestedInLiterals.ts, 6, 16)) + +for (kowloona of [c = 1, d = c]) { +>kowloona : Symbol(kowloona, Decl(assignmentNestedInLiterals.ts, 6, 3)) +>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13)) +>d : Symbol(d, Decl(assignmentNestedInLiterals.ts, 6, 16)) +>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13)) +} + diff --git a/tests/baselines/reference/assignmentNestedInLiterals.types b/tests/baselines/reference/assignmentNestedInLiterals.types index 8c4d5aadc7d6c..8ab73f80691f4 100644 --- a/tests/baselines/reference/assignmentNestedInLiterals.types +++ b/tests/baselines/reference/assignmentNestedInLiterals.types @@ -33,3 +33,19 @@ aegis = { x: a = 1, y: b = a }; >b : any >a : number +var kowloona, c, d; +>kowloona : any +>c : any +>d : any + +for (kowloona of [c = 1, d = c]) { +>kowloona : any +>[c = 1, d = c] : number[] +>c = 1 : 1 +>c : any +>1 : 1 +>d = c : number +>d : any +>c : number +} + diff --git a/tests/cases/compiler/assignmentNestedInLiterals.ts b/tests/cases/compiler/assignmentNestedInLiterals.ts index 5b1f52cb45034..09d8c94488fe7 100644 --- a/tests/cases/compiler/assignmentNestedInLiterals.ts +++ b/tests/cases/compiler/assignmentNestedInLiterals.ts @@ -4,3 +4,7 @@ target = [x = 1, y = x]; var aegis, a, b; aegis = { x: a = 1, y: b = a }; + +var kowloona, c, d; +for (kowloona of [c = 1, d = c]) { +} From 80568c53264b210246bb5ab2bb28424f90233632 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Wed, 8 Feb 2017 19:11:42 -0800 Subject: [PATCH 078/116] remove the new line after targeted line --- src/services/codefixes/unusedIdentifierFixes.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts index 0ca01a81eb176..3e74f81d8aa03 100644 --- a/src/services/codefixes/unusedIdentifierFixes.ts +++ b/src/services/codefixes/unusedIdentifierFixes.ts @@ -150,7 +150,20 @@ namespace ts.codefix { } function createCodeFixToRemoveNode(node: Node) { - return createCodeFix("", node.getStart(), node.getWidth()); + let end = node.getEnd(); + const endCharCode = sourceFile.text.charCodeAt(end); + const afterEndCharCode = sourceFile.text.charCodeAt(end + 1); + if (isLineBreak(endCharCode)) { + end += 1; + } + // in the case of CR LF, you could have two consecutive new line characters for one new line. + // this needs to be differenciated from two LF LF chars that actually mean two new lines. + if (isLineBreak(afterEndCharCode) && endCharCode !== afterEndCharCode) { + end += 1; + } + + const start = node.getStart(); + return createCodeFix("", start, end - start); } function findFirstNonSpaceCharPosStarting(start: number) { From e238b38278df025414dbbedc5739760f259d4098 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Wed, 8 Feb 2017 19:32:02 -0800 Subject: [PATCH 079/116] Update some tests because the original marker will be deleted --- tests/cases/fourslash/unusedVariableInForLoop7FS.ts | 6 +++--- tests/cases/fourslash/unusedVariableInModule1.ts | 6 +++--- tests/cases/fourslash/unusedVariableInModule3.ts | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts index fa862594ff98b..5aa3251c0b450 100644 --- a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts +++ b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts @@ -4,9 +4,9 @@ //// function f1 () { //// for (const elem of ["a", "b", "c"]) { //// elem; -//// [|var x = 20;|] -//// } +//// [|var x = 20; +//// }|] ////} //// -verify.rangeAfterCodeFix(""); +verify.rangeAfterCodeFix("}"); diff --git a/tests/cases/fourslash/unusedVariableInModule1.ts b/tests/cases/fourslash/unusedVariableInModule1.ts index 85ca41952cc5d..e9fe9515e6d8d 100644 --- a/tests/cases/fourslash/unusedVariableInModule1.ts +++ b/tests/cases/fourslash/unusedVariableInModule1.ts @@ -3,7 +3,7 @@ // @noUnusedLocals: true // @noUnusedParameters: true //// export {} -//// [|var x: string;|] -//// export var y: string; +//// [|var x: string; +//// export var y: string;|] -verify.rangeAfterCodeFix(""); +verify.rangeAfterCodeFix("export var y: string;"); diff --git a/tests/cases/fourslash/unusedVariableInModule3.ts b/tests/cases/fourslash/unusedVariableInModule3.ts index 428d234c164b4..0185b89e3a634 100644 --- a/tests/cases/fourslash/unusedVariableInModule3.ts +++ b/tests/cases/fourslash/unusedVariableInModule3.ts @@ -3,7 +3,7 @@ // @noUnusedLocals: true // @noUnusedParameters: true //// export {} -//// [|var x = function f1() {}|] -//// export var y: string; +//// [|var x = function f1() {} +//// export var y: string;|] -verify.rangeAfterCodeFix(""); +verify.rangeAfterCodeFix("export var y: string;"); From 2480e8d492ecd90849b189f98e57eb63ad1918c3 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 8 Feb 2017 20:35:01 -0800 Subject: [PATCH 080/116] do secondary lookup only if module has non-relative name --- Jakefile.js | 1 - src/harness/unittests/typingsInstaller.ts | 39 +++++++++++++++++++++++ src/server/lsHost.ts | 2 +- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index f422a995725e2..4fd3be57e4f75 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -37,7 +37,6 @@ if (process.env.path !== undefined) { } function filesFromConfig(configPath) { - console.log(configPath); var configText = fs.readFileSync(configPath).toString(); var config = ts.parseConfigFileTextToJson(configPath, configText, /*stripComments*/ true); if (config.error) { diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts index 2b79141c3e3b5..29076df80f232 100644 --- a/src/harness/unittests/typingsInstaller.ts +++ b/src/harness/unittests/typingsInstaller.ts @@ -46,6 +46,45 @@ namespace ts.projectSystem { import typingsName = server.typingsInstaller.typingsName; + describe("local module", () => { + it("should not be picked up", () => { + const f1 = { + path: "/a/app.js", + content: "const c = require('./config');" + }; + const f2 = { + path: "/a/config.js", + content: "export let x = 1" + }; + const typesCache = "/cache" + const typesConfig = { + path: typesCache + "/node_modules/@types/config/index.d.ts", + content: "export let y: number;" + }; + const config = { + path: "/a/jsconfig.json", + content: JSON.stringify({ + compilerOptions: { moduleResolution: "commonjs" }, + typeAcquisition: { enable: true } + }) + }; + const host = createServerHost([f1, f2, config, typesConfig]); + const installer = new (class extends Installer { + constructor() { + super(host, { typesRegistry: createTypesRegistry("config"), globalTypingsCacheLocation: typesCache }); + } + installWorker(_requestId: number, _args: string[], _cwd: string, _cb: server.typingsInstaller.RequestCompletedAction) { + assert(false, "should not be called") + } + })(); + const service = createProjectService(host, { typingsInstaller: installer }); + service.openClientFile(f1.path); + service.checkNumberOfProjects({ configuredProjects: 1 }); + checkProjectActualFiles(service.configuredProjects[0], [f1.path, f2.path]); + installer.installAll(0); + }); + }); + describe("typingsInstaller", () => { it("configured projects (typings installed) 1", () => { const file1 = { diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts index 9d8c9c08cb612..eee80d82e7f11 100644 --- a/src/server/lsHost.ts +++ b/src/server/lsHost.ts @@ -28,7 +28,7 @@ namespace ts.server { : undefined; const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host); // return result immediately only if it is .ts, .tsx or .d.ts - if (!(primaryResult.resolvedModule && extensionIsTypeScript(primaryResult.resolvedModule.extension)) && globalCache !== undefined) { + if (moduleHasNonRelativeName(moduleName) && !(primaryResult.resolvedModule && extensionIsTypeScript(primaryResult.resolvedModule.extension)) && globalCache !== undefined) { // otherwise try to load typings from @types // create different collection of failed lookup locations for second pass From 8da2bd97bd0389fffb62d852d6e8ddeda53df47c Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Thu, 9 Feb 2017 12:32:50 -0800 Subject: [PATCH 081/116] Address code review --- 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 03804dfeebe3c..e881c94cc8396 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2239,7 +2239,7 @@ namespace ts { // a // /* End of parameter a */ -> this comment isn't considered to be trailing comment of parameter "a" due to newline // , - if (emitLeadingCommentsOfPosition && delimiter && previousSibling.end !== parentNode.end) { + if (delimiter && previousSibling.end !== parentNode.end) { emitLeadingCommentsOfPosition(previousSibling.end); } write(delimiter); From 84fc29f9005f969f84480e3d142a88087d6b9f71 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 9 Feb 2017 12:46:09 -0800 Subject: [PATCH 082/116] Fix lint failures detected by tslint@4.4.2 --- src/compiler/sys.ts | 2 +- src/harness/fourslash.ts | 2 +- src/harness/harnessLanguageService.ts | 4 ++-- src/harness/unittests/tsserverProjectSystem.ts | 2 +- src/server/cancellationToken/cancellationToken.ts | 2 +- src/services/codefixes/unusedIdentifierFixes.ts | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index 8ac797507b19f..c90a3484a8a4c 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -486,7 +486,7 @@ namespace ts { // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643) let options: any; if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) { - // do nothing if either + // do nothing if either // - target folder does not exist // - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874) return noOpFileWatcher; diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index c7f455bd75365..fc85fb7276c03 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -183,7 +183,7 @@ namespace FourSlash { // The current caret position in the active file public currentCaretPosition = 0; - public lastKnownMarker: string = ""; + public lastKnownMarker = ""; // The file that's currently 'opened' public activeFile: FourSlashFile; diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index cd44fbf7a3a28..59930fd98ba6c 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -5,7 +5,7 @@ namespace Harness.LanguageService { export class ScriptInfo { - public version: number = 1; + public version = 1; public editRanges: { length: number; textChangeRange: ts.TextChangeRange; }[] = []; private lineMap: number[] = undefined; @@ -594,7 +594,7 @@ namespace Harness.LanguageService { class SessionServerHost implements ts.server.ServerHost, ts.server.Logger { args: string[] = []; newLine: string; - useCaseSensitiveFileNames: boolean = false; + useCaseSensitiveFileNames = false; constructor(private host: NativeLanguageServiceHost) { this.newLine = this.host.getNewLine(); diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts index 93027675bd64f..e6f4abde38223 100644 --- a/src/harness/unittests/tsserverProjectSystem.ts +++ b/src/harness/unittests/tsserverProjectSystem.ts @@ -3115,7 +3115,7 @@ namespace ts.projectSystem { let options = project.getCompilerOptions(); assert.isTrue(options.maxNodeModuleJsDepth === 2); - // Assert the option sticks + // Assert the option sticks projectService.setCompilerOptionsForInferredProjects({ target: ScriptTarget.ES2016 }); project = projectService.inferredProjects[0]; options = project.getCompilerOptions(); diff --git a/src/server/cancellationToken/cancellationToken.ts b/src/server/cancellationToken/cancellationToken.ts index 6d3dec67cc65b..de59f3a1bcebc 100644 --- a/src/server/cancellationToken/cancellationToken.ts +++ b/src/server/cancellationToken/cancellationToken.ts @@ -1,7 +1,7 @@ /// -// TODO: extract services types +// TODO: extract services types interface HostCancellationToken { isCancellationRequested(): boolean; } diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts index 0ca01a81eb176..6c0bc04eca8c6 100644 --- a/src/services/codefixes/unusedIdentifierFixes.ts +++ b/src/services/codefixes/unusedIdentifierFixes.ts @@ -94,9 +94,9 @@ namespace ts.codefix { return removeSingleItem(namedImports.elements, token); } - // handle case where "import d, * as ns from './file'" + // handle case where "import d, * as ns from './file'" // or "'import {a, b as ns} from './file'" - case SyntaxKind.ImportClause: // this covers both 'import |d|' and 'import |d,| *' + case SyntaxKind.ImportClause: // this covers both 'import |d|' and 'import |d,| *' const importClause = token.parent; if (!importClause.namedBindings) { // |import d from './file'| or |import * as ns from './file'| const importDecl = findImportDeclaration(importClause); From 24ddbe4b60a2d755a604a5f485206eb704e4599b Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 9 Feb 2017 14:55:07 -0800 Subject: [PATCH 083/116] Widen after sub-type-reduction took place --- src/compiler/checker.ts | 6 ++--- .../jsFileClassPropertyType3.errors.txt | 22 +++++++++++++++++++ .../reference/multipleDeclarations.types | 2 +- .../compiler/jsFileClassPropertyType3.ts | 18 +++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/jsFileClassPropertyType3.errors.txt create mode 100644 tests/cases/compiler/jsFileClassPropertyType3.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 10c5f5422e3f7..831126adfa1ed 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3378,7 +3378,7 @@ namespace ts { } // Return the inferred type for a variable, parameter, or property declaration - function getWidenedTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type { + function getTypeForJSSpecialPropertyDeclaration(declaration: Declaration): Type { const expression = declaration.kind === SyntaxKind.BinaryExpression ? declaration : declaration.kind === SyntaxKind.PropertyAccessExpression ? getAncestor(declaration, SyntaxKind.BinaryExpression) : undefined; @@ -3395,7 +3395,7 @@ namespace ts { } } - return getWidenedType(getWidenedLiteralType(checkExpressionCached(expression.right))); + return getWidenedLiteralType(checkExpressionCached(expression.right)); } // Return the type implied by a binding pattern element. This is the type of the initializer of the element if @@ -3552,7 +3552,7 @@ namespace ts { // * className.prototype.method = expr if (declaration.kind === SyntaxKind.BinaryExpression || declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) { - type = getUnionType(map(symbol.declarations, getWidenedTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true); + type = getWidenedType(getUnionType(map(symbol.declarations, getTypeForJSSpecialPropertyDeclaration), /*subtypeReduction*/ true)); } else { type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true); diff --git a/tests/baselines/reference/jsFileClassPropertyType3.errors.txt b/tests/baselines/reference/jsFileClassPropertyType3.errors.txt new file mode 100644 index 0000000000000..bf225095b01ca --- /dev/null +++ b/tests/baselines/reference/jsFileClassPropertyType3.errors.txt @@ -0,0 +1,22 @@ +tests/cases/compiler/bar.ts(2,1): error TS2322: Type '"string"' is not assignable to type 'number'. + + +==== tests/cases/compiler/foo.js (0 errors) ==== + + class C { + constructor() { + if (cond) { + this.p = null; + } + else { + this.p = 0; + } + } + } + +==== tests/cases/compiler/bar.ts (1 errors) ==== + + (new C()).p = "string"; // Error + ~~~~~~~~~~~ +!!! error TS2322: Type '"string"' is not assignable to type 'number'. + \ No newline at end of file diff --git a/tests/baselines/reference/multipleDeclarations.types b/tests/baselines/reference/multipleDeclarations.types index c11bd13dffe14..195bdc2ad0d61 100644 --- a/tests/baselines/reference/multipleDeclarations.types +++ b/tests/baselines/reference/multipleDeclarations.types @@ -21,7 +21,7 @@ C.prototype.m = function() { this.nothing(); >this.nothing() : any >this.nothing : any ->this : { m: any; } +>this : { m: () => void; } >nothing : any } class X { diff --git a/tests/cases/compiler/jsFileClassPropertyType3.ts b/tests/cases/compiler/jsFileClassPropertyType3.ts new file mode 100644 index 0000000000000..7c240e942fb39 --- /dev/null +++ b/tests/cases/compiler/jsFileClassPropertyType3.ts @@ -0,0 +1,18 @@ +// @allowJs: true +// @noEmit: true + +// @filename: foo.js +class C { + constructor() { + if (cond) { + this.p = null; + } + else { + this.p = 0; + } + } +} + +// @filename: bar.ts + +(new C()).p = "string"; // Error From a47c47611f6be54e86454a45e90bd89a270597fc Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 9 Feb 2017 15:25:49 -0800 Subject: [PATCH 084/116] Respond to code review comments --- src/compiler/checker.ts | 6 ++---- src/compiler/utilities.ts | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6b49b0bdb939a..88f4b1bfe6b29 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5226,7 +5226,7 @@ namespace ts { let hasThisParameter: boolean; const iife = getImmediatelyInvokedFunctionExpression(declaration); const isJSConstructSignature = isJSDocConstructSignature(declaration); - const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration); + const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration) && !hasJSDocParamterTags(declaration); // If this is a JSDoc construct signature, then skip the first parameter in the // parameter list. The first parameter represents the return type of the construct @@ -5252,13 +5252,11 @@ namespace ts { hasLiteralTypes = true; } - const isUntypedParamInJSFile = isUntypedSignatureInJSFile && !param.type && !getJSDocParameterTags(param); - // Record a new minimum argument count if this is not an optional parameter const isOptionalParameter = param.initializer || param.questionToken || param.dotDotDotToken || iife && parameters.length > iife.arguments.length && !param.type || isJSDocOptionalParameter(param) || - isUntypedParamInJSFile; + isUntypedSignatureInJSFile; if (!isOptionalParameter) { minArgumentCount = parameters.length; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 01cfcb08047ed..9935c2fb84980 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1518,6 +1518,11 @@ namespace ts { return map(getJSDocs(node), doc => doc.comment); } + export function hasJSDocParamterTags(node: FunctionLikeDeclaration | SignatureDeclaration) { + const parameterTags = getJSDocTags(node, SyntaxKind.JSDocParameterTag); + return parameterTags && parameterTags.length > 0; + } + function getJSDocTags(node: Node, kind: SyntaxKind): JSDocTag[] { const docs = getJSDocs(node); if (docs) { From 43c49b1ae7218b38f7d5c9d43b7529054c5d4b04 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 9 Feb 2017 15:32:17 -0800 Subject: [PATCH 085/116] Properly handle private/protected properties in intersection types --- src/compiler/checker.ts | 146 ++++++++++++++++++++------- src/compiler/diagnosticMessages.json | 4 + src/compiler/types.ts | 8 +- 3 files changed, 117 insertions(+), 41 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a0878b47ebb2d..e25f3681278b7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3736,9 +3736,9 @@ namespace ts { return getObjectFlags(type) & ObjectFlags.Reference ? (type).target : type; } - function hasBaseType(type: BaseType, checkBase: BaseType) { + function hasBaseType(type: Type, checkBase: Type) { return check(type); - function check(type: BaseType): boolean { + function check(type: Type): boolean { if (getObjectFlags(type) & (ObjectFlags.ClassOrInterface | ObjectFlags.Reference)) { const target = getTargetType(type); return target === checkBase || forEach(getBaseTypes(target), check); @@ -4939,17 +4939,19 @@ namespace ts { } function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol { - const types = containingType.types; - const excludeModifiers = containingType.flags & TypeFlags.Union ? ModifierFlags.Private | ModifierFlags.Protected : 0; let props: Symbol[]; + const types = containingType.types; + const isUnion = containingType.flags & TypeFlags.Union; + const excludeModifiers = isUnion ? ModifierFlags.NonPublicAccessibilityModifier : 0; // Flags we want to propagate to the result if they exist in all source symbols - let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None; + let commonFlags = isUnion ? SymbolFlags.None : SymbolFlags.Optional; let checkFlags = CheckFlags.SyntheticProperty; for (const current of types) { const type = getApparentType(current); if (type !== unknownType) { const prop = getPropertyOfType(type, name); - if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & excludeModifiers)) { + const modifiers = prop ? getDeclarationModifierFlagsFromSymbol(prop) : 0; + if (prop && !(modifiers & excludeModifiers)) { commonFlags &= prop.flags; if (!props) { props = [prop]; @@ -4957,11 +4959,13 @@ namespace ts { else if (!contains(props, prop)) { props.push(prop); } - if (isReadonlySymbol(prop)) { - checkFlags |= CheckFlags.Readonly; - } + checkFlags |= (isReadonlySymbol(prop) ? CheckFlags.Readonly : 0) | + (!(modifiers & ModifierFlags.NonPublicAccessibilityModifier) ? CheckFlags.ContainsPublic : 0) | + (modifiers & ModifierFlags.Protected ? CheckFlags.ContainsProtected : 0) | + (modifiers & ModifierFlags.Private ? CheckFlags.ContainsPrivate : 0) | + (modifiers & ModifierFlags.Static ? CheckFlags.ContainsStatic : 0); } - else if (containingType.flags & TypeFlags.Union) { + else if (isUnion) { checkFlags |= CheckFlags.Partial; } } @@ -4992,7 +4996,7 @@ namespace ts { result.checkFlags = checkFlags; result.containingType = containingType; result.declarations = declarations; - result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes); + result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes); return result; } @@ -6066,7 +6070,10 @@ namespace ts { if (type.flags & TypeFlags.Union && typeSet.unionIndex === undefined) { typeSet.unionIndex = typeSet.length; } - typeSet.push(type); + if (!(type.flags & TypeFlags.Object && (type).objectFlags & ObjectFlags.Anonymous && + type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method) && containsIdenticalType(typeSet, type))) { + typeSet.push(type); + } } } @@ -7950,6 +7957,12 @@ namespace ts { const sourcePropFlags = getDeclarationModifierFlagsFromSymbol(sourceProp); const targetPropFlags = getDeclarationModifierFlagsFromSymbol(targetProp); if (sourcePropFlags & ModifierFlags.Private || targetPropFlags & ModifierFlags.Private) { + if (getCheckFlags(sourceProp) & CheckFlags.ContainsPrivate) { + if (reportErrors) { + reportError(Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source)); + } + return Ternary.False; + } if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) { if (reportErrors) { if (sourcePropFlags & ModifierFlags.Private && targetPropFlags & ModifierFlags.Private) { @@ -7965,13 +7978,10 @@ namespace ts { } } else if (targetPropFlags & ModifierFlags.Protected) { - const sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class; - const sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined; - const targetClass = getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp)); - if (!sourceClass || !hasBaseType(sourceClass, targetClass)) { + if (!isValidOverrideOf(sourceProp, targetProp)) { if (reportErrors) { - reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, - symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass)); + reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), + typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target)); } return Ternary.False; } @@ -8213,6 +8223,49 @@ namespace ts { } } + // Invoke the callback for each underlying property symbol of the given symbol and return the first + // value that isn't undefined. + function forEachProperty(prop: Symbol, callback: (p: Symbol) => T): T { + if (getCheckFlags(prop) & CheckFlags.SyntheticProperty) { + for (const t of (prop).containingType.types) { + const p = getPropertyOfType(t, prop.name); + const result = p && forEachProperty(p, callback); + if (result) { + return result; + } + } + return undefined; + } + return callback(prop); + } + + // Return the declaring class type of a property or undefined if property not declared in class + function getDeclaringClass(prop: Symbol) { + return prop.parent && prop.parent.flags & SymbolFlags.Class ? getDeclaredTypeOfSymbol(getParentOfSymbol(prop)) : undefined; + } + + // Return true if some underlying source property is declared in a class that derives + // from the given base class. + function isPropertyInClassDerivedFrom(prop: Symbol, baseClass: Type) { + return forEachProperty(prop, sp => { + const sourceClass = getDeclaringClass(sp); + return sourceClass ? hasBaseType(sourceClass, baseClass) : false; + }); + } + + // Return true if source property is a valid override of protected parts of target property. + function isValidOverrideOf(sourceProp: Symbol, targetProp: Symbol) { + return !forEachProperty(targetProp, tp => getDeclarationModifierFlagsFromSymbol(tp) & ModifierFlags.Protected ? + !isPropertyInClassDerivedFrom(sourceProp, getDeclaringClass(tp)) : false); + } + + // Return true if the given class derives from each of the declaring classes of the protected + // constituents of the given property. + function isClassDerivedFromDeclaringClasses(checkClass: Type, prop: Symbol) { + return forEachProperty(prop, p => getDeclarationModifierFlagsFromSymbol(p) & ModifierFlags.Protected ? + !hasBaseType(checkClass, getDeclaringClass(p)) : false) ? undefined : checkClass; + } + // Return true if the given type is the constructor type for an abstract class function isAbstractConstructorType(type: Type) { if (getObjectFlags(type) & ObjectFlags.Anonymous) { @@ -12369,7 +12422,22 @@ namespace ts { } function getDeclarationModifierFlagsFromSymbol(s: Symbol): ModifierFlags { - return s.valueDeclaration ? getCombinedModifierFlags(s.valueDeclaration) : s.flags & SymbolFlags.Prototype ? ModifierFlags.Public | ModifierFlags.Static : 0; + if (s.valueDeclaration) { + const flags = getCombinedModifierFlags(s.valueDeclaration); + return s.parent && s.parent.flags & SymbolFlags.Class ? flags : flags & ~ModifierFlags.AccessibilityModifier; + } + if (getCheckFlags(s) & CheckFlags.SyntheticProperty) { + const checkFlags = (s).checkFlags; + const accessModifier = checkFlags & CheckFlags.ContainsPrivate ? ModifierFlags.Private : + checkFlags & CheckFlags.ContainsPublic ? ModifierFlags.Public : + ModifierFlags.Protected; + const staticModifier = checkFlags & CheckFlags.ContainsStatic ? ModifierFlags.Static : 0; + return accessModifier | staticModifier; + } + if (s.flags & SymbolFlags.Prototype) { + return ModifierFlags.Public | ModifierFlags.Static; + } + return 0; } function getDeclarationNodeFlagsFromSymbol(s: Symbol): NodeFlags { @@ -12384,12 +12452,18 @@ namespace ts { * @param type The type of left. * @param prop The symbol for the right hand side of the property access. */ - function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean { + function checkPropertyAccessibility(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean { const flags = getDeclarationModifierFlagsFromSymbol(prop); - const declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop)); const errorNode = node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.VariableDeclaration ? (node).name : (node).right; + + if (getCheckFlags(prop) & CheckFlags.ContainsPrivate) { + // Synthetic property with private constituent property + error(errorNode, Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type)); + return false; + } + if (left.kind === SyntaxKind.SuperKeyword) { // TS 1.0 spec (April 2014): 4.8.2 // - In a constructor, instance member function, instance member accessor, or @@ -12408,14 +12482,12 @@ namespace ts { return false; } } - if (flags & ModifierFlags.Abstract) { // A method cannot be accessed in a super property access if the method is abstract. // This error could mask a private property access error. But, a member // cannot simultaneously be private and abstract, so this will trigger an // additional error elsewhere. - - error(errorNode, Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(declaringClass)); + error(errorNode, Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(getDeclaringClass(prop))); return false; } } @@ -12431,7 +12503,7 @@ namespace ts { if (flags & ModifierFlags.Private) { const declaringClassDeclaration = getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop)); if (!isNodeWithinClass(node, declaringClassDeclaration)) { - error(errorNode, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass)); + error(errorNode, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(getDeclaringClass(prop))); return false; } return true; @@ -12444,15 +12516,15 @@ namespace ts { return true; } - // Get the enclosing class that has the declaring class as its base type + // Find the first enclosing class that has the declaring classes of the protected constituents + // of the property as base classes const enclosingClass = forEachEnclosingClass(node, enclosingDeclaration => { const enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration)); - return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined; + return isClassDerivedFromDeclaringClasses(enclosingClass, prop) ? enclosingClass : undefined; }); - // A protected property is accessible if the property is within the declaring class or classes derived from it if (!enclosingClass) { - error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass)); + error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type)); return false; } // No further restrictions for static properties @@ -12464,9 +12536,7 @@ namespace ts { // get the original type -- represented as the type constraint of the 'this' type type = getConstraintOfTypeParameter(type); } - - // TODO: why is the first part of this check here? - if (!(getObjectFlags(getTargetType(type)) & ObjectFlags.ClassOrInterface && hasBaseType(type, enclosingClass))) { + if (!(getObjectFlags(getTargetType(type)) & ObjectFlags.ClassOrInterface && hasBaseType(type, enclosingClass))) { error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass)); return false; } @@ -12553,9 +12623,7 @@ namespace ts { getNodeLinks(node).resolvedSymbol = prop; - if (prop.parent && prop.parent.flags & SymbolFlags.Class) { - checkClassPropertyAccess(node, left, apparentType, prop); - } + checkPropertyAccessibility(node, left, apparentType, prop); const propType = getTypeOfSymbol(prop); const assignmentKind = getAssignmentTargetKind(node); @@ -12587,8 +12655,8 @@ namespace ts { const type = checkExpression(left); if (type !== unknownType && !isTypeAny(type)) { const prop = getPropertyOfType(getWidenedType(type), propertyName); - if (prop && prop.parent && prop.parent.flags & SymbolFlags.Class) { - return checkClassPropertyAccess(node, left, type, prop); + if (prop) { + return checkPropertyAccessibility(node, left, type, prop); } } return true; @@ -17527,8 +17595,8 @@ namespace ts { const name = node.propertyName || node.name; const property = getPropertyOfType(parentType, getTextOfPropertyName(name)); markPropertyAsReferenced(property); - if (parent.initializer && property && getParentOfSymbol(property)) { - checkClassPropertyAccess(parent, parent.initializer, parentType, property); + if (parent.initializer && property) { + checkPropertyAccessibility(parent, parent.initializer, parentType, property); } } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 93953a3b90a7b..880547bac8520 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1787,6 +1787,10 @@ "category": "Error", "code": 2545 }, + "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'.": { + "category": "Error", + "code": 2546 + }, "JSX element attributes type '{0}' may not be a union type.": { "category": "Error", "code": 2600 diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 6912931be6577..db9873734aa7e 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2727,8 +2727,12 @@ Instantiated = 1 << 0, // Instantiated symbol SyntheticProperty = 1 << 1, // Property in union or intersection type Readonly = 1 << 2, // Readonly transient symbol - Partial = 1 << 3, // Property present in some but not all constituents - HasNonUniformType = 1 << 4, // Constituents have non-uniform types + Partial = 1 << 3, // Synthetic property present in some but not all constituents + HasNonUniformType = 1 << 4, // Synthetic property with non-uniform type in constituents + ContainsPublic = 1 << 5, // Synthetic property with public constituent(s) + ContainsProtected = 1 << 6, // Synthetic property with protected constituent(s) + ContainsPrivate = 1 << 7, // Synthetic property with private constituent(s) + ContainsStatic = 1 << 8, // Synthetic property with static constituent(s) } /* @internal */ From e76607e8649d86d6fba3342345f6fb020501bc96 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 9 Feb 2017 16:24:32 -0800 Subject: [PATCH 086/116] Fix typo --- src/compiler/checker.ts | 2 +- src/compiler/utilities.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 88f4b1bfe6b29..62b761cae5b91 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5226,7 +5226,7 @@ namespace ts { let hasThisParameter: boolean; const iife = getImmediatelyInvokedFunctionExpression(declaration); const isJSConstructSignature = isJSDocConstructSignature(declaration); - const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration) && !hasJSDocParamterTags(declaration); + const isUntypedSignatureInJSFile = !iife && !isJSConstructSignature && isInJavaScriptFile(declaration) && !hasJSDocParameterTags(declaration); // If this is a JSDoc construct signature, then skip the first parameter in the // parameter list. The first parameter represents the return type of the construct diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 9935c2fb84980..7d6d93c3c4ea1 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1518,7 +1518,7 @@ namespace ts { return map(getJSDocs(node), doc => doc.comment); } - export function hasJSDocParamterTags(node: FunctionLikeDeclaration | SignatureDeclaration) { + export function hasJSDocParameterTags(node: FunctionLikeDeclaration | SignatureDeclaration) { const parameterTags = getJSDocTags(node, SyntaxKind.JSDocParameterTag); return parameterTags && parameterTags.length > 0; } From 88961a276d4011e88eec5f45c739eec084b66710 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 9 Feb 2017 17:47:04 -0800 Subject: [PATCH 087/116] Add tests --- .../compiler/mixinPrivateAndProtected.ts | 88 ++++++++++++++ .../classes/mixinAccessModifiers.ts | 108 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 tests/cases/compiler/mixinPrivateAndProtected.ts create mode 100644 tests/cases/conformance/classes/mixinAccessModifiers.ts diff --git a/tests/cases/compiler/mixinPrivateAndProtected.ts b/tests/cases/compiler/mixinPrivateAndProtected.ts new file mode 100644 index 0000000000000..5cbcdb1c7b6bd --- /dev/null +++ b/tests/cases/compiler/mixinPrivateAndProtected.ts @@ -0,0 +1,88 @@ +// Repro from #13830 + +type Constructor = new(...args: any[]) => T; + +class A { + public pb: number = 2; + protected ptd: number = 1; + private pvt: number = 0; +} + +function mixB>(Cls: T) { + return class extends Cls { + protected ptd: number = 10; + private pvt: number = 0; + }; +} + +function mixB2>(Cls: T) { + return class extends Cls { + protected ptd: number = 10; + }; +} + +const + AB = mixB(A), + AB2 = mixB2(A); + +function mixC>(Cls: T) { + return class extends Cls { + protected ptd: number = 100; + private pvt: number = 0; + }; +} + +const + AB2C = mixC(AB2), + ABC = mixC(AB); + +const + a = new A(), + ab = new AB(), + abc = new ABC(), + ab2c = new AB2C(); + +a.pb.toFixed(); +a.ptd.toFixed(); // Error +a.pvt.toFixed(); // Error + +ab.pb.toFixed(); +ab.ptd.toFixed(); // Error +ab.pvt.toFixed(); // Error + +abc.pb.toFixed(); +abc.ptd.toFixed(); // Error +abc.pvt.toFixed(); // Error + +ab2c.pb.toFixed(); +ab2c.ptd.toFixed(); // Error +ab2c.pvt.toFixed(); // Error + +// Repro from #13924 + +class Person { + constructor(public name: string) {} + + protected myProtectedFunction() { + // do something + } +} + +function PersonMixin>(Base: T) { + return class extends Base { + constructor(...args: any[]) { + super(...args); + } + + myProtectedFunction() { + super.myProtectedFunction(); + // do more things + } + }; +} + +class Customer extends PersonMixin(Person) { + accountBalance: number; + f() { + } +} diff --git a/tests/cases/conformance/classes/mixinAccessModifiers.ts b/tests/cases/conformance/classes/mixinAccessModifiers.ts new file mode 100644 index 0000000000000..a628371eec6bb --- /dev/null +++ b/tests/cases/conformance/classes/mixinAccessModifiers.ts @@ -0,0 +1,108 @@ +// @declaration: true + +type Constructable = new (...args: any[]) => object; + +class Private { + constructor (...args: any[]) {} + private p: string; +} + +class Private2 { + constructor (...args: any[]) {} + private p: string; +} + +class Protected { + constructor (...args: any[]) {} + protected p: string; + protected static s: string; +} + +class Protected2 { + constructor (...args: any[]) {} + protected p: string; + protected static s: string; +} + +class Public { + constructor (...args: any[]) {} + public p: string; + public static s: string; +} + +class Public2 { + constructor (...args: any[]) {} + public p: string; + public static s: string; +} + +function f1(x: Private & Private2) { + x.p; // Error, private constituent makes property inaccessible +} + +function f2(x: Private & Protected) { + x.p; // Error, private constituent makes property inaccessible +} + +function f3(x: Private & Public) { + x.p; // Error, private constituent makes property inaccessible +} + +function f4(x: Protected & Protected2) { + x.p; // Error, protected when all constituents are protected +} + +function f5(x: Protected & Public) { + x.p; // Ok, public if any constituent is public +} + +function f6(x: Public & Public2) { + x.p; // Ok, public if any constituent is public +} + +declare function Mix(c1: T, c2: U): T & U; + +// Can't derive from type with inaccessible properties + +class C1 extends Mix(Private, Private2) {} +class C2 extends Mix(Private, Protected) {} +class C3 extends Mix(Private, Public) {} + +class C4 extends Mix(Protected, Protected2) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; + c5.p; + c6.p; + } + static g() { + C4.s; + C5.s; + C6.s + } +} + +class C5 extends Mix(Protected, Public) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; // Error, not in class deriving from Protected2 + c5.p; + c6.p; + } + static g() { + C4.s; // Error, not in class deriving from Protected2 + C5.s; + C6.s + } +} + +class C6 extends Mix(Public, Public2) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; // Error, not in class deriving from Protected2 + c5.p; + c6.p; + } + static g() { + C4.s; // Error, not in class deriving from Protected2 + C5.s; + C6.s + } +} From c870beffc73959f9e16e879dd9feafc193e1085d Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 9 Feb 2017 17:47:25 -0800 Subject: [PATCH 088/116] Accept new baselines --- .../reference/mixinAccessModifiers.errors.txt | 156 +++++++++ .../reference/mixinAccessModifiers.js | 323 ++++++++++++++++++ .../mixinPrivateAndProtected.errors.txt | 116 +++++++ .../reference/mixinPrivateAndProtected.js | 197 +++++++++++ 4 files changed, 792 insertions(+) create mode 100644 tests/baselines/reference/mixinAccessModifiers.errors.txt create mode 100644 tests/baselines/reference/mixinAccessModifiers.js create mode 100644 tests/baselines/reference/mixinPrivateAndProtected.errors.txt create mode 100644 tests/baselines/reference/mixinPrivateAndProtected.js diff --git a/tests/baselines/reference/mixinAccessModifiers.errors.txt b/tests/baselines/reference/mixinAccessModifiers.errors.txt new file mode 100644 index 0000000000000..a161a8558812f --- /dev/null +++ b/tests/baselines/reference/mixinAccessModifiers.errors.txt @@ -0,0 +1,156 @@ +tests/cases/conformance/classes/mixinAccessModifiers.ts(39,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Private2'. +tests/cases/conformance/classes/mixinAccessModifiers.ts(43,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Protected'. +tests/cases/conformance/classes/mixinAccessModifiers.ts(47,4): error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Public'. +tests/cases/conformance/classes/mixinAccessModifiers.ts(51,4): error TS2445: Property 'p' is protected and only accessible within class 'Protected & Protected2' and its subclasses. +tests/cases/conformance/classes/mixinAccessModifiers.ts(66,7): error TS2415: Class 'C1' incorrectly extends base class 'Private & Private2'. + Type 'C1' is not assignable to type 'Private'. + Property 'p' has conflicting declarations and is inaccessible in type 'C1'. +tests/cases/conformance/classes/mixinAccessModifiers.ts(67,7): error TS2415: Class 'C2' incorrectly extends base class 'Private & Protected'. + Type 'C2' is not assignable to type 'Private'. + Property 'p' has conflicting declarations and is inaccessible in type 'C2'. +tests/cases/conformance/classes/mixinAccessModifiers.ts(68,7): error TS2415: Class 'C3' incorrectly extends base class 'Private & Public'. + Type 'C3' is not assignable to type 'Private'. + Property 'p' has conflicting declarations and is inaccessible in type 'C3'. +tests/cases/conformance/classes/mixinAccessModifiers.ts(85,6): error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses. +tests/cases/conformance/classes/mixinAccessModifiers.ts(90,6): error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses. +tests/cases/conformance/classes/mixinAccessModifiers.ts(98,6): error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses. +tests/cases/conformance/classes/mixinAccessModifiers.ts(103,6): error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses. + + +==== tests/cases/conformance/classes/mixinAccessModifiers.ts (11 errors) ==== + + type Constructable = new (...args: any[]) => object; + + class Private { + constructor (...args: any[]) {} + private p: string; + } + + class Private2 { + constructor (...args: any[]) {} + private p: string; + } + + class Protected { + constructor (...args: any[]) {} + protected p: string; + protected static s: string; + } + + class Protected2 { + constructor (...args: any[]) {} + protected p: string; + protected static s: string; + } + + class Public { + constructor (...args: any[]) {} + public p: string; + public static s: string; + } + + class Public2 { + constructor (...args: any[]) {} + public p: string; + public static s: string; + } + + function f1(x: Private & Private2) { + x.p; // Error, private constituent makes property inaccessible + ~ +!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Private2'. + } + + function f2(x: Private & Protected) { + x.p; // Error, private constituent makes property inaccessible + ~ +!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Protected'. + } + + function f3(x: Private & Public) { + x.p; // Error, private constituent makes property inaccessible + ~ +!!! error TS2546: Property 'p' has conflicting declarations and is inaccessible in type 'Private & Public'. + } + + function f4(x: Protected & Protected2) { + x.p; // Error, protected when all constituents are protected + ~ +!!! error TS2445: Property 'p' is protected and only accessible within class 'Protected & Protected2' and its subclasses. + } + + function f5(x: Protected & Public) { + x.p; // Ok, public if any constituent is public + } + + function f6(x: Public & Public2) { + x.p; // Ok, public if any constituent is public + } + + declare function Mix(c1: T, c2: U): T & U; + + // Can't derive from type with inaccessible properties + + class C1 extends Mix(Private, Private2) {} + ~~ +!!! error TS2415: Class 'C1' incorrectly extends base class 'Private & Private2'. +!!! error TS2415: Type 'C1' is not assignable to type 'Private'. +!!! error TS2415: Property 'p' has conflicting declarations and is inaccessible in type 'C1'. + class C2 extends Mix(Private, Protected) {} + ~~ +!!! error TS2415: Class 'C2' incorrectly extends base class 'Private & Protected'. +!!! error TS2415: Type 'C2' is not assignable to type 'Private'. +!!! error TS2415: Property 'p' has conflicting declarations and is inaccessible in type 'C2'. + class C3 extends Mix(Private, Public) {} + ~~ +!!! error TS2415: Class 'C3' incorrectly extends base class 'Private & Public'. +!!! error TS2415: Type 'C3' is not assignable to type 'Private'. +!!! error TS2415: Property 'p' has conflicting declarations and is inaccessible in type 'C3'. + + class C4 extends Mix(Protected, Protected2) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; + c5.p; + c6.p; + } + static g() { + C4.s; + C5.s; + C6.s + } + } + + class C5 extends Mix(Protected, Public) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; // Error, not in class deriving from Protected2 + ~ +!!! error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses. + c5.p; + c6.p; + } + static g() { + C4.s; // Error, not in class deriving from Protected2 + ~ +!!! error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses. + C5.s; + C6.s + } + } + + class C6 extends Mix(Public, Public2) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; // Error, not in class deriving from Protected2 + ~ +!!! error TS2445: Property 'p' is protected and only accessible within class 'C4' and its subclasses. + c5.p; + c6.p; + } + static g() { + C4.s; // Error, not in class deriving from Protected2 + ~ +!!! error TS2445: Property 's' is protected and only accessible within class 'typeof C4' and its subclasses. + C5.s; + C6.s + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/mixinAccessModifiers.js b/tests/baselines/reference/mixinAccessModifiers.js new file mode 100644 index 0000000000000..5bf42f480fb29 --- /dev/null +++ b/tests/baselines/reference/mixinAccessModifiers.js @@ -0,0 +1,323 @@ +//// [mixinAccessModifiers.ts] + +type Constructable = new (...args: any[]) => object; + +class Private { + constructor (...args: any[]) {} + private p: string; +} + +class Private2 { + constructor (...args: any[]) {} + private p: string; +} + +class Protected { + constructor (...args: any[]) {} + protected p: string; + protected static s: string; +} + +class Protected2 { + constructor (...args: any[]) {} + protected p: string; + protected static s: string; +} + +class Public { + constructor (...args: any[]) {} + public p: string; + public static s: string; +} + +class Public2 { + constructor (...args: any[]) {} + public p: string; + public static s: string; +} + +function f1(x: Private & Private2) { + x.p; // Error, private constituent makes property inaccessible +} + +function f2(x: Private & Protected) { + x.p; // Error, private constituent makes property inaccessible +} + +function f3(x: Private & Public) { + x.p; // Error, private constituent makes property inaccessible +} + +function f4(x: Protected & Protected2) { + x.p; // Error, protected when all constituents are protected +} + +function f5(x: Protected & Public) { + x.p; // Ok, public if any constituent is public +} + +function f6(x: Public & Public2) { + x.p; // Ok, public if any constituent is public +} + +declare function Mix(c1: T, c2: U): T & U; + +// Can't derive from type with inaccessible properties + +class C1 extends Mix(Private, Private2) {} +class C2 extends Mix(Private, Protected) {} +class C3 extends Mix(Private, Public) {} + +class C4 extends Mix(Protected, Protected2) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; + c5.p; + c6.p; + } + static g() { + C4.s; + C5.s; + C6.s + } +} + +class C5 extends Mix(Protected, Public) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; // Error, not in class deriving from Protected2 + c5.p; + c6.p; + } + static g() { + C4.s; // Error, not in class deriving from Protected2 + C5.s; + C6.s + } +} + +class C6 extends Mix(Public, Public2) { + f(c4: C4, c5: C5, c6: C6) { + c4.p; // Error, not in class deriving from Protected2 + c5.p; + c6.p; + } + static g() { + C4.s; // Error, not in class deriving from Protected2 + C5.s; + C6.s + } +} + + +//// [mixinAccessModifiers.js] +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +var Private = (function () { + function Private() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + } + return Private; +}()); +var Private2 = (function () { + function Private2() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + } + return Private2; +}()); +var Protected = (function () { + function Protected() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + } + return Protected; +}()); +var Protected2 = (function () { + function Protected2() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + } + return Protected2; +}()); +var Public = (function () { + function Public() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + } + return Public; +}()); +var Public2 = (function () { + function Public2() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + } + return Public2; +}()); +function f1(x) { + x.p; // Error, private constituent makes property inaccessible +} +function f2(x) { + x.p; // Error, private constituent makes property inaccessible +} +function f3(x) { + x.p; // Error, private constituent makes property inaccessible +} +function f4(x) { + x.p; // Error, protected when all constituents are protected +} +function f5(x) { + x.p; // Ok, public if any constituent is public +} +function f6(x) { + x.p; // Ok, public if any constituent is public +} +// Can't derive from type with inaccessible properties +var C1 = (function (_super) { + __extends(C1, _super); + function C1() { + return _super !== null && _super.apply(this, arguments) || this; + } + return C1; +}(Mix(Private, Private2))); +var C2 = (function (_super) { + __extends(C2, _super); + function C2() { + return _super !== null && _super.apply(this, arguments) || this; + } + return C2; +}(Mix(Private, Protected))); +var C3 = (function (_super) { + __extends(C3, _super); + function C3() { + return _super !== null && _super.apply(this, arguments) || this; + } + return C3; +}(Mix(Private, Public))); +var C4 = (function (_super) { + __extends(C4, _super); + function C4() { + return _super !== null && _super.apply(this, arguments) || this; + } + C4.prototype.f = function (c4, c5, c6) { + c4.p; + c5.p; + c6.p; + }; + C4.g = function () { + C4.s; + C5.s; + C6.s; + }; + return C4; +}(Mix(Protected, Protected2))); +var C5 = (function (_super) { + __extends(C5, _super); + function C5() { + return _super !== null && _super.apply(this, arguments) || this; + } + C5.prototype.f = function (c4, c5, c6) { + c4.p; // Error, not in class deriving from Protected2 + c5.p; + c6.p; + }; + C5.g = function () { + C4.s; // Error, not in class deriving from Protected2 + C5.s; + C6.s; + }; + return C5; +}(Mix(Protected, Public))); +var C6 = (function (_super) { + __extends(C6, _super); + function C6() { + return _super !== null && _super.apply(this, arguments) || this; + } + C6.prototype.f = function (c4, c5, c6) { + c4.p; // Error, not in class deriving from Protected2 + c5.p; + c6.p; + }; + C6.g = function () { + C4.s; // Error, not in class deriving from Protected2 + C5.s; + C6.s; + }; + return C6; +}(Mix(Public, Public2))); + + +//// [mixinAccessModifiers.d.ts] +declare type Constructable = new (...args: any[]) => object; +declare class Private { + constructor(...args: any[]); + private p; +} +declare class Private2 { + constructor(...args: any[]); + private p; +} +declare class Protected { + constructor(...args: any[]); + protected p: string; + protected static s: string; +} +declare class Protected2 { + constructor(...args: any[]); + protected p: string; + protected static s: string; +} +declare class Public { + constructor(...args: any[]); + p: string; + static s: string; +} +declare class Public2 { + constructor(...args: any[]); + p: string; + static s: string; +} +declare function f1(x: Private & Private2): void; +declare function f2(x: Private & Protected): void; +declare function f3(x: Private & Public): void; +declare function f4(x: Protected & Protected2): void; +declare function f5(x: Protected & Public): void; +declare function f6(x: Public & Public2): void; +declare function Mix(c1: T, c2: U): T & U; +declare class C1 extends Private & Private2 { +} +declare class C2 extends Private & Protected { +} +declare class C3 extends Private & Public { +} +declare class C4 extends Protected & Protected2 { + f(c4: C4, c5: C5, c6: C6): void; + static g(): void; +} +declare class C5 extends Protected & Public { + f(c4: C4, c5: C5, c6: C6): void; + static g(): void; +} +declare class C6 extends Public & Public2 { + f(c4: C4, c5: C5, c6: C6): void; + static g(): void; +} diff --git a/tests/baselines/reference/mixinPrivateAndProtected.errors.txt b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt new file mode 100644 index 0000000000000..131aff967d9b4 --- /dev/null +++ b/tests/baselines/reference/mixinPrivateAndProtected.errors.txt @@ -0,0 +1,116 @@ +tests/cases/compiler/mixinPrivateAndProtected.ts(46,3): error TS2445: Property 'ptd' is protected and only accessible within class 'A' and its subclasses. +tests/cases/compiler/mixinPrivateAndProtected.ts(47,3): error TS2341: Property 'pvt' is private and only accessible within class 'A'. +tests/cases/compiler/mixinPrivateAndProtected.ts(50,4): error TS2445: Property 'ptd' is protected and only accessible within class 'mixB.(Anonymous class) & A' and its subclasses. +tests/cases/compiler/mixinPrivateAndProtected.ts(51,4): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixB.(Anonymous class) & A'. +tests/cases/compiler/mixinPrivateAndProtected.ts(54,5): error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB.(Anonymous class); prototype: mixB.(Anonymous class); } & typeof A>.(Anonymous class) & mixB.(Anonymous class) & A' and its subclasses. +tests/cases/compiler/mixinPrivateAndProtected.ts(55,5): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB.(Anonymous class); prototype: mixB.(Anonymous class); } & typeof A>.(Anonymous class) & mixB.(Anonymous class) & A'. +tests/cases/compiler/mixinPrivateAndProtected.ts(58,6): error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB2.(Anonymous class); prototype: mixB2.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2.(Anonymous class) & A' and its subclasses. +tests/cases/compiler/mixinPrivateAndProtected.ts(59,6): error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB2.(Anonymous class); prototype: mixB2.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2.(Anonymous class) & A'. + + +==== tests/cases/compiler/mixinPrivateAndProtected.ts (8 errors) ==== + // Repro from #13830 + + type Constructor = new(...args: any[]) => T; + + class A { + public pb: number = 2; + protected ptd: number = 1; + private pvt: number = 0; + } + + function mixB>(Cls: T) { + return class extends Cls { + protected ptd: number = 10; + private pvt: number = 0; + }; + } + + function mixB2>(Cls: T) { + return class extends Cls { + protected ptd: number = 10; + }; + } + + const + AB = mixB(A), + AB2 = mixB2(A); + + function mixC>(Cls: T) { + return class extends Cls { + protected ptd: number = 100; + private pvt: number = 0; + }; + } + + const + AB2C = mixC(AB2), + ABC = mixC(AB); + + const + a = new A(), + ab = new AB(), + abc = new ABC(), + ab2c = new AB2C(); + + a.pb.toFixed(); + a.ptd.toFixed(); // Error + ~~~ +!!! error TS2445: Property 'ptd' is protected and only accessible within class 'A' and its subclasses. + a.pvt.toFixed(); // Error + ~~~ +!!! error TS2341: Property 'pvt' is private and only accessible within class 'A'. + + ab.pb.toFixed(); + ab.ptd.toFixed(); // Error + ~~~ +!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixB.(Anonymous class) & A' and its subclasses. + ab.pvt.toFixed(); // Error + ~~~ +!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixB.(Anonymous class) & A'. + + abc.pb.toFixed(); + abc.ptd.toFixed(); // Error + ~~~ +!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB.(Anonymous class); prototype: mixB.(Anonymous class); } & typeof A>.(Anonymous class) & mixB.(Anonymous class) & A' and its subclasses. + abc.pvt.toFixed(); // Error + ~~~ +!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB.(Anonymous class); prototype: mixB.(Anonymous class); } & typeof A>.(Anonymous class) & mixB.(Anonymous class) & A'. + + ab2c.pb.toFixed(); + ab2c.ptd.toFixed(); // Error + ~~~ +!!! error TS2445: Property 'ptd' is protected and only accessible within class 'mixC<{ new (...args: any[]): mixB2.(Anonymous class); prototype: mixB2.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2.(Anonymous class) & A' and its subclasses. + ab2c.pvt.toFixed(); // Error + ~~~ +!!! error TS2546: Property 'pvt' has conflicting declarations and is inaccessible in type 'mixC<{ new (...args: any[]): mixB2.(Anonymous class); prototype: mixB2.(Anonymous class); } & typeof A>.(Anonymous class) & mixB2.(Anonymous class) & A'. + + // Repro from #13924 + + class Person { + constructor(public name: string) {} + + protected myProtectedFunction() { + // do something + } + } + + function PersonMixin>(Base: T) { + return class extends Base { + constructor(...args: any[]) { + super(...args); + } + + myProtectedFunction() { + super.myProtectedFunction(); + // do more things + } + }; + } + + class Customer extends PersonMixin(Person) { + accountBalance: number; + f() { + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/mixinPrivateAndProtected.js b/tests/baselines/reference/mixinPrivateAndProtected.js new file mode 100644 index 0000000000000..9b8f3ee0c128a --- /dev/null +++ b/tests/baselines/reference/mixinPrivateAndProtected.js @@ -0,0 +1,197 @@ +//// [mixinPrivateAndProtected.ts] +// Repro from #13830 + +type Constructor = new(...args: any[]) => T; + +class A { + public pb: number = 2; + protected ptd: number = 1; + private pvt: number = 0; +} + +function mixB>(Cls: T) { + return class extends Cls { + protected ptd: number = 10; + private pvt: number = 0; + }; +} + +function mixB2>(Cls: T) { + return class extends Cls { + protected ptd: number = 10; + }; +} + +const + AB = mixB(A), + AB2 = mixB2(A); + +function mixC>(Cls: T) { + return class extends Cls { + protected ptd: number = 100; + private pvt: number = 0; + }; +} + +const + AB2C = mixC(AB2), + ABC = mixC(AB); + +const + a = new A(), + ab = new AB(), + abc = new ABC(), + ab2c = new AB2C(); + +a.pb.toFixed(); +a.ptd.toFixed(); // Error +a.pvt.toFixed(); // Error + +ab.pb.toFixed(); +ab.ptd.toFixed(); // Error +ab.pvt.toFixed(); // Error + +abc.pb.toFixed(); +abc.ptd.toFixed(); // Error +abc.pvt.toFixed(); // Error + +ab2c.pb.toFixed(); +ab2c.ptd.toFixed(); // Error +ab2c.pvt.toFixed(); // Error + +// Repro from #13924 + +class Person { + constructor(public name: string) {} + + protected myProtectedFunction() { + // do something + } +} + +function PersonMixin>(Base: T) { + return class extends Base { + constructor(...args: any[]) { + super(...args); + } + + myProtectedFunction() { + super.myProtectedFunction(); + // do more things + } + }; +} + +class Customer extends PersonMixin(Person) { + accountBalance: number; + f() { + } +} + + +//// [mixinPrivateAndProtected.js] +// Repro from #13830 +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +var A = (function () { + function A() { + this.pb = 2; + this.ptd = 1; + this.pvt = 0; + } + return A; +}()); +function mixB(Cls) { + return (function (_super) { + __extends(class_1, _super); + function class_1() { + var _this = _super !== null && _super.apply(this, arguments) || this; + _this.ptd = 10; + _this.pvt = 0; + return _this; + } + return class_1; + }(Cls)); +} +function mixB2(Cls) { + return (function (_super) { + __extends(class_2, _super); + function class_2() { + var _this = _super !== null && _super.apply(this, arguments) || this; + _this.ptd = 10; + return _this; + } + return class_2; + }(Cls)); +} +var AB = mixB(A), AB2 = mixB2(A); +function mixC(Cls) { + return (function (_super) { + __extends(class_3, _super); + function class_3() { + var _this = _super !== null && _super.apply(this, arguments) || this; + _this.ptd = 100; + _this.pvt = 0; + return _this; + } + return class_3; + }(Cls)); +} +var AB2C = mixC(AB2), ABC = mixC(AB); +var a = new A(), ab = new AB(), abc = new ABC(), ab2c = new AB2C(); +a.pb.toFixed(); +a.ptd.toFixed(); // Error +a.pvt.toFixed(); // Error +ab.pb.toFixed(); +ab.ptd.toFixed(); // Error +ab.pvt.toFixed(); // Error +abc.pb.toFixed(); +abc.ptd.toFixed(); // Error +abc.pvt.toFixed(); // Error +ab2c.pb.toFixed(); +ab2c.ptd.toFixed(); // Error +ab2c.pvt.toFixed(); // Error +// Repro from #13924 +var Person = (function () { + function Person(name) { + this.name = name; + } + Person.prototype.myProtectedFunction = function () { + // do something + }; + return Person; +}()); +function PersonMixin(Base) { + return (function (_super) { + __extends(class_4, _super); + function class_4() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return _super.apply(this, args) || this; + } + class_4.prototype.myProtectedFunction = function () { + _super.prototype.myProtectedFunction.call(this); + // do more things + }; + return class_4; + }(Base)); +} +var Customer = (function (_super) { + __extends(Customer, _super); + function Customer() { + return _super !== null && _super.apply(this, arguments) || this; + } + Customer.prototype.f = function () { + }; + return Customer; +}(PersonMixin(Person))); From 3480fcc69a890c8aebb3f455436f8892a644bf07 Mon Sep 17 00:00:00 2001 From: Jason Ramsay Date: Thu, 9 Feb 2017 17:06:47 -0800 Subject: [PATCH 089/116] Always set allowNonTsExtensions for allowJs --- .../unittests/tsserverProjectSystem.ts | 109 ++++++++++++++++++ src/server/project.ts | 4 +- 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts index e6f4abde38223..bb06e46cff691 100644 --- a/src/harness/unittests/tsserverProjectSystem.ts +++ b/src/harness/unittests/tsserverProjectSystem.ts @@ -1650,6 +1650,115 @@ namespace ts.projectSystem { assert(completions && completions.entries[0].name !== "hello", `unexpected hello entry in completion list`); }); + it("no tsconfig script block diagnostic errors", () => { + + // #1. Ensure no diagnostic errors when allowJs is true + const file1 = { + path: "/a/b/f1.ts", + content: ` ` + }; + const file2 = { + path: "/a/b/f2.html", + content: `var hello = "hello";` + }; + const config1 = { + path: "/a/b/tsconfig.json", + content: JSON.stringify({ compilerOptions: { allowJs: true } }) + }; + + let host = createServerHost([file1, file2, config1, libFile], { executingFilePath: combinePaths(getDirectoryPath(libFile.path), "tsc.js") }); + let session = createSession(host); + + // Specify .html extension as mixed content in a configure host request + const extraFileExtensions = [{ extension: ".html", scriptKind: ScriptKind.JS, isMixedContent: true }]; + const configureHostRequest = makeSessionRequest(CommandNames.Configure, { extraFileExtensions }); + session.executeCommand(configureHostRequest).response; + + openFilesForSession([file1], session); + let projectService = session.getProjectService(); + + checkNumberOfProjects(projectService, { configuredProjects: 1 }); + + let diagnostics = projectService.configuredProjects[0].getLanguageService().getCompilerOptionsDiagnostics(); + assert.deepEqual(diagnostics, []); + + // #2. Ensure no errors when allowJs is false + const config2 = { + path: "/a/b/tsconfig.json", + content: JSON.stringify({ compilerOptions: { allowJs: false } }) + }; + + host = createServerHost([file1, file2, config2, libFile], { executingFilePath: combinePaths(getDirectoryPath(libFile.path), "tsc.js") }); + session = createSession(host); + + session.executeCommand(configureHostRequest).response; + + openFilesForSession([file1], session); + projectService = session.getProjectService(); + + checkNumberOfProjects(projectService, { configuredProjects: 1 }); + + diagnostics = projectService.configuredProjects[0].getLanguageService().getCompilerOptionsDiagnostics(); + assert.deepEqual(diagnostics, []); + + // #3. Ensure no errors when compiler options aren't specified + const config3 = { + path: "/a/b/tsconfig.json", + content: JSON.stringify({ }) + }; + + host = createServerHost([file1, file2, config3, libFile], { executingFilePath: combinePaths(getDirectoryPath(libFile.path), "tsc.js") }); + session = createSession(host); + + session.executeCommand(configureHostRequest).response; + + openFilesForSession([file1], session); + projectService = session.getProjectService(); + + checkNumberOfProjects(projectService, { configuredProjects: 1 }); + + diagnostics = projectService.configuredProjects[0].getLanguageService().getCompilerOptionsDiagnostics(); + assert.deepEqual(diagnostics, []); + + // #4. Ensure no errors when files are explicitly specified in tsconfig + const config4 = { + path: "/a/b/tsconfig.json", + content: JSON.stringify({ compilerOptions: { allowJs: true }, files: [file1.path, file2.path] }) + }; + + host = createServerHost([file1, file2, config4, libFile], { executingFilePath: combinePaths(getDirectoryPath(libFile.path), "tsc.js") }); + session = createSession(host); + + session.executeCommand(configureHostRequest).response; + + openFilesForSession([file1], session); + projectService = session.getProjectService(); + + checkNumberOfProjects(projectService, { configuredProjects: 1 }); + + diagnostics = projectService.configuredProjects[0].getLanguageService().getCompilerOptionsDiagnostics(); + assert.deepEqual(diagnostics, []); + + // #4. Ensure no errors when files are explicitly excluded in tsconfig + const config5 = { + path: "/a/b/tsconfig.json", + content: JSON.stringify({ compilerOptions: { allowJs: true }, exclude: [file2.path] }) + }; + + host = createServerHost([file1, file2, config5, libFile], { executingFilePath: combinePaths(getDirectoryPath(libFile.path), "tsc.js") }); + session = createSession(host); + + session.executeCommand(configureHostRequest).response; + + openFilesForSession([file1], session); + projectService = session.getProjectService(); + + checkNumberOfProjects(projectService, { configuredProjects: 1 }); + + diagnostics = projectService.configuredProjects[0].getLanguageService().getCompilerOptionsDiagnostics(); + assert.deepEqual(diagnostics, []); + }); + it("project structure update is deferred if files are not added\removed", () => { const file1 = { path: "/a/b/f1.ts", diff --git a/src/server/project.ts b/src/server/project.ts index 6042fd9a62be6..f10ccfab02037 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -165,8 +165,8 @@ namespace ts.server { this.compilerOptions.allowNonTsExtensions = true; this.compilerOptions.allowJs = true; } - else if (hasExplicitListOfFiles) { - // If files are listed explicitly, allow all extensions + else if (hasExplicitListOfFiles || this.compilerOptions.allowJs) { + // If files are listed explicitly or allowJs is specified, allow all extensions this.compilerOptions.allowNonTsExtensions = true; } From 15935ec48e16b80577b59d2fcb68ce885dc70a1c Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 10 Feb 2017 12:46:32 -0800 Subject: [PATCH 090/116] Emit "__esModule" before other statments --- src/compiler/transformers/module/module.ts | 17 +- .../baselines/reference/APISample_compile.js | 2 +- tests/baselines/reference/APISample_linter.js | 2 +- .../reference/APISample_parseConfig.js | 2 +- .../reference/APISample_transform.js | 2 +- .../baselines/reference/APISample_watcher.js | 2 +- tests/baselines/reference/aliasAssignments.js | 4 +- .../reference/aliasOnMergedModuleInterface.js | 2 +- .../reference/aliasUsageInAccessorsOfClass.js | 6 +- .../baselines/reference/aliasUsageInArray.js | 6 +- .../aliasUsageInFunctionExpression.js | 6 +- .../reference/aliasUsageInGenericFunction.js | 6 +- .../reference/aliasUsageInIndexerOfClass.js | 6 +- .../reference/aliasUsageInObjectLiteral.js | 6 +- .../reference/aliasUsageInOrExpression.js | 6 +- ...aliasUsageInTypeArgumentOfExtendsClause.js | 6 +- .../reference/aliasUsageInVarAssignment.js | 6 +- .../reference/aliasUsedAsNameValue.js | 4 +- ...aceExportAssignmentUsedInVarInitializer.js | 2 +- .../allowSyntheticDefaultImports1.js | 4 +- .../allowSyntheticDefaultImports10.js | 2 +- .../allowSyntheticDefaultImports4.js | 2 +- .../allowSyntheticDefaultImports9.js | 2 +- .../reference/alwaysStrictModule4.js | 2 +- .../reference/alwaysStrictModule6.js | 2 +- .../reference/ambientDeclarationsExternal.js | 2 +- .../reference/ambientDeclarationsPatterns.js | 2 +- .../reference/ambientExternalModuleMerging.js | 2 +- ...rnalModuleWithInternalImportDeclaration.js | 2 +- ...lModuleWithoutInternalImportDeclaration.js | 2 +- tests/baselines/reference/ambientShorthand.js | 2 +- .../reference/ambientShorthand_reExport.js | 6 +- .../reference/amdDependencyComment1.js | 2 +- .../reference/amdDependencyComment2.js | 2 +- .../reference/amdDependencyCommentName1.js | 2 +- .../reference/amdDependencyCommentName2.js | 2 +- .../reference/amdDependencyCommentName3.js | 2 +- .../reference/amdDependencyCommentName4.js | 2 +- .../reference/amdImportAsPrimaryExpression.js | 4 +- .../amdImportNotAsPrimaryExpression.js | 4 +- .../reference/anonymousDefaultExportsAmd.js | 4 +- .../anonymousDefaultExportsCommonjs.js | 4 +- .../reference/anonymousDefaultExportsUmd.js | 4 +- tests/baselines/reference/asOperator4.js | 4 +- .../asyncAwaitIsolatedModules_es5.js | 2 +- .../reference/asyncImportedPromise_es5.js | 4 +- .../reference/asyncImportedPromise_es6.js | 4 +- .../reference/augmentExportEquals1.js | 2 +- .../reference/augmentExportEquals1_1.js | 2 +- .../reference/augmentExportEquals2.js | 2 +- .../reference/augmentExportEquals2_1.js | 2 +- .../reference/augmentExportEquals3.js | 4 +- .../reference/augmentExportEquals3_1.js | 4 +- .../reference/augmentExportEquals4.js | 4 +- .../reference/augmentExportEquals4_1.js | 4 +- .../reference/augmentExportEquals5.js | 2 +- .../reference/augmentExportEquals6.js | 4 +- .../reference/augmentExportEquals6_1.js | 2 +- .../augmentedTypesExternalModule1.js | 2 +- tests/baselines/reference/cacheResolutions.js | 6 +- .../baselines/reference/chainedImportAlias.js | 4 +- .../baselines/reference/circularReference.js | 4 +- .../reference/circularReferenceInImport.js | 2 +- .../reference/classAbstractManyKeywords.js | 2 +- .../reference/classExtendsAcrossFiles.js | 4 +- ...classMemberInitializerWithLamdaScoping3.js | 2 +- ...classMemberInitializerWithLamdaScoping4.js | 2 +- .../collisionExportsRequireAndAlias.js | 6 +- .../collisionExportsRequireAndAmbientClass.js | 2 +- .../collisionExportsRequireAndAmbientEnum.js | 2 +- ...llisionExportsRequireAndAmbientFunction.js | 2 +- ...collisionExportsRequireAndAmbientModule.js | 2 +- .../collisionExportsRequireAndAmbientVar.js | 2 +- .../collisionExportsRequireAndClass.js | 2 +- .../collisionExportsRequireAndEnum.js | 2 +- .../collisionExportsRequireAndFunction.js | 2 +- ...ionExportsRequireAndInternalModuleAlias.js | 2 +- .../collisionExportsRequireAndModule.js | 2 +- ...onExportsRequireAndUninstantiatedModule.js | 2 +- .../collisionExportsRequireAndVar.js | 2 +- .../commentOnExportEnumDeclaration.js | 2 +- .../reference/commentsDottedModuleName.js | 2 +- .../reference/commentsExternalModules.js | 4 +- .../reference/commentsExternalModules2.js | 4 +- .../reference/commentsExternalModules3.js | 4 +- .../reference/commentsMultiModuleMultiFile.js | 4 +- .../reference/commentsOnRequireStatement.js | 6 +- .../commonJSImportAsPrimaryExpression.js | 4 +- .../commonJSImportNotAsPrimaryExpression.js | 4 +- tests/baselines/reference/commonSourceDir5.js | 6 +- tests/baselines/reference/commonSourceDir6.js | 6 +- .../reference/commonSourceDirectory.js | 2 +- .../reference/commonSourceDirectory.js.map | 2 +- .../commonSourceDirectory.sourcemap.txt | 26 +- .../reference/commonSourceDirectory_dts.js | 2 +- .../commonSourceDirectory_dts.js.map | 2 +- .../commonSourceDirectory_dts.sourcemap.txt | 20 +- .../baselines/reference/commonjsSafeImport.js | 4 +- .../reference/complexNarrowingWithAny.js | 2 +- .../reference/constDeclarations-access5.js | 4 +- .../reference/constEnumExternalModule.js | 2 +- .../controlFlowBinaryOrExpression.js | 2 +- .../controlFlowPropertyDeclarations.js | 2 +- .../controlFlowSelfReferentialLoop.js | 2 +- .../reference/copyrightWithNewLine1.js | 2 +- .../reference/copyrightWithoutNewLine1.js | 2 +- .../crashIntypeCheckInvocationExpression.js | 2 +- ...rashIntypeCheckObjectCreationExpression.js | 2 +- .../baselines/reference/declFileAccessors.js | 2 +- .../declFileAliasUseBeforeDeclaration.js | 4 +- ...assWithStaticMethodReturningConstructor.js | 2 +- .../reference/declFileConstructors.js | 2 +- ...lFileExportAssignmentOfGenericInterface.js | 2 +- .../reference/declFileExportImportChain.js | 4 +- .../reference/declFileExportImportChain2.js | 2 +- .../reference/declFileForExportedImport.js | 2 +- .../baselines/reference/declFileFunctions.js | 2 +- .../reference/declFileGenericType.js | 2 +- ...eclFileImportModuleWithExportAssignment.js | 2 +- tests/baselines/reference/declFileMethods.js | 2 +- .../declarationEmitClassMemberNameConflict.js | 2 +- .../declarationEmitExportAssignment.js | 2 +- .../declarationEmitExportDeclaration.js | 4 +- .../declarationEmitExpressionInExtends3.js | 2 +- .../declarationEmitIdentifierPredicates01.js | 2 +- ...itIdentifierPredicatesWithPrivateName01.js | 2 +- ...declarationEmitInferedDefaultExportType.js | 2 +- .../declarationEmitInferedTypeAlias1.js | 4 +- .../declarationEmitInferedTypeAlias2.js | 4 +- .../declarationEmitInferedTypeAlias3.js | 4 +- .../declarationEmitInferedTypeAlias5.js | 4 +- .../declarationEmitInferedTypeAlias6.js | 4 +- .../declarationEmitInferedTypeAlias7.js | 4 +- .../declarationEmitInferedTypeAlias9.js | 2 +- .../reference/declarationEmitInvalidExport.js | 2 +- .../reference/declarationEmitNameConflicts.js | 2 +- .../declarationEmitNameConflictsWithAlias.js | 2 +- .../reference/declarationEmitPromise.js | 2 +- .../declarationEmitThisPredicates01.js | 2 +- .../declarationEmitThisPredicates02.js | 2 +- ...tionEmitThisPredicatesWithPrivateName01.js | 2 +- ...tionEmitThisPredicatesWithPrivateName02.js | 2 +- ...arationEmitTypeAliasWithTypeParameters1.js | 2 +- ...arationEmitTypeAliasWithTypeParameters2.js | 2 +- ...arationEmitTypeAliasWithTypeParameters5.js | 2 +- .../reference/declarationEmitUnknownImport.js | 2 +- .../declarationEmitUnknownImport2.js | 2 +- .../reference/declarationMerging2.js | 2 +- .../decoratedClassExportsCommonJS1.js | 2 +- .../decoratedClassExportsCommonJS2.js | 2 +- .../decoratedDefaultExportsGetExportedAmd.js | 4 +- ...oratedDefaultExportsGetExportedCommonjs.js | 4 +- .../decoratedDefaultExportsGetExportedUmd.js | 4 +- ...ratorInstantiateModulesInFunctionBodies.js | 4 +- .../baselines/reference/decoratorMetadata.js | 4 +- .../decoratorMetadataOnInferredType.js | 2 +- ...orMetadataRestParameterWithImportedType.js | 8 +- .../decoratorMetadataWithConstructorType.js | 2 +- ...adataWithImportDeclarationNameCollision.js | 4 +- ...dataWithImportDeclarationNameCollision2.js | 4 +- ...dataWithImportDeclarationNameCollision3.js | 4 +- ...dataWithImportDeclarationNameCollision4.js | 4 +- ...dataWithImportDeclarationNameCollision5.js | 4 +- ...dataWithImportDeclarationNameCollision6.js | 4 +- ...dataWithImportDeclarationNameCollision7.js | 4 +- ...dataWithImportDeclarationNameCollision8.js | 4 +- .../baselines/reference/decoratorOnClass2.js | 2 +- .../reference/decoratorOnClassConstructor2.js | 4 +- .../reference/decoratorOnClassConstructor3.js | 4 +- .../defaultExportInAwaitExpression01.js | 4 +- .../defaultExportInAwaitExpression02.js | 4 +- .../reference/defaultExportWithOverloads01.js | 2 +- .../reference/defaultExportsCannotMerge01.js | 4 +- .../reference/defaultExportsCannotMerge02.js | 4 +- .../reference/defaultExportsCannotMerge03.js | 4 +- .../reference/defaultExportsCannotMerge04.js | 2 +- .../reference/defaultExportsGetExportedAmd.js | 4 +- .../defaultExportsGetExportedCommonjs.js | 4 +- .../reference/defaultExportsGetExportedUmd.js | 4 +- .../reference/dependencyViaImportAlias.js | 2 +- .../destructuringInVariableDeclarations1.js | 2 +- .../destructuringInVariableDeclarations2.js | 2 +- .../destructuringInVariableDeclarations3.js | 2 +- .../destructuringInVariableDeclarations4.js | 2 +- .../destructuringInVariableDeclarations5.js | 2 +- .../destructuringInVariableDeclarations6.js | 2 +- .../reference/downlevelLetConst13.js | 2 +- .../reference/duplicateLocalVariable1.js | 2 +- .../reference/duplicateLocalVariable2.js | 2 +- .../duplicateSymbolsExportMatching.js | 2 +- .../reference/dynamicModuleTypecheckError.js | 2 +- .../baselines/reference/elidingImportNames.js | 6 +- tests/baselines/reference/emptyModuleName.js | 2 +- .../reference/enumFromExternalModule.js | 4 +- .../reference/errorsOnImportedSymbol.js | 2 +- .../reference/es3defaultAliasIsQuoted.js | 4 +- tests/baselines/reference/es5-commonjs.js | 2 +- tests/baselines/reference/es5-commonjs2.js | 2 +- tests/baselines/reference/es5-commonjs3.js | 2 +- tests/baselines/reference/es5-commonjs4.js | 2 +- tests/baselines/reference/es5-commonjs5.js | 2 +- tests/baselines/reference/es5-commonjs6.js | 2 +- .../es5-importHelpersAsyncFunctions.js | 2 +- tests/baselines/reference/es5-umd2.js | 2 +- tests/baselines/reference/es5-umd3.js | 2 +- .../es5ExportDefaultClassDeclaration.js | 2 +- .../es5ExportDefaultClassDeclaration2.js | 2 +- .../es5ExportDefaultClassDeclaration3.js | 2 +- .../reference/es5ExportDefaultExpression.js | 2 +- .../es5ExportDefaultFunctionDeclaration.js | 2 +- .../es5ExportDefaultFunctionDeclaration2.js | 2 +- .../es5ExportDefaultFunctionDeclaration3.js | 2 +- .../reference/es5ExportDefaultIdentifier.js | 2 +- .../es5ModuleInternalNamedImports.js | 2 +- .../reference/es5ModuleWithModuleGenAmd.js | 2 +- .../es5ModuleWithModuleGenCommonjs.js | 2 +- .../es5ModuleWithoutModuleGenTarget.js | 2 +- tests/baselines/reference/es6-umd2.js | 2 +- .../baselines/reference/es6ExportAllInEs5.js | 4 +- .../reference/es6ExportClauseInEs5.js | 2 +- .../es6ExportClauseWithAssignmentInEs5.js | 2 +- ...ExportClauseWithoutModuleSpecifierInEs5.js | 4 +- .../reference/es6ExportEqualsInterop.js | 2 +- .../reference/es6ImportDefaultBindingAmd.js | 4 +- .../reference/es6ImportDefaultBindingDts.js | 4 +- ...rtDefaultBindingFollowedWithNamedImport.js | 4 +- ...ultBindingFollowedWithNamedImport1InEs5.js | 4 +- ...ndingFollowedWithNamedImport1WithExport.js | 4 +- ...efaultBindingFollowedWithNamedImportDts.js | 4 +- ...faultBindingFollowedWithNamedImportDts1.js | 4 +- ...aultBindingFollowedWithNamedImportInEs5.js | 4 +- ...indingFollowedWithNamedImportWithExport.js | 4 +- ...ndingFollowedWithNamespaceBinding1InEs5.js | 4 +- ...FollowedWithNamespaceBinding1WithExport.js | 4 +- ...tBindingFollowedWithNamespaceBindingDts.js | 4 +- ...BindingFollowedWithNamespaceBindingDts1.js | 4 +- ...indingFollowedWithNamespaceBindingInEs5.js | 4 +- ...gFollowedWithNamespaceBindingWithExport.js | 4 +- .../es6ImportDefaultBindingMergeErrors.js | 4 +- ...s6ImportDefaultBindingNoDefaultProperty.js | 2 +- .../es6ImportDefaultBindingWithExport.js | 4 +- .../reference/es6ImportNameSpaceImport.js | 4 +- .../reference/es6ImportNameSpaceImportAmd.js | 4 +- .../reference/es6ImportNameSpaceImportDts.js | 4 +- .../es6ImportNameSpaceImportInEs5.js | 4 +- .../es6ImportNameSpaceImportMergeErrors.js | 4 +- .../es6ImportNameSpaceImportWithExport.js | 4 +- .../reference/es6ImportNamedImport.js | 4 +- .../reference/es6ImportNamedImportAmd.js | 4 +- .../reference/es6ImportNamedImportDts.js | 4 +- .../reference/es6ImportNamedImportInEs5.js | 4 +- .../es6ImportNamedImportInExportAssignment.js | 2 +- ...rtNamedImportInIndirectExportAssignment.js | 2 +- .../es6ImportNamedImportMergeErrors.js | 4 +- .../es6ImportNamedImportNoExportMember.js | 2 +- .../es6ImportNamedImportWithExport.js | 4 +- .../es6ImportNamedImportWithTypesAndValues.js | 4 +- .../es6ImportWithoutFromClauseAmd.js | 6 +- .../es6ImportWithoutFromClauseInEs5.js | 4 +- .../es6ImportWithoutFromClauseWithExport.js | 4 +- .../es6ModuleWithModuleGenTargetAmd.js | 2 +- .../es6ModuleWithModuleGenTargetCommonjs.js | 2 +- .../reference/exportAndImport-es3-amd.js | 4 +- .../reference/exportAndImport-es3.js | 4 +- .../reference/exportAndImport-es5-amd.js | 4 +- .../reference/exportAndImport-es5.js | 4 +- .../reference/exportArrayBindingPattern.js | 2 +- .../reference/exportAssignClassAndModule.js | 2 +- .../reference/exportAssignDottedName.js | 2 +- .../exportAssignImportedIdentifier.js | 4 +- .../baselines/reference/exportAssignTypes.js | 2 +- .../exportAssignedTypeAsTypeAnnotation.js | 2 +- .../reference/exportAssignmentClass.js | 2 +- .../exportAssignmentConstrainedGenericType.js | 2 +- .../reference/exportAssignmentEnum.js | 2 +- .../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 +- ...ationWithModuleSpecifierNameOnNextLine1.js | 8 +- .../reference/exportDeclareClass1.js | 2 +- .../reference/exportDeclaredModule.js | 2 +- .../reference/exportDefaultProperty.js | 6 +- .../reference/exportDefaultProperty2.js | 4 +- .../reference/exportEqualCallable.js | 2 +- .../reference/exportEqualErrorType.js | 2 +- .../reference/exportEqualMemberMissing.js | 2 +- .../reference/exportEqualsDefaultProperty.js | 2 +- .../reference/exportEqualsProperty.js | 2 +- .../reference/exportEqualsProperty2.js | 2 +- tests/baselines/reference/exportImport.js | 4 +- .../reference/exportImportMultipleFiles.js | 6 +- .../exportImportNonInstantiatedModule2.js | 2 +- .../exportNonInitializedVariablesAMD.js | 2 +- .../exportNonInitializedVariablesCommonJS.js | 2 +- .../exportNonInitializedVariablesUMD.js | 2 +- .../exportRedeclarationTypeAliases.js | 2 +- .../reference/exportSameNameFuncVar.js | 2 +- .../reference/exportSpecifierForAGlobal.js | 2 +- tests/baselines/reference/exportStar-amd.js | 10 +- tests/baselines/reference/exportStar.js | 10 +- .../reference/exportStarForValues.js | 2 +- .../reference/exportStarForValues2.js | 4 +- .../reference/exportStarForValues3.js | 8 +- .../reference/exportStarForValues4.js | 4 +- .../reference/exportStarForValues7.js | 4 +- .../reference/exportStarForValues8.js | 8 +- .../reference/exportStarForValues9.js | 4 +- .../reference/exportStarFromEmptyModule.js | 6 +- tests/baselines/reference/exportToString.js | 2 +- tests/baselines/reference/exportVisibility.js | 2 +- .../exportedBlockScopedDeclarations.js | 2 +- .../baselines/reference/exportedVariable1.js | 2 +- .../exportingContainingVisibleType.js | 2 +- .../reference/exportsAndImports1-amd.js | 6 +- .../reference/exportsAndImports1-es6.js | 6 +- .../baselines/reference/exportsAndImports1.js | 6 +- .../reference/exportsAndImports2-amd.js | 6 +- .../reference/exportsAndImports2-es6.js | 6 +- .../baselines/reference/exportsAndImports2.js | 6 +- .../reference/exportsAndImports3-amd.js | 6 +- .../reference/exportsAndImports3-es6.js | 6 +- .../baselines/reference/exportsAndImports3.js | 6 +- .../reference/exportsAndImports4-amd.js | 4 +- .../reference/exportsAndImports4-es6.js | 4 +- .../baselines/reference/exportsAndImports4.js | 4 +- ...sAndImportsWithContextualKeywordNames01.js | 2 +- ...sAndImportsWithContextualKeywordNames02.js | 4 +- .../exportsAndImportsWithUnderscores1.js | 4 +- .../exportsAndImportsWithUnderscores2.js | 4 +- .../exportsAndImportsWithUnderscores3.js | 4 +- .../exportsAndImportsWithUnderscores4.js | 4 +- .../extendClassExpressionFromModule.js | 2 +- ...xtendingClassFromAliasAndUsageInIndexer.js | 8 +- .../reference/externalModuleAssignToVar.js | 4 +- .../externalModuleExportingGenericClass.js | 2 +- .../externalModuleImmutableBindings.js | 4 +- .../reference/externalModuleQualification.js | 2 +- ...ceOfImportDeclarationWithExportModifier.js | 4 +- ...ernceResolutionOrderInImportDeclaration.js | 4 +- .../reference/externalModuleResolution.js | 2 +- .../reference/externalModuleResolution2.js | 2 +- .../reference/fieldAndGetterWithSameName.js | 2 +- ...ilesEmittingIntoSameOutputWithOutOption.js | 2 +- .../functionAndImportNameConflict.js | 4 +- .../functionLikeInParameterInitializer.js | 2 +- .../reference/generatorES6InAMDModule.js | 2 +- .../reference/genericClassesInModule2.js | 2 +- .../genericInterfaceFunctionTypeParameter.js | 2 +- .../reference/genericMemberFunction.js | 2 +- .../reference/genericReturnTypeFromGetter1.js | 2 +- .../genericTypeWithMultipleBases1.js | 2 +- .../genericTypeWithMultipleBases2.js | 2 +- .../genericWithIndexerOfTypeParameterType2.js | 2 +- ...getEmitOutputWithDeclarationFile2.baseline | 2 +- .../getEmitOutputWithEmitterErrors2.baseline | 2 +- tests/baselines/reference/giant.js | 2 +- ...sAnExternalModuleInsideAnInternalModule.js | 4 +- .../baselines/reference/importAsBaseClass.js | 4 +- tests/baselines/reference/importDecl.js | 12 +- .../reference/importDeclWithClassModifiers.js | 2 +- .../importDeclWithDeclareModifier.js | 2 +- .../reference/importDeclWithExportModifier.js | 2 +- ...clWithExportModifierAndExportAssignment.js | 2 +- .../importDeclarationUsedAsTypeQuery.js | 2 +- tests/baselines/reference/importHelpers.js | 2 +- tests/baselines/reference/importHelpersAmd.js | 4 +- .../importHelpersInIsolatedModules.js | 4 +- .../baselines/reference/importHelpersInTsx.js | 2 +- .../reference/importHelpersNoHelpers.js | 2 +- .../reference/importHelpersNoModule.js | 2 +- .../reference/importHelpersOutFile.js | 6 +- .../reference/importImportOnlyModule.js | 6 +- .../baselines/reference/importInsideModule.js | 2 +- .../reference/importNonExternalModule.js | 2 +- .../reference/importNonStringLiteral.js | 2 +- .../baselines/reference/importTsBeforeDTs.js | 4 +- .../reference/importUsedInExtendsList1.js | 4 +- .../reference/importWithTrailingSlash.js | 8 +- .../import_reference-exported-alias.js | 2 +- .../import_reference-to-type-alias.js | 4 +- ...-referenecing-aliased-type-throug-array.js | 2 +- ...ar-referencing-an-imported-module-alias.js | 4 +- .../importedAliasesInTypePositions.js | 4 +- .../reference/importedModuleClassNameClash.js | 2 +- .../reference/importsImplicitlyReadonly.js | 4 +- tests/baselines/reference/inferenceLimit.js | 2 +- .../reference/instanceOfInExternalModules.js | 4 +- .../reference/interfaceContextualType.js | 2 +- .../reference/interfaceDeclaration3.js | 2 +- .../reference/interfaceDeclaration5.js | 2 +- .../reference/interfaceImplementation6.js | 2 +- ...alAliasClassInsideLocalModuleWithExport.js | 2 +- ...liasClassInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...liasClassInsideTopLevelModuleWithExport.js | 2 +- ...sClassInsideTopLevelModuleWithoutExport.js | 2 +- ...nalAliasEnumInsideLocalModuleWithExport.js | 2 +- ...AliasEnumInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...AliasEnumInsideTopLevelModuleWithExport.js | 2 +- ...asEnumInsideTopLevelModuleWithoutExport.js | 2 +- ...liasFunctionInsideLocalModuleWithExport.js | 2 +- ...sFunctionInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...sFunctionInsideTopLevelModuleWithExport.js | 2 +- ...nctionInsideTopLevelModuleWithoutExport.js | 2 +- ...alizedModuleInsideLocalModuleWithExport.js | 2 +- ...zedModuleInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...zedModuleInsideTopLevelModuleWithExport.js | 2 +- ...ModuleInsideTopLevelModuleWithoutExport.js | 2 +- ...iasInterfaceInsideLocalModuleWithExport.js | 2 +- ...InterfaceInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...alizedModuleInsideLocalModuleWithExport.js | 2 +- ...zedModuleInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...zedModuleInsideTopLevelModuleWithExport.js | 2 +- ...ModuleInsideTopLevelModuleWithoutExport.js | 2 +- ...rnalAliasVarInsideLocalModuleWithExport.js | 2 +- ...lAliasVarInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...lAliasVarInsideTopLevelModuleWithExport.js | 2 +- ...iasVarInsideTopLevelModuleWithoutExport.js | 2 +- .../reference/intersectionTypeInference1.js | 2 +- .../isolatedModulesImportExportElision.js | 2 +- .../reference/isolatedModulesPlainFile-AMD.js | 2 +- .../isolatedModulesPlainFile-CommonJS.js | 2 +- .../reference/isolatedModulesPlainFile-UMD.js | 2 +- ...jsFileCompilationRestParamJsDocFunction.js | 2 +- .../reference/jsxEmitWithAttributes.js | 4 +- .../reference/jsxFactoryAndReactNamespace.js | 4 +- .../reference/jsxFactoryIdentifier.js | 4 +- .../reference/jsxFactoryIdentifier.js.map | 4 +- .../jsxFactoryIdentifier.sourcemap.txt | 248 +++++++++--------- .../jsxFactoryIdentifierAsParameter.js | 2 +- .../jsxFactoryIdentifierAsParameter.js.map | 2 +- ...FactoryIdentifierAsParameter.sourcemap.txt | 33 ++- ...jsxFactoryIdentifierWithAbsentParameter.js | 2 +- ...actoryIdentifierWithAbsentParameter.js.map | 2 +- ...dentifierWithAbsentParameter.sourcemap.txt | 29 +- .../jsxFactoryNotIdentifierOrQualifiedName.js | 4 +- ...jsxFactoryNotIdentifierOrQualifiedName2.js | 4 +- .../reference/jsxFactoryQualifiedName.js | 4 +- .../reference/jsxFactoryQualifiedName.js.map | 4 +- .../jsxFactoryQualifiedName.sourcemap.txt | 232 ++++++++-------- .../jsxFactoryQualifiedNameResolutionError.js | 2 +- ...FactoryQualifiedNameResolutionError.js.map | 2 +- ...QualifiedNameResolutionError.sourcemap.txt | 33 ++- .../jsxFactoryQualifiedNameWithEs5.js | 2 +- .../reference/jsxImportInAttribute.js | 2 +- tests/baselines/reference/jsxViaImport.2.js | 2 +- tests/baselines/reference/jsxViaImport.js | 2 +- .../reference/localAliasExportAssignment.js | 2 +- .../baselines/reference/mapOnTupleTypes01.js | 2 +- .../baselines/reference/mapOnTupleTypes02.js | 2 +- .../memberAccessMustUseModuleInstances.js | 4 +- .../reference/mergeWithImportedNamespace.js | 2 +- .../reference/mergeWithImportedType.js | 2 +- .../reference/mergedDeclarations6.js | 4 +- .../reference/mergedDeclarations7.js | 2 +- .../mergedModuleDeclarationCodeGen.js | 2 +- .../reference/metadataOfEventAlias.js | 4 +- .../missingFunctionImplementation.js | 2 +- .../missingSemicolonInModuleSpecifier.js | 4 +- .../moduleAliasAsFunctionArgument.js | 2 +- ...gmentationCollidingNamesInAugmentation1.js | 6 +- .../moduleAugmentationDeclarationEmit1.js | 6 +- .../moduleAugmentationDeclarationEmit2.js | 6 +- .../moduleAugmentationDisallowedExtensions.js | 10 +- .../moduleAugmentationExtendAmbientModule1.js | 4 +- .../moduleAugmentationExtendAmbientModule2.js | 4 +- .../moduleAugmentationExtendFileModule1.js | 6 +- .../moduleAugmentationExtendFileModule2.js | 6 +- .../reference/moduleAugmentationGlobal1.js | 4 +- .../reference/moduleAugmentationGlobal2.js | 4 +- .../reference/moduleAugmentationGlobal3.js | 4 +- .../reference/moduleAugmentationGlobal4.js | 2 +- .../reference/moduleAugmentationGlobal5.js | 2 +- .../moduleAugmentationImportsAndExports1.js | 8 +- .../moduleAugmentationImportsAndExports2.js | 8 +- .../moduleAugmentationImportsAndExports3.js | 8 +- .../moduleAugmentationImportsAndExports4.js | 8 +- .../moduleAugmentationImportsAndExports5.js | 8 +- .../moduleAugmentationImportsAndExports6.js | 8 +- .../moduleAugmentationInAmbientModule1.js | 2 +- .../moduleAugmentationInAmbientModule2.js | 2 +- .../moduleAugmentationInAmbientModule3.js | 2 +- .../moduleAugmentationInAmbientModule4.js | 2 +- .../moduleAugmentationInAmbientModule5.js | 2 +- .../moduleAugmentationInDependency.js | 2 +- .../moduleAugmentationInDependency2.js | 2 +- .../reference/moduleAugmentationNoNewNames.js | 4 +- .../moduleAugmentationsBundledOutput1.js | 10 +- .../reference/moduleAugmentationsImports1.js | 8 +- .../reference/moduleAugmentationsImports2.js | 10 +- .../reference/moduleAugmentationsImports3.js | 8 +- .../reference/moduleAugmentationsImports4.js | 6 +- .../baselines/reference/moduleCodeGenTest5.js | 2 +- .../baselines/reference/moduleCodegenTest4.js | 2 +- .../reference/moduleDuplicateIdentifiers.js | 2 +- tests/baselines/reference/moduleExports1.js | 2 +- .../moduleImportedForTypeArgumentPosition.js | 2 +- .../reference/moduleInTypePosition1.js | 4 +- .../reference/moduleMergeConstructor.js | 2 +- tests/baselines/reference/moduleNoneErrors.js | 2 +- .../baselines/reference/modulePrologueAMD.js | 2 +- .../reference/modulePrologueCommonjs.js | 2 +- .../baselines/reference/modulePrologueUmd.js | 2 +- .../reference/moduleResolutionNoResolve.js | 2 +- .../reference/moduleResolutionNoTs.js | 4 +- .../moduleResolutionWithExtensions.js | 2 +- ...moduleResolutionWithExtensions_preferTs.js | 2 +- ...duleResolutionWithExtensions_unexpected.js | 2 +- ...uleResolutionWithExtensions_unexpected2.js | 2 +- .../reference/moduleResolutionWithSymlinks.js | 6 +- ...ResolutionWithSymlinks_notInNodeModules.js | 6 +- ...moduleResolutionWithSymlinks_withOutDir.js | 6 +- ...duleSameValueDuplicateExportedBindings1.js | 6 +- ...duleSameValueDuplicateExportedBindings2.js | 6 +- tests/baselines/reference/moduleScoping.js | 4 +- .../baselines/reference/multiImportExport.js | 4 +- .../reference/multipleDefaultExports01.js | 4 +- .../reference/multipleDefaultExports02.js | 4 +- .../reference/multipleDefaultExports03.js | 2 +- .../reference/multipleDefaultExports04.js | 2 +- .../reference/multipleExportDefault1.js | 2 +- .../reference/multipleExportDefault2.js | 2 +- .../reference/multipleExportDefault3.js | 2 +- .../reference/multipleExportDefault4.js | 2 +- .../reference/multipleExportDefault5.js | 2 +- .../reference/multipleExportDefault6.js | 2 +- tests/baselines/reference/multipleExports.js | 2 +- .../reference/nameDelimitedBySlashes.js | 4 +- .../reference/nameWithFileExtension.js | 4 +- .../reference/nameWithRelativePaths.js | 8 +- .../reference/project/baseline/amd/decl.js | 2 +- .../reference/project/baseline/amd/emit.js | 2 +- .../reference/project/baseline/node/decl.js | 2 +- .../reference/project/baseline/node/emit.js | 2 +- .../reference/project/baseline2/amd/decl.js | 2 +- .../project/baseline2/amd/dont_emit.js | 2 +- .../reference/project/baseline2/node/decl.js | 2 +- .../project/baseline2/node/dont_emit.js | 2 +- .../project/baseline3/amd/nestedModule.js | 2 +- .../project/baseline3/node/nestedModule.js | 2 +- .../reference/project/declarationDir/amd/a.js | 2 +- .../project/declarationDir/amd/subfolder/b.js | 2 +- .../project/declarationDir/amd/subfolder/c.js | 2 +- .../project/declarationDir/node/a.js | 2 +- .../declarationDir/node/subfolder/b.js | 2 +- .../declarationDir/node/subfolder/c.js | 2 +- .../project/declarationDir2/amd/out/a.js | 2 +- .../declarationDir2/amd/out/subfolder/b.js | 2 +- .../declarationDir2/amd/out/subfolder/c.js | 2 +- .../project/declarationDir2/node/out/a.js | 2 +- .../declarationDir2/node/out/subfolder/b.js | 2 +- .../declarationDir2/node/out/subfolder/c.js | 2 +- .../project/declarationDir3/amd/out.js | 6 +- .../declarationsCascadingImports/amd/m4.js | 2 +- .../declarationsCascadingImports/node/m4.js | 2 +- .../declarationsGlobalImport/amd/glo_m4.js | 2 +- .../declarationsGlobalImport/amd/useModule.js | 2 +- .../declarationsGlobalImport/node/glo_m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/private_m4.js | 2 +- .../amd/useModule.js | 2 +- .../node/private_m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/fncOnly_m4.js | 2 +- .../amd/useModule.js | 2 +- .../node/fncOnly_m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/m4.js | 2 +- .../amd/m5.js | 2 +- .../amd/useModule.js | 2 +- .../node/m4.js | 2 +- .../node/m5.js | 2 +- .../node/useModule.js | 2 +- .../declarationsMultipleTimesImport/amd/m4.js | 2 +- .../amd/useModule.js | 2 +- .../node/m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/m4.js | 2 +- .../amd/m5.js | 2 +- .../amd/useModule.js | 2 +- .../node/m4.js | 2 +- .../node/m5.js | 2 +- .../node/useModule.js | 2 +- .../declarationsSimpleImport/amd/m4.js | 2 +- .../declarationsSimpleImport/amd/useModule.js | 2 +- .../declarationsSimpleImport/node/m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../emitDecoratorMetadataSystemJS/amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../maprootUrlModuleSimpleNoOutdir/amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../maprootUrlModuleSimpleNoOutdir/node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/importHigher/root.js | 2 +- .../node/importHigher/root.js | 2 +- .../amd/maxDepthExceeded/built/root.js | 2 +- .../node/maxDepthExceeded/built/root.js | 2 +- .../amd/maxDepthIncreased/root.js | 2 +- .../node/maxDepthIncreased/root.js | 2 +- .../project/nonRelative/amd/consume.js | 2 +- .../reference/project/nonRelative/amd/decl.js | 2 +- .../project/nonRelative/amd/lib/bar/a.js | 2 +- .../project/nonRelative/amd/lib/foo/a.js | 2 +- .../project/nonRelative/amd/lib/foo/b.js | 2 +- .../project/nonRelative/node/consume.js | 2 +- .../project/nonRelative/node/decl.js | 2 +- .../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.js | 2 +- .../outMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/diskFile0.js | 2 +- .../amd/ref/m1.js | 2 +- .../outModuleMultifolderNoOutdir/amd/test.js | 2 +- .../node/diskFile0.js | 2 +- .../node/ref/m1.js | 2 +- .../outModuleMultifolderNoOutdir/node/test.js | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../amd/bin/test.js | 6 +- .../project/outModuleSimpleNoOutdir/amd/m1.js | 2 +- .../outModuleSimpleNoOutdir/amd/test.js | 2 +- .../outModuleSimpleNoOutdir/node/m1.js | 2 +- .../outModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/bin/test.js | 4 +- .../outModuleSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../outModuleSubfolderNoOutdir/amd/test.js | 2 +- .../outModuleSubfolderNoOutdir/node/ref/m1.js | 2 +- .../outModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/bin/test.js | 4 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../sourcemapModuleSimpleNoOutdir/amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../sourcemapModuleSimpleNoOutdir/amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../sourcemapModuleSimpleNoOutdir/node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/fs.js | 2 +- .../node/fs.js | 2 +- ...ata when transpile with CommonJS option.js | 2 +- .../Does not generate semantic diagnostics.js | 2 +- ...enerates expected syntactic diagnostics.js | 2 +- .../transpile/Generates module output.js | 2 +- ...diagnostics for missing file references.js | 2 +- ...erates no diagnostics with valid inputs.js | 2 +- ...extra errors for file without extension.js | 2 +- .../transpile/Rename dependencies - AMD.js | 2 +- .../transpile/Rename dependencies - UMD.js | 2 +- .../Support options with lib values.js | 2 +- .../Support options with types values.js | 2 +- .../Supports backslashes in file name.js | 2 +- .../transpile/Supports setting allowJs.js | 2 +- ...ts setting allowSyntheticDefaultImports.js | 2 +- .../Supports setting allowUnreachableCode.js | 2 +- .../Supports setting allowUnusedLabels.js | 2 +- .../Supports setting alwaysStrict.js | 2 +- .../transpile/Supports setting baseUrl.js | 2 +- .../transpile/Supports setting charset.js | 2 +- .../transpile/Supports setting declaration.js | 2 +- .../Supports setting declarationDir.js | 2 +- .../transpile/Supports setting emitBOM.js | 2 +- .../Supports setting emitDecoratorMetadata.js | 2 +- ...Supports setting experimentalDecorators.js | 2 +- ...etting forceConsistentCasingInFileNames.js | 2 +- .../Supports setting isolatedModules.js | 2 +- .../transpile/Supports setting jsx.js | 2 +- .../transpile/Supports setting jsxFactory.js | 2 +- .../transpile/Supports setting lib.js | 2 +- .../transpile/Supports setting locale.js | 2 +- .../transpile/Supports setting module.js | 2 +- .../Supports setting moduleResolution.js | 2 +- .../transpile/Supports setting newLine.js | 2 +- .../transpile/Supports setting noEmit.js | 2 +- .../Supports setting noEmitHelpers.js | 2 +- .../Supports setting noEmitOnError.js | 2 +- .../Supports setting noErrorTruncation.js | 2 +- ...orts setting noFallthroughCasesInSwitch.js | 2 +- .../Supports setting noImplicitAny.js | 2 +- .../Supports setting noImplicitReturns.js | 2 +- .../Supports setting noImplicitThis.js | 2 +- .../Supports setting noImplicitUseStrict.js | 2 +- .../transpile/Supports setting noLib.js | 2 +- .../transpile/Supports setting noResolve.js | 2 +- .../transpile/Supports setting out.js | 2 +- .../transpile/Supports setting outDir.js | 2 +- .../transpile/Supports setting outFile.js | 2 +- .../transpile/Supports setting paths.js | 2 +- .../Supports setting preserveConstEnums.js | 2 +- .../Supports setting reactNamespace.js | 2 +- .../Supports setting removeComments.js | 2 +- .../transpile/Supports setting rootDir.js | 2 +- .../transpile/Supports setting rootDirs.js | 2 +- .../Supports setting skipDefaultLibCheck.js | 2 +- .../Supports setting skipLibCheck.js | 2 +- .../Supports setting strictNullChecks.js | 2 +- .../Supports setting stripInternal.js | 2 +- ...ts setting suppressExcessPropertyErrors.js | 2 +- ... setting suppressImplicitAnyIndexErrors.js | 2 +- .../transpile/Supports setting typeRoots.js | 2 +- .../transpile/Supports setting types.js | 2 +- .../transpile/Supports urls in file name.js | 2 +- ... with emit decorators and emit metadata.js | 2 +- .../Uses correct newLine character.js | 2 +- .../transpile/transpile .js files.js | 2 +- ...anspile file as tsx if jsx is specified.js | 2 +- tests/baselines/reference/withExportDecl.js | 2 +- tests/baselines/reference/withImportDecl.js | 4 +- 1328 files changed, 1987 insertions(+), 1989 deletions(-) diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index cdd3380b3b787..bf963bdc0e5c9 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -83,15 +83,16 @@ namespace ts { const statements: Statement[] = []; const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor); - append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true)); - addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset)); - addRange(statements, endLexicalEnvironment()); - addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); if (!currentModuleInfo.exportEquals) { append(statements, createUnderscoreUnderscoreESModule()); } + append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true)); + addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset)); + addRange(statements, endLexicalEnvironment()); + addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); + const updated = updateSourceFileNode(node, setTextRange(createNodeArray(statements), node.statements)); if (currentModuleInfo.hasExportStarsToExportValues) { addEmitHelper(updated, exportStarHelper); @@ -374,6 +375,10 @@ namespace ts { const statements: Statement[] = []; const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor); + if (!currentModuleInfo.exportEquals) { + append(statements, createUnderscoreUnderscoreESModule()); + } + // Visit each statement of the module body. append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true)); addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset)); @@ -385,10 +390,6 @@ namespace ts { // Append the 'export =' statement if provided. addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true); - if (!currentModuleInfo.exportEquals) { - append(statements, createUnderscoreUnderscoreESModule()); - } - const body = createBlock(statements, /*multiLine*/ true); if (currentModuleInfo.hasExportStarsToExportValues) { // If we have any `export * from ...` declarations diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 3738308298325..0315fd516b5bd 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -41,6 +41,7 @@ compile(process.argv.slice(2), { * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function compile(fileNames, options) { var program = ts.createProgram(fileNames, options); @@ -60,4 +61,3 @@ compile(process.argv.slice(2), { noEmitOnError: true, noImplicitAny: true, target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS }); -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index cc57b18496006..57ebd64c4e2bf 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -71,6 +71,7 @@ fileNames.forEach(fileName => { * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function delint(sourceFile) { delintNode(sourceFile); @@ -117,4 +118,3 @@ fileNames.forEach(function (fileName) { // delint it delint(sourceFile); }); -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js index d97acbdc14f0e..77f0a07c1dff8 100644 --- a/tests/baselines/reference/APISample_parseConfig.js +++ b/tests/baselines/reference/APISample_parseConfig.js @@ -43,6 +43,7 @@ export function createProgram(rootFiles: string[], compilerOptionsJson: string): * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function printError(error) { if (!error) { @@ -68,4 +69,3 @@ function createProgram(rootFiles, compilerOptionsJson) { return ts.createProgram(rootFiles, settings.options); } exports.createProgram = createProgram; -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 1156d6433543e..0716e59edb774 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -23,8 +23,8 @@ console.log(JSON.stringify(result)); * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); var source = "let x: string = 'string'"; var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS }); console.log(JSON.stringify(result)); -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index d877071a228f2..f4400ccda4cc0 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -116,6 +116,7 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS }); * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function watch(rootFileNames, options) { var files = {}; @@ -189,4 +190,3 @@ var currentDirectoryFiles = fs.readdirSync(process.cwd()). filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; }); // Start the watcher watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS }); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js index 84e20daa7c7f3..c21fe575e764f 100644 --- a/tests/baselines/reference/aliasAssignments.js +++ b/tests/baselines/reference/aliasAssignments.js @@ -15,18 +15,18 @@ y = moduleA; // should be error //// [aliasAssignments_moduleA.js] "use strict"; +exports.__esModule = true; var someClass = (function () { function someClass() { } return someClass; }()); exports.someClass = someClass; -exports.__esModule = true; //// [aliasAssignments_1.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasAssignments_moduleA"); var x = moduleA; x = 1; // Should be error var y = 1; y = moduleA; // should be error -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js index 8fbeaf78d9547..d3d312e53bb92 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.js +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js @@ -24,7 +24,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"; +exports.__esModule = true; 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 -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js index 03888704e70fa..883cbb84ee310 100644 --- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js +++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js @@ -29,13 +29,13 @@ class C2 { //// [aliasUsage1_backbone.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aliasUsage1_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -48,6 +48,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var Backbone = require("./aliasUsage1_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -57,9 +58,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aliasUsage1_main.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var moduleA = require("./aliasUsage1_moduleA"); var C2 = (function () { function C2() { @@ -76,4 +77,3 @@ var C2 = (function () { }); return C2; }()); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js index 5be50e00f30a5..1ccbc958aec35 100644 --- a/tests/baselines/reference/aliasUsageInArray.js +++ b/tests/baselines/reference/aliasUsageInArray.js @@ -23,13 +23,13 @@ var xs2: typeof moduleA[] = [moduleA]; //// [aliasUsageInArray_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInArray_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInArray_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -51,10 +52,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInArray_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInArray_moduleA"); var xs = [moduleA]; var xs2 = [moduleA]; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js index 0f15ecda6ac7c..de661ae803e30 100644 --- a/tests/baselines/reference/aliasUsageInFunctionExpression.js +++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js @@ -22,13 +22,13 @@ f = (x) => moduleA; //// [aliasUsageInFunctionExpression_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInFunctionExpression_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInFunctionExpression_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -50,10 +51,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInFunctionExpression_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInFunctionExpression_moduleA"); var f = function (x) { return x; }; f = function (x) { return moduleA; }; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js index 8c61ddeefb8c5..2ca49ea8dfc33 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.js +++ b/tests/baselines/reference/aliasUsageInGenericFunction.js @@ -26,13 +26,13 @@ var r2 = foo({ a: null }); //// [aliasUsageInGenericFunction_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInGenericFunction_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInGenericFunction_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -54,13 +55,12 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInGenericFunction_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInGenericFunction_moduleA"); function foo(x) { return x; } var r = foo({ a: moduleA }); var r2 = foo({ a: null }); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js index acd4dd1f533f5..81084b8b92fa6 100644 --- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js +++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js @@ -28,13 +28,13 @@ class N2 { //// [aliasUsageInIndexerOfClass_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInIndexerOfClass_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -47,6 +47,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInIndexerOfClass_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -56,9 +57,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInIndexerOfClass_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInIndexerOfClass_moduleA"); var N = (function () { function N() { @@ -71,4 +72,3 @@ var N2 = (function () { } return N2; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js index 10dcc50083c20..6f4adfae58c98 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.js +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js @@ -23,13 +23,13 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } }; //// [aliasUsageInObjectLiteral_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInObjectLiteral_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInObjectLiteral_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -51,11 +52,10 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInObjectLiteral_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInObjectLiteral_moduleA"); var a = { x: moduleA }; var b = { x: moduleA }; var c = { y: { z: moduleA } }; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js index 07dea7ea22da8..178ccaaee230d 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.js +++ b/tests/baselines/reference/aliasUsageInOrExpression.js @@ -26,13 +26,13 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x //// [aliasUsageInOrExpression_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInOrExpression_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInOrExpression_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -54,9 +55,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInOrExpression_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInOrExpression_moduleA"); var i; var d1 = i || moduleA; @@ -64,4 +65,3 @@ var d2 = i || moduleA; var d2 = moduleA || i; var e = null || { x: moduleA }; var f = null ? { x: moduleA } : null; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js index 509797bd2608b..5ac28396fba69 100644 --- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js +++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js @@ -26,13 +26,13 @@ class D extends C { //// [aliasUsageInTypeArgumentOfExtendsClause_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -54,7 +55,6 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInTypeArgumentOfExtendsClause_main.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -67,6 +67,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA"); var C = (function () { function C() { @@ -82,4 +83,3 @@ var D = (function (_super) { } return D; }(C)); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js index e5c7af13078fd..a85d61fd34cad 100644 --- a/tests/baselines/reference/aliasUsageInVarAssignment.js +++ b/tests/baselines/reference/aliasUsageInVarAssignment.js @@ -22,13 +22,13 @@ var m: typeof moduleA = i; //// [aliasUsageInVarAssignment_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInVarAssignment_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInVarAssignment_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -50,9 +51,8 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInVarAssignment_main.js] "use strict"; +exports.__esModule = true; var i; var m = i; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js index b86051d7b198e..168567eb80fac 100644 --- a/tests/baselines/reference/aliasUsedAsNameValue.js +++ b/tests/baselines/reference/aliasUsedAsNameValue.js @@ -23,11 +23,12 @@ export var a = function () { exports.__esModule = true; //// [aliasUsedAsNameValue_1.js] "use strict"; +exports.__esModule = true; function b(a) { return null; } exports.b = b; -exports.__esModule = true; //// [aliasUsedAsNameValue_2.js] "use strict"; +exports.__esModule = true; /// /// var mod = require("./aliasUsedAsNameValue_0"); @@ -36,4 +37,3 @@ exports.a = function () { //var x = mod.id; // TODO needed hack that mod is loaded b.b(mod); }; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js index 9cc8372a0bb69..58565bbb91648 100644 --- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js +++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js @@ -15,5 +15,5 @@ var d = b.q3; exports.__esModule = true; //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js] "use strict"; -var d = b.q3; exports.__esModule = true; +var d = b.q3; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js index dceecdd40014d..a659eb60151c3 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports1.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js @@ -12,15 +12,15 @@ export class Foo { //// [b.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; //// [a.js] "use strict"; +exports.__esModule = true; var b_1 = require("./b"); exports.x = new b_1["default"].Foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js index 09e80cc799f1f..ad3ed5715c08f 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports10.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports10.js @@ -12,7 +12,7 @@ Foo.default.default.foo(); //// [a.js] "use strict"; +exports.__esModule = true; var Foo = require("./b"); Foo["default"].bar(); Foo["default"]["default"].foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js index 69bfedadc4991..762c032b81287 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports4.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js @@ -13,6 +13,6 @@ export var x = new Foo(); //// [a.js] "use strict"; +exports.__esModule = true; var b_1 = require("./b"); exports.x = new b_1["default"](); -exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js index a455f0e757001..2d8ab463d83f7 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports9.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js @@ -12,7 +12,7 @@ Foo.foo(); //// [a.js] "use strict"; +exports.__esModule = true; var b_1 = require("./b"); b_1["default"].bar(); b_1["default"].foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js index 7ca68d8500028..dcaafdfeee6f6 100644 --- a/tests/baselines/reference/alwaysStrictModule4.js +++ b/tests/baselines/reference/alwaysStrictModule4.js @@ -5,6 +5,6 @@ export const a = 1 //// [alwaysStrictModule4.js] "use strict"; +exports.__esModule = true; // Module commonjs exports.a = 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js index 161e341ba7967..cd97b55b67bac 100644 --- a/tests/baselines/reference/alwaysStrictModule6.js +++ b/tests/baselines/reference/alwaysStrictModule6.js @@ -5,6 +5,6 @@ export const a = 1; //// [alwaysStrictModule6.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); // Targeting ES5 exports.a = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js index 7f8741d3baf4c..dfff030b78f47 100644 --- a/tests/baselines/reference/ambientDeclarationsExternal.js +++ b/tests/baselines/reference/ambientDeclarationsExternal.js @@ -28,8 +28,8 @@ var n: number; // Ambient external import declaration referencing ambient external module using top level module name //// [consumer.js] "use strict"; +exports.__esModule = true; // 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; var n; -exports.__esModule = true; diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js index fac34990e5e9b..84088d11d4eb4 100644 --- a/tests/baselines/reference/ambientDeclarationsPatterns.js +++ b/tests/baselines/reference/ambientDeclarationsPatterns.js @@ -34,6 +34,7 @@ foo(fileText); //// [user.js] "use strict"; +exports.__esModule = true; /// var foobarbaz_1 = require("foobarbaz"); foobarbaz_1.foo(foobarbaz_1.baz); @@ -42,4 +43,3 @@ foobarbaz_1.foo(foosball_1.foos); // Works with relative file name var file_text_1 = require("./file!text"); foobarbaz_1.foo(file_text_1["default"]); -exports.__esModule = true; diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js index 0dddb3a307c73..6c2de62c90a66 100644 --- a/tests/baselines/reference/ambientExternalModuleMerging.js +++ b/tests/baselines/reference/ambientExternalModuleMerging.js @@ -19,9 +19,9 @@ declare module "M" { //// [ambientExternalModuleMerging_use.js] define(["require", "exports", "M"], function (require, exports, M) { "use strict"; + exports.__esModule = true; // Should be strings var x = M.x; var y = M.y; - exports.__esModule = true; }); //// [ambientExternalModuleMerging_declare.js] diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js index 537c765a482c4..9efd9e4ada9fc 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js @@ -22,6 +22,6 @@ var c = new A(); //// [ambientExternalModuleWithInternalImportDeclaration_1.js] define(["require", "exports", "M"], function (require, exports, A) { "use strict"; - var c = new A(); exports.__esModule = true; + var c = new A(); }); diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js index 692c57073324f..98d3d46912aae 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js @@ -21,6 +21,6 @@ var c = new A(); //// [ambientExternalModuleWithoutInternalImportDeclaration_1.js] define(["require", "exports", "M"], function (require, exports, A) { "use strict"; - var c = new A(); exports.__esModule = true; + var c = new A(); }); diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js index 5dd15c8e0efd5..a7513e7eb585a 100644 --- a/tests/baselines/reference/ambientShorthand.js +++ b/tests/baselines/reference/ambientShorthand.js @@ -15,9 +15,9 @@ foo(bar, baz, boom); //// [user.js] "use strict"; +exports.__esModule = true; /// var jquery_1 = require("jquery"); var baz = require("fs"); var boom = require("jquery"); jquery_1["default"](jquery_1.bar, baz, boom); -exports.__esModule = true; diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js index 6818cca28d3d8..6842d0f75541f 100644 --- a/tests/baselines/reference/ambientShorthand_reExport.js +++ b/tests/baselines/reference/ambientShorthand_reExport.js @@ -18,20 +18,20 @@ x($); //// [reExportX.js] "use strict"; +exports.__esModule = true; var jquery_1 = require("jquery"); exports.x = jquery_1.x; -exports.__esModule = true; //// [reExportAll.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } -__export(require("jquery")); exports.__esModule = true; +__export(require("jquery")); //// [reExportUser.js] "use strict"; +exports.__esModule = true; var reExportX_1 = require("./reExportX"); var $ = require("./reExportAll"); // '$' is not callable, it is an object. reExportX_1.x($); -exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js index 1c5594ea7c309..6be26909f3ad0 100644 --- a/tests/baselines/reference/amdDependencyComment1.js +++ b/tests/baselines/reference/amdDependencyComment1.js @@ -7,6 +7,6 @@ m1.f(); //// [amdDependencyComment1.js] /// "use strict"; +exports.__esModule = true; var m1 = require("m2"); m1.f(); -exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js index db87e4e942205..222093cf15933 100644 --- a/tests/baselines/reference/amdDependencyComment2.js +++ b/tests/baselines/reference/amdDependencyComment2.js @@ -8,6 +8,6 @@ m1.f(); /// define(["require", "exports", "m2", "bar"], function (require, exports, m1) { "use strict"; - m1.f(); exports.__esModule = true; + m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js index e886d4b1579fb..d0e4d73fb7a23 100644 --- a/tests/baselines/reference/amdDependencyCommentName1.js +++ b/tests/baselines/reference/amdDependencyCommentName1.js @@ -7,6 +7,6 @@ m1.f(); //// [amdDependencyCommentName1.js] /// "use strict"; +exports.__esModule = true; var m1 = require("m2"); m1.f(); -exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js index bb2fc9a2389ac..c39902371a0cf 100644 --- a/tests/baselines/reference/amdDependencyCommentName2.js +++ b/tests/baselines/reference/amdDependencyCommentName2.js @@ -8,6 +8,6 @@ m1.f(); /// define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) { "use strict"; - m1.f(); exports.__esModule = true; + m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js index dafbe2463f96c..f842ad0cbf8c5 100644 --- a/tests/baselines/reference/amdDependencyCommentName3.js +++ b/tests/baselines/reference/amdDependencyCommentName3.js @@ -12,6 +12,6 @@ m1.f(); /// define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) { "use strict"; - m1.f(); exports.__esModule = true; + m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js index d82eab0d12f60..6542aa14fa299 100644 --- a/tests/baselines/reference/amdDependencyCommentName4.js +++ b/tests/baselines/reference/amdDependencyCommentName4.js @@ -27,9 +27,9 @@ 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"; + exports.__esModule = true; r1; aliasedModule2_1.p1; aliasedModule3_1["default"]; ns; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js index b127532206963..7819c0c7205fa 100644 --- a/tests/baselines/reference/amdImportAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js @@ -15,18 +15,18 @@ if(foo.E1.A === 0){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var E1; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); - exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.E1.A === 0) { } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index 7f75124dba78e..651ae7a6d3945 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -34,6 +34,7 @@ var e: number = 0; //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -48,15 +49,14 @@ define(["require", "exports"], function (require, exports) { E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); - exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var i; var x = {}; var y = false; var z; var e = 0; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js index a3b8b7cd98a80..24e833b7542ee 100644 --- a/tests/baselines/reference/anonymousDefaultExportsAmd.js +++ b/tests/baselines/reference/anonymousDefaultExportsAmd.js @@ -9,15 +9,15 @@ export default function() {} //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class default_1 { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js index dbfdfd0f420f8..e22000856d686 100644 --- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js +++ b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js @@ -8,12 +8,12 @@ export default function() {} //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class default_1 { } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js index a8984434c9cd7..484238b8722cf 100644 --- a/tests/baselines/reference/anonymousDefaultExportsUmd.js +++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js @@ -17,10 +17,10 @@ export default function() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class default_1 { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] (function (factory) { @@ -33,7 +33,7 @@ export default function() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js index b19fa3ca14c1e..3a43f328f3511 100644 --- a/tests/baselines/reference/asOperator4.js +++ b/tests/baselines/reference/asOperator4.js @@ -14,13 +14,13 @@ import { foo } from './foo'; //// [foo.js] "use strict"; +exports.__esModule = true; function foo() { } exports.foo = foo; -exports.__esModule = true; //// [bar.js] "use strict"; +exports.__esModule = true; var foo_1 = require("./foo"); // These should emit identically foo_1.foo; foo_1.foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js index 06b9fd1468252..bd05f90a26e38 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js @@ -77,6 +77,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { } }; var _this = this; +Object.defineProperty(exports, "__esModule", { value: true }); var missing_1 = require("missing"); function f0() { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { @@ -190,4 +191,3 @@ var M; } M.f1 = f1; })(M || (M = {})); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js index 25a771ffbfbb5..550f0d2357e82 100644 --- a/tests/baselines/reference/asyncImportedPromise_es5.js +++ b/tests/baselines/reference/asyncImportedPromise_es5.js @@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var Task = (function (_super) { __extends(Task, _super); function Task() { @@ -29,7 +30,6 @@ var Task = (function (_super) { return Task; }(Promise)); exports.Task = Task; -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -67,6 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; +Object.defineProperty(exports, "__esModule", { value: true }); var task_1 = require("./task"); var Test = (function () { function Test() { @@ -78,4 +79,3 @@ var Test = (function () { }; return Test; }()); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js index b3fa2c4b491ee..6b84f5615b3fd 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.js +++ b/tests/baselines/reference/asyncImportedPromise_es6.js @@ -11,10 +11,10 @@ class Test { //// [task.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class Task extends Promise { } exports.Task = Task; -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -25,9 +25,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); class Test { example() { return __awaiter(this, void 0, void 0, function* () { return; }); } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js index ef176ac90daa3..7b0bfcf73353c 100644 --- a/tests/baselines/reference/augmentExportEquals1.js +++ b/tests/baselines/reference/augmentExportEquals1.js @@ -33,6 +33,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "./file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js index 1e094701f79d0..51bc67e7fa4d6 100644 --- a/tests/baselines/reference/augmentExportEquals1_1.js +++ b/tests/baselines/reference/augmentExportEquals1_1.js @@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js index fe55906b65787..efdce1bc0cf21 100644 --- a/tests/baselines/reference/augmentExportEquals2.js +++ b/tests/baselines/reference/augmentExportEquals2.js @@ -32,6 +32,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "./file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js index 5b80ef1d5123c..322ab3b36bf1a 100644 --- a/tests/baselines/reference/augmentExportEquals2_1.js +++ b/tests/baselines/reference/augmentExportEquals2_1.js @@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js index 3e12c9968d22e..387ef86ff7921 100644 --- a/tests/baselines/reference/augmentExportEquals3.js +++ b/tests/baselines/reference/augmentExportEquals3.js @@ -36,13 +36,13 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js index 9fd08cb8f7f45..e91ca4498dd86 100644 --- a/tests/baselines/reference/augmentExportEquals3_1.js +++ b/tests/baselines/reference/augmentExportEquals3_1.js @@ -30,13 +30,13 @@ let b = x.b; //// [file2.js] define(["require", "exports", "file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "file1", "file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js index 1a83e86f3fcd0..37be30731de08 100644 --- a/tests/baselines/reference/augmentExportEquals4.js +++ b/tests/baselines/reference/augmentExportEquals4.js @@ -40,13 +40,13 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js index e039e7dcda642..71d39aedb1ff0 100644 --- a/tests/baselines/reference/augmentExportEquals4_1.js +++ b/tests/baselines/reference/augmentExportEquals4_1.js @@ -31,13 +31,13 @@ let b = x.b; //// [file2.js] define(["require", "exports", "file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "file1", "file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js index ee26ddda90e8a..7bc5102ca9d4c 100644 --- a/tests/baselines/reference/augmentExportEquals5.js +++ b/tests/baselines/reference/augmentExportEquals5.js @@ -90,7 +90,7 @@ define(["require", "exports"], function (require, exports) { //// [consumer.js] define(["require", "exports", "./augmentation"], function (require, exports) { "use strict"; + exports.__esModule = true; var x; var y = x.id; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js index 2db5bc66e3ca7..4299f8653dd84 100644 --- a/tests/baselines/reference/augmentExportEquals6.js +++ b/tests/baselines/reference/augmentExportEquals6.js @@ -52,14 +52,14 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; - x.B.b = 1; exports.__esModule = true; + x.B.b = 1; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = a.a; var c = x.B.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js index 6ba3534610941..e69728a766bd6 100644 --- a/tests/baselines/reference/augmentExportEquals6_1.js +++ b/tests/baselines/reference/augmentExportEquals6_1.js @@ -34,7 +34,7 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.a; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js index 321118461620c..0a8b7404bd1c5 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.js +++ b/tests/baselines/reference/augmentedTypesExternalModule1.js @@ -6,6 +6,7 @@ module c5 { } // should be ok everywhere //// [augmentedTypesExternalModule1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = 1; var c5 = (function () { function c5() { @@ -13,5 +14,4 @@ define(["require", "exports"], function (require, exports) { c5.prototype.foo = function () { }; return c5; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js index 1c8c6ec016873..6b28c90e321fe 100644 --- a/tests/baselines/reference/cacheResolutions.js +++ b/tests/baselines/reference/cacheResolutions.js @@ -13,18 +13,18 @@ export let x = 1; //// [app.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [lib1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [lib2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js index 3af2cc7a5f934..8fcdd501707c4 100644 --- a/tests/baselines/reference/chainedImportAlias.js +++ b/tests/baselines/reference/chainedImportAlias.js @@ -13,15 +13,15 @@ y.m.foo(); //// [chainedImportAlias_file0.js] "use strict"; +exports.__esModule = true; var m; (function (m) { function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); -exports.__esModule = true; //// [chainedImportAlias_file1.js] "use strict"; +exports.__esModule = true; var x = require("./chainedImportAlias_file0"); var y = x; y.m.foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js index 8d3419f1db6b0..198a886f0267c 100644 --- a/tests/baselines/reference/circularReference.js +++ b/tests/baselines/reference/circularReference.js @@ -35,6 +35,7 @@ export module M1 { //// [foo1.js] "use strict"; +exports.__esModule = true; var foo2 = require("./foo2"); var M1; (function (M1) { @@ -48,9 +49,9 @@ var M1; }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); -exports.__esModule = true; //// [foo2.js] "use strict"; +exports.__esModule = true; var foo1 = require("./foo1"); var M1; (function (M1) { @@ -67,4 +68,3 @@ var M1; }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js index 28f43fa798539..8b49f45dbd205 100644 --- a/tests/baselines/reference/circularReferenceInImport.js +++ b/tests/baselines/reference/circularReferenceInImport.js @@ -17,11 +17,11 @@ export function foo() { //// [app.js] "use strict"; +exports.__esModule = true; function foo() { return new Object(); } exports.foo = foo; -exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js index 298395a232c9c..8ba50dcee1c62 100644 --- a/tests/baselines/reference/classAbstractManyKeywords.js +++ b/tests/baselines/reference/classAbstractManyKeywords.js @@ -6,6 +6,7 @@ import abstract class D {} //// [classAbstractManyKeywords.js] "use strict"; +exports.__esModule = true; exports["default"] = abstract; var A = (function () { function A() { @@ -29,4 +30,3 @@ var D = (function () { } return D; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js index 8a648cc62cd49..933f92cad64fd 100644 --- a/tests/baselines/reference/classExtendsAcrossFiles.js +++ b/tests/baselines/reference/classExtendsAcrossFiles.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var a_1 = require("./a"); exports.b = { f: function () { @@ -49,7 +50,6 @@ exports.b = { a_1.a.f(); } }; -Object.defineProperty(exports, "__esModule", { value: true }); //// [a.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -62,6 +62,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var b_1 = require("./b"); exports.a = { f: function () { @@ -80,4 +81,3 @@ exports.a = { b_1.b.f(); } }; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js index ce46e75bed8c0..d4df05f2ea353 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js @@ -21,6 +21,7 @@ export class Test1 { var field1; //// [classMemberInitializerWithLamdaScoping3_1.js] "use strict"; +exports.__esModule = true; var Test1 = (function () { function Test1(field1) { this.field1 = field1; @@ -33,4 +34,3 @@ var Test1 = (function () { return Test1; }()); exports.Test1 = Test1; -exports.__esModule = true; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js index 890d2bbd500b2..76835e757e074 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js @@ -20,6 +20,7 @@ export class Test1 { exports.__esModule = true; //// [classMemberInitializerWithLamdaScoping3_1.js] "use strict"; +exports.__esModule = true; var Test1 = (function () { function Test1(field1) { this.field1 = field1; @@ -30,4 +31,3 @@ var Test1 = (function () { return Test1; }()); exports.Test1 = Test1; -exports.__esModule = true; diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js index b6d3159b0f98d..487553bb00492 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js @@ -20,22 +20,23 @@ export function foo2() { //// [collisionExportsRequireAndAlias_file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function bar() { } exports.bar = bar; - exports.__esModule = true; }); //// [collisionExportsRequireAndAlias_file3333.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function bar2() { } exports.bar2 = bar2; - exports.__esModule = true; }); //// [collisionExportsRequireAndAlias_file2.js] define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) { "use strict"; + exports.__esModule = true; function foo() { require.bar(); } @@ -44,5 +45,4 @@ define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisio exports.bar2(); } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js index cbe0104ebce15..1a16f4a2d5f95 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js @@ -40,10 +40,10 @@ module m4 { //// [collisionExportsRequireAndAmbientClass_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientClass_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js index b931a6210cf87..0e717b01d3bd0 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js @@ -63,10 +63,10 @@ module m4 { //// [collisionExportsRequireAndAmbientEnum_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientEnum_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js index 5d462fb1ce2e5..050799d4c2b7b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js @@ -16,9 +16,9 @@ module m2 { //// [collisionExportsRequireAndAmbientFunction.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { var a = 10; })(m2 || (m2 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js index 045e7dcb796c2..2eb5ea74f920e 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js @@ -97,6 +97,7 @@ module m4 { //// [collisionExportsRequireAndAmbientModule_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { return null; } @@ -109,7 +110,6 @@ define(["require", "exports"], function (require, exports) { (function (m2) { var a = 10; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientModule_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js index a75732a65bab1..8454248845a61 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js @@ -29,11 +29,11 @@ module m4 { //// [collisionExportsRequireAndAmbientVar_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { var a = 10; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientVar_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js index ca16128e9cd33..0bc56b97cf111 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndClass.js @@ -39,6 +39,7 @@ module m4 { //// [collisionExportsRequireAndClass_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var require = (function () { function require() { } @@ -79,7 +80,6 @@ define(["require", "exports"], function (require, exports) { }()); m2.exports = exports; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndClass_globalFile.js] var require = (function () { diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js index d6fb21ba60af3..4bb6614ffe768 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js @@ -63,6 +63,7 @@ module m4 { //// [collisionExportsRequireAndEnum_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var require; (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; @@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) { exports[exports["_thisVal2"] = 1] = "_thisVal2"; })(exports = m2.exports || (m2.exports = {})); })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndEnum_globalFile.js] var require; diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js index 7e538d462b2f3..1da8cf29d665f 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js @@ -25,6 +25,7 @@ module m2 { //// [collisionExportsRequireAndFunction.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function exports() { return 1; } @@ -53,5 +54,4 @@ define(["require", "exports"], function (require, exports) { } m2.require = require; })(m2 || (m2 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js index 7ac6ba06ed62a..9cb3c4e797e0e 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js @@ -25,6 +25,7 @@ module m2 { //// [collisionExportsRequireAndInternalModuleAlias.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m; (function (m) { var c = (function () { @@ -52,5 +53,4 @@ define(["require", "exports"], function (require, exports) { new m2.exports(); new m2.require(); })(m2 || (m2 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js index d1ca4d3a75cc3..4282095500408 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndModule.js @@ -94,6 +94,7 @@ module m4 { //// [collisionExportsRequireAndModule_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var require; (function (require) { var C = (function () { @@ -162,7 +163,6 @@ define(["require", "exports"], function (require, exports) { exports.C = C; })(exports = m2.exports || (m2.exports = {})); })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndModule_globalFile.js] var require; diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js index ba1926dd965b2..b9552c16223f2 100644 --- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js @@ -17,6 +17,7 @@ export function foo2(): exports.I { //// [collisionExportsRequireAndUninstantiatedModule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { return null; } @@ -25,5 +26,4 @@ define(["require", "exports"], function (require, exports) { return null; } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js index 9c7a24b176f7b..9a20472ea685b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndVar.js @@ -29,6 +29,7 @@ module m4 { //// [collisionExportsRequireAndVar_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { } exports.foo = foo; @@ -44,7 +45,6 @@ define(["require", "exports"], function (require, exports) { m2.exports = 0; m2.require = "require"; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndVar_globalFile.js] var exports = 0; diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js index 33ea3d7fcfbec..353b70f4d3c08 100644 --- a/tests/baselines/reference/commentOnExportEnumDeclaration.js +++ b/tests/baselines/reference/commentOnExportEnumDeclaration.js @@ -8,6 +8,7 @@ export enum Color { //// [commentOnExportEnumDeclaration.js] "use strict"; +exports.__esModule = true; /** * comment */ @@ -17,4 +18,3 @@ var Color; Color[Color["g"] = 1] = "g"; Color[Color["b"] = 2] = "b"; })(Color = exports.Color || (exports.Color = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js index cdba9542f544d..1c1df10403940 100644 --- a/tests/baselines/reference/commentsDottedModuleName.js +++ b/tests/baselines/reference/commentsDottedModuleName.js @@ -10,6 +10,7 @@ export module outerModule.InnerModule { //// [commentsDottedModuleName.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi declare module*/ var outerModule; (function (outerModule) { @@ -24,7 +25,6 @@ define(["require", "exports"], function (require, exports) { InnerModule.b = b; })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {})); })(outerModule = exports.outerModule || (exports.outerModule = {})); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index 57cc701941ab0..39002f90d9105 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -64,6 +64,7 @@ var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ var m1; (function (m1) { @@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) { })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules_0"], function (require, exports, extMod) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); extMod.m1.fooExport(); var newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); var newVar2 = new extMod.m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index 6ee404269948a..d06c588425fea 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -64,6 +64,7 @@ export var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules2_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ var m1; (function (m1) { @@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) { })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); extMod.m1.fooExport(); exports.newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); exports.newVar2 = new extMod.m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index ee48cfde32855..81e90a159d560 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules2_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ var m1; (function (m1) { @@ -123,16 +124,15 @@ var m4; })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [commentsExternalModules_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /**This is on import declaration*/ var extMod = require("./commentsExternalModules2_0"); // trailing comment 1 extMod.m1.fooExport(); exports.newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); exports.newVar2 = new extMod.m4.m2.c(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [commentsExternalModules2_0.d.ts] diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index 2c26b93b82df0..25dd8a907808a 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -39,6 +39,7 @@ new multiM.d(); //// [commentsMultiModuleMultiFile_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi declare module*/ var multiM; (function (multiM) { @@ -69,11 +70,11 @@ define(["require", "exports"], function (require, exports) { })(multiM = exports.multiM || (exports.multiM = {})); new multiM.b(); new multiM.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsMultiModuleMultiFile_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi module 3 comment*/ var multiM; (function (multiM) { @@ -93,7 +94,6 @@ define(["require", "exports"], function (require, exports) { multiM.f = f; })(multiM = exports.multiM || (exports.multiM = {})); new multiM.d(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js index 6feff1bd813ac..eee05c8049395 100644 --- a/tests/baselines/reference/commentsOnRequireStatement.js +++ b/tests/baselines/reference/commentsOnRequireStatement.js @@ -19,14 +19,15 @@ export {subject1} from './1'; //// [0.js] "use strict"; -exports.subject = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.subject = 10; //// [1.js] "use strict"; -exports.subject1 = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.subject1 = 10; //// [2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /* blah0 */ // blah // blah @@ -36,4 +37,3 @@ exports.subject = _0_1.subject; /* blah1 */ var _1_1 = require("./1"); exports.subject1 = _1_1.subject1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index c1d2a303d7ad9..ee2846d4a6065 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -15,6 +15,7 @@ if(foo.C1.s1){ //// [foo_0.js] "use strict"; +exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -23,10 +24,9 @@ var C1 = (function () { }()); C1.s1 = true; exports.C1 = C1; -exports.__esModule = true; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); if (foo.C1.s1) { } -exports.__esModule = true; diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index 1f37d83c81580..5ac0e3fcc649e 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -33,6 +33,7 @@ var e: number = 0; //// [foo_0.js] "use strict"; +exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -47,12 +48,11 @@ var E1; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); -exports.__esModule = true; //// [foo_1.js] "use strict"; +exports.__esModule = true; var i; var x = {}; var y = false; var z; var e = 0; -exports.__esModule = true; diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js index f1ec275cf73f7..ef6e97f4d5e76 100644 --- a/tests/baselines/reference/commonSourceDir5.js +++ b/tests/baselines/reference/commonSourceDir5.js @@ -19,18 +19,18 @@ export var y = x * i; //// [concat.js] define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, exports, bar_1, foo_1) { "use strict"; + exports.__esModule = true; exports.pi = Math.PI; exports.y = bar_1.x * foo_1.i; - exports.__esModule = true; }); define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) { "use strict"; + exports.__esModule = true; exports.i = Math.sqrt(-1); exports.z = baz_1.pi * baz_1.pi; - exports.__esModule = true; }); define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) { "use strict"; - exports.x = foo_2.z + foo_2.z; exports.__esModule = true; + exports.x = foo_2.z + foo_2.z; }); diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js index d52fde52cf2a0..071953afcdc76 100644 --- a/tests/baselines/reference/commonSourceDir6.js +++ b/tests/baselines/reference/commonSourceDir6.js @@ -18,18 +18,18 @@ export var y = x * i; //// [concat.js] define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, exports, bar_1, foo_1) { "use strict"; + exports.__esModule = true; exports.pi = Math.PI; exports.y = bar_1.x * foo_1.i; - exports.__esModule = true; }); define("a/foo", ["require", "exports", "baz"], function (require, exports, baz_1) { "use strict"; + exports.__esModule = true; exports.i = Math.sqrt(-1); exports.z = baz_1.pi * baz_1.pi; - exports.__esModule = true; }); define("a/bar", ["require", "exports", "a/foo"], function (require, exports, foo_2) { "use strict"; - exports.x = foo_2.z + foo_2.z; exports.__esModule = true; + exports.x = foo_2.z + foo_2.z; }); diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js index 08e628cac2a94..5569ae6d52b77 100644 --- a/tests/baselines/reference/commonSourceDirectory.js +++ b/tests/baselines/reference/commonSourceDirectory.js @@ -19,11 +19,11 @@ x + y; //// [/app/bin/index.js] "use strict"; +exports.__esModule = true; /// var foo_1 = require("foo"); var bar_1 = require("bar"); foo_1.x + bar_1.y; -exports.__esModule = true; //# sourceMappingURL=/app/myMapRoot/index.js.map //// [/app/bin/index.d.ts] diff --git a/tests/baselines/reference/commonSourceDirectory.js.map b/tests/baselines/reference/commonSourceDirectory.js.map index 8e3f925eee953..fd88719859b7a 100644 --- a/tests/baselines/reference/commonSourceDirectory.js.map +++ b/tests/baselines/reference/commonSourceDirectory.js.map @@ -1,2 +1,2 @@ //// [/app/bin/index.js.map] -{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt index 5675c05e34b01..c880d2d0059fb 100644 --- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt +++ b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt @@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js sourceFile:index.ts ------------------------------------------------------------------- >>>"use strict"; +>>>exports.__esModule = true; >>>/// 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 >/// -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 42) Source(1, 42) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 42) Source(1, 42) + SourceIndex(0) --- >>>var foo_1 = require("foo"); 1 > @@ -24,8 +25,8 @@ sourceFile:index.ts 1 > > 2 >import { x } from "foo"; -1 >Emitted(3, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 28) Source(2, 25) + SourceIndex(0) +1 >Emitted(4, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 28) Source(2, 25) + SourceIndex(0) --- >>>var bar_1 = require("bar"); 1-> @@ -33,8 +34,8 @@ sourceFile:index.ts 1-> > 2 >import { y } from "bar"; -1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(4, 28) Source(3, 25) + SourceIndex(0) +1->Emitted(5, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(5, 28) Source(3, 25) + SourceIndex(0) --- >>>foo_1.x + bar_1.y; 1 > @@ -42,18 +43,17 @@ sourceFile:index.ts 3 > ^^^ 4 > ^^^^^^^ 5 > ^ -6 > ^^^^^^^^^-> +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >x 3 > + 4 > y 5 > ; -1 >Emitted(5, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(5, 8) Source(4, 2) + SourceIndex(0) -3 >Emitted(5, 11) Source(4, 5) + SourceIndex(0) -4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0) -5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0) +1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 8) Source(4, 2) + SourceIndex(0) +3 >Emitted(6, 11) Source(4, 5) + SourceIndex(0) +4 >Emitted(6, 18) Source(4, 6) + SourceIndex(0) +5 >Emitted(6, 19) Source(4, 7) + SourceIndex(0) --- ->>>exports.__esModule = true; >>>//# sourceMappingURL=/app/myMapRoot/index.js.map \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js index e49192dbe2f67..249edecedddaa 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.js +++ b/tests/baselines/reference/commonSourceDirectory_dts.js @@ -12,9 +12,9 @@ export const x = y; //// [/app/bin/index.js] "use strict"; +exports.__esModule = true; /// exports.x = y; -exports.__esModule = true; //# sourceMappingURL=/app/myMapRoot/index.js.map //// [/app/bin/index.d.ts] diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map index b33518dd04cae..552da577884d8 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.js.map +++ b/tests/baselines/reference/commonSourceDirectory_dts.js.map @@ -1,2 +1,2 @@ //// [/app/bin/index.js.map] -{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt index ccbbc89465d9c..925a3d30ed4a2 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt +++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt @@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js sourceFile:index.ts ------------------------------------------------------------------- >>>"use strict"; +>>>exports.__esModule = true; >>>/// 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 >/// -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 41) Source(1, 41) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 41) Source(1, 41) + SourceIndex(0) --- >>>exports.x = y; 1 > @@ -24,7 +25,7 @@ sourceFile:index.ts 4 > ^^^ 5 > ^ 6 > ^ -7 > ^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >export const 2 > @@ -32,12 +33,11 @@ sourceFile:index.ts 4 > = 5 > y 6 > ; -1 >Emitted(3, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 10) Source(2, 15) + SourceIndex(0) -4 >Emitted(3, 13) Source(2, 18) + SourceIndex(0) -5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) -6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(4, 9) Source(2, 14) + SourceIndex(0) +3 >Emitted(4, 10) Source(2, 15) + SourceIndex(0) +4 >Emitted(4, 13) Source(2, 18) + SourceIndex(0) +5 >Emitted(4, 14) Source(2, 19) + SourceIndex(0) +6 >Emitted(4, 15) Source(2, 20) + SourceIndex(0) --- ->>>exports.__esModule = true; >>>//# sourceMappingURL=/app/myMapRoot/index.js.map \ No newline at end of file diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js index da7c571061040..e7a251e9cee3c 100644 --- a/tests/baselines/reference/commonjsSafeImport.js +++ b/tests/baselines/reference/commonjsSafeImport.js @@ -12,14 +12,14 @@ Foo(); //// [10_lib.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function Foo() { } exports.Foo = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var _10_lib_1 = require("./10_lib"); _10_lib_1.Foo(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [10_lib.d.ts] diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js index 5c665a52cb304..4408d64acbfdf 100644 --- a/tests/baselines/reference/complexNarrowingWithAny.js +++ b/tests/baselines/reference/complexNarrowingWithAny.js @@ -562,6 +562,7 @@ export function viewFactory_AppComponent0(viewUtils:any,parentInjector:any,decla //// [complexNarrowingWithAny.js] // Repro from #10869 "use strict"; +exports.__esModule = true; /** * This file is generated by the Angular 2 template compiler. * Do not edit. @@ -1025,4 +1026,3 @@ function viewFactory_AppComponent0(viewUtils, parentInjector, declarationEl) { return new _View_AppComponent0(viewUtils, parentInjector, declarationEl); } exports.viewFactory_AppComponent0 = viewFactory_AppComponent0; -exports.__esModule = true; diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js index 9c7c78ad6261b..f02b9611541f6 100644 --- a/tests/baselines/reference/constDeclarations-access5.js +++ b/tests/baselines/reference/constDeclarations-access5.js @@ -51,12 +51,13 @@ m.x.toString(); //// [constDeclarations_access_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 0; Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = 0; }); //// [constDeclarations_access_2.js] define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); // Errors m.x = 1; m.x += 2; @@ -87,5 +88,4 @@ define(["require", "exports", "constDeclarations_access_1"], function (require, -m.x; +m.x; m.x.toString(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js index e658dc1734760..8ea5625ac0797 100644 --- a/tests/baselines/reference/constEnumExternalModule.js +++ b/tests/baselines/reference/constEnumExternalModule.js @@ -18,6 +18,6 @@ define(["require", "exports"], function (require, exports) { //// [m2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var v = 100 /* V */; exports.__esModule = true; + var v = 100 /* V */; }); diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js index 8b65f916dfaba..752479cf4e9b2 100644 --- a/tests/baselines/reference/controlFlowBinaryOrExpression.js +++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js @@ -38,6 +38,7 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) { //// [controlFlowBinaryOrExpression.js] "use strict"; +exports.__esModule = true; var x; var cond; (x = "") || (x = 0); @@ -55,4 +56,3 @@ if (isHTMLCollection(sourceObj)) { if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) { sourceObj.length; } -exports.__esModule = true; diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js index be61fc2c75a58..27fce9a9a1288 100644 --- a/tests/baselines/reference/controlFlowPropertyDeclarations.js +++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js @@ -151,6 +151,7 @@ export class StyleParser { //// [controlFlowPropertyDeclarations.js] // Repro from ##8913 "use strict"; +exports.__esModule = true; var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig'); // Populate property map with ReactJS's attribute and property mappings // TODO handle/use .Properties value eg: MUST_USE_PROPERTY is not HTML attr @@ -289,4 +290,3 @@ var StyleParser = (function () { return StyleParser; }()); exports.StyleParser = StyleParser; -exports.__esModule = true; diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js index d1422112fff8f..0a7eff198ff81 100644 --- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js +++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js @@ -104,6 +104,7 @@ export default md5; //// [controlFlowSelfReferentialLoop.js] // Repro from #12319 "use strict"; +exports.__esModule = true; function md5(string) { function FF(a, b, c, d, x, s, ac) { return 0; @@ -204,4 +205,3 @@ function md5(string) { } } exports["default"] = md5; -exports.__esModule = true; diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js index 7fa40a63a1082..f7c1ac602dd6d 100644 --- a/tests/baselines/reference/copyrightWithNewLine1.js +++ b/tests/baselines/reference/copyrightWithNewLine1.js @@ -15,9 +15,9 @@ greeter.start(); ****************************/ define(["require", "exports", "./greeter"], function (require, exports, model) { "use strict"; + exports.__esModule = true; var el = document.getElementById('content'); var greeter = new model.Greeter(el); /** things */ greeter.start(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js index 4b31d5997134b..0f479c3db7f26 100644 --- a/tests/baselines/reference/copyrightWithoutNewLine1.js +++ b/tests/baselines/reference/copyrightWithoutNewLine1.js @@ -11,9 +11,9 @@ greeter.start(); //// [copyrightWithoutNewLine1.js] define(["require", "exports", "./greeter"], function (require, exports, model) { "use strict"; + exports.__esModule = true; var el = document.getElementById('content'); var greeter = new model.Greeter(el); /** things */ greeter.start(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js index 67eba038d46e5..d555d3f3bcafe 100644 --- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js @@ -15,6 +15,7 @@ export var compileServer = task(() => { //// [crashIntypeCheckInvocationExpression.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var nake; function doCompile(fileset, moduleType) { return undefined; @@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) { var folder = path.join(), fileset = nake.fileSetSync(folder); return doCompile(fileset, moduleType); }); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js index 48fe4dad45fe0..a115e7ab0a3aa 100644 --- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js @@ -11,6 +11,7 @@ export class BuildWorkspaceService { //// [crashIntypeCheckObjectCreationExpression.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var BuildWorkspaceService = (function () { function BuildWorkspaceService() { } @@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) { return BuildWorkspaceService; }()); exports.BuildWorkspaceService = BuildWorkspaceService; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js index b0cc0c8fbaa56..64a99bb84382c 100644 --- a/tests/baselines/reference/declFileAccessors.js +++ b/tests/baselines/reference/declFileAccessors.js @@ -103,6 +103,7 @@ class c2 { //// [declFileAccessors_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /** This is comment for c1*/ var c1 = (function () { function c1() { @@ -185,7 +186,6 @@ var c1 = (function () { return c1; }()); exports.c1 = c1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileAccessors_1.js] /** This is comment for c2 - the global class*/ var c2 = (function () { diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js index f89863a302971..56b8992811b39 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js @@ -10,18 +10,18 @@ import foo = require("./declFileAliasUseBeforeDeclaration_foo"); //// [declFileAliasUseBeforeDeclaration_foo.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; //// [declFileAliasUseBeforeDeclaration_test.js] "use strict"; +exports.__esModule = true; function bar(a) { } exports.bar = bar; -exports.__esModule = true; //// [declFileAliasUseBeforeDeclaration_foo.d.ts] diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js index 218157185afaf..ee1964415c910 100644 --- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js +++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js @@ -8,6 +8,7 @@ export class Enhancement { //// [declFileClassWithStaticMethodReturningConstructor.js] "use strict"; +exports.__esModule = true; var Enhancement = (function () { function Enhancement() { } @@ -17,7 +18,6 @@ var Enhancement = (function () { return Enhancement; }()); exports.Enhancement = Enhancement; -exports.__esModule = true; //// [declFileClassWithStaticMethodReturningConstructor.d.ts] diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js index 87cf77e733ede..214620193b796 100644 --- a/tests/baselines/reference/declFileConstructors.js +++ b/tests/baselines/reference/declFileConstructors.js @@ -99,6 +99,7 @@ class GlobalConstructorWithParameterInitializer { //// [declFileConstructors_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SimpleConstructor = (function () { /** This comment should appear for foo*/ function SimpleConstructor() { @@ -162,7 +163,6 @@ var ConstructorWithParameterInitializer = (function () { return ConstructorWithParameterInitializer; }()); exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileConstructors_1.js] var GlobalSimpleConstructor = (function () { /** This comment should appear for foo*/ diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js index e9d140ae2e2aa..1caa920719377 100644 --- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js +++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js @@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) { //// [declFileExportAssignmentOfGenericInterface_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x.a; exports.__esModule = true; + exports.x.a; }); diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index a03fa43afff3e..2af2103b62a62 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -44,8 +44,8 @@ define(["require", "exports"], function (require, exports) { //// [declFileExportImportChain_b.js] define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) { "use strict"; - exports.a = a; exports.__esModule = true; + exports.a = a; }); //// [declFileExportImportChain_b1.js] define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) { @@ -55,8 +55,8 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require, //// [declFileExportImportChain_c.js] define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) { "use strict"; - exports.b1 = b1; exports.__esModule = true; + exports.b1 = b1; }); //// [declFileExportImportChain_d.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index c7feeec7e8ccb..70478fdf43028 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -46,8 +46,8 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require //// [declFileExportImportChain2_c.js] define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) { "use strict"; - exports.b = b; exports.__esModule = true; + exports.b = b; }); //// [declFileExportImportChain2_d.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js index 0bb2c7dfe55f3..809f01878d4a9 100644 --- a/tests/baselines/reference/declFileForExportedImport.js +++ b/tests/baselines/reference/declFileForExportedImport.js @@ -16,12 +16,12 @@ var z = b.x; exports.__esModule = true; //// [declFileForExportedImport_1.js] "use strict"; +exports.__esModule = true; /// exports.a = require("./declFileForExportedImport_0"); var y = exports.a.x; exports.b = exports.a; var z = exports.b.x; -exports.__esModule = true; //// [declFileForExportedImport_0.d.ts] diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js index c93dee4e30ea0..f62b7772b41ae 100644 --- a/tests/baselines/reference/declFileFunctions.js +++ b/tests/baselines/reference/declFileFunctions.js @@ -79,6 +79,7 @@ function globalfooWithOverloads(a: any): any { //// [declFileFunctions_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /** This comment should appear for foo*/ function foo() { } @@ -145,7 +146,6 @@ function nonExportedFooWithRestParameters(a) { function nonExportedFooWithOverloads(a) { return a; } -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileFunctions_1.js] /** This comment should appear for foo*/ function globalfoo() { diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index ab3fc63f450e3..f56abaf6b97d7 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -51,6 +51,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var C; (function (C) { var A = (function () { @@ -102,7 +103,6 @@ var h = (function (_super) { }(C.A)); exports.h = h; exports.j = C.F6; -exports.__esModule = true; //// [declFileGenericType.d.ts] diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index d1d9589e8c753..110539774df5a 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -32,11 +32,11 @@ var m2; module.exports = m2; //// [declFileImportModuleWithExportAssignment_1.js] "use strict"; +exports.__esModule = true; /**This is on import declaration*/ var a1 = require("./declFileImportModuleWithExportAssignment_0"); exports.a = a1; exports.a.test1(null, null, null); -exports.__esModule = true; //// [declFileImportModuleWithExportAssignment_0.d.ts] diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js index dee10473f2cac..61e2bfab70015 100644 --- a/tests/baselines/reference/declFileMethods.js +++ b/tests/baselines/reference/declFileMethods.js @@ -192,6 +192,7 @@ interface I2 { //// [declFileMethods_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c1 = (function () { function c1() { } @@ -274,7 +275,6 @@ var c1 = (function () { return c1; }()); exports.c1 = c1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileMethods_1.js] var c2 = (function () { function c2() { diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js index 35a861a60469b..698622a86500f 100644 --- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js @@ -38,6 +38,7 @@ export class C4 { //// [declarationEmitClassMemberNameConflict.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var C1 = (function () { function C1() { } @@ -91,7 +92,6 @@ var C4 = (function () { return C4; }()); exports.C4 = C4; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declarationEmitClassMemberNameConflict.d.ts] diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js index 5557ff7102049..223376ef8ffd9 100644 --- a/tests/baselines/reference/declarationEmitExportAssignment.js +++ b/tests/baselines/reference/declarationEmitExportAssignment.js @@ -12,11 +12,11 @@ export = foo; //// [utils.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; -Object.defineProperty(exports, "__esModule", { value: true }); //// [index.js] "use strict"; var utils_1 = require("./utils"); diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js index e019203030ee4..57c39b95e6448 100644 --- a/tests/baselines/reference/declarationEmitExportDeclaration.js +++ b/tests/baselines/reference/declarationEmitExportDeclaration.js @@ -15,18 +15,18 @@ export {bar}; //// [utils.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; -Object.defineProperty(exports, "__esModule", { value: true }); //// [index.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var utils_1 = require("./utils"); exports.bar = utils_1.bar; utils_1.foo(); var obj; -Object.defineProperty(exports, "__esModule", { value: true }); //// [utils.d.ts] diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js index a1e3aac882358..a02eac46dba20 100644 --- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js @@ -55,6 +55,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var ExportedClass = (function () { function ExportedClass() { } @@ -104,4 +105,3 @@ var MyClass4 = (function (_super) { return MyClass4; }(getExportedClass(undefined))); exports.MyClass4 = MyClass4; -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js index 87141cfb69943..08208c2435d38 100644 --- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js +++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js @@ -6,11 +6,11 @@ export function f(x: any): x is number { //// [declarationEmitIdentifierPredicates01.js] "use strict"; +exports.__esModule = true; function f(x) { return typeof x === "number"; } exports.f = f; -exports.__esModule = true; //// [declarationEmitIdentifierPredicates01.d.ts] diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js index f20654d508c53..5829e9b4427f0 100644 --- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js +++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js @@ -10,8 +10,8 @@ export function f(x: any): x is I { //// [declarationEmitIdentifierPredicatesWithPrivateName01.js] "use strict"; +exports.__esModule = true; function f(x) { return typeof x.a === "number"; } exports.f = f; -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js index 555006528303f..608f172cd1f7f 100644 --- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js +++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js @@ -9,13 +9,13 @@ export default { //// [declarationEmitInferedDefaultExportType.js] "use strict"; +exports.__esModule = true; // test.ts exports["default"] = { foo: [], bar: undefined, baz: null }; -exports.__esModule = true; //// [declarationEmitInferedDefaultExportType.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js index dca7f142dc9cb..4e41c8558c697 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js @@ -14,15 +14,15 @@ export { v } //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js index 9228b766d3ffe..601026ab6f3bf 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js @@ -17,19 +17,19 @@ export { v, bar } //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; function bar() { return v; } exports.bar = bar; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js index 8b2783a73fdfc..30df7e38b0139 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js @@ -14,15 +14,15 @@ export default x; //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var x = "hi" || 5; exports["default"] = x; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js index 3020721dfc8cc..24f2a52c5d8ea 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js @@ -13,14 +13,14 @@ export { v } //// [0.js] "use strict"; -var obj = true; exports.__esModule = true; +var obj = true; //// [1.js] "use strict"; +exports.__esModule = true; //let v2: Z.Data; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js index c7be3aca6b4ec..5b14a3738e413 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js @@ -14,15 +14,15 @@ export { v } //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js index 2177a17efa548..9a9b1247e24d3 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js @@ -11,13 +11,13 @@ export { v } //// [0.js] "use strict"; -var obj = true; exports.__esModule = true; +var obj = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js index 70560f5a54d5b..cddb463074098 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js @@ -9,12 +9,12 @@ export function returnSomeGlobalValue() { //// [declarationEmitInferedTypeAlias9.js] "use strict"; +exports.__esModule = true; var x; function returnSomeGlobalValue() { return x; } exports.returnSomeGlobalValue = returnSomeGlobalValue; -exports.__esModule = true; //// [declarationEmitInferedTypeAlias9.d.ts] diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js index 4188b673b0bd3..d4280cd00c672 100644 --- a/tests/baselines/reference/declarationEmitInvalidExport.js +++ b/tests/baselines/reference/declarationEmitInvalidExport.js @@ -9,7 +9,7 @@ export type MyClass = typeof myClass; //// [declarationEmitInvalidExport.js] "use strict"; +exports.__esModule = true; if (false) { export var myClass = 0; } -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js index 08747bbe198a4..5440f3d358400 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.js +++ b/tests/baselines/reference/declarationEmitNameConflicts.js @@ -63,6 +63,7 @@ var f; module.exports = f; //// [declarationEmit_nameConflicts_0.js] "use strict"; +exports.__esModule = true; var im = require("./declarationEmit_nameConflicts_1"); var M; (function (M) { @@ -129,7 +130,6 @@ var M; })(N = Q.N || (Q.N = {})); })(Q = M.Q || (M.Q = {})); })(M = exports.M || (exports.M = {})); -exports.__esModule = true; //// [declarationEmit_nameConflicts_1.d.ts] diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js index e5c10ab348433..4b4aca4f4b2d3 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js @@ -8,10 +8,10 @@ export module M { //// [declarationEmitNameConflictsWithAlias.js] "use strict"; +exports.__esModule = true; var M; (function (M) { })(M = exports.M || (exports.M = {})); -exports.__esModule = true; //// [declarationEmitNameConflictsWithAlias.d.ts] diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js index 4f56ad9186497..7444a956a2add 100644 --- a/tests/baselines/reference/declarationEmitPromise.js +++ b/tests/baselines/reference/declarationEmitPromise.js @@ -32,6 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); class bluebird { } exports.bluebird = bluebird; @@ -53,7 +54,6 @@ function runSampleBreaks(a, b, c, d, e) { }); } exports.runSampleBreaks = runSampleBreaks; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declarationEmitPromise.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js index 2845a120b7485..e95a7db05edd7 100644 --- a/tests/baselines/reference/declarationEmitThisPredicates01.js +++ b/tests/baselines/reference/declarationEmitThisPredicates01.js @@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var C = (function () { function C() { } @@ -38,7 +39,6 @@ var D = (function (_super) { return D; }(C)); exports.D = D; -exports.__esModule = true; //// [declarationEmitThisPredicates01.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js index b9a81b2fb8e4d..0e7c99df1f32c 100644 --- a/tests/baselines/reference/declarationEmitThisPredicates02.js +++ b/tests/baselines/reference/declarationEmitThisPredicates02.js @@ -15,13 +15,13 @@ export const obj = { //// [declarationEmitThisPredicates02.js] "use strict"; +exports.__esModule = true; exports.obj = { m: function () { var dis = this; return dis.a != null && dis.b != null && dis.c != null; } }; -exports.__esModule = true; //// [declarationEmitThisPredicates02.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js index 16ae267bc3c16..a0f611d2d29a3 100644 --- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js +++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js @@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var C = (function () { function C() { } @@ -37,4 +38,3 @@ var D = (function (_super) { } return D; }(C)); -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js index fcc373ccbe8bb..7ec7ba5dec8a0 100644 --- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js +++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js @@ -15,10 +15,10 @@ export const obj = { //// [declarationEmitThisPredicatesWithPrivateName02.js] "use strict"; +exports.__esModule = true; exports.obj = { m: function () { var dis = this; return dis.a != null && dis.b != null && dis.c != null; } }; -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js index 303959f55042e..84b55a9792fb2 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js @@ -6,8 +6,8 @@ export const y = (x: Foo) => 1 //// [declarationEmitTypeAliasWithTypeParameters1.js] "use strict"; -exports.y = function (x) { return 1; }; exports.__esModule = true; +exports.y = function (x) { return 1; }; //// [declarationEmitTypeAliasWithTypeParameters1.d.ts] diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js index 52f696a9448d8..1bb6beac9e1f5 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js @@ -7,8 +7,8 @@ export const y = (x: Baa) => 1 //// [declarationEmitTypeAliasWithTypeParameters2.js] "use strict"; -exports.y = function (x) { return 1; }; exports.__esModule = true; +exports.y = function (x) { return 1; }; //// [declarationEmitTypeAliasWithTypeParameters2.d.ts] diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js index e6ef1234c3a99..28997a754965a 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js @@ -12,7 +12,7 @@ function foo() { //// [declarationEmitTypeAliasWithTypeParameters5.js] "use strict"; +exports.__esModule = true; function foo() { return {}; } -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js index 686ed8dce2c9d..1ac1e934578e5 100644 --- a/tests/baselines/reference/declarationEmitUnknownImport.js +++ b/tests/baselines/reference/declarationEmitUnknownImport.js @@ -5,6 +5,6 @@ export {Foo} //// [declarationEmitUnknownImport.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Foo = SomeNonExistingName; exports.Foo = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js index 10b8b1b98867a..1f291312913c2 100644 --- a/tests/baselines/reference/declarationEmitUnknownImport2.js +++ b/tests/baselines/reference/declarationEmitUnknownImport2.js @@ -5,7 +5,7 @@ export default Foo //// [declarationEmitUnknownImport2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Foo = From; './Foo'; // Syntax error exports.default = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js index a08b36e278195..64a6cf2d84910 100644 --- a/tests/baselines/reference/declarationMerging2.js +++ b/tests/baselines/reference/declarationMerging2.js @@ -18,6 +18,7 @@ declare module "./a" { //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } @@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; - exports.__esModule = true; }); //// [b.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js index d0e8504713dd0..b624c11e79d3b 100644 --- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js +++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js @@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); let Testing123 = Testing123_1 = class Testing123 { }; Testing123.prop1 = Testing123_1.prop0; @@ -22,4 +23,3 @@ Testing123 = Testing123_1 = __decorate([ ], Testing123); exports.Testing123 = Testing123; var Testing123_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js index 3e24af5f427ad..978d8f1840291 100644 --- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js +++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js @@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); let Testing123 = Testing123_1 = class Testing123 { }; Testing123 = Testing123_1 = __decorate([ @@ -20,4 +21,3 @@ Testing123 = Testing123_1 = __decorate([ ], Testing123); exports.Testing123 = Testing123; var Testing123_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js index bf5e9e5dcfc23..dadaa5ed6df1b 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js @@ -22,6 +22,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, }; define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let Foo = class Foo { }; @@ -29,7 +30,6 @@ define(["require", "exports"], function (require, exports) { decorator ], Foo); exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -40,6 +40,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, }; define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let default_1 = class { }; @@ -47,5 +48,4 @@ define(["require", "exports"], function (require, exports) { decorator ], default_1); exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js index fe62d15c27fdb..f6c7b7cbc8b80 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js @@ -21,6 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let Foo = class Foo { }; @@ -28,7 +29,6 @@ Foo = __decorate([ decorator ], Foo); exports.default = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -37,6 +37,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let default_1 = class { }; @@ -44,4 +45,3 @@ default_1 = __decorate([ decorator ], default_1); exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js index e6f4773df7dec..beb5fa26755ef 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js @@ -30,6 +30,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let Foo = class Foo { }; @@ -37,7 +38,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, decorator ], Foo); exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -56,6 +56,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let default_1 = class { }; @@ -63,5 +64,4 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, decorator ], default_1); exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js index 8c4bb8c12661b..22e4a448f1e0b 100644 --- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js +++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js @@ -23,9 +23,9 @@ class Wat { //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); // from #3108 exports.test = 'abc'; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -34,6 +34,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var a_1 = require("./a"); function filter(handler) { return function (target, propertyKey) { @@ -51,4 +52,3 @@ var Wat = (function () { __decorate([ filter(function () { return a_1.test == 'abc'; }) ], Wat, "whatever", null); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js index 50dbe2cafdc1c..9998ae3d08a89 100644 --- a/tests/baselines/reference/decoratorMetadata.js +++ b/tests/baselines/reference/decoratorMetadata.js @@ -20,13 +20,13 @@ class MyComponent { //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Service = (function () { function Service() { } return Service; }()); exports.default = Service; -Object.defineProperty(exports, "__esModule", { value: true }); //// [component.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -38,6 +38,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var service_1 = require("./service"); var MyComponent = (function () { function MyComponent(Service) { @@ -57,4 +58,3 @@ MyComponent = __decorate([ decorator, __metadata("design:paramtypes", [service_1.default]) ], MyComponent); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js index 653bc911ed492..6f2476377293e 100644 --- a/tests/baselines/reference/decoratorMetadataOnInferredType.js +++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js @@ -19,6 +19,7 @@ export class B { //// [decoratorMetadataOnInferredType.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { console.log('new A'); @@ -38,4 +39,3 @@ __decorate([ __metadata("design:type", Object) ], B.prototype, "x", void 0); exports.B = B; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js index 9cbc514d932e0..a65ba5b2f7388 100644 --- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js +++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js @@ -42,31 +42,31 @@ export class ClassA { //// [aux.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SomeClass = (function () { function SomeClass() { } return SomeClass; }()); exports.SomeClass = SomeClass; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aux1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SomeClass1 = (function () { function SomeClass1() { } return SomeClass1; }()); exports.SomeClass1 = SomeClass1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aux2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SomeClass2 = (function () { function SomeClass2() { } return SomeClass2; }()); exports.SomeClass2 = SomeClass2; -Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -78,6 +78,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var aux_1 = require("./aux"); var aux1_1 = require("./aux1"); function annotation() { @@ -113,4 +114,3 @@ ClassA = __decorate([ __metadata("design:paramtypes", [aux_1.SomeClass]) ], ClassA); exports.ClassA = ClassA; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js index 91c3814774ccb..10aa42ddce7da 100644 --- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js +++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js @@ -19,6 +19,7 @@ export class B { //// [decoratorMetadataWithConstructorType.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { console.log('new A'); @@ -38,4 +39,3 @@ __decorate([ __metadata("design:type", A) ], B.prototype, "x", void 0); exports.B = B; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js index e2cd357f14a32..b0e23a78971a6 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js index 19c8bafa4c199..f03190cff0c09 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js index 63177201f1d0a..c1eca0815274b 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js index 1979adf9c82ae..7d78cf7adbe7e 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); // error no default export function someDecorator(target) { return target; @@ -53,4 +54,3 @@ MyClass = __decorate([ ], MyClass); exports.MyClass = MyClass; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js index f3f82342fad31..3f7069902ce1b 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.default = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.default]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js index 34f63af38eaa3..66eb30dc7105d 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.default = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.default]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js index 4b0d77b9d2f92..1dd09c3a1775f 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.default = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [Object]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js index a587baf1d05f4..830e6bc80ee63 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var database = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [database.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js index 6ec7a58da6627..77020e7cb7739 100644 --- a/tests/baselines/reference/decoratorOnClass2.js +++ b/tests/baselines/reference/decoratorOnClass2.js @@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -22,4 +23,3 @@ C = __decorate([ dec ], C); exports.C = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js index 0e289d51c7117..2af3b0426dc02 100644 --- a/tests/baselines/reference/decoratorOnClassConstructor2.js +++ b/tests/baselines/reference/decoratorOnClassConstructor2.js @@ -16,6 +16,7 @@ export class C extends base{ //// [0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var base = (function () { function base() { } @@ -24,7 +25,6 @@ var base = (function () { exports.base = base; function foo(target, propertyKey, parameterIndex) { } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [2.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -46,6 +46,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __param = (this && this.__param) || function (paramIndex, decorator) { return function (target, key) { decorator(target, key, paramIndex); } }; +Object.defineProperty(exports, "__esModule", { value: true }); var _0_ts_1 = require("./0.ts"); var _0_ts_2 = require("./0.ts"); var C = (function (_super) { @@ -59,4 +60,3 @@ C = __decorate([ __param(0, _0_ts_2.foo) ], C); exports.C = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js index 518ddee0a813a..4ed401284a9f5 100644 --- a/tests/baselines/reference/decoratorOnClassConstructor3.js +++ b/tests/baselines/reference/decoratorOnClassConstructor3.js @@ -18,6 +18,7 @@ export class C extends base{ //// [0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var base = (function () { function base() { } @@ -26,7 +27,6 @@ var base = (function () { exports.base = base; function foo(target, propertyKey, parameterIndex) { } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [2.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -48,6 +48,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __param = (this && this.__param) || function (paramIndex, decorator) { return function (target, key) { decorator(target, key, paramIndex); } }; +Object.defineProperty(exports, "__esModule", { value: true }); var _0_1 = require("./0"); var _0_2 = require("./0"); /* Comment on the Class Declaration */ @@ -62,4 +63,3 @@ C = __decorate([ __param(0, _0_2.foo) ], C); exports.C = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js index cba3d6e115c5b..6a31461fe3cf2 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression01.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js @@ -23,9 +23,9 @@ import x from './a'; } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); const x = new Promise((resolve, reject) => { resolve({}); }); exports.default = x; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -46,11 +46,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); const a_1 = require("./a"); (function () { return __awaiter(this, void 0, void 0, function* () { const value = yield a_1.default; }); }()); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js index ea597359a03c6..565cfb416175c 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression02.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js @@ -14,9 +14,9 @@ import x from './a'; //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const x = new Promise((resolve, reject) => { resolve({}); }); exports.default = x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -27,10 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); const a_1 = require("./a"); (function () { return __awaiter(this, void 0, void 0, function* () { const value = yield a_1.default; }); }()); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js index d74cc416e28d5..a273b8916792a 100644 --- a/tests/baselines/reference/defaultExportWithOverloads01.js +++ b/tests/baselines/reference/defaultExportWithOverloads01.js @@ -7,6 +7,7 @@ export default function f(...args: any[]) { //// [defaultExportWithOverloads01.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { var args = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -14,4 +15,3 @@ function f() { } } exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js index bd186fa279d73..aaadfaefebbfd 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge01.js +++ b/tests/baselines/reference/defaultExportsCannotMerge01.js @@ -32,6 +32,7 @@ Entity.y; //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function Decl() { return 0; } @@ -41,13 +42,12 @@ var Decl; Decl.x = 10; Decl.y = 20; })(Decl = exports.Decl || (exports.Decl = {})); -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("m1"); m1_1.default(); var x; var y; m1_1.default.x; m1_1.default.y; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js index 7b26a1aa59f12..b83d54548ca6b 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge02.js +++ b/tests/baselines/reference/defaultExportsCannotMerge02.js @@ -27,19 +27,19 @@ var sum = z.p1 + z.p2 //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Decl = (function () { function Decl() { } return Decl; }()); exports.default = Decl; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("m1"); m1_1.default(); var x; var y; var z = new m1_1.default(); var sum = z.p1 + z.p2; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js index 1b2e53f03046b..254723ec5f1f5 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge03.js +++ b/tests/baselines/reference/defaultExportsCannotMerge03.js @@ -27,19 +27,19 @@ var sum = z.p1 + z.p2 //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Decl = (function () { function Decl() { } return Decl; }()); exports.default = Decl; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("m1"); m1_1.default(); var x; var y; var z = new m1_1.default(); var sum = z.p1 + z.p2; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js index baade8572964f..38ab4861c62b0 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge04.js +++ b/tests/baselines/reference/defaultExportsCannotMerge04.js @@ -15,10 +15,10 @@ export interface Foo { //// [defaultExportsCannotMerge04.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function Foo() { } exports.default = Foo; var Foo; (function (Foo) { })(Foo || (Foo = {})); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js index 214522a56c8db..c5037364b0077 100644 --- a/tests/baselines/reference/defaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js @@ -10,15 +10,15 @@ export default function foo() {} //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class Foo { } exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js index c31174a5acd1d..051ab7bbf03eb 100644 --- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js @@ -9,12 +9,12 @@ export default function foo() {} //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class Foo { } exports.default = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js index 8eb92f872bbe4..5417b9b9a962e 100644 --- a/tests/baselines/reference/defaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js @@ -18,10 +18,10 @@ export default function foo() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class Foo { } exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] (function (factory) { @@ -34,7 +34,7 @@ export default function foo() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js index fd2f277c71adc..285cfbcda16e6 100644 --- a/tests/baselines/reference/dependencyViaImportAlias.js +++ b/tests/baselines/reference/dependencyViaImportAlias.js @@ -13,13 +13,13 @@ export = A; //// [A.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); //// [B.js] define(["require", "exports", "A"], function (require, exports, a) { diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js index 37eed7110670e..a7645ceabe9ea 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations1.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js @@ -7,8 +7,8 @@ export let { toString } = 1; //// [destructuringInVariableDeclarations1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.toString = (1).toString; { let { toFixed } = 1; } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js index 21f272d22a6bc..43a2f740c94bc 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations2.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js @@ -8,8 +8,8 @@ export {}; //// [destructuringInVariableDeclarations2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); let { toString } = 1; { let { toFixed } = 1; } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js index 11e242da1a2e5..2522a704e180a 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations3.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js @@ -8,9 +8,9 @@ export let { toString } = 1; //// [destructuringInVariableDeclarations3.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.toString = (1).toString; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js index 0f25ca3827fba..867417cf01fc5 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations4.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js @@ -9,9 +9,9 @@ export {}; //// [destructuringInVariableDeclarations4.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); let { toString } = 1; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js index 6c799d10803f0..20a094a03750d 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations5.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js @@ -16,9 +16,9 @@ export let { toString } = 1; } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.toString = (1).toString; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js index fcdefe72df63c..583a2cd1f1d24 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations6.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js @@ -17,9 +17,9 @@ export {}; } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); let { toString } = 1; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index b1983c82d15ce..324c0cd9293b0 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -21,6 +21,7 @@ export module M { //// [downlevelLetConst13.js] 'use strict'; +Object.defineProperty(exports, "__esModule", { value: true }); // exported let\const bindings should not be renamed exports.foo = 10; exports.bar = "123"; @@ -37,4 +38,3 @@ var M; M.bar7 = { a: 1 }.a; M.bar8 = { a: 1 }.a; })(M = exports.M || (exports.M = {})); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index c348443fb2917..0deb672456cca 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -347,6 +347,7 @@ export var tests: TestRunner = (function () { //// [duplicateLocalVariable1.js] "use strict"; +exports.__esModule = true; / /; commonjs; var TestFileDir = ".\\TempTestFiles"; @@ -636,4 +637,3 @@ exports.tests = (function () { }, "Codepoint at index: 3 has control value: 8")); return testRunner; })(); -exports.__esModule = true; diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js index 3e89e88fd3c32..2962e544b9b94 100644 --- a/tests/baselines/reference/duplicateLocalVariable2.js +++ b/tests/baselines/reference/duplicateLocalVariable2.js @@ -38,6 +38,7 @@ export var tests: TestRunner = (function () { //// [duplicateLocalVariable2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var TestCase = (function () { function TestCase(name, test, errorMessageRegEx) { this.name = name; @@ -77,5 +78,4 @@ define(["require", "exports"], function (require, exports) { })); return testRunner; })(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index 05af7a2bac87f..5f5590e2b417e 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -68,6 +68,7 @@ export interface D { } //// [duplicateSymbolsExportMatching.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; // Should report error only once for instantiated module var M; (function (M) { @@ -103,5 +104,4 @@ define(["require", "exports"], function (require, exports) { var t; })(C = M.C || (M.C = {})); })(M || (M = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js index 9fc3f4404145b..2c94e692dd015 100644 --- a/tests/baselines/reference/dynamicModuleTypecheckError.js +++ b/tests/baselines/reference/dynamicModuleTypecheckError.js @@ -10,8 +10,8 @@ for(var i = 0; i < 30; i++) { //// [dynamicModuleTypecheckError.js] "use strict"; +exports.__esModule = true; exports.x = 1; for (var i = 0; i < 30; i++) { exports.x = i * 1000; // should not be an error here } -exports.__esModule = true; diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js index ee6fbd2b07f68..f878c5044eaeb 100644 --- a/tests/baselines/reference/elidingImportNames.js +++ b/tests/baselines/reference/elidingImportNames.js @@ -17,17 +17,17 @@ export var main = 10; //// [elidingImportNames_main.js] "use strict"; -exports.main = 10; exports.__esModule = true; +exports.main = 10; //// [elidingImportNames_main1.js] "use strict"; -exports.main = 10; exports.__esModule = true; +exports.main = 10; //// [elidingImportNames_test.js] "use strict"; +exports.__esModule = true; var a = require("./elidingImportNames_main"); // alias used in typeof var b = a; var x; var a2 = require("./elidingImportNames_main1"); // alias not used in typeof var b2 = a2; -exports.__esModule = true; diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js index e8915e406afe8..d98359d94bbab 100644 --- a/tests/baselines/reference/emptyModuleName.js +++ b/tests/baselines/reference/emptyModuleName.js @@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var A = require(""); var B = (function (_super) { __extends(B, _super); @@ -23,4 +24,3 @@ var B = (function (_super) { } return B; }(A)); -exports.__esModule = true; diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js index 9125b5126b23f..2a1865d3ccd0d 100644 --- a/tests/baselines/reference/enumFromExternalModule.js +++ b/tests/baselines/reference/enumFromExternalModule.js @@ -12,14 +12,14 @@ var x = f.Mode.Open; //// [enumFromExternalModule_0.js] "use strict"; +exports.__esModule = true; var Mode; (function (Mode) { Mode[Mode["Open"] = 0] = "Open"; })(Mode = exports.Mode || (exports.Mode = {})); -exports.__esModule = true; //// [enumFromExternalModule_1.js] "use strict"; +exports.__esModule = true; /// var f = require("./enumFromExternalModule_0"); var x = f.Mode.Open; -exports.__esModule = true; diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js index 52d144c1e4927..15ae0c90bd1e6 100644 --- a/tests/baselines/reference/errorsOnImportedSymbol.js +++ b/tests/baselines/reference/errorsOnImportedSymbol.js @@ -20,6 +20,6 @@ var y = Sammy.Sammy(); Object.defineProperty(exports, "__esModule", { value: true }); //// [errorsOnImportedSymbol_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var x = new Sammy.Sammy(); var y = Sammy.Sammy(); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js index 0ad02c848fd6b..d3bb3d006e5f5 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.js +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js @@ -16,6 +16,7 @@ assert(Foo.CONSTANT === "Foo"); //// [es3defaultAliasQuoted_file0.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } @@ -28,9 +29,8 @@ function assert(value) { throw new Error("Assertion failed!"); } exports["default"] = assert; -exports.__esModule = true; //// [es3defaultAliasQuoted_file1.js] "use strict"; +exports.__esModule = true; var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0"); es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo"); -exports.__esModule = true; diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js index 72c954b02f2a4..8ebcfb01be6ec 100644 --- a/tests/baselines/reference/es5-commonjs.js +++ b/tests/baselines/reference/es5-commonjs.js @@ -16,6 +16,7 @@ export default class A //// [es5-commonjs.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -25,4 +26,3 @@ var A = (function () { return A; }()); exports.default = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js index ce15d3a5ce43d..2c38edef6ae44 100644 --- a/tests/baselines/reference/es5-commonjs2.js +++ b/tests/baselines/reference/es5-commonjs2.js @@ -5,5 +5,5 @@ export default 1; //// [es5-commonjs2.js] "use strict"; -exports.default = 1; 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 5fc9462b955d9..15c11b189a3ed 100644 --- a/tests/baselines/reference/es5-commonjs3.js +++ b/tests/baselines/reference/es5-commonjs3.js @@ -6,6 +6,6 @@ export var __esModule = 1; //// [es5-commonjs3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "test"; exports.__esModule = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js index bf28e0645000f..d2530d1bdf2a0 100644 --- a/tests/baselines/reference/es5-commonjs4.js +++ b/tests/baselines/reference/es5-commonjs4.js @@ -17,6 +17,7 @@ export var __esModule = 1; //// [es5-commonjs4.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -27,4 +28,3 @@ var A = (function () { }()); exports.default = A; exports.__esModule = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js index 93a0ed94a5c5a..bbc9bbba7c29f 100644 --- a/tests/baselines/reference/es5-commonjs5.js +++ b/tests/baselines/reference/es5-commonjs5.js @@ -7,8 +7,8 @@ export default function () { //// [es5-commonjs5.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { return "test"; } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js index 33015271d7a04..87d2f7d62a6fd 100644 --- a/tests/baselines/reference/es5-commonjs6.js +++ b/tests/baselines/reference/es5-commonjs6.js @@ -6,6 +6,6 @@ var __esModule = 1; //// [es5-commonjs6.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "test"; var __esModule = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js index 5bb6f87e4e5f5..f62c861b7c99e 100644 --- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js +++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js @@ -19,6 +19,7 @@ export declare function __generator(body: Function): any; //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); function foo() { return tslib_1.__awaiter(this, void 0, void 0, function () { @@ -28,7 +29,6 @@ function foo() { }); } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { return new (P || (P = Promise))(function (resolve, reject) { diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js index 6f129f5e58dad..b55422ca7b1a0 100644 --- a/tests/baselines/reference/es5-umd2.js +++ b/tests/baselines/reference/es5-umd2.js @@ -25,6 +25,7 @@ export class A } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -34,5 +35,4 @@ export class A return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js index 1291c739fcb32..37b19ece1ac88 100644 --- a/tests/baselines/reference/es5-umd3.js +++ b/tests/baselines/reference/es5-umd3.js @@ -25,6 +25,7 @@ export default class A } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -34,5 +35,4 @@ export default class A return A; }()); exports.default = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js index f6817129fb34f..25a1db0a25f4d 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js @@ -7,6 +7,7 @@ export default class C { //// [es5ExportDefaultClassDeclaration.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -14,7 +15,6 @@ var C = (function () { return C; }()); exports.default = C; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js index 5cf3405c43716..931eab75c72f0 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js @@ -7,6 +7,7 @@ export default class { //// [es5ExportDefaultClassDeclaration2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var default_1 = (function () { function default_1() { } @@ -14,7 +15,6 @@ var default_1 = (function () { return default_1; }()); exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration2.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js index d28148d1416e2..927536114efca 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js @@ -16,6 +16,7 @@ var t: typeof C = C; //// [es5ExportDefaultClassDeclaration3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var before = new C(); var C = (function () { function C() { @@ -28,7 +29,6 @@ var C = (function () { exports.default = C; var after = new C(); var t = C; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration3.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js index 6ebab2a4b0dd2..0821543134c8f 100644 --- a/tests/baselines/reference/es5ExportDefaultExpression.js +++ b/tests/baselines/reference/es5ExportDefaultExpression.js @@ -5,8 +5,8 @@ export default (1 + 2); //// [es5ExportDefaultExpression.js] "use strict"; -exports.default = (1 + 2); Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = (1 + 2); //// [es5ExportDefaultExpression.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js index 1060607886a76..068a966faa245 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js @@ -5,9 +5,9 @@ export default function f() { } //// [es5ExportDefaultFunctionDeclaration.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js index 13f9e014be6b5..ab44c4cb584d1 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js @@ -5,9 +5,9 @@ export default function () { } //// [es5ExportDefaultFunctionDeclaration2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration2.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js index 47ed66880e66a..c4bbcd4373e06 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js @@ -10,13 +10,13 @@ var after: typeof func = func(); //// [es5ExportDefaultFunctionDeclaration3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var before = func(); function func() { return func; } exports.default = func; var after = func(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration3.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js index 1102eab997d1b..d60fba590ac13 100644 --- a/tests/baselines/reference/es5ExportDefaultIdentifier.js +++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js @@ -7,10 +7,10 @@ export default f; //// [es5ExportDefaultIdentifier.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.f = f; exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultIdentifier.d.ts] diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js index 28516a541f5de..abc81b3dc94ab 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js @@ -39,6 +39,7 @@ import M3 from "M3"; //// [es5ModuleInternalNamedImports.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var M; (function (M) { // variable @@ -65,5 +66,4 @@ define(["require", "exports"], function (require, exports) { // alias M.M_A = M_M; })(M = exports.M || (exports.M = {})); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js index 02774139add51..dc55545617d1f 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js @@ -14,6 +14,7 @@ export class A //// [es5ModuleWithModuleGenAmd.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js index 4c58c0bd20f81..93056203f9b4e 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js @@ -13,6 +13,7 @@ export class A //// [es5ModuleWithModuleGenCommonjs.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -22,4 +23,3 @@ var A = (function () { return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js index 4479259a5234b..89d11045ddac2 100644 --- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js +++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js @@ -13,6 +13,7 @@ export class A //// [es5ModuleWithoutModuleGenTarget.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -22,4 +23,3 @@ var A = (function () { return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js index 6f1d083ebe8f6..c0707b869cc04 100644 --- a/tests/baselines/reference/es6-umd2.js +++ b/tests/baselines/reference/es6-umd2.js @@ -24,6 +24,7 @@ export class A } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class A { constructor() { } @@ -32,5 +33,4 @@ export class A } } exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index 80d31b41695fd..91910ba26163c 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -18,6 +18,7 @@ export * from "./server"; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } @@ -29,14 +30,13 @@ var m; m.x = 10; })(m = exports.m || (exports.m = {})); exports.x = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } -__export(require("./server")); Object.defineProperty(exports, "__esModule", { value: true }); +__export(require("./server")); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index 98940523143d9..3d3625aad18d7 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -18,6 +18,7 @@ export { x }; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } @@ -32,7 +33,6 @@ var m; exports.instantiatedModule = m; var x = 10; exports.x = x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js index f1cb97ad0f674..d8aa8e607e358 100644 --- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js @@ -19,6 +19,7 @@ export { foo, baz, baz as quux, buzz, bizz }; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var foo = 2; exports.foo = foo; exports.foo = foo = 3; @@ -34,4 +35,3 @@ exports.bizz = bizz; exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1 exports.bizz = bizz -= 1; // similarly exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index 5891de5731084..ecfccd5d84379 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -22,6 +22,7 @@ export { x } from "./server"; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } @@ -33,9 +34,9 @@ var m; m.x = 10; })(m = exports.m || (exports.m = {})); exports.x = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.c = server_1.c; var server_2 = require("./server"); @@ -44,7 +45,6 @@ var server_3 = require("./server"); exports.instantiatedModule = server_3.m; var server_4 = require("./server"); exports.x = server_4.x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js index c84c76839ee76..d1f8de5faa710 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.js +++ b/tests/baselines/reference/es6ExportEqualsInterop.js @@ -213,6 +213,7 @@ export * from "class-module"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +exports.__esModule = true; var z2 = require("variable"); var z3 = require("interface-variable"); var z4 = require("module"); @@ -304,4 +305,3 @@ __export(require("function")); __export(require("function-module")); __export(require("class")); __export(require("class-module")); -exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js index 035a8c0be25bd..977b94f879031 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js +++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js @@ -14,15 +14,15 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import //// [es6ImportDefaultBindingAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [es6ImportDefaultBindingAmd_1.js] define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) { "use strict"; - var x = es6ImportDefaultBindingAmd_0_1.default; Object.defineProperty(exports, "__esModule", { value: true }); + var x = es6ImportDefaultBindingAmd_0_1.default; }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js index 6f4836a668054..94b824a3766b8 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js @@ -13,18 +13,18 @@ import defaultBinding2 from "./server"; // elide this import since defaultBindin //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } return c; }()); exports.default = c; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.x = new server_1.default(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js index 66be06536f035..8335a1953de0e 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js @@ -24,13 +24,14 @@ var x1: number = m; //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; exports.default = {}; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a; const es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); @@ -42,7 +43,6 @@ const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportD var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x; const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index 4712a4325032b..8eb76b487f8db 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -22,11 +22,12 @@ var x: number = defaultBinding6; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); @@ -39,7 +40,6 @@ var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6Imp var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js index 5d2518bb7742d..d72751c7610bd 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js @@ -22,11 +22,12 @@ export var x1: number = defaultBinding6; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.x1 = server_1.default; var server_2 = require("./server"); @@ -39,7 +40,6 @@ var server_5 = require("./server"); exports.x1 = server_5.default; var server_6 = require("./server"); exports.x1 = server_6.default; -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js index 0556d87248006..5bf268709d38a 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js @@ -26,6 +26,7 @@ export var x6 = new m(); //// [server.js] "use strict"; +exports.__esModule = true; var a = (function () { function a() { } @@ -62,9 +63,9 @@ var x11 = (function () { return x11; }()); exports.x11 = x11; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var server_1 = require("./server"); exports.x1 = new server_1.a(); var server_2 = require("./server"); @@ -76,7 +77,6 @@ var server_4 = require("./server"); exports.x3 = new server_4.x11(); var server_5 = require("./server"); exports.x6 = new server_5.m(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index f52c590f44e80..307dcc92f4668 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -21,15 +21,16 @@ export var x6 = new defaultBinding6(); //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = (function () { function a() { } return a; }()); exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.x1 = new server_1.default(); var server_2 = require("./server"); @@ -42,7 +43,6 @@ var server_5 = require("./server"); exports.x5 = new server_5.default(); var server_6 = require("./server"); exports.x6 = new server_6.default(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js index dcc2ec2c7859d..2e9d8104a39c4 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js @@ -23,12 +23,13 @@ var x1: number = m; //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); @@ -40,7 +41,6 @@ var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6Impo var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js index 247c64c3e7f41..77266084bda3c 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js @@ -25,22 +25,22 @@ export var x1: number = m; //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; exports.default = {}; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [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"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.x1 = server_1.a; exports.x1 = server_2.a; exports.x1 = server_3.x; exports.x1 = server_3.a; exports.x1 = server_4.x; exports.x1 = server_5.m; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js index db922cb220037..c1c419689341f 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js @@ -11,14 +11,14 @@ var x: number = defaultBinding; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js index fbd045e81de42..b82fb9aeee96f 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js @@ -12,15 +12,15 @@ export var x: number = defaultBinding; //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; - exports.x = server_1.default; Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = server_1.default; }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index 8b430e2cf46d5..8d033c6953626 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -10,18 +10,18 @@ export var x = new nameSpaceBinding.a(); //// [server.js] "use strict"; +exports.__esModule = true; var a = (function () { function a() { } return a; }()); exports.a = a; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var nameSpaceBinding = require("./server"); exports.x = new nameSpaceBinding.a(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js index 09caf0db18ae2..c488db3e88e52 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js @@ -12,19 +12,19 @@ export var x = new defaultBinding(); //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = (function () { function a() { } return a; }()); exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; - exports.x = new server_1.default(); Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = new server_1.default(); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index 92e3fe0a33f19..0db21dfd064ea 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -10,13 +10,13 @@ var x: number = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); var x = nameSpaceBinding.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js index 0b5670b18a976..96720294a8af9 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js @@ -10,13 +10,13 @@ export var x: number = nameSpaceBinding.a; //// [server.js] "use strict"; -exports.a = 10; exports.__esModule = true; +exports.a = 10; //// [client.js] "use strict"; +exports.__esModule = true; var nameSpaceBinding = require("./server"); exports.x = nameSpaceBinding.a; -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js index b9f73ac47ebb2..4c51a54462d65 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js +++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js @@ -18,12 +18,12 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould //// [es6ImportDefaultBindingMergeErrors_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingMergeErrors_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); var x = es6ImportDefaultBindingMergeErrors_0_1.default; var defaultBinding2 = "hello world"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js index 265be908b8588..e294c08befa7e 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js +++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js @@ -10,8 +10,8 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0"; //// [es6ImportDefaultBindingNoDefaultProperty_0.js] "use strict"; -exports.a = 10; exports.__esModule = true; +exports.a = 10; //// [es6ImportDefaultBindingNoDefaultProperty_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js index 6ea0812d40b9a..a9f760f127869 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js @@ -13,15 +13,15 @@ export import defaultBinding2 from "server"; // non referenced //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; - exports.x = server_1.default; Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = server_1.default; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js index 510750edc50d0..b5296d15f9bef 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImport.js @@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this //// [es6ImportNameSpaceImport_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNameSpaceImport_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); var x = nameSpaceBinding.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js index ea2403383168e..200f49a298655 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js @@ -13,14 +13,14 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi //// [es6ImportNameSpaceImportAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.a = 10; exports.__esModule = true; + exports.a = 10; }); //// [es6ImportNameSpaceImportAmd_1.js] define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) { "use strict"; - var x = nameSpaceBinding.a; exports.__esModule = true; + var x = nameSpaceBinding.a; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js index 20b9d3af20bc8..cae90885ce21d 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js @@ -11,6 +11,7 @@ import * as nameSpaceBinding2 from "./server"; // unreferenced //// [server.js] "use strict"; +exports.__esModule = true; var c = (function () { function c() { } @@ -18,12 +19,11 @@ var c = (function () { }()); exports.c = c; ; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var nameSpaceBinding = require("./server"); exports.x = new nameSpaceBinding.c(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js index 88bf937c69c79..ee00df9a2cc55 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js @@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide //// [es6ImportNameSpaceImportInEs5_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNameSpaceImportInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); var x = nameSpaceBinding.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js index 696659cb1f756..39594102007ba 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js @@ -17,9 +17,9 @@ var nameSpaceBinding3 = 10; //// [es6ImportNameSpaceImportMergeErrors_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNameSpaceImportMergeErrors_1.js] "use strict"; -var nameSpaceBinding3 = 10; Object.defineProperty(exports, "__esModule", { value: true }); +var nameSpaceBinding3 = 10; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js index 1663d7ec9238a..3c8b40f550e06 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js @@ -13,14 +13,14 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.a = 10; exports.__esModule = true; + exports.a = 10; }); //// [client.js] define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) { "use strict"; - exports.x = nameSpaceBinding.a; exports.__esModule = true; + exports.x = nameSpaceBinding.a; }); diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js index 9719305e62b50..a9fcb861ec510 100644 --- a/tests/baselines/reference/es6ImportNamedImport.js +++ b/tests/baselines/reference/es6ImportNamedImport.js @@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImport_0"; //// [es6ImportNamedImport_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -51,9 +52,9 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImport_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_1.a; const es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0"); @@ -75,7 +76,6 @@ const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0"); var z111 = es6ImportNamedImport_0_8.z1; const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0"); var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js index 31582223c52cc..bd6213f259fc5 100644 --- a/tests/baselines/reference/es6ImportNamedImportAmd.js +++ b/tests/baselines/reference/es6ImportNamedImportAmd.js @@ -44,6 +44,7 @@ import { aaaa as bbbb } from "es6ImportNamedImportAmd_0"; //// [es6ImportNamedImportAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -52,11 +53,11 @@ define(["require", "exports"], function (require, exports) { exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; - exports.__esModule = true; }); //// [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"; + exports.__esModule = true; var xxxx = es6ImportNamedImportAmd_0_1.a; var xxxx = es6ImportNamedImportAmd_0_2.a; var xxxx = es6ImportNamedImportAmd_0_3.x; @@ -69,7 +70,6 @@ define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImport var xxxx = es6ImportNamedImportAmd_0_7.x1; var z111 = es6ImportNamedImportAmd_0_8.z1; var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error - exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js index f8fdf4616445c..d68ffd794a728 100644 --- a/tests/baselines/reference/es6ImportNamedImportDts.js +++ b/tests/baselines/reference/es6ImportNamedImportDts.js @@ -48,6 +48,7 @@ import { aaaa1 as bbbb } from "./server"; //// [server.js] "use strict"; +exports.__esModule = true; var a = (function () { function a() { } @@ -132,9 +133,9 @@ var aaaa1 = (function () { return aaaa1; }()); exports.aaaa1 = aaaa1; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var server_1 = require("./server"); exports.xxxx = new server_1.a(); var server_2 = require("./server"); @@ -156,7 +157,6 @@ var server_8 = require("./server"); exports.z111 = new server_8.z1(); var server_9 = require("./server"); exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js index 5c6f3573c7fc1..9e025dca61be9 100644 --- a/tests/baselines/reference/es6ImportNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js @@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0"; //// [es6ImportNamedImportInEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -51,9 +52,9 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImportInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0"); var xxxx = es6ImportNamedImportInEs5_0_1.a; var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0"); @@ -75,7 +76,6 @@ var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0"); var z111 = es6ImportNamedImportInEs5_0_8.z1; var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0"); var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js index 0743f1658b49f..d64b517c50f4c 100644 --- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js @@ -10,8 +10,8 @@ export = a; //// [es6ImportNamedImportInExportAssignment_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNamedImportInExportAssignment_1.js] "use strict"; const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index ce878ca021661..38cda17bd7efe 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -14,6 +14,7 @@ export = x; //// [es6ImportNamedImportInIndirectExportAssignment_0.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var c = (function () { @@ -23,7 +24,6 @@ var a; }()); a.c = c; })(a = exports.a || (exports.a = {})); -exports.__esModule = true; //// [es6ImportNamedImportInIndirectExportAssignment_1.js] "use strict"; var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js index 11bd3b73a9ec7..261039bcc10bc 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js @@ -22,13 +22,13 @@ import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be erro //// [es6ImportNamedImportMergeErrors_0.js] "use strict"; +exports.__esModule = true; exports.a = 10; exports.x = exports.a; exports.z = exports.a; exports.z1 = exports.a; -exports.__esModule = true; //// [es6ImportNamedImportMergeErrors_1.js] "use strict"; +exports.__esModule = true; var x = 10; var x44 = 10; -exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js index 87f3c1d5d072e..4e78df34b6d30 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js +++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js @@ -11,9 +11,9 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0"; //// [es6ImportNamedImportNoExportMember_0.js] "use strict"; +exports.__esModule = true; exports.a = 10; exports.x = exports.a; -exports.__esModule = true; //// [es6ImportNamedImport_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js index 7377f737e470c..13e2d40144b26 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js @@ -42,6 +42,7 @@ export import { aaaa as bbbb } from "./server"; //// [server.js] "use strict"; +exports.__esModule = true; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -50,9 +51,9 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var server_1 = require("./server"); exports.xxxx = server_1.a; var server_2 = require("./server"); @@ -74,7 +75,6 @@ var server_8 = require("./server"); exports.z111 = server_8.z1; var server_9 = require("./server"); exports.z2 = server_9.z2; // z2 shouldn't give redeclare error -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js index 1bbab226ae8e2..0aa3214e5d708 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js @@ -22,6 +22,7 @@ export var cVal = new C(); //// [server.js] "use strict"; +exports.__esModule = true; var C = (function () { function C() { this.prop = "hello"; @@ -36,12 +37,11 @@ var C2 = (function () { return C2; }()); exports.C2 = C2; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; 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(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js index c90ea418f26f5..d83ba9370eecb 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js @@ -16,21 +16,21 @@ var _b = 10; //// [es6ImportWithoutFromClauseAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.a = 10; exports.__esModule = true; + exports.a = 10; }); //// [es6ImportWithoutFromClauseAmd_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.b = 10; exports.__esModule = true; + exports.b = 10; }); //// [es6ImportWithoutFromClauseAmd_2.js] define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) { "use strict"; + exports.__esModule = true; var _a = 10; var _b = 10; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js index 0262cfdd045f9..b11e2ea9a07e2 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js @@ -9,12 +9,12 @@ import "es6ImportWithoutFromClauseInEs5_0"; //// [es6ImportWithoutFromClauseInEs5_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportWithoutFromClauseInEs5_1.js] "use strict"; -require("es6ImportWithoutFromClauseInEs5_0"); Object.defineProperty(exports, "__esModule", { value: true }); +require("es6ImportWithoutFromClauseInEs5_0"); //// [es6ImportWithoutFromClauseInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index 71874fc7b405f..99214d2a2c6c8 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -9,12 +9,12 @@ export import "server"; //// [server.js] "use strict"; -exports.a = 10; exports.__esModule = true; +exports.a = 10; //// [client.js] "use strict"; -require("server"); exports.__esModule = true; +require("server"); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js index bd45a62e2f400..4ced3a35ab27f 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js @@ -14,6 +14,7 @@ export class A //// [es6ModuleWithModuleGenTargetAmd.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class A { constructor() { } @@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) { } } exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js index a7cf0599e5435..187ece7e718ba 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js @@ -13,6 +13,7 @@ export class A //// [es6ModuleWithModuleGenTargetCommonjs.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class A { constructor() { } @@ -21,4 +22,3 @@ class A { } } exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js index b2a01bbb552d5..d19de0c78b07b 100644 --- a/tests/baselines/reference/exportAndImport-es3-amd.js +++ b/tests/baselines/reference/exportAndImport-es3-amd.js @@ -15,17 +15,17 @@ export default function f2() { //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function f1() { } exports["default"] = f1; - exports.__esModule = true; }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { "use strict"; + exports.__esModule = true; function f2() { m1_1["default"](); } exports["default"] = f2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js index 898261ef7fea6..13b6f1eaf4804 100644 --- a/tests/baselines/reference/exportAndImport-es3.js +++ b/tests/baselines/reference/exportAndImport-es3.js @@ -14,15 +14,15 @@ export default function f2() { //// [m1.js] "use strict"; +exports.__esModule = true; function f1() { } exports["default"] = f1; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); function f2() { m1_1["default"](); } exports["default"] = f2; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js index fcc918bb8cead..60b1246b616dc 100644 --- a/tests/baselines/reference/exportAndImport-es5-amd.js +++ b/tests/baselines/reference/exportAndImport-es5-amd.js @@ -15,17 +15,17 @@ export default function f2() { //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function f1() { } exports.default = f1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function f2() { m1_1.default(); } exports.default = f2; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js index fa1652c603e3b..f4bc496e6b254 100644 --- a/tests/baselines/reference/exportAndImport-es5.js +++ b/tests/baselines/reference/exportAndImport-es5.js @@ -14,15 +14,15 @@ export default function f2() { //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f1() { } exports.default = f1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("./m1"); function f2() { m1_1.default(); } exports.default = f2; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js index 641500fa09d5e..b556810976362 100644 --- a/tests/baselines/reference/exportArrayBindingPattern.js +++ b/tests/baselines/reference/exportArrayBindingPattern.js @@ -5,8 +5,8 @@ export { a, b }; //// [exportArrayBindingPattern.js] "use strict"; +exports.__esModule = true; // issue: https://github.com/Microsoft/TypeScript/issues/10778 var _a = [1, 2, 3], a = _a[0], b = _a[2]; exports.a = a; exports.b = b; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js index f557bc5d9a45f..9f3eaf78480ba 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.js +++ b/tests/baselines/reference/exportAssignClassAndModule.js @@ -28,7 +28,7 @@ var Foo = (function () { module.exports = Foo; //// [exportAssignClassAndModule_1.js] "use strict"; +exports.__esModule = true; var z; var zz; zz.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js index a39a7aa04cd23..592d97dbaa0d3 100644 --- a/tests/baselines/reference/exportAssignDottedName.js +++ b/tests/baselines/reference/exportAssignDottedName.js @@ -12,11 +12,11 @@ export = foo1.x; // Ok //// [foo1.js] "use strict"; +exports.__esModule = true; function x() { return true; } exports.x = x; -exports.__esModule = true; //// [foo2.js] "use strict"; var foo1 = require("./foo1"); diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js index 09daa469ef48b..208df4eff6300 100644 --- a/tests/baselines/reference/exportAssignImportedIdentifier.js +++ b/tests/baselines/reference/exportAssignImportedIdentifier.js @@ -16,11 +16,11 @@ var x = foo2(); // should be boolean //// [foo1.js] "use strict"; +exports.__esModule = true; function x() { return true; } exports.x = x; -exports.__esModule = true; //// [foo2.js] "use strict"; var foo1 = require("./foo1"); @@ -28,6 +28,6 @@ var x = foo1.x; module.exports = x; //// [foo3.js] "use strict"; +exports.__esModule = true; var foo2 = require("./foo2"); var x = foo2(); // should be boolean -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js index 645f44545fe91..bed4480f3935d 100644 --- a/tests/baselines/reference/exportAssignTypes.js +++ b/tests/baselines/reference/exportAssignTypes.js @@ -85,6 +85,7 @@ function x(a) { module.exports = x; //// [consumer.js] "use strict"; +exports.__esModule = true; var iString = require("./expString"); var v1 = iString; var iNumber = require("./expNumber"); @@ -99,4 +100,3 @@ var iAny = require("./expAny"); var v6 = iAny; var iGeneric = require("./expGeneric"); var v7 = iGeneric; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js index e1bdf0d544f0e..d4b6961cfe95a 100644 --- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js +++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js @@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignedTypeAsTypeAnnotation_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var t2; // should not raise a 'container type' error exports.__esModule = true; + var t2; // should not raise a 'container type' error }); diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js index 265afdfd04130..549ad5bbd4dcb 100644 --- a/tests/baselines/reference/exportAssignmentClass.js +++ b/tests/baselines/reference/exportAssignmentClass.js @@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignmentClass_B.js] define(["require", "exports", "exportAssignmentClass_A"], function (require, exports, D) { "use strict"; + exports.__esModule = true; var d = new D(); var x = d.p; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js index 003927c251140..eddbddf8d6d87 100644 --- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js +++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js @@ -24,8 +24,8 @@ var Foo = (function () { module.exports = Foo; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); var x = new foo(true); // Should error var y = new foo({ a: "test", b: 42 }); // Should be OK var z = y.test.b; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js index a30868a18e5a2..a32da0a2e3f78 100644 --- a/tests/baselines/reference/exportAssignmentEnum.js +++ b/tests/baselines/reference/exportAssignmentEnum.js @@ -27,8 +27,8 @@ var E; module.exports = E; //// [exportAssignmentEnum_B.js] "use strict"; +exports.__esModule = true; var EnumE = require("./exportAssignmentEnum_A"); var a = EnumE.A; var b = EnumE.B; var c = EnumE.C; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js index 5743490fec308..775bb6b1af195 100644 --- a/tests/baselines/reference/exportAssignmentFunction.js +++ b/tests/baselines/reference/exportAssignmentFunction.js @@ -19,6 +19,6 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignmentFunction_B.js] define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) { "use strict"; - var n = fooFunc(); exports.__esModule = true; + var n = fooFunc(); }); diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js index 3ef295639fd27..95563aa36a9dd 100644 --- a/tests/baselines/reference/exportAssignmentGenericType.js +++ b/tests/baselines/reference/exportAssignmentGenericType.js @@ -22,7 +22,7 @@ var Foo = (function () { module.exports = Foo; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); var x = new foo(); var y = x.test; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js index 8f4403cf40a38..f3cc9ae9bbe8c 100644 --- a/tests/baselines/reference/exportAssignmentInterface.js +++ b/tests/baselines/reference/exportAssignmentInterface.js @@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignmentInterface_B.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var i; var n = i.p1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js index e4ba7a9f7d8ae..b5c45785f8ff0 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.js +++ b/tests/baselines/reference/exportAssignmentInternalModule.js @@ -23,6 +23,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; exports.__esModule = true; + var n = modM.x; }); diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js index ba77f90557f8f..3ee760dedfa54 100644 --- a/tests/baselines/reference/exportAssignmentMergedInterface.js +++ b/tests/baselines/reference/exportAssignmentMergedInterface.js @@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var x; x("test"); x(42); @@ -37,5 +38,4 @@ define(["require", "exports"], function (require, exports) { if (!!x.c) { } var z = { x: 1, y: 2 }; z = x.d; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js index 59008dfc37068..ef48895b5cb7c 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.js +++ b/tests/baselines/reference/exportAssignmentMergedModule.js @@ -47,9 +47,9 @@ var Foo; module.exports = Foo; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); var a = foo.a(); if (!!foo.b) { foo.Test.answer = foo.c(42); } -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js index 280e93f8c016d..6c61eeedfc110 100644 --- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js +++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js @@ -21,9 +21,9 @@ var b = z(); // call signature - no error exports.__esModule = true; //// [exportAssignmentOfDeclaredExternalModule_1.js] "use strict"; +exports.__esModule = true; 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' var a = new z(); // constructor - no error var b = z(); // call signature - no error -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js index f4417f871e913..9cd15ec01a4c4 100644 --- a/tests/baselines/reference/exportAssignmentOfGenericType1.js +++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js @@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (require, exports, q) { "use strict"; + exports.__esModule = true; var M = (function (_super) { __extends(M, _super); function M() { @@ -45,5 +46,4 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req }(q)); var m; var r = m.foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js index 44afbca1f691e..f4001e5ab1572 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js @@ -33,8 +33,8 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.answer === 42) { var x = new foo(); } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js index a6abc6aa37dd2..7ba5a655c2010 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js @@ -34,9 +34,9 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; var color; if (color === foo.green) { color = foo.answer; } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js index 4c0abd1d650f5..f122b8fbe8b06 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js @@ -30,8 +30,8 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.answer === 42) { var x = foo(); } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js index 0d31a25623cf8..a7acbaf34967c 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js @@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.answer === 42) { } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js index 8f9c02ecfbb02..e6ccdb46f9a5e 100644 --- a/tests/baselines/reference/exportAssignmentVariable.js +++ b/tests/baselines/reference/exportAssignmentVariable.js @@ -16,6 +16,6 @@ var x = 0; module.exports = x; //// [exportAssignmentVariable_B.js] "use strict"; +exports.__esModule = true; var y = require("./exportAssignmentVariable_A"); var n = y; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js index 6c3a951841d2c..e0165098b20c5 100644 --- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js +++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js @@ -22,23 +22,23 @@ export { x as a, } from //// [t1.js] "use strict"; -exports.x = "x"; exports.__esModule = true; +exports.x = "x"; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.x = t1_1.x; -exports.__esModule = true; //// [t3.js] "use strict"; exports.__esModule = true; //// [t4.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.a = t1_1.x; -exports.__esModule = true; //// [t5.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.a = t1_1.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js index 23ce59f2402ea..950b3db26e51d 100644 --- a/tests/baselines/reference/exportDeclareClass1.js +++ b/tests/baselines/reference/exportDeclareClass1.js @@ -12,7 +12,7 @@ //// [exportDeclareClass1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; ; ; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js index 08d62eb3782c2..473ebaa0492e0 100644 --- a/tests/baselines/reference/exportDeclaredModule.js +++ b/tests/baselines/reference/exportDeclaredModule.js @@ -17,6 +17,6 @@ var x: number = foo1.b(); module.exports = M1; //// [foo2.js] "use strict"; +exports.__esModule = true; var foo1 = require("./foo1"); var x = foo1.b(); -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js index 04ad89f9dc042..dddea6a6b7342 100644 --- a/tests/baselines/reference/exportDefaultProperty.js +++ b/tests/baselines/reference/exportDefaultProperty.js @@ -43,6 +43,7 @@ fooLength + 1; //// [a.js] "use strict"; +exports.__esModule = true; var A; (function (A) { var B = (function () { @@ -56,13 +57,13 @@ var A; })(B = A.B || (A.B = {})); })(A || (A = {})); exports["default"] = A.B; -exports.__esModule = true; //// [b.js] "use strict"; -exports["default"] = "foo".length; exports.__esModule = true; +exports["default"] = "foo".length; //// [index.js] "use strict"; +exports.__esModule = true; /// var foobar_1 = require("foobar"); var X = foobar_1["default"].X; @@ -73,4 +74,3 @@ var a_1 = require("./a"); var b = new a_1["default"](a_1["default"].b); var b_1 = require("./b"); b_1["default"] + 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js index 861acb7347cd9..4922738430acf 100644 --- a/tests/baselines/reference/exportDefaultProperty2.js +++ b/tests/baselines/reference/exportDefaultProperty2.js @@ -20,15 +20,15 @@ const x: B = { c: B }; //// [a.js] // This test is just like exportEqualsProperty2, but with `export default`. "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports["default"] = C.B; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var a_1 = require("./a"); var x = { c: a_1["default"] }; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js index d8347b62944ec..177e3943ac717 100644 --- a/tests/baselines/reference/exportEqualCallable.js +++ b/tests/baselines/reference/exportEqualCallable.js @@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) { //// [exportEqualCallable_1.js] define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) { "use strict"; - connect(); exports.__esModule = true; + connect(); }); diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js index f8d0afe95da8e..4a65ce5fd4908 100644 --- a/tests/baselines/reference/exportEqualErrorType.js +++ b/tests/baselines/reference/exportEqualErrorType.js @@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) { //// [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 ''. exports.__esModule = true; + 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 3a4982a7434d6..68ac9485f5f2b 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.js +++ b/tests/baselines/reference/exportEqualMemberMissing.js @@ -27,7 +27,7 @@ var server; module.exports = server; //// [exportEqualMemberMissing_1.js] "use strict"; +exports.__esModule = true; /// var connect = require("./exportEqualMemberMissing_0"); connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js index 3cf456818072a..9cf7a7b2ee8a3 100644 --- a/tests/baselines/reference/exportEqualsDefaultProperty.js +++ b/tests/baselines/reference/exportEqualsDefaultProperty.js @@ -23,6 +23,6 @@ var x = { module.exports = x; //// [imp.js] "use strict"; +exports.__esModule = true; var exp_1 = require("./exp"); exp_1["default"].toExponential(2); -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js index feb5e563903ee..e6bd09d536743 100644 --- a/tests/baselines/reference/exportEqualsProperty.js +++ b/tests/baselines/reference/exportEqualsProperty.js @@ -60,6 +60,7 @@ module.exports = A.B; module.exports = "foo".length; //// [index.js] "use strict"; +exports.__esModule = true; /// var foobar_1 = require("foobar"); var X2 = require("foobarx"); @@ -69,4 +70,3 @@ var B = require("./a"); var b = new B(B.b); var fooLength = require("./b"); fooLength + 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js index f51a130e572f0..36fcbdf34469f 100644 --- a/tests/baselines/reference/exportEqualsProperty2.js +++ b/tests/baselines/reference/exportEqualsProperty2.js @@ -28,6 +28,6 @@ var C = (function () { module.exports = C.B; //// [b.js] "use strict"; +exports.__esModule = true; var B = require("./a"); var x = { c: B }; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js index d947393c05f89..615f3d266abb0 100644 --- a/tests/baselines/reference/exportImport.js +++ b/tests/baselines/reference/exportImport.js @@ -29,17 +29,17 @@ define(["require", "exports"], function (require, exports) { //// [exporter.js] define(["require", "exports", "./w1"], function (require, exports, w) { "use strict"; - exports.w = w; exports.__esModule = true; + exports.w = w; }); //// [consumer.js] define(["require", "exports", "./exporter"], function (require, exports, e) { "use strict"; + exports.__esModule = true; function w() { return new e.w(); } exports.w = w; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js index 7defcbac0448b..31f5f218d6574 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.js +++ b/tests/baselines/reference/exportImportMultipleFiles.js @@ -15,20 +15,20 @@ lib.math.add(3, 4); // Shouldnt be error //// [exportImportMultipleFiles_math.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function add(a, b) { return a + b; } exports.add = add; - exports.__esModule = true; }); //// [exportImportMultipleFiles_library.js] define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) { "use strict"; + exports.__esModule = true; exports.math = math; exports.math.add(3, 4); // OK - exports.__esModule = true; }); //// [exportImportMultipleFiles_userCode.js] define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) { "use strict"; - lib.math.add(3, 4); // Shouldnt be error exports.__esModule = true; + lib.math.add(3, 4); // Shouldnt be error }); diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js index 77eb0c35ce690..1394d7492dda1 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js @@ -28,11 +28,11 @@ define(["require", "exports"], function (require, exports) { //// [consumer.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function w() { return { name: 'value' }; } exports.w = w; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js index ba7f938086597..f7ee0b8d4d890 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js @@ -37,6 +37,7 @@ export let h1: D = new D; //// [exportNonInitializedVariablesAMD.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var ; let; var ; @@ -67,5 +68,4 @@ define(["require", "exports"], function (require, exports) { exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js index bf30e45f1ca33..7623127aee8f3 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js @@ -36,6 +36,7 @@ export let h1: D = new D; //// [exportNonInitializedVariablesCommonJS.js] "use strict"; +exports.__esModule = true; var ; let; var ; @@ -66,4 +67,3 @@ exports.e1 = new D; exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js index 1b26cfe3c1aea..504c6e700841c 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js @@ -45,6 +45,7 @@ export let h1: D = new D; } })(function (require, exports) { "use strict"; + exports.__esModule = true; var ; let; var ; @@ -75,5 +76,4 @@ export let h1: D = new D; exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js index a9ec4591c6c89..c3e97cf3e106b 100644 --- a/tests/baselines/reference/exportRedeclarationTypeAliases.js +++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js @@ -5,6 +5,6 @@ export function Foo(): any {} //// [exportRedeclarationTypeAliases.js] "use strict"; +exports.__esModule = true; function Foo() { } exports.Foo = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js index e5fa8913ffd63..dc0b24b98c3a3 100644 --- a/tests/baselines/reference/exportSameNameFuncVar.js +++ b/tests/baselines/reference/exportSameNameFuncVar.js @@ -6,9 +6,9 @@ export function a() { //// [exportSameNameFuncVar.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = 10; function a() { } exports.a = a; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js index b117972450eec..fe59f5071f2b8 100644 --- a/tests/baselines/reference/exportSpecifierForAGlobal.js +++ b/tests/baselines/reference/exportSpecifierForAGlobal.js @@ -14,12 +14,12 @@ export function f() { //// [b.js] "use strict"; +exports.__esModule = true; function f() { var x; return x; } exports.f = f; -exports.__esModule = true; //// [b.d.ts] diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js index 9a4def0dd7858..f25a68a5aa625 100644 --- a/tests/baselines/reference/exportStar-amd.js +++ b/tests/baselines/reference/exportStar-amd.js @@ -32,28 +32,28 @@ foo; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.x = 1; exports.y = 2; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } exports.foo = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var x = "x"; exports.x = x; var y = "y"; exports.y = y; var z = "z"; exports.z = z; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t4.js] define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) { @@ -61,18 +61,18 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + Object.defineProperty(exports, "__esModule", { value: true }); __export(t1_1); __export(t2_1); __export(t3_1); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [main.js] define(["require", "exports", "./t4"], function (require, exports, t4_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); t4_1.default; t4_1.x; t4_1.y; t4_1.z; t4_1.foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js index 4b9ec28f6aa31..a188cefd8b6ce 100644 --- a/tests/baselines/reference/exportStar.js +++ b/tests/baselines/reference/exportStar.js @@ -31,39 +31,39 @@ foo; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.x = 1; exports.y = 2; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var x = "x"; exports.x = x; var y = "y"; exports.y = y; var z = "z"; exports.z = z; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t4.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +Object.defineProperty(exports, "__esModule", { value: true }); __export(require("./t1")); __export(require("./t2")); __export(require("./t3")); -Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t4_1 = require("./t4"); t4_1.default; t4_1.x; t4_1.y; t4_1.z; t4_1.foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js index 3b74564d4d169..8376ec1927e93 100644 --- a/tests/baselines/reference/exportStarForValues.js +++ b/tests/baselines/reference/exportStarForValues.js @@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x; exports.__esModule = true; + var x; }); diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js index 74b28ef6d00d0..f18f9f1c587f1 100644 --- a/tests/baselines/reference/exportStarForValues2.js +++ b/tests/baselines/reference/exportStarForValues2.js @@ -20,12 +20,12 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js index 52e18851fc990..5ccd12f8a37e0 100644 --- a/tests/baselines/reference/exportStarForValues3.js +++ b/tests/baselines/reference/exportStarForValues3.js @@ -32,24 +32,24 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file5.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js index 7697100842e00..e06b5e26207de 100644 --- a/tests/baselines/reference/exportStarForValues4.js +++ b/tests/baselines/reference/exportStarForValues4.js @@ -24,12 +24,12 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js index 1311e215fce77..1f5163dd9cd36 100644 --- a/tests/baselines/reference/exportStarForValues7.js +++ b/tests/baselines/reference/exportStarForValues7.js @@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports, file2_1) { @@ -29,7 +29,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file2_1); exports.x = 1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js index b6ee3c56ae730..6f52bce89f97f 100644 --- a/tests/baselines/reference/exportStarForValues8.js +++ b/tests/baselines/reference/exportStarForValues8.js @@ -32,14 +32,14 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file4.js] define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) { @@ -47,10 +47,10 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file2_1); __export(file3_1); exports.x = 1; - exports.__esModule = true; }); //// [file5.js] define(["require", "exports", "file4"], function (require, exports, file4_1) { @@ -58,7 +58,7 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file4_1); exports.x = 1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js index 5d24c558ec06f..3c34bb1afdb71 100644 --- a/tests/baselines/reference/exportStarForValues9.js +++ b/tests/baselines/reference/exportStarForValues9.js @@ -27,9 +27,9 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file2_1); exports.x = 1; - exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "file3"], function (require, exports, file3_1) { @@ -37,7 +37,7 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file3_1); exports.x = 1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index 44ece87187456..4fcac9312b987 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -25,13 +25,13 @@ X.A.r; // Error //// [exportStarFromEmptyModule_module1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module2.js] // empty //// [exportStarFromEmptyModule_module3.js] @@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +Object.defineProperty(exports, "__esModule", { value: true }); __export(require("./exportStarFromEmptyModule_module2")); __export(require("./exportStarFromEmptyModule_module1")); var A = (function () { @@ -47,14 +48,13 @@ var A = (function () { return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module4.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var X = require("./exportStarFromEmptyModule_module3"); var s; X.A.q; X.A.r; // Error -Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module1.d.ts] diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js index ee9482c655ff5..d527a02741c95 100644 --- a/tests/baselines/reference/exportToString.js +++ b/tests/baselines/reference/exportToString.js @@ -5,6 +5,6 @@ export { toString }; //// [exportToString.js] "use strict"; +exports.__esModule = true; var toString = 0; exports.toString = toString; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js index d66cf54312488..fbb2555d54b75 100644 --- a/tests/baselines/reference/exportVisibility.js +++ b/tests/baselines/reference/exportVisibility.js @@ -11,6 +11,7 @@ export function test(foo: Foo) { //// [exportVisibility.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } @@ -22,4 +23,3 @@ function test(foo) { return true; } exports.test = test; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js index 357e7dc25f448..068ac5db23b84 100644 --- a/tests/baselines/reference/exportedBlockScopedDeclarations.js +++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js @@ -20,6 +20,7 @@ namespace NS1 { //// [exportedBlockScopedDeclarations.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var foo = foo; // compile error exports.bar = exports.bar; // should be compile error function f() { @@ -38,5 +39,4 @@ define(["require", "exports"], function (require, exports) { (function (NS1) { NS1.bar1 = NS1.bar1; // should be compile error })(NS1 || (NS1 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js index 11737e21e734f..80a7fc6a39152 100644 --- a/tests/baselines/reference/exportedVariable1.js +++ b/tests/baselines/reference/exportedVariable1.js @@ -6,7 +6,7 @@ var upper = foo.name.toUpperCase(); //// [exportedVariable1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.foo = { name: "Bill" }; var upper = exports.foo.name.toUpperCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js index 5e9d0f2edf251..d50a2a35f0618 100644 --- a/tests/baselines/reference/exportingContainingVisibleType.js +++ b/tests/baselines/reference/exportingContainingVisibleType.js @@ -13,6 +13,7 @@ export var x = 5; //// [exportingContainingVisibleType.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } @@ -27,5 +28,4 @@ define(["require", "exports"], function (require, exports) { return Foo; }()); exports.x = 5; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js index f6456368e33b0..87761c779faab 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.js +++ b/tests/baselines/reference/exportsAndImports1-amd.js @@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var v = 1; exports.v = v; function f() { } @@ -60,27 +61,26 @@ define(["require", "exports"], function (require, exports) { exports.M = M; var a = M.x; exports.a = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v; exports.f = t1_1.f; exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v; exports.f = t1_1.f; exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js index 968cd18537872..6b9a40f0ea217 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.js +++ b/tests/baselines/reference/exportsAndImports1-es6.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var v = 1; exports.v = v; function f() { } @@ -56,9 +57,9 @@ var M; exports.M = M; var a = M.x; exports.a = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -66,9 +67,9 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -76,4 +77,3 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index a6f97be067729..56f74d27473c4 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +exports.__esModule = true; var v = 1; exports.v = v; function f() { } @@ -59,9 +60,9 @@ var M; exports.M = M; var a = M.x; exports.a = a; -exports.__esModule = true; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -69,9 +70,9 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -79,4 +80,3 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js index d67dd92707d94..5154751b21e12 100644 --- a/tests/baselines/reference/exportsAndImports2-amd.js +++ b/tests/baselines/reference/exportsAndImports2-amd.js @@ -16,21 +16,21 @@ export { x as y, y as x }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.x = "x"; exports.y = "y"; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.y = t1_1.x; exports.x = t1_1.y; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.y = t1_1.x; exports.x = t1_1.y; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js index 59ee55defd830..b0714b83c39e6 100644 --- a/tests/baselines/reference/exportsAndImports2-es6.js +++ b/tests/baselines/reference/exportsAndImports2-es6.js @@ -15,18 +15,18 @@ export { x as y, y as x }; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.x = "x"; exports.y = "y"; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js index 672d7161e74f4..5b3fe689d9029 100644 --- a/tests/baselines/reference/exportsAndImports2.js +++ b/tests/baselines/reference/exportsAndImports2.js @@ -15,18 +15,18 @@ export { x as y, y as x }; //// [t1.js] "use strict"; +exports.__esModule = true; exports.x = "x"; exports.y = "y"; -exports.__esModule = true; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js index 1f74addddec17..a6af4adb5f48b 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.js +++ b/tests/baselines/reference/exportsAndImports3-amd.js @@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = 1; exports.v1 = exports.v; function f() { } @@ -62,27 +63,26 @@ define(["require", "exports"], function (require, exports) { exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v1; exports.f = t1_1.f1; exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v1; exports.f = t1_1.f1; exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js index b4152cab77867..1ac23446807d2 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.js +++ b/tests/baselines/reference/exportsAndImports3-es6.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.v = 1; exports.v1 = exports.v; function f() { } @@ -58,9 +59,9 @@ var M; exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -68,9 +69,9 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -78,4 +79,3 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index 2bc4c828fe1c6..4dfa0411946e0 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +exports.__esModule = true; exports.v = 1; exports.v1 = exports.v; function f() { } @@ -61,9 +62,9 @@ var M; exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; -exports.__esModule = true; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -71,9 +72,9 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -81,4 +82,3 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js index ddacb1eec94b0..ed31f42ebc781 100644 --- a/tests/baselines/reference/exportsAndImports4-amd.js +++ b/tests/baselines/reference/exportsAndImports4-amd.js @@ -42,12 +42,13 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.default = "hello"; 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"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.a = a; a.default; exports.b = t1_1.default; @@ -65,5 +66,4 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f exports.f2 = t1_4.default; t1_4.default; t1_4.default; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js index 5f0c37ab04fd1..d8c51d03bb1de 100644 --- a/tests/baselines/reference/exportsAndImports4-es6.js +++ b/tests/baselines/reference/exportsAndImports4-es6.js @@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] "use strict"; -exports.default = "hello"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = "hello"; //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const a = require("./t1"); exports.a = a; a.default; @@ -67,4 +68,3 @@ exports.f1 = t1_4.default; exports.f2 = t1_4.default; t1_4.default; t1_4.default; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js index 6a78862e55e09..99f81a6b87542 100644 --- a/tests/baselines/reference/exportsAndImports4.js +++ b/tests/baselines/reference/exportsAndImports4.js @@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] "use strict"; -exports.default = "hello"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = "hello"; //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = require("./t1"); exports.a = a; a.default; @@ -67,4 +68,3 @@ exports.f1 = t1_4.default; exports.f2 = t1_4.default; t1_4.default; t1_4.default; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js index 0a2ee7d318300..068afdc346b57 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js @@ -21,6 +21,7 @@ import { get } from "./t1"; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var set = { set foo(x) { } @@ -28,7 +29,6 @@ var set = { exports.set = set; var get = 10; exports.get = get; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js index ea7f554d1b351..8b1deff064f50 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js @@ -19,16 +19,16 @@ import { as } from "./t1"; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var as = 100; exports.return = as; exports.as = as; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var as = require("./t1"); var x = as.as; var y = as.return; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js index 2b3e9d36f337f..207d2948fa471 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js @@ -16,15 +16,15 @@ const { __, _, ___ } = R; //// [m1.js] "use strict"; +exports.__esModule = true; var R; exports["default"] = R = { "__": 20, "_": 10, "___": 30 }; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js index 3555148f75520..a53d4662e9766 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js @@ -15,14 +15,14 @@ const { __esmodule, __proto__ } = R; //// [m1.js] "use strict"; +exports.__esModule = true; var R; exports["default"] = R = { "__esmodule": true, "__proto__": {} }; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js index 028ca80400fac..3a5bba1deed58 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js @@ -16,15 +16,15 @@ const { ___, ___hello, _hi } = R; //// [m1.js] "use strict"; +exports.__esModule = true; var R; exports["default"] = R = { "___": 30, "___hello": 21, "_hi": 40 }; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js index fa643c5e7e2a6..718d048b9a27a 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js @@ -36,6 +36,7 @@ _hi(); //// [m1.js] "use strict"; +exports.__esModule = true; function _() { console.log("_"); } @@ -64,9 +65,9 @@ function ___hello() { console.log("___hello"); } exports.___hello = ___hello; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); m1_1._(); m1_1.__(); @@ -74,4 +75,3 @@ m1_1.___hello(); m1_1.__esmodule(); m1_1.__proto(); m1_1._hi(); -exports.__esModule = true; diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js index a5900c588ba3d..28c9488f7fa35 100644 --- a/tests/baselines/reference/extendClassExpressionFromModule.js +++ b/tests/baselines/reference/extendClassExpressionFromModule.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var foo1 = require("./foo1"); var x = foo1; var y = (function (_super) { @@ -40,4 +41,3 @@ var y = (function (_super) { } return y; }(x)); -exports.__esModule = true; diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js index 4f0d5ced7b515..c8f7719faf026 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js @@ -34,13 +34,13 @@ var visModel = new moduleMap[moduleName].VisualizationModel(); //// [extendingClassFromAliasAndUsageInIndexer_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -53,6 +53,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -62,7 +63,6 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -75,6 +75,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -84,9 +85,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA"); var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB"); var moduleATyped = moduleA; @@ -96,4 +97,3 @@ var moduleMap = { }; var moduleName; var visModel = new moduleMap[moduleName].VisualizationModel(); -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js index 41ec58a467df7..70ce2281ad3d6 100644 --- a/tests/baselines/reference/externalModuleAssignToVar.js +++ b/tests/baselines/reference/externalModuleAssignToVar.js @@ -29,13 +29,13 @@ y3 = ext3; // ok //// [externalModuleAssignToVar_core_require.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); //// [externalModuleAssignToVar_core_require2.js] define(["require", "exports"], function (require, exports) { @@ -60,11 +60,11 @@ 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"; + exports.__esModule = true; var y1 = ext; y1 = ext; // ok var y2 = ext2; y2 = ext2; // ok var y3 = ext3; y3 = ext3; // ok - exports.__esModule = true; }); diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js index ca51181ec3b6c..33aa1776e9448 100644 --- a/tests/baselines/reference/externalModuleExportingGenericClass.js +++ b/tests/baselines/reference/externalModuleExportingGenericClass.js @@ -25,8 +25,8 @@ var C = (function () { module.exports = C; //// [externalModuleExportingGenericClass_file1.js] "use strict"; +exports.__esModule = true; var a = require("./externalModuleExportingGenericClass_file0"); var v; // this should report error var v2 = (new a()).foo; var v3 = (new a()).foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js index bd811cd8b5814..7e2a78a4728b6 100644 --- a/tests/baselines/reference/externalModuleImmutableBindings.js +++ b/tests/baselines/reference/externalModuleImmutableBindings.js @@ -53,10 +53,11 @@ for ((stuff[n]) of []) {} //// [f1.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [f2.js] "use strict"; +exports.__esModule = true; // all mutations below are illegal and should be fixed var stuff = require("./f1"); var n = 'baz'; @@ -108,4 +109,3 @@ for ((stuff[n]) in []) { } for (var _p = 0, _q = []; _p < _q.length; _p++) { (stuff[n]) = _q[_p]; } -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js index 353af42a40847..0402847a13a93 100644 --- a/tests/baselines/reference/externalModuleQualification.js +++ b/tests/baselines/reference/externalModuleQualification.js @@ -13,6 +13,7 @@ class NavigateAction { //// [externalModuleQualification.js] "use strict"; +exports.__esModule = true; exports.ID = "test"; var DiffEditor = (function () { function DiffEditor(id) { @@ -28,4 +29,3 @@ var NavigateAction = (function () { }; return NavigateAction; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js index 75d719670d18e..e5a854077c5b1 100644 --- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js +++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js @@ -11,15 +11,15 @@ file1.foo(); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { } exports.foo = foo; ; - exports.__esModule = true; }); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js] define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) { "use strict"; + exports.__esModule = true; exports.file1 = file1; exports.file1.foo(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js index a012d0d37b65d..3a930d8e03a41 100644 --- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js +++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js @@ -20,14 +20,14 @@ file1.bar(); //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js] //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js] "use strict"; +exports.__esModule = true; function foo() { } exports.foo = foo; ; -exports.__esModule = true; //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js] "use strict"; +exports.__esModule = true; /// var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1"); file1.foo(); file1.bar(); -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js index 3d1fe11f88f34..1ef5be538831e 100644 --- a/tests/baselines/reference/externalModuleResolution.js +++ b/tests/baselines/reference/externalModuleResolution.js @@ -25,6 +25,6 @@ var M2; module.exports = M2; //// [consumer.js] "use strict"; +exports.__esModule = true; var x = require("./foo"); x.Y; // .ts should be picked -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js index 96fb493090fee..2c3c9facff18c 100644 --- a/tests/baselines/reference/externalModuleResolution2.js +++ b/tests/baselines/reference/externalModuleResolution2.js @@ -26,6 +26,6 @@ var M2; module.exports = M2; //// [consumer.js] "use strict"; +exports.__esModule = true; var x = require("./foo"); x.X; // .ts should be picked -exports.__esModule = true; diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js index 959a3ffffcf37..673a0372f054d 100644 --- a/tests/baselines/reference/fieldAndGetterWithSameName.js +++ b/tests/baselines/reference/fieldAndGetterWithSameName.js @@ -7,6 +7,7 @@ export class C { //// [fieldAndGetterWithSameName.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } @@ -18,5 +19,4 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js index 793f4ab6c0605..9b48439ad5608 100644 --- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js +++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js @@ -12,13 +12,13 @@ function foo() { //// [a.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c = (function () { function c() { } return c; }()); exports.c = c; - exports.__esModule = true; }); function foo() { } diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js index 3b1644e7ac11b..2bc6d91b2c3e6 100644 --- a/tests/baselines/reference/functionAndImportNameConflict.js +++ b/tests/baselines/reference/functionAndImportNameConflict.js @@ -11,13 +11,13 @@ export function f() { //// [f1.js] "use strict"; +exports.__esModule = true; function f() { } exports.f = f; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; function f() { } exports.f = f; -exports.__esModule = true; diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js index d794cded0f4f8..9bf71aff1eab7 100644 --- a/tests/baselines/reference/functionLikeInParameterInitializer.js +++ b/tests/baselines/reference/functionLikeInParameterInitializer.js @@ -21,6 +21,7 @@ export function baz3(func = class { x = foo }) { //// [functionLikeInParameterInitializer.js] "use strict"; +exports.__esModule = true; // error function bar(func) { if (func === void 0) { func = function () { return foo; }; } @@ -50,4 +51,3 @@ function baz3(func) { var foo = "in"; } exports.baz3 = baz3; -exports.__esModule = true; diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js index 426697dfa8dc8..b7e460af9b10d 100644 --- a/tests/baselines/reference/generatorES6InAMDModule.js +++ b/tests/baselines/reference/generatorES6InAMDModule.js @@ -6,9 +6,9 @@ export function* foo() { //// [generatorES6InAMDModule.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function* foo() { yield; } exports.foo = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js index 1b008c90860da..738fa996cf785 100644 --- a/tests/baselines/reference/genericClassesInModule2.js +++ b/tests/baselines/reference/genericClassesInModule2.js @@ -23,6 +23,7 @@ export class B { //// [genericClassesInModule2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A(callback) { this.callback = callback; @@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) { return B; }()); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js index 2cbb4485e3181..83b100f48370d 100644 --- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js +++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js @@ -10,9 +10,9 @@ export function foo(fn: (ifoo: IFoo) => void) { //// [genericInterfaceFunctionTypeParameter.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo(fn) { foo(fn); // Invocation is necessary to repro (!) } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js index 9704fe5d148a2..61a9298eb7f85 100644 --- a/tests/baselines/reference/genericMemberFunction.js +++ b/tests/baselines/reference/genericMemberFunction.js @@ -25,6 +25,7 @@ export class BuildResult{ //// [genericMemberFunction.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var BuildError = (function () { function BuildError() { } @@ -59,5 +60,4 @@ define(["require", "exports"], function (require, exports) { return BuildResult; }()); exports.BuildResult = BuildResult; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js index 457158faee1c5..728d81dd147bc 100644 --- a/tests/baselines/reference/genericReturnTypeFromGetter1.js +++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js @@ -11,6 +11,7 @@ export class DbSet { //// [genericReturnTypeFromGetter1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var DbSet = (function () { function DbSet() { } @@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) { return DbSet; }()); exports.DbSet = DbSet; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js index 3201344c0de80..a958516dfa034 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases1.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js @@ -21,8 +21,8 @@ x.m2(); //// [genericTypeWithMultipleBases1.js] "use strict"; +exports.__esModule = true; var x; x.p1; x.m1(); x.m2(); -exports.__esModule = true; diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js index a445714400055..43651ec8278ae 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases2.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js @@ -21,9 +21,9 @@ x.m2(); //// [genericTypeWithMultipleBases2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var x; x.p1; x.m1(); x.m2(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js index 0ed35307d2d5d..3f5e3dcfe8e6e 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js @@ -27,6 +27,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Collection = (function () { function Collection() { } @@ -56,5 +57,4 @@ define(["require", "exports"], function (require, exports) { return ListItem; }(CollectionItem)); exports.ListItem = ListItem; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline index 783ec2bf947a6..5739596a8f0e9 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline @@ -3,13 +3,13 @@ EmitSkipped: false EmitSkipped: false FileName : /tests/cases/fourslash/inputFile2.js "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); EmitSkipped: false FileName : /tests/cases/fourslash/inputFile3.js diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index 74cf137ef37ae..50e80f9483142 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -4,6 +4,7 @@ Diagnostics: FileName : /tests/cases/fourslash/inputFile.js define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -13,6 +14,5 @@ define(["require", "exports"], function (require, exports) { (function (M) { M.foo = new C(); })(M = exports.M || (exports.M = {})); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 434835a59d3a2..ce4df039932fc 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -684,6 +684,7 @@ export declare module eaM { //// [giant.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; /* Prefixes p -> public @@ -1107,7 +1108,6 @@ define(["require", "exports"], function (require, exports) { ; })(eM = exports.eM || (exports.eM = {})); ; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js index 040bdccd515aa..60bea32e305fa 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js @@ -16,14 +16,15 @@ module m_private { //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js] "use strict"; +exports.__esModule = true; var m; (function (m) { function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); -exports.__esModule = true; //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js] "use strict"; +exports.__esModule = true; var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0"); var m_private; (function (m_private) { @@ -31,4 +32,3 @@ var m_private; m_private.C = r; // no error m_private.C.m.foo(); })(m_private || (m_private = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js index a626d034c7572..725390825c605 100644 --- a/tests/baselines/reference/importAsBaseClass.js +++ b/tests/baselines/reference/importAsBaseClass.js @@ -12,6 +12,7 @@ class Hello extends Greeter { } //// [importAsBaseClass_0.js] "use strict"; +exports.__esModule = true; var Greeter = (function () { function Greeter() { } @@ -19,7 +20,6 @@ var Greeter = (function () { return Greeter; }()); exports.Greeter = Greeter; -exports.__esModule = true; //// [importAsBaseClass_1.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Greeter = require("./importAsBaseClass_0"); var Hello = (function (_super) { __extends(Hello, _super); @@ -40,4 +41,3 @@ var Hello = (function (_super) { } return Hello; }(Greeter)); -exports.__esModule = true; diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index a33b758df7d1e..1e5e5d0ec719e 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -83,6 +83,7 @@ export var useMultiImport_m4_f4 = multiImport_m4.foo(); //// [importDecl_require.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -91,9 +92,9 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require1.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -103,9 +104,9 @@ exports.d = d; var x; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require2.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -114,9 +115,9 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require3.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -125,14 +126,14 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require4.js] "use strict"; +exports.__esModule = true; function foo2() { return null; } exports.foo2 = foo2; -exports.__esModule = true; //// [importDecl_1.js] "use strict"; +exports.__esModule = true; /// /// /// @@ -174,7 +175,6 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); -exports.__esModule = true; //// [importDecl_require.d.ts] diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js index 98e322fb61967..00e5dae1f9593 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.js +++ b/tests/baselines/reference/importDeclWithClassModifiers.js @@ -12,9 +12,9 @@ var b: a; //// [importDeclWithClassModifiers.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = x.c; exports.b = x.c; exports.c = x.c; var b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js index 05c40739a8202..e7929ac27fc29 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.js +++ b/tests/baselines/reference/importDeclWithDeclareModifier.js @@ -9,6 +9,6 @@ var b: a; //// [importDeclWithDeclareModifier.js] "use strict"; +exports.__esModule = true; exports.a = x.c; var b; -exports.__esModule = true; diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js index c23fae4074908..26076c2630eff 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.js +++ b/tests/baselines/reference/importDeclWithExportModifier.js @@ -10,7 +10,7 @@ var b: a; //// [importDeclWithExportModifier.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = x.c; var b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js index a4102cbfff4d2..ce5069c335edd 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js @@ -8,5 +8,5 @@ export = x; //// [importDeclWithExportModifierAndExportAssignment.js] "use strict"; -exports.a = x.c; exports.__esModule = true; +exports.a = x.c; diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js index ee4e8f1dc8c39..cce30fd8b85e6 100644 --- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js +++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js @@ -13,13 +13,13 @@ export var x: typeof a; //// [importDeclarationUsedAsTypeQuery_require.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [importDeclarationUsedAsTypeQuery_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js index 7f2c4ad4036ee..bf66829a4350d 100644 --- a/tests/baselines/reference/importHelpers.js +++ b/tests/baselines/reference/importHelpers.js @@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -66,7 +67,6 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js index 03a4e6393d7fa..b756355921de6 100644 --- a/tests/baselines/reference/importHelpersAmd.js +++ b/tests/baselines/reference/importHelpersAmd.js @@ -19,17 +19,18 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var B = (function (_super) { tslib_1.__extends(B, _super); function B() { @@ -38,5 +39,4 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib return B; }(a_1.A)); exports.B = B; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js index 828c1a5a3601c..72a91ac365e39 100644 --- a/tests/baselines/reference/importHelpersInIsolatedModules.js +++ b/tests/baselines/reference/importHelpersInIsolatedModules.js @@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -66,9 +67,9 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -98,4 +99,3 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js index 2883a7aaa53ad..330b8623f696b 100644 --- a/tests/baselines/reference/importHelpersInTsx.js +++ b/tests/baselines/reference/importHelpersInTsx.js @@ -21,9 +21,9 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); exports.x = React.createElement("span", tslib_1.__assign({}, o)); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __assign = (this && this.__assign) || Object.assign || function(t) { for (var s, i = 1, n = arguments.length; i < n; i++) { diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js index 4747e017ff513..5b98b61da2045 100644 --- a/tests/baselines/reference/importHelpersNoHelpers.js +++ b/tests/baselines/reference/importHelpersNoHelpers.js @@ -34,6 +34,7 @@ export {} //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -68,7 +69,6 @@ C = tslib_1.__decorate([ var o = { a: 1 }; var y = tslib_1.__assign({}, o); var x = tslib_1.__rest(y, []); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js index efcd4827257be..36a326e124d38 100644 --- a/tests/baselines/reference/importHelpersNoModule.js +++ b/tests/baselines/reference/importHelpersNoModule.js @@ -27,6 +27,7 @@ class C { //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -58,7 +59,6 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js index 233b12208c13d..55bf2ea9d4655 100644 --- a/tests/baselines/reference/importHelpersOutFile.js +++ b/tests/baselines/reference/importHelpersOutFile.js @@ -23,16 +23,17 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [out.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var B = (function (_super) { tslib_1.__extends(B, _super); function B() { @@ -41,10 +42,10 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts return B; }(a_1.A)); exports.B = B; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var C = (function (_super) { tslib_2.__extends(C, _super); function C() { @@ -53,5 +54,4 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts return C; }(a_2.A)); exports.C = C; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js index 917c50f3fee3f..0c6f0540354c8 100644 --- a/tests/baselines/reference/importImportOnlyModule.js +++ b/tests/baselines/reference/importImportOnlyModule.js @@ -18,6 +18,7 @@ var x = foo; // Cause a runtime dependency //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -26,17 +27,16 @@ define(["require", "exports"], function (require, exports) { }()); C1.s1 = true; exports.C1 = C1; - exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var answer = 42; // No exports exports.__esModule = true; + 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 exports.__esModule = true; + var x = foo; // Cause a runtime dependency }); diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js index cfc63f83551ec..da492a7103d92 100644 --- a/tests/baselines/reference/importInsideModule.js +++ b/tests/baselines/reference/importInsideModule.js @@ -11,8 +11,8 @@ export module myModule { //// [importInsideModule_file2.js] "use strict"; +exports.__esModule = true; var myModule; (function (myModule) { var a = foo.x; })(myModule = exports.myModule || (exports.myModule = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js index 8af20d4be36f0..0340bcd35cb3e 100644 --- a/tests/baselines/reference/importNonExternalModule.js +++ b/tests/baselines/reference/importNonExternalModule.js @@ -21,8 +21,8 @@ var foo; //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; // Import should fail. foo_0 not an external module if (foo.answer === 42) { } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js index e5785d928666a..eb76621f7c06e 100644 --- a/tests/baselines/reference/importNonStringLiteral.js +++ b/tests/baselines/reference/importNonStringLiteral.js @@ -5,5 +5,5 @@ import foo = require(x); // invalid //// [foo_0.js] "use strict"; -var x = "filename"; exports.__esModule = true; +var x = "filename"; diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js index 658b464983ad9..40213ce99687d 100644 --- a/tests/baselines/reference/importTsBeforeDTs.js +++ b/tests/baselines/reference/importTsBeforeDTs.js @@ -15,11 +15,11 @@ var z2 = foo.y + 10; // Should resolve //// [foo_0.js] "use strict"; -exports.y = 42; exports.__esModule = true; +exports.y = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; 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 -exports.__esModule = true; diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js index d44239cec115a..15bf907ddd5b1 100644 --- a/tests/baselines/reference/importUsedInExtendsList1.js +++ b/tests/baselines/reference/importUsedInExtendsList1.js @@ -13,13 +13,13 @@ var r: string = s.foo; //// [importUsedInExtendsList1_require.js] "use strict"; +exports.__esModule = true; var Super = (function () { function Super() { } return Super; }()); exports.Super = Super; -exports.__esModule = true; //// [importUsedInExtendsList1_1.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; /// var foo = require("./importUsedInExtendsList1_require"); var Sub = (function (_super) { @@ -43,4 +44,3 @@ var Sub = (function (_super) { }(foo.Super)); var s; var r = s.foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js index c5e502f3fdc08..9450fc5d7b2d8 100644 --- a/tests/baselines/reference/importWithTrailingSlash.js +++ b/tests/baselines/reference/importWithTrailingSlash.js @@ -22,23 +22,23 @@ aIndex.aIndex; //// [a.js] "use strict"; -exports["default"] = { a: 0 }; exports.__esModule = true; +exports["default"] = { a: 0 }; //// [index.js] "use strict"; -exports["default"] = { aIndex: 0 }; exports.__esModule = true; +exports["default"] = { aIndex: 0 }; //// [test.js] "use strict"; +exports.__esModule = true; var _1 = require("."); var _2 = require("./"); _1["default"].a; _2["default"].aIndex; -exports.__esModule = true; //// [test.js] "use strict"; +exports.__esModule = true; var __1 = require(".."); var _1 = require("../"); __1["default"].a; _1["default"].aIndex; -exports.__esModule = true; diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js index 16c6f2b95c7af..b3d607a6943a6 100644 --- a/tests/baselines/reference/import_reference-exported-alias.js +++ b/tests/baselines/reference/import_reference-exported-alias.js @@ -45,8 +45,8 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { "use strict"; + exports.__esModule = true; var Services = appJs.Services; var UserServices = Services.UserServices; var x = new UserServices().getUserName(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js index 5934d9b2f5ead..c6771d47bae30 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.js +++ b/tests/baselines/reference/import_reference-to-type-alias.js @@ -20,6 +20,7 @@ var x = new Services.UserServices().getUserName(); //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var App; (function (App) { var Services; @@ -35,12 +36,11 @@ define(["require", "exports"], function (require, exports) { Services.UserServices = UserServices; })(Services = App.Services || (App.Services = {})); })(App = exports.App || (exports.App = {})); - exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { "use strict"; + exports.__esModule = true; var Services = appJs.App.Services; var x = new Services.UserServices().getUserName(); - exports.__esModule = true; }); 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 7fb4e02d9fd1d..1cd0376ddedf1 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 @@ -19,7 +19,7 @@ var p = testData[0].name; //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var testData; var p = testData[0].name; - exports.__esModule = true; }); 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 c2ac2416806b1..9b5e518804cc1 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 @@ -13,18 +13,18 @@ var v = new hostVar.Host(); //// [host.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Host = (function () { function Host() { } return Host; }()); exports.Host = Host; - exports.__esModule = true; }); //// [consumer.js] define(["require", "exports", "host"], function (require, exports, host) { "use strict"; + exports.__esModule = true; var hostVar = host; var v = new hostVar.Host(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js index 61b411ea571c4..b82ac22f4ede4 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.js +++ b/tests/baselines/reference/importedAliasesInTypePositions.js @@ -21,6 +21,7 @@ export module ImportingModule { //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var elaborate; (function (elaborate) { var nested; @@ -41,11 +42,11 @@ define(["require", "exports"], function (require, exports) { })(mod = nested.mod || (nested.mod = {})); })(nested = elaborate.nested || (elaborate.nested = {})); })(elaborate = exports.elaborate || (exports.elaborate = {})); - exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var ImportingModule; (function (ImportingModule) { var UsesReferredType = (function () { @@ -55,5 +56,4 @@ define(["require", "exports"], function (require, exports) { return UsesReferredType; }()); })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js index 52761e7e9db13..5f4f9677dcd6c 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.js +++ b/tests/baselines/reference/importedModuleClassNameClash.js @@ -9,10 +9,10 @@ class foo { } //// [importedModuleClassNameClash.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var foo = (function () { function foo() { } return foo; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js index b85c7145a4716..dd45d4db89c64 100644 --- a/tests/baselines/reference/importsImplicitlyReadonly.js +++ b/tests/baselines/reference/importsImplicitlyReadonly.js @@ -23,12 +23,13 @@ a3.y = 1; //// [a.js] "use strict"; +exports.__esModule = true; exports.x = 1; var y = 1; exports.y = y; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var a_1 = require("./a"); var a1 = require("./a"); var a2 = require("./a"); @@ -41,4 +42,3 @@ a2.x = 1; a2.y = 1; a3.x = 1; a3.y = 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js index bc20008c2fabe..997cbcd5b791b 100644 --- a/tests/baselines/reference/inferenceLimit.js +++ b/tests/baselines/reference/inferenceLimit.js @@ -53,6 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); class BrokenClass { constructor() { } brokenMethod(field, value) { @@ -80,4 +81,3 @@ class BrokenClass { } } exports.BrokenClass = BrokenClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js index 9fe669911b269..293be662a4d74 100644 --- a/tests/baselines/reference/instanceOfInExternalModules.js +++ b/tests/baselines/reference/instanceOfInExternalModules.js @@ -14,19 +14,19 @@ function IsFoo(value: any): boolean { //// [instanceOfInExternalModules_require.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; - exports.__esModule = true; }); //// [instanceOfInExternalModules_1.js] define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) { "use strict"; + exports.__esModule = true; function IsFoo(value) { return value instanceof Bar.Foo; } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js index 7fb7b08a8818f..ec50272592509 100644 --- a/tests/baselines/reference/interfaceContextualType.js +++ b/tests/baselines/reference/interfaceContextualType.js @@ -23,6 +23,7 @@ class Bug { //// [interfaceContextualType.js] "use strict"; +exports.__esModule = true; var Bug = (function () { function Bug() { } @@ -37,4 +38,3 @@ var Bug = (function () { }; return Bug; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js index 01a648055303f..41f12dbac05b1 100644 --- a/tests/baselines/reference/interfaceDeclaration3.js +++ b/tests/baselines/reference/interfaceDeclaration3.js @@ -58,6 +58,7 @@ interface I2 extends I1 { item:string; } //// [interfaceDeclaration3.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var M1; (function (M1) { var C1 = (function () { @@ -119,5 +120,4 @@ define(["require", "exports"], function (require, exports) { } return C3; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js index dde6b1632f1c6..318e8903c36f0 100644 --- a/tests/baselines/reference/interfaceDeclaration5.js +++ b/tests/baselines/reference/interfaceDeclaration5.js @@ -6,11 +6,11 @@ export class C1 { } //// [interfaceDeclaration5.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { } return C1; }()); exports.C1 = C1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js index 5fb3996134b15..0bc759f6cda86 100644 --- a/tests/baselines/reference/interfaceImplementation6.js +++ b/tests/baselines/reference/interfaceImplementation6.js @@ -27,6 +27,7 @@ export class Test { //// [interfaceImplementation6.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { } @@ -50,5 +51,4 @@ define(["require", "exports"], function (require, exports) { return Test; }()); exports.Test = Test; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index 20ce33035e6e2..0b333ac1830a1 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -19,6 +19,7 @@ export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -41,7 +42,6 @@ var m2; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); exports.d = new m2.m3.c(); -exports.__esModule = true; //// [internalAliasClassInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 6868a0511a623..cf2eb41662b56 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -17,6 +17,7 @@ export module m2 { //// [internalAliasClassInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -38,7 +39,6 @@ var m2; var cReturnVal = m3.cProp.foo(10); })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); -exports.__esModule = true; //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js index d9f47a05d9e9c..1de7fe25407fb 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js @@ -19,6 +19,7 @@ export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -41,4 +42,3 @@ var m2; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); exports.d = new m2.m3.c(); -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index 52a2e0b3fed87..e224b40c9f320 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -28,7 +29,6 @@ var x; exports.xc = x.c; exports.cProp = new exports.xc(); var cReturnVal = exports.cProp.foo(10); -exports.__esModule = true; //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index 640b533f1518c..16f53fe3e8b0e 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -28,7 +29,6 @@ var x; var xc = x.c; exports.cProp = new xc(); var cReturnVal = exports.cProp.foo(10); -exports.__esModule = true; //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index de2582debefe4..c387fa6e2c415 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -15,6 +15,7 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var weekend; @@ -29,7 +30,6 @@ var c; c.b = a.weekend; c.bVal = c.b.Sunday; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasEnumInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index 6e54ed79afc41..717652283cf96 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -15,6 +15,7 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var weekend; @@ -29,7 +30,6 @@ var c; var b = a.weekend; c.bVal = b.Sunday; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js index c7b5180fd9346..a84ebf0b9aded 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js @@ -16,6 +16,7 @@ var happyFriday = c.b.Friday; //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var weekend; @@ -31,4 +32,3 @@ var c; c.bVal = b.Sunday; })(c = exports.c || (exports.c = {})); var happyFriday = c.b.Friday; -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index d3e9fdf8349c5..ad07b9bd33f1c 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -14,6 +14,7 @@ export var bVal: b = b.Sunday; //// [internalAliasEnumInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var weekend; @@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); exports.b = a.weekend; exports.bVal = exports.b.Sunday; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index 99b9156c0c9d2..6b5f5b17a26de 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -14,6 +14,7 @@ export var bVal: b = b.Sunday; //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var weekend; @@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); var b = a.weekend; exports.bVal = b.Sunday; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index 4138970da0bb4..95bb936bc75e2 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -27,7 +28,6 @@ var c; c.bVal = c.b(10); c.bVal2 = c.b; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index 83cab3c05bbd2..50de6b470ee4c 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -27,7 +28,6 @@ var c; var bVal = b(10); c.bVal2 = b; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js index 67239e40b1d76..543e9952f235a 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js @@ -14,6 +14,7 @@ var d = c.b(11); //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -28,4 +29,3 @@ var c; c.bVal2 = b; })(c = exports.c || (exports.c = {})); var d = c.b(11); -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index 88765f267e635..267045b625d5d 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -13,6 +13,7 @@ export var bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -23,7 +24,6 @@ define(["require", "exports"], function (require, exports) { exports.b = a.foo; exports.bVal = exports.b(10); exports.bVal2 = exports.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index 160b404784919..bb3b0e244d2fa 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -12,6 +12,7 @@ export var bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -22,7 +23,6 @@ var a; var b = a.foo; exports.bVal = b(10); exports.bVal2 = b; -exports.__esModule = true; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index 904c7171818bb..85335a0fb7f65 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var b; @@ -31,7 +32,6 @@ define(["require", "exports"], function (require, exports) { c.b = a.b; c.x = new c.b.c(); })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index eb59627a4cbf5..c39e6cfd16848 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -13,6 +13,7 @@ export module c { //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var b; @@ -30,7 +31,6 @@ var c; var b = a.b; c.x = new b.c(); })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js index 77dbbab235a05..6e66118f5b934 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -15,6 +15,7 @@ export var d = new c.b.c(); //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var b; @@ -33,4 +34,3 @@ var c; c.x = new b.c(); })(c = exports.c || (exports.c = {})); exports.d = new c.b.c(); -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index 05fe46f1eb525..86d9f88cee372 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -11,6 +11,7 @@ export var x: b.c = new b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var b; @@ -25,7 +26,6 @@ var a; })(a = exports.a || (exports.a = {})); exports.b = a.b; exports.x = new exports.b.c(); -exports.__esModule = true; //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 63f6b8c14226a..79185fed2284a 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -12,6 +12,7 @@ export var x: b.c = new b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var b; @@ -26,7 +27,6 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); var b = a.b; exports.x = new b.c(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index e2cbdc3b54dd3..bd50cd8bbc2ec 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -13,10 +13,10 @@ export module c { //// [internalAliasInterfaceInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index 15e03818d848b..f7b08e6c170aa 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -13,10 +13,10 @@ export module c { //// [internalAliasInterfaceInsideLocalModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js index ed4c6714196ca..19163ff1f66ab 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js @@ -14,9 +14,9 @@ var x: c.b; //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { })(c = exports.c || (exports.c = {})); var x; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index 1b74ded4656fd..7ca966e90b206 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -15,11 +15,11 @@ export module c { //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index a46d7629ae9b0..22793f8aef5ae 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -15,11 +15,11 @@ export module c { //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js index efbb156bed8d9..a6b4f83de8e34 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -19,9 +19,9 @@ export var z: c.b.I; //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js index ac52f94db72d7..eccbd9a45bd58 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js @@ -15,8 +15,8 @@ x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x.foo(); exports.__esModule = true; + exports.x.foo(); }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index 45af45361514e..27de6bbfd9837 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -14,8 +14,8 @@ x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js] "use strict"; -exports.x.foo(); exports.__esModule = true; +exports.x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js index 5cd431470f538..34f044721c49e 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js @@ -12,6 +12,7 @@ export module c { //// [internalAliasVarInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { a.x = 10; @@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) { c.b = a.x; c.bVal = c.b; })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js index 956c70d7cbb39..161dc0bf97368 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js @@ -12,6 +12,7 @@ export module c { //// [internalAliasVarInsideLocalModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { a.x = 10; @@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) { var b = a.x; c.bVal = b; })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js index 962e34c4a3e9a..a0192fc9daaf2 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js @@ -12,6 +12,7 @@ export var z = c.b; //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { a.x = 10; @@ -22,4 +23,3 @@ var c; c.bVal = b; })(c = exports.c || (exports.c = {})); exports.z = c.b; -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js index 732257b93e5b2..d27b4e3188da2 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js @@ -11,13 +11,13 @@ export var bVal = b; //// [internalAliasVarInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { a.x = 10; })(a = exports.a || (exports.a = {})); exports.b = a.x; exports.bVal = exports.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js index f0d02aa709ce4..65c9204ed3c1e 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js @@ -10,13 +10,13 @@ export var bVal = b; //// [internalAliasVarInsideTopLevelModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { a.x = 10; })(a = exports.a || (exports.a = {})); var b = a.x; exports.bVal = b; -exports.__esModule = true; //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js index 27a75a64be615..32ddedae2b3c1 100644 --- a/tests/baselines/reference/intersectionTypeInference1.js +++ b/tests/baselines/reference/intersectionTypeInference1.js @@ -11,8 +11,8 @@ export const Form3 = brokenFunction(parameterFn)({store: "hello"}) //// [intersectionTypeInference1.js] // Repro from #8801 "use strict"; +exports.__esModule = true; function alert(s) { } var parameterFn = function (props) { return alert(props.store); }; var brokenFunction = function (f) { return function (o) { return o; }; }; exports.Form3 = brokenFunction(parameterFn)({ store: "hello" }); -exports.__esModule = true; diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js index f9590d70dd3c3..5aac4a6418671 100644 --- a/tests/baselines/reference/isolatedModulesImportExportElision.js +++ b/tests/baselines/reference/isolatedModulesImportExportElision.js @@ -25,6 +25,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var module_1 = require("module"); var module_2 = require("module"); var ns = require("module"); @@ -40,4 +41,3 @@ var y = ns.value; var module_3 = require("module"); exports.c1 = module_3.c1; exports.z = x; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js index 0d4e00b2593c5..4ed1fdf2c7798 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js @@ -7,6 +7,6 @@ run(1); //// [isolatedModulesPlainFile-AMD.js] define(["require", "exports"], function (require, exports) { "use strict"; - run(1); Object.defineProperty(exports, "__esModule", { value: true }); + run(1); }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js index 5cf8d27759717..38739a700ef3b 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js @@ -6,5 +6,5 @@ run(1); //// [isolatedModulesPlainFile-CommonJS.js] "use strict"; -run(1); Object.defineProperty(exports, "__esModule", { value: true }); +run(1); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js index 5886a1908a6a1..f37962a84abbf 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js @@ -15,6 +15,6 @@ run(1); } })(function (require, exports) { "use strict"; - run(1); Object.defineProperty(exports, "__esModule", { value: true }); + run(1); }); diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js index cbb97e43d7239..088b40e97ad74 100644 --- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js +++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js @@ -26,6 +26,7 @@ export default apply; //// [apply.js] define("_apply", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; /** * A faster alternative to `Function#apply`, this function invokes `func` * with the `this` binding of `thisArg` and the arguments of `args`. @@ -47,5 +48,4 @@ define("_apply", ["require", "exports"], function (require, exports) { return func.apply(thisArg, args); } exports["default"] = apply; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js index a3259d55cd360..dd4d326268b2d 100644 --- a/tests/baselines/reference/jsxEmitWithAttributes.js +++ b/tests/baselines/reference/jsxEmitWithAttributes.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let c; class A { @@ -80,4 +81,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js index 32ebf4d5d542c..a864da65dbb6d 100644 --- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js +++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let c; class A { @@ -80,4 +81,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js index 36b16c62f49cc..9beff01d7077e 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js +++ b/tests/baselines/reference/jsxFactoryIdentifier.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=Element.js.map//// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let createElement = Element_1.Element.createElement; let c; @@ -81,5 +82,4 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map index cad196b8ba5ee..57ff760b8a883 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map @@ -1,3 +1,3 @@ //// [Element.js.map] -{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file +{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt index 71dbb45a155a5..6101ee1d5e788 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js sourceFile:Element.ts ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>var Element; 1 > 2 >^^^^ @@ -42,10 +43,10 @@ sourceFile:Element.ts > } > } > } -1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0) -3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0) -4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0) +1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0) +3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0) +4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0) --- >>>(function (Element) { 1-> @@ -55,9 +56,9 @@ sourceFile:Element.ts 1-> 2 >export namespace 3 > Element -1->Emitted(3, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0) -3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0) +1->Emitted(4, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0) +3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0) --- >>> function isElement(el) { 1->^^^^ @@ -68,9 +69,9 @@ sourceFile:Element.ts > 2 > export function isElement( 3 > el: any -1->Emitted(4, 5) Source(15, 5) + SourceIndex(0) -2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0) -3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0) +1->Emitted(5, 5) Source(15, 5) + SourceIndex(0) +2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0) +3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0) --- >>> return el.markAsChildOfRootElement !== undefined; 1->^^^^^^^^ @@ -92,15 +93,15 @@ sourceFile:Element.ts 7 > !== 8 > undefined 9 > ; -1->Emitted(5, 9) Source(16, 9) + SourceIndex(0) -2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0) -3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0) -4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0) -5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0) -6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0) -7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0) -8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0) -9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0) +1->Emitted(6, 9) Source(16, 9) + SourceIndex(0) +2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0) +3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0) +4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0) +5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0) +6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0) +7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0) +8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0) +9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -109,8 +110,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0) -2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0) +1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0) +2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0) --- >>> Element.isElement = isElement; 1->^^^^ @@ -124,10 +125,10 @@ sourceFile:Element.ts > return el.markAsChildOfRootElement !== undefined; > } 4 > -1->Emitted(7, 5) Source(15, 21) + SourceIndex(0) -2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0) -3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0) -4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0) +1->Emitted(8, 5) Source(15, 21) + SourceIndex(0) +2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0) +3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0) +4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0) --- >>> function createElement(args) { 1->^^^^ @@ -138,9 +139,9 @@ sourceFile:Element.ts > 2 > export function createElement( 3 > args: any[] -1->Emitted(8, 5) Source(19, 5) + SourceIndex(0) -2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0) -3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0) +1->Emitted(9, 5) Source(19, 5) + SourceIndex(0) +2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0) +3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0) --- >>> return {}; 1 >^^^^^^^^ @@ -156,11 +157,11 @@ sourceFile:Element.ts 4 > { > } 5 > -1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0) -2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0) -3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0) -4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0) -5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0) +1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0) +2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0) +3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0) +4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0) +5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -169,8 +170,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0) -2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0) +1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0) --- >>> Element.createElement = createElement; 1->^^^^ @@ -186,10 +187,10 @@ sourceFile:Element.ts > } > } 4 > -1->Emitted(11, 5) Source(19, 21) + SourceIndex(0) -2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0) -3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0) -4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0) +1->Emitted(12, 5) Source(19, 21) + SourceIndex(0) +2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0) +3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0) +4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0) --- >>>})(Element = exports.Element || (exports.Element = {})); 1-> @@ -221,15 +222,15 @@ sourceFile:Element.ts > } > } > } -1->Emitted(12, 1) Source(24, 1) + SourceIndex(0) -2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0) -3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0) -4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0) -5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0) -6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0) -7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0) -8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0) -9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(24, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0) +3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0) +4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0) +5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0) +6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0) +7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0) +8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0) +9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0) --- >>>exports.createElement = Element.createElement; 1 > @@ -250,14 +251,14 @@ sourceFile:Element.ts 6 > . 7 > createElement 8 > ; -1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0) -2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0) -3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0) -4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0) -5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0) -6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0) -7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0) -8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0) +1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0) +2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0) +3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0) +4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0) +5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0) +6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0) +7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0) +8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0) --- >>>function toCamelCase(text) { 1 > @@ -269,9 +270,9 @@ sourceFile:Element.ts > 2 >function toCamelCase( 3 > text: string -1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0) -2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0) -3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0) +1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0) +2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0) +3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0) --- >>> return text[0].toLowerCase() + text.substring(1); 1->^^^^ @@ -311,36 +312,35 @@ sourceFile:Element.ts 16> 1 17> ) 18> ; -1->Emitted(15, 5) Source(29, 5) + SourceIndex(0) -2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0) -3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0) -4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0) -5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0) -6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0) -7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0) -8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0) -9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0) -10>Emitted(15, 33) Source(29, 33) + SourceIndex(0) -11>Emitted(15, 36) Source(29, 36) + SourceIndex(0) -12>Emitted(15, 40) Source(29, 40) + SourceIndex(0) -13>Emitted(15, 41) Source(29, 41) + SourceIndex(0) -14>Emitted(15, 50) Source(29, 50) + SourceIndex(0) -15>Emitted(15, 51) Source(29, 51) + SourceIndex(0) -16>Emitted(15, 52) Source(29, 52) + SourceIndex(0) -17>Emitted(15, 53) Source(29, 53) + SourceIndex(0) -18>Emitted(15, 54) Source(29, 54) + SourceIndex(0) +1->Emitted(16, 5) Source(29, 5) + SourceIndex(0) +2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0) +3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0) +4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0) +5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0) +6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0) +7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0) +8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0) +9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0) +10>Emitted(16, 33) Source(29, 33) + SourceIndex(0) +11>Emitted(16, 36) Source(29, 36) + SourceIndex(0) +12>Emitted(16, 40) Source(29, 40) + SourceIndex(0) +13>Emitted(16, 41) Source(29, 41) + SourceIndex(0) +14>Emitted(16, 50) Source(29, 50) + SourceIndex(0) +15>Emitted(16, 51) Source(29, 51) + SourceIndex(0) +16>Emitted(16, 52) Source(29, 52) + SourceIndex(0) +17>Emitted(16, 53) Source(29, 53) + SourceIndex(0) +18>Emitted(16, 54) Source(29, 54) + SourceIndex(0) --- >>>} 1 > 2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} -1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0) -2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0) +1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0) +2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=Element.js.map=================================================================== JsFile: test.js mapUrl: test.js.map @@ -352,14 +352,15 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>const Element_1 = require("./Element"); 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^-> 1 > 2 >import { Element} from './Element'; -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0) --- >>>let createElement = Element_1.Element.createElement; 1-> @@ -379,14 +380,14 @@ sourceFile:test.tsx 6 > . 7 > createElement 8 > ; -1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) -3 >Emitted(3, 18) Source(2, 18) + SourceIndex(0) -4 >Emitted(3, 21) Source(2, 21) + SourceIndex(0) -5 >Emitted(3, 38) Source(2, 28) + SourceIndex(0) -6 >Emitted(3, 39) Source(2, 29) + SourceIndex(0) -7 >Emitted(3, 52) Source(2, 42) + SourceIndex(0) -8 >Emitted(3, 53) Source(2, 43) + SourceIndex(0) +1->Emitted(4, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(4, 18) Source(2, 18) + SourceIndex(0) +4 >Emitted(4, 21) Source(2, 21) + SourceIndex(0) +5 >Emitted(4, 38) Source(2, 28) + SourceIndex(0) +6 >Emitted(4, 39) Source(2, 29) + SourceIndex(0) +7 >Emitted(4, 52) Source(2, 42) + SourceIndex(0) +8 >Emitted(4, 53) Source(2, 43) + SourceIndex(0) --- >>>let c; 1 > @@ -403,10 +404,10 @@ sourceFile:test.tsx > } > } 4 > ; -1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0) -3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0) -4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0) +1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(5, 5) Source(3, 5) + SourceIndex(0) +3 >Emitted(5, 6) Source(7, 2) + SourceIndex(0) +4 >Emitted(5, 7) Source(7, 3) + SourceIndex(0) --- >>>class A { 1-> @@ -414,7 +415,7 @@ sourceFile:test.tsx 1-> > > -1->Emitted(5, 1) Source(9, 1) + SourceIndex(0) +1->Emitted(6, 1) Source(9, 1) + SourceIndex(0) --- >>> view() { 1->^^^^ @@ -423,8 +424,8 @@ sourceFile:test.tsx 1->class A { > 2 > view -1->Emitted(6, 5) Source(10, 2) + SourceIndex(0) -2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0) +1->Emitted(7, 5) Source(10, 2) + SourceIndex(0) +2 >Emitted(7, 9) Source(10, 6) + SourceIndex(0) --- >>> return [ 1->^^^^^^^^ @@ -435,9 +436,9 @@ sourceFile:test.tsx > 2 > return 3 > -1->Emitted(7, 9) Source(11, 3) + SourceIndex(0) -2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0) -3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0) +1->Emitted(8, 9) Source(11, 3) + SourceIndex(0) +2 >Emitted(8, 15) Source(11, 9) + SourceIndex(0) +3 >Emitted(8, 16) Source(11, 10) + SourceIndex(0) --- >>> createElement("meta", { content: "helloworld" }), 1->^^^^^^^^^^^^ @@ -453,12 +454,12 @@ sourceFile:test.tsx 4 > = 5 > "helloworld" 6 > > -1->Emitted(8, 13) Source(12, 4) + SourceIndex(0) -2 >Emitted(8, 37) Source(12, 10) + SourceIndex(0) -3 >Emitted(8, 44) Source(12, 17) + SourceIndex(0) -4 >Emitted(8, 46) Source(12, 18) + SourceIndex(0) -5 >Emitted(8, 58) Source(12, 30) + SourceIndex(0) -6 >Emitted(8, 61) Source(12, 38) + SourceIndex(0) +1->Emitted(9, 13) Source(12, 4) + SourceIndex(0) +2 >Emitted(9, 37) Source(12, 10) + SourceIndex(0) +3 >Emitted(9, 44) Source(12, 17) + SourceIndex(0) +4 >Emitted(9, 46) Source(12, 18) + SourceIndex(0) +5 >Emitted(9, 58) Source(12, 30) + SourceIndex(0) +6 >Emitted(9, 61) Source(12, 38) + SourceIndex(0) --- >>> createElement("meta", { content: c.a.b }) 1 >^^^^^^^^^^^^ @@ -482,16 +483,16 @@ sourceFile:test.tsx 8 > . 9 > b 10> }> -1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0) -2 >Emitted(9, 37) Source(13, 10) + SourceIndex(0) -3 >Emitted(9, 44) Source(13, 17) + SourceIndex(0) -4 >Emitted(9, 46) Source(13, 19) + SourceIndex(0) -5 >Emitted(9, 47) Source(13, 20) + SourceIndex(0) -6 >Emitted(9, 48) Source(13, 21) + SourceIndex(0) -7 >Emitted(9, 49) Source(13, 23) + SourceIndex(0) -8 >Emitted(9, 50) Source(13, 24) + SourceIndex(0) -9 >Emitted(9, 51) Source(13, 25) + SourceIndex(0) -10>Emitted(9, 54) Source(13, 34) + SourceIndex(0) +1 >Emitted(10, 13) Source(13, 4) + SourceIndex(0) +2 >Emitted(10, 37) Source(13, 10) + SourceIndex(0) +3 >Emitted(10, 44) Source(13, 17) + SourceIndex(0) +4 >Emitted(10, 46) Source(13, 19) + SourceIndex(0) +5 >Emitted(10, 47) Source(13, 20) + SourceIndex(0) +6 >Emitted(10, 48) Source(13, 21) + SourceIndex(0) +7 >Emitted(10, 49) Source(13, 23) + SourceIndex(0) +8 >Emitted(10, 50) Source(13, 24) + SourceIndex(0) +9 >Emitted(10, 51) Source(13, 25) + SourceIndex(0) +10>Emitted(10, 54) Source(13, 34) + SourceIndex(0) --- >>> ]; 1 >^^^^^^^^^ @@ -499,8 +500,8 @@ sourceFile:test.tsx 1 > > ] 2 > ; -1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0) -2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0) +1 >Emitted(11, 10) Source(14, 4) + SourceIndex(0) +2 >Emitted(11, 11) Source(14, 5) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -508,15 +509,14 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0) -2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0) +1 >Emitted(12, 5) Source(15, 2) + SourceIndex(0) +2 >Emitted(12, 6) Source(15, 3) + SourceIndex(0) --- >>>} 1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0) +1 >Emitted(13, 2) Source(16, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js index 3ab40dee5eb31..05da89d0d85aa 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js @@ -15,11 +15,11 @@ export class AppComponent { //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class AppComponent { render(createElement) { return createElement("div", null); } } exports.AppComponent = AppComponent; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map index c108b93a9134f..c72e1bf8057c5 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map @@ -1,2 +1,2 @@ //// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt index 68f39e67ddd86..b2d30177b1d0d 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>class AppComponent { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> @@ -20,7 +21,7 @@ sourceFile:test.tsx >} > > -1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0) --- >>> render(createElement) { 1->^^^^ @@ -33,10 +34,10 @@ sourceFile:test.tsx 2 > render 3 > ( 4 > createElement -1->Emitted(3, 5) Source(9, 5) + SourceIndex(0) -2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0) -3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0) -4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0) +1->Emitted(4, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0) --- >>> return createElement("div", null); 1->^^^^^^^^ @@ -50,11 +51,11 @@ sourceFile:test.tsx 3 > 4 >
5 > ; -1->Emitted(4, 9) Source(10, 9) + SourceIndex(0) -2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0) -3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0) -4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0) -5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0) +1->Emitted(5, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0) +3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0) +4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0) +5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -62,28 +63,26 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0) -2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0) +1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0) +1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0) --- >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render(createElement) { > return
; > } >} -1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js index 12ea8b96602c3..c9f5f3465e353 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js @@ -15,11 +15,11 @@ export class AppComponent { //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class AppComponent { render() { return createElement("div", null); } } exports.AppComponent = AppComponent; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map index 715014ff53fbe..66666a526d62d 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map @@ -1,2 +1,2 @@ //// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt index b1b8db46eaace..1a77ab3eae17b 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>class AppComponent { 1 > 2 >^^^^^^^^^^^^^^^-> @@ -20,7 +21,7 @@ sourceFile:test.tsx >} > > -1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0) --- >>> render() { 1->^^^^ @@ -29,8 +30,8 @@ sourceFile:test.tsx 1->export class AppComponent { > 2 > render -1->Emitted(3, 5) Source(9, 5) + SourceIndex(0) -2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0) +1->Emitted(4, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0) --- >>> return createElement("div", null); 1->^^^^^^^^ @@ -44,11 +45,11 @@ sourceFile:test.tsx 3 > 4 >
5 > ; -1->Emitted(4, 9) Source(10, 9) + SourceIndex(0) -2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0) -3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0) -4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0) -5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0) +1->Emitted(5, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0) +3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0) +4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0) +5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -56,28 +57,26 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0) -2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0) +1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0) +1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0) --- >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render() { > return
; > } >} -1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js index 9f408e4db7ae9..9fc5799b11d96 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); let c; class A { view() { @@ -79,4 +80,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js index 331c7a65d7332..aa90c74cce5a7 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); let c; class A { view() { @@ -79,4 +80,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js index 0a7b7f8d38774..ee747733799ba 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=Element.js.map//// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let c; class A { @@ -80,5 +81,4 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map index f8cef24a0f0d5..6c5dd8abf56bf 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js.map +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map @@ -1,3 +1,3 @@ //// [Element.js.map] -{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file +{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt index 86ed94197d6e3..9831a9ab5fd6d 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js sourceFile:Element.ts ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>var Element; 1 > 2 >^^^^ @@ -42,10 +43,10 @@ sourceFile:Element.ts > } > } > } -1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0) -3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0) -4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0) +1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0) +3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0) +4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0) --- >>>(function (Element) { 1-> @@ -55,9 +56,9 @@ sourceFile:Element.ts 1-> 2 >export namespace 3 > Element -1->Emitted(3, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0) -3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0) +1->Emitted(4, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0) +3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0) --- >>> function isElement(el) { 1->^^^^ @@ -68,9 +69,9 @@ sourceFile:Element.ts > 2 > export function isElement( 3 > el: any -1->Emitted(4, 5) Source(15, 5) + SourceIndex(0) -2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0) -3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0) +1->Emitted(5, 5) Source(15, 5) + SourceIndex(0) +2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0) +3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0) --- >>> return el.markAsChildOfRootElement !== undefined; 1->^^^^^^^^ @@ -92,15 +93,15 @@ sourceFile:Element.ts 7 > !== 8 > undefined 9 > ; -1->Emitted(5, 9) Source(16, 9) + SourceIndex(0) -2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0) -3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0) -4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0) -5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0) -6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0) -7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0) -8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0) -9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0) +1->Emitted(6, 9) Source(16, 9) + SourceIndex(0) +2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0) +3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0) +4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0) +5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0) +6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0) +7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0) +8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0) +9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -109,8 +110,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0) -2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0) +1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0) +2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0) --- >>> Element.isElement = isElement; 1->^^^^ @@ -124,10 +125,10 @@ sourceFile:Element.ts > return el.markAsChildOfRootElement !== undefined; > } 4 > -1->Emitted(7, 5) Source(15, 21) + SourceIndex(0) -2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0) -3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0) -4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0) +1->Emitted(8, 5) Source(15, 21) + SourceIndex(0) +2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0) +3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0) +4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0) --- >>> function createElement(args) { 1->^^^^ @@ -138,9 +139,9 @@ sourceFile:Element.ts > 2 > export function createElement( 3 > args: any[] -1->Emitted(8, 5) Source(19, 5) + SourceIndex(0) -2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0) -3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0) +1->Emitted(9, 5) Source(19, 5) + SourceIndex(0) +2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0) +3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0) --- >>> return {}; 1 >^^^^^^^^ @@ -156,11 +157,11 @@ sourceFile:Element.ts 4 > { > } 5 > -1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0) -2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0) -3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0) -4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0) -5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0) +1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0) +2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0) +3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0) +4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0) +5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -169,8 +170,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0) -2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0) +1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0) --- >>> Element.createElement = createElement; 1->^^^^ @@ -186,10 +187,10 @@ sourceFile:Element.ts > } > } 4 > -1->Emitted(11, 5) Source(19, 21) + SourceIndex(0) -2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0) -3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0) -4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0) +1->Emitted(12, 5) Source(19, 21) + SourceIndex(0) +2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0) +3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0) +4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0) --- >>>})(Element = exports.Element || (exports.Element = {})); 1-> @@ -221,15 +222,15 @@ sourceFile:Element.ts > } > } > } -1->Emitted(12, 1) Source(24, 1) + SourceIndex(0) -2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0) -3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0) -4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0) -5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0) -6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0) -7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0) -8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0) -9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(24, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0) +3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0) +4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0) +5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0) +6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0) +7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0) +8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0) +9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0) --- >>>exports.createElement = Element.createElement; 1 > @@ -250,14 +251,14 @@ sourceFile:Element.ts 6 > . 7 > createElement 8 > ; -1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0) -2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0) -3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0) -4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0) -5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0) -6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0) -7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0) -8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0) +1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0) +2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0) +3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0) +4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0) +5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0) +6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0) +7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0) +8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0) --- >>>function toCamelCase(text) { 1 > @@ -269,9 +270,9 @@ sourceFile:Element.ts > 2 >function toCamelCase( 3 > text: string -1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0) -2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0) -3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0) +1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0) +2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0) +3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0) --- >>> return text[0].toLowerCase() + text.substring(1); 1->^^^^ @@ -311,36 +312,35 @@ sourceFile:Element.ts 16> 1 17> ) 18> ; -1->Emitted(15, 5) Source(29, 5) + SourceIndex(0) -2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0) -3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0) -4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0) -5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0) -6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0) -7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0) -8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0) -9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0) -10>Emitted(15, 33) Source(29, 33) + SourceIndex(0) -11>Emitted(15, 36) Source(29, 36) + SourceIndex(0) -12>Emitted(15, 40) Source(29, 40) + SourceIndex(0) -13>Emitted(15, 41) Source(29, 41) + SourceIndex(0) -14>Emitted(15, 50) Source(29, 50) + SourceIndex(0) -15>Emitted(15, 51) Source(29, 51) + SourceIndex(0) -16>Emitted(15, 52) Source(29, 52) + SourceIndex(0) -17>Emitted(15, 53) Source(29, 53) + SourceIndex(0) -18>Emitted(15, 54) Source(29, 54) + SourceIndex(0) +1->Emitted(16, 5) Source(29, 5) + SourceIndex(0) +2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0) +3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0) +4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0) +5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0) +6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0) +7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0) +8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0) +9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0) +10>Emitted(16, 33) Source(29, 33) + SourceIndex(0) +11>Emitted(16, 36) Source(29, 36) + SourceIndex(0) +12>Emitted(16, 40) Source(29, 40) + SourceIndex(0) +13>Emitted(16, 41) Source(29, 41) + SourceIndex(0) +14>Emitted(16, 50) Source(29, 50) + SourceIndex(0) +15>Emitted(16, 51) Source(29, 51) + SourceIndex(0) +16>Emitted(16, 52) Source(29, 52) + SourceIndex(0) +17>Emitted(16, 53) Source(29, 53) + SourceIndex(0) +18>Emitted(16, 54) Source(29, 54) + SourceIndex(0) --- >>>} 1 > 2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} -1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0) -2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0) +1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0) +2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=Element.js.map=================================================================== JsFile: test.js mapUrl: test.js.map @@ -352,13 +352,14 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>const Element_1 = require("./Element"); 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 >import { Element} from './Element'; -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0) --- >>>let c; 1 > @@ -376,10 +377,10 @@ sourceFile:test.tsx > } > } 4 > ; -1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0) -3 >Emitted(3, 6) Source(7, 2) + SourceIndex(0) -4 >Emitted(3, 7) Source(7, 3) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0) +3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0) +4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0) --- >>>class A { 1-> @@ -387,7 +388,7 @@ sourceFile:test.tsx 1-> > > -1->Emitted(4, 1) Source(9, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(9, 1) + SourceIndex(0) --- >>> view() { 1->^^^^ @@ -396,8 +397,8 @@ sourceFile:test.tsx 1->class A { > 2 > view -1->Emitted(5, 5) Source(10, 2) + SourceIndex(0) -2 >Emitted(5, 9) Source(10, 6) + SourceIndex(0) +1->Emitted(6, 5) Source(10, 2) + SourceIndex(0) +2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0) --- >>> return [ 1->^^^^^^^^ @@ -408,9 +409,9 @@ sourceFile:test.tsx > 2 > return 3 > -1->Emitted(6, 9) Source(11, 3) + SourceIndex(0) -2 >Emitted(6, 15) Source(11, 9) + SourceIndex(0) -3 >Emitted(6, 16) Source(11, 10) + SourceIndex(0) +1->Emitted(7, 9) Source(11, 3) + SourceIndex(0) +2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0) +3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0) --- >>> Element_1.Element.createElement("meta", { content: "helloworld" }), 1->^^^^^^^^^^^^ @@ -426,12 +427,12 @@ sourceFile:test.tsx 4 > = 5 > "helloworld" 6 > > -1->Emitted(7, 13) Source(12, 4) + SourceIndex(0) -2 >Emitted(7, 55) Source(12, 10) + SourceIndex(0) -3 >Emitted(7, 62) Source(12, 17) + SourceIndex(0) -4 >Emitted(7, 64) Source(12, 18) + SourceIndex(0) -5 >Emitted(7, 76) Source(12, 30) + SourceIndex(0) -6 >Emitted(7, 79) Source(12, 38) + SourceIndex(0) +1->Emitted(8, 13) Source(12, 4) + SourceIndex(0) +2 >Emitted(8, 55) Source(12, 10) + SourceIndex(0) +3 >Emitted(8, 62) Source(12, 17) + SourceIndex(0) +4 >Emitted(8, 64) Source(12, 18) + SourceIndex(0) +5 >Emitted(8, 76) Source(12, 30) + SourceIndex(0) +6 >Emitted(8, 79) Source(12, 38) + SourceIndex(0) --- >>> Element_1.Element.createElement("meta", { content: c.a.b }) 1 >^^^^^^^^^^^^ @@ -455,16 +456,16 @@ sourceFile:test.tsx 8 > . 9 > b 10> }> -1 >Emitted(8, 13) Source(13, 4) + SourceIndex(0) -2 >Emitted(8, 55) Source(13, 10) + SourceIndex(0) -3 >Emitted(8, 62) Source(13, 17) + SourceIndex(0) -4 >Emitted(8, 64) Source(13, 19) + SourceIndex(0) -5 >Emitted(8, 65) Source(13, 20) + SourceIndex(0) -6 >Emitted(8, 66) Source(13, 21) + SourceIndex(0) -7 >Emitted(8, 67) Source(13, 23) + SourceIndex(0) -8 >Emitted(8, 68) Source(13, 24) + SourceIndex(0) -9 >Emitted(8, 69) Source(13, 25) + SourceIndex(0) -10>Emitted(8, 72) Source(13, 34) + SourceIndex(0) +1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0) +2 >Emitted(9, 55) Source(13, 10) + SourceIndex(0) +3 >Emitted(9, 62) Source(13, 17) + SourceIndex(0) +4 >Emitted(9, 64) Source(13, 19) + SourceIndex(0) +5 >Emitted(9, 65) Source(13, 20) + SourceIndex(0) +6 >Emitted(9, 66) Source(13, 21) + SourceIndex(0) +7 >Emitted(9, 67) Source(13, 23) + SourceIndex(0) +8 >Emitted(9, 68) Source(13, 24) + SourceIndex(0) +9 >Emitted(9, 69) Source(13, 25) + SourceIndex(0) +10>Emitted(9, 72) Source(13, 34) + SourceIndex(0) --- >>> ]; 1 >^^^^^^^^^ @@ -472,8 +473,8 @@ sourceFile:test.tsx 1 > > ] 2 > ; -1 >Emitted(9, 10) Source(14, 4) + SourceIndex(0) -2 >Emitted(9, 11) Source(14, 5) + SourceIndex(0) +1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0) +2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -481,15 +482,14 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(10, 5) Source(15, 2) + SourceIndex(0) -2 >Emitted(10, 6) Source(15, 3) + SourceIndex(0) +1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0) +2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0) --- >>>} 1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0) +1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js index 60c8ca80212fd..510efc97f4a9a 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js @@ -14,11 +14,11 @@ export class AppComponent { //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class AppComponent { render(createElement) { return MyElement.createElement("div", null); } } exports.AppComponent = AppComponent; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map index ac54c9638cd1b..1af641eb35159 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map @@ -1,2 +1,2 @@ //// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt index 0e8d7ec51f3f8..2f5270f370535 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>class AppComponent { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> @@ -20,7 +21,7 @@ sourceFile:test.tsx >} > > -1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0) --- >>> render(createElement) { 1->^^^^ @@ -33,10 +34,10 @@ sourceFile:test.tsx 2 > render 3 > ( 4 > createElement -1->Emitted(3, 5) Source(9, 5) + SourceIndex(0) -2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0) -3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0) -4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0) +1->Emitted(4, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0) --- >>> return MyElement.createElement("div", null); 1->^^^^^^^^ @@ -50,11 +51,11 @@ sourceFile:test.tsx 3 > 4 >
5 > ; -1->Emitted(4, 9) Source(10, 9) + SourceIndex(0) -2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0) -3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0) -4 >Emitted(4, 52) Source(10, 23) + SourceIndex(0) -5 >Emitted(4, 53) Source(10, 24) + SourceIndex(0) +1->Emitted(5, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0) +3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0) +4 >Emitted(5, 52) Source(10, 23) + SourceIndex(0) +5 >Emitted(5, 53) Source(10, 24) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -62,28 +63,26 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0) -2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0) +1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0) +1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0) --- >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render(createElement) { > return
; > } >} -1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js index 72200aee75c59..267f3eaee5062 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js +++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js @@ -13,6 +13,7 @@ class Component { //// [index.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); require("./jsx"); var skate; var React = { createElement: skate.h }; @@ -25,4 +26,3 @@ var Component = (function () { return Component; }()); ; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js index 59bde766a351b..4b42ebe812d52 100644 --- a/tests/baselines/reference/jsxImportInAttribute.js +++ b/tests/baselines/reference/jsxImportInAttribute.js @@ -16,8 +16,8 @@ let x = Test; // emit test_1.default //// [consumer.jsx] "use strict"; +exports.__esModule = true; /// var Test_1 = require("Test"); var x = Test_1["default"]; // emit test_1.default ; // ? -exports.__esModule = true; diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js index 626a48d191eda..187ba545fb382 100644 --- a/tests/baselines/reference/jsxViaImport.2.js +++ b/tests/baselines/reference/jsxViaImport.2.js @@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; /// var BaseComponent_1 = require("BaseComponent"); var TestComponent = (function (_super) { @@ -47,4 +48,3 @@ var TestComponent = (function (_super) { }; return TestComponent; }(React.Component)); -exports.__esModule = true; diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js index 9040455be5695..3b291a347747e 100644 --- a/tests/baselines/reference/jsxViaImport.js +++ b/tests/baselines/reference/jsxViaImport.js @@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; /// var BaseComponent = require("BaseComponent"); var TestComponent = (function (_super) { @@ -47,4 +48,3 @@ var TestComponent = (function (_super) { }; return TestComponent; }(React.Component)); -exports.__esModule = true; diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js index 3e6b396184fb3..f198c0f9ea777 100644 --- a/tests/baselines/reference/localAliasExportAssignment.js +++ b/tests/baselines/reference/localAliasExportAssignment.js @@ -22,7 +22,7 @@ var server; module.exports = server; //// [localAliasExportAssignment_1.js] "use strict"; +exports.__esModule = true; /// var connect = require("./localAliasExportAssignment_0"); connect(); -exports.__esModule = true; diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js index 731e0e2e70b4f..9f22aa637535d 100644 --- a/tests/baselines/reference/mapOnTupleTypes01.js +++ b/tests/baselines/reference/mapOnTupleTypes01.js @@ -44,6 +44,7 @@ export let h = numNumNumNumNum.map(n => n * n); //// [mapOnTupleTypes01.js] "use strict"; +exports.__esModule = true; exports.mapOnLooseArrayLiteral = [1, 2, 3, 4].map(function (n) { return n * n; }); // Length 1 var numTuple = [1]; @@ -67,7 +68,6 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; }); // Length 6 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6]; exports.h = numNumNumNumNum.map(function (n) { return n * n; }); -exports.__esModule = true; //// [mapOnTupleTypes01.d.ts] diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js index 0906c6df189ee..ca835751a7a7d 100644 --- a/tests/baselines/reference/mapOnTupleTypes02.js +++ b/tests/baselines/reference/mapOnTupleTypes02.js @@ -8,11 +8,11 @@ export function increment(point: Point) { //// [mapOnTupleTypes02.js] "use strict"; +exports.__esModule = true; function increment(point) { return point.map(function (d) { return d + 1; }); } exports.increment = increment; -exports.__esModule = true; //// [mapOnTupleTypes02.d.ts] diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js index b3c51e66c4bd5..2ba05b016bee2 100644 --- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js +++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js @@ -17,6 +17,7 @@ WinJS.Promise.timeout(10); //// [memberAccessMustUseModuleInstances_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Promise = (function () { function Promise() { } @@ -26,11 +27,10 @@ define(["require", "exports"], function (require, exports) { return Promise; }()); exports.Promise = Promise; - exports.__esModule = true; }); //// [memberAccessMustUseModuleInstances_1.js] define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) { "use strict"; - WinJS.Promise.timeout(10); exports.__esModule = true; + WinJS.Promise.timeout(10); }); diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js index c27c5ef86150e..ec2eb4a1087cb 100644 --- a/tests/baselines/reference/mergeWithImportedNamespace.js +++ b/tests/baselines/reference/mergeWithImportedNamespace.js @@ -12,11 +12,11 @@ export namespace N { //// [f1.js] "use strict"; +exports.__esModule = true; var N; (function (N) { N.x = 1; })(N = exports.N || (exports.N = {})); -exports.__esModule = true; //// [f2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js index 21e457b1361ca..efa95d7763064 100644 --- a/tests/baselines/reference/mergeWithImportedType.js +++ b/tests/baselines/reference/mergeWithImportedType.js @@ -10,11 +10,11 @@ export type E = E; //// [f1.js] "use strict"; +exports.__esModule = true; var E; (function (E) { E[E["X"] = 0] = "X"; })(E = exports.E || (exports.E = {})); -exports.__esModule = true; //// [f2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js index 17aeccbc769f5..83173f35752d2 100644 --- a/tests/baselines/reference/mergedDeclarations6.js +++ b/tests/baselines/reference/mergedDeclarations6.js @@ -26,6 +26,7 @@ export class B extends A { //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } @@ -35,7 +36,6 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; - exports.__esModule = true; }); //// [b.js] var __extends = (this && this.__extends) || (function () { @@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports", "./a"], function (require, exports, a_1) { "use strict"; + exports.__esModule = true; var B = (function (_super) { __extends(B, _super); function B() { @@ -60,5 +61,4 @@ define(["require", "exports", "./a"], function (require, exports, a_1) { return B; }(a_1.A)); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js index d1becde5240ae..8fa3f2d0731f5 100644 --- a/tests/baselines/reference/mergedDeclarations7.js +++ b/tests/baselines/reference/mergedDeclarations7.js @@ -24,6 +24,6 @@ let p: Passport = passport.use(); //// [test.js] "use strict"; +exports.__esModule = true; var passport = require("passport"); var p = passport.use(); -exports.__esModule = true; diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js index c4e5c8dfa1056..8d5f55b68017f 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js @@ -17,6 +17,7 @@ export module X { //// [mergedModuleDeclarationCodeGen.js] "use strict"; +exports.__esModule = true; var X; (function (X) { var Y; @@ -40,4 +41,3 @@ var X; Y.B = B; })(Y = X.Y || (X.Y = {})); })(X = exports.X || (exports.X = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js index ace3445911c51..40cbc87cdcb67 100644 --- a/tests/baselines/reference/metadataOfEventAlias.js +++ b/tests/baselines/reference/metadataOfEventAlias.js @@ -13,8 +13,8 @@ export class SomeClass { //// [event.js] "use strict"; -; Object.defineProperty(exports, "__esModule", { value: true }); +; //// [test.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -26,6 +26,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); function Input(target, key) { } var SomeClass = (function () { function SomeClass() { @@ -37,4 +38,3 @@ __decorate([ __metadata("design:type", Object) ], SomeClass.prototype, "event", void 0); exports.SomeClass = SomeClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js index 87e1fdd8f58e0..23bb2356640ed 100644 --- a/tests/baselines/reference/missingFunctionImplementation.js +++ b/tests/baselines/reference/missingFunctionImplementation.js @@ -82,6 +82,7 @@ namespace N12 { //// [missingFunctionImplementation.js] "use strict"; +exports.__esModule = true; var C1 = (function () { function C1() { } @@ -162,4 +163,3 @@ var N12; function m(a) { } N12.m = m; })(N12 || (N12 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js index 2d33c5b97684e..d4a8b12d2a669 100644 --- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js +++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js @@ -10,9 +10,9 @@ import {x} from "./a" //// [a.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [b.js] "use strict"; -(function () { return 1; }()); exports.__esModule = true; +(function () { return 1; }()); diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js index 95ef30bb8d6e3..16eb962a863ce 100644 --- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js +++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js @@ -22,9 +22,9 @@ define(["require", "exports"], function (require, exports) { //// [moduleAliasAsFunctionArgument_1.js] define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) { "use strict"; + exports.__esModule = true; function fn(arg) { } a.x; // OK fn(a); // Error: property 'x' is missing from 'a' - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js index 76eb8237cc69f..a92cf5093e34e 100644 --- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js +++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js @@ -41,20 +41,20 @@ define(["require", "exports"], function (require, exports) { //// [map1.js] define(["require", "exports", "./observable"], function (require, exports, observable_1) { "use strict"; - observable_1.Observable.prototype.map = function () { }; exports.__esModule = true; + observable_1.Observable.prototype.map = function () { }; }); //// [map2.js] define(["require", "exports", "./observable"], function (require, exports, observable_1) { "use strict"; - observable_1.Observable.prototype.map = function () { }; exports.__esModule = true; + observable_1.Observable.prototype.map = function () { }; }); //// [main.js] define(["require", "exports", "./map1", "./map2"], function (require, exports) { "use strict"; - var x; exports.__esModule = true; + var x; }); diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js index 92bb6cd1d9982..7775930684556 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js @@ -34,22 +34,22 @@ let y = x.map(x => x + 1); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { var someValue; })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; //// [observable.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js index 02d461e642d3f..15ca6aaf806da 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js @@ -36,24 +36,24 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); require("./map"); var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); -exports.__esModule = true; //// [observable.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js index cae38270898be..c29bed68e5137 100644 --- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js +++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js @@ -49,24 +49,24 @@ import "./x"; //// [x0.js] "use strict"; -exports.a = 1; exports.__esModule = true; +exports.a = 1; //// [x.js] "use strict"; +exports.__esModule = true; var N1; (function (N1) { N1.x = 1; })(N1 || (N1 = {})); -exports.__esModule = true; //// [observable.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [test.js] "use strict"; -exports.b = 1; exports.__esModule = true; +exports.b = 1; //// [main.js] "use strict"; -require("./x"); exports.__esModule = true; +require("./x"); diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js index 5dc02dc308222..d6857a28ef162 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js @@ -36,12 +36,12 @@ let y = x.map(x => x + 1); //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js index 28461511dfff2..eee03576336ff 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js @@ -38,11 +38,12 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; /// var observable_1 = require("observable"); require("./map"); @@ -50,7 +51,6 @@ var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); -exports.__esModule = true; //// [map.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js index 0becae3f0fff5..9d15f3fe387fd 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js @@ -34,19 +34,19 @@ let y = x.map(x => x + 1); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { var someValue; })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js index cdad871ac21c3..072c62862e3bc 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js @@ -36,21 +36,21 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); require("./map"); var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js index 6569631a8d73f..2ef6441692f40 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal1.js +++ b/tests/baselines/reference/moduleAugmentationGlobal1.js @@ -20,18 +20,18 @@ let y = x.getA().x; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var x = [1]; var y = x.getA().x; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js index 222e337dd6437..1806ceae9a192 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal2.js +++ b/tests/baselines/reference/moduleAugmentationGlobal2.js @@ -20,6 +20,7 @@ let y = x.getCountAsString().toLowerCase(); //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } @@ -27,12 +28,11 @@ var A = (function () { }()); exports.A = A; ; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var x = [1]; var y = x.getCountAsString().toLowerCase(); -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js index 88e6b2c204d1e..9cb08f2b866f4 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal3.js +++ b/tests/baselines/reference/moduleAugmentationGlobal3.js @@ -23,6 +23,7 @@ let y = x.getCountAsString().toLowerCase(); //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } @@ -30,16 +31,15 @@ var A = (function () { }()); exports.A = A; ; -exports.__esModule = true; //// [f2.js] "use strict"; exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; require("./f2"); var x = [1]; var y = x.getCountAsString().toLowerCase(); -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js index 6d9d76f8aafb1..194d06aeb80a7 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal4.js +++ b/tests/baselines/reference/moduleAugmentationGlobal4.js @@ -26,9 +26,9 @@ exports.__esModule = true; exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; require("./f1"); require("./f2"); -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js index f25dffba5e83b..43d8c6b958b16 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal5.js +++ b/tests/baselines/reference/moduleAugmentationGlobal5.js @@ -23,11 +23,11 @@ import "B"; //// [f3.js] "use strict"; +exports.__esModule = true; /// /// require("A"); require("B"); -exports.__esModule = true; //// [f3.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js index 6a825dcf34c71..66ce39e8d84a1 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js @@ -29,33 +29,33 @@ let b = a.foo().n; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js index 4f30d1210ff44..e79f2e5848482 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js @@ -41,33 +41,33 @@ let b = a.foo().n; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js index 66de9f1c596f8..c7c13ea786117 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js @@ -39,33 +39,33 @@ let b = a.foo().n; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js index 0729457fc514e..9cdf76b90a557 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js @@ -41,32 +41,32 @@ let d = a.baz().b; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js index 7970f65f412c8..c7f7990608ec2 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js @@ -41,35 +41,35 @@ let d = a.baz().b; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js index 3b290b8297512..0f19e737ec5ba 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js @@ -41,35 +41,35 @@ let d = a.baz().b; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js index 852d50f8d014b..4cdef37a4f7cc 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js @@ -31,9 +31,9 @@ x.foo().x; //// [main.js] /// "use strict"; +exports.__esModule = true; var x; x.foo().x; -exports.__esModule = true; //// [main.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js index 1fdb32a55b54d..536931ee61fbf 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js @@ -31,7 +31,7 @@ x.foo().x; //// [main.js] /// "use strict"; +exports.__esModule = true; require("Map"); var x; x.foo().x; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js index aa6b33baef3d7..37253ab7e5b40 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js @@ -41,8 +41,8 @@ x.foo2().x2; //// [main.js] /// "use strict"; +exports.__esModule = true; require("Map"); var x; x.foo().x; x.foo2().x2; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js index 5f209f753cf96..0c861447b46a7 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js @@ -44,8 +44,8 @@ x.foo2().x2; /// /// "use strict"; +exports.__esModule = true; require("Map"); var x; x.foo().x; x.foo2().x2; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js index 55226da5ee979..ac202784f43e8 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js @@ -25,11 +25,11 @@ let y = x.getA().x; //// [f.js] "use strict"; +exports.__esModule = true; /// require("array"); var x = [1]; var y = x.getA().x; -exports.__esModule = true; //// [f.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js index 757b71754d6a7..31c82ad18e881 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency.js +++ b/tests/baselines/reference/moduleAugmentationInDependency.js @@ -10,5 +10,5 @@ import "A" //// [app.js] "use strict"; -require("A"); exports.__esModule = true; +require("A"); diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js index 53d2e6ede7175..e7a964650bd8e 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency2.js +++ b/tests/baselines/reference/moduleAugmentationInDependency2.js @@ -13,5 +13,5 @@ import "A" exports.__esModule = true; //// [app.js] "use strict"; -require("A"); exports.__esModule = true; +require("A"); diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js index 6edaf5b9fca98..4376c23a7f8f8 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.js +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js @@ -33,12 +33,12 @@ let y = x.map(x => x + 1); exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js index d41be36991757..9ad2aa842d0cc 100644 --- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js +++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js @@ -58,22 +58,23 @@ c.baz2().x.toLowerCase(); //// [out.js] define("m1", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var Cls = (function () { function Cls() { } return Cls; }()); exports.Cls = Cls; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); m1_1.Cls.prototype.foo = function () { return 1; }; m1_1.Cls.prototype.bar = function () { return "1"; }; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("m3", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var C1 = (function () { function C1() { } @@ -86,22 +87,21 @@ define("m3", ["require", "exports"], function (require, exports) { return C2; }()); exports.C2 = C2; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); m1_2.Cls.prototype.baz1 = function () { return undefined; }; m1_2.Cls.prototype.baz2 = function () { return undefined; }; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("test", ["require", "exports", "m2", "m4"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var c; c.foo().toExponential(); c.bar().toLowerCase(); c.baz1().x.toExponential(); c.baz2().x.toLowerCase(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js index 4f93e976dfca8..116c5c5e830f3 100644 --- a/tests/baselines/reference/moduleAugmentationsImports1.js +++ b/tests/baselines/reference/moduleAugmentationsImports1.js @@ -45,37 +45,37 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); /// define("d", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; + exports.__esModule = true; a_1.A.prototype.getB = function () { return undefined; }; a_1.A.prototype.getCls = function () { return undefined; }; - exports.__esModule = true; }); define("main", ["require", "exports", "d"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js index 94d418c7fc748..e13cbd8f3ddf9 100644 --- a/tests/baselines/reference/moduleAugmentationsImports2.js +++ b/tests/baselines/reference/moduleAugmentationsImports2.js @@ -50,41 +50,41 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); /// define("d", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; - a_1.A.prototype.getB = function () { return undefined; }; exports.__esModule = true; + a_1.A.prototype.getB = function () { return undefined; }; }); define("e", ["require", "exports", "a"], function (require, exports, a_2) { "use strict"; - a_2.A.prototype.getCls = function () { return undefined; }; exports.__esModule = true; + a_2.A.prototype.getCls = function () { return undefined; }; }); define("main", ["require", "exports", "d", "e"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js index 71f96df940c84..a4a6ccea84955 100644 --- a/tests/baselines/reference/moduleAugmentationsImports3.js +++ b/tests/baselines/reference/moduleAugmentationsImports3.js @@ -49,35 +49,35 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); define("e", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; - a_1.A.prototype.getCls = function () { return undefined; }; exports.__esModule = true; + a_1.A.prototype.getCls = function () { return undefined; }; }); define("main", ["require", "exports", "D", "e"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js index 2883d91d03c4c..4be17a61edbc6 100644 --- a/tests/baselines/reference/moduleAugmentationsImports4.js +++ b/tests/baselines/reference/moduleAugmentationsImports4.js @@ -50,30 +50,30 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); define("main", ["require", "exports", "D", "E"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js index 8c396d4fcdd5e..ee6fd2ab3176b 100644 --- a/tests/baselines/reference/moduleCodeGenTest5.js +++ b/tests/baselines/reference/moduleCodeGenTest5.js @@ -23,6 +23,7 @@ var v = E2.B; //// [moduleCodeGenTest5.js] "use strict"; +exports.__esModule = true; exports.x = 0; var y = 0; function f1() { } @@ -53,4 +54,3 @@ var E2; E2[E2["B"] = 0] = "B"; })(E2 || (E2 = {})); var v = E2.B; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js index e66235ca2bcb4..f877ad74bc36a 100644 --- a/tests/baselines/reference/moduleCodegenTest4.js +++ b/tests/baselines/reference/moduleCodegenTest4.js @@ -6,10 +6,10 @@ void 0; //// [moduleCodegenTest4.js] "use strict"; +exports.__esModule = true; var Baz; (function (Baz) { Baz.x = "hello"; })(Baz = exports.Baz || (exports.Baz = {})); Baz.x = "goodbye"; void 0; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js index 1af231a9a6224..a2a099fca1d56 100644 --- a/tests/baselines/reference/moduleDuplicateIdentifiers.js +++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js @@ -42,6 +42,7 @@ export enum Utensils { // Shouldn't error //// [moduleDuplicateIdentifiers.js] "use strict"; +exports.__esModule = true; exports.Foo = 2; exports.Foo = 42; // Should error var FooBar; @@ -76,4 +77,3 @@ var Utensils; (function (Utensils) { Utensils[Utensils["Spork"] = 3] = "Spork"; })(Utensils = exports.Utensils || (exports.Utensils = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js index 7db2ce416ddd8..66c746c5f5189 100644 --- a/tests/baselines/reference/moduleExports1.js +++ b/tests/baselines/reference/moduleExports1.js @@ -16,6 +16,7 @@ if (!module.exports) module.exports = ""; //// [moduleExports1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var TypeScript; (function (TypeScript) { var Strasse; @@ -36,5 +37,4 @@ define(["require", "exports"], function (require, exports) { void 0; if (!module.exports) module.exports = ""; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js index 9e79d8d81b226..2ed22cfa4f0e3 100644 --- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js +++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js @@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { } @@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) { } return Test1; }(C1)); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js index 314460661b24b..7408db5c29111 100644 --- a/tests/baselines/reference/moduleInTypePosition1.js +++ b/tests/baselines/reference/moduleInTypePosition1.js @@ -13,14 +13,14 @@ var x = (w1: WinJS) => { }; //// [moduleInTypePosition1_0.js] "use strict"; +exports.__esModule = true; var Promise = (function () { function Promise() { } return Promise; }()); exports.Promise = Promise; -exports.__esModule = true; //// [moduleInTypePosition1_1.js] "use strict"; -var x = function (w1) { }; exports.__esModule = true; +var x = function (w1) { }; diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js index edf18bb7d583a..88531532acc70 100644 --- a/tests/baselines/reference/moduleMergeConstructor.js +++ b/tests/baselines/reference/moduleMergeConstructor.js @@ -30,11 +30,11 @@ class Test { //// [index.js] define(["require", "exports", "foo"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; var Test = (function () { function Test() { this.bar = new foo.Foo(); } return Test; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js index 3ed09d2cd7aa6..7be89f236be00 100644 --- a/tests/baselines/reference/moduleNoneErrors.js +++ b/tests/baselines/reference/moduleNoneErrors.js @@ -6,10 +6,10 @@ export class Foo { //// [a.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js index cb53b78f03819..b38e5d95f2c53 100644 --- a/tests/baselines/reference/modulePrologueAMD.js +++ b/tests/baselines/reference/modulePrologueAMD.js @@ -6,11 +6,11 @@ export class Foo {} //// [modulePrologueAMD.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js index 2f2cf9d91488f..4f465a2ae2f19 100644 --- a/tests/baselines/reference/modulePrologueCommonjs.js +++ b/tests/baselines/reference/modulePrologueCommonjs.js @@ -5,10 +5,10 @@ export class Foo {} //// [modulePrologueCommonjs.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js index 7b39a9d12e312..c9b8c331bcf14 100644 --- a/tests/baselines/reference/modulePrologueUmd.js +++ b/tests/baselines/reference/modulePrologueUmd.js @@ -14,11 +14,11 @@ export class Foo {} } })(function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js index 685a2ac02331f..86f681fa27af6 100644 --- a/tests/baselines/reference/moduleResolutionNoResolve.js +++ b/tests/baselines/reference/moduleResolutionNoResolve.js @@ -13,5 +13,5 @@ export var c = ''; exports.__esModule = true; //// [b.js] "use strict"; -exports.c = ''; exports.__esModule = true; +exports.c = ''; diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js index 3921729211785..33f692396fac6 100644 --- a/tests/baselines/reference/moduleResolutionNoTs.js +++ b/tests/baselines/reference/moduleResolutionNoTs.js @@ -23,12 +23,12 @@ import z2 from "./z"; //// [x.js] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; //// [y.jsx] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; //// [user.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js index d2ee65a508a41..b9a644a7209ad 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions.js @@ -27,8 +27,8 @@ import j from "./jquery.js" //// [a.js] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; // No extension: '.ts' added //// [b.js] "use strict"; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js index fb8904c5748e6..a9dc91d9a5516 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js @@ -12,8 +12,8 @@ import b from "./b"; //// [index.js] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; //// [a.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js index 014207d240027..7d67bde6509b9 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js @@ -14,5 +14,5 @@ import "normalize.css"; //// [a.js] "use strict"; -require("normalize.css"); exports.__esModule = true; +require("normalize.css"); diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js index c53efeb09613b..0a04d8a9077d6 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js @@ -14,5 +14,5 @@ import "foo"; //// [a.js] "use strict"; -require("foo"); exports.__esModule = true; +require("foo"); diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js index e0aebb04d76b3..520324cb22239 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js @@ -43,25 +43,25 @@ tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js // When symlinked files are in node_modules, they are resolved with realpath; // so a linked file does not create a duplicate SourceFile of the real one. "use strict"; +exports.__esModule = true; var MyClass = (function () { function MyClass() { } return MyClass; }()); exports.MyClass = MyClass; -exports.__esModule = true; //// [/src/library-b/index.js] "use strict"; +exports.__esModule = true; var library_a_1 = require("library-a"); exports.MyClass2 = library_a_1.MyClass; -exports.__esModule = true; //// [/src/app.js] "use strict"; +exports.__esModule = true; var x; var y; x = y; y = x; -exports.__esModule = true; /* # To reproduce in a real project: diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js index 55317e413bfcc..cde63e0604ded 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js @@ -18,18 +18,18 @@ x + x2; // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files. // See GH#10364. "use strict"; -exports.x = 0; exports.__esModule = true; +exports.x = 0; //// [/src/bin/shared2/abc.js] // When symlinked files are not in node_modules, realpath is not used. // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files. // See GH#10364. "use strict"; -exports.x = 0; exports.__esModule = true; +exports.x = 0; //// [/src/bin/app.js] "use strict"; +exports.__esModule = true; var abc_1 = require("./shared/abc"); var abc_2 = require("./shared2/abc"); abc_1.x + abc_2.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js index d4fb798e8c7c8..0bd77a1dcc78d 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js @@ -22,22 +22,22 @@ y = x; //// [/src/bin/library-a/index.js] // Same as moduleResolutionWithSymlinks.ts, but with outDir "use strict"; +exports.__esModule = true; var MyClass = (function () { function MyClass() { } return MyClass; }()); exports.MyClass = MyClass; -exports.__esModule = true; //// [/src/bin/library-b/index.js] "use strict"; +exports.__esModule = true; var library_a_1 = require("library-a"); exports.MyClass2 = library_a_1.MyClass; -exports.__esModule = true; //// [/src/bin/app.js] "use strict"; +exports.__esModule = true; var x; var y; x = y; y = x; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js index 0b50be0e5e419..c4d451ba9f9d3 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js @@ -12,20 +12,20 @@ export var foo = 42; //// [c.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [b.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } -__export(require("./c")); exports.__esModule = true; +__export(require("./c")); //// [a.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +exports.__esModule = true; __export(require("./b")); __export(require("./c")); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js index 7caaf1e55f69a..d1f6dc7abc7cf 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js @@ -15,23 +15,23 @@ export enum Animals { //// [c.js] "use strict"; +exports.__esModule = true; var Animals; (function (Animals) { Animals[Animals["Cat"] = 0] = "Cat"; Animals[Animals["Dog"] = 1] = "Dog"; })(Animals = exports.Animals || (exports.Animals = {})); ; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var c_1 = require("./c"); exports.Animals = c_1.Animals; -exports.__esModule = true; //// [a.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +exports.__esModule = true; __export(require("./b")); __export(require("./c")); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js index bee7a06ce6ffe..601d7e41fcde0 100644 --- a/tests/baselines/reference/moduleScoping.js +++ b/tests/baselines/reference/moduleScoping.js @@ -29,16 +29,16 @@ var v2 = 42; // Global scope var v4 = function () { return 5; }; //// [file3.js] "use strict"; +exports.__esModule = true; exports.v3 = true; var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope -exports.__esModule = true; //// [file4.js] "use strict"; +exports.__esModule = true; var file3 = require("./file3"); var t1 = v1; var t2 = v2; var t3 = file3.v3; var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module -exports.__esModule = true; //// [file5.js] var x = v2; // Should be global v2 of type number again diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js index afc2fa1f5bd58..07e353cb301b2 100644 --- a/tests/baselines/reference/multiImportExport.js +++ b/tests/baselines/reference/multiImportExport.js @@ -44,13 +44,13 @@ var Math = { module.exports = Math; //// [Drawing.js] "use strict"; -exports.Math = require("./Math/Math"); exports.__esModule = true; +exports.Math = require("./Math/Math"); //// [consumer.js] "use strict"; +exports.__esModule = true; var Drawing = require("./Drawing"); var addr = new Drawing.Math.Adder(); -exports.__esModule = true; //// [Adder.d.ts] diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js index 4ea2e7cb8f03e..98c170518094d 100644 --- a/tests/baselines/reference/multipleDefaultExports01.js +++ b/tests/baselines/reference/multipleDefaultExports01.js @@ -20,6 +20,7 @@ Entity(); //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var foo = (function () { function foo() { } @@ -31,9 +32,8 @@ function bar() { exports.default = bar; var x = 10; exports.default = x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("./m1"); m1_1.default(); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js index 5fe294d193976..b129dba039232 100644 --- a/tests/baselines/reference/multipleDefaultExports02.js +++ b/tests/baselines/reference/multipleDefaultExports02.js @@ -17,15 +17,15 @@ Entity(); //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; function bar() { } exports.default = bar; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("./m1"); m1_1.default(); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js index 436232c145ed7..897a3f00eb443 100644 --- a/tests/baselines/reference/multipleDefaultExports03.js +++ b/tests/baselines/reference/multipleDefaultExports03.js @@ -8,6 +8,7 @@ export default class C { //// [multipleDefaultExports03.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -20,4 +21,3 @@ var C = (function () { return C; }()); exports.default = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js index b2c37ec5f0ef3..341f6f41c629e 100644 --- a/tests/baselines/reference/multipleDefaultExports04.js +++ b/tests/baselines/reference/multipleDefaultExports04.js @@ -8,10 +8,10 @@ export default function f() { //// [multipleDefaultExports04.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.default = f; function f() { } exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js index 4817012ab75dc..8375c2f9e6f3e 100644 --- a/tests/baselines/reference/multipleExportDefault1.js +++ b/tests/baselines/reference/multipleExportDefault1.js @@ -10,10 +10,10 @@ export default { //// [multipleExportDefault1.js] "use strict"; +exports.__esModule = true; function Foo() { } exports["default"] = Foo; exports["default"] = { uhoh: "another default" }; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js index e979b96fe7174..0c06385f9af46 100644 --- a/tests/baselines/reference/multipleExportDefault2.js +++ b/tests/baselines/reference/multipleExportDefault2.js @@ -9,9 +9,9 @@ export default function Foo() { } //// [multipleExportDefault2.js] "use strict"; +exports.__esModule = true; exports["default"] = { uhoh: "another default" }; function Foo() { } exports["default"] = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js index e889edc907a9f..1091af16301ec 100644 --- a/tests/baselines/reference/multipleExportDefault3.js +++ b/tests/baselines/reference/multipleExportDefault3.js @@ -9,6 +9,7 @@ export default class C { } //// [multipleExportDefault3.js] "use strict"; +exports.__esModule = true; exports["default"] = { uhoh: "another default" }; @@ -18,4 +19,3 @@ var C = (function () { return C; }()); exports["default"] = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js index d46cda4d8b3a4..b3e0ef3e87069 100644 --- a/tests/baselines/reference/multipleExportDefault4.js +++ b/tests/baselines/reference/multipleExportDefault4.js @@ -7,6 +7,7 @@ export default { //// [multipleExportDefault4.js] "use strict"; +exports.__esModule = true; var C = (function () { function C() { } @@ -16,4 +17,3 @@ exports["default"] = C; exports["default"] = { uhoh: "another default" }; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js index 5c10a1be95abe..a5032e45244c8 100644 --- a/tests/baselines/reference/multipleExportDefault5.js +++ b/tests/baselines/reference/multipleExportDefault5.js @@ -4,6 +4,7 @@ export default class C {} //// [multipleExportDefault5.js] "use strict"; +exports.__esModule = true; function bar() { } exports["default"] = bar; var C = (function () { @@ -12,4 +13,3 @@ var C = (function () { return C; }()); exports["default"] = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js index 3d990277993f6..aa372e4d4105c 100644 --- a/tests/baselines/reference/multipleExportDefault6.js +++ b/tests/baselines/reference/multipleExportDefault6.js @@ -9,10 +9,10 @@ export default { //// [multipleExportDefault6.js] "use strict"; +exports.__esModule = true; exports["default"] = { lol: 1 }; exports["default"] = { lol: 2 }; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js index 75a4e125f2119..052765914474b 100644 --- a/tests/baselines/reference/multipleExports.js +++ b/tests/baselines/reference/multipleExports.js @@ -14,6 +14,7 @@ export module M { //// [multipleExports.js] "use strict"; +exports.__esModule = true; var M; (function (M) { M.v = 0; @@ -22,4 +23,3 @@ var x = 0; (function (M) { M.v; })(M = exports.M || (exports.M = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js index 4677da0df7b89..149b6a0d59f8d 100644 --- a/tests/baselines/reference/nameDelimitedBySlashes.js +++ b/tests/baselines/reference/nameDelimitedBySlashes.js @@ -10,10 +10,10 @@ var x = foo.foo + 42; //// [foo_0.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./test/foo_0"); var x = foo.foo + 42; -exports.__esModule = true; diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js index de42c5ed60cae..3c1cf8dce663d 100644 --- a/tests/baselines/reference/nameWithFileExtension.js +++ b/tests/baselines/reference/nameWithFileExtension.js @@ -10,10 +10,10 @@ var x = foo.foo + 42; //// [foo_0.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0.js"); var x = foo.foo + 42; -exports.__esModule = true; diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js index e7c85322317a4..d070638417bdd 100644 --- a/tests/baselines/reference/nameWithRelativePaths.js +++ b/tests/baselines/reference/nameWithRelativePaths.js @@ -25,28 +25,28 @@ if(foo2.M2.x){ //// [foo_0.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; function f() { return 42; } exports.f = f; -exports.__esModule = true; //// [foo_2.js] "use strict"; +exports.__esModule = true; var M2; (function (M2) { M2.x = true; })(M2 = exports.M2 || (exports.M2 = {})); -exports.__esModule = true; //// [foo_3.js] "use strict"; +exports.__esModule = true; var foo0 = require("../foo_0"); var foo1 = require("./test/foo_1"); var foo2 = require("./.././test/foo_2"); if (foo2.M2.x) { var x = foo0.foo + foo1.f(); } -exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js index a8a506f23c3ae..1e03f7745d259 100644 --- a/tests/baselines/reference/project/baseline/amd/decl.js +++ b/tests/baselines/reference/project/baseline/amd/decl.js @@ -1,9 +1,9 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js index 5daa18796285e..b4d6d12445bc9 100644 --- a/tests/baselines/reference/project/baseline/amd/emit.js +++ b/tests/baselines/reference/project/baseline/amd/emit.js @@ -1,5 +1,5 @@ define(["require", "exports", "./decl"], function (require, exports, g) { "use strict"; - var p = g.point(10, 20); exports.__esModule = true; + 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 998ffaa559235..b7047c3f0473f 100644 --- a/tests/baselines/reference/project/baseline/node/decl.js +++ b/tests/baselines/reference/project/baseline/node/decl.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js index 17c96719d0b45..9410f82bc328e 100644 --- a/tests/baselines/reference/project/baseline/node/emit.js +++ b/tests/baselines/reference/project/baseline/node/emit.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; var g = require("./decl"); var p = g.point(10, 20); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js index a8a506f23c3ae..1e03f7745d259 100644 --- a/tests/baselines/reference/project/baseline2/amd/decl.js +++ b/tests/baselines/reference/project/baseline2/amd/decl.js @@ -1,9 +1,9 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js index 859d262e9c613..18dae0f6420b3 100644 --- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js @@ -1,5 +1,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; - var p = { x: 10, y: 20 }; exports.__esModule = true; + 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 998ffaa559235..b7047c3f0473f 100644 --- a/tests/baselines/reference/project/baseline2/node/decl.js +++ b/tests/baselines/reference/project/baseline2/node/decl.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js index c172dcd312fe7..ce766eee086a3 100644 --- a/tests/baselines/reference/project/baseline2/node/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js @@ -1,3 +1,3 @@ "use strict"; -var p = { x: 10, y: 20 }; exports.__esModule = true; +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 3fa69311ffa10..c4f4e37489dbe 100644 --- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var outer; (function (outer) { var inner; @@ -8,5 +9,4 @@ define(["require", "exports"], function (require, exports) { inner.a = local; })(inner = outer.inner || (outer.inner = {})); })(outer = exports.outer || (exports.outer = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js index 9596b38253ae1..345fd8914cc6f 100644 --- a/tests/baselines/reference/project/baseline3/node/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var outer; (function (outer) { var inner; @@ -7,4 +8,3 @@ var outer; inner.a = local; })(inner = outer.inner || (outer.inner = {})); })(outer = exports.outer || (exports.outer = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js index 30c63965136d0..4db463a796620 100644 --- a/tests/baselines/reference/project/declarationDir/amd/a.js +++ b/tests/baselines/reference/project/declarationDir/amd/a.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js index 14c0c78edb83c..bdae3c44b0aa1 100644 --- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js index b62647beae072..ff657652a4a98 100644 --- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js index 7480c269a0555..2139e86c811c4 100644 --- a/tests/baselines/reference/project/declarationDir/node/a.js +++ b/tests/baselines/reference/project/declarationDir/node/a.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js index 3c9a75de66e6d..df27fec56d182 100644 --- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js index 6f1ce11cdc6f3..385b6df759167 100644 --- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js index 30c63965136d0..4db463a796620 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js index 14c0c78edb83c..bdae3c44b0aa1 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js index b62647beae072..ff657652a4a98 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js index 7480c269a0555..2139e86c811c4 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/a.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js index 3c9a75de66e6d..df27fec56d182 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js index 6f1ce11cdc6f3..385b6df759167 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js index d190c7a5767b1..b90d4415806a6 100644 --- a/tests/baselines/reference/project/declarationDir3/amd/out.js +++ b/tests/baselines/reference/project/declarationDir3/amd/out.js @@ -1,30 +1,30 @@ define("subfolder/b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("subfolder/c", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js index 44111609dca35..1610052986d7e 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js @@ -1,7 +1,7 @@ define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) { "use strict"; + exports.__esModule = true; exports.useGlo_m4_x4 = glo_m4.x; exports.useGlo_m4_d4 = glo_m4.d; exports.useGlo_m4_f4 = glo_m4.foo(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js index b3ee7499e44d9..b7ddd253b1a93 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js @@ -1,6 +1,6 @@ "use strict"; +exports.__esModule = true; 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(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js index a6563ac4f7396..6ecb0c59793af 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js @@ -1,10 +1,10 @@ define(["require", "exports", "private_m4"], function (require, exports, private_m4) { "use strict"; + exports.__esModule = true; 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 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js index 24526ded58be4..79310d89c02b4 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; // only used privately no need to emit var private_m4 = require("private_m4"); var usePrivate_m4_m1; @@ -7,4 +8,3 @@ var usePrivate_m4_m1; var d3 = private_m4.d; var f3 = private_m4.foo(); })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js index b3dc7cc82f223..c6c57dabc810d 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js @@ -1,5 +1,5 @@ define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) { "use strict"; - exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); exports.__esModule = true; + exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); }); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js index 8d74ebb2b6eb2..991afa567cffe 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; var fncOnly_m4 = require("fncOnly_m4"); exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js index 6f282e2614768..1a0305591ccbd 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js @@ -1,8 +1,8 @@ define(["require", "exports", "m4"], function (require, exports, m4) { "use strict"; + exports.__esModule = true; function foo2() { return new m4.d(); } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js index e9c49cd4ddcec..6f962bd42e5ed 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js @@ -1,10 +1,10 @@ define(["require", "exports", "m5"], function (require, exports, m5) { "use strict"; + exports.__esModule = true; exports.d = m5.foo2(); exports.x = m5.foo2; function n() { return m5.foo2(); } exports.n = n; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js index fd0ae21091eee..db280e7fd8e1b 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used function foo2() { return new m4.d(); } exports.foo2 = foo2; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js index f06725c106869..7cc88b54ff394 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; // Do not emit unused import var m5 = require("m5"); exports.d = m5.foo2(); @@ -7,4 +8,3 @@ function n() { return m5.foo2(); } exports.n = n; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js index 8af4110011c61..5375f44c01361 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js @@ -1,5 +1,6 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) { "use strict"; + exports.__esModule = true; exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); @@ -15,5 +16,4 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js index fc6900da8d5d5..395cbeee96693 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; @@ -17,4 +18,3 @@ 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(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js index 6f282e2614768..1a0305591ccbd 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js @@ -1,8 +1,8 @@ define(["require", "exports", "m4"], function (require, exports, m4) { "use strict"; + exports.__esModule = true; function foo2() { return new m4.d(); } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js index 7221b9e2e8f55..b8a22cfdc1f76 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js @@ -1,5 +1,6 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { "use strict"; + exports.__esModule = true; exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); @@ -13,5 +14,4 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); exports.d = m5.foo2(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js index fd0ae21091eee..db280e7fd8e1b 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used function foo2() { return new m4.d(); } exports.foo2 = foo2; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js index 7e7a43ce145d9..49958bb9814bc 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; @@ -15,4 +16,3 @@ var m1; // Do not emit unused import var m5 = require("m5"); exports.d = m5.foo2(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js index 1c8e3a5a3082a..af5fcb7d87409 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js @@ -1,5 +1,6 @@ define(["require", "exports", "m4"], function (require, exports, m4) { "use strict"; + exports.__esModule = true; exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); @@ -12,5 +13,4 @@ define(["require", "exports", "m4"], function (require, exports, m4) { var d3 = m4.d; var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js index ea2836708d217..3a5602a21664d 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; @@ -12,4 +13,3 @@ var m1; var d3 = m4.d; var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index 2ef457654e2f6..7eeee43049b85 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 891c03b13f2e4..c44e24a081e88 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index b12b9bfe9bbd3..d393dda0c5749 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 30f6e242bc8aa..436eab5db94f2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 2ef457654e2f6..7eeee43049b85 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 891c03b13f2e4..c44e24a081e88 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index b12b9bfe9bbd3..d393dda0c5749 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 30f6e242bc8aa..436eab5db94f2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 225b233f3e1bc..1c199b7384adb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 e924809994328..df6d2c811c08e 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index ee9fb6673bed4..749fbd732a5b9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 9d5330f5c8154..0c75dbb2b0052 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 5db5f8f1bfb54..b49f0a04b531b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 62dc8a8d83fa4..c67e35d1b89b4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js index 2d386326fcd6a..1935dadfdb358 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 28136d8ffc30a..8f88c077a44d6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index 944360ae9cc37..fa9c56910474d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index dd409b9f2c3b1..b3b4c42289fee 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 78b4b9fcfe113..80d6ba438ba60 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index e7e1070403f0a..dabe72d27872a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js index bd73b1912c293..d28465d805ea8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f5f5dfcd793b1..6c7d26906a41e 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index aff7400b20fc2..46d82346a3749 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 6ba04afda9e2a..3813e4b2cca84 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 2d386326fcd6a..1935dadfdb358 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 28136d8ffc30a..8f88c077a44d6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index 944360ae9cc37..fa9c56910474d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index dd409b9f2c3b1..b3b4c42289fee 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 62dc8a8d83fa4..c67e35d1b89b4 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 5db5f8f1bfb54..b49f0a04b531b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index bd73b1912c293..d28465d805ea8 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f5f5dfcd793b1..6c7d26906a41e 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index aff7400b20fc2..46d82346a3749 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 6ba04afda9e2a..3813e4b2cca84 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index e7e1070403f0a..dabe72d27872a 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 78b4b9fcfe113..80d6ba438ba60 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 4b75cfaa75405..371d873f34591 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 d65b73465ef2b..783691c52eda8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index dd98ae30d59ec..1f3b6d7a6dcf5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 43b1caa625e11..16e1f5129239d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index c8ece24eda3ad..a112cba6d0e90 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 27d3a9788c460..a6a299a8a7eb0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 02f7bbcbb676a..d16575e8a9766 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js index 058f9c4c3a524..94e4facb645a8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 766ff607b5482..47915c9660bb0 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index dd98ae30d59ec..1f3b6d7a6dcf5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 43b1caa625e11..16e1f5129239d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c8ece24eda3ad..a112cba6d0e90 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 27d3a9788c460..a6a299a8a7eb0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 02f7bbcbb676a..d16575e8a9766 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 058f9c4c3a524..94e4facb645a8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 766ff607b5482..47915c9660bb0 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 00530261d7682..c5e2f0c04bf73 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a30b607676c03..293a147898977 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1d0559224b84e..8359b4472ee37 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 a6d24f0f0204d..9cef03b071133 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index cb628091e33f6..32cd3e8915e13 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 99859780314e2..39f0b1365680c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 a23c18711264e..de654530492f1 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index 541d8dc4c2650..61925246a0e91 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index a758d2a1cd03e..4a1329681e840 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1d0559224b84e..8359b4472ee37 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 a6d24f0f0204d..9cef03b071133 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index cb628091e33f6..32cd3e8915e13 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 99859780314e2..39f0b1365680c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 a23c18711264e..de654530492f1 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 541d8dc4c2650..61925246a0e91 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index a758d2a1cd03e..4a1329681e840 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 0f5938617e2c2..11d40e4d23be7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 173790ea04245..61dfeeeb8d386 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 30cf48ae0ef77..c467f0b8be0aa 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 0dab151470606..7c959ab940892 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index f7a19e1fa1411..d43267b1c9a13 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 14104ec68b946..15c5c91190e7f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 744aff01a0899..9a46a37deb80e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 0dab151470606..7c959ab940892 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index edf0e169c568a..727afdc29fd5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 14104ec68b946..15c5c91190e7f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 3f4ebdb191180..2a89c0fc929bc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 b2efc9bf3d498..0b7f01fdec516 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index f1ed00eb13992..62af54d370044 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 95830bd2c255d..d4bfc44728001 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 4f51d470c8238..59de635378658 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 9cdad10a9660d..6cf63b567ba6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.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 index 2df791f04e8db..2a191801c438a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ee8a26cafcfb4..301f83dab5587 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js index 1d1c53b36cf16..2dcea15d05055 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index e60e0fbfa7afc..6c74ce312be20 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 3c653ded70050..97b03befa2245 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index a889d6f19b358..28edf7546504a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.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 index 83cb52c7f14f8..9a8f5b774980b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 5f97087307dc1..bd9b5d0051a32 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js index 9ef0d252f050a..603b29da7fac8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 8c64bacf53325..3821a46478ada 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f50e1837a8698..4090486a73038 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ee8a26cafcfb4..301f83dab5587 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index 1222f92a7d238..f637a581e133f 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index e60e0fbfa7afc..6c74ce312be20 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index edafd9055b2df..fa97d15a89a17 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 4f51d470c8238..59de635378658 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3cfb1b4c03096..8de8d6f84b688 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 5f97087307dc1..bd9b5d0051a32 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 4e054f3269902..ca070c2062fb7 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 8c64bacf53325..3821a46478ada 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 931971b3f841a..6ce6e73202e8e 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 3c653ded70050..97b03befa2245 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 44a6d536eeda7..e4a7bb40897a2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 b4f33f056d675..83050ce43fe0b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 8151fed382b8b..b890ae8232aa5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 611b73c5c7daf..df737e96f26d5 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js index fe1308aca7eeb..2cbff5fc156d3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a6d5cebe7f182..84f19710abc71 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index b1a971bd89f12..a0cc81f5af957 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 733fa0fc069d6..ea360554f9228 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js index e4c81cdfc8e79..2cce36f74c262 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 86cfbeb5b6365..e395bf8648fdb 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index df8c82915fbcc..f5001a6551e1f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 611b73c5c7daf..df737e96f26d5 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index f361c1c091733..2fb4fbfd5c382 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a6d5cebe7f182..84f19710abc71 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7479c4aebee76..0110f9dce1662 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 733fa0fc069d6..ea360554f9228 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 7e4f77c1c695b..4849c53d0c431 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 86cfbeb5b6365..e395bf8648fdb 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 37af60df3eaca..587721fb87ae8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 5721a33f4a544..5e9e5c8593de9 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 29a43275b499c..b99a41c8c3cc1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dbfe0b5d9270f..dcfdb34145e7e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js index 62ec7868d7009..c4c2a04f642fd 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a8d6293492c13..2df46e6835c7c 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index debe15abde9f5..9574bd33b835a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 172c4d4804a02..44556b7866340 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js index 461809c985f5f..4ac58aea85631 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index ef62267d9579b..47558364d4b8a 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 09f9886020eb8..2885a499091ac 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dbfe0b5d9270f..dcfdb34145e7e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 5eab5555cbe86..0ee63c4207043 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a8d6293492c13..2df46e6835c7c 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 81956eb2903c3..fa9502d4d6475 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 172c4d4804a02..44556b7866340 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index fd86ae84059f6..cabfd9f98d668 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index ef62267d9579b..47558364d4b8a 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 708517a1d9514..d6d1268972139 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a7416c83297ce..aa198a56dbe76 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c657ed8edce0c..4d37c4456a3b8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 56f12c2290391..6ba684e3841d3 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c657ed8edce0c..4d37c4456a3b8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 56f12c2290391..6ba684e3841d3 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 62e49557aab28..d9f0f5b153109 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 7618a616fa352..e84545ade7753 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5df712534f6bf..cc3f604524fcc 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 6a226fbc86c14..e115b1ebd64dd 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 3c1c9b64dc299..0b4d12cead18e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 587eac860102c..f6057bf162a8e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9bdc7ad550474..fa0bcf94a5d2c 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 3a4d618044a38..6a2bfc777e916 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 4103e499cbdef..29b98b193fb99 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index cfa86d8b53f71..9324632b44acb 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js index e3725479646dd..f590179583204 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 49f97b88a3888..f4de6b06e496d 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js index 4737d2e579bc4..e8734ca6d27b0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 830a0ddd3e5fc..842d34fe73d4d 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9bdc7ad550474..fa0bcf94a5d2c 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 3a4d618044a38..6a2bfc777e916 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 587eac860102c..f6057bf162a8e 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 3c1c9b64dc299..0b4d12cead18e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index e3725479646dd..f590179583204 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 49f97b88a3888..f4de6b06e496d 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 4737d2e579bc4..e8734ca6d27b0 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 830a0ddd3e5fc..842d34fe73d4d 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index cfa86d8b53f71..9324632b44acb 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 4103e499cbdef..29b98b193fb99 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 058227b1276fb..1ea95ed9ba028 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 f80ee7e320867..cd6a7fab3776e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 eceec7b450a5e..f0cb61b0632d9 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d68dbf6eb9e6d..ed2f67c585b22 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b9de639cb1d4b..da3b77ba14625 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 826729aba8749..f4d0ecfe24be1 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 eceec7b450a5e..f0cb61b0632d9 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d68dbf6eb9e6d..ed2f67c585b22 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b9de639cb1d4b..da3b77ba14625 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 826729aba8749..f4d0ecfe24be1 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 16cec87f1e7e7..d19b91956859e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 c7b114195f232..ba2950b1a5e03 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 755cc1d0aaf44..2f6470b65ffe0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 957a73c648a60..a88a706d9b140 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f7e4388304886..5b58a2ee5719b 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 8baefdad92bbe..d4034d62c4a82 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 755cc1d0aaf44..2f6470b65ffe0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 957a73c648a60..a88a706d9b140 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f7e4388304886..5b58a2ee5719b 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 8baefdad92bbe..d4034d62c4a82 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index cf6d4730e1995..63e58be27dc68 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 d1ea7163910a3..12f2439e6f5a4 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 62e49557aab28..d9f0f5b153109 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 33f8f550fbd92..92315bfcacc33 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5df712534f6bf..cc3f604524fcc 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 a60954292ba87..c98b66fadede7 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 587eac860102c..f6057bf162a8e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index cfa86d8b53f71..9324632b44acb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js index e3725479646dd..f590179583204 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js index 4737d2e579bc4..e8734ca6d27b0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 587eac860102c..f6057bf162a8e 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index e3725479646dd..f590179583204 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 4737d2e579bc4..e8734ca6d27b0 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index cfa86d8b53f71..9324632b44acb 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 058227b1276fb..1ea95ed9ba028 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 9ca8e953224a8..5d14898713d71 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 16cec87f1e7e7..d19b91956859e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 714b21374005a..f5849debd838d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index cf6d4730e1995..63e58be27dc68 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a2fff6d9c9070..6f4defc3e4c78 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js index b5c401da717e2..65e3b33be1a80 100644 --- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js +++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js @@ -1,7 +1,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js index fb163c512b80e..4fc36cd0222e6 100644 --- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js +++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js @@ -1,6 +1,6 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js index 432701235d5dc..493e1b9636e3d 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js @@ -1,8 +1,8 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; m1.f1("test"); m1.f2.a = "10"; // Error: Should be number m1.rel = 42; // Error: Should be boolean m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any". - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js index 12d17b6070916..5137083683789 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); m1.f1("test"); m1.f2.a = "10"; // Error: Should be number m1.rel = 42; // Error: Should be boolean m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any". -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js index 81c077dfd9c82..948a6d68b8338 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js @@ -1,8 +1,8 @@ define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) { "use strict"; + exports.__esModule = true; m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Should error if loaded the .js files correctly var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js index 0d06a91c2a62e..50feab5d27f86 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); var m4 = require("m4"); m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Should error if loaded the .js files correctly var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js index 11da1c899c1d4..a6bce0ab2c63f 100644 --- a/tests/baselines/reference/project/nonRelative/amd/consume.js +++ b/tests/baselines/reference/project/nonRelative/amd/consume.js @@ -1,10 +1,10 @@ define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) { "use strict"; + exports.__esModule = true; x.hello(); y.hello(); var str = mod.call(); if (str !== "success") { fail(); } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js index 90d387773d3e2..d22c3ced24e55 100644 --- a/tests/baselines/reference/project/nonRelative/amd/decl.js +++ b/tests/baselines/reference/project/nonRelative/amd/decl.js @@ -1,8 +1,8 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function call() { return "success"; } exports.call = call; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js index 4731ff335a3f2..b92af88609dd4 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function hello() { } exports.hello = hello; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js index 4731ff335a3f2..b92af88609dd4 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function hello() { } exports.hello = hello; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js index 4731ff335a3f2..b92af88609dd4 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function hello() { } exports.hello = hello; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js index d4f9f6e288d02..51d811bb72ada 100644 --- a/tests/baselines/reference/project/nonRelative/node/consume.js +++ b/tests/baselines/reference/project/nonRelative/node/consume.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var mod = require("decl"); var x = require("lib/foo/a"); var y = require("lib/bar/a"); @@ -8,4 +9,3 @@ var str = mod.call(); if (str !== "success") { fail(); } -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js index 9bb5f2ac6edff..7cde1400c608e 100644 --- a/tests/baselines/reference/project/nonRelative/node/decl.js +++ b/tests/baselines/reference/project/nonRelative/node/decl.js @@ -1,6 +1,6 @@ "use strict"; +exports.__esModule = true; function call() { return "success"; } exports.call = call; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js index 819723f983325..c83848543b20f 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; function hello() { } exports.hello = hello; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js index 819723f983325..c83848543b20f 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; function hello() { } exports.hello = hello; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js index 819723f983325..c83848543b20f 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; function hello() { } exports.hello = hello; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js index e7791f9f3f5f6..257b2bbaa8fc8 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js index 90648dbececbc..7a90183baf30b 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; 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 e7791f9f3f5f6..257b2bbaa8fc8 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,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); 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 90648dbececbc..7a90183baf30b 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,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js index bc27e650743ab..ef652b9e92970 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index bc27e650743ab..ef652b9e92970 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js index e7791f9f3f5f6..257b2bbaa8fc8 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js index a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js index 87b3e0b685649..fb9329a59b47e 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js index 90648dbececbc..7a90183baf30b 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js index a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js index 313682ec06c76..18fccdca8bbd2 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,4 +16,3 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; 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 a56e5f0ea0bdc..b5ccdc63b22ee 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,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); 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 index 87b3e0b685649..fb9329a59b47e 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); 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 index e7791f9f3f5f6..257b2bbaa8fc8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); 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 a355a990939b1..52ebad557038b 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,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; 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 index 313682ec06c76..18fccdca8bbd2 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,4 +16,3 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; 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 index 90648dbececbc..7a90183baf30b 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 5c65bc4968b62..adb1b5061b50d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,5 +47,4 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js index a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js index 39ac64cda823a..c062c0ac6d4a8 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js index a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js index e12a028abc09b..2e50e0b798937 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; 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 a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 39ac64cda823a..c062c0ac6d4a8 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); 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 a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index e12a028abc09b..2e50e0b798937 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js index 4c036fa59a178..0a1f6b523c998 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,5 +30,4 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js index a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js index 865896d2602b5..0fdf8d91b324b 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js index a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js index 8d4d683ff7c4e..33f201ce9d5e2 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; 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 a56e5f0ea0bdc..b5ccdc63b22ee 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,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 865896d2602b5..0fdf8d91b324b 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); 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 a355a990939b1..52ebad557038b 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,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 8d4d683ff7c4e..33f201ce9d5e2 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 7c40db25bb7e4..2ddfb9277a3ad 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,5 +30,4 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 e9a80c428b2b4..67693560dfcaf 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9f1206b5b146f..d188f8a16bd30 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 e9a80c428b2b4..67693560dfcaf 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9f1206b5b146f..d188f8a16bd30 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 57114f145bd00..3520f3c0a5f22 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 132d98cd87f6f..ed2de159383c9 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index ab7082a2e8e1a..bed0bf9b3e21a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 6bebdd113b6f3..616307fc2aaf0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 21c996978fdcc..ac1540d3d7cb3 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 06c30f32eaf7c..4281eb94fe562 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b757263c8667e..20f349632210f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index b123ccf13c8f4..e794023608c20 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 6bebdd113b6f3..616307fc2aaf0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 21c996978fdcc..ac1540d3d7cb3 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index ab7082a2e8e1a..bed0bf9b3e21a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b757263c8667e..20f349632210f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index b123ccf13c8f4..e794023608c20 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 06c30f32eaf7c..4281eb94fe562 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 bd89a9514f26b..5970dfad43ea7 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ffc39be804440..101e0b07546f6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6366b8c2d8595..5194b89b4a5d8 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 04bd4e10a3b47..6316b37945ca0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 9dc457a016701..ec26fbe336a51 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ffc39be804440..101e0b07546f6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6366b8c2d8595..5194b89b4a5d8 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 04bd4e10a3b47..6316b37945ca0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 9dc457a016701..ec26fbe336a51 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 8718a3a9350e2..64a56e717148f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 cd798e72d8902..a8d5da3a201fb 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6738a871942dd..1628374eef408 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 81d64320d78de..f43884731e041 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index b2ea9133dfcb9..649377c06fca0 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 cd798e72d8902..a8d5da3a201fb 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6738a871942dd..1628374eef408 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 81d64320d78de..f43884731e041 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index b2ea9133dfcb9..649377c06fca0 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 af3b647fcab17..bbf9b58c64f2c 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 560075530f1ae..d65693aee664a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 27abb47a45bbe..5d1100e38fa48 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 560075530f1ae..d65693aee664a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 27abb47a45bbe..5d1100e38fa48 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 5378b914fc796..544b444f69ac8 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 cd6b23ddc0f30..39cc19f0b0922 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 6b4ece94c1588..7571615de418a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 8271bf25be1bd..ad01eacc00c56 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 8be239f355348..343b30f743a46 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 c7ae549832a57..a7121ab0fb4bd 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 37adc61e54fdd..ddd4975937458 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 79b428ca3a1de..34026638960d8 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 8271bf25be1bd..ad01eacc00c56 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 8be239f355348..343b30f743a46 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 6b4ece94c1588..7571615de418a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 37adc61e54fdd..ddd4975937458 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 79b428ca3a1de..34026638960d8 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index c7ae549832a57..a7121ab0fb4bd 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 66fd3cfe86711..12697408ddd4e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 29c8533aded52..f9a2fd1d74063 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 8086d9c04da05..70db4f7545c83 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 0d24a0e332a2a..0e6c49a9aec9a 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 29c8533aded52..f9a2fd1d74063 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 8086d9c04da05..70db4f7545c83 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 0d24a0e332a2a..0e6c49a9aec9a 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a5dcbdc600abe..1132db08bd04e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 91793ab100241..07643a2c9dc34 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 00e388b171e2f..a9e9284e21daf 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 07178ab519f00..9b21b166c375e 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 91793ab100241..07643a2c9dc34 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 00e388b171e2f..a9e9284e21daf 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 07178ab519f00..9b21b166c375e 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 d9e63184a83e2..5121f5c6a1e39 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c4bc3c327089b..a7a1fecb87f74 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 208dd329040a0..ba1b40abf87a2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c0b56df8d9001..35edbb3cd9c4a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 5e34d4494ddc1..3c66628ccf772 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 e924809994328..df6d2c811c08e 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 9d5330f5c8154..0c75dbb2b0052 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map index c4bc3c327089b..a7a1fecb87f74 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dcdf5faf89716..fb3dc7e5f1a0f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 096386e968d05..99618a3d6a791 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 208dd329040a0..ba1b40abf87a2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 87fa414a454ee..5660dd850103f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a9dba1be1ddbd..308a0083438bc 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 2293c1a7c9602..8ba6985442776 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index d21a585cc41d5..1179d81203742 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 5d8cf325d5277..14fbdd65f4f18 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 49bb95f32d517..a42c40521a151 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a48d929a86067..86d72e20c9378 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index b9e5ddb335f92..18103b0a8b106 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 d65b73465ef2b..783691c52eda8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dcdf5faf89716..fb3dc7e5f1a0f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 9a899efce6487..8072260980021 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 87fa414a454ee..5660dd850103f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 57b2f0a9935b7..90f1d966b1c3f 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 128c9957bf43b..2eb15ca540b14 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 50263c64897cd..742f4f4a9af84 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 40d0111893e18..c819ff2c52c1a 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index cc2b2e9b918e4..b94230beb69b4 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a30b607676c03..293a147898977 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dcdf5faf89716..fb3dc7e5f1a0f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 9a899efce6487..8072260980021 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 87fa414a454ee..5660dd850103f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 6f71fb82f4c2d..6f61cbbee19ae 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 28136d8ffc30a..8f88c077a44d6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 50263c64897cd..742f4f4a9af84 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f5f5dfcd793b1..6c7d26906a41e 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 9c9d3ffec9263..ab37fc26b40e0 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 173790ea04245..61dfeeeb8d386 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 33f8f550fbd92..92315bfcacc33 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 a60954292ba87..c98b66fadede7 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 9ca8e953224a8..5d14898713d71 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 714b21374005a..f5849debd838d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a2fff6d9c9070..6f4defc3e4c78 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js index d80da6d9e1b73..66facecde7f6b 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var RM = (function () { function RM() { } @@ -15,5 +16,4 @@ define(["require", "exports"], function (require, exports) { return RM; }()); exports.RM = RM; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js index a07a323df50fb..221c232222727 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var RM = (function () { function RM() { } @@ -14,4 +15,3 @@ var RM = (function () { return RM; }()); exports.RM = RM; -exports.__esModule = true; diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js index a4356e562e751..cd4ce3c862e53 100644 --- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js +++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -20,5 +21,4 @@ MyClass1 = __decorate([ __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object]) ], MyClass1); var _a; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js index 7e30c98d6e899..4571caffa31e2 100644 --- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js +++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js index f350f205d5ac9..4d133b7655c9e 100644 --- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js +++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js @@ -1,5 +1,5 @@ "use strict"; +exports.__esModule = true; a; b; -exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js index 12a13d2aebf39..2c7bb7add09eb 100644 --- a/tests/baselines/reference/transpile/Generates module output.js +++ b/tests/baselines/reference/transpile/Generates module output.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; - var x = 0; exports.__esModule = true; + var x = 0; }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js index 0b3dcfad991dc..04ba1d12e5e00 100644 --- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js +++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js @@ -1,5 +1,5 @@ "use strict"; +exports.__esModule = true; /// var x = 0; -exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js index 7e30c98d6e899..4571caffa31e2 100644 --- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js +++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js index 7e30c98d6e899..4571caffa31e2 100644 --- a/tests/baselines/reference/transpile/No extra errors for file without extension.js +++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js index 4f5beb97d2cb9..c5ffb86a1aa34 100644 --- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js +++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js @@ -1,6 +1,6 @@ define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) { "use strict"; - use(SomeName_1.foo); exports.__esModule = true; + use(SomeName_1.foo); }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js index 97215e27b98a3..0ecfbce239727 100644 --- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js +++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js @@ -8,8 +8,8 @@ } })(function (require, exports) { "use strict"; + exports.__esModule = true; var SomeName_1 = require("SomeOtherName"); use(SomeName_1.foo); - exports.__esModule = true; }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js index 1ac09c54ab802..72e077de381af 100644 --- a/tests/baselines/reference/transpile/Support options with lib values.js +++ b/tests/baselines/reference/transpile/Support options with lib values.js @@ -1,4 +1,4 @@ "use strict"; -var a = 10; exports.__esModule = true; +var a = 10; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js index 1ac09c54ab802..72e077de381af 100644 --- a/tests/baselines/reference/transpile/Support options with types values.js +++ b/tests/baselines/reference/transpile/Support options with types values.js @@ -1,4 +1,4 @@ "use strict"; -var a = 10; exports.__esModule = true; +var a = 10; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js index e109ef9014f68..8ef38d2b61702 100644 --- a/tests/baselines/reference/transpile/Supports backslashes in file name.js +++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js @@ -1,4 +1,4 @@ "use strict"; -var x; exports.__esModule = true; +var x; //# sourceMappingURL=b.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowJs.js +++ b/tests/baselines/reference/transpile/Supports setting allowJs.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js +++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js +++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js +++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js +++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting baseUrl.js +++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting charset.js +++ b/tests/baselines/reference/transpile/Supports setting charset.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting declaration.js +++ b/tests/baselines/reference/transpile/Supports setting declaration.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting declarationDir.js +++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting emitBOM.js +++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js +++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js +++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js +++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js +++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting jsx.js +++ b/tests/baselines/reference/transpile/Supports setting jsx.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js +++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting lib.js +++ b/tests/baselines/reference/transpile/Supports setting lib.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting locale.js +++ b/tests/baselines/reference/transpile/Supports setting locale.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting module.js +++ b/tests/baselines/reference/transpile/Supports setting module.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js +++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting newLine.js +++ b/tests/baselines/reference/transpile/Supports setting newLine.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmit.js +++ b/tests/baselines/reference/transpile/Supports setting noEmit.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js +++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js +++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js +++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js +++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js index 5233b2a8e48f9..8124d51fde3be 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js @@ -1,3 +1,3 @@ -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noLib.js +++ b/tests/baselines/reference/transpile/Supports setting noLib.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noResolve.js +++ b/tests/baselines/reference/transpile/Supports setting noResolve.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting out.js +++ b/tests/baselines/reference/transpile/Supports setting out.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting outDir.js +++ b/tests/baselines/reference/transpile/Supports setting outDir.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting outFile.js +++ b/tests/baselines/reference/transpile/Supports setting outFile.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting paths.js +++ b/tests/baselines/reference/transpile/Supports setting paths.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js +++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js +++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting removeComments.js +++ b/tests/baselines/reference/transpile/Supports setting removeComments.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting rootDir.js +++ b/tests/baselines/reference/transpile/Supports setting rootDir.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting rootDirs.js +++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js +++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js +++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js +++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting stripInternal.js +++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js +++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js +++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting typeRoots.js +++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting types.js +++ b/tests/baselines/reference/transpile/Supports setting types.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js index 071466dd65f94..933981306d2da 100644 --- a/tests/baselines/reference/transpile/Supports urls in file name.js +++ b/tests/baselines/reference/transpile/Supports urls in file name.js @@ -1,4 +1,4 @@ "use strict"; -var x; exports.__esModule = true; +var x; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js index 54ceb0250e182..0b3bbaa8d7333 100644 --- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js +++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js @@ -1,4 +1,5 @@ "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -16,5 +17,4 @@ MyClass = __decorate([ ], MyClass); exports.MyClass = MyClass; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js index 2c2e8563d24a0..04042012d1821 100644 --- a/tests/baselines/reference/transpile/Uses correct newLine character.js +++ b/tests/baselines/reference/transpile/Uses correct newLine character.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js index 54832b9592841..b9048bd515d52 100644 --- a/tests/baselines/reference/transpile/transpile .js files.js +++ b/tests/baselines/reference/transpile/transpile .js files.js @@ -1,4 +1,4 @@ "use strict"; -var a = 10; exports.__esModule = true; +var a = 10; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js index ff03528b3e566..2a73615e4768f 100644 --- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js +++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js @@ -1,4 +1,4 @@ "use strict"; -var x = React.createElement("div", null); exports.__esModule = true; +var x = React.createElement("div", null); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index 49cac46d21296..97d528ecd62f6 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -61,6 +61,7 @@ export var eVar3 = 10, eVar4, eVar5; //// [withExportDecl.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var simpleVar; var anotherVar; var varWithSimpleType; @@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) { exports.eVar2 = 10; var eVar22; exports.eVar3 = 10; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index feb48648252b4..f0a1a2d2f148d 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -46,17 +46,18 @@ b.foo; //// [withImportDecl_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); //// [withImportDecl_1.js] define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) { "use strict"; + exports.__esModule = true; /// var simpleVar; var anotherVar; @@ -81,7 +82,6 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m })(m1 || (m1 = {})); var b = new m3.A(); b.foo; - exports.__esModule = true; }); From dc1ac131ff9a4c4d09e1806488ff291b9de7cf0b Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 10 Feb 2017 12:48:14 -0800 Subject: [PATCH 091/116] Emit "__esModule" before other statments --- src/compiler/transformers/module/module.ts | 17 +- .../baselines/reference/APISample_compile.js | 2 +- tests/baselines/reference/APISample_linter.js | 2 +- .../reference/APISample_parseConfig.js | 2 +- .../reference/APISample_transform.js | 2 +- .../baselines/reference/APISample_watcher.js | 2 +- ...eEachWithExportedLocalVarsOfTheSameName.js | 4 +- tests/baselines/reference/aliasAssignments.js | 4 +- .../reference/aliasOnMergedModuleInterface.js | 2 +- .../reference/aliasUsageInAccessorsOfClass.js | 6 +- .../baselines/reference/aliasUsageInArray.js | 6 +- .../aliasUsageInFunctionExpression.js | 6 +- .../reference/aliasUsageInGenericFunction.js | 6 +- .../reference/aliasUsageInIndexerOfClass.js | 6 +- .../reference/aliasUsageInObjectLiteral.js | 6 +- .../reference/aliasUsageInOrExpression.js | 6 +- ...aliasUsageInTypeArgumentOfExtendsClause.js | 6 +- .../reference/aliasUsageInVarAssignment.js | 6 +- .../reference/aliasUsedAsNameValue.js | 4 +- ...aceExportAssignmentUsedInVarInitializer.js | 2 +- .../allowSyntheticDefaultImports1.js | 4 +- .../allowSyntheticDefaultImports10.js | 2 +- .../allowSyntheticDefaultImports4.js | 2 +- .../allowSyntheticDefaultImports9.js | 2 +- .../reference/alwaysStrictModule4.js | 2 +- .../reference/alwaysStrictModule6.js | 2 +- .../reference/ambientDeclarationsExternal.js | 2 +- .../reference/ambientDeclarationsPatterns.js | 2 +- .../reference/ambientExternalModuleMerging.js | 2 +- ...rnalModuleWithInternalImportDeclaration.js | 2 +- ...lModuleWithoutInternalImportDeclaration.js | 2 +- tests/baselines/reference/ambientShorthand.js | 2 +- .../reference/ambientShorthand_reExport.js | 6 +- .../reference/amdDependencyComment1.js | 2 +- .../reference/amdDependencyComment2.js | 2 +- .../reference/amdDependencyCommentName1.js | 2 +- .../reference/amdDependencyCommentName2.js | 2 +- .../reference/amdDependencyCommentName3.js | 2 +- .../reference/amdDependencyCommentName4.js | 2 +- .../reference/amdImportAsPrimaryExpression.js | 4 +- .../amdImportNotAsPrimaryExpression.js | 4 +- .../reference/anonymousDefaultExportsAmd.js | 4 +- .../anonymousDefaultExportsCommonjs.js | 4 +- .../reference/anonymousDefaultExportsUmd.js | 4 +- tests/baselines/reference/asOperator4.js | 4 +- .../asyncAwaitIsolatedModules_es5.js | 2 +- .../reference/asyncImportedPromise_es5.js | 4 +- .../reference/asyncImportedPromise_es6.js | 4 +- .../reference/augmentExportEquals1.js | 2 +- .../reference/augmentExportEquals1_1.js | 2 +- .../reference/augmentExportEquals2.js | 2 +- .../reference/augmentExportEquals2_1.js | 2 +- .../reference/augmentExportEquals3.js | 4 +- .../reference/augmentExportEquals3_1.js | 4 +- .../reference/augmentExportEquals4.js | 4 +- .../reference/augmentExportEquals4_1.js | 4 +- .../reference/augmentExportEquals5.js | 2 +- .../reference/augmentExportEquals6.js | 4 +- .../reference/augmentExportEquals6_1.js | 2 +- .../augmentedTypesExternalModule1.js | 2 +- tests/baselines/reference/cacheResolutions.js | 6 +- .../baselines/reference/chainedImportAlias.js | 4 +- .../baselines/reference/circularReference.js | 4 +- .../reference/circularReferenceInImport.js | 2 +- .../reference/classAbstractManyKeywords.js | 2 +- .../reference/classExtendsAcrossFiles.js | 4 +- ...classMemberInitializerWithLamdaScoping3.js | 2 +- ...classMemberInitializerWithLamdaScoping4.js | 2 +- .../collisionExportsRequireAndAlias.js | 6 +- .../collisionExportsRequireAndAmbientClass.js | 2 +- .../collisionExportsRequireAndAmbientEnum.js | 2 +- ...llisionExportsRequireAndAmbientFunction.js | 2 +- ...collisionExportsRequireAndAmbientModule.js | 2 +- .../collisionExportsRequireAndAmbientVar.js | 2 +- .../collisionExportsRequireAndClass.js | 2 +- .../collisionExportsRequireAndEnum.js | 2 +- .../collisionExportsRequireAndFunction.js | 2 +- ...ionExportsRequireAndInternalModuleAlias.js | 2 +- .../collisionExportsRequireAndModule.js | 2 +- ...onExportsRequireAndUninstantiatedModule.js | 2 +- .../collisionExportsRequireAndVar.js | 2 +- .../commentOnExportEnumDeclaration.js | 2 +- .../reference/commentsDottedModuleName.js | 2 +- .../reference/commentsExternalModules.js | 4 +- .../reference/commentsExternalModules2.js | 4 +- .../reference/commentsExternalModules3.js | 4 +- .../reference/commentsMultiModuleMultiFile.js | 4 +- .../reference/commentsOnRequireStatement.js | 6 +- .../commonJSImportAsPrimaryExpression.js | 4 +- .../commonJSImportNotAsPrimaryExpression.js | 4 +- tests/baselines/reference/commonSourceDir5.js | 6 +- tests/baselines/reference/commonSourceDir6.js | 6 +- .../reference/commonSourceDirectory.js | 2 +- .../reference/commonSourceDirectory.js.map | 2 +- .../commonSourceDirectory.sourcemap.txt | 26 +- .../reference/commonSourceDirectory_dts.js | 2 +- .../commonSourceDirectory_dts.js.map | 2 +- .../commonSourceDirectory_dts.sourcemap.txt | 20 +- .../baselines/reference/commonjsSafeImport.js | 4 +- .../reference/complexNarrowingWithAny.js | 2 +- .../reference/constDeclarations-access5.js | 4 +- .../reference/constEnumExternalModule.js | 2 +- .../controlFlowBinaryOrExpression.js | 2 +- .../controlFlowPropertyDeclarations.js | 2 +- .../controlFlowSelfReferentialLoop.js | 2 +- .../reference/copyrightWithNewLine1.js | 2 +- .../reference/copyrightWithoutNewLine1.js | 2 +- .../crashIntypeCheckInvocationExpression.js | 2 +- ...rashIntypeCheckObjectCreationExpression.js | 2 +- .../baselines/reference/declFileAccessors.js | 2 +- .../declFileAliasUseBeforeDeclaration.js | 4 +- ...assWithStaticMethodReturningConstructor.js | 2 +- .../reference/declFileConstructors.js | 2 +- ...lFileExportAssignmentOfGenericInterface.js | 2 +- .../reference/declFileExportImportChain.js | 4 +- .../reference/declFileExportImportChain2.js | 2 +- .../reference/declFileForExportedImport.js | 2 +- .../baselines/reference/declFileFunctions.js | 2 +- .../reference/declFileGenericType.js | 2 +- ...eclFileImportModuleWithExportAssignment.js | 2 +- tests/baselines/reference/declFileMethods.js | 2 +- .../declarationEmitClassMemberNameConflict.js | 2 +- .../declarationEmitExportAssignment.js | 2 +- .../declarationEmitExportDeclaration.js | 4 +- .../declarationEmitExpressionInExtends3.js | 2 +- .../declarationEmitIdentifierPredicates01.js | 2 +- ...itIdentifierPredicatesWithPrivateName01.js | 2 +- ...declarationEmitInferedDefaultExportType.js | 2 +- .../declarationEmitInferedTypeAlias1.js | 4 +- .../declarationEmitInferedTypeAlias2.js | 4 +- .../declarationEmitInferedTypeAlias3.js | 4 +- .../declarationEmitInferedTypeAlias5.js | 4 +- .../declarationEmitInferedTypeAlias6.js | 4 +- .../declarationEmitInferedTypeAlias7.js | 4 +- .../declarationEmitInferedTypeAlias9.js | 2 +- .../reference/declarationEmitInvalidExport.js | 2 +- .../reference/declarationEmitNameConflicts.js | 2 +- .../declarationEmitNameConflictsWithAlias.js | 2 +- .../reference/declarationEmitPromise.js | 2 +- .../declarationEmitThisPredicates01.js | 2 +- .../declarationEmitThisPredicates02.js | 2 +- ...tionEmitThisPredicatesWithPrivateName01.js | 2 +- ...tionEmitThisPredicatesWithPrivateName02.js | 2 +- ...arationEmitTypeAliasWithTypeParameters1.js | 2 +- ...arationEmitTypeAliasWithTypeParameters2.js | 2 +- ...arationEmitTypeAliasWithTypeParameters5.js | 2 +- .../reference/declarationEmitUnknownImport.js | 2 +- .../declarationEmitUnknownImport2.js | 2 +- .../reference/declarationMerging2.js | 2 +- .../decoratedClassExportsCommonJS1.js | 2 +- .../decoratedClassExportsCommonJS2.js | 2 +- .../decoratedDefaultExportsGetExportedAmd.js | 4 +- ...oratedDefaultExportsGetExportedCommonjs.js | 4 +- .../decoratedDefaultExportsGetExportedUmd.js | 4 +- ...ratorInstantiateModulesInFunctionBodies.js | 4 +- .../baselines/reference/decoratorMetadata.js | 4 +- .../decoratorMetadataOnInferredType.js | 2 +- ...orMetadataRestParameterWithImportedType.js | 8 +- .../decoratorMetadataWithConstructorType.js | 2 +- ...adataWithImportDeclarationNameCollision.js | 4 +- ...dataWithImportDeclarationNameCollision2.js | 4 +- ...dataWithImportDeclarationNameCollision3.js | 4 +- ...dataWithImportDeclarationNameCollision4.js | 4 +- ...dataWithImportDeclarationNameCollision5.js | 4 +- ...dataWithImportDeclarationNameCollision6.js | 4 +- ...dataWithImportDeclarationNameCollision7.js | 4 +- ...dataWithImportDeclarationNameCollision8.js | 4 +- .../baselines/reference/decoratorOnClass2.js | 2 +- .../reference/decoratorOnClassConstructor2.js | 4 +- .../reference/decoratorOnClassConstructor3.js | 4 +- .../defaultExportInAwaitExpression01.js | 4 +- .../defaultExportInAwaitExpression02.js | 4 +- .../reference/defaultExportWithOverloads01.js | 2 +- .../reference/defaultExportsCannotMerge01.js | 4 +- .../reference/defaultExportsCannotMerge02.js | 4 +- .../reference/defaultExportsCannotMerge03.js | 4 +- .../reference/defaultExportsCannotMerge04.js | 2 +- .../reference/defaultExportsGetExportedAmd.js | 4 +- .../defaultExportsGetExportedCommonjs.js | 4 +- .../reference/defaultExportsGetExportedUmd.js | 4 +- .../reference/dependencyViaImportAlias.js | 2 +- .../destructuringInVariableDeclarations1.js | 2 +- .../destructuringInVariableDeclarations2.js | 2 +- .../destructuringInVariableDeclarations3.js | 2 +- .../destructuringInVariableDeclarations4.js | 2 +- .../destructuringInVariableDeclarations5.js | 2 +- .../destructuringInVariableDeclarations6.js | 2 +- .../reference/downlevelLetConst13.js | 2 +- .../reference/duplicateLocalVariable1.js | 2 +- .../reference/duplicateLocalVariable2.js | 2 +- .../duplicateSymbolsExportMatching.js | 2 +- .../reference/dynamicModuleTypecheckError.js | 2 +- .../baselines/reference/elidingImportNames.js | 6 +- tests/baselines/reference/emptyModuleName.js | 2 +- .../reference/enumFromExternalModule.js | 4 +- .../reference/errorsOnImportedSymbol.js | 2 +- .../reference/es3defaultAliasIsQuoted.js | 4 +- tests/baselines/reference/es5-commonjs.js | 2 +- tests/baselines/reference/es5-commonjs2.js | 2 +- tests/baselines/reference/es5-commonjs3.js | 2 +- tests/baselines/reference/es5-commonjs4.js | 2 +- tests/baselines/reference/es5-commonjs5.js | 2 +- tests/baselines/reference/es5-commonjs6.js | 2 +- .../es5-importHelpersAsyncFunctions.js | 2 +- tests/baselines/reference/es5-umd2.js | 2 +- tests/baselines/reference/es5-umd3.js | 2 +- .../es5ExportDefaultClassDeclaration.js | 2 +- .../es5ExportDefaultClassDeclaration2.js | 2 +- .../es5ExportDefaultClassDeclaration3.js | 2 +- .../reference/es5ExportDefaultExpression.js | 2 +- .../es5ExportDefaultFunctionDeclaration.js | 2 +- .../es5ExportDefaultFunctionDeclaration2.js | 2 +- .../es5ExportDefaultFunctionDeclaration3.js | 2 +- .../reference/es5ExportDefaultIdentifier.js | 2 +- .../es5ModuleInternalNamedImports.js | 2 +- .../reference/es5ModuleWithModuleGenAmd.js | 2 +- .../es5ModuleWithModuleGenCommonjs.js | 2 +- .../es5ModuleWithoutModuleGenTarget.js | 2 +- tests/baselines/reference/es6-umd2.js | 2 +- .../baselines/reference/es6ExportAllInEs5.js | 4 +- .../reference/es6ExportClauseInEs5.js | 2 +- .../es6ExportClauseWithAssignmentInEs5.js | 2 +- ...ExportClauseWithoutModuleSpecifierInEs5.js | 4 +- .../reference/es6ExportEqualsInterop.js | 2 +- .../reference/es6ImportDefaultBindingAmd.js | 4 +- .../reference/es6ImportDefaultBindingDts.js | 4 +- ...rtDefaultBindingFollowedWithNamedImport.js | 4 +- ...ultBindingFollowedWithNamedImport1InEs5.js | 4 +- ...ndingFollowedWithNamedImport1WithExport.js | 4 +- ...efaultBindingFollowedWithNamedImportDts.js | 4 +- ...faultBindingFollowedWithNamedImportDts1.js | 4 +- ...aultBindingFollowedWithNamedImportInEs5.js | 4 +- ...indingFollowedWithNamedImportWithExport.js | 4 +- ...ndingFollowedWithNamespaceBinding1InEs5.js | 4 +- ...FollowedWithNamespaceBinding1WithExport.js | 4 +- ...tBindingFollowedWithNamespaceBindingDts.js | 4 +- ...BindingFollowedWithNamespaceBindingDts1.js | 4 +- ...indingFollowedWithNamespaceBindingInEs5.js | 4 +- ...gFollowedWithNamespaceBindingWithExport.js | 4 +- .../es6ImportDefaultBindingMergeErrors.js | 4 +- ...s6ImportDefaultBindingNoDefaultProperty.js | 2 +- .../es6ImportDefaultBindingWithExport.js | 4 +- .../reference/es6ImportNameSpaceImport.js | 4 +- .../reference/es6ImportNameSpaceImportAmd.js | 4 +- .../reference/es6ImportNameSpaceImportDts.js | 4 +- .../es6ImportNameSpaceImportInEs5.js | 4 +- .../es6ImportNameSpaceImportMergeErrors.js | 4 +- .../es6ImportNameSpaceImportWithExport.js | 4 +- .../reference/es6ImportNamedImport.js | 4 +- .../reference/es6ImportNamedImportAmd.js | 4 +- .../reference/es6ImportNamedImportDts.js | 4 +- .../reference/es6ImportNamedImportInEs5.js | 4 +- .../es6ImportNamedImportInExportAssignment.js | 2 +- ...rtNamedImportInIndirectExportAssignment.js | 2 +- .../es6ImportNamedImportMergeErrors.js | 4 +- .../es6ImportNamedImportNoExportMember.js | 2 +- .../es6ImportNamedImportWithExport.js | 4 +- .../es6ImportNamedImportWithTypesAndValues.js | 4 +- .../es6ImportWithoutFromClauseAmd.js | 6 +- .../es6ImportWithoutFromClauseInEs5.js | 4 +- .../es6ImportWithoutFromClauseWithExport.js | 4 +- .../es6ModuleWithModuleGenTargetAmd.js | 2 +- .../es6ModuleWithModuleGenTargetCommonjs.js | 2 +- .../reference/exportAndImport-es3-amd.js | 4 +- .../reference/exportAndImport-es3.js | 4 +- .../reference/exportAndImport-es5-amd.js | 4 +- .../reference/exportAndImport-es5.js | 4 +- .../reference/exportArrayBindingPattern.js | 2 +- .../reference/exportAssignClassAndModule.js | 2 +- .../reference/exportAssignDottedName.js | 2 +- .../exportAssignImportedIdentifier.js | 4 +- .../baselines/reference/exportAssignTypes.js | 2 +- .../exportAssignedTypeAsTypeAnnotation.js | 2 +- .../reference/exportAssignmentClass.js | 2 +- .../exportAssignmentConstrainedGenericType.js | 2 +- .../reference/exportAssignmentEnum.js | 2 +- .../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 +- ...ationWithModuleSpecifierNameOnNextLine1.js | 8 +- .../reference/exportDeclareClass1.js | 2 +- .../reference/exportDeclaredModule.js | 2 +- .../reference/exportDefaultProperty.js | 6 +- .../reference/exportDefaultProperty2.js | 4 +- .../reference/exportEqualCallable.js | 2 +- .../reference/exportEqualErrorType.js | 2 +- .../reference/exportEqualMemberMissing.js | 2 +- .../reference/exportEqualsDefaultProperty.js | 2 +- .../reference/exportEqualsProperty.js | 2 +- .../reference/exportEqualsProperty2.js | 2 +- tests/baselines/reference/exportImport.js | 4 +- .../reference/exportImportMultipleFiles.js | 6 +- .../exportImportNonInstantiatedModule2.js | 2 +- .../exportNonInitializedVariablesAMD.js | 2 +- .../exportNonInitializedVariablesCommonJS.js | 2 +- .../exportNonInitializedVariablesUMD.js | 2 +- .../exportRedeclarationTypeAliases.js | 2 +- .../reference/exportSameNameFuncVar.js | 2 +- .../reference/exportSpecifierForAGlobal.js | 2 +- tests/baselines/reference/exportStar-amd.js | 10 +- tests/baselines/reference/exportStar.js | 10 +- .../reference/exportStarForValues.js | 2 +- .../reference/exportStarForValues2.js | 4 +- .../reference/exportStarForValues3.js | 8 +- .../reference/exportStarForValues4.js | 4 +- .../reference/exportStarForValues7.js | 4 +- .../reference/exportStarForValues8.js | 8 +- .../reference/exportStarForValues9.js | 4 +- .../reference/exportStarFromEmptyModule.js | 6 +- tests/baselines/reference/exportToString.js | 2 +- tests/baselines/reference/exportVisibility.js | 2 +- .../exportedBlockScopedDeclarations.js | 2 +- .../baselines/reference/exportedVariable1.js | 2 +- .../exportingContainingVisibleType.js | 2 +- .../reference/exportsAndImports1-amd.js | 6 +- .../reference/exportsAndImports1-es6.js | 6 +- .../baselines/reference/exportsAndImports1.js | 6 +- .../reference/exportsAndImports2-amd.js | 6 +- .../reference/exportsAndImports2-es6.js | 6 +- .../baselines/reference/exportsAndImports2.js | 6 +- .../reference/exportsAndImports3-amd.js | 6 +- .../reference/exportsAndImports3-es6.js | 6 +- .../baselines/reference/exportsAndImports3.js | 6 +- .../reference/exportsAndImports4-amd.js | 4 +- .../reference/exportsAndImports4-es6.js | 4 +- .../baselines/reference/exportsAndImports4.js | 4 +- ...sAndImportsWithContextualKeywordNames01.js | 2 +- ...sAndImportsWithContextualKeywordNames02.js | 4 +- .../exportsAndImportsWithUnderscores1.js | 4 +- .../exportsAndImportsWithUnderscores2.js | 4 +- .../exportsAndImportsWithUnderscores3.js | 4 +- .../exportsAndImportsWithUnderscores4.js | 4 +- .../extendClassExpressionFromModule.js | 2 +- ...xtendingClassFromAliasAndUsageInIndexer.js | 8 +- .../reference/externalModuleAssignToVar.js | 4 +- .../externalModuleExportingGenericClass.js | 2 +- .../externalModuleImmutableBindings.js | 4 +- .../reference/externalModuleQualification.js | 2 +- ...ceOfImportDeclarationWithExportModifier.js | 4 +- ...ernceResolutionOrderInImportDeclaration.js | 4 +- .../reference/externalModuleResolution.js | 2 +- .../reference/externalModuleResolution2.js | 2 +- .../reference/fieldAndGetterWithSameName.js | 2 +- ...ilesEmittingIntoSameOutputWithOutOption.js | 2 +- .../functionAndImportNameConflict.js | 4 +- .../functionLikeInParameterInitializer.js | 2 +- .../reference/generatorES6InAMDModule.js | 2 +- .../reference/genericClassesInModule2.js | 2 +- .../genericInterfaceFunctionTypeParameter.js | 2 +- .../reference/genericMemberFunction.js | 2 +- .../reference/genericReturnTypeFromGetter1.js | 2 +- .../genericTypeWithMultipleBases1.js | 2 +- .../genericTypeWithMultipleBases2.js | 2 +- .../genericWithIndexerOfTypeParameterType2.js | 2 +- ...getEmitOutputWithDeclarationFile2.baseline | 2 +- .../getEmitOutputWithEmitterErrors2.baseline | 2 +- tests/baselines/reference/giant.js | 2 +- ...sAnExternalModuleInsideAnInternalModule.js | 4 +- .../baselines/reference/importAsBaseClass.js | 4 +- tests/baselines/reference/importDecl.js | 12 +- .../reference/importDeclWithClassModifiers.js | 2 +- .../importDeclWithDeclareModifier.js | 2 +- .../reference/importDeclWithExportModifier.js | 2 +- ...clWithExportModifierAndExportAssignment.js | 2 +- .../importDeclarationUsedAsTypeQuery.js | 2 +- tests/baselines/reference/importHelpers.js | 2 +- tests/baselines/reference/importHelpersAmd.js | 4 +- .../importHelpersInIsolatedModules.js | 4 +- .../baselines/reference/importHelpersInTsx.js | 2 +- .../reference/importHelpersNoHelpers.js | 2 +- .../reference/importHelpersNoModule.js | 2 +- .../reference/importHelpersOutFile.js | 6 +- .../reference/importImportOnlyModule.js | 6 +- .../baselines/reference/importInsideModule.js | 2 +- .../reference/importNonExternalModule.js | 2 +- .../reference/importNonStringLiteral.js | 2 +- .../baselines/reference/importTsBeforeDTs.js | 4 +- .../reference/importUsedInExtendsList1.js | 4 +- .../reference/importWithTrailingSlash.js | 8 +- .../import_reference-exported-alias.js | 2 +- .../import_reference-to-type-alias.js | 4 +- ...-referenecing-aliased-type-throug-array.js | 2 +- ...ar-referencing-an-imported-module-alias.js | 4 +- .../importedAliasesInTypePositions.js | 4 +- .../reference/importedModuleClassNameClash.js | 2 +- .../reference/importsImplicitlyReadonly.js | 4 +- tests/baselines/reference/inferenceLimit.js | 2 +- .../reference/instanceOfInExternalModules.js | 4 +- .../reference/interfaceContextualType.js | 2 +- .../reference/interfaceDeclaration3.js | 2 +- .../reference/interfaceDeclaration5.js | 2 +- .../reference/interfaceImplementation6.js | 2 +- ...alAliasClassInsideLocalModuleWithExport.js | 2 +- ...liasClassInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...liasClassInsideTopLevelModuleWithExport.js | 2 +- ...sClassInsideTopLevelModuleWithoutExport.js | 2 +- ...nalAliasEnumInsideLocalModuleWithExport.js | 2 +- ...AliasEnumInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...AliasEnumInsideTopLevelModuleWithExport.js | 2 +- ...asEnumInsideTopLevelModuleWithoutExport.js | 2 +- ...liasFunctionInsideLocalModuleWithExport.js | 2 +- ...sFunctionInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...sFunctionInsideTopLevelModuleWithExport.js | 2 +- ...nctionInsideTopLevelModuleWithoutExport.js | 2 +- ...alizedModuleInsideLocalModuleWithExport.js | 2 +- ...zedModuleInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...zedModuleInsideTopLevelModuleWithExport.js | 2 +- ...ModuleInsideTopLevelModuleWithoutExport.js | 2 +- ...iasInterfaceInsideLocalModuleWithExport.js | 2 +- ...InterfaceInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...alizedModuleInsideLocalModuleWithExport.js | 2 +- ...zedModuleInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...zedModuleInsideTopLevelModuleWithExport.js | 2 +- ...ModuleInsideTopLevelModuleWithoutExport.js | 2 +- ...rnalAliasVarInsideLocalModuleWithExport.js | 2 +- ...lAliasVarInsideLocalModuleWithoutExport.js | 2 +- ...sideLocalModuleWithoutExportAccessError.js | 2 +- ...lAliasVarInsideTopLevelModuleWithExport.js | 2 +- ...iasVarInsideTopLevelModuleWithoutExport.js | 2 +- .../reference/intersectionTypeInference1.js | 2 +- .../isolatedModulesImportExportElision.js | 2 +- .../reference/isolatedModulesPlainFile-AMD.js | 2 +- .../isolatedModulesPlainFile-CommonJS.js | 2 +- .../reference/isolatedModulesPlainFile-UMD.js | 2 +- ...jsFileCompilationRestParamJsDocFunction.js | 2 +- .../reference/jsxEmitWithAttributes.js | 4 +- .../reference/jsxFactoryAndReactNamespace.js | 4 +- .../reference/jsxFactoryIdentifier.js | 4 +- .../reference/jsxFactoryIdentifier.js.map | 4 +- .../jsxFactoryIdentifier.sourcemap.txt | 248 ++-- .../jsxFactoryIdentifierAsParameter.js | 2 +- .../jsxFactoryIdentifierAsParameter.js.map | 2 +- ...FactoryIdentifierAsParameter.sourcemap.txt | 33 +- ...jsxFactoryIdentifierWithAbsentParameter.js | 2 +- ...actoryIdentifierWithAbsentParameter.js.map | 2 +- ...dentifierWithAbsentParameter.sourcemap.txt | 29 +- .../jsxFactoryNotIdentifierOrQualifiedName.js | 4 +- ...jsxFactoryNotIdentifierOrQualifiedName2.js | 4 +- .../reference/jsxFactoryQualifiedName.js | 4 +- .../reference/jsxFactoryQualifiedName.js.map | 4 +- .../jsxFactoryQualifiedName.sourcemap.txt | 232 ++-- .../jsxFactoryQualifiedNameResolutionError.js | 2 +- ...FactoryQualifiedNameResolutionError.js.map | 2 +- ...QualifiedNameResolutionError.sourcemap.txt | 33 +- .../jsxFactoryQualifiedNameWithEs5.js | 2 +- .../reference/jsxImportInAttribute.js | 2 +- tests/baselines/reference/jsxViaImport.2.js | 2 +- tests/baselines/reference/jsxViaImport.js | 2 +- .../reference/localAliasExportAssignment.js | 2 +- .../baselines/reference/mapOnTupleTypes01.js | 2 +- .../baselines/reference/mapOnTupleTypes02.js | 2 +- .../memberAccessMustUseModuleInstances.js | 4 +- .../reference/mergeWithImportedNamespace.js | 2 +- .../reference/mergeWithImportedType.js | 2 +- .../reference/mergedDeclarations6.js | 4 +- .../reference/mergedDeclarations7.js | 2 +- .../mergedModuleDeclarationCodeGen.js | 2 +- .../reference/metadataOfEventAlias.js | 4 +- .../missingFunctionImplementation.js | 2 +- .../missingSemicolonInModuleSpecifier.js | 4 +- .../moduleAliasAsFunctionArgument.js | 2 +- ...gmentationCollidingNamesInAugmentation1.js | 6 +- .../moduleAugmentationDeclarationEmit1.js | 6 +- .../moduleAugmentationDeclarationEmit2.js | 6 +- .../moduleAugmentationDisallowedExtensions.js | 10 +- .../moduleAugmentationExtendAmbientModule1.js | 4 +- .../moduleAugmentationExtendAmbientModule2.js | 4 +- .../moduleAugmentationExtendFileModule1.js | 6 +- .../moduleAugmentationExtendFileModule2.js | 6 +- .../reference/moduleAugmentationGlobal1.js | 4 +- .../reference/moduleAugmentationGlobal2.js | 4 +- .../reference/moduleAugmentationGlobal3.js | 4 +- .../reference/moduleAugmentationGlobal4.js | 2 +- .../reference/moduleAugmentationGlobal5.js | 2 +- .../moduleAugmentationImportsAndExports1.js | 8 +- .../moduleAugmentationImportsAndExports2.js | 8 +- .../moduleAugmentationImportsAndExports3.js | 8 +- .../moduleAugmentationImportsAndExports4.js | 8 +- .../moduleAugmentationImportsAndExports5.js | 8 +- .../moduleAugmentationImportsAndExports6.js | 8 +- .../moduleAugmentationInAmbientModule1.js | 2 +- .../moduleAugmentationInAmbientModule2.js | 2 +- .../moduleAugmentationInAmbientModule3.js | 2 +- .../moduleAugmentationInAmbientModule4.js | 2 +- .../moduleAugmentationInAmbientModule5.js | 2 +- .../moduleAugmentationInDependency.js | 2 +- .../moduleAugmentationInDependency2.js | 2 +- .../reference/moduleAugmentationNoNewNames.js | 4 +- .../moduleAugmentationsBundledOutput1.js | 10 +- .../reference/moduleAugmentationsImports1.js | 8 +- .../reference/moduleAugmentationsImports2.js | 10 +- .../reference/moduleAugmentationsImports3.js | 8 +- .../reference/moduleAugmentationsImports4.js | 6 +- .../baselines/reference/moduleCodeGenTest5.js | 2 +- .../baselines/reference/moduleCodegenTest4.js | 2 +- .../reference/moduleDuplicateIdentifiers.js | 2 +- tests/baselines/reference/moduleExports1.js | 2 +- .../moduleImportedForTypeArgumentPosition.js | 2 +- .../reference/moduleInTypePosition1.js | 4 +- .../reference/moduleMergeConstructor.js | 2 +- tests/baselines/reference/moduleNoneErrors.js | 2 +- .../baselines/reference/modulePrologueAMD.js | 2 +- .../reference/modulePrologueCommonjs.js | 2 +- .../baselines/reference/modulePrologueUmd.js | 2 +- .../reference/moduleResolutionNoResolve.js | 2 +- .../reference/moduleResolutionNoTs.js | 4 +- .../moduleResolutionWithExtensions.js | 2 +- ...moduleResolutionWithExtensions_preferTs.js | 2 +- ...duleResolutionWithExtensions_unexpected.js | 2 +- ...uleResolutionWithExtensions_unexpected2.js | 2 +- .../reference/moduleResolutionWithSymlinks.js | 6 +- ...ResolutionWithSymlinks_notInNodeModules.js | 6 +- ...moduleResolutionWithSymlinks_withOutDir.js | 6 +- ...duleSameValueDuplicateExportedBindings1.js | 6 +- ...duleSameValueDuplicateExportedBindings2.js | 6 +- tests/baselines/reference/moduleScoping.js | 4 +- .../baselines/reference/multiImportExport.js | 4 +- .../reference/multipleDefaultExports01.js | 4 +- .../reference/multipleDefaultExports02.js | 4 +- .../reference/multipleDefaultExports03.js | 2 +- .../reference/multipleDefaultExports04.js | 2 +- .../reference/multipleExportDefault1.js | 2 +- .../reference/multipleExportDefault2.js | 2 +- .../reference/multipleExportDefault3.js | 2 +- .../reference/multipleExportDefault4.js | 2 +- .../reference/multipleExportDefault5.js | 2 +- .../reference/multipleExportDefault6.js | 2 +- tests/baselines/reference/multipleExports.js | 2 +- .../reference/nameDelimitedBySlashes.js | 4 +- .../reference/nameWithFileExtension.js | 4 +- .../reference/nameWithRelativePaths.js | 8 +- .../narrowingConstrainedTypeParameter.js | 2 +- tests/baselines/reference/nestedLoops.js | 2 +- ...ortModuleAugmentationInDeclarationFile2.js | 2 +- ...ortModuleAugmentationInDeclarationFile3.js | 2 +- ...ImplicitAnyDestructuringInPrivateMethod.js | 2 +- .../reference/noImplicitUseStrict_amd.js | 2 +- .../reference/noImplicitUseStrict_commonjs.js | 2 +- .../reference/noImplicitUseStrict_umd.js | 2 +- tests/baselines/reference/nodeResolution1.js | 2 +- .../baselines/reference/nonMergedOverloads.js | 2 +- tests/baselines/reference/objectIndexer.js | 2 +- .../reference/outFilerootDirModuleNamesAmd.js | 4 +- .../baselines/reference/outModuleConcatAmd.js | 4 +- .../reference/outModuleConcatAmd.js.map | 2 +- .../outModuleConcatAmd.sourcemap.txt | 66 +- .../reference/outModuleTripleSlashRefs.js | 4 +- .../reference/outModuleTripleSlashRefs.js.map | 2 +- .../outModuleTripleSlashRefs.sourcemap.txt | 70 +- .../reference/overloadModifiersMustAgree.js | 2 +- tests/baselines/reference/parser0_004152.js | 2 +- tests/baselines/reference/parser509546.js | 2 +- tests/baselines/reference/parser509546_1.js | 2 +- tests/baselines/reference/parser509546_2.js | 2 +- tests/baselines/reference/parser618973.js | 2 +- .../reference/parserArgumentList1.js | 2 +- tests/baselines/reference/parserClass1.js | 2 +- tests/baselines/reference/parserClass2.js | 2 +- tests/baselines/reference/parserEnum1.js | 2 +- tests/baselines/reference/parserEnum2.js | 2 +- tests/baselines/reference/parserEnum3.js | 2 +- tests/baselines/reference/parserEnum4.js | 2 +- .../parserModifierOnStatementInBlock1.js | 2 +- .../parserModifierOnStatementInBlock3.js | 2 +- tests/baselines/reference/parserModule1.js | 2 +- ...thMappingBasedModuleResolution1_classic.js | 2 +- .../pathMappingBasedModuleResolution1_node.js | 2 +- ...thMappingBasedModuleResolution2_classic.js | 2 +- .../pathMappingBasedModuleResolution2_node.js | 2 +- ...thMappingBasedModuleResolution3_classic.js | 8 +- .../pathMappingBasedModuleResolution3_node.js | 6 +- ...thMappingBasedModuleResolution4_classic.js | 8 +- .../pathMappingBasedModuleResolution4_node.js | 6 +- ...thMappingBasedModuleResolution5_classic.js | 10 +- .../pathMappingBasedModuleResolution5_node.js | 8 +- ...thMappingBasedModuleResolution6_classic.js | 4 +- .../pathMappingBasedModuleResolution6_node.js | 4 +- ...thMappingBasedModuleResolution7_classic.js | 4 +- .../pathMappingBasedModuleResolution7_node.js | 4 +- ...pingBasedModuleResolution_withExtension.js | 4 +- .../prespecializedGenericMembers1.js | 2 +- .../reference/privacyAccessorDeclFile.js | 2 +- .../privacyCannotNameAccessorDeclFile.js | 6 +- .../privacyCannotNameVarTypeDeclFile.js | 6 +- .../privacyCheckAnonymousFunctionParameter.js | 2 +- ...privacyCheckAnonymousFunctionParameter2.js | 2 +- ...arameterReferenceInConstructorParameter.js | 2 +- .../reference/privacyCheckTypeOfFunction.js | 2 +- tests/baselines/reference/privacyClass.js | 2 +- .../privacyClassExtendsClauseDeclFile.js | 2 +- .../privacyClassImplementsClauseDeclFile.js | 2 +- ...FunctionCannotNameParameterTypeDeclFile.js | 6 +- ...acyFunctionCannotNameReturnTypeDeclFile.js | 6 +- .../privacyFunctionParameterDeclFile.js | 2 +- .../privacyFunctionReturnTypeDeclFile.js | 2 +- tests/baselines/reference/privacyGetter.js | 2 +- tests/baselines/reference/privacyGloFunc.js | 2 +- tests/baselines/reference/privacyImport.js | 2 +- .../reference/privacyImportParseErrors.js | 2 +- tests/baselines/reference/privacyInterface.js | 2 +- ...yLocalInternalReferenceImportWithExport.js | 2 +- ...calInternalReferenceImportWithoutExport.js | 2 +- ...elAmbientExternalModuleImportWithExport.js | 6 +- ...mbientExternalModuleImportWithoutExport.js | 6 +- ...pLevelInternalReferenceImportWithExport.js | 2 +- ...velInternalReferenceImportWithoutExport.js | 2 +- .../privacyTypeParameterOfFunction.js | 2 +- .../privacyTypeParameterOfFunctionDeclFile.js | 2 +- .../reference/privacyTypeParametersOfClass.js | 2 +- .../privacyTypeParametersOfClassDeclFile.js | 2 +- .../privacyTypeParametersOfInterface.js | 2 +- ...rivacyTypeParametersOfInterfaceDeclFile.js | 2 +- tests/baselines/reference/privacyVar.js | 2 +- .../baselines/reference/privacyVarDeclFile.js | 2 +- .../privatePropertyUsingObjectType.js | 2 +- .../reference/project/baseline/amd/decl.js | 2 +- .../reference/project/baseline/amd/emit.js | 2 +- .../reference/project/baseline/node/decl.js | 2 +- .../reference/project/baseline/node/emit.js | 2 +- .../reference/project/baseline2/amd/decl.js | 2 +- .../project/baseline2/amd/dont_emit.js | 2 +- .../reference/project/baseline2/node/decl.js | 2 +- .../project/baseline2/node/dont_emit.js | 2 +- .../project/baseline3/amd/nestedModule.js | 2 +- .../project/baseline3/node/nestedModule.js | 2 +- .../reference/project/declarationDir/amd/a.js | 2 +- .../project/declarationDir/amd/subfolder/b.js | 2 +- .../project/declarationDir/amd/subfolder/c.js | 2 +- .../project/declarationDir/node/a.js | 2 +- .../declarationDir/node/subfolder/b.js | 2 +- .../declarationDir/node/subfolder/c.js | 2 +- .../project/declarationDir2/amd/out/a.js | 2 +- .../declarationDir2/amd/out/subfolder/b.js | 2 +- .../declarationDir2/amd/out/subfolder/c.js | 2 +- .../project/declarationDir2/node/out/a.js | 2 +- .../declarationDir2/node/out/subfolder/b.js | 2 +- .../declarationDir2/node/out/subfolder/c.js | 2 +- .../project/declarationDir3/amd/out.js | 6 +- .../declarationsCascadingImports/amd/m4.js | 2 +- .../declarationsCascadingImports/node/m4.js | 2 +- .../declarationsGlobalImport/amd/glo_m4.js | 2 +- .../declarationsGlobalImport/amd/useModule.js | 2 +- .../declarationsGlobalImport/node/glo_m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/private_m4.js | 2 +- .../amd/useModule.js | 2 +- .../node/private_m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/fncOnly_m4.js | 2 +- .../amd/useModule.js | 2 +- .../node/fncOnly_m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/m4.js | 2 +- .../amd/m5.js | 2 +- .../amd/useModule.js | 2 +- .../node/m4.js | 2 +- .../node/m5.js | 2 +- .../node/useModule.js | 2 +- .../declarationsMultipleTimesImport/amd/m4.js | 2 +- .../amd/useModule.js | 2 +- .../node/m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/m4.js | 2 +- .../amd/m5.js | 2 +- .../amd/useModule.js | 2 +- .../node/m4.js | 2 +- .../node/m5.js | 2 +- .../node/useModule.js | 2 +- .../declarationsSimpleImport/amd/m4.js | 2 +- .../declarationsSimpleImport/amd/useModule.js | 2 +- .../declarationsSimpleImport/node/m4.js | 2 +- .../node/useModule.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../emitDecoratorMetadataSystemJS/amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/main.js | 2 +- .../node/main.js | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../maprootUrlModuleSimpleNoOutdir/amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../maprootUrlModuleSimpleNoOutdir/node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/importHigher/root.js | 2 +- .../node/importHigher/root.js | 2 +- .../amd/maxDepthExceeded/built/root.js | 2 +- .../node/maxDepthExceeded/built/root.js | 2 +- .../amd/maxDepthIncreased/root.js | 2 +- .../node/maxDepthIncreased/root.js | 2 +- .../project/nonRelative/amd/consume.js | 2 +- .../reference/project/nonRelative/amd/decl.js | 2 +- .../project/nonRelative/amd/lib/bar/a.js | 2 +- .../project/nonRelative/amd/lib/foo/a.js | 2 +- .../project/nonRelative/amd/lib/foo/b.js | 2 +- .../project/nonRelative/node/consume.js | 2 +- .../project/nonRelative/node/decl.js | 2 +- .../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.js | 2 +- .../outMixedSubfolderNoOutdir/node/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/diskFile0.js | 2 +- .../amd/ref/m1.js | 2 +- .../outModuleMultifolderNoOutdir/amd/test.js | 2 +- .../node/diskFile0.js | 2 +- .../node/ref/m1.js | 2 +- .../outModuleMultifolderNoOutdir/node/test.js | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../amd/bin/test.js | 6 +- .../project/outModuleSimpleNoOutdir/amd/m1.js | 2 +- .../outModuleSimpleNoOutdir/amd/test.js | 2 +- .../outModuleSimpleNoOutdir/node/m1.js | 2 +- .../outModuleSimpleNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/bin/test.js | 4 +- .../outModuleSubfolderNoOutdir/amd/ref/m1.js | 2 +- .../outModuleSubfolderNoOutdir/amd/test.js | 2 +- .../outModuleSubfolderNoOutdir/node/ref/m1.js | 2 +- .../outModuleSubfolderNoOutdir/node/test.js | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/test.js | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/test.js | 2 +- .../amd/bin/test.js | 4 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../sourcemapModuleSimpleNoOutdir/amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../sourcemapModuleSimpleNoOutdir/amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../sourcemapModuleSimpleNoOutdir/node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m2.js | 2 +- .../amd/ref/m2.js.map | 2 +- .../node/ref/m2.js | 2 +- .../node/ref/m2.js.map | 2 +- .../amd/outdir/simple/ref/m2.js | 2 +- .../amd/outdir/simple/ref/m2.js.map | 2 +- .../node/outdir/simple/ref/m2.js | 2 +- .../node/outdir/simple/ref/m2.js.map | 2 +- .../amd/bin/test.js | 2 +- .../amd/bin/test.js.map | 2 +- .../amd/bin/outAndOutDirFile.js | 2 +- .../amd/bin/outAndOutDirFile.js.map | 2 +- .../amd/diskFile0.js.map | 2 +- .../amd/diskFile1.js | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/diskFile0.js.map | 2 +- .../node/diskFile1.js | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../outputdir_module_multifolder/ref/m1.js | 2 +- .../ref/m1.js.map | 2 +- .../outputdir_module_multifolder/test.js | 2 +- .../outputdir_module_multifolder/test.js.map | 2 +- .../outputdir_module_multifolder_ref/m2.js | 2 +- .../m2.js.map | 2 +- .../amd/bin/test.js | 6 +- .../amd/bin/test.js.map | 2 +- .../amd/m1.js | 2 +- .../amd/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/m1.js | 2 +- .../node/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/m1.js | 2 +- .../amd/outdir/simple/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/m1.js | 2 +- .../node/outdir/simple/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/ref/m1.js | 2 +- .../amd/ref/m1.js.map | 2 +- .../amd/test.js | 2 +- .../amd/test.js.map | 2 +- .../node/ref/m1.js | 2 +- .../node/ref/m1.js.map | 2 +- .../node/test.js | 2 +- .../node/test.js.map | 2 +- .../amd/outdir/simple/ref/m1.js | 2 +- .../amd/outdir/simple/ref/m1.js.map | 2 +- .../amd/outdir/simple/test.js | 2 +- .../amd/outdir/simple/test.js.map | 2 +- .../node/outdir/simple/ref/m1.js | 2 +- .../node/outdir/simple/ref/m1.js.map | 2 +- .../node/outdir/simple/test.js | 2 +- .../node/outdir/simple/test.js.map | 2 +- .../amd/bin/test.js | 4 +- .../amd/bin/test.js.map | 2 +- .../amd/fs.js | 2 +- .../node/fs.js | 2 +- .../propertyIdentityWithPrivacyMismatch.js | 2 +- .../reference/reExportDefaultExport.js | 4 +- .../baselines/reference/reExportUndefined2.js | 4 +- .../reactNamespaceImportPresevation.js | 2 +- tests/baselines/reference/recursiveMods.js | 2 +- .../reference/reexportClassDefinition.js | 2 +- .../relativeNamesInClassicResolution.js | 2 +- .../reference/relativePathMustResolve.js | 2 +- .../relativePathToDeclarationFile.js | 2 +- .../requireAsFunctionInExternalModule.js | 6 +- .../reference/requireEmitSemicolon.js | 4 +- tests/baselines/reference/reservedWords2.js | 2 +- .../reference/reuseInnerModuleMember.js | 2 +- tests/baselines/reference/scannerClass2.js | 2 +- tests/baselines/reference/scannerEnum1.js | 2 +- .../reference/shebangBeforeReferences.js | 2 +- .../reference/shorthand-property-es6-amd.js | 2 +- ...fExportedEntity01_targetES2015_CommonJS.js | 2 +- ...ndOfExportedEntity02_targetES5_CommonJS.js | 2 +- .../shorthandPropertyAssignmentInES6Module.js | 4 +- .../reference/sourceMapValidationImport.js | 2 +- .../sourceMapValidationImport.js.map | 2 +- .../sourceMapValidationImport.sourcemap.txt | 128 +- .../reference/staticInstanceResolution3.js | 4 +- .../reference/staticInstanceResolution5.js | 4 +- ...dWithTypeParameterExtendsClauseDeclFile.js | 2 +- .../reference/topLevelAmbientModule.js | 2 +- tests/baselines/reference/topLevelExports.js | 2 +- .../baselines/reference/topLevelFileModule.js | 2 +- .../reference/topLevelFileModuleMissing.js | 2 +- tests/baselines/reference/topLevelLambda4.js | 2 +- .../topLevelModuleDeclarationAndFile.js | 2 +- .../transformNestedGeneratorsWithTry.js | 2 +- ...ata when transpile with CommonJS option.js | 2 +- .../Does not generate semantic diagnostics.js | 2 +- ...enerates expected syntactic diagnostics.js | 2 +- .../transpile/Generates module output.js | 2 +- ...diagnostics for missing file references.js | 2 +- ...erates no diagnostics with valid inputs.js | 2 +- ...extra errors for file without extension.js | 2 +- .../transpile/Rename dependencies - AMD.js | 2 +- .../transpile/Rename dependencies - UMD.js | 2 +- .../Support options with lib values.js | 2 +- .../Support options with types values.js | 2 +- .../Supports backslashes in file name.js | 2 +- .../transpile/Supports setting allowJs.js | 2 +- ...ts setting allowSyntheticDefaultImports.js | 2 +- .../Supports setting allowUnreachableCode.js | 2 +- .../Supports setting allowUnusedLabels.js | 2 +- .../Supports setting alwaysStrict.js | 2 +- .../transpile/Supports setting baseUrl.js | 2 +- .../transpile/Supports setting charset.js | 2 +- .../transpile/Supports setting declaration.js | 2 +- .../Supports setting declarationDir.js | 2 +- .../transpile/Supports setting emitBOM.js | 2 +- .../Supports setting emitDecoratorMetadata.js | 2 +- ...Supports setting experimentalDecorators.js | 2 +- ...etting forceConsistentCasingInFileNames.js | 2 +- .../Supports setting isolatedModules.js | 2 +- .../transpile/Supports setting jsx.js | 2 +- .../transpile/Supports setting jsxFactory.js | 2 +- .../transpile/Supports setting lib.js | 2 +- .../transpile/Supports setting locale.js | 2 +- .../transpile/Supports setting module.js | 2 +- .../Supports setting moduleResolution.js | 2 +- .../transpile/Supports setting newLine.js | 2 +- .../transpile/Supports setting noEmit.js | 2 +- .../Supports setting noEmitHelpers.js | 2 +- .../Supports setting noEmitOnError.js | 2 +- .../Supports setting noErrorTruncation.js | 2 +- ...orts setting noFallthroughCasesInSwitch.js | 2 +- .../Supports setting noImplicitAny.js | 2 +- .../Supports setting noImplicitReturns.js | 2 +- .../Supports setting noImplicitThis.js | 2 +- .../Supports setting noImplicitUseStrict.js | 2 +- .../transpile/Supports setting noLib.js | 2 +- .../transpile/Supports setting noResolve.js | 2 +- .../transpile/Supports setting out.js | 2 +- .../transpile/Supports setting outDir.js | 2 +- .../transpile/Supports setting outFile.js | 2 +- .../transpile/Supports setting paths.js | 2 +- .../Supports setting preserveConstEnums.js | 2 +- .../Supports setting reactNamespace.js | 2 +- .../Supports setting removeComments.js | 2 +- .../transpile/Supports setting rootDir.js | 2 +- .../transpile/Supports setting rootDirs.js | 2 +- .../Supports setting skipDefaultLibCheck.js | 2 +- .../Supports setting skipLibCheck.js | 2 +- .../Supports setting strictNullChecks.js | 2 +- .../Supports setting stripInternal.js | 2 +- ...ts setting suppressExcessPropertyErrors.js | 2 +- ... setting suppressImplicitAnyIndexErrors.js | 2 +- .../transpile/Supports setting typeRoots.js | 2 +- .../transpile/Supports setting types.js | 2 +- .../transpile/Supports urls in file name.js | 2 +- ... with emit decorators and emit metadata.js | 2 +- .../Uses correct newLine character.js | 2 +- .../transpile/transpile .js files.js | 2 +- ...anspile file as tsx if jsx is specified.js | 2 +- .../reference/tsxAttributeResolution10.js | 2 +- .../reference/tsxAttributeResolution9.js | 2 +- .../tsxCorrectlyParseLessThanComparison1.js | 2 +- .../baselines/reference/tsxDefaultImports.js | 4 +- .../baselines/reference/tsxDynamicTagName5.js | 2 +- .../baselines/reference/tsxDynamicTagName7.js | 2 +- .../baselines/reference/tsxDynamicTagName8.js | 2 +- .../baselines/reference/tsxDynamicTagName9.js | 2 +- .../reference/tsxElementResolution17.js | 2 +- .../reference/tsxElementResolution19.js | 4 +- .../reference/tsxExternalModuleEmit1.js | 4 +- .../reference/tsxExternalModuleEmit2.js | 2 +- tests/baselines/reference/tsxPreserveEmit1.js | 2 +- tests/baselines/reference/tsxReactEmit5.js | 2 +- .../tsxStatelessFunctionComponents2.js | 2 +- .../tsxStatelessFunctionComponents3.js | 2 +- .../reference/tsxUnionTypeComponent1.js | 2 +- .../reference/tsxUnionTypeComponent2.js | 2 +- ...pressionWithUndefinedCallResolutionData.js | 4 +- .../reference/typeGuardsAsAssertions.js | 2 +- .../reference/typeGuardsInExternalModule.js | 2 +- .../reference/typeInferenceLiteralUnion.js | 2 +- ...rameterCompatibilityAccrossDeclarations.js | 2 +- .../reference/typePredicateInLoop.js | 2 +- .../reference/typeReferenceDirectives7.js | 2 +- .../reference/typeReferenceDirectives8.js | 4 +- .../reference/typeReferenceDirectives9.js | 6 +- tests/baselines/reference/typeResolution.js | 2 +- .../baselines/reference/typeResolution.js.map | 2 +- .../reference/typeResolution.sourcemap.txt | 1180 ++++++++--------- ...RootsFromMultipleNodeModulesDirectories.js | 2 +- ...peRootsFromNodeModulesInParentDirectory.js | 2 +- .../reference/typeUsedAsValueError2.js | 2 +- .../reference/typeofANonExportedType.js | 2 +- .../reference/typeofAmbientExternalModules.js | 4 +- .../reference/typeofAnExportedType.js | 2 +- .../reference/typeofExternalModules.js | 4 +- ...typesOnlyExternalModuleStillHasInstance.js | 2 +- tests/baselines/reference/typingsLookup4.js | 4 +- .../baselines/reference/umd-augmentation-1.js | 2 +- .../baselines/reference/umd-augmentation-3.js | 2 +- tests/baselines/reference/umd3.js | 2 +- tests/baselines/reference/umd4.js | 2 +- tests/baselines/reference/umd5.js | 2 +- tests/baselines/reference/umd8.js | 2 +- .../reference/umdDependencyComment2.js | 2 +- .../reference/umdDependencyCommentName1.js | 2 +- .../reference/umdDependencyCommentName2.js | 2 +- .../reference/unclosedExportClause01.js | 10 +- .../reference/unclosedExportClause02.js | 10 +- .../reference/undeclaredModuleError.js | 2 +- .../reference/untypedModuleImport.js | 6 +- .../reference/untypedModuleImport_allowJs.js | 2 +- .../untypedModuleImport_vsAmbient.js | 2 +- .../untypedModuleImport_withAugmentation.js | 2 +- .../reference/unusedImportDeclaration.js | 2 +- tests/baselines/reference/unusedImports1.js | 2 +- tests/baselines/reference/unusedImports11.js | 4 +- tests/baselines/reference/unusedImports12.js | 2 +- tests/baselines/reference/unusedImports13.js | 2 +- tests/baselines/reference/unusedImports14.js | 2 +- tests/baselines/reference/unusedImports15.js | 2 +- tests/baselines/reference/unusedImports16.js | 2 +- tests/baselines/reference/unusedImports2.js | 4 +- tests/baselines/reference/unusedImports3.js | 4 +- tests/baselines/reference/unusedImports4.js | 4 +- tests/baselines/reference/unusedImports5.js | 4 +- tests/baselines/reference/unusedImports6.js | 2 +- tests/baselines/reference/unusedImports7.js | 2 +- tests/baselines/reference/unusedImports8.js | 4 +- tests/baselines/reference/unusedImports9.js | 2 +- .../reference/unusedLocalsAndObjectSpread2.js | 2 +- .../reference/unusedLocalsAndParameters.js | 2 +- .../unusedLocalsAndParametersDeferred.js | 2 +- ...edLocalsAndParametersOverloadSignatures.js | 2 +- .../unusedLocalsAndParametersTypeAliases.js | 2 +- .../unusedLocalsAndParametersTypeAliases2.js | 2 +- .../reference/unusedVariablesinModules1.js | 2 +- .../useStrictLikePrologueString01.js | 2 +- .../reference/varArgsOnConstructorTypes.js | 2 +- .../visibilityOfCrossModuleTypeUsage.js | 2 +- .../reference/visibilityOfTypeParameters.js | 2 +- .../reference/voidAsNonAmbiguousReturnType.js | 4 +- tests/baselines/reference/withExportDecl.js | 2 +- tests/baselines/reference/withImportDecl.js | 4 +- 1529 files changed, 2977 insertions(+), 2983 deletions(-) diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index cdd3380b3b787..bf963bdc0e5c9 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -83,15 +83,16 @@ namespace ts { const statements: Statement[] = []; const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor); - append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true)); - addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset)); - addRange(statements, endLexicalEnvironment()); - addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); if (!currentModuleInfo.exportEquals) { append(statements, createUnderscoreUnderscoreESModule()); } + append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true)); + addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset)); + addRange(statements, endLexicalEnvironment()); + addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); + const updated = updateSourceFileNode(node, setTextRange(createNodeArray(statements), node.statements)); if (currentModuleInfo.hasExportStarsToExportValues) { addEmitHelper(updated, exportStarHelper); @@ -374,6 +375,10 @@ namespace ts { const statements: Statement[] = []; const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor); + if (!currentModuleInfo.exportEquals) { + append(statements, createUnderscoreUnderscoreESModule()); + } + // Visit each statement of the module body. append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true)); addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset)); @@ -385,10 +390,6 @@ namespace ts { // Append the 'export =' statement if provided. addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true); - if (!currentModuleInfo.exportEquals) { - append(statements, createUnderscoreUnderscoreESModule()); - } - const body = createBlock(statements, /*multiLine*/ true); if (currentModuleInfo.hasExportStarsToExportValues) { // If we have any `export * from ...` declarations diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 3738308298325..0315fd516b5bd 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -41,6 +41,7 @@ compile(process.argv.slice(2), { * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function compile(fileNames, options) { var program = ts.createProgram(fileNames, options); @@ -60,4 +61,3 @@ compile(process.argv.slice(2), { noEmitOnError: true, noImplicitAny: true, target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS }); -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index cc57b18496006..57ebd64c4e2bf 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -71,6 +71,7 @@ fileNames.forEach(fileName => { * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function delint(sourceFile) { delintNode(sourceFile); @@ -117,4 +118,3 @@ fileNames.forEach(function (fileName) { // delint it delint(sourceFile); }); -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js index d97acbdc14f0e..77f0a07c1dff8 100644 --- a/tests/baselines/reference/APISample_parseConfig.js +++ b/tests/baselines/reference/APISample_parseConfig.js @@ -43,6 +43,7 @@ export function createProgram(rootFiles: string[], compilerOptionsJson: string): * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function printError(error) { if (!error) { @@ -68,4 +69,3 @@ function createProgram(rootFiles, compilerOptionsJson) { return ts.createProgram(rootFiles, settings.options); } exports.createProgram = createProgram; -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 1156d6433543e..0716e59edb774 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -23,8 +23,8 @@ console.log(JSON.stringify(result)); * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); var source = "let x: string = 'string'"; var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS }); console.log(JSON.stringify(result)); -exports.__esModule = true; diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index d877071a228f2..f4400ccda4cc0 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -116,6 +116,7 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS }); * Please log a "breaking change" issue for any API breaking change affecting this issue */ "use strict"; +exports.__esModule = true; var ts = require("typescript"); function watch(rootFileNames, options) { var files = {}; @@ -189,4 +190,3 @@ var currentDirectoryFiles = fs.readdirSync(process.cwd()). filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; }); // Start the watcher watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS }); -exports.__esModule = true; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js index 8fa171ed05a96..a68614c0ed478 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js @@ -31,6 +31,7 @@ export module A { //// [part1.js] "use strict"; +exports.__esModule = true; var A; (function (A) { var Utils; @@ -42,9 +43,9 @@ var A; })(Utils = A.Utils || (A.Utils = {})); A.Origin = { x: 0, y: 0 }; })(A = exports.A || (exports.A = {})); -exports.__esModule = true; //// [part2.js] "use strict"; +exports.__esModule = true; var A; (function (A) { // collision with 'Origin' var in other part of merged module @@ -61,4 +62,3 @@ var A; Utils.Plane = Plane; })(Utils = A.Utils || (A.Utils = {})); })(A = exports.A || (exports.A = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js index 84e20daa7c7f3..c21fe575e764f 100644 --- a/tests/baselines/reference/aliasAssignments.js +++ b/tests/baselines/reference/aliasAssignments.js @@ -15,18 +15,18 @@ y = moduleA; // should be error //// [aliasAssignments_moduleA.js] "use strict"; +exports.__esModule = true; var someClass = (function () { function someClass() { } return someClass; }()); exports.someClass = someClass; -exports.__esModule = true; //// [aliasAssignments_1.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasAssignments_moduleA"); var x = moduleA; x = 1; // Should be error var y = 1; y = moduleA; // should be error -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js index 8fbeaf78d9547..d3d312e53bb92 100644 --- a/tests/baselines/reference/aliasOnMergedModuleInterface.js +++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js @@ -24,7 +24,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"; +exports.__esModule = true; 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 -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js index 03888704e70fa..883cbb84ee310 100644 --- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js +++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js @@ -29,13 +29,13 @@ class C2 { //// [aliasUsage1_backbone.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aliasUsage1_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -48,6 +48,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var Backbone = require("./aliasUsage1_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -57,9 +58,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aliasUsage1_main.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var moduleA = require("./aliasUsage1_moduleA"); var C2 = (function () { function C2() { @@ -76,4 +77,3 @@ var C2 = (function () { }); return C2; }()); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js index 5be50e00f30a5..1ccbc958aec35 100644 --- a/tests/baselines/reference/aliasUsageInArray.js +++ b/tests/baselines/reference/aliasUsageInArray.js @@ -23,13 +23,13 @@ var xs2: typeof moduleA[] = [moduleA]; //// [aliasUsageInArray_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInArray_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInArray_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -51,10 +52,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInArray_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInArray_moduleA"); var xs = [moduleA]; var xs2 = [moduleA]; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js index 0f15ecda6ac7c..de661ae803e30 100644 --- a/tests/baselines/reference/aliasUsageInFunctionExpression.js +++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js @@ -22,13 +22,13 @@ f = (x) => moduleA; //// [aliasUsageInFunctionExpression_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInFunctionExpression_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInFunctionExpression_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -50,10 +51,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInFunctionExpression_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInFunctionExpression_moduleA"); var f = function (x) { return x; }; f = function (x) { return moduleA; }; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js index 8c61ddeefb8c5..2ca49ea8dfc33 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.js +++ b/tests/baselines/reference/aliasUsageInGenericFunction.js @@ -26,13 +26,13 @@ var r2 = foo({ a: null }); //// [aliasUsageInGenericFunction_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInGenericFunction_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInGenericFunction_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -54,13 +55,12 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInGenericFunction_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInGenericFunction_moduleA"); function foo(x) { return x; } var r = foo({ a: moduleA }); var r2 = foo({ a: null }); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js index acd4dd1f533f5..81084b8b92fa6 100644 --- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js +++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js @@ -28,13 +28,13 @@ class N2 { //// [aliasUsageInIndexerOfClass_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInIndexerOfClass_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -47,6 +47,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInIndexerOfClass_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -56,9 +57,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInIndexerOfClass_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInIndexerOfClass_moduleA"); var N = (function () { function N() { @@ -71,4 +72,3 @@ var N2 = (function () { } return N2; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js index 10dcc50083c20..6f4adfae58c98 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.js +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js @@ -23,13 +23,13 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } }; //// [aliasUsageInObjectLiteral_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInObjectLiteral_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInObjectLiteral_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -51,11 +52,10 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInObjectLiteral_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInObjectLiteral_moduleA"); var a = { x: moduleA }; var b = { x: moduleA }; var c = { y: { z: moduleA } }; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js index 07dea7ea22da8..178ccaaee230d 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.js +++ b/tests/baselines/reference/aliasUsageInOrExpression.js @@ -26,13 +26,13 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x //// [aliasUsageInOrExpression_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInOrExpression_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInOrExpression_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -54,9 +55,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInOrExpression_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./aliasUsageInOrExpression_moduleA"); var i; var d1 = i || moduleA; @@ -64,4 +65,3 @@ var d2 = i || moduleA; var d2 = moduleA || i; var e = null || { x: moduleA }; var f = null ? { x: moduleA } : null; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js index 509797bd2608b..5ac28396fba69 100644 --- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js +++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js @@ -26,13 +26,13 @@ class D extends C { //// [aliasUsageInTypeArgumentOfExtendsClause_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -54,7 +55,6 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInTypeArgumentOfExtendsClause_main.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -67,6 +67,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA"); var C = (function () { function C() { @@ -82,4 +83,3 @@ var D = (function (_super) { } return D; }(C)); -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js index e5c7af13078fd..a85d61fd34cad 100644 --- a/tests/baselines/reference/aliasUsageInVarAssignment.js +++ b/tests/baselines/reference/aliasUsageInVarAssignment.js @@ -22,13 +22,13 @@ var m: typeof moduleA = i; //// [aliasUsageInVarAssignment_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [aliasUsageInVarAssignment_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./aliasUsageInVarAssignment_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -50,9 +51,8 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [aliasUsageInVarAssignment_main.js] "use strict"; +exports.__esModule = true; var i; var m = i; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js index b86051d7b198e..168567eb80fac 100644 --- a/tests/baselines/reference/aliasUsedAsNameValue.js +++ b/tests/baselines/reference/aliasUsedAsNameValue.js @@ -23,11 +23,12 @@ export var a = function () { exports.__esModule = true; //// [aliasUsedAsNameValue_1.js] "use strict"; +exports.__esModule = true; function b(a) { return null; } exports.b = b; -exports.__esModule = true; //// [aliasUsedAsNameValue_2.js] "use strict"; +exports.__esModule = true; /// /// var mod = require("./aliasUsedAsNameValue_0"); @@ -36,4 +37,3 @@ exports.a = function () { //var x = mod.id; // TODO needed hack that mod is loaded b.b(mod); }; -exports.__esModule = true; diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js index 9cc8372a0bb69..58565bbb91648 100644 --- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js +++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js @@ -15,5 +15,5 @@ var d = b.q3; exports.__esModule = true; //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js] "use strict"; -var d = b.q3; exports.__esModule = true; +var d = b.q3; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js index dceecdd40014d..a659eb60151c3 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports1.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js @@ -12,15 +12,15 @@ export class Foo { //// [b.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; //// [a.js] "use strict"; +exports.__esModule = true; var b_1 = require("./b"); exports.x = new b_1["default"].Foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js index 09e80cc799f1f..ad3ed5715c08f 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports10.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports10.js @@ -12,7 +12,7 @@ Foo.default.default.foo(); //// [a.js] "use strict"; +exports.__esModule = true; var Foo = require("./b"); Foo["default"].bar(); Foo["default"]["default"].foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js index 69bfedadc4991..762c032b81287 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports4.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js @@ -13,6 +13,6 @@ export var x = new Foo(); //// [a.js] "use strict"; +exports.__esModule = true; var b_1 = require("./b"); exports.x = new b_1["default"](); -exports.__esModule = true; diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js index a455f0e757001..2d8ab463d83f7 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports9.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js @@ -12,7 +12,7 @@ Foo.foo(); //// [a.js] "use strict"; +exports.__esModule = true; var b_1 = require("./b"); b_1["default"].bar(); b_1["default"].foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js index 7ca68d8500028..dcaafdfeee6f6 100644 --- a/tests/baselines/reference/alwaysStrictModule4.js +++ b/tests/baselines/reference/alwaysStrictModule4.js @@ -5,6 +5,6 @@ export const a = 1 //// [alwaysStrictModule4.js] "use strict"; +exports.__esModule = true; // Module commonjs exports.a = 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js index 161e341ba7967..cd97b55b67bac 100644 --- a/tests/baselines/reference/alwaysStrictModule6.js +++ b/tests/baselines/reference/alwaysStrictModule6.js @@ -5,6 +5,6 @@ export const a = 1; //// [alwaysStrictModule6.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); // Targeting ES5 exports.a = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js index 7f8741d3baf4c..dfff030b78f47 100644 --- a/tests/baselines/reference/ambientDeclarationsExternal.js +++ b/tests/baselines/reference/ambientDeclarationsExternal.js @@ -28,8 +28,8 @@ var n: number; // Ambient external import declaration referencing ambient external module using top level module name //// [consumer.js] "use strict"; +exports.__esModule = true; // 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; var n; -exports.__esModule = true; diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js index fac34990e5e9b..84088d11d4eb4 100644 --- a/tests/baselines/reference/ambientDeclarationsPatterns.js +++ b/tests/baselines/reference/ambientDeclarationsPatterns.js @@ -34,6 +34,7 @@ foo(fileText); //// [user.js] "use strict"; +exports.__esModule = true; /// var foobarbaz_1 = require("foobarbaz"); foobarbaz_1.foo(foobarbaz_1.baz); @@ -42,4 +43,3 @@ foobarbaz_1.foo(foosball_1.foos); // Works with relative file name var file_text_1 = require("./file!text"); foobarbaz_1.foo(file_text_1["default"]); -exports.__esModule = true; diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js index 0dddb3a307c73..6c2de62c90a66 100644 --- a/tests/baselines/reference/ambientExternalModuleMerging.js +++ b/tests/baselines/reference/ambientExternalModuleMerging.js @@ -19,9 +19,9 @@ declare module "M" { //// [ambientExternalModuleMerging_use.js] define(["require", "exports", "M"], function (require, exports, M) { "use strict"; + exports.__esModule = true; // Should be strings var x = M.x; var y = M.y; - exports.__esModule = true; }); //// [ambientExternalModuleMerging_declare.js] diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js index 537c765a482c4..9efd9e4ada9fc 100644 --- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js @@ -22,6 +22,6 @@ var c = new A(); //// [ambientExternalModuleWithInternalImportDeclaration_1.js] define(["require", "exports", "M"], function (require, exports, A) { "use strict"; - var c = new A(); exports.__esModule = true; + var c = new A(); }); diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js index 692c57073324f..98d3d46912aae 100644 --- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js +++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js @@ -21,6 +21,6 @@ var c = new A(); //// [ambientExternalModuleWithoutInternalImportDeclaration_1.js] define(["require", "exports", "M"], function (require, exports, A) { "use strict"; - var c = new A(); exports.__esModule = true; + var c = new A(); }); diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js index 5dd15c8e0efd5..a7513e7eb585a 100644 --- a/tests/baselines/reference/ambientShorthand.js +++ b/tests/baselines/reference/ambientShorthand.js @@ -15,9 +15,9 @@ foo(bar, baz, boom); //// [user.js] "use strict"; +exports.__esModule = true; /// var jquery_1 = require("jquery"); var baz = require("fs"); var boom = require("jquery"); jquery_1["default"](jquery_1.bar, baz, boom); -exports.__esModule = true; diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js index 6818cca28d3d8..6842d0f75541f 100644 --- a/tests/baselines/reference/ambientShorthand_reExport.js +++ b/tests/baselines/reference/ambientShorthand_reExport.js @@ -18,20 +18,20 @@ x($); //// [reExportX.js] "use strict"; +exports.__esModule = true; var jquery_1 = require("jquery"); exports.x = jquery_1.x; -exports.__esModule = true; //// [reExportAll.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } -__export(require("jquery")); exports.__esModule = true; +__export(require("jquery")); //// [reExportUser.js] "use strict"; +exports.__esModule = true; var reExportX_1 = require("./reExportX"); var $ = require("./reExportAll"); // '$' is not callable, it is an object. reExportX_1.x($); -exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js index 1c5594ea7c309..6be26909f3ad0 100644 --- a/tests/baselines/reference/amdDependencyComment1.js +++ b/tests/baselines/reference/amdDependencyComment1.js @@ -7,6 +7,6 @@ m1.f(); //// [amdDependencyComment1.js] /// "use strict"; +exports.__esModule = true; var m1 = require("m2"); m1.f(); -exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js index db87e4e942205..222093cf15933 100644 --- a/tests/baselines/reference/amdDependencyComment2.js +++ b/tests/baselines/reference/amdDependencyComment2.js @@ -8,6 +8,6 @@ m1.f(); /// define(["require", "exports", "m2", "bar"], function (require, exports, m1) { "use strict"; - m1.f(); exports.__esModule = true; + m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js index e886d4b1579fb..d0e4d73fb7a23 100644 --- a/tests/baselines/reference/amdDependencyCommentName1.js +++ b/tests/baselines/reference/amdDependencyCommentName1.js @@ -7,6 +7,6 @@ m1.f(); //// [amdDependencyCommentName1.js] /// "use strict"; +exports.__esModule = true; var m1 = require("m2"); m1.f(); -exports.__esModule = true; diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js index bb2fc9a2389ac..c39902371a0cf 100644 --- a/tests/baselines/reference/amdDependencyCommentName2.js +++ b/tests/baselines/reference/amdDependencyCommentName2.js @@ -8,6 +8,6 @@ m1.f(); /// define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) { "use strict"; - m1.f(); exports.__esModule = true; + m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js index dafbe2463f96c..f842ad0cbf8c5 100644 --- a/tests/baselines/reference/amdDependencyCommentName3.js +++ b/tests/baselines/reference/amdDependencyCommentName3.js @@ -12,6 +12,6 @@ m1.f(); /// define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) { "use strict"; - m1.f(); exports.__esModule = true; + m1.f(); }); diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js index d82eab0d12f60..6542aa14fa299 100644 --- a/tests/baselines/reference/amdDependencyCommentName4.js +++ b/tests/baselines/reference/amdDependencyCommentName4.js @@ -27,9 +27,9 @@ 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"; + exports.__esModule = true; r1; aliasedModule2_1.p1; aliasedModule3_1["default"]; ns; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js index b127532206963..7819c0c7205fa 100644 --- a/tests/baselines/reference/amdImportAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js @@ -15,18 +15,18 @@ if(foo.E1.A === 0){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var E1; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); - exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.E1.A === 0) { } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index 7f75124dba78e..651ae7a6d3945 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -34,6 +34,7 @@ var e: number = 0; //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -48,15 +49,14 @@ define(["require", "exports"], function (require, exports) { E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); - exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var i; var x = {}; var y = false; var z; var e = 0; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js index a3b8b7cd98a80..24e833b7542ee 100644 --- a/tests/baselines/reference/anonymousDefaultExportsAmd.js +++ b/tests/baselines/reference/anonymousDefaultExportsAmd.js @@ -9,15 +9,15 @@ export default function() {} //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class default_1 { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js index dbfdfd0f420f8..e22000856d686 100644 --- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js +++ b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js @@ -8,12 +8,12 @@ export default function() {} //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class default_1 { } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js index a8984434c9cd7..484238b8722cf 100644 --- a/tests/baselines/reference/anonymousDefaultExportsUmd.js +++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js @@ -17,10 +17,10 @@ export default function() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class default_1 { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] (function (factory) { @@ -33,7 +33,7 @@ export default function() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js index b19fa3ca14c1e..3a43f328f3511 100644 --- a/tests/baselines/reference/asOperator4.js +++ b/tests/baselines/reference/asOperator4.js @@ -14,13 +14,13 @@ import { foo } from './foo'; //// [foo.js] "use strict"; +exports.__esModule = true; function foo() { } exports.foo = foo; -exports.__esModule = true; //// [bar.js] "use strict"; +exports.__esModule = true; var foo_1 = require("./foo"); // These should emit identically foo_1.foo; foo_1.foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js index 06b9fd1468252..bd05f90a26e38 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js @@ -77,6 +77,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { } }; var _this = this; +Object.defineProperty(exports, "__esModule", { value: true }); var missing_1 = require("missing"); function f0() { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { @@ -190,4 +191,3 @@ var M; } M.f1 = f1; })(M || (M = {})); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js index 25a771ffbfbb5..550f0d2357e82 100644 --- a/tests/baselines/reference/asyncImportedPromise_es5.js +++ b/tests/baselines/reference/asyncImportedPromise_es5.js @@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var Task = (function (_super) { __extends(Task, _super); function Task() { @@ -29,7 +30,6 @@ var Task = (function (_super) { return Task; }(Promise)); exports.Task = Task; -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -67,6 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; +Object.defineProperty(exports, "__esModule", { value: true }); var task_1 = require("./task"); var Test = (function () { function Test() { @@ -78,4 +79,3 @@ var Test = (function () { }; return Test; }()); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js index b3fa2c4b491ee..6b84f5615b3fd 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.js +++ b/tests/baselines/reference/asyncImportedPromise_es6.js @@ -11,10 +11,10 @@ class Test { //// [task.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class Task extends Promise { } exports.Task = Task; -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -25,9 +25,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); class Test { example() { return __awaiter(this, void 0, void 0, function* () { return; }); } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js index ef176ac90daa3..7b0bfcf73353c 100644 --- a/tests/baselines/reference/augmentExportEquals1.js +++ b/tests/baselines/reference/augmentExportEquals1.js @@ -33,6 +33,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "./file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js index 1e094701f79d0..51bc67e7fa4d6 100644 --- a/tests/baselines/reference/augmentExportEquals1_1.js +++ b/tests/baselines/reference/augmentExportEquals1_1.js @@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js index fe55906b65787..efdce1bc0cf21 100644 --- a/tests/baselines/reference/augmentExportEquals2.js +++ b/tests/baselines/reference/augmentExportEquals2.js @@ -32,6 +32,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "./file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js index 5b80ef1d5123c..322ab3b36bf1a 100644 --- a/tests/baselines/reference/augmentExportEquals2_1.js +++ b/tests/baselines/reference/augmentExportEquals2_1.js @@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; - var a; // should not work exports.__esModule = true; + var a; // should not work }); diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js index 3e12c9968d22e..387ef86ff7921 100644 --- a/tests/baselines/reference/augmentExportEquals3.js +++ b/tests/baselines/reference/augmentExportEquals3.js @@ -36,13 +36,13 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js index 9fd08cb8f7f45..e91ca4498dd86 100644 --- a/tests/baselines/reference/augmentExportEquals3_1.js +++ b/tests/baselines/reference/augmentExportEquals3_1.js @@ -30,13 +30,13 @@ let b = x.b; //// [file2.js] define(["require", "exports", "file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "file1", "file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js index 1a83e86f3fcd0..37be30731de08 100644 --- a/tests/baselines/reference/augmentExportEquals4.js +++ b/tests/baselines/reference/augmentExportEquals4.js @@ -40,13 +40,13 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js index e039e7dcda642..71d39aedb1ff0 100644 --- a/tests/baselines/reference/augmentExportEquals4_1.js +++ b/tests/baselines/reference/augmentExportEquals4_1.js @@ -31,13 +31,13 @@ let b = x.b; //// [file2.js] define(["require", "exports", "file1"], function (require, exports, x) { "use strict"; - x.b = 1; exports.__esModule = true; + x.b = 1; }); //// [file3.js] define(["require", "exports", "file1", "file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = x.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js index ee26ddda90e8a..7bc5102ca9d4c 100644 --- a/tests/baselines/reference/augmentExportEquals5.js +++ b/tests/baselines/reference/augmentExportEquals5.js @@ -90,7 +90,7 @@ define(["require", "exports"], function (require, exports) { //// [consumer.js] define(["require", "exports", "./augmentation"], function (require, exports) { "use strict"; + exports.__esModule = true; var x; var y = x.id; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js index 2db5bc66e3ca7..4299f8653dd84 100644 --- a/tests/baselines/reference/augmentExportEquals6.js +++ b/tests/baselines/reference/augmentExportEquals6.js @@ -52,14 +52,14 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "./file1"], function (require, exports, x) { "use strict"; - x.B.b = 1; exports.__esModule = true; + x.B.b = 1; }); //// [file3.js] define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { "use strict"; + exports.__esModule = true; var a; var b = a.a; var c = x.B.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js index 6ba3534610941..e69728a766bd6 100644 --- a/tests/baselines/reference/augmentExportEquals6_1.js +++ b/tests/baselines/reference/augmentExportEquals6_1.js @@ -34,7 +34,7 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports", "file2"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.a; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js index 321118461620c..0a8b7404bd1c5 100644 --- a/tests/baselines/reference/augmentedTypesExternalModule1.js +++ b/tests/baselines/reference/augmentedTypesExternalModule1.js @@ -6,6 +6,7 @@ module c5 { } // should be ok everywhere //// [augmentedTypesExternalModule1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = 1; var c5 = (function () { function c5() { @@ -13,5 +14,4 @@ define(["require", "exports"], function (require, exports) { c5.prototype.foo = function () { }; return c5; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js index 1c8c6ec016873..6b28c90e321fe 100644 --- a/tests/baselines/reference/cacheResolutions.js +++ b/tests/baselines/reference/cacheResolutions.js @@ -13,18 +13,18 @@ export let x = 1; //// [app.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [lib1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [lib2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js index 3af2cc7a5f934..8fcdd501707c4 100644 --- a/tests/baselines/reference/chainedImportAlias.js +++ b/tests/baselines/reference/chainedImportAlias.js @@ -13,15 +13,15 @@ y.m.foo(); //// [chainedImportAlias_file0.js] "use strict"; +exports.__esModule = true; var m; (function (m) { function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); -exports.__esModule = true; //// [chainedImportAlias_file1.js] "use strict"; +exports.__esModule = true; var x = require("./chainedImportAlias_file0"); var y = x; y.m.foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js index 8d3419f1db6b0..198a886f0267c 100644 --- a/tests/baselines/reference/circularReference.js +++ b/tests/baselines/reference/circularReference.js @@ -35,6 +35,7 @@ export module M1 { //// [foo1.js] "use strict"; +exports.__esModule = true; var foo2 = require("./foo2"); var M1; (function (M1) { @@ -48,9 +49,9 @@ var M1; }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); -exports.__esModule = true; //// [foo2.js] "use strict"; +exports.__esModule = true; var foo1 = require("./foo1"); var M1; (function (M1) { @@ -67,4 +68,3 @@ var M1; }()); M1.C1 = C1; })(M1 = exports.M1 || (exports.M1 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js index 28f43fa798539..8b49f45dbd205 100644 --- a/tests/baselines/reference/circularReferenceInImport.js +++ b/tests/baselines/reference/circularReferenceInImport.js @@ -17,11 +17,11 @@ export function foo() { //// [app.js] "use strict"; +exports.__esModule = true; function foo() { return new Object(); } exports.foo = foo; -exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js index 298395a232c9c..8ba50dcee1c62 100644 --- a/tests/baselines/reference/classAbstractManyKeywords.js +++ b/tests/baselines/reference/classAbstractManyKeywords.js @@ -6,6 +6,7 @@ import abstract class D {} //// [classAbstractManyKeywords.js] "use strict"; +exports.__esModule = true; exports["default"] = abstract; var A = (function () { function A() { @@ -29,4 +30,3 @@ var D = (function () { } return D; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js index 8a648cc62cd49..933f92cad64fd 100644 --- a/tests/baselines/reference/classExtendsAcrossFiles.js +++ b/tests/baselines/reference/classExtendsAcrossFiles.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var a_1 = require("./a"); exports.b = { f: function () { @@ -49,7 +50,6 @@ exports.b = { a_1.a.f(); } }; -Object.defineProperty(exports, "__esModule", { value: true }); //// [a.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -62,6 +62,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var b_1 = require("./b"); exports.a = { f: function () { @@ -80,4 +81,3 @@ exports.a = { b_1.b.f(); } }; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js index ce46e75bed8c0..d4df05f2ea353 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js @@ -21,6 +21,7 @@ export class Test1 { var field1; //// [classMemberInitializerWithLamdaScoping3_1.js] "use strict"; +exports.__esModule = true; var Test1 = (function () { function Test1(field1) { this.field1 = field1; @@ -33,4 +34,3 @@ var Test1 = (function () { return Test1; }()); exports.Test1 = Test1; -exports.__esModule = true; diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js index 890d2bbd500b2..76835e757e074 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js @@ -20,6 +20,7 @@ export class Test1 { exports.__esModule = true; //// [classMemberInitializerWithLamdaScoping3_1.js] "use strict"; +exports.__esModule = true; var Test1 = (function () { function Test1(field1) { this.field1 = field1; @@ -30,4 +31,3 @@ var Test1 = (function () { return Test1; }()); exports.Test1 = Test1; -exports.__esModule = true; diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js index b6d3159b0f98d..487553bb00492 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js @@ -20,22 +20,23 @@ export function foo2() { //// [collisionExportsRequireAndAlias_file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function bar() { } exports.bar = bar; - exports.__esModule = true; }); //// [collisionExportsRequireAndAlias_file3333.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function bar2() { } exports.bar2 = bar2; - exports.__esModule = true; }); //// [collisionExportsRequireAndAlias_file2.js] define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) { "use strict"; + exports.__esModule = true; function foo() { require.bar(); } @@ -44,5 +45,4 @@ define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisio exports.bar2(); } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js index cbe0104ebce15..1a16f4a2d5f95 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js @@ -40,10 +40,10 @@ module m4 { //// [collisionExportsRequireAndAmbientClass_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientClass_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js index b931a6210cf87..0e717b01d3bd0 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js @@ -63,10 +63,10 @@ module m4 { //// [collisionExportsRequireAndAmbientEnum_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientEnum_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js index 5d462fb1ce2e5..050799d4c2b7b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js @@ -16,9 +16,9 @@ module m2 { //// [collisionExportsRequireAndAmbientFunction.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { var a = 10; })(m2 || (m2 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js index 045e7dcb796c2..2eb5ea74f920e 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js @@ -97,6 +97,7 @@ module m4 { //// [collisionExportsRequireAndAmbientModule_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { return null; } @@ -109,7 +110,6 @@ define(["require", "exports"], function (require, exports) { (function (m2) { var a = 10; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientModule_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js index a75732a65bab1..8454248845a61 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js @@ -29,11 +29,11 @@ module m4 { //// [collisionExportsRequireAndAmbientVar_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m2; (function (m2) { var a = 10; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndAmbientVar_globalFile.js] var m4; diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js index ca16128e9cd33..0bc56b97cf111 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndClass.js @@ -39,6 +39,7 @@ module m4 { //// [collisionExportsRequireAndClass_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var require = (function () { function require() { } @@ -79,7 +80,6 @@ define(["require", "exports"], function (require, exports) { }()); m2.exports = exports; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndClass_globalFile.js] var require = (function () { diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js index d6fb21ba60af3..4bb6614ffe768 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js @@ -63,6 +63,7 @@ module m4 { //// [collisionExportsRequireAndEnum_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var require; (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; @@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) { exports[exports["_thisVal2"] = 1] = "_thisVal2"; })(exports = m2.exports || (m2.exports = {})); })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndEnum_globalFile.js] var require; diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js index 7e538d462b2f3..1da8cf29d665f 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js @@ -25,6 +25,7 @@ module m2 { //// [collisionExportsRequireAndFunction.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function exports() { return 1; } @@ -53,5 +54,4 @@ define(["require", "exports"], function (require, exports) { } m2.require = require; })(m2 || (m2 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js index 7ac6ba06ed62a..9cb3c4e797e0e 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js @@ -25,6 +25,7 @@ module m2 { //// [collisionExportsRequireAndInternalModuleAlias.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m; (function (m) { var c = (function () { @@ -52,5 +53,4 @@ define(["require", "exports"], function (require, exports) { new m2.exports(); new m2.require(); })(m2 || (m2 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js index d1ca4d3a75cc3..4282095500408 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndModule.js @@ -94,6 +94,7 @@ module m4 { //// [collisionExportsRequireAndModule_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var require; (function (require) { var C = (function () { @@ -162,7 +163,6 @@ define(["require", "exports"], function (require, exports) { exports.C = C; })(exports = m2.exports || (m2.exports = {})); })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndModule_globalFile.js] var require; diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js index ba1926dd965b2..b9552c16223f2 100644 --- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js @@ -17,6 +17,7 @@ export function foo2(): exports.I { //// [collisionExportsRequireAndUninstantiatedModule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { return null; } @@ -25,5 +26,4 @@ define(["require", "exports"], function (require, exports) { return null; } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js index 9c7a24b176f7b..9a20472ea685b 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndVar.js @@ -29,6 +29,7 @@ module m4 { //// [collisionExportsRequireAndVar_externalmodule.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { } exports.foo = foo; @@ -44,7 +45,6 @@ define(["require", "exports"], function (require, exports) { m2.exports = 0; m2.require = "require"; })(m2 || (m2 = {})); - exports.__esModule = true; }); //// [collisionExportsRequireAndVar_globalFile.js] var exports = 0; diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js index 33ea3d7fcfbec..353b70f4d3c08 100644 --- a/tests/baselines/reference/commentOnExportEnumDeclaration.js +++ b/tests/baselines/reference/commentOnExportEnumDeclaration.js @@ -8,6 +8,7 @@ export enum Color { //// [commentOnExportEnumDeclaration.js] "use strict"; +exports.__esModule = true; /** * comment */ @@ -17,4 +18,3 @@ var Color; Color[Color["g"] = 1] = "g"; Color[Color["b"] = 2] = "b"; })(Color = exports.Color || (exports.Color = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js index cdba9542f544d..1c1df10403940 100644 --- a/tests/baselines/reference/commentsDottedModuleName.js +++ b/tests/baselines/reference/commentsDottedModuleName.js @@ -10,6 +10,7 @@ export module outerModule.InnerModule { //// [commentsDottedModuleName.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi declare module*/ var outerModule; (function (outerModule) { @@ -24,7 +25,6 @@ define(["require", "exports"], function (require, exports) { InnerModule.b = b; })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {})); })(outerModule = exports.outerModule || (exports.outerModule = {})); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index 57cc701941ab0..39002f90d9105 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -64,6 +64,7 @@ var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ var m1; (function (m1) { @@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) { })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules_0"], function (require, exports, extMod) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); extMod.m1.fooExport(); var newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); var newVar2 = new extMod.m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index 6ee404269948a..d06c588425fea 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -64,6 +64,7 @@ export var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules2_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ var m1; (function (m1) { @@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) { })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsExternalModules_1.js] define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); extMod.m1.fooExport(); exports.newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); exports.newVar2 = new extMod.m4.m2.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index ee48cfde32855..81e90a159d560 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules2_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ var m1; (function (m1) { @@ -123,16 +124,15 @@ var m4; })(m4 = exports.m4 || (exports.m4 = {})); m4.fooExport(); var myvar2 = new m4.m2.c(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [commentsExternalModules_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /**This is on import declaration*/ var extMod = require("./commentsExternalModules2_0"); // trailing comment 1 extMod.m1.fooExport(); exports.newVar = new extMod.m1.m2.c(); extMod.m4.fooExport(); exports.newVar2 = new extMod.m4.m2.c(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [commentsExternalModules2_0.d.ts] diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index 2c26b93b82df0..25dd8a907808a 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -39,6 +39,7 @@ new multiM.d(); //// [commentsMultiModuleMultiFile_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi declare module*/ var multiM; (function (multiM) { @@ -69,11 +70,11 @@ define(["require", "exports"], function (require, exports) { })(multiM = exports.multiM || (exports.multiM = {})); new multiM.b(); new multiM.c(); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [commentsMultiModuleMultiFile_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi module 3 comment*/ var multiM; (function (multiM) { @@ -93,7 +94,6 @@ define(["require", "exports"], function (require, exports) { multiM.f = f; })(multiM = exports.multiM || (exports.multiM = {})); new multiM.d(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js index 6feff1bd813ac..eee05c8049395 100644 --- a/tests/baselines/reference/commentsOnRequireStatement.js +++ b/tests/baselines/reference/commentsOnRequireStatement.js @@ -19,14 +19,15 @@ export {subject1} from './1'; //// [0.js] "use strict"; -exports.subject = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.subject = 10; //// [1.js] "use strict"; -exports.subject1 = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.subject1 = 10; //// [2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /* blah0 */ // blah // blah @@ -36,4 +37,3 @@ exports.subject = _0_1.subject; /* blah1 */ var _1_1 = require("./1"); exports.subject1 = _1_1.subject1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js index c1d2a303d7ad9..ee2846d4a6065 100644 --- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js @@ -15,6 +15,7 @@ if(foo.C1.s1){ //// [foo_0.js] "use strict"; +exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -23,10 +24,9 @@ var C1 = (function () { }()); C1.s1 = true; exports.C1 = C1; -exports.__esModule = true; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); if (foo.C1.s1) { } -exports.__esModule = true; diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index 1f37d83c81580..5ac0e3fcc649e 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -33,6 +33,7 @@ var e: number = 0; //// [foo_0.js] "use strict"; +exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -47,12 +48,11 @@ var E1; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; })(E1 = exports.E1 || (exports.E1 = {})); -exports.__esModule = true; //// [foo_1.js] "use strict"; +exports.__esModule = true; var i; var x = {}; var y = false; var z; var e = 0; -exports.__esModule = true; diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js index f1ec275cf73f7..ef6e97f4d5e76 100644 --- a/tests/baselines/reference/commonSourceDir5.js +++ b/tests/baselines/reference/commonSourceDir5.js @@ -19,18 +19,18 @@ export var y = x * i; //// [concat.js] define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, exports, bar_1, foo_1) { "use strict"; + exports.__esModule = true; exports.pi = Math.PI; exports.y = bar_1.x * foo_1.i; - exports.__esModule = true; }); define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) { "use strict"; + exports.__esModule = true; exports.i = Math.sqrt(-1); exports.z = baz_1.pi * baz_1.pi; - exports.__esModule = true; }); define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) { "use strict"; - exports.x = foo_2.z + foo_2.z; exports.__esModule = true; + exports.x = foo_2.z + foo_2.z; }); diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js index d52fde52cf2a0..071953afcdc76 100644 --- a/tests/baselines/reference/commonSourceDir6.js +++ b/tests/baselines/reference/commonSourceDir6.js @@ -18,18 +18,18 @@ export var y = x * i; //// [concat.js] define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, exports, bar_1, foo_1) { "use strict"; + exports.__esModule = true; exports.pi = Math.PI; exports.y = bar_1.x * foo_1.i; - exports.__esModule = true; }); define("a/foo", ["require", "exports", "baz"], function (require, exports, baz_1) { "use strict"; + exports.__esModule = true; exports.i = Math.sqrt(-1); exports.z = baz_1.pi * baz_1.pi; - exports.__esModule = true; }); define("a/bar", ["require", "exports", "a/foo"], function (require, exports, foo_2) { "use strict"; - exports.x = foo_2.z + foo_2.z; exports.__esModule = true; + exports.x = foo_2.z + foo_2.z; }); diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js index 08e628cac2a94..5569ae6d52b77 100644 --- a/tests/baselines/reference/commonSourceDirectory.js +++ b/tests/baselines/reference/commonSourceDirectory.js @@ -19,11 +19,11 @@ x + y; //// [/app/bin/index.js] "use strict"; +exports.__esModule = true; /// var foo_1 = require("foo"); var bar_1 = require("bar"); foo_1.x + bar_1.y; -exports.__esModule = true; //# sourceMappingURL=/app/myMapRoot/index.js.map //// [/app/bin/index.d.ts] diff --git a/tests/baselines/reference/commonSourceDirectory.js.map b/tests/baselines/reference/commonSourceDirectory.js.map index 8e3f925eee953..fd88719859b7a 100644 --- a/tests/baselines/reference/commonSourceDirectory.js.map +++ b/tests/baselines/reference/commonSourceDirectory.js.map @@ -1,2 +1,2 @@ //// [/app/bin/index.js.map] -{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt index 5675c05e34b01..c880d2d0059fb 100644 --- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt +++ b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt @@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js sourceFile:index.ts ------------------------------------------------------------------- >>>"use strict"; +>>>exports.__esModule = true; >>>/// 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 >/// -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 42) Source(1, 42) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 42) Source(1, 42) + SourceIndex(0) --- >>>var foo_1 = require("foo"); 1 > @@ -24,8 +25,8 @@ sourceFile:index.ts 1 > > 2 >import { x } from "foo"; -1 >Emitted(3, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 28) Source(2, 25) + SourceIndex(0) +1 >Emitted(4, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 28) Source(2, 25) + SourceIndex(0) --- >>>var bar_1 = require("bar"); 1-> @@ -33,8 +34,8 @@ sourceFile:index.ts 1-> > 2 >import { y } from "bar"; -1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(4, 28) Source(3, 25) + SourceIndex(0) +1->Emitted(5, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(5, 28) Source(3, 25) + SourceIndex(0) --- >>>foo_1.x + bar_1.y; 1 > @@ -42,18 +43,17 @@ sourceFile:index.ts 3 > ^^^ 4 > ^^^^^^^ 5 > ^ -6 > ^^^^^^^^^-> +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >x 3 > + 4 > y 5 > ; -1 >Emitted(5, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(5, 8) Source(4, 2) + SourceIndex(0) -3 >Emitted(5, 11) Source(4, 5) + SourceIndex(0) -4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0) -5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0) +1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(6, 8) Source(4, 2) + SourceIndex(0) +3 >Emitted(6, 11) Source(4, 5) + SourceIndex(0) +4 >Emitted(6, 18) Source(4, 6) + SourceIndex(0) +5 >Emitted(6, 19) Source(4, 7) + SourceIndex(0) --- ->>>exports.__esModule = true; >>>//# sourceMappingURL=/app/myMapRoot/index.js.map \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js index e49192dbe2f67..249edecedddaa 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.js +++ b/tests/baselines/reference/commonSourceDirectory_dts.js @@ -12,9 +12,9 @@ export const x = y; //// [/app/bin/index.js] "use strict"; +exports.__esModule = true; /// exports.x = y; -exports.__esModule = true; //# sourceMappingURL=/app/myMapRoot/index.js.map //// [/app/bin/index.d.ts] diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map index b33518dd04cae..552da577884d8 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.js.map +++ b/tests/baselines/reference/commonSourceDirectory_dts.js.map @@ -1,2 +1,2 @@ //// [/app/bin/index.js.map] -{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt index ccbbc89465d9c..925a3d30ed4a2 100644 --- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt +++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt @@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js sourceFile:index.ts ------------------------------------------------------------------- >>>"use strict"; +>>>exports.__esModule = true; >>>/// 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 >/// -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 41) Source(1, 41) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 41) Source(1, 41) + SourceIndex(0) --- >>>exports.x = y; 1 > @@ -24,7 +25,7 @@ sourceFile:index.ts 4 > ^^^ 5 > ^ 6 > ^ -7 > ^^^^^^^^^^^^^-> +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >export const 2 > @@ -32,12 +33,11 @@ sourceFile:index.ts 4 > = 5 > y 6 > ; -1 >Emitted(3, 1) Source(2, 14) + SourceIndex(0) -2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0) -3 >Emitted(3, 10) Source(2, 15) + SourceIndex(0) -4 >Emitted(3, 13) Source(2, 18) + SourceIndex(0) -5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0) -6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0) +1 >Emitted(4, 1) Source(2, 14) + SourceIndex(0) +2 >Emitted(4, 9) Source(2, 14) + SourceIndex(0) +3 >Emitted(4, 10) Source(2, 15) + SourceIndex(0) +4 >Emitted(4, 13) Source(2, 18) + SourceIndex(0) +5 >Emitted(4, 14) Source(2, 19) + SourceIndex(0) +6 >Emitted(4, 15) Source(2, 20) + SourceIndex(0) --- ->>>exports.__esModule = true; >>>//# sourceMappingURL=/app/myMapRoot/index.js.map \ No newline at end of file diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js index da7c571061040..e7a251e9cee3c 100644 --- a/tests/baselines/reference/commonjsSafeImport.js +++ b/tests/baselines/reference/commonjsSafeImport.js @@ -12,14 +12,14 @@ Foo(); //// [10_lib.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function Foo() { } exports.Foo = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var _10_lib_1 = require("./10_lib"); _10_lib_1.Foo(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [10_lib.d.ts] diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js index 5c665a52cb304..4408d64acbfdf 100644 --- a/tests/baselines/reference/complexNarrowingWithAny.js +++ b/tests/baselines/reference/complexNarrowingWithAny.js @@ -562,6 +562,7 @@ export function viewFactory_AppComponent0(viewUtils:any,parentInjector:any,decla //// [complexNarrowingWithAny.js] // Repro from #10869 "use strict"; +exports.__esModule = true; /** * This file is generated by the Angular 2 template compiler. * Do not edit. @@ -1025,4 +1026,3 @@ function viewFactory_AppComponent0(viewUtils, parentInjector, declarationEl) { return new _View_AppComponent0(viewUtils, parentInjector, declarationEl); } exports.viewFactory_AppComponent0 = viewFactory_AppComponent0; -exports.__esModule = true; diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js index 9c7c78ad6261b..f02b9611541f6 100644 --- a/tests/baselines/reference/constDeclarations-access5.js +++ b/tests/baselines/reference/constDeclarations-access5.js @@ -51,12 +51,13 @@ m.x.toString(); //// [constDeclarations_access_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 0; Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = 0; }); //// [constDeclarations_access_2.js] define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); // Errors m.x = 1; m.x += 2; @@ -87,5 +88,4 @@ define(["require", "exports", "constDeclarations_access_1"], function (require, -m.x; +m.x; m.x.toString(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js index e658dc1734760..8ea5625ac0797 100644 --- a/tests/baselines/reference/constEnumExternalModule.js +++ b/tests/baselines/reference/constEnumExternalModule.js @@ -18,6 +18,6 @@ define(["require", "exports"], function (require, exports) { //// [m2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var v = 100 /* V */; exports.__esModule = true; + var v = 100 /* V */; }); diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js index 8b65f916dfaba..752479cf4e9b2 100644 --- a/tests/baselines/reference/controlFlowBinaryOrExpression.js +++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js @@ -38,6 +38,7 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) { //// [controlFlowBinaryOrExpression.js] "use strict"; +exports.__esModule = true; var x; var cond; (x = "") || (x = 0); @@ -55,4 +56,3 @@ if (isHTMLCollection(sourceObj)) { if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) { sourceObj.length; } -exports.__esModule = true; diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js index be61fc2c75a58..27fce9a9a1288 100644 --- a/tests/baselines/reference/controlFlowPropertyDeclarations.js +++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js @@ -151,6 +151,7 @@ export class StyleParser { //// [controlFlowPropertyDeclarations.js] // Repro from ##8913 "use strict"; +exports.__esModule = true; var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig'); // Populate property map with ReactJS's attribute and property mappings // TODO handle/use .Properties value eg: MUST_USE_PROPERTY is not HTML attr @@ -289,4 +290,3 @@ var StyleParser = (function () { return StyleParser; }()); exports.StyleParser = StyleParser; -exports.__esModule = true; diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js index d1422112fff8f..0a7eff198ff81 100644 --- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js +++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js @@ -104,6 +104,7 @@ export default md5; //// [controlFlowSelfReferentialLoop.js] // Repro from #12319 "use strict"; +exports.__esModule = true; function md5(string) { function FF(a, b, c, d, x, s, ac) { return 0; @@ -204,4 +205,3 @@ function md5(string) { } } exports["default"] = md5; -exports.__esModule = true; diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js index 7fa40a63a1082..f7c1ac602dd6d 100644 --- a/tests/baselines/reference/copyrightWithNewLine1.js +++ b/tests/baselines/reference/copyrightWithNewLine1.js @@ -15,9 +15,9 @@ greeter.start(); ****************************/ define(["require", "exports", "./greeter"], function (require, exports, model) { "use strict"; + exports.__esModule = true; var el = document.getElementById('content'); var greeter = new model.Greeter(el); /** things */ greeter.start(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js index 4b31d5997134b..0f479c3db7f26 100644 --- a/tests/baselines/reference/copyrightWithoutNewLine1.js +++ b/tests/baselines/reference/copyrightWithoutNewLine1.js @@ -11,9 +11,9 @@ greeter.start(); //// [copyrightWithoutNewLine1.js] define(["require", "exports", "./greeter"], function (require, exports, model) { "use strict"; + exports.__esModule = true; var el = document.getElementById('content'); var greeter = new model.Greeter(el); /** things */ greeter.start(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js index 67eba038d46e5..d555d3f3bcafe 100644 --- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js @@ -15,6 +15,7 @@ export var compileServer = task(() => { //// [crashIntypeCheckInvocationExpression.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var nake; function doCompile(fileset, moduleType) { return undefined; @@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) { var folder = path.join(), fileset = nake.fileSetSync(folder); return doCompile(fileset, moduleType); }); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js index 48fe4dad45fe0..a115e7ab0a3aa 100644 --- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js +++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js @@ -11,6 +11,7 @@ export class BuildWorkspaceService { //// [crashIntypeCheckObjectCreationExpression.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var BuildWorkspaceService = (function () { function BuildWorkspaceService() { } @@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) { return BuildWorkspaceService; }()); exports.BuildWorkspaceService = BuildWorkspaceService; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js index b0cc0c8fbaa56..64a99bb84382c 100644 --- a/tests/baselines/reference/declFileAccessors.js +++ b/tests/baselines/reference/declFileAccessors.js @@ -103,6 +103,7 @@ class c2 { //// [declFileAccessors_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /** This is comment for c1*/ var c1 = (function () { function c1() { @@ -185,7 +186,6 @@ var c1 = (function () { return c1; }()); exports.c1 = c1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileAccessors_1.js] /** This is comment for c2 - the global class*/ var c2 = (function () { diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js index f89863a302971..56b8992811b39 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js @@ -10,18 +10,18 @@ import foo = require("./declFileAliasUseBeforeDeclaration_foo"); //// [declFileAliasUseBeforeDeclaration_foo.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; //// [declFileAliasUseBeforeDeclaration_test.js] "use strict"; +exports.__esModule = true; function bar(a) { } exports.bar = bar; -exports.__esModule = true; //// [declFileAliasUseBeforeDeclaration_foo.d.ts] diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js index 218157185afaf..ee1964415c910 100644 --- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js +++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js @@ -8,6 +8,7 @@ export class Enhancement { //// [declFileClassWithStaticMethodReturningConstructor.js] "use strict"; +exports.__esModule = true; var Enhancement = (function () { function Enhancement() { } @@ -17,7 +18,6 @@ var Enhancement = (function () { return Enhancement; }()); exports.Enhancement = Enhancement; -exports.__esModule = true; //// [declFileClassWithStaticMethodReturningConstructor.d.ts] diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js index 87cf77e733ede..214620193b796 100644 --- a/tests/baselines/reference/declFileConstructors.js +++ b/tests/baselines/reference/declFileConstructors.js @@ -99,6 +99,7 @@ class GlobalConstructorWithParameterInitializer { //// [declFileConstructors_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SimpleConstructor = (function () { /** This comment should appear for foo*/ function SimpleConstructor() { @@ -162,7 +163,6 @@ var ConstructorWithParameterInitializer = (function () { return ConstructorWithParameterInitializer; }()); exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileConstructors_1.js] var GlobalSimpleConstructor = (function () { /** This comment should appear for foo*/ diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js index e9d140ae2e2aa..1caa920719377 100644 --- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js +++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js @@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) { //// [declFileExportAssignmentOfGenericInterface_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x.a; exports.__esModule = true; + exports.x.a; }); diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index a03fa43afff3e..2af2103b62a62 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -44,8 +44,8 @@ define(["require", "exports"], function (require, exports) { //// [declFileExportImportChain_b.js] define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) { "use strict"; - exports.a = a; exports.__esModule = true; + exports.a = a; }); //// [declFileExportImportChain_b1.js] define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) { @@ -55,8 +55,8 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require, //// [declFileExportImportChain_c.js] define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) { "use strict"; - exports.b1 = b1; exports.__esModule = true; + exports.b1 = b1; }); //// [declFileExportImportChain_d.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index c7feeec7e8ccb..70478fdf43028 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -46,8 +46,8 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require //// [declFileExportImportChain2_c.js] define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) { "use strict"; - exports.b = b; exports.__esModule = true; + exports.b = b; }); //// [declFileExportImportChain2_d.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js index 0bb2c7dfe55f3..809f01878d4a9 100644 --- a/tests/baselines/reference/declFileForExportedImport.js +++ b/tests/baselines/reference/declFileForExportedImport.js @@ -16,12 +16,12 @@ var z = b.x; exports.__esModule = true; //// [declFileForExportedImport_1.js] "use strict"; +exports.__esModule = true; /// exports.a = require("./declFileForExportedImport_0"); var y = exports.a.x; exports.b = exports.a; var z = exports.b.x; -exports.__esModule = true; //// [declFileForExportedImport_0.d.ts] diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js index c93dee4e30ea0..f62b7772b41ae 100644 --- a/tests/baselines/reference/declFileFunctions.js +++ b/tests/baselines/reference/declFileFunctions.js @@ -79,6 +79,7 @@ function globalfooWithOverloads(a: any): any { //// [declFileFunctions_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /** This comment should appear for foo*/ function foo() { } @@ -145,7 +146,6 @@ function nonExportedFooWithRestParameters(a) { function nonExportedFooWithOverloads(a) { return a; } -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileFunctions_1.js] /** This comment should appear for foo*/ function globalfoo() { diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index ab3fc63f450e3..f56abaf6b97d7 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -51,6 +51,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var C; (function (C) { var A = (function () { @@ -102,7 +103,6 @@ var h = (function (_super) { }(C.A)); exports.h = h; exports.j = C.F6; -exports.__esModule = true; //// [declFileGenericType.d.ts] diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index d1d9589e8c753..110539774df5a 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -32,11 +32,11 @@ var m2; module.exports = m2; //// [declFileImportModuleWithExportAssignment_1.js] "use strict"; +exports.__esModule = true; /**This is on import declaration*/ var a1 = require("./declFileImportModuleWithExportAssignment_0"); exports.a = a1; exports.a.test1(null, null, null); -exports.__esModule = true; //// [declFileImportModuleWithExportAssignment_0.d.ts] diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js index dee10473f2cac..61e2bfab70015 100644 --- a/tests/baselines/reference/declFileMethods.js +++ b/tests/baselines/reference/declFileMethods.js @@ -192,6 +192,7 @@ interface I2 { //// [declFileMethods_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c1 = (function () { function c1() { } @@ -274,7 +275,6 @@ var c1 = (function () { return c1; }()); exports.c1 = c1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declFileMethods_1.js] var c2 = (function () { function c2() { diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js index 35a861a60469b..698622a86500f 100644 --- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js @@ -38,6 +38,7 @@ export class C4 { //// [declarationEmitClassMemberNameConflict.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var C1 = (function () { function C1() { } @@ -91,7 +92,6 @@ var C4 = (function () { return C4; }()); exports.C4 = C4; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declarationEmitClassMemberNameConflict.d.ts] diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js index 5557ff7102049..223376ef8ffd9 100644 --- a/tests/baselines/reference/declarationEmitExportAssignment.js +++ b/tests/baselines/reference/declarationEmitExportAssignment.js @@ -12,11 +12,11 @@ export = foo; //// [utils.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; -Object.defineProperty(exports, "__esModule", { value: true }); //// [index.js] "use strict"; var utils_1 = require("./utils"); diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js index e019203030ee4..57c39b95e6448 100644 --- a/tests/baselines/reference/declarationEmitExportDeclaration.js +++ b/tests/baselines/reference/declarationEmitExportDeclaration.js @@ -15,18 +15,18 @@ export {bar}; //// [utils.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.foo = foo; function bar() { } exports.bar = bar; -Object.defineProperty(exports, "__esModule", { value: true }); //// [index.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var utils_1 = require("./utils"); exports.bar = utils_1.bar; utils_1.foo(); var obj; -Object.defineProperty(exports, "__esModule", { value: true }); //// [utils.d.ts] diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js index a1e3aac882358..a02eac46dba20 100644 --- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js @@ -55,6 +55,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var ExportedClass = (function () { function ExportedClass() { } @@ -104,4 +105,3 @@ var MyClass4 = (function (_super) { return MyClass4; }(getExportedClass(undefined))); exports.MyClass4 = MyClass4; -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js index 87141cfb69943..08208c2435d38 100644 --- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js +++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js @@ -6,11 +6,11 @@ export function f(x: any): x is number { //// [declarationEmitIdentifierPredicates01.js] "use strict"; +exports.__esModule = true; function f(x) { return typeof x === "number"; } exports.f = f; -exports.__esModule = true; //// [declarationEmitIdentifierPredicates01.d.ts] diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js index f20654d508c53..5829e9b4427f0 100644 --- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js +++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js @@ -10,8 +10,8 @@ export function f(x: any): x is I { //// [declarationEmitIdentifierPredicatesWithPrivateName01.js] "use strict"; +exports.__esModule = true; function f(x) { return typeof x.a === "number"; } exports.f = f; -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js index 555006528303f..608f172cd1f7f 100644 --- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js +++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js @@ -9,13 +9,13 @@ export default { //// [declarationEmitInferedDefaultExportType.js] "use strict"; +exports.__esModule = true; // test.ts exports["default"] = { foo: [], bar: undefined, baz: null }; -exports.__esModule = true; //// [declarationEmitInferedDefaultExportType.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js index dca7f142dc9cb..4e41c8558c697 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js @@ -14,15 +14,15 @@ export { v } //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js index 9228b766d3ffe..601026ab6f3bf 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js @@ -17,19 +17,19 @@ export { v, bar } //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; function bar() { return v; } exports.bar = bar; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js index 8b2783a73fdfc..30df7e38b0139 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js @@ -14,15 +14,15 @@ export default x; //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var x = "hi" || 5; exports["default"] = x; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js index 3020721dfc8cc..24f2a52c5d8ea 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js @@ -13,14 +13,14 @@ export { v } //// [0.js] "use strict"; -var obj = true; exports.__esModule = true; +var obj = true; //// [1.js] "use strict"; +exports.__esModule = true; //let v2: Z.Data; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js index c7be3aca6b4ec..5b14a3738e413 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js @@ -14,15 +14,15 @@ export { v } //// [0.js] "use strict"; +exports.__esModule = true; { var obj = true; } -exports.__esModule = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js index 2177a17efa548..9a9b1247e24d3 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js @@ -11,13 +11,13 @@ export { v } //// [0.js] "use strict"; -var obj = true; exports.__esModule = true; +var obj = true; //// [1.js] "use strict"; +exports.__esModule = true; var v = "str" || true; exports.v = v; -exports.__esModule = true; //// [0.d.ts] diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js index 70560f5a54d5b..cddb463074098 100644 --- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js +++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js @@ -9,12 +9,12 @@ export function returnSomeGlobalValue() { //// [declarationEmitInferedTypeAlias9.js] "use strict"; +exports.__esModule = true; var x; function returnSomeGlobalValue() { return x; } exports.returnSomeGlobalValue = returnSomeGlobalValue; -exports.__esModule = true; //// [declarationEmitInferedTypeAlias9.d.ts] diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js index 4188b673b0bd3..d4280cd00c672 100644 --- a/tests/baselines/reference/declarationEmitInvalidExport.js +++ b/tests/baselines/reference/declarationEmitInvalidExport.js @@ -9,7 +9,7 @@ export type MyClass = typeof myClass; //// [declarationEmitInvalidExport.js] "use strict"; +exports.__esModule = true; if (false) { export var myClass = 0; } -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js index 08747bbe198a4..5440f3d358400 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.js +++ b/tests/baselines/reference/declarationEmitNameConflicts.js @@ -63,6 +63,7 @@ var f; module.exports = f; //// [declarationEmit_nameConflicts_0.js] "use strict"; +exports.__esModule = true; var im = require("./declarationEmit_nameConflicts_1"); var M; (function (M) { @@ -129,7 +130,6 @@ var M; })(N = Q.N || (Q.N = {})); })(Q = M.Q || (M.Q = {})); })(M = exports.M || (exports.M = {})); -exports.__esModule = true; //// [declarationEmit_nameConflicts_1.d.ts] diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js index e5c10ab348433..4b4aca4f4b2d3 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js @@ -8,10 +8,10 @@ export module M { //// [declarationEmitNameConflictsWithAlias.js] "use strict"; +exports.__esModule = true; var M; (function (M) { })(M = exports.M || (exports.M = {})); -exports.__esModule = true; //// [declarationEmitNameConflictsWithAlias.d.ts] diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js index 4f56ad9186497..7444a956a2add 100644 --- a/tests/baselines/reference/declarationEmitPromise.js +++ b/tests/baselines/reference/declarationEmitPromise.js @@ -32,6 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); class bluebird { } exports.bluebird = bluebird; @@ -53,7 +54,6 @@ function runSampleBreaks(a, b, c, d, e) { }); } exports.runSampleBreaks = runSampleBreaks; -Object.defineProperty(exports, "__esModule", { value: true }); //// [declarationEmitPromise.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js index 2845a120b7485..e95a7db05edd7 100644 --- a/tests/baselines/reference/declarationEmitThisPredicates01.js +++ b/tests/baselines/reference/declarationEmitThisPredicates01.js @@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var C = (function () { function C() { } @@ -38,7 +39,6 @@ var D = (function (_super) { return D; }(C)); exports.D = D; -exports.__esModule = true; //// [declarationEmitThisPredicates01.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js index b9a81b2fb8e4d..0e7c99df1f32c 100644 --- a/tests/baselines/reference/declarationEmitThisPredicates02.js +++ b/tests/baselines/reference/declarationEmitThisPredicates02.js @@ -15,13 +15,13 @@ export const obj = { //// [declarationEmitThisPredicates02.js] "use strict"; +exports.__esModule = true; exports.obj = { m: function () { var dis = this; return dis.a != null && dis.b != null && dis.c != null; } }; -exports.__esModule = true; //// [declarationEmitThisPredicates02.d.ts] diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js index 16ae267bc3c16..a0f611d2d29a3 100644 --- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js +++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js @@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var C = (function () { function C() { } @@ -37,4 +38,3 @@ var D = (function (_super) { } return D; }(C)); -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js index fcc373ccbe8bb..7ec7ba5dec8a0 100644 --- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js +++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js @@ -15,10 +15,10 @@ export const obj = { //// [declarationEmitThisPredicatesWithPrivateName02.js] "use strict"; +exports.__esModule = true; exports.obj = { m: function () { var dis = this; return dis.a != null && dis.b != null && dis.c != null; } }; -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js index 303959f55042e..84b55a9792fb2 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js @@ -6,8 +6,8 @@ export const y = (x: Foo) => 1 //// [declarationEmitTypeAliasWithTypeParameters1.js] "use strict"; -exports.y = function (x) { return 1; }; exports.__esModule = true; +exports.y = function (x) { return 1; }; //// [declarationEmitTypeAliasWithTypeParameters1.d.ts] diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js index 52f696a9448d8..1bb6beac9e1f5 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js @@ -7,8 +7,8 @@ export const y = (x: Baa) => 1 //// [declarationEmitTypeAliasWithTypeParameters2.js] "use strict"; -exports.y = function (x) { return 1; }; exports.__esModule = true; +exports.y = function (x) { return 1; }; //// [declarationEmitTypeAliasWithTypeParameters2.d.ts] diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js index e6ef1234c3a99..28997a754965a 100644 --- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js +++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js @@ -12,7 +12,7 @@ function foo() { //// [declarationEmitTypeAliasWithTypeParameters5.js] "use strict"; +exports.__esModule = true; function foo() { return {}; } -exports.__esModule = true; diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js index 686ed8dce2c9d..1ac1e934578e5 100644 --- a/tests/baselines/reference/declarationEmitUnknownImport.js +++ b/tests/baselines/reference/declarationEmitUnknownImport.js @@ -5,6 +5,6 @@ export {Foo} //// [declarationEmitUnknownImport.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Foo = SomeNonExistingName; exports.Foo = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js index 10b8b1b98867a..1f291312913c2 100644 --- a/tests/baselines/reference/declarationEmitUnknownImport2.js +++ b/tests/baselines/reference/declarationEmitUnknownImport2.js @@ -5,7 +5,7 @@ export default Foo //// [declarationEmitUnknownImport2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Foo = From; './Foo'; // Syntax error exports.default = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js index a08b36e278195..64a6cf2d84910 100644 --- a/tests/baselines/reference/declarationMerging2.js +++ b/tests/baselines/reference/declarationMerging2.js @@ -18,6 +18,7 @@ declare module "./a" { //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } @@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; - exports.__esModule = true; }); //// [b.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js index d0e8504713dd0..b624c11e79d3b 100644 --- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js +++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js @@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); let Testing123 = Testing123_1 = class Testing123 { }; Testing123.prop1 = Testing123_1.prop0; @@ -22,4 +23,3 @@ Testing123 = Testing123_1 = __decorate([ ], Testing123); exports.Testing123 = Testing123; var Testing123_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js index 3e24af5f427ad..978d8f1840291 100644 --- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js +++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js @@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); let Testing123 = Testing123_1 = class Testing123 { }; Testing123 = Testing123_1 = __decorate([ @@ -20,4 +21,3 @@ Testing123 = Testing123_1 = __decorate([ ], Testing123); exports.Testing123 = Testing123; var Testing123_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js index bf5e9e5dcfc23..dadaa5ed6df1b 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js @@ -22,6 +22,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, }; define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let Foo = class Foo { }; @@ -29,7 +30,6 @@ define(["require", "exports"], function (require, exports) { decorator ], Foo); exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -40,6 +40,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, }; define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let default_1 = class { }; @@ -47,5 +48,4 @@ define(["require", "exports"], function (require, exports) { decorator ], default_1); exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js index fe62d15c27fdb..f6c7b7cbc8b80 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js @@ -21,6 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let Foo = class Foo { }; @@ -28,7 +29,6 @@ Foo = __decorate([ decorator ], Foo); exports.default = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -37,6 +37,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let default_1 = class { }; @@ -44,4 +45,3 @@ default_1 = __decorate([ decorator ], default_1); exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js index e6f4773df7dec..beb5fa26755ef 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js @@ -30,6 +30,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let Foo = class Foo { }; @@ -37,7 +38,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, decorator ], Foo); exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -56,6 +56,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var decorator; let default_1 = class { }; @@ -63,5 +64,4 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, decorator ], default_1); exports.default = default_1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js index 8c4bb8c12661b..22e4a448f1e0b 100644 --- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js +++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js @@ -23,9 +23,9 @@ class Wat { //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); // from #3108 exports.test = 'abc'; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -34,6 +34,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var a_1 = require("./a"); function filter(handler) { return function (target, propertyKey) { @@ -51,4 +52,3 @@ var Wat = (function () { __decorate([ filter(function () { return a_1.test == 'abc'; }) ], Wat, "whatever", null); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js index 50dbe2cafdc1c..9998ae3d08a89 100644 --- a/tests/baselines/reference/decoratorMetadata.js +++ b/tests/baselines/reference/decoratorMetadata.js @@ -20,13 +20,13 @@ class MyComponent { //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Service = (function () { function Service() { } return Service; }()); exports.default = Service; -Object.defineProperty(exports, "__esModule", { value: true }); //// [component.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -38,6 +38,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var service_1 = require("./service"); var MyComponent = (function () { function MyComponent(Service) { @@ -57,4 +58,3 @@ MyComponent = __decorate([ decorator, __metadata("design:paramtypes", [service_1.default]) ], MyComponent); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js index 653bc911ed492..6f2476377293e 100644 --- a/tests/baselines/reference/decoratorMetadataOnInferredType.js +++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js @@ -19,6 +19,7 @@ export class B { //// [decoratorMetadataOnInferredType.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { console.log('new A'); @@ -38,4 +39,3 @@ __decorate([ __metadata("design:type", Object) ], B.prototype, "x", void 0); exports.B = B; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js index 9cbc514d932e0..a65ba5b2f7388 100644 --- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js +++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js @@ -42,31 +42,31 @@ export class ClassA { //// [aux.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SomeClass = (function () { function SomeClass() { } return SomeClass; }()); exports.SomeClass = SomeClass; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aux1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SomeClass1 = (function () { function SomeClass1() { } return SomeClass1; }()); exports.SomeClass1 = SomeClass1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [aux2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var SomeClass2 = (function () { function SomeClass2() { } return SomeClass2; }()); exports.SomeClass2 = SomeClass2; -Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -78,6 +78,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var aux_1 = require("./aux"); var aux1_1 = require("./aux1"); function annotation() { @@ -113,4 +114,3 @@ ClassA = __decorate([ __metadata("design:paramtypes", [aux_1.SomeClass]) ], ClassA); exports.ClassA = ClassA; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js index 91c3814774ccb..10aa42ddce7da 100644 --- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js +++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js @@ -19,6 +19,7 @@ export class B { //// [decoratorMetadataWithConstructorType.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { console.log('new A'); @@ -38,4 +39,3 @@ __decorate([ __metadata("design:type", A) ], B.prototype, "x", void 0); exports.B = B; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js index e2cd357f14a32..b0e23a78971a6 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js index 19c8bafa4c199..f03190cff0c09 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js index 63177201f1d0a..c1eca0815274b 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js index 1979adf9c82ae..7d78cf7adbe7e 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); // error no default export function someDecorator(target) { return target; @@ -53,4 +54,3 @@ MyClass = __decorate([ ], MyClass); exports.MyClass = MyClass; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js index f3f82342fad31..3f7069902ce1b 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.default = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.default]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js index 34f63af38eaa3..66eb30dc7105d 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.default = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [db_1.default]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js index 4b0d77b9d2f92..1dd09c3a1775f 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.default = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [Object]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js index a587baf1d05f4..830e6bc80ee63 100644 --- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js +++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js @@ -25,6 +25,7 @@ export {MyClass}; //// [db.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db = (function () { function db() { } @@ -33,9 +34,9 @@ var db = (function () { return db; }()); exports.db = db; -Object.defineProperty(exports, "__esModule", { value: true }); //// [service.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var database = require("./db"); function someDecorator(target) { return target; @@ -52,4 +53,3 @@ MyClass = __decorate([ __metadata("design:paramtypes", [database.db]) ], MyClass); exports.MyClass = MyClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js index 6ec7a58da6627..77020e7cb7739 100644 --- a/tests/baselines/reference/decoratorOnClass2.js +++ b/tests/baselines/reference/decoratorOnClass2.js @@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, 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; }; +Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -22,4 +23,3 @@ C = __decorate([ dec ], C); exports.C = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js index 0e289d51c7117..2af3b0426dc02 100644 --- a/tests/baselines/reference/decoratorOnClassConstructor2.js +++ b/tests/baselines/reference/decoratorOnClassConstructor2.js @@ -16,6 +16,7 @@ export class C extends base{ //// [0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var base = (function () { function base() { } @@ -24,7 +25,6 @@ var base = (function () { exports.base = base; function foo(target, propertyKey, parameterIndex) { } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [2.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -46,6 +46,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __param = (this && this.__param) || function (paramIndex, decorator) { return function (target, key) { decorator(target, key, paramIndex); } }; +Object.defineProperty(exports, "__esModule", { value: true }); var _0_ts_1 = require("./0.ts"); var _0_ts_2 = require("./0.ts"); var C = (function (_super) { @@ -59,4 +60,3 @@ C = __decorate([ __param(0, _0_ts_2.foo) ], C); exports.C = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js index 518ddee0a813a..4ed401284a9f5 100644 --- a/tests/baselines/reference/decoratorOnClassConstructor3.js +++ b/tests/baselines/reference/decoratorOnClassConstructor3.js @@ -18,6 +18,7 @@ export class C extends base{ //// [0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var base = (function () { function base() { } @@ -26,7 +27,6 @@ var base = (function () { exports.base = base; function foo(target, propertyKey, parameterIndex) { } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [2.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -48,6 +48,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __param = (this && this.__param) || function (paramIndex, decorator) { return function (target, key) { decorator(target, key, paramIndex); } }; +Object.defineProperty(exports, "__esModule", { value: true }); var _0_1 = require("./0"); var _0_2 = require("./0"); /* Comment on the Class Declaration */ @@ -62,4 +63,3 @@ C = __decorate([ __param(0, _0_2.foo) ], C); exports.C = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js index cba3d6e115c5b..6a31461fe3cf2 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression01.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js @@ -23,9 +23,9 @@ import x from './a'; } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); const x = new Promise((resolve, reject) => { resolve({}); }); exports.default = x; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -46,11 +46,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); const a_1 = require("./a"); (function () { return __awaiter(this, void 0, void 0, function* () { const value = yield a_1.default; }); }()); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js index ea597359a03c6..565cfb416175c 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression02.js +++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js @@ -14,9 +14,9 @@ import x from './a'; //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const x = new Promise((resolve, reject) => { resolve({}); }); exports.default = x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -27,10 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); const a_1 = require("./a"); (function () { return __awaiter(this, void 0, void 0, function* () { const value = yield a_1.default; }); }()); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js index d74cc416e28d5..a273b8916792a 100644 --- a/tests/baselines/reference/defaultExportWithOverloads01.js +++ b/tests/baselines/reference/defaultExportWithOverloads01.js @@ -7,6 +7,7 @@ export default function f(...args: any[]) { //// [defaultExportWithOverloads01.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { var args = []; for (var _i = 0; _i < arguments.length; _i++) { @@ -14,4 +15,3 @@ function f() { } } exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js index bd186fa279d73..aaadfaefebbfd 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge01.js +++ b/tests/baselines/reference/defaultExportsCannotMerge01.js @@ -32,6 +32,7 @@ Entity.y; //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function Decl() { return 0; } @@ -41,13 +42,12 @@ var Decl; Decl.x = 10; Decl.y = 20; })(Decl = exports.Decl || (exports.Decl = {})); -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("m1"); m1_1.default(); var x; var y; m1_1.default.x; m1_1.default.y; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js index 7b26a1aa59f12..b83d54548ca6b 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge02.js +++ b/tests/baselines/reference/defaultExportsCannotMerge02.js @@ -27,19 +27,19 @@ var sum = z.p1 + z.p2 //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Decl = (function () { function Decl() { } return Decl; }()); exports.default = Decl; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("m1"); m1_1.default(); var x; var y; var z = new m1_1.default(); var sum = z.p1 + z.p2; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js index 1b2e53f03046b..254723ec5f1f5 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge03.js +++ b/tests/baselines/reference/defaultExportsCannotMerge03.js @@ -27,19 +27,19 @@ var sum = z.p1 + z.p2 //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Decl = (function () { function Decl() { } return Decl; }()); exports.default = Decl; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("m1"); m1_1.default(); var x; var y; var z = new m1_1.default(); var sum = z.p1 + z.p2; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js index baade8572964f..38ab4861c62b0 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge04.js +++ b/tests/baselines/reference/defaultExportsCannotMerge04.js @@ -15,10 +15,10 @@ export interface Foo { //// [defaultExportsCannotMerge04.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function Foo() { } exports.default = Foo; var Foo; (function (Foo) { })(Foo || (Foo = {})); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js index 214522a56c8db..c5037364b0077 100644 --- a/tests/baselines/reference/defaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js @@ -10,15 +10,15 @@ export default function foo() {} //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class Foo { } exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js index c31174a5acd1d..051ab7bbf03eb 100644 --- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js @@ -9,12 +9,12 @@ export default function foo() {} //// [a.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class Foo { } exports.default = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [b.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js index 8eb92f872bbe4..5417b9b9a962e 100644 --- a/tests/baselines/reference/defaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js @@ -18,10 +18,10 @@ export default function foo() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class Foo { } exports.default = Foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] (function (factory) { @@ -34,7 +34,7 @@ export default function foo() {} } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js index fd2f277c71adc..285cfbcda16e6 100644 --- a/tests/baselines/reference/dependencyViaImportAlias.js +++ b/tests/baselines/reference/dependencyViaImportAlias.js @@ -13,13 +13,13 @@ export = A; //// [A.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); //// [B.js] define(["require", "exports", "A"], function (require, exports, a) { diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js index 37eed7110670e..a7645ceabe9ea 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations1.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js @@ -7,8 +7,8 @@ export let { toString } = 1; //// [destructuringInVariableDeclarations1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.toString = (1).toString; { let { toFixed } = 1; } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js index 21f272d22a6bc..43a2f740c94bc 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations2.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js @@ -8,8 +8,8 @@ export {}; //// [destructuringInVariableDeclarations2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); let { toString } = 1; { let { toFixed } = 1; } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js index 11e242da1a2e5..2522a704e180a 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations3.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js @@ -8,9 +8,9 @@ export let { toString } = 1; //// [destructuringInVariableDeclarations3.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.toString = (1).toString; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js index 0f25ca3827fba..867417cf01fc5 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations4.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js @@ -9,9 +9,9 @@ export {}; //// [destructuringInVariableDeclarations4.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); let { toString } = 1; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js index 6c799d10803f0..20a094a03750d 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations5.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js @@ -16,9 +16,9 @@ export let { toString } = 1; } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.toString = (1).toString; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js index fcdefe72df63c..583a2cd1f1d24 100644 --- a/tests/baselines/reference/destructuringInVariableDeclarations6.js +++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js @@ -17,9 +17,9 @@ export {}; } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); let { toString } = 1; { let { toFixed } = 1; } - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index b1983c82d15ce..324c0cd9293b0 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -21,6 +21,7 @@ export module M { //// [downlevelLetConst13.js] 'use strict'; +Object.defineProperty(exports, "__esModule", { value: true }); // exported let\const bindings should not be renamed exports.foo = 10; exports.bar = "123"; @@ -37,4 +38,3 @@ var M; M.bar7 = { a: 1 }.a; M.bar8 = { a: 1 }.a; })(M = exports.M || (exports.M = {})); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js index c348443fb2917..0deb672456cca 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.js +++ b/tests/baselines/reference/duplicateLocalVariable1.js @@ -347,6 +347,7 @@ export var tests: TestRunner = (function () { //// [duplicateLocalVariable1.js] "use strict"; +exports.__esModule = true; / /; commonjs; var TestFileDir = ".\\TempTestFiles"; @@ -636,4 +637,3 @@ exports.tests = (function () { }, "Codepoint at index: 3 has control value: 8")); return testRunner; })(); -exports.__esModule = true; diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js index 3e89e88fd3c32..2962e544b9b94 100644 --- a/tests/baselines/reference/duplicateLocalVariable2.js +++ b/tests/baselines/reference/duplicateLocalVariable2.js @@ -38,6 +38,7 @@ export var tests: TestRunner = (function () { //// [duplicateLocalVariable2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var TestCase = (function () { function TestCase(name, test, errorMessageRegEx) { this.name = name; @@ -77,5 +78,4 @@ define(["require", "exports"], function (require, exports) { })); return testRunner; })(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index 05af7a2bac87f..5f5590e2b417e 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -68,6 +68,7 @@ export interface D { } //// [duplicateSymbolsExportMatching.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; // Should report error only once for instantiated module var M; (function (M) { @@ -103,5 +104,4 @@ define(["require", "exports"], function (require, exports) { var t; })(C = M.C || (M.C = {})); })(M || (M = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js index 9fc3f4404145b..2c94e692dd015 100644 --- a/tests/baselines/reference/dynamicModuleTypecheckError.js +++ b/tests/baselines/reference/dynamicModuleTypecheckError.js @@ -10,8 +10,8 @@ for(var i = 0; i < 30; i++) { //// [dynamicModuleTypecheckError.js] "use strict"; +exports.__esModule = true; exports.x = 1; for (var i = 0; i < 30; i++) { exports.x = i * 1000; // should not be an error here } -exports.__esModule = true; diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js index ee6fbd2b07f68..f878c5044eaeb 100644 --- a/tests/baselines/reference/elidingImportNames.js +++ b/tests/baselines/reference/elidingImportNames.js @@ -17,17 +17,17 @@ export var main = 10; //// [elidingImportNames_main.js] "use strict"; -exports.main = 10; exports.__esModule = true; +exports.main = 10; //// [elidingImportNames_main1.js] "use strict"; -exports.main = 10; exports.__esModule = true; +exports.main = 10; //// [elidingImportNames_test.js] "use strict"; +exports.__esModule = true; var a = require("./elidingImportNames_main"); // alias used in typeof var b = a; var x; var a2 = require("./elidingImportNames_main1"); // alias not used in typeof var b2 = a2; -exports.__esModule = true; diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js index e8915e406afe8..d98359d94bbab 100644 --- a/tests/baselines/reference/emptyModuleName.js +++ b/tests/baselines/reference/emptyModuleName.js @@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var A = require(""); var B = (function (_super) { __extends(B, _super); @@ -23,4 +24,3 @@ var B = (function (_super) { } return B; }(A)); -exports.__esModule = true; diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js index 9125b5126b23f..2a1865d3ccd0d 100644 --- a/tests/baselines/reference/enumFromExternalModule.js +++ b/tests/baselines/reference/enumFromExternalModule.js @@ -12,14 +12,14 @@ var x = f.Mode.Open; //// [enumFromExternalModule_0.js] "use strict"; +exports.__esModule = true; var Mode; (function (Mode) { Mode[Mode["Open"] = 0] = "Open"; })(Mode = exports.Mode || (exports.Mode = {})); -exports.__esModule = true; //// [enumFromExternalModule_1.js] "use strict"; +exports.__esModule = true; /// var f = require("./enumFromExternalModule_0"); var x = f.Mode.Open; -exports.__esModule = true; diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js index 52d144c1e4927..15ae0c90bd1e6 100644 --- a/tests/baselines/reference/errorsOnImportedSymbol.js +++ b/tests/baselines/reference/errorsOnImportedSymbol.js @@ -20,6 +20,6 @@ var y = Sammy.Sammy(); Object.defineProperty(exports, "__esModule", { value: true }); //// [errorsOnImportedSymbol_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var x = new Sammy.Sammy(); var y = Sammy.Sammy(); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js index 0ad02c848fd6b..d3bb3d006e5f5 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.js +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js @@ -16,6 +16,7 @@ assert(Foo.CONSTANT === "Foo"); //// [es3defaultAliasQuoted_file0.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } @@ -28,9 +29,8 @@ function assert(value) { throw new Error("Assertion failed!"); } exports["default"] = assert; -exports.__esModule = true; //// [es3defaultAliasQuoted_file1.js] "use strict"; +exports.__esModule = true; var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0"); es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo"); -exports.__esModule = true; diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js index 72c954b02f2a4..8ebcfb01be6ec 100644 --- a/tests/baselines/reference/es5-commonjs.js +++ b/tests/baselines/reference/es5-commonjs.js @@ -16,6 +16,7 @@ export default class A //// [es5-commonjs.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -25,4 +26,3 @@ var A = (function () { return A; }()); exports.default = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js index ce15d3a5ce43d..2c38edef6ae44 100644 --- a/tests/baselines/reference/es5-commonjs2.js +++ b/tests/baselines/reference/es5-commonjs2.js @@ -5,5 +5,5 @@ export default 1; //// [es5-commonjs2.js] "use strict"; -exports.default = 1; 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 5fc9462b955d9..15c11b189a3ed 100644 --- a/tests/baselines/reference/es5-commonjs3.js +++ b/tests/baselines/reference/es5-commonjs3.js @@ -6,6 +6,6 @@ export var __esModule = 1; //// [es5-commonjs3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "test"; exports.__esModule = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js index bf28e0645000f..d2530d1bdf2a0 100644 --- a/tests/baselines/reference/es5-commonjs4.js +++ b/tests/baselines/reference/es5-commonjs4.js @@ -17,6 +17,7 @@ export var __esModule = 1; //// [es5-commonjs4.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -27,4 +28,3 @@ var A = (function () { }()); exports.default = A; exports.__esModule = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js index 93a0ed94a5c5a..bbc9bbba7c29f 100644 --- a/tests/baselines/reference/es5-commonjs5.js +++ b/tests/baselines/reference/es5-commonjs5.js @@ -7,8 +7,8 @@ export default function () { //// [es5-commonjs5.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { return "test"; } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js index 33015271d7a04..87d2f7d62a6fd 100644 --- a/tests/baselines/reference/es5-commonjs6.js +++ b/tests/baselines/reference/es5-commonjs6.js @@ -6,6 +6,6 @@ var __esModule = 1; //// [es5-commonjs6.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "test"; var __esModule = 1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js index 5bb6f87e4e5f5..f62c861b7c99e 100644 --- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js +++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js @@ -19,6 +19,7 @@ export declare function __generator(body: Function): any; //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); function foo() { return tslib_1.__awaiter(this, void 0, void 0, function () { @@ -28,7 +29,6 @@ function foo() { }); } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { return new (P || (P = Promise))(function (resolve, reject) { diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js index 6f129f5e58dad..b55422ca7b1a0 100644 --- a/tests/baselines/reference/es5-umd2.js +++ b/tests/baselines/reference/es5-umd2.js @@ -25,6 +25,7 @@ export class A } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -34,5 +35,4 @@ export class A return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js index 1291c739fcb32..37b19ece1ac88 100644 --- a/tests/baselines/reference/es5-umd3.js +++ b/tests/baselines/reference/es5-umd3.js @@ -25,6 +25,7 @@ export default class A } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -34,5 +35,4 @@ export default class A return A; }()); exports.default = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js index f6817129fb34f..25a1db0a25f4d 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js @@ -7,6 +7,7 @@ export default class C { //// [es5ExportDefaultClassDeclaration.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -14,7 +15,6 @@ var C = (function () { return C; }()); exports.default = C; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js index 5cf3405c43716..931eab75c72f0 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js @@ -7,6 +7,7 @@ export default class { //// [es5ExportDefaultClassDeclaration2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var default_1 = (function () { function default_1() { } @@ -14,7 +15,6 @@ var default_1 = (function () { return default_1; }()); exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration2.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js index d28148d1416e2..927536114efca 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js @@ -16,6 +16,7 @@ var t: typeof C = C; //// [es5ExportDefaultClassDeclaration3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var before = new C(); var C = (function () { function C() { @@ -28,7 +29,6 @@ var C = (function () { exports.default = C; var after = new C(); var t = C; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultClassDeclaration3.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js index 6ebab2a4b0dd2..0821543134c8f 100644 --- a/tests/baselines/reference/es5ExportDefaultExpression.js +++ b/tests/baselines/reference/es5ExportDefaultExpression.js @@ -5,8 +5,8 @@ export default (1 + 2); //// [es5ExportDefaultExpression.js] "use strict"; -exports.default = (1 + 2); Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = (1 + 2); //// [es5ExportDefaultExpression.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js index 1060607886a76..068a966faa245 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js @@ -5,9 +5,9 @@ export default function f() { } //// [es5ExportDefaultFunctionDeclaration.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js index 13f9e014be6b5..ab44c4cb584d1 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js @@ -5,9 +5,9 @@ export default function () { } //// [es5ExportDefaultFunctionDeclaration2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function default_1() { } exports.default = default_1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration2.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js index 47ed66880e66a..c4bbcd4373e06 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js @@ -10,13 +10,13 @@ var after: typeof func = func(); //// [es5ExportDefaultFunctionDeclaration3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var before = func(); function func() { return func; } exports.default = func; var after = func(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultFunctionDeclaration3.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js index 1102eab997d1b..d60fba590ac13 100644 --- a/tests/baselines/reference/es5ExportDefaultIdentifier.js +++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js @@ -7,10 +7,10 @@ export default f; //// [es5ExportDefaultIdentifier.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.f = f; exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es5ExportDefaultIdentifier.d.ts] diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js index 28516a541f5de..abc81b3dc94ab 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js @@ -39,6 +39,7 @@ import M3 from "M3"; //// [es5ModuleInternalNamedImports.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var M; (function (M) { // variable @@ -65,5 +66,4 @@ define(["require", "exports"], function (require, exports) { // alias M.M_A = M_M; })(M = exports.M || (exports.M = {})); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js index 02774139add51..dc55545617d1f 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js @@ -14,6 +14,7 @@ export class A //// [es5ModuleWithModuleGenAmd.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js index 4c58c0bd20f81..93056203f9b4e 100644 --- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js +++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js @@ -13,6 +13,7 @@ export class A //// [es5ModuleWithModuleGenCommonjs.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -22,4 +23,3 @@ var A = (function () { return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js index 4479259a5234b..89d11045ddac2 100644 --- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js +++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js @@ -13,6 +13,7 @@ export class A //// [es5ModuleWithoutModuleGenTarget.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } @@ -22,4 +23,3 @@ var A = (function () { return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js index 6f1d083ebe8f6..c0707b869cc04 100644 --- a/tests/baselines/reference/es6-umd2.js +++ b/tests/baselines/reference/es6-umd2.js @@ -24,6 +24,7 @@ export class A } })(function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class A { constructor() { } @@ -32,5 +33,4 @@ export class A } } exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index 80d31b41695fd..91910ba26163c 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -18,6 +18,7 @@ export * from "./server"; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } @@ -29,14 +30,13 @@ var m; m.x = 10; })(m = exports.m || (exports.m = {})); exports.x = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } -__export(require("./server")); Object.defineProperty(exports, "__esModule", { value: true }); +__export(require("./server")); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index 98940523143d9..3d3625aad18d7 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -18,6 +18,7 @@ export { x }; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } @@ -32,7 +33,6 @@ var m; exports.instantiatedModule = m; var x = 10; exports.x = x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js index f1cb97ad0f674..d8aa8e607e358 100644 --- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js @@ -19,6 +19,7 @@ export { foo, baz, baz as quux, buzz, bizz }; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var foo = 2; exports.foo = foo; exports.foo = foo = 3; @@ -34,4 +35,3 @@ exports.bizz = bizz; exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1 exports.bizz = bizz -= 1; // similarly exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index 5891de5731084..ecfccd5d84379 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -22,6 +22,7 @@ export { x } from "./server"; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } @@ -33,9 +34,9 @@ var m; m.x = 10; })(m = exports.m || (exports.m = {})); exports.x = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.c = server_1.c; var server_2 = require("./server"); @@ -44,7 +45,6 @@ var server_3 = require("./server"); exports.instantiatedModule = server_3.m; var server_4 = require("./server"); exports.x = server_4.x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js index c84c76839ee76..d1f8de5faa710 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.js +++ b/tests/baselines/reference/es6ExportEqualsInterop.js @@ -213,6 +213,7 @@ export * from "class-module"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +exports.__esModule = true; var z2 = require("variable"); var z3 = require("interface-variable"); var z4 = require("module"); @@ -304,4 +305,3 @@ __export(require("function")); __export(require("function-module")); __export(require("class")); __export(require("class-module")); -exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js index 035a8c0be25bd..977b94f879031 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js +++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js @@ -14,15 +14,15 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import //// [es6ImportDefaultBindingAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [es6ImportDefaultBindingAmd_1.js] define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) { "use strict"; - var x = es6ImportDefaultBindingAmd_0_1.default; Object.defineProperty(exports, "__esModule", { value: true }); + var x = es6ImportDefaultBindingAmd_0_1.default; }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js index 6f4836a668054..94b824a3766b8 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js @@ -13,18 +13,18 @@ import defaultBinding2 from "./server"; // elide this import since defaultBindin //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var c = (function () { function c() { } return c; }()); exports.default = c; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.x = new server_1.default(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js index 66be06536f035..8335a1953de0e 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js @@ -24,13 +24,14 @@ var x1: number = m; //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; exports.default = {}; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a; const es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); @@ -42,7 +43,6 @@ const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportD var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x; const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index 4712a4325032b..8eb76b487f8db 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -22,11 +22,12 @@ var x: number = defaultBinding6; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); @@ -39,7 +40,6 @@ var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6Imp var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default; var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js index 5d2518bb7742d..d72751c7610bd 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js @@ -22,11 +22,12 @@ export var x1: number = defaultBinding6; //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.x1 = server_1.default; var server_2 = require("./server"); @@ -39,7 +40,6 @@ var server_5 = require("./server"); exports.x1 = server_5.default; var server_6 = require("./server"); exports.x1 = server_6.default; -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js index 0556d87248006..5bf268709d38a 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js @@ -26,6 +26,7 @@ export var x6 = new m(); //// [server.js] "use strict"; +exports.__esModule = true; var a = (function () { function a() { } @@ -62,9 +63,9 @@ var x11 = (function () { return x11; }()); exports.x11 = x11; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var server_1 = require("./server"); exports.x1 = new server_1.a(); var server_2 = require("./server"); @@ -76,7 +77,6 @@ var server_4 = require("./server"); exports.x3 = new server_4.x11(); var server_5 = require("./server"); exports.x6 = new server_5.m(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index f52c590f44e80..307dcc92f4668 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -21,15 +21,16 @@ export var x6 = new defaultBinding6(); //// [server.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = (function () { function a() { } return a; }()); exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [client.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var server_1 = require("./server"); exports.x1 = new server_1.default(); var server_2 = require("./server"); @@ -42,7 +43,6 @@ var server_5 = require("./server"); exports.x5 = new server_5.default(); var server_6 = require("./server"); exports.x6 = new server_6.default(); -Object.defineProperty(exports, "__esModule", { value: true }); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js index dcc2ec2c7859d..2e9d8104a39c4 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js @@ -23,12 +23,13 @@ var x1: number = m; //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); @@ -40,7 +41,6 @@ var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6Impo var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x; var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js index 247c64c3e7f41..77266084bda3c 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js @@ -25,22 +25,22 @@ export var x1: number = m; //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; exports.default = {}; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [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"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.x1 = server_1.a; exports.x1 = server_2.a; exports.x1 = server_3.x; exports.x1 = server_3.a; exports.x1 = server_4.x; exports.x1 = server_5.m; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js index db922cb220037..c1c419689341f 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js @@ -11,14 +11,14 @@ var x: number = defaultBinding; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js index fbd045e81de42..b82fb9aeee96f 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js @@ -12,15 +12,15 @@ export var x: number = defaultBinding; //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; - exports.x = server_1.default; Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = server_1.default; }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index 8b430e2cf46d5..8d033c6953626 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -10,18 +10,18 @@ export var x = new nameSpaceBinding.a(); //// [server.js] "use strict"; +exports.__esModule = true; var a = (function () { function a() { } return a; }()); exports.a = a; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var nameSpaceBinding = require("./server"); exports.x = new nameSpaceBinding.a(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js index 09caf0db18ae2..c488db3e88e52 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js @@ -12,19 +12,19 @@ export var x = new defaultBinding(); //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = (function () { function a() { } return a; }()); exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; - exports.x = new server_1.default(); Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = new server_1.default(); }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index 92e3fe0a33f19..0db21dfd064ea 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -10,13 +10,13 @@ var x: number = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); var x = nameSpaceBinding.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js index 0b5670b18a976..96720294a8af9 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js @@ -10,13 +10,13 @@ export var x: number = nameSpaceBinding.a; //// [server.js] "use strict"; -exports.a = 10; exports.__esModule = true; +exports.a = 10; //// [client.js] "use strict"; +exports.__esModule = true; var nameSpaceBinding = require("./server"); exports.x = nameSpaceBinding.a; -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js index b9f73ac47ebb2..4c51a54462d65 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js +++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js @@ -18,12 +18,12 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould //// [es6ImportDefaultBindingMergeErrors_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportDefaultBindingMergeErrors_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); var x = es6ImportDefaultBindingMergeErrors_0_1.default; var defaultBinding2 = "hello world"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js index 265be908b8588..e294c08befa7e 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js +++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js @@ -10,8 +10,8 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0"; //// [es6ImportDefaultBindingNoDefaultProperty_0.js] "use strict"; -exports.a = 10; exports.__esModule = true; +exports.a = 10; //// [es6ImportDefaultBindingNoDefaultProperty_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js index 6ea0812d40b9a..a9f760f127869 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js @@ -13,15 +13,15 @@ export import defaultBinding2 from "server"; // non referenced //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var a = 10; exports.default = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [client.js] define(["require", "exports", "server"], function (require, exports, server_1) { "use strict"; - exports.x = server_1.default; Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = server_1.default; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js index 510750edc50d0..b5296d15f9bef 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImport.js @@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this //// [es6ImportNameSpaceImport_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNameSpaceImport_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); var x = nameSpaceBinding.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js index ea2403383168e..200f49a298655 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js @@ -13,14 +13,14 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi //// [es6ImportNameSpaceImportAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.a = 10; exports.__esModule = true; + exports.a = 10; }); //// [es6ImportNameSpaceImportAmd_1.js] define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) { "use strict"; - var x = nameSpaceBinding.a; exports.__esModule = true; + var x = nameSpaceBinding.a; }); diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js index 20b9d3af20bc8..cae90885ce21d 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js @@ -11,6 +11,7 @@ import * as nameSpaceBinding2 from "./server"; // unreferenced //// [server.js] "use strict"; +exports.__esModule = true; var c = (function () { function c() { } @@ -18,12 +19,11 @@ var c = (function () { }()); exports.c = c; ; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var nameSpaceBinding = require("./server"); exports.x = new nameSpaceBinding.c(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js index 88bf937c69c79..ee00df9a2cc55 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js @@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide //// [es6ImportNameSpaceImportInEs5_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNameSpaceImportInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); var x = nameSpaceBinding.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNameSpaceImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js index 696659cb1f756..39594102007ba 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js @@ -17,9 +17,9 @@ var nameSpaceBinding3 = 10; //// [es6ImportNameSpaceImportMergeErrors_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNameSpaceImportMergeErrors_1.js] "use strict"; -var nameSpaceBinding3 = 10; Object.defineProperty(exports, "__esModule", { value: true }); +var nameSpaceBinding3 = 10; diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js index 1663d7ec9238a..3c8b40f550e06 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js @@ -13,14 +13,14 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports //// [server.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.a = 10; exports.__esModule = true; + exports.a = 10; }); //// [client.js] define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) { "use strict"; - exports.x = nameSpaceBinding.a; exports.__esModule = true; + exports.x = nameSpaceBinding.a; }); diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js index 9719305e62b50..a9fcb861ec510 100644 --- a/tests/baselines/reference/es6ImportNamedImport.js +++ b/tests/baselines/reference/es6ImportNamedImport.js @@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImport_0"; //// [es6ImportNamedImport_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -51,9 +52,9 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImport_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_1.a; const es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0"); @@ -75,7 +76,6 @@ const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0"); var z111 = es6ImportNamedImport_0_8.z1; const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0"); var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImport_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js index 31582223c52cc..bd6213f259fc5 100644 --- a/tests/baselines/reference/es6ImportNamedImportAmd.js +++ b/tests/baselines/reference/es6ImportNamedImportAmd.js @@ -44,6 +44,7 @@ import { aaaa as bbbb } from "es6ImportNamedImportAmd_0"; //// [es6ImportNamedImportAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -52,11 +53,11 @@ define(["require", "exports"], function (require, exports) { exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; - exports.__esModule = true; }); //// [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"; + exports.__esModule = true; var xxxx = es6ImportNamedImportAmd_0_1.a; var xxxx = es6ImportNamedImportAmd_0_2.a; var xxxx = es6ImportNamedImportAmd_0_3.x; @@ -69,7 +70,6 @@ define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImport var xxxx = es6ImportNamedImportAmd_0_7.x1; var z111 = es6ImportNamedImportAmd_0_8.z1; var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error - exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js index f8fdf4616445c..d68ffd794a728 100644 --- a/tests/baselines/reference/es6ImportNamedImportDts.js +++ b/tests/baselines/reference/es6ImportNamedImportDts.js @@ -48,6 +48,7 @@ import { aaaa1 as bbbb } from "./server"; //// [server.js] "use strict"; +exports.__esModule = true; var a = (function () { function a() { } @@ -132,9 +133,9 @@ var aaaa1 = (function () { return aaaa1; }()); exports.aaaa1 = aaaa1; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var server_1 = require("./server"); exports.xxxx = new server_1.a(); var server_2 = require("./server"); @@ -156,7 +157,6 @@ var server_8 = require("./server"); exports.z111 = new server_8.z1(); var server_9 = require("./server"); exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js index 5c6f3573c7fc1..9e025dca61be9 100644 --- a/tests/baselines/reference/es6ImportNamedImportInEs5.js +++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js @@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0"; //// [es6ImportNamedImportInEs5_0.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -51,9 +52,9 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImportInEs5_1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0"); var xxxx = es6ImportNamedImportInEs5_0_1.a; var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0"); @@ -75,7 +76,6 @@ var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0"); var z111 = es6ImportNamedImportInEs5_0_8.z1; var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0"); var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error -Object.defineProperty(exports, "__esModule", { value: true }); //// [es6ImportNamedImportInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js index 0743f1658b49f..d64b517c50f4c 100644 --- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js @@ -10,8 +10,8 @@ export = a; //// [es6ImportNamedImportInExportAssignment_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportNamedImportInExportAssignment_1.js] "use strict"; const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index ce878ca021661..38cda17bd7efe 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -14,6 +14,7 @@ export = x; //// [es6ImportNamedImportInIndirectExportAssignment_0.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var c = (function () { @@ -23,7 +24,6 @@ var a; }()); a.c = c; })(a = exports.a || (exports.a = {})); -exports.__esModule = true; //// [es6ImportNamedImportInIndirectExportAssignment_1.js] "use strict"; var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0"); diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js index 11bd3b73a9ec7..261039bcc10bc 100644 --- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js +++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js @@ -22,13 +22,13 @@ import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be erro //// [es6ImportNamedImportMergeErrors_0.js] "use strict"; +exports.__esModule = true; exports.a = 10; exports.x = exports.a; exports.z = exports.a; exports.z1 = exports.a; -exports.__esModule = true; //// [es6ImportNamedImportMergeErrors_1.js] "use strict"; +exports.__esModule = true; var x = 10; var x44 = 10; -exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js index 87f3c1d5d072e..4e78df34b6d30 100644 --- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js +++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js @@ -11,9 +11,9 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0"; //// [es6ImportNamedImportNoExportMember_0.js] "use strict"; +exports.__esModule = true; exports.a = 10; exports.x = exports.a; -exports.__esModule = true; //// [es6ImportNamedImport_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js index 7377f737e470c..13e2d40144b26 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js @@ -42,6 +42,7 @@ export import { aaaa as bbbb } from "./server"; //// [server.js] "use strict"; +exports.__esModule = true; exports.a = 10; exports.x = exports.a; exports.m = exports.a; @@ -50,9 +51,9 @@ exports.x1 = 10; exports.z1 = 10; exports.z2 = 10; exports.aaaa = 10; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; var server_1 = require("./server"); exports.xxxx = server_1.a; var server_2 = require("./server"); @@ -74,7 +75,6 @@ var server_8 = require("./server"); exports.z111 = server_8.z1; var server_9 = require("./server"); exports.z2 = server_9.z2; // z2 shouldn't give redeclare error -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js index 1bbab226ae8e2..0aa3214e5d708 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js +++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js @@ -22,6 +22,7 @@ export var cVal = new C(); //// [server.js] "use strict"; +exports.__esModule = true; var C = (function () { function C() { this.prop = "hello"; @@ -36,12 +37,11 @@ var C2 = (function () { return C2; }()); exports.C2 = C2; -exports.__esModule = true; //// [client.js] "use strict"; +exports.__esModule = true; 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(); -exports.__esModule = true; //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js index c90ea418f26f5..d83ba9370eecb 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js @@ -16,21 +16,21 @@ var _b = 10; //// [es6ImportWithoutFromClauseAmd_0.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.a = 10; exports.__esModule = true; + exports.a = 10; }); //// [es6ImportWithoutFromClauseAmd_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.b = 10; exports.__esModule = true; + exports.b = 10; }); //// [es6ImportWithoutFromClauseAmd_2.js] define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) { "use strict"; + exports.__esModule = true; var _a = 10; var _b = 10; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js index 0262cfdd045f9..b11e2ea9a07e2 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js @@ -9,12 +9,12 @@ import "es6ImportWithoutFromClauseInEs5_0"; //// [es6ImportWithoutFromClauseInEs5_0.js] "use strict"; -exports.a = 10; Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = 10; //// [es6ImportWithoutFromClauseInEs5_1.js] "use strict"; -require("es6ImportWithoutFromClauseInEs5_0"); Object.defineProperty(exports, "__esModule", { value: true }); +require("es6ImportWithoutFromClauseInEs5_0"); //// [es6ImportWithoutFromClauseInEs5_0.d.ts] diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index 71874fc7b405f..99214d2a2c6c8 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -9,12 +9,12 @@ export import "server"; //// [server.js] "use strict"; -exports.a = 10; exports.__esModule = true; +exports.a = 10; //// [client.js] "use strict"; -require("server"); exports.__esModule = true; +require("server"); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js index bd45a62e2f400..4ced3a35ab27f 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js @@ -14,6 +14,7 @@ export class A //// [es6ModuleWithModuleGenTargetAmd.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class A { constructor() { } @@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) { } } exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js index a7cf0599e5435..187ece7e718ba 100644 --- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js +++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js @@ -13,6 +13,7 @@ export class A //// [es6ModuleWithModuleGenTargetCommonjs.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class A { constructor() { } @@ -21,4 +22,3 @@ class A { } } exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js index b2a01bbb552d5..d19de0c78b07b 100644 --- a/tests/baselines/reference/exportAndImport-es3-amd.js +++ b/tests/baselines/reference/exportAndImport-es3-amd.js @@ -15,17 +15,17 @@ export default function f2() { //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function f1() { } exports["default"] = f1; - exports.__esModule = true; }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { "use strict"; + exports.__esModule = true; function f2() { m1_1["default"](); } exports["default"] = f2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js index 898261ef7fea6..13b6f1eaf4804 100644 --- a/tests/baselines/reference/exportAndImport-es3.js +++ b/tests/baselines/reference/exportAndImport-es3.js @@ -14,15 +14,15 @@ export default function f2() { //// [m1.js] "use strict"; +exports.__esModule = true; function f1() { } exports["default"] = f1; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); function f2() { m1_1["default"](); } exports["default"] = f2; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js index fcc918bb8cead..60b1246b616dc 100644 --- a/tests/baselines/reference/exportAndImport-es5-amd.js +++ b/tests/baselines/reference/exportAndImport-es5-amd.js @@ -15,17 +15,17 @@ export default function f2() { //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function f1() { } exports.default = f1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [m2.js] define(["require", "exports", "./m1"], function (require, exports, m1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function f2() { m1_1.default(); } exports.default = f2; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js index fa1652c603e3b..f4bc496e6b254 100644 --- a/tests/baselines/reference/exportAndImport-es5.js +++ b/tests/baselines/reference/exportAndImport-es5.js @@ -14,15 +14,15 @@ export default function f2() { //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f1() { } exports.default = f1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("./m1"); function f2() { m1_1.default(); } exports.default = f2; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js index 641500fa09d5e..b556810976362 100644 --- a/tests/baselines/reference/exportArrayBindingPattern.js +++ b/tests/baselines/reference/exportArrayBindingPattern.js @@ -5,8 +5,8 @@ export { a, b }; //// [exportArrayBindingPattern.js] "use strict"; +exports.__esModule = true; // issue: https://github.com/Microsoft/TypeScript/issues/10778 var _a = [1, 2, 3], a = _a[0], b = _a[2]; exports.a = a; exports.b = b; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js index f557bc5d9a45f..9f3eaf78480ba 100644 --- a/tests/baselines/reference/exportAssignClassAndModule.js +++ b/tests/baselines/reference/exportAssignClassAndModule.js @@ -28,7 +28,7 @@ var Foo = (function () { module.exports = Foo; //// [exportAssignClassAndModule_1.js] "use strict"; +exports.__esModule = true; var z; var zz; zz.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js index a39a7aa04cd23..592d97dbaa0d3 100644 --- a/tests/baselines/reference/exportAssignDottedName.js +++ b/tests/baselines/reference/exportAssignDottedName.js @@ -12,11 +12,11 @@ export = foo1.x; // Ok //// [foo1.js] "use strict"; +exports.__esModule = true; function x() { return true; } exports.x = x; -exports.__esModule = true; //// [foo2.js] "use strict"; var foo1 = require("./foo1"); diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js index 09daa469ef48b..208df4eff6300 100644 --- a/tests/baselines/reference/exportAssignImportedIdentifier.js +++ b/tests/baselines/reference/exportAssignImportedIdentifier.js @@ -16,11 +16,11 @@ var x = foo2(); // should be boolean //// [foo1.js] "use strict"; +exports.__esModule = true; function x() { return true; } exports.x = x; -exports.__esModule = true; //// [foo2.js] "use strict"; var foo1 = require("./foo1"); @@ -28,6 +28,6 @@ var x = foo1.x; module.exports = x; //// [foo3.js] "use strict"; +exports.__esModule = true; var foo2 = require("./foo2"); var x = foo2(); // should be boolean -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js index 645f44545fe91..bed4480f3935d 100644 --- a/tests/baselines/reference/exportAssignTypes.js +++ b/tests/baselines/reference/exportAssignTypes.js @@ -85,6 +85,7 @@ function x(a) { module.exports = x; //// [consumer.js] "use strict"; +exports.__esModule = true; var iString = require("./expString"); var v1 = iString; var iNumber = require("./expNumber"); @@ -99,4 +100,3 @@ var iAny = require("./expAny"); var v6 = iAny; var iGeneric = require("./expGeneric"); var v7 = iGeneric; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js index e1bdf0d544f0e..d4b6961cfe95a 100644 --- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js +++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js @@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignedTypeAsTypeAnnotation_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var t2; // should not raise a 'container type' error exports.__esModule = true; + var t2; // should not raise a 'container type' error }); diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js index 265afdfd04130..549ad5bbd4dcb 100644 --- a/tests/baselines/reference/exportAssignmentClass.js +++ b/tests/baselines/reference/exportAssignmentClass.js @@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignmentClass_B.js] define(["require", "exports", "exportAssignmentClass_A"], function (require, exports, D) { "use strict"; + exports.__esModule = true; var d = new D(); var x = d.p; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js index 003927c251140..eddbddf8d6d87 100644 --- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js +++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js @@ -24,8 +24,8 @@ var Foo = (function () { module.exports = Foo; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); var x = new foo(true); // Should error var y = new foo({ a: "test", b: 42 }); // Should be OK var z = y.test.b; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js index a30868a18e5a2..a32da0a2e3f78 100644 --- a/tests/baselines/reference/exportAssignmentEnum.js +++ b/tests/baselines/reference/exportAssignmentEnum.js @@ -27,8 +27,8 @@ var E; module.exports = E; //// [exportAssignmentEnum_B.js] "use strict"; +exports.__esModule = true; var EnumE = require("./exportAssignmentEnum_A"); var a = EnumE.A; var b = EnumE.B; var c = EnumE.C; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js index 5743490fec308..775bb6b1af195 100644 --- a/tests/baselines/reference/exportAssignmentFunction.js +++ b/tests/baselines/reference/exportAssignmentFunction.js @@ -19,6 +19,6 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignmentFunction_B.js] define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) { "use strict"; - var n = fooFunc(); exports.__esModule = true; + var n = fooFunc(); }); diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js index 3ef295639fd27..95563aa36a9dd 100644 --- a/tests/baselines/reference/exportAssignmentGenericType.js +++ b/tests/baselines/reference/exportAssignmentGenericType.js @@ -22,7 +22,7 @@ var Foo = (function () { module.exports = Foo; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); var x = new foo(); var y = x.test; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js index 8f4403cf40a38..f3cc9ae9bbe8c 100644 --- a/tests/baselines/reference/exportAssignmentInterface.js +++ b/tests/baselines/reference/exportAssignmentInterface.js @@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) { //// [exportAssignmentInterface_B.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var i; var n = i.p1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js index e4ba7a9f7d8ae..b5c45785f8ff0 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.js +++ b/tests/baselines/reference/exportAssignmentInternalModule.js @@ -23,6 +23,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; exports.__esModule = true; + var n = modM.x; }); diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js index ba77f90557f8f..3ee760dedfa54 100644 --- a/tests/baselines/reference/exportAssignmentMergedInterface.js +++ b/tests/baselines/reference/exportAssignmentMergedInterface.js @@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var x; x("test"); x(42); @@ -37,5 +38,4 @@ define(["require", "exports"], function (require, exports) { if (!!x.c) { } var z = { x: 1, y: 2 }; z = x.d; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js index 59008dfc37068..ef48895b5cb7c 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.js +++ b/tests/baselines/reference/exportAssignmentMergedModule.js @@ -47,9 +47,9 @@ var Foo; module.exports = Foo; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0"); var a = foo.a(); if (!!foo.b) { foo.Test.answer = foo.c(42); } -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js index 280e93f8c016d..6c61eeedfc110 100644 --- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js +++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js @@ -21,9 +21,9 @@ var b = z(); // call signature - no error exports.__esModule = true; //// [exportAssignmentOfDeclaredExternalModule_1.js] "use strict"; +exports.__esModule = true; 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' var a = new z(); // constructor - no error var b = z(); // call signature - no error -exports.__esModule = true; diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js index f4417f871e913..9cd15ec01a4c4 100644 --- a/tests/baselines/reference/exportAssignmentOfGenericType1.js +++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js @@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (require, exports, q) { "use strict"; + exports.__esModule = true; var M = (function (_super) { __extends(M, _super); function M() { @@ -45,5 +46,4 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req }(q)); var m; var r = m.foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js index 44afbca1f691e..f4001e5ab1572 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js @@ -33,8 +33,8 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.answer === 42) { var x = new foo(); } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js index a6abc6aa37dd2..7ba5a655c2010 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js @@ -34,9 +34,9 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; var color; if (color === foo.green) { color = foo.answer; } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js index 4c0abd1d650f5..f122b8fbe8b06 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js @@ -30,8 +30,8 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.answer === 42) { var x = foo(); } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js index 0d31a25623cf8..a7acbaf34967c 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js @@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) { //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; if (foo.answer === 42) { } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js index 8f9c02ecfbb02..e6ccdb46f9a5e 100644 --- a/tests/baselines/reference/exportAssignmentVariable.js +++ b/tests/baselines/reference/exportAssignmentVariable.js @@ -16,6 +16,6 @@ var x = 0; module.exports = x; //// [exportAssignmentVariable_B.js] "use strict"; +exports.__esModule = true; var y = require("./exportAssignmentVariable_A"); var n = y; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js index 6c3a951841d2c..e0165098b20c5 100644 --- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js +++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js @@ -22,23 +22,23 @@ export { x as a, } from //// [t1.js] "use strict"; -exports.x = "x"; exports.__esModule = true; +exports.x = "x"; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.x = t1_1.x; -exports.__esModule = true; //// [t3.js] "use strict"; exports.__esModule = true; //// [t4.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.a = t1_1.x; -exports.__esModule = true; //// [t5.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.a = t1_1.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js index 23ce59f2402ea..950b3db26e51d 100644 --- a/tests/baselines/reference/exportDeclareClass1.js +++ b/tests/baselines/reference/exportDeclareClass1.js @@ -12,7 +12,7 @@ //// [exportDeclareClass1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; ; ; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js index 08d62eb3782c2..473ebaa0492e0 100644 --- a/tests/baselines/reference/exportDeclaredModule.js +++ b/tests/baselines/reference/exportDeclaredModule.js @@ -17,6 +17,6 @@ var x: number = foo1.b(); module.exports = M1; //// [foo2.js] "use strict"; +exports.__esModule = true; var foo1 = require("./foo1"); var x = foo1.b(); -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js index 04ad89f9dc042..dddea6a6b7342 100644 --- a/tests/baselines/reference/exportDefaultProperty.js +++ b/tests/baselines/reference/exportDefaultProperty.js @@ -43,6 +43,7 @@ fooLength + 1; //// [a.js] "use strict"; +exports.__esModule = true; var A; (function (A) { var B = (function () { @@ -56,13 +57,13 @@ var A; })(B = A.B || (A.B = {})); })(A || (A = {})); exports["default"] = A.B; -exports.__esModule = true; //// [b.js] "use strict"; -exports["default"] = "foo".length; exports.__esModule = true; +exports["default"] = "foo".length; //// [index.js] "use strict"; +exports.__esModule = true; /// var foobar_1 = require("foobar"); var X = foobar_1["default"].X; @@ -73,4 +74,3 @@ var a_1 = require("./a"); var b = new a_1["default"](a_1["default"].b); var b_1 = require("./b"); b_1["default"] + 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js index 861acb7347cd9..4922738430acf 100644 --- a/tests/baselines/reference/exportDefaultProperty2.js +++ b/tests/baselines/reference/exportDefaultProperty2.js @@ -20,15 +20,15 @@ const x: B = { c: B }; //// [a.js] // This test is just like exportEqualsProperty2, but with `export default`. "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports["default"] = C.B; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var a_1 = require("./a"); var x = { c: a_1["default"] }; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js index d8347b62944ec..177e3943ac717 100644 --- a/tests/baselines/reference/exportEqualCallable.js +++ b/tests/baselines/reference/exportEqualCallable.js @@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) { //// [exportEqualCallable_1.js] define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) { "use strict"; - connect(); exports.__esModule = true; + connect(); }); diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js index f8d0afe95da8e..4a65ce5fd4908 100644 --- a/tests/baselines/reference/exportEqualErrorType.js +++ b/tests/baselines/reference/exportEqualErrorType.js @@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) { //// [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 ''. exports.__esModule = true; + 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 3a4982a7434d6..68ac9485f5f2b 100644 --- a/tests/baselines/reference/exportEqualMemberMissing.js +++ b/tests/baselines/reference/exportEqualMemberMissing.js @@ -27,7 +27,7 @@ var server; module.exports = server; //// [exportEqualMemberMissing_1.js] "use strict"; +exports.__esModule = true; /// var connect = require("./exportEqualMemberMissing_0"); connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js index 3cf456818072a..9cf7a7b2ee8a3 100644 --- a/tests/baselines/reference/exportEqualsDefaultProperty.js +++ b/tests/baselines/reference/exportEqualsDefaultProperty.js @@ -23,6 +23,6 @@ var x = { module.exports = x; //// [imp.js] "use strict"; +exports.__esModule = true; var exp_1 = require("./exp"); exp_1["default"].toExponential(2); -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js index feb5e563903ee..e6bd09d536743 100644 --- a/tests/baselines/reference/exportEqualsProperty.js +++ b/tests/baselines/reference/exportEqualsProperty.js @@ -60,6 +60,7 @@ module.exports = A.B; module.exports = "foo".length; //// [index.js] "use strict"; +exports.__esModule = true; /// var foobar_1 = require("foobar"); var X2 = require("foobarx"); @@ -69,4 +70,3 @@ var B = require("./a"); var b = new B(B.b); var fooLength = require("./b"); fooLength + 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js index f51a130e572f0..36fcbdf34469f 100644 --- a/tests/baselines/reference/exportEqualsProperty2.js +++ b/tests/baselines/reference/exportEqualsProperty2.js @@ -28,6 +28,6 @@ var C = (function () { module.exports = C.B; //// [b.js] "use strict"; +exports.__esModule = true; var B = require("./a"); var x = { c: B }; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js index d947393c05f89..615f3d266abb0 100644 --- a/tests/baselines/reference/exportImport.js +++ b/tests/baselines/reference/exportImport.js @@ -29,17 +29,17 @@ define(["require", "exports"], function (require, exports) { //// [exporter.js] define(["require", "exports", "./w1"], function (require, exports, w) { "use strict"; - exports.w = w; exports.__esModule = true; + exports.w = w; }); //// [consumer.js] define(["require", "exports", "./exporter"], function (require, exports, e) { "use strict"; + exports.__esModule = true; function w() { return new e.w(); } exports.w = w; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js index 7defcbac0448b..31f5f218d6574 100644 --- a/tests/baselines/reference/exportImportMultipleFiles.js +++ b/tests/baselines/reference/exportImportMultipleFiles.js @@ -15,20 +15,20 @@ lib.math.add(3, 4); // Shouldnt be error //// [exportImportMultipleFiles_math.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function add(a, b) { return a + b; } exports.add = add; - exports.__esModule = true; }); //// [exportImportMultipleFiles_library.js] define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) { "use strict"; + exports.__esModule = true; exports.math = math; exports.math.add(3, 4); // OK - exports.__esModule = true; }); //// [exportImportMultipleFiles_userCode.js] define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) { "use strict"; - lib.math.add(3, 4); // Shouldnt be error exports.__esModule = true; + lib.math.add(3, 4); // Shouldnt be error }); diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js index 77eb0c35ce690..1394d7492dda1 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js @@ -28,11 +28,11 @@ define(["require", "exports"], function (require, exports) { //// [consumer.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function w() { return { name: 'value' }; } exports.w = w; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js index ba7f938086597..f7ee0b8d4d890 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js @@ -37,6 +37,7 @@ export let h1: D = new D; //// [exportNonInitializedVariablesAMD.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var ; let; var ; @@ -67,5 +68,4 @@ define(["require", "exports"], function (require, exports) { exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js index bf30e45f1ca33..7623127aee8f3 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js @@ -36,6 +36,7 @@ export let h1: D = new D; //// [exportNonInitializedVariablesCommonJS.js] "use strict"; +exports.__esModule = true; var ; let; var ; @@ -66,4 +67,3 @@ exports.e1 = new D; exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js index 1b26cfe3c1aea..504c6e700841c 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js @@ -45,6 +45,7 @@ export let h1: D = new D; } })(function (require, exports) { "use strict"; + exports.__esModule = true; var ; let; var ; @@ -75,5 +76,4 @@ export let h1: D = new D; exports.f1 = new D; exports.g1 = new D; exports.h1 = new D; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js index a9ec4591c6c89..c3e97cf3e106b 100644 --- a/tests/baselines/reference/exportRedeclarationTypeAliases.js +++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js @@ -5,6 +5,6 @@ export function Foo(): any {} //// [exportRedeclarationTypeAliases.js] "use strict"; +exports.__esModule = true; function Foo() { } exports.Foo = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js index e5fa8913ffd63..dc0b24b98c3a3 100644 --- a/tests/baselines/reference/exportSameNameFuncVar.js +++ b/tests/baselines/reference/exportSameNameFuncVar.js @@ -6,9 +6,9 @@ export function a() { //// [exportSameNameFuncVar.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = 10; function a() { } exports.a = a; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js index b117972450eec..fe59f5071f2b8 100644 --- a/tests/baselines/reference/exportSpecifierForAGlobal.js +++ b/tests/baselines/reference/exportSpecifierForAGlobal.js @@ -14,12 +14,12 @@ export function f() { //// [b.js] "use strict"; +exports.__esModule = true; function f() { var x; return x; } exports.f = f; -exports.__esModule = true; //// [b.d.ts] diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js index 9a4def0dd7858..f25a68a5aa625 100644 --- a/tests/baselines/reference/exportStar-amd.js +++ b/tests/baselines/reference/exportStar-amd.js @@ -32,28 +32,28 @@ foo; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.x = 1; exports.y = 2; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } exports.foo = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var x = "x"; exports.x = x; var y = "y"; exports.y = y; var z = "z"; exports.z = z; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t4.js] define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) { @@ -61,18 +61,18 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + Object.defineProperty(exports, "__esModule", { value: true }); __export(t1_1); __export(t2_1); __export(t3_1); - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [main.js] define(["require", "exports", "./t4"], function (require, exports, t4_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); t4_1.default; t4_1.x; t4_1.y; t4_1.z; t4_1.foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js index 4b9ec28f6aa31..a188cefd8b6ce 100644 --- a/tests/baselines/reference/exportStar.js +++ b/tests/baselines/reference/exportStar.js @@ -31,39 +31,39 @@ foo; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.x = 1; exports.y = 2; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; function foo() { } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var x = "x"; exports.x = x; var y = "y"; exports.y = y; var z = "z"; exports.z = z; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t4.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +Object.defineProperty(exports, "__esModule", { value: true }); __export(require("./t1")); __export(require("./t2")); __export(require("./t3")); -Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t4_1 = require("./t4"); t4_1.default; t4_1.x; t4_1.y; t4_1.z; t4_1.foo; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js index 3b74564d4d169..8376ec1927e93 100644 --- a/tests/baselines/reference/exportStarForValues.js +++ b/tests/baselines/reference/exportStarForValues.js @@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x; exports.__esModule = true; + var x; }); diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js index 74b28ef6d00d0..f18f9f1c587f1 100644 --- a/tests/baselines/reference/exportStarForValues2.js +++ b/tests/baselines/reference/exportStarForValues2.js @@ -20,12 +20,12 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js index 52e18851fc990..5ccd12f8a37e0 100644 --- a/tests/baselines/reference/exportStarForValues3.js +++ b/tests/baselines/reference/exportStarForValues3.js @@ -32,24 +32,24 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file5.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js index 7697100842e00..e06b5e26207de 100644 --- a/tests/baselines/reference/exportStarForValues4.js +++ b/tests/baselines/reference/exportStarForValues4.js @@ -24,12 +24,12 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - var x = 1; exports.__esModule = true; + var x = 1; }); diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js index 1311e215fce77..1f5163dd9cd36 100644 --- a/tests/baselines/reference/exportStarForValues7.js +++ b/tests/baselines/reference/exportStarForValues7.js @@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file3.js] define(["require", "exports", "file2"], function (require, exports, file2_1) { @@ -29,7 +29,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file2_1); exports.x = 1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js index b6ee3c56ae730..6f52bce89f97f 100644 --- a/tests/baselines/reference/exportStarForValues8.js +++ b/tests/baselines/reference/exportStarForValues8.js @@ -32,14 +32,14 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file4.js] define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) { @@ -47,10 +47,10 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file2_1); __export(file3_1); exports.x = 1; - exports.__esModule = true; }); //// [file5.js] define(["require", "exports", "file4"], function (require, exports, file4_1) { @@ -58,7 +58,7 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file4_1); exports.x = 1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js index 5d24c558ec06f..3c34bb1afdb71 100644 --- a/tests/baselines/reference/exportStarForValues9.js +++ b/tests/baselines/reference/exportStarForValues9.js @@ -27,9 +27,9 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file2_1); exports.x = 1; - exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "file3"], function (require, exports, file3_1) { @@ -37,7 +37,7 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) { function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } + exports.__esModule = true; __export(file3_1); exports.x = 1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index 44ece87187456..4fcac9312b987 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -25,13 +25,13 @@ X.A.r; // Error //// [exportStarFromEmptyModule_module1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module2.js] // empty //// [exportStarFromEmptyModule_module3.js] @@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +Object.defineProperty(exports, "__esModule", { value: true }); __export(require("./exportStarFromEmptyModule_module2")); __export(require("./exportStarFromEmptyModule_module1")); var A = (function () { @@ -47,14 +48,13 @@ var A = (function () { return A; }()); exports.A = A; -Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module4.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var X = require("./exportStarFromEmptyModule_module3"); var s; X.A.q; X.A.r; // Error -Object.defineProperty(exports, "__esModule", { value: true }); //// [exportStarFromEmptyModule_module1.d.ts] diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js index ee9482c655ff5..d527a02741c95 100644 --- a/tests/baselines/reference/exportToString.js +++ b/tests/baselines/reference/exportToString.js @@ -5,6 +5,6 @@ export { toString }; //// [exportToString.js] "use strict"; +exports.__esModule = true; var toString = 0; exports.toString = toString; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js index d66cf54312488..fbb2555d54b75 100644 --- a/tests/baselines/reference/exportVisibility.js +++ b/tests/baselines/reference/exportVisibility.js @@ -11,6 +11,7 @@ export function test(foo: Foo) { //// [exportVisibility.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } @@ -22,4 +23,3 @@ function test(foo) { return true; } exports.test = test; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js index 357e7dc25f448..068ac5db23b84 100644 --- a/tests/baselines/reference/exportedBlockScopedDeclarations.js +++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js @@ -20,6 +20,7 @@ namespace NS1 { //// [exportedBlockScopedDeclarations.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var foo = foo; // compile error exports.bar = exports.bar; // should be compile error function f() { @@ -38,5 +39,4 @@ define(["require", "exports"], function (require, exports) { (function (NS1) { NS1.bar1 = NS1.bar1; // should be compile error })(NS1 || (NS1 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js index 11737e21e734f..80a7fc6a39152 100644 --- a/tests/baselines/reference/exportedVariable1.js +++ b/tests/baselines/reference/exportedVariable1.js @@ -6,7 +6,7 @@ var upper = foo.name.toUpperCase(); //// [exportedVariable1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.foo = { name: "Bill" }; var upper = exports.foo.name.toUpperCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js index 5e9d0f2edf251..d50a2a35f0618 100644 --- a/tests/baselines/reference/exportingContainingVisibleType.js +++ b/tests/baselines/reference/exportingContainingVisibleType.js @@ -13,6 +13,7 @@ export var x = 5; //// [exportingContainingVisibleType.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } @@ -27,5 +28,4 @@ define(["require", "exports"], function (require, exports) { return Foo; }()); exports.x = 5; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js index f6456368e33b0..87761c779faab 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.js +++ b/tests/baselines/reference/exportsAndImports1-amd.js @@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var v = 1; exports.v = v; function f() { } @@ -60,27 +61,26 @@ define(["require", "exports"], function (require, exports) { exports.M = M; var a = M.x; exports.a = a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v; exports.f = t1_1.f; exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v; exports.f = t1_1.f; exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js index 968cd18537872..6b9a40f0ea217 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.js +++ b/tests/baselines/reference/exportsAndImports1-es6.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var v = 1; exports.v = v; function f() { } @@ -56,9 +57,9 @@ var M; exports.M = M; var a = M.x; exports.a = a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -66,9 +67,9 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -76,4 +77,3 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index a6f97be067729..56f74d27473c4 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +exports.__esModule = true; var v = 1; exports.v = v; function f() { } @@ -59,9 +60,9 @@ var M; exports.M = M; var a = M.x; exports.a = a; -exports.__esModule = true; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -69,9 +70,9 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; @@ -79,4 +80,3 @@ exports.C = t1_1.C; exports.E = t1_1.E; exports.M = t1_1.M; exports.a = t1_1.a; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js index d67dd92707d94..5154751b21e12 100644 --- a/tests/baselines/reference/exportsAndImports2-amd.js +++ b/tests/baselines/reference/exportsAndImports2-amd.js @@ -16,21 +16,21 @@ export { x as y, y as x }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.x = "x"; exports.y = "y"; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.y = t1_1.x; exports.x = t1_1.y; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.y = t1_1.x; exports.x = t1_1.y; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js index 59ee55defd830..b0714b83c39e6 100644 --- a/tests/baselines/reference/exportsAndImports2-es6.js +++ b/tests/baselines/reference/exportsAndImports2-es6.js @@ -15,18 +15,18 @@ export { x as y, y as x }; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.x = "x"; exports.y = "y"; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js index 672d7161e74f4..5b3fe689d9029 100644 --- a/tests/baselines/reference/exportsAndImports2.js +++ b/tests/baselines/reference/exportsAndImports2.js @@ -15,18 +15,18 @@ export { x as y, y as x }; //// [t1.js] "use strict"; +exports.__esModule = true; exports.x = "x"; exports.y = "y"; -exports.__esModule = true; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js index 1f74addddec17..a6af4adb5f48b 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.js +++ b/tests/baselines/reference/exportsAndImports3-amd.js @@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = 1; exports.v1 = exports.v; function f() { } @@ -62,27 +63,26 @@ define(["require", "exports"], function (require, exports) { exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t2.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v1; exports.f = t1_1.f1; exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [t3.js] define(["require", "exports", "./t1"], function (require, exports, t1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.v = t1_1.v1; exports.f = t1_1.f1; exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js index b4152cab77867..1ac23446807d2 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.js +++ b/tests/baselines/reference/exportsAndImports3-es6.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.v = 1; exports.v1 = exports.v; function f() { } @@ -58,9 +59,9 @@ var M; exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -68,9 +69,9 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -78,4 +79,3 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index 2bc4c828fe1c6..4dfa0411946e0 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a }; //// [t1.js] "use strict"; +exports.__esModule = true; exports.v = 1; exports.v1 = exports.v; function f() { } @@ -61,9 +62,9 @@ var M; exports.M1 = M; exports.a = M.x; exports.a1 = exports.a; -exports.__esModule = true; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -71,9 +72,9 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; @@ -81,4 +82,3 @@ exports.C = t1_1.C1; exports.E = t1_1.E1; exports.M = t1_1.M1; exports.a = t1_1.a1; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js index ddacb1eec94b0..ed31f42ebc781 100644 --- a/tests/baselines/reference/exportsAndImports4-amd.js +++ b/tests/baselines/reference/exportsAndImports4-amd.js @@ -42,12 +42,13 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.default = "hello"; 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"; + Object.defineProperty(exports, "__esModule", { value: true }); exports.a = a; a.default; exports.b = t1_1.default; @@ -65,5 +66,4 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f exports.f2 = t1_4.default; t1_4.default; t1_4.default; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js index 5f0c37ab04fd1..d8c51d03bb1de 100644 --- a/tests/baselines/reference/exportsAndImports4-es6.js +++ b/tests/baselines/reference/exportsAndImports4-es6.js @@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] "use strict"; -exports.default = "hello"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = "hello"; //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const a = require("./t1"); exports.a = a; a.default; @@ -67,4 +68,3 @@ exports.f1 = t1_4.default; exports.f2 = t1_4.default; t1_4.default; t1_4.default; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js index 6a78862e55e09..99f81a6b87542 100644 --- a/tests/baselines/reference/exportsAndImports4.js +++ b/tests/baselines/reference/exportsAndImports4.js @@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 }; //// [t1.js] "use strict"; -exports.default = "hello"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = "hello"; //// [t3.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var a = require("./t1"); exports.a = a; a.default; @@ -67,4 +68,3 @@ exports.f1 = t1_4.default; exports.f2 = t1_4.default; t1_4.default; t1_4.default; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js index 0a2ee7d318300..068afdc346b57 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js @@ -21,6 +21,7 @@ import { get } from "./t1"; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var set = { set foo(x) { } @@ -28,7 +29,6 @@ var set = { exports.set = set; var get = 10; exports.get = get; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js index ea7f554d1b351..8b1deff064f50 100644 --- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js +++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js @@ -19,16 +19,16 @@ import { as } from "./t1"; //// [t1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var as = 100; exports.return = as; exports.as = as; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var as = require("./t1"); var x = as.as; var y = as.return; -Object.defineProperty(exports, "__esModule", { value: true }); //// [t3.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js index 2b3e9d36f337f..207d2948fa471 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js @@ -16,15 +16,15 @@ const { __, _, ___ } = R; //// [m1.js] "use strict"; +exports.__esModule = true; var R; exports["default"] = R = { "__": 20, "_": 10, "___": 30 }; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js index 3555148f75520..a53d4662e9766 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js @@ -15,14 +15,14 @@ const { __esmodule, __proto__ } = R; //// [m1.js] "use strict"; +exports.__esModule = true; var R; exports["default"] = R = { "__esmodule": true, "__proto__": {} }; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js index 028ca80400fac..3a5bba1deed58 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js @@ -16,15 +16,15 @@ const { ___, ___hello, _hi } = R; //// [m1.js] "use strict"; +exports.__esModule = true; var R; exports["default"] = R = { "___": 30, "___hello": 21, "_hi": 40 }; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi; -exports.__esModule = true; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js index fa643c5e7e2a6..718d048b9a27a 100644 --- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js @@ -36,6 +36,7 @@ _hi(); //// [m1.js] "use strict"; +exports.__esModule = true; function _() { console.log("_"); } @@ -64,9 +65,9 @@ function ___hello() { console.log("___hello"); } exports.___hello = ___hello; -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m1_1 = require("./m1"); m1_1._(); m1_1.__(); @@ -74,4 +75,3 @@ m1_1.___hello(); m1_1.__esmodule(); m1_1.__proto(); m1_1._hi(); -exports.__esModule = true; diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js index a5900c588ba3d..28c9488f7fa35 100644 --- a/tests/baselines/reference/extendClassExpressionFromModule.js +++ b/tests/baselines/reference/extendClassExpressionFromModule.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var foo1 = require("./foo1"); var x = foo1; var y = (function (_super) { @@ -40,4 +41,3 @@ var y = (function (_super) { } return y; }(x)); -exports.__esModule = true; diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js index 4f0d5ced7b515..c8f7719faf026 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js @@ -34,13 +34,13 @@ var visModel = new moduleMap[moduleName].VisualizationModel(); //// [extendingClassFromAliasAndUsageInIndexer_backbone.js] "use strict"; +exports.__esModule = true; var Model = (function () { function Model() { } return Model; }()); exports.Model = Model; -exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -53,6 +53,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -62,7 +63,6 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -75,6 +75,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone"); var VisualizationModel = (function (_super) { __extends(VisualizationModel, _super); @@ -84,9 +85,9 @@ var VisualizationModel = (function (_super) { return VisualizationModel; }(Backbone.Model)); exports.VisualizationModel = VisualizationModel; -exports.__esModule = true; //// [extendingClassFromAliasAndUsageInIndexer_main.js] "use strict"; +exports.__esModule = true; var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA"); var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB"); var moduleATyped = moduleA; @@ -96,4 +97,3 @@ var moduleMap = { }; var moduleName; var visModel = new moduleMap[moduleName].VisualizationModel(); -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js index 41ec58a467df7..70ce2281ad3d6 100644 --- a/tests/baselines/reference/externalModuleAssignToVar.js +++ b/tests/baselines/reference/externalModuleAssignToVar.js @@ -29,13 +29,13 @@ y3 = ext3; // ok //// [externalModuleAssignToVar_core_require.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); //// [externalModuleAssignToVar_core_require2.js] define(["require", "exports"], function (require, exports) { @@ -60,11 +60,11 @@ 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"; + exports.__esModule = true; var y1 = ext; y1 = ext; // ok var y2 = ext2; y2 = ext2; // ok var y3 = ext3; y3 = ext3; // ok - exports.__esModule = true; }); diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js index ca51181ec3b6c..33aa1776e9448 100644 --- a/tests/baselines/reference/externalModuleExportingGenericClass.js +++ b/tests/baselines/reference/externalModuleExportingGenericClass.js @@ -25,8 +25,8 @@ var C = (function () { module.exports = C; //// [externalModuleExportingGenericClass_file1.js] "use strict"; +exports.__esModule = true; var a = require("./externalModuleExportingGenericClass_file0"); var v; // this should report error var v2 = (new a()).foo; var v3 = (new a()).foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js index bd811cd8b5814..7e2a78a4728b6 100644 --- a/tests/baselines/reference/externalModuleImmutableBindings.js +++ b/tests/baselines/reference/externalModuleImmutableBindings.js @@ -53,10 +53,11 @@ for ((stuff[n]) of []) {} //// [f1.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [f2.js] "use strict"; +exports.__esModule = true; // all mutations below are illegal and should be fixed var stuff = require("./f1"); var n = 'baz'; @@ -108,4 +109,3 @@ for ((stuff[n]) in []) { } for (var _p = 0, _q = []; _p < _q.length; _p++) { (stuff[n]) = _q[_p]; } -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js index 353af42a40847..0402847a13a93 100644 --- a/tests/baselines/reference/externalModuleQualification.js +++ b/tests/baselines/reference/externalModuleQualification.js @@ -13,6 +13,7 @@ class NavigateAction { //// [externalModuleQualification.js] "use strict"; +exports.__esModule = true; exports.ID = "test"; var DiffEditor = (function () { function DiffEditor(id) { @@ -28,4 +29,3 @@ var NavigateAction = (function () { }; return NavigateAction; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js index 75d719670d18e..e5a854077c5b1 100644 --- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js +++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js @@ -11,15 +11,15 @@ file1.foo(); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo() { } exports.foo = foo; ; - exports.__esModule = true; }); //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js] define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) { "use strict"; + exports.__esModule = true; exports.file1 = file1; exports.file1.foo(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js index a012d0d37b65d..3a930d8e03a41 100644 --- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js +++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js @@ -20,14 +20,14 @@ file1.bar(); //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js] //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js] "use strict"; +exports.__esModule = true; function foo() { } exports.foo = foo; ; -exports.__esModule = true; //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js] "use strict"; +exports.__esModule = true; /// var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1"); file1.foo(); file1.bar(); -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js index 3d1fe11f88f34..1ef5be538831e 100644 --- a/tests/baselines/reference/externalModuleResolution.js +++ b/tests/baselines/reference/externalModuleResolution.js @@ -25,6 +25,6 @@ var M2; module.exports = M2; //// [consumer.js] "use strict"; +exports.__esModule = true; var x = require("./foo"); x.Y; // .ts should be picked -exports.__esModule = true; diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js index 96fb493090fee..2c3c9facff18c 100644 --- a/tests/baselines/reference/externalModuleResolution2.js +++ b/tests/baselines/reference/externalModuleResolution2.js @@ -26,6 +26,6 @@ var M2; module.exports = M2; //// [consumer.js] "use strict"; +exports.__esModule = true; var x = require("./foo"); x.X; // .ts should be picked -exports.__esModule = true; diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js index 959a3ffffcf37..673a0372f054d 100644 --- a/tests/baselines/reference/fieldAndGetterWithSameName.js +++ b/tests/baselines/reference/fieldAndGetterWithSameName.js @@ -7,6 +7,7 @@ export class C { //// [fieldAndGetterWithSameName.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } @@ -18,5 +19,4 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js index 793f4ab6c0605..9b48439ad5608 100644 --- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js +++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js @@ -12,13 +12,13 @@ function foo() { //// [a.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c = (function () { function c() { } return c; }()); exports.c = c; - exports.__esModule = true; }); function foo() { } diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js index 3b1644e7ac11b..2bc6d91b2c3e6 100644 --- a/tests/baselines/reference/functionAndImportNameConflict.js +++ b/tests/baselines/reference/functionAndImportNameConflict.js @@ -11,13 +11,13 @@ export function f() { //// [f1.js] "use strict"; +exports.__esModule = true; function f() { } exports.f = f; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; function f() { } exports.f = f; -exports.__esModule = true; diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js index d794cded0f4f8..9bf71aff1eab7 100644 --- a/tests/baselines/reference/functionLikeInParameterInitializer.js +++ b/tests/baselines/reference/functionLikeInParameterInitializer.js @@ -21,6 +21,7 @@ export function baz3(func = class { x = foo }) { //// [functionLikeInParameterInitializer.js] "use strict"; +exports.__esModule = true; // error function bar(func) { if (func === void 0) { func = function () { return foo; }; } @@ -50,4 +51,3 @@ function baz3(func) { var foo = "in"; } exports.baz3 = baz3; -exports.__esModule = true; diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js index 426697dfa8dc8..b7e460af9b10d 100644 --- a/tests/baselines/reference/generatorES6InAMDModule.js +++ b/tests/baselines/reference/generatorES6InAMDModule.js @@ -6,9 +6,9 @@ export function* foo() { //// [generatorES6InAMDModule.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function* foo() { yield; } exports.foo = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js index 1b008c90860da..738fa996cf785 100644 --- a/tests/baselines/reference/genericClassesInModule2.js +++ b/tests/baselines/reference/genericClassesInModule2.js @@ -23,6 +23,7 @@ export class B { //// [genericClassesInModule2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A(callback) { this.callback = callback; @@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) { return B; }()); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js index 2cbb4485e3181..83b100f48370d 100644 --- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js +++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js @@ -10,9 +10,9 @@ export function foo(fn: (ifoo: IFoo) => void) { //// [genericInterfaceFunctionTypeParameter.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function foo(fn) { foo(fn); // Invocation is necessary to repro (!) } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js index 9704fe5d148a2..61a9298eb7f85 100644 --- a/tests/baselines/reference/genericMemberFunction.js +++ b/tests/baselines/reference/genericMemberFunction.js @@ -25,6 +25,7 @@ export class BuildResult{ //// [genericMemberFunction.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var BuildError = (function () { function BuildError() { } @@ -59,5 +60,4 @@ define(["require", "exports"], function (require, exports) { return BuildResult; }()); exports.BuildResult = BuildResult; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js index 457158faee1c5..728d81dd147bc 100644 --- a/tests/baselines/reference/genericReturnTypeFromGetter1.js +++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js @@ -11,6 +11,7 @@ export class DbSet { //// [genericReturnTypeFromGetter1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var DbSet = (function () { function DbSet() { } @@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) { return DbSet; }()); exports.DbSet = DbSet; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js index 3201344c0de80..a958516dfa034 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases1.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js @@ -21,8 +21,8 @@ x.m2(); //// [genericTypeWithMultipleBases1.js] "use strict"; +exports.__esModule = true; var x; x.p1; x.m1(); x.m2(); -exports.__esModule = true; diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js index a445714400055..43651ec8278ae 100644 --- a/tests/baselines/reference/genericTypeWithMultipleBases2.js +++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js @@ -21,9 +21,9 @@ x.m2(); //// [genericTypeWithMultipleBases2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var x; x.p1; x.m1(); x.m2(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js index 0ed35307d2d5d..3f5e3dcfe8e6e 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js @@ -27,6 +27,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Collection = (function () { function Collection() { } @@ -56,5 +57,4 @@ define(["require", "exports"], function (require, exports) { return ListItem; }(CollectionItem)); exports.ListItem = ListItem; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline index 783ec2bf947a6..5739596a8f0e9 100644 --- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline +++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline @@ -3,13 +3,13 @@ EmitSkipped: false EmitSkipped: false FileName : /tests/cases/fourslash/inputFile2.js "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -Object.defineProperty(exports, "__esModule", { value: true }); EmitSkipped: false FileName : /tests/cases/fourslash/inputFile3.js diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index 74cf137ef37ae..50e80f9483142 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -4,6 +4,7 @@ Diagnostics: FileName : /tests/cases/fourslash/inputFile.js define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -13,6 +14,5 @@ define(["require", "exports"], function (require, exports) { (function (M) { M.foo = new C(); })(M = exports.M || (exports.M = {})); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 434835a59d3a2..ce4df039932fc 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -684,6 +684,7 @@ export declare module eaM { //// [giant.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; /* Prefixes p -> public @@ -1107,7 +1108,6 @@ define(["require", "exports"], function (require, exports) { ; })(eM = exports.eM || (exports.eM = {})); ; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js index 040bdccd515aa..60bea32e305fa 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js @@ -16,14 +16,15 @@ module m_private { //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js] "use strict"; +exports.__esModule = true; var m; (function (m) { function foo() { } m.foo = foo; })(m = exports.m || (exports.m = {})); -exports.__esModule = true; //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js] "use strict"; +exports.__esModule = true; var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0"); var m_private; (function (m_private) { @@ -31,4 +32,3 @@ var m_private; m_private.C = r; // no error m_private.C.m.foo(); })(m_private || (m_private = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js index a626d034c7572..725390825c605 100644 --- a/tests/baselines/reference/importAsBaseClass.js +++ b/tests/baselines/reference/importAsBaseClass.js @@ -12,6 +12,7 @@ class Hello extends Greeter { } //// [importAsBaseClass_0.js] "use strict"; +exports.__esModule = true; var Greeter = (function () { function Greeter() { } @@ -19,7 +20,6 @@ var Greeter = (function () { return Greeter; }()); exports.Greeter = Greeter; -exports.__esModule = true; //// [importAsBaseClass_1.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var Greeter = require("./importAsBaseClass_0"); var Hello = (function (_super) { __extends(Hello, _super); @@ -40,4 +41,3 @@ var Hello = (function (_super) { } return Hello; }(Greeter)); -exports.__esModule = true; diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index a33b758df7d1e..1e5e5d0ec719e 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -83,6 +83,7 @@ export var useMultiImport_m4_f4 = multiImport_m4.foo(); //// [importDecl_require.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -91,9 +92,9 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require1.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -103,9 +104,9 @@ exports.d = d; var x; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require2.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -114,9 +115,9 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require3.js] "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -125,14 +126,14 @@ var d = (function () { exports.d = d; function foo() { return null; } exports.foo = foo; -exports.__esModule = true; //// [importDecl_require4.js] "use strict"; +exports.__esModule = true; function foo2() { return null; } exports.foo2 = foo2; -exports.__esModule = true; //// [importDecl_1.js] "use strict"; +exports.__esModule = true; /// /// /// @@ -174,7 +175,6 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); -exports.__esModule = true; //// [importDecl_require.d.ts] diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js index 98e322fb61967..00e5dae1f9593 100644 --- a/tests/baselines/reference/importDeclWithClassModifiers.js +++ b/tests/baselines/reference/importDeclWithClassModifiers.js @@ -12,9 +12,9 @@ var b: a; //// [importDeclWithClassModifiers.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = x.c; exports.b = x.c; exports.c = x.c; var b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js index 05c40739a8202..e7929ac27fc29 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.js +++ b/tests/baselines/reference/importDeclWithDeclareModifier.js @@ -9,6 +9,6 @@ var b: a; //// [importDeclWithDeclareModifier.js] "use strict"; +exports.__esModule = true; exports.a = x.c; var b; -exports.__esModule = true; diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js index c23fae4074908..26076c2630eff 100644 --- a/tests/baselines/reference/importDeclWithExportModifier.js +++ b/tests/baselines/reference/importDeclWithExportModifier.js @@ -10,7 +10,7 @@ var b: a; //// [importDeclWithExportModifier.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.a = x.c; var b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js index a4102cbfff4d2..ce5069c335edd 100644 --- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js +++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js @@ -8,5 +8,5 @@ export = x; //// [importDeclWithExportModifierAndExportAssignment.js] "use strict"; -exports.a = x.c; exports.__esModule = true; +exports.a = x.c; diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js index ee4e8f1dc8c39..cce30fd8b85e6 100644 --- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js +++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js @@ -13,13 +13,13 @@ export var x: typeof a; //// [importDeclarationUsedAsTypeQuery_require.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [importDeclarationUsedAsTypeQuery_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js index 7f2c4ad4036ee..bf66829a4350d 100644 --- a/tests/baselines/reference/importHelpers.js +++ b/tests/baselines/reference/importHelpers.js @@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -66,7 +67,6 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js index 03a4e6393d7fa..b756355921de6 100644 --- a/tests/baselines/reference/importHelpersAmd.js +++ b/tests/baselines/reference/importHelpersAmd.js @@ -19,17 +19,18 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); //// [b.js] define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var B = (function (_super) { tslib_1.__extends(B, _super); function B() { @@ -38,5 +39,4 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib return B; }(a_1.A)); exports.B = B; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js index 828c1a5a3601c..72a91ac365e39 100644 --- a/tests/baselines/reference/importHelpersInIsolatedModules.js +++ b/tests/baselines/reference/importHelpersInIsolatedModules.js @@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -66,9 +67,9 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -98,4 +99,3 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js index 2883a7aaa53ad..330b8623f696b 100644 --- a/tests/baselines/reference/importHelpersInTsx.js +++ b/tests/baselines/reference/importHelpersInTsx.js @@ -21,9 +21,9 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); exports.x = React.createElement("span", tslib_1.__assign({}, o)); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __assign = (this && this.__assign) || Object.assign || function(t) { for (var s, i = 1, n = arguments.length; i < n; i++) { diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js index 4747e017ff513..5b98b61da2045 100644 --- a/tests/baselines/reference/importHelpersNoHelpers.js +++ b/tests/baselines/reference/importHelpersNoHelpers.js @@ -34,6 +34,7 @@ export {} //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -68,7 +69,6 @@ C = tslib_1.__decorate([ var o = { a: 1 }; var y = tslib_1.__assign({}, o); var x = tslib_1.__rest(y, []); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js index efcd4827257be..36a326e124d38 100644 --- a/tests/baselines/reference/importHelpersNoModule.js +++ b/tests/baselines/reference/importHelpersNoModule.js @@ -27,6 +27,7 @@ class C { //// [external.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var A = (function () { function A() { @@ -58,7 +59,6 @@ tslib_1.__decorate([ C = tslib_1.__decorate([ dec ], C); -Object.defineProperty(exports, "__esModule", { value: true }); //// [script.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js index 233b12208c13d..55bf2ea9d4655 100644 --- a/tests/baselines/reference/importHelpersOutFile.js +++ b/tests/baselines/reference/importHelpersOutFile.js @@ -23,16 +23,17 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge //// [out.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var B = (function (_super) { tslib_1.__extends(B, _super); function B() { @@ -41,10 +42,10 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts return B; }(a_1.A)); exports.B = B; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var C = (function (_super) { tslib_2.__extends(C, _super); function C() { @@ -53,5 +54,4 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts return C; }(a_2.A)); exports.C = C; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js index 917c50f3fee3f..0c6f0540354c8 100644 --- a/tests/baselines/reference/importImportOnlyModule.js +++ b/tests/baselines/reference/importImportOnlyModule.js @@ -18,6 +18,7 @@ var x = foo; // Cause a runtime dependency //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { this.m1 = 42; @@ -26,17 +27,16 @@ define(["require", "exports"], function (require, exports) { }()); C1.s1 = true; exports.C1 = C1; - exports.__esModule = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var answer = 42; // No exports exports.__esModule = true; + 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 exports.__esModule = true; + var x = foo; // Cause a runtime dependency }); diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js index cfc63f83551ec..da492a7103d92 100644 --- a/tests/baselines/reference/importInsideModule.js +++ b/tests/baselines/reference/importInsideModule.js @@ -11,8 +11,8 @@ export module myModule { //// [importInsideModule_file2.js] "use strict"; +exports.__esModule = true; var myModule; (function (myModule) { var a = foo.x; })(myModule = exports.myModule || (exports.myModule = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js index 8af20d4be36f0..0340bcd35cb3e 100644 --- a/tests/baselines/reference/importNonExternalModule.js +++ b/tests/baselines/reference/importNonExternalModule.js @@ -21,8 +21,8 @@ var foo; //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; // Import should fail. foo_0 not an external module if (foo.answer === 42) { } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js index e5785d928666a..eb76621f7c06e 100644 --- a/tests/baselines/reference/importNonStringLiteral.js +++ b/tests/baselines/reference/importNonStringLiteral.js @@ -5,5 +5,5 @@ import foo = require(x); // invalid //// [foo_0.js] "use strict"; -var x = "filename"; exports.__esModule = true; +var x = "filename"; diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js index 658b464983ad9..40213ce99687d 100644 --- a/tests/baselines/reference/importTsBeforeDTs.js +++ b/tests/baselines/reference/importTsBeforeDTs.js @@ -15,11 +15,11 @@ var z2 = foo.y + 10; // Should resolve //// [foo_0.js] "use strict"; -exports.y = 42; exports.__esModule = true; +exports.y = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; 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 -exports.__esModule = true; diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js index d44239cec115a..15bf907ddd5b1 100644 --- a/tests/baselines/reference/importUsedInExtendsList1.js +++ b/tests/baselines/reference/importUsedInExtendsList1.js @@ -13,13 +13,13 @@ var r: string = s.foo; //// [importUsedInExtendsList1_require.js] "use strict"; +exports.__esModule = true; var Super = (function () { function Super() { } return Super; }()); exports.Super = Super; -exports.__esModule = true; //// [importUsedInExtendsList1_1.js] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; /// var foo = require("./importUsedInExtendsList1_require"); var Sub = (function (_super) { @@ -43,4 +44,3 @@ var Sub = (function (_super) { }(foo.Super)); var s; var r = s.foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js index c5e502f3fdc08..9450fc5d7b2d8 100644 --- a/tests/baselines/reference/importWithTrailingSlash.js +++ b/tests/baselines/reference/importWithTrailingSlash.js @@ -22,23 +22,23 @@ aIndex.aIndex; //// [a.js] "use strict"; -exports["default"] = { a: 0 }; exports.__esModule = true; +exports["default"] = { a: 0 }; //// [index.js] "use strict"; -exports["default"] = { aIndex: 0 }; exports.__esModule = true; +exports["default"] = { aIndex: 0 }; //// [test.js] "use strict"; +exports.__esModule = true; var _1 = require("."); var _2 = require("./"); _1["default"].a; _2["default"].aIndex; -exports.__esModule = true; //// [test.js] "use strict"; +exports.__esModule = true; var __1 = require(".."); var _1 = require("../"); __1["default"].a; _1["default"].aIndex; -exports.__esModule = true; diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js index 16c6f2b95c7af..b3d607a6943a6 100644 --- a/tests/baselines/reference/import_reference-exported-alias.js +++ b/tests/baselines/reference/import_reference-exported-alias.js @@ -45,8 +45,8 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { "use strict"; + exports.__esModule = true; var Services = appJs.Services; var UserServices = Services.UserServices; var x = new UserServices().getUserName(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js index 5934d9b2f5ead..c6771d47bae30 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.js +++ b/tests/baselines/reference/import_reference-to-type-alias.js @@ -20,6 +20,7 @@ var x = new Services.UserServices().getUserName(); //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var App; (function (App) { var Services; @@ -35,12 +36,11 @@ define(["require", "exports"], function (require, exports) { Services.UserServices = UserServices; })(Services = App.Services || (App.Services = {})); })(App = exports.App || (exports.App = {})); - exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { "use strict"; + exports.__esModule = true; var Services = appJs.App.Services; var x = new Services.UserServices().getUserName(); - exports.__esModule = true; }); 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 7fb4e02d9fd1d..1cd0376ddedf1 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 @@ -19,7 +19,7 @@ var p = testData[0].name; //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var testData; var p = testData[0].name; - exports.__esModule = true; }); 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 c2ac2416806b1..9b5e518804cc1 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 @@ -13,18 +13,18 @@ var v = new hostVar.Host(); //// [host.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Host = (function () { function Host() { } return Host; }()); exports.Host = Host; - exports.__esModule = true; }); //// [consumer.js] define(["require", "exports", "host"], function (require, exports, host) { "use strict"; + exports.__esModule = true; var hostVar = host; var v = new hostVar.Host(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js index 61b411ea571c4..b82ac22f4ede4 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.js +++ b/tests/baselines/reference/importedAliasesInTypePositions.js @@ -21,6 +21,7 @@ export module ImportingModule { //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var elaborate; (function (elaborate) { var nested; @@ -41,11 +42,11 @@ define(["require", "exports"], function (require, exports) { })(mod = nested.mod || (nested.mod = {})); })(nested = elaborate.nested || (elaborate.nested = {})); })(elaborate = exports.elaborate || (exports.elaborate = {})); - exports.__esModule = true; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var ImportingModule; (function (ImportingModule) { var UsesReferredType = (function () { @@ -55,5 +56,4 @@ define(["require", "exports"], function (require, exports) { return UsesReferredType; }()); })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js index 52761e7e9db13..5f4f9677dcd6c 100644 --- a/tests/baselines/reference/importedModuleClassNameClash.js +++ b/tests/baselines/reference/importedModuleClassNameClash.js @@ -9,10 +9,10 @@ class foo { } //// [importedModuleClassNameClash.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var foo = (function () { function foo() { } return foo; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js index b85c7145a4716..dd45d4db89c64 100644 --- a/tests/baselines/reference/importsImplicitlyReadonly.js +++ b/tests/baselines/reference/importsImplicitlyReadonly.js @@ -23,12 +23,13 @@ a3.y = 1; //// [a.js] "use strict"; +exports.__esModule = true; exports.x = 1; var y = 1; exports.y = y; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var a_1 = require("./a"); var a1 = require("./a"); var a2 = require("./a"); @@ -41,4 +42,3 @@ a2.x = 1; a2.y = 1; a3.x = 1; a3.y = 1; -exports.__esModule = true; diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js index bc20008c2fabe..997cbcd5b791b 100644 --- a/tests/baselines/reference/inferenceLimit.js +++ b/tests/baselines/reference/inferenceLimit.js @@ -53,6 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); class BrokenClass { constructor() { } brokenMethod(field, value) { @@ -80,4 +81,3 @@ class BrokenClass { } } exports.BrokenClass = BrokenClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js index 9fe669911b269..293be662a4d74 100644 --- a/tests/baselines/reference/instanceOfInExternalModules.js +++ b/tests/baselines/reference/instanceOfInExternalModules.js @@ -14,19 +14,19 @@ function IsFoo(value: any): boolean { //// [instanceOfInExternalModules_require.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; - exports.__esModule = true; }); //// [instanceOfInExternalModules_1.js] define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) { "use strict"; + exports.__esModule = true; function IsFoo(value) { return value instanceof Bar.Foo; } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js index 7fb7b08a8818f..ec50272592509 100644 --- a/tests/baselines/reference/interfaceContextualType.js +++ b/tests/baselines/reference/interfaceContextualType.js @@ -23,6 +23,7 @@ class Bug { //// [interfaceContextualType.js] "use strict"; +exports.__esModule = true; var Bug = (function () { function Bug() { } @@ -37,4 +38,3 @@ var Bug = (function () { }; return Bug; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js index 01a648055303f..41f12dbac05b1 100644 --- a/tests/baselines/reference/interfaceDeclaration3.js +++ b/tests/baselines/reference/interfaceDeclaration3.js @@ -58,6 +58,7 @@ interface I2 extends I1 { item:string; } //// [interfaceDeclaration3.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var M1; (function (M1) { var C1 = (function () { @@ -119,5 +120,4 @@ define(["require", "exports"], function (require, exports) { } return C3; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js index dde6b1632f1c6..318e8903c36f0 100644 --- a/tests/baselines/reference/interfaceDeclaration5.js +++ b/tests/baselines/reference/interfaceDeclaration5.js @@ -6,11 +6,11 @@ export class C1 { } //// [interfaceDeclaration5.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { } return C1; }()); exports.C1 = C1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js index 5fb3996134b15..0bc759f6cda86 100644 --- a/tests/baselines/reference/interfaceImplementation6.js +++ b/tests/baselines/reference/interfaceImplementation6.js @@ -27,6 +27,7 @@ export class Test { //// [interfaceImplementation6.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { } @@ -50,5 +51,4 @@ define(["require", "exports"], function (require, exports) { return Test; }()); exports.Test = Test; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index 20ce33035e6e2..0b333ac1830a1 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -19,6 +19,7 @@ export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -41,7 +42,6 @@ var m2; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); exports.d = new m2.m3.c(); -exports.__esModule = true; //// [internalAliasClassInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 6868a0511a623..cf2eb41662b56 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -17,6 +17,7 @@ export module m2 { //// [internalAliasClassInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -38,7 +39,6 @@ var m2; var cReturnVal = m3.cProp.foo(10); })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); -exports.__esModule = true; //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js index d9f47a05d9e9c..1de7fe25407fb 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js @@ -19,6 +19,7 @@ export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -41,4 +42,3 @@ var m2; })(m3 = m2.m3 || (m2.m3 = {})); })(m2 = exports.m2 || (exports.m2 = {})); exports.d = new m2.m3.c(); -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index 52a2e0b3fed87..e224b40c9f320 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -28,7 +29,6 @@ var x; exports.xc = x.c; exports.cProp = new exports.xc(); var cReturnVal = exports.cProp.foo(10); -exports.__esModule = true; //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index 640b533f1518c..16f53fe3e8b0e 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var x; (function (x) { var c = (function () { @@ -28,7 +29,6 @@ var x; var xc = x.c; exports.cProp = new xc(); var cReturnVal = exports.cProp.foo(10); -exports.__esModule = true; //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index de2582debefe4..c387fa6e2c415 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -15,6 +15,7 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var weekend; @@ -29,7 +30,6 @@ var c; c.b = a.weekend; c.bVal = c.b.Sunday; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasEnumInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index 6e54ed79afc41..717652283cf96 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -15,6 +15,7 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var weekend; @@ -29,7 +30,6 @@ var c; var b = a.weekend; c.bVal = b.Sunday; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js index c7b5180fd9346..a84ebf0b9aded 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js @@ -16,6 +16,7 @@ var happyFriday = c.b.Friday; //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var weekend; @@ -31,4 +32,3 @@ var c; c.bVal = b.Sunday; })(c = exports.c || (exports.c = {})); var happyFriday = c.b.Friday; -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index d3e9fdf8349c5..ad07b9bd33f1c 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -14,6 +14,7 @@ export var bVal: b = b.Sunday; //// [internalAliasEnumInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var weekend; @@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); exports.b = a.weekend; exports.bVal = exports.b.Sunday; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index 99b9156c0c9d2..6b5f5b17a26de 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -14,6 +14,7 @@ export var bVal: b = b.Sunday; //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var weekend; @@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); var b = a.weekend; exports.bVal = b.Sunday; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index 4138970da0bb4..95bb936bc75e2 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -27,7 +28,6 @@ var c; c.bVal = c.b(10); c.bVal2 = c.b; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index 83cab3c05bbd2..50de6b470ee4c 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -27,7 +28,6 @@ var c; var bVal = b(10); c.bVal2 = b; })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js index 67239e40b1d76..543e9952f235a 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js @@ -14,6 +14,7 @@ var d = c.b(11); //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -28,4 +29,3 @@ var c; c.bVal2 = b; })(c = exports.c || (exports.c = {})); var d = c.b(11); -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index 88765f267e635..267045b625d5d 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -13,6 +13,7 @@ export var bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -23,7 +24,6 @@ define(["require", "exports"], function (require, exports) { exports.b = a.foo; exports.bVal = exports.b(10); exports.bVal2 = exports.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index 160b404784919..bb3b0e244d2fa 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -12,6 +12,7 @@ export var bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { function foo(x) { @@ -22,7 +23,6 @@ var a; var b = a.foo; exports.bVal = b(10); exports.bVal2 = b; -exports.__esModule = true; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index 904c7171818bb..85335a0fb7f65 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -14,6 +14,7 @@ export module c { //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var b; @@ -31,7 +32,6 @@ define(["require", "exports"], function (require, exports) { c.b = a.b; c.x = new c.b.c(); })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index eb59627a4cbf5..c39e6cfd16848 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -13,6 +13,7 @@ export module c { //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var b; @@ -30,7 +31,6 @@ var c; var b = a.b; c.x = new b.c(); })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js index 77dbbab235a05..6e66118f5b934 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -15,6 +15,7 @@ export var d = new c.b.c(); //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var b; @@ -33,4 +34,3 @@ var c; c.x = new b.c(); })(c = exports.c || (exports.c = {})); exports.d = new c.b.c(); -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index 05fe46f1eb525..86d9f88cee372 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -11,6 +11,7 @@ export var x: b.c = new b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { var b; @@ -25,7 +26,6 @@ var a; })(a = exports.a || (exports.a = {})); exports.b = a.b; exports.x = new exports.b.c(); -exports.__esModule = true; //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 63f6b8c14226a..79185fed2284a 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -12,6 +12,7 @@ export var x: b.c = new b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { var b; @@ -26,7 +27,6 @@ define(["require", "exports"], function (require, exports) { })(a = exports.a || (exports.a = {})); var b = a.b; exports.x = new b.c(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index e2cbdc3b54dd3..bd50cd8bbc2ec 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -13,10 +13,10 @@ export module c { //// [internalAliasInterfaceInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index 15e03818d848b..f7b08e6c170aa 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -13,10 +13,10 @@ export module c { //// [internalAliasInterfaceInsideLocalModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js index ed4c6714196ca..19163ff1f66ab 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js @@ -14,9 +14,9 @@ var x: c.b; //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { })(c = exports.c || (exports.c = {})); var x; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index 1b74ded4656fd..7ca966e90b206 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -15,11 +15,11 @@ export module c { //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js] "use strict"; +exports.__esModule = true; var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index a46d7629ae9b0..22793f8aef5ae 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -15,11 +15,11 @@ export module c { //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); -exports.__esModule = true; //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js index efbb156bed8d9..a6b4f83de8e34 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -19,9 +19,9 @@ export var z: c.b.I; //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c; (function (c) { c.x.foo(); })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js index ac52f94db72d7..eccbd9a45bd58 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js @@ -15,8 +15,8 @@ x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x.foo(); exports.__esModule = true; + exports.x.foo(); }); diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index 45af45361514e..27de6bbfd9837 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -14,8 +14,8 @@ x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js] "use strict"; -exports.x.foo(); exports.__esModule = true; +exports.x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js index 5cd431470f538..34f044721c49e 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js @@ -12,6 +12,7 @@ export module c { //// [internalAliasVarInsideLocalModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { a.x = 10; @@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) { c.b = a.x; c.bVal = c.b; })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js index 956c70d7cbb39..161dc0bf97368 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js @@ -12,6 +12,7 @@ export module c { //// [internalAliasVarInsideLocalModuleWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { a.x = 10; @@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) { var b = a.x; c.bVal = b; })(c = exports.c || (exports.c = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js index 962e34c4a3e9a..a0192fc9daaf2 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js @@ -12,6 +12,7 @@ export var z = c.b; //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js] "use strict"; +exports.__esModule = true; var a; (function (a) { a.x = 10; @@ -22,4 +23,3 @@ var c; c.bVal = b; })(c = exports.c || (exports.c = {})); exports.z = c.b; -exports.__esModule = true; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js index 732257b93e5b2..d27b4e3188da2 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js @@ -11,13 +11,13 @@ export var bVal = b; //// [internalAliasVarInsideTopLevelModuleWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; (function (a) { a.x = 10; })(a = exports.a || (exports.a = {})); exports.b = a.x; exports.bVal = exports.b; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js index f0d02aa709ce4..65c9204ed3c1e 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js @@ -10,13 +10,13 @@ export var bVal = b; //// [internalAliasVarInsideTopLevelModuleWithoutExport.js] "use strict"; +exports.__esModule = true; var a; (function (a) { a.x = 10; })(a = exports.a || (exports.a = {})); var b = a.x; exports.bVal = b; -exports.__esModule = true; //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js index 27a75a64be615..32ddedae2b3c1 100644 --- a/tests/baselines/reference/intersectionTypeInference1.js +++ b/tests/baselines/reference/intersectionTypeInference1.js @@ -11,8 +11,8 @@ export const Form3 = brokenFunction(parameterFn)({store: "hello"}) //// [intersectionTypeInference1.js] // Repro from #8801 "use strict"; +exports.__esModule = true; function alert(s) { } var parameterFn = function (props) { return alert(props.store); }; var brokenFunction = function (f) { return function (o) { return o; }; }; exports.Form3 = brokenFunction(parameterFn)({ store: "hello" }); -exports.__esModule = true; diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js index f9590d70dd3c3..5aac4a6418671 100644 --- a/tests/baselines/reference/isolatedModulesImportExportElision.js +++ b/tests/baselines/reference/isolatedModulesImportExportElision.js @@ -25,6 +25,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +Object.defineProperty(exports, "__esModule", { value: true }); var module_1 = require("module"); var module_2 = require("module"); var ns = require("module"); @@ -40,4 +41,3 @@ var y = ns.value; var module_3 = require("module"); exports.c1 = module_3.c1; exports.z = x; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js index 0d4e00b2593c5..4ed1fdf2c7798 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js @@ -7,6 +7,6 @@ run(1); //// [isolatedModulesPlainFile-AMD.js] define(["require", "exports"], function (require, exports) { "use strict"; - run(1); Object.defineProperty(exports, "__esModule", { value: true }); + run(1); }); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js index 5cf8d27759717..38739a700ef3b 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js @@ -6,5 +6,5 @@ run(1); //// [isolatedModulesPlainFile-CommonJS.js] "use strict"; -run(1); Object.defineProperty(exports, "__esModule", { value: true }); +run(1); diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js index 5886a1908a6a1..f37962a84abbf 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js @@ -15,6 +15,6 @@ run(1); } })(function (require, exports) { "use strict"; - run(1); Object.defineProperty(exports, "__esModule", { value: true }); + run(1); }); diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js index cbb97e43d7239..088b40e97ad74 100644 --- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js +++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js @@ -26,6 +26,7 @@ export default apply; //// [apply.js] define("_apply", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; /** * A faster alternative to `Function#apply`, this function invokes `func` * with the `this` binding of `thisArg` and the arguments of `args`. @@ -47,5 +48,4 @@ define("_apply", ["require", "exports"], function (require, exports) { return func.apply(thisArg, args); } exports["default"] = apply; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js index a3259d55cd360..dd4d326268b2d 100644 --- a/tests/baselines/reference/jsxEmitWithAttributes.js +++ b/tests/baselines/reference/jsxEmitWithAttributes.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let c; class A { @@ -80,4 +81,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js index 32ebf4d5d542c..a864da65dbb6d 100644 --- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js +++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let c; class A { @@ -80,4 +81,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js index 36b16c62f49cc..9beff01d7077e 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js +++ b/tests/baselines/reference/jsxFactoryIdentifier.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=Element.js.map//// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let createElement = Element_1.Element.createElement; let c; @@ -81,5 +82,4 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map index cad196b8ba5ee..57ff760b8a883 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map @@ -1,3 +1,3 @@ //// [Element.js.map] -{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file +{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt index 71dbb45a155a5..6101ee1d5e788 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js sourceFile:Element.ts ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>var Element; 1 > 2 >^^^^ @@ -42,10 +43,10 @@ sourceFile:Element.ts > } > } > } -1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0) -3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0) -4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0) +1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0) +3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0) +4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0) --- >>>(function (Element) { 1-> @@ -55,9 +56,9 @@ sourceFile:Element.ts 1-> 2 >export namespace 3 > Element -1->Emitted(3, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0) -3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0) +1->Emitted(4, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0) +3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0) --- >>> function isElement(el) { 1->^^^^ @@ -68,9 +69,9 @@ sourceFile:Element.ts > 2 > export function isElement( 3 > el: any -1->Emitted(4, 5) Source(15, 5) + SourceIndex(0) -2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0) -3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0) +1->Emitted(5, 5) Source(15, 5) + SourceIndex(0) +2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0) +3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0) --- >>> return el.markAsChildOfRootElement !== undefined; 1->^^^^^^^^ @@ -92,15 +93,15 @@ sourceFile:Element.ts 7 > !== 8 > undefined 9 > ; -1->Emitted(5, 9) Source(16, 9) + SourceIndex(0) -2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0) -3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0) -4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0) -5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0) -6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0) -7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0) -8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0) -9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0) +1->Emitted(6, 9) Source(16, 9) + SourceIndex(0) +2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0) +3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0) +4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0) +5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0) +6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0) +7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0) +8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0) +9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -109,8 +110,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0) -2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0) +1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0) +2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0) --- >>> Element.isElement = isElement; 1->^^^^ @@ -124,10 +125,10 @@ sourceFile:Element.ts > return el.markAsChildOfRootElement !== undefined; > } 4 > -1->Emitted(7, 5) Source(15, 21) + SourceIndex(0) -2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0) -3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0) -4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0) +1->Emitted(8, 5) Source(15, 21) + SourceIndex(0) +2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0) +3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0) +4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0) --- >>> function createElement(args) { 1->^^^^ @@ -138,9 +139,9 @@ sourceFile:Element.ts > 2 > export function createElement( 3 > args: any[] -1->Emitted(8, 5) Source(19, 5) + SourceIndex(0) -2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0) -3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0) +1->Emitted(9, 5) Source(19, 5) + SourceIndex(0) +2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0) +3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0) --- >>> return {}; 1 >^^^^^^^^ @@ -156,11 +157,11 @@ sourceFile:Element.ts 4 > { > } 5 > -1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0) -2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0) -3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0) -4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0) -5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0) +1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0) +2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0) +3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0) +4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0) +5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -169,8 +170,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0) -2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0) +1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0) --- >>> Element.createElement = createElement; 1->^^^^ @@ -186,10 +187,10 @@ sourceFile:Element.ts > } > } 4 > -1->Emitted(11, 5) Source(19, 21) + SourceIndex(0) -2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0) -3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0) -4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0) +1->Emitted(12, 5) Source(19, 21) + SourceIndex(0) +2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0) +3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0) +4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0) --- >>>})(Element = exports.Element || (exports.Element = {})); 1-> @@ -221,15 +222,15 @@ sourceFile:Element.ts > } > } > } -1->Emitted(12, 1) Source(24, 1) + SourceIndex(0) -2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0) -3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0) -4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0) -5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0) -6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0) -7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0) -8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0) -9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(24, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0) +3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0) +4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0) +5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0) +6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0) +7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0) +8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0) +9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0) --- >>>exports.createElement = Element.createElement; 1 > @@ -250,14 +251,14 @@ sourceFile:Element.ts 6 > . 7 > createElement 8 > ; -1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0) -2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0) -3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0) -4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0) -5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0) -6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0) -7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0) -8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0) +1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0) +2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0) +3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0) +4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0) +5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0) +6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0) +7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0) +8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0) --- >>>function toCamelCase(text) { 1 > @@ -269,9 +270,9 @@ sourceFile:Element.ts > 2 >function toCamelCase( 3 > text: string -1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0) -2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0) -3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0) +1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0) +2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0) +3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0) --- >>> return text[0].toLowerCase() + text.substring(1); 1->^^^^ @@ -311,36 +312,35 @@ sourceFile:Element.ts 16> 1 17> ) 18> ; -1->Emitted(15, 5) Source(29, 5) + SourceIndex(0) -2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0) -3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0) -4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0) -5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0) -6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0) -7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0) -8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0) -9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0) -10>Emitted(15, 33) Source(29, 33) + SourceIndex(0) -11>Emitted(15, 36) Source(29, 36) + SourceIndex(0) -12>Emitted(15, 40) Source(29, 40) + SourceIndex(0) -13>Emitted(15, 41) Source(29, 41) + SourceIndex(0) -14>Emitted(15, 50) Source(29, 50) + SourceIndex(0) -15>Emitted(15, 51) Source(29, 51) + SourceIndex(0) -16>Emitted(15, 52) Source(29, 52) + SourceIndex(0) -17>Emitted(15, 53) Source(29, 53) + SourceIndex(0) -18>Emitted(15, 54) Source(29, 54) + SourceIndex(0) +1->Emitted(16, 5) Source(29, 5) + SourceIndex(0) +2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0) +3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0) +4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0) +5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0) +6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0) +7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0) +8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0) +9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0) +10>Emitted(16, 33) Source(29, 33) + SourceIndex(0) +11>Emitted(16, 36) Source(29, 36) + SourceIndex(0) +12>Emitted(16, 40) Source(29, 40) + SourceIndex(0) +13>Emitted(16, 41) Source(29, 41) + SourceIndex(0) +14>Emitted(16, 50) Source(29, 50) + SourceIndex(0) +15>Emitted(16, 51) Source(29, 51) + SourceIndex(0) +16>Emitted(16, 52) Source(29, 52) + SourceIndex(0) +17>Emitted(16, 53) Source(29, 53) + SourceIndex(0) +18>Emitted(16, 54) Source(29, 54) + SourceIndex(0) --- >>>} 1 > 2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} -1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0) -2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0) +1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0) +2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=Element.js.map=================================================================== JsFile: test.js mapUrl: test.js.map @@ -352,14 +352,15 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>const Element_1 = require("./Element"); 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^-> 1 > 2 >import { Element} from './Element'; -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0) --- >>>let createElement = Element_1.Element.createElement; 1-> @@ -379,14 +380,14 @@ sourceFile:test.tsx 6 > . 7 > createElement 8 > ; -1->Emitted(3, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(2, 5) + SourceIndex(0) -3 >Emitted(3, 18) Source(2, 18) + SourceIndex(0) -4 >Emitted(3, 21) Source(2, 21) + SourceIndex(0) -5 >Emitted(3, 38) Source(2, 28) + SourceIndex(0) -6 >Emitted(3, 39) Source(2, 29) + SourceIndex(0) -7 >Emitted(3, 52) Source(2, 42) + SourceIndex(0) -8 >Emitted(3, 53) Source(2, 43) + SourceIndex(0) +1->Emitted(4, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(4, 5) Source(2, 5) + SourceIndex(0) +3 >Emitted(4, 18) Source(2, 18) + SourceIndex(0) +4 >Emitted(4, 21) Source(2, 21) + SourceIndex(0) +5 >Emitted(4, 38) Source(2, 28) + SourceIndex(0) +6 >Emitted(4, 39) Source(2, 29) + SourceIndex(0) +7 >Emitted(4, 52) Source(2, 42) + SourceIndex(0) +8 >Emitted(4, 53) Source(2, 43) + SourceIndex(0) --- >>>let c; 1 > @@ -403,10 +404,10 @@ sourceFile:test.tsx > } > } 4 > ; -1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0) -3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0) -4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0) +1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(5, 5) Source(3, 5) + SourceIndex(0) +3 >Emitted(5, 6) Source(7, 2) + SourceIndex(0) +4 >Emitted(5, 7) Source(7, 3) + SourceIndex(0) --- >>>class A { 1-> @@ -414,7 +415,7 @@ sourceFile:test.tsx 1-> > > -1->Emitted(5, 1) Source(9, 1) + SourceIndex(0) +1->Emitted(6, 1) Source(9, 1) + SourceIndex(0) --- >>> view() { 1->^^^^ @@ -423,8 +424,8 @@ sourceFile:test.tsx 1->class A { > 2 > view -1->Emitted(6, 5) Source(10, 2) + SourceIndex(0) -2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0) +1->Emitted(7, 5) Source(10, 2) + SourceIndex(0) +2 >Emitted(7, 9) Source(10, 6) + SourceIndex(0) --- >>> return [ 1->^^^^^^^^ @@ -435,9 +436,9 @@ sourceFile:test.tsx > 2 > return 3 > -1->Emitted(7, 9) Source(11, 3) + SourceIndex(0) -2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0) -3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0) +1->Emitted(8, 9) Source(11, 3) + SourceIndex(0) +2 >Emitted(8, 15) Source(11, 9) + SourceIndex(0) +3 >Emitted(8, 16) Source(11, 10) + SourceIndex(0) --- >>> createElement("meta", { content: "helloworld" }), 1->^^^^^^^^^^^^ @@ -453,12 +454,12 @@ sourceFile:test.tsx 4 > = 5 > "helloworld" 6 > > -1->Emitted(8, 13) Source(12, 4) + SourceIndex(0) -2 >Emitted(8, 37) Source(12, 10) + SourceIndex(0) -3 >Emitted(8, 44) Source(12, 17) + SourceIndex(0) -4 >Emitted(8, 46) Source(12, 18) + SourceIndex(0) -5 >Emitted(8, 58) Source(12, 30) + SourceIndex(0) -6 >Emitted(8, 61) Source(12, 38) + SourceIndex(0) +1->Emitted(9, 13) Source(12, 4) + SourceIndex(0) +2 >Emitted(9, 37) Source(12, 10) + SourceIndex(0) +3 >Emitted(9, 44) Source(12, 17) + SourceIndex(0) +4 >Emitted(9, 46) Source(12, 18) + SourceIndex(0) +5 >Emitted(9, 58) Source(12, 30) + SourceIndex(0) +6 >Emitted(9, 61) Source(12, 38) + SourceIndex(0) --- >>> createElement("meta", { content: c.a.b }) 1 >^^^^^^^^^^^^ @@ -482,16 +483,16 @@ sourceFile:test.tsx 8 > . 9 > b 10> }> -1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0) -2 >Emitted(9, 37) Source(13, 10) + SourceIndex(0) -3 >Emitted(9, 44) Source(13, 17) + SourceIndex(0) -4 >Emitted(9, 46) Source(13, 19) + SourceIndex(0) -5 >Emitted(9, 47) Source(13, 20) + SourceIndex(0) -6 >Emitted(9, 48) Source(13, 21) + SourceIndex(0) -7 >Emitted(9, 49) Source(13, 23) + SourceIndex(0) -8 >Emitted(9, 50) Source(13, 24) + SourceIndex(0) -9 >Emitted(9, 51) Source(13, 25) + SourceIndex(0) -10>Emitted(9, 54) Source(13, 34) + SourceIndex(0) +1 >Emitted(10, 13) Source(13, 4) + SourceIndex(0) +2 >Emitted(10, 37) Source(13, 10) + SourceIndex(0) +3 >Emitted(10, 44) Source(13, 17) + SourceIndex(0) +4 >Emitted(10, 46) Source(13, 19) + SourceIndex(0) +5 >Emitted(10, 47) Source(13, 20) + SourceIndex(0) +6 >Emitted(10, 48) Source(13, 21) + SourceIndex(0) +7 >Emitted(10, 49) Source(13, 23) + SourceIndex(0) +8 >Emitted(10, 50) Source(13, 24) + SourceIndex(0) +9 >Emitted(10, 51) Source(13, 25) + SourceIndex(0) +10>Emitted(10, 54) Source(13, 34) + SourceIndex(0) --- >>> ]; 1 >^^^^^^^^^ @@ -499,8 +500,8 @@ sourceFile:test.tsx 1 > > ] 2 > ; -1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0) -2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0) +1 >Emitted(11, 10) Source(14, 4) + SourceIndex(0) +2 >Emitted(11, 11) Source(14, 5) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -508,15 +509,14 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0) -2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0) +1 >Emitted(12, 5) Source(15, 2) + SourceIndex(0) +2 >Emitted(12, 6) Source(15, 3) + SourceIndex(0) --- >>>} 1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0) +1 >Emitted(13, 2) Source(16, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js index 3ab40dee5eb31..05da89d0d85aa 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js @@ -15,11 +15,11 @@ export class AppComponent { //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class AppComponent { render(createElement) { return createElement("div", null); } } exports.AppComponent = AppComponent; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map index c108b93a9134f..c72e1bf8057c5 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map @@ -1,2 +1,2 @@ //// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt index 68f39e67ddd86..b2d30177b1d0d 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>class AppComponent { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> @@ -20,7 +21,7 @@ sourceFile:test.tsx >} > > -1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0) --- >>> render(createElement) { 1->^^^^ @@ -33,10 +34,10 @@ sourceFile:test.tsx 2 > render 3 > ( 4 > createElement -1->Emitted(3, 5) Source(9, 5) + SourceIndex(0) -2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0) -3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0) -4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0) +1->Emitted(4, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0) --- >>> return createElement("div", null); 1->^^^^^^^^ @@ -50,11 +51,11 @@ sourceFile:test.tsx 3 > 4 >
5 > ; -1->Emitted(4, 9) Source(10, 9) + SourceIndex(0) -2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0) -3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0) -4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0) -5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0) +1->Emitted(5, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0) +3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0) +4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0) +5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -62,28 +63,26 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0) -2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0) +1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0) +1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0) --- >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render(createElement) { > return
; > } >} -1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js index 12ea8b96602c3..c9f5f3465e353 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js @@ -15,11 +15,11 @@ export class AppComponent { //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class AppComponent { render() { return createElement("div", null); } } exports.AppComponent = AppComponent; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map index 715014ff53fbe..66666a526d62d 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map @@ -1,2 +1,2 @@ //// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt index b1b8db46eaace..1a77ab3eae17b 100644 --- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>class AppComponent { 1 > 2 >^^^^^^^^^^^^^^^-> @@ -20,7 +21,7 @@ sourceFile:test.tsx >} > > -1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0) --- >>> render() { 1->^^^^ @@ -29,8 +30,8 @@ sourceFile:test.tsx 1->export class AppComponent { > 2 > render -1->Emitted(3, 5) Source(9, 5) + SourceIndex(0) -2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0) +1->Emitted(4, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0) --- >>> return createElement("div", null); 1->^^^^^^^^ @@ -44,11 +45,11 @@ sourceFile:test.tsx 3 > 4 >
5 > ; -1->Emitted(4, 9) Source(10, 9) + SourceIndex(0) -2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0) -3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0) -4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0) -5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0) +1->Emitted(5, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0) +3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0) +4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0) +5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -56,28 +57,26 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0) -2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0) +1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0) +1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0) --- >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render() { > return
; > } >} -1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js index 9f408e4db7ae9..9fc5799b11d96 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); let c; class A { view() { @@ -79,4 +80,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js index 331c7a65d7332..aa90c74cce5a7 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); let c; class A { view() { @@ -79,4 +80,3 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js index 0a7b7f8d38774..ee747733799ba 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js @@ -52,6 +52,7 @@ class A { //// [Element.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Element; (function (Element) { function isElement(el) { @@ -67,9 +68,9 @@ exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=Element.js.map//// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const Element_1 = require("./Element"); let c; class A { @@ -80,5 +81,4 @@ class A { ]; } } -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map index f8cef24a0f0d5..6c5dd8abf56bf 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js.map +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map @@ -1,3 +1,3 @@ //// [Element.js.map] -{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file +{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt index 86ed94197d6e3..9831a9ab5fd6d 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js sourceFile:Element.ts ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>var Element; 1 > 2 >^^^^ @@ -42,10 +43,10 @@ sourceFile:Element.ts > } > } > } -1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0) -3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0) -4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0) +1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0) +3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0) +4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0) --- >>>(function (Element) { 1-> @@ -55,9 +56,9 @@ sourceFile:Element.ts 1-> 2 >export namespace 3 > Element -1->Emitted(3, 1) Source(14, 1) + SourceIndex(0) -2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0) -3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0) +1->Emitted(4, 1) Source(14, 1) + SourceIndex(0) +2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0) +3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0) --- >>> function isElement(el) { 1->^^^^ @@ -68,9 +69,9 @@ sourceFile:Element.ts > 2 > export function isElement( 3 > el: any -1->Emitted(4, 5) Source(15, 5) + SourceIndex(0) -2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0) -3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0) +1->Emitted(5, 5) Source(15, 5) + SourceIndex(0) +2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0) +3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0) --- >>> return el.markAsChildOfRootElement !== undefined; 1->^^^^^^^^ @@ -92,15 +93,15 @@ sourceFile:Element.ts 7 > !== 8 > undefined 9 > ; -1->Emitted(5, 9) Source(16, 9) + SourceIndex(0) -2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0) -3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0) -4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0) -5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0) -6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0) -7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0) -8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0) -9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0) +1->Emitted(6, 9) Source(16, 9) + SourceIndex(0) +2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0) +3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0) +4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0) +5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0) +6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0) +7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0) +8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0) +9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -109,8 +110,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0) -2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0) +1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0) +2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0) --- >>> Element.isElement = isElement; 1->^^^^ @@ -124,10 +125,10 @@ sourceFile:Element.ts > return el.markAsChildOfRootElement !== undefined; > } 4 > -1->Emitted(7, 5) Source(15, 21) + SourceIndex(0) -2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0) -3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0) -4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0) +1->Emitted(8, 5) Source(15, 21) + SourceIndex(0) +2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0) +3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0) +4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0) --- >>> function createElement(args) { 1->^^^^ @@ -138,9 +139,9 @@ sourceFile:Element.ts > 2 > export function createElement( 3 > args: any[] -1->Emitted(8, 5) Source(19, 5) + SourceIndex(0) -2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0) -3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0) +1->Emitted(9, 5) Source(19, 5) + SourceIndex(0) +2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0) +3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0) --- >>> return {}; 1 >^^^^^^^^ @@ -156,11 +157,11 @@ sourceFile:Element.ts 4 > { > } 5 > -1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0) -2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0) -3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0) -4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0) -5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0) +1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0) +2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0) +3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0) +4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0) +5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -169,8 +170,8 @@ sourceFile:Element.ts 1 > > 2 > } -1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0) -2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0) +1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0) +2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0) --- >>> Element.createElement = createElement; 1->^^^^ @@ -186,10 +187,10 @@ sourceFile:Element.ts > } > } 4 > -1->Emitted(11, 5) Source(19, 21) + SourceIndex(0) -2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0) -3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0) -4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0) +1->Emitted(12, 5) Source(19, 21) + SourceIndex(0) +2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0) +3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0) +4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0) --- >>>})(Element = exports.Element || (exports.Element = {})); 1-> @@ -221,15 +222,15 @@ sourceFile:Element.ts > } > } > } -1->Emitted(12, 1) Source(24, 1) + SourceIndex(0) -2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0) -3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0) -4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0) -5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0) -6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0) -7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0) -8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0) -9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0) +1->Emitted(13, 1) Source(24, 1) + SourceIndex(0) +2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0) +3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0) +4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0) +5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0) +6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0) +7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0) +8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0) +9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0) --- >>>exports.createElement = Element.createElement; 1 > @@ -250,14 +251,14 @@ sourceFile:Element.ts 6 > . 7 > createElement 8 > ; -1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0) -2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0) -3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0) -4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0) -5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0) -6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0) -7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0) -8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0) +1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0) +2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0) +3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0) +4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0) +5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0) +6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0) +7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0) +8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0) --- >>>function toCamelCase(text) { 1 > @@ -269,9 +270,9 @@ sourceFile:Element.ts > 2 >function toCamelCase( 3 > text: string -1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0) -2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0) -3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0) +1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0) +2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0) +3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0) --- >>> return text[0].toLowerCase() + text.substring(1); 1->^^^^ @@ -311,36 +312,35 @@ sourceFile:Element.ts 16> 1 17> ) 18> ; -1->Emitted(15, 5) Source(29, 5) + SourceIndex(0) -2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0) -3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0) -4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0) -5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0) -6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0) -7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0) -8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0) -9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0) -10>Emitted(15, 33) Source(29, 33) + SourceIndex(0) -11>Emitted(15, 36) Source(29, 36) + SourceIndex(0) -12>Emitted(15, 40) Source(29, 40) + SourceIndex(0) -13>Emitted(15, 41) Source(29, 41) + SourceIndex(0) -14>Emitted(15, 50) Source(29, 50) + SourceIndex(0) -15>Emitted(15, 51) Source(29, 51) + SourceIndex(0) -16>Emitted(15, 52) Source(29, 52) + SourceIndex(0) -17>Emitted(15, 53) Source(29, 53) + SourceIndex(0) -18>Emitted(15, 54) Source(29, 54) + SourceIndex(0) +1->Emitted(16, 5) Source(29, 5) + SourceIndex(0) +2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0) +3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0) +4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0) +5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0) +6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0) +7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0) +8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0) +9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0) +10>Emitted(16, 33) Source(29, 33) + SourceIndex(0) +11>Emitted(16, 36) Source(29, 36) + SourceIndex(0) +12>Emitted(16, 40) Source(29, 40) + SourceIndex(0) +13>Emitted(16, 41) Source(29, 41) + SourceIndex(0) +14>Emitted(16, 50) Source(29, 50) + SourceIndex(0) +15>Emitted(16, 51) Source(29, 51) + SourceIndex(0) +16>Emitted(16, 52) Source(29, 52) + SourceIndex(0) +17>Emitted(16, 53) Source(29, 53) + SourceIndex(0) +18>Emitted(16, 54) Source(29, 54) + SourceIndex(0) --- >>>} 1 > 2 >^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} -1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0) -2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0) +1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0) +2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=Element.js.map=================================================================== JsFile: test.js mapUrl: test.js.map @@ -352,13 +352,14 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>const Element_1 = require("./Element"); 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1 > 2 >import { Element} from './Element'; -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0) --- >>>let c; 1 > @@ -376,10 +377,10 @@ sourceFile:test.tsx > } > } 4 > ; -1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0) -3 >Emitted(3, 6) Source(7, 2) + SourceIndex(0) -4 >Emitted(3, 7) Source(7, 3) + SourceIndex(0) +1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0) +3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0) +4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0) --- >>>class A { 1-> @@ -387,7 +388,7 @@ sourceFile:test.tsx 1-> > > -1->Emitted(4, 1) Source(9, 1) + SourceIndex(0) +1->Emitted(5, 1) Source(9, 1) + SourceIndex(0) --- >>> view() { 1->^^^^ @@ -396,8 +397,8 @@ sourceFile:test.tsx 1->class A { > 2 > view -1->Emitted(5, 5) Source(10, 2) + SourceIndex(0) -2 >Emitted(5, 9) Source(10, 6) + SourceIndex(0) +1->Emitted(6, 5) Source(10, 2) + SourceIndex(0) +2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0) --- >>> return [ 1->^^^^^^^^ @@ -408,9 +409,9 @@ sourceFile:test.tsx > 2 > return 3 > -1->Emitted(6, 9) Source(11, 3) + SourceIndex(0) -2 >Emitted(6, 15) Source(11, 9) + SourceIndex(0) -3 >Emitted(6, 16) Source(11, 10) + SourceIndex(0) +1->Emitted(7, 9) Source(11, 3) + SourceIndex(0) +2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0) +3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0) --- >>> Element_1.Element.createElement("meta", { content: "helloworld" }), 1->^^^^^^^^^^^^ @@ -426,12 +427,12 @@ sourceFile:test.tsx 4 > = 5 > "helloworld" 6 > > -1->Emitted(7, 13) Source(12, 4) + SourceIndex(0) -2 >Emitted(7, 55) Source(12, 10) + SourceIndex(0) -3 >Emitted(7, 62) Source(12, 17) + SourceIndex(0) -4 >Emitted(7, 64) Source(12, 18) + SourceIndex(0) -5 >Emitted(7, 76) Source(12, 30) + SourceIndex(0) -6 >Emitted(7, 79) Source(12, 38) + SourceIndex(0) +1->Emitted(8, 13) Source(12, 4) + SourceIndex(0) +2 >Emitted(8, 55) Source(12, 10) + SourceIndex(0) +3 >Emitted(8, 62) Source(12, 17) + SourceIndex(0) +4 >Emitted(8, 64) Source(12, 18) + SourceIndex(0) +5 >Emitted(8, 76) Source(12, 30) + SourceIndex(0) +6 >Emitted(8, 79) Source(12, 38) + SourceIndex(0) --- >>> Element_1.Element.createElement("meta", { content: c.a.b }) 1 >^^^^^^^^^^^^ @@ -455,16 +456,16 @@ sourceFile:test.tsx 8 > . 9 > b 10> }> -1 >Emitted(8, 13) Source(13, 4) + SourceIndex(0) -2 >Emitted(8, 55) Source(13, 10) + SourceIndex(0) -3 >Emitted(8, 62) Source(13, 17) + SourceIndex(0) -4 >Emitted(8, 64) Source(13, 19) + SourceIndex(0) -5 >Emitted(8, 65) Source(13, 20) + SourceIndex(0) -6 >Emitted(8, 66) Source(13, 21) + SourceIndex(0) -7 >Emitted(8, 67) Source(13, 23) + SourceIndex(0) -8 >Emitted(8, 68) Source(13, 24) + SourceIndex(0) -9 >Emitted(8, 69) Source(13, 25) + SourceIndex(0) -10>Emitted(8, 72) Source(13, 34) + SourceIndex(0) +1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0) +2 >Emitted(9, 55) Source(13, 10) + SourceIndex(0) +3 >Emitted(9, 62) Source(13, 17) + SourceIndex(0) +4 >Emitted(9, 64) Source(13, 19) + SourceIndex(0) +5 >Emitted(9, 65) Source(13, 20) + SourceIndex(0) +6 >Emitted(9, 66) Source(13, 21) + SourceIndex(0) +7 >Emitted(9, 67) Source(13, 23) + SourceIndex(0) +8 >Emitted(9, 68) Source(13, 24) + SourceIndex(0) +9 >Emitted(9, 69) Source(13, 25) + SourceIndex(0) +10>Emitted(9, 72) Source(13, 34) + SourceIndex(0) --- >>> ]; 1 >^^^^^^^^^ @@ -472,8 +473,8 @@ sourceFile:test.tsx 1 > > ] 2 > ; -1 >Emitted(9, 10) Source(14, 4) + SourceIndex(0) -2 >Emitted(9, 11) Source(14, 5) + SourceIndex(0) +1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0) +2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -481,15 +482,14 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(10, 5) Source(15, 2) + SourceIndex(0) -2 >Emitted(10, 6) Source(15, 3) + SourceIndex(0) +1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0) +2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0) --- >>>} 1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0) +1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js index 60c8ca80212fd..510efc97f4a9a 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js @@ -14,11 +14,11 @@ export class AppComponent { //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); class AppComponent { render(createElement) { return MyElement.createElement("div", null); } } exports.AppComponent = AppComponent; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map index ac54c9638cd1b..1af641eb35159 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map @@ -1,2 +1,2 @@ //// [test.js.map] -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt index 0e8d7ec51f3f8..2f5270f370535 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js sourceFile:test.tsx ------------------------------------------------------------------- >>>"use strict"; +>>>Object.defineProperty(exports, "__esModule", { value: true }); >>>class AppComponent { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> @@ -20,7 +21,7 @@ sourceFile:test.tsx >} > > -1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0) --- >>> render(createElement) { 1->^^^^ @@ -33,10 +34,10 @@ sourceFile:test.tsx 2 > render 3 > ( 4 > createElement -1->Emitted(3, 5) Source(9, 5) + SourceIndex(0) -2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0) -3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0) -4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0) +1->Emitted(4, 5) Source(9, 5) + SourceIndex(0) +2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0) +3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0) +4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0) --- >>> return MyElement.createElement("div", null); 1->^^^^^^^^ @@ -50,11 +51,11 @@ sourceFile:test.tsx 3 > 4 >
5 > ; -1->Emitted(4, 9) Source(10, 9) + SourceIndex(0) -2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0) -3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0) -4 >Emitted(4, 52) Source(10, 23) + SourceIndex(0) -5 >Emitted(4, 53) Source(10, 24) + SourceIndex(0) +1->Emitted(5, 9) Source(10, 9) + SourceIndex(0) +2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0) +3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0) +4 >Emitted(5, 52) Source(10, 23) + SourceIndex(0) +5 >Emitted(5, 53) Source(10, 24) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -62,28 +63,26 @@ sourceFile:test.tsx 1 > > 2 > } -1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0) -2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0) +1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0) +2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0) +1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0) --- >>>exports.AppComponent = AppComponent; 1-> 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 >export class AppComponent { > render(createElement) { > return
; > } >} -1->Emitted(7, 1) Source(8, 1) + SourceIndex(0) -2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0) +1->Emitted(8, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0) --- ->>>Object.defineProperty(exports, "__esModule", { value: true }); >>>//# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js index 72200aee75c59..267f3eaee5062 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js +++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js @@ -13,6 +13,7 @@ class Component { //// [index.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); require("./jsx"); var skate; var React = { createElement: skate.h }; @@ -25,4 +26,3 @@ var Component = (function () { return Component; }()); ; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js index 59bde766a351b..4b42ebe812d52 100644 --- a/tests/baselines/reference/jsxImportInAttribute.js +++ b/tests/baselines/reference/jsxImportInAttribute.js @@ -16,8 +16,8 @@ let x = Test; // emit test_1.default //// [consumer.jsx] "use strict"; +exports.__esModule = true; /// var Test_1 = require("Test"); var x = Test_1["default"]; // emit test_1.default ; // ? -exports.__esModule = true; diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js index 626a48d191eda..187ba545fb382 100644 --- a/tests/baselines/reference/jsxViaImport.2.js +++ b/tests/baselines/reference/jsxViaImport.2.js @@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; /// var BaseComponent_1 = require("BaseComponent"); var TestComponent = (function (_super) { @@ -47,4 +48,3 @@ var TestComponent = (function (_super) { }; return TestComponent; }(React.Component)); -exports.__esModule = true; diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js index 9040455be5695..3b291a347747e 100644 --- a/tests/baselines/reference/jsxViaImport.js +++ b/tests/baselines/reference/jsxViaImport.js @@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; /// var BaseComponent = require("BaseComponent"); var TestComponent = (function (_super) { @@ -47,4 +48,3 @@ var TestComponent = (function (_super) { }; return TestComponent; }(React.Component)); -exports.__esModule = true; diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js index 3e6b396184fb3..f198c0f9ea777 100644 --- a/tests/baselines/reference/localAliasExportAssignment.js +++ b/tests/baselines/reference/localAliasExportAssignment.js @@ -22,7 +22,7 @@ var server; module.exports = server; //// [localAliasExportAssignment_1.js] "use strict"; +exports.__esModule = true; /// var connect = require("./localAliasExportAssignment_0"); connect(); -exports.__esModule = true; diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js index 731e0e2e70b4f..9f22aa637535d 100644 --- a/tests/baselines/reference/mapOnTupleTypes01.js +++ b/tests/baselines/reference/mapOnTupleTypes01.js @@ -44,6 +44,7 @@ export let h = numNumNumNumNum.map(n => n * n); //// [mapOnTupleTypes01.js] "use strict"; +exports.__esModule = true; exports.mapOnLooseArrayLiteral = [1, 2, 3, 4].map(function (n) { return n * n; }); // Length 1 var numTuple = [1]; @@ -67,7 +68,6 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; }); // Length 6 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6]; exports.h = numNumNumNumNum.map(function (n) { return n * n; }); -exports.__esModule = true; //// [mapOnTupleTypes01.d.ts] diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js index 0906c6df189ee..ca835751a7a7d 100644 --- a/tests/baselines/reference/mapOnTupleTypes02.js +++ b/tests/baselines/reference/mapOnTupleTypes02.js @@ -8,11 +8,11 @@ export function increment(point: Point) { //// [mapOnTupleTypes02.js] "use strict"; +exports.__esModule = true; function increment(point) { return point.map(function (d) { return d + 1; }); } exports.increment = increment; -exports.__esModule = true; //// [mapOnTupleTypes02.d.ts] diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js index b3c51e66c4bd5..2ba05b016bee2 100644 --- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js +++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js @@ -17,6 +17,7 @@ WinJS.Promise.timeout(10); //// [memberAccessMustUseModuleInstances_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Promise = (function () { function Promise() { } @@ -26,11 +27,10 @@ define(["require", "exports"], function (require, exports) { return Promise; }()); exports.Promise = Promise; - exports.__esModule = true; }); //// [memberAccessMustUseModuleInstances_1.js] define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) { "use strict"; - WinJS.Promise.timeout(10); exports.__esModule = true; + WinJS.Promise.timeout(10); }); diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js index c27c5ef86150e..ec2eb4a1087cb 100644 --- a/tests/baselines/reference/mergeWithImportedNamespace.js +++ b/tests/baselines/reference/mergeWithImportedNamespace.js @@ -12,11 +12,11 @@ export namespace N { //// [f1.js] "use strict"; +exports.__esModule = true; var N; (function (N) { N.x = 1; })(N = exports.N || (exports.N = {})); -exports.__esModule = true; //// [f2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js index 21e457b1361ca..efa95d7763064 100644 --- a/tests/baselines/reference/mergeWithImportedType.js +++ b/tests/baselines/reference/mergeWithImportedType.js @@ -10,11 +10,11 @@ export type E = E; //// [f1.js] "use strict"; +exports.__esModule = true; var E; (function (E) { E[E["X"] = 0] = "X"; })(E = exports.E || (exports.E = {})); -exports.__esModule = true; //// [f2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js index 17aeccbc769f5..83173f35752d2 100644 --- a/tests/baselines/reference/mergedDeclarations6.js +++ b/tests/baselines/reference/mergedDeclarations6.js @@ -26,6 +26,7 @@ export class B extends A { //// [a.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } @@ -35,7 +36,6 @@ define(["require", "exports"], function (require, exports) { return A; }()); exports.A = A; - exports.__esModule = true; }); //// [b.js] var __extends = (this && this.__extends) || (function () { @@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports", "./a"], function (require, exports, a_1) { "use strict"; + exports.__esModule = true; var B = (function (_super) { __extends(B, _super); function B() { @@ -60,5 +61,4 @@ define(["require", "exports", "./a"], function (require, exports, a_1) { return B; }(a_1.A)); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js index d1becde5240ae..8fa3f2d0731f5 100644 --- a/tests/baselines/reference/mergedDeclarations7.js +++ b/tests/baselines/reference/mergedDeclarations7.js @@ -24,6 +24,6 @@ let p: Passport = passport.use(); //// [test.js] "use strict"; +exports.__esModule = true; var passport = require("passport"); var p = passport.use(); -exports.__esModule = true; diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js index c4e5c8dfa1056..8d5f55b68017f 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js @@ -17,6 +17,7 @@ export module X { //// [mergedModuleDeclarationCodeGen.js] "use strict"; +exports.__esModule = true; var X; (function (X) { var Y; @@ -40,4 +41,3 @@ var X; Y.B = B; })(Y = X.Y || (X.Y = {})); })(X = exports.X || (exports.X = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js index ace3445911c51..40cbc87cdcb67 100644 --- a/tests/baselines/reference/metadataOfEventAlias.js +++ b/tests/baselines/reference/metadataOfEventAlias.js @@ -13,8 +13,8 @@ export class SomeClass { //// [event.js] "use strict"; -; Object.defineProperty(exports, "__esModule", { value: true }); +; //// [test.js] "use strict"; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { @@ -26,6 +26,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); function Input(target, key) { } var SomeClass = (function () { function SomeClass() { @@ -37,4 +38,3 @@ __decorate([ __metadata("design:type", Object) ], SomeClass.prototype, "event", void 0); exports.SomeClass = SomeClass; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js index 87e1fdd8f58e0..23bb2356640ed 100644 --- a/tests/baselines/reference/missingFunctionImplementation.js +++ b/tests/baselines/reference/missingFunctionImplementation.js @@ -82,6 +82,7 @@ namespace N12 { //// [missingFunctionImplementation.js] "use strict"; +exports.__esModule = true; var C1 = (function () { function C1() { } @@ -162,4 +163,3 @@ var N12; function m(a) { } N12.m = m; })(N12 || (N12 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js index 2d33c5b97684e..d4a8b12d2a669 100644 --- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js +++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js @@ -10,9 +10,9 @@ import {x} from "./a" //// [a.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [b.js] "use strict"; -(function () { return 1; }()); exports.__esModule = true; +(function () { return 1; }()); diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js index 95ef30bb8d6e3..16eb962a863ce 100644 --- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js +++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js @@ -22,9 +22,9 @@ define(["require", "exports"], function (require, exports) { //// [moduleAliasAsFunctionArgument_1.js] define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) { "use strict"; + exports.__esModule = true; function fn(arg) { } a.x; // OK fn(a); // Error: property 'x' is missing from 'a' - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js index 76eb8237cc69f..a92cf5093e34e 100644 --- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js +++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js @@ -41,20 +41,20 @@ define(["require", "exports"], function (require, exports) { //// [map1.js] define(["require", "exports", "./observable"], function (require, exports, observable_1) { "use strict"; - observable_1.Observable.prototype.map = function () { }; exports.__esModule = true; + observable_1.Observable.prototype.map = function () { }; }); //// [map2.js] define(["require", "exports", "./observable"], function (require, exports, observable_1) { "use strict"; - observable_1.Observable.prototype.map = function () { }; exports.__esModule = true; + observable_1.Observable.prototype.map = function () { }; }); //// [main.js] define(["require", "exports", "./map1", "./map2"], function (require, exports) { "use strict"; - var x; exports.__esModule = true; + var x; }); diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js index 92bb6cd1d9982..7775930684556 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js @@ -34,22 +34,22 @@ let y = x.map(x => x + 1); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { var someValue; })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; //// [observable.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js index 02d461e642d3f..15ca6aaf806da 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js @@ -36,24 +36,24 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); require("./map"); var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); -exports.__esModule = true; //// [observable.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js index cae38270898be..c29bed68e5137 100644 --- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js +++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js @@ -49,24 +49,24 @@ import "./x"; //// [x0.js] "use strict"; -exports.a = 1; exports.__esModule = true; +exports.a = 1; //// [x.js] "use strict"; +exports.__esModule = true; var N1; (function (N1) { N1.x = 1; })(N1 || (N1 = {})); -exports.__esModule = true; //// [observable.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [test.js] "use strict"; -exports.b = 1; exports.__esModule = true; +exports.b = 1; //// [main.js] "use strict"; -require("./x"); exports.__esModule = true; +require("./x"); diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js index 5dc02dc308222..d6857a28ef162 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js @@ -36,12 +36,12 @@ let y = x.map(x => x + 1); //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js index 28461511dfff2..eee03576336ff 100644 --- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js +++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js @@ -38,11 +38,12 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; /// var observable_1 = require("observable"); require("./map"); @@ -50,7 +51,6 @@ var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); -exports.__esModule = true; //// [map.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js index 0becae3f0fff5..9d15f3fe387fd 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js @@ -34,19 +34,19 @@ let y = x.map(x => x + 1); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { var someValue; })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js index cdad871ac21c3..072c62862e3bc 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js @@ -36,21 +36,21 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [observable.js] "use strict"; +exports.__esModule = true; var Observable; (function (Observable) { })(Observable = exports.Observable || (exports.Observable = {})); -exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); require("./map"); var x; var y = x.map(function (x) { return x + 1; }); var z1 = observable_1.Observable.someValue.toFixed(); var z2 = observable_1.Observable.someAnotherValue.toLowerCase(); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js index 6569631a8d73f..2ef6441692f40 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal1.js +++ b/tests/baselines/reference/moduleAugmentationGlobal1.js @@ -20,18 +20,18 @@ let y = x.getA().x; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var x = [1]; var y = x.getA().x; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js index 222e337dd6437..1806ceae9a192 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal2.js +++ b/tests/baselines/reference/moduleAugmentationGlobal2.js @@ -20,6 +20,7 @@ let y = x.getCountAsString().toLowerCase(); //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } @@ -27,12 +28,11 @@ var A = (function () { }()); exports.A = A; ; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var x = [1]; var y = x.getCountAsString().toLowerCase(); -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js index 88e6b2c204d1e..9cb08f2b866f4 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal3.js +++ b/tests/baselines/reference/moduleAugmentationGlobal3.js @@ -23,6 +23,7 @@ let y = x.getCountAsString().toLowerCase(); //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } @@ -30,16 +31,15 @@ var A = (function () { }()); exports.A = A; ; -exports.__esModule = true; //// [f2.js] "use strict"; exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; require("./f2"); var x = [1]; var y = x.getCountAsString().toLowerCase(); -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js index 6d9d76f8aafb1..194d06aeb80a7 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal4.js +++ b/tests/baselines/reference/moduleAugmentationGlobal4.js @@ -26,9 +26,9 @@ exports.__esModule = true; exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; require("./f1"); require("./f2"); -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js index f25dffba5e83b..43d8c6b958b16 100644 --- a/tests/baselines/reference/moduleAugmentationGlobal5.js +++ b/tests/baselines/reference/moduleAugmentationGlobal5.js @@ -23,11 +23,11 @@ import "B"; //// [f3.js] "use strict"; +exports.__esModule = true; /// /// require("A"); require("B"); -exports.__esModule = true; //// [f3.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js index 6a825dcf34c71..66ce39e8d84a1 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js @@ -29,33 +29,33 @@ let b = a.foo().n; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js index 4f30d1210ff44..e79f2e5848482 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js @@ -41,33 +41,33 @@ let b = a.foo().n; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js index 66de9f1c596f8..c7c13ea786117 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js @@ -39,33 +39,33 @@ let b = a.foo().n; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js index 0729457fc514e..9cdf76b90a557 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js @@ -41,32 +41,32 @@ let d = a.baz().b; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js index 7970f65f412c8..c7f7990608ec2 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js @@ -41,35 +41,35 @@ let d = a.baz().b; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js index 3b290b8297512..0f19e737ec5ba 100644 --- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js +++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js @@ -41,35 +41,35 @@ let d = a.baz().b; //// [f1.js] "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; //// [f2.js] "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; //// [f3.js] "use strict"; +exports.__esModule = true; var f1_1 = require("./f1"); f1_1.A.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [f4.js] "use strict"; +exports.__esModule = true; require("./f3"); var a; var b = a.foo().n; var c = a.bar().a; var d = a.baz().b; -exports.__esModule = true; //// [f1.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js index 852d50f8d014b..4cdef37a4f7cc 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js @@ -31,9 +31,9 @@ x.foo().x; //// [main.js] /// "use strict"; +exports.__esModule = true; var x; x.foo().x; -exports.__esModule = true; //// [main.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js index 1fdb32a55b54d..536931ee61fbf 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js @@ -31,7 +31,7 @@ x.foo().x; //// [main.js] /// "use strict"; +exports.__esModule = true; require("Map"); var x; x.foo().x; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js index aa6b33baef3d7..37253ab7e5b40 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js @@ -41,8 +41,8 @@ x.foo2().x2; //// [main.js] /// "use strict"; +exports.__esModule = true; require("Map"); var x; x.foo().x; x.foo2().x2; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js index 5f209f753cf96..0c861447b46a7 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js @@ -44,8 +44,8 @@ x.foo2().x2; /// /// "use strict"; +exports.__esModule = true; require("Map"); var x; x.foo().x; x.foo2().x2; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js index 55226da5ee979..ac202784f43e8 100644 --- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js +++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js @@ -25,11 +25,11 @@ let y = x.getA().x; //// [f.js] "use strict"; +exports.__esModule = true; /// require("array"); var x = [1]; var y = x.getA().x; -exports.__esModule = true; //// [f.d.ts] diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js index 757b71754d6a7..31c82ad18e881 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency.js +++ b/tests/baselines/reference/moduleAugmentationInDependency.js @@ -10,5 +10,5 @@ import "A" //// [app.js] "use strict"; -require("A"); exports.__esModule = true; +require("A"); diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js index 53d2e6ede7175..e7a964650bd8e 100644 --- a/tests/baselines/reference/moduleAugmentationInDependency2.js +++ b/tests/baselines/reference/moduleAugmentationInDependency2.js @@ -13,5 +13,5 @@ import "A" exports.__esModule = true; //// [app.js] "use strict"; -require("A"); exports.__esModule = true; +require("A"); diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js index 6edaf5b9fca98..4376c23a7f8f8 100644 --- a/tests/baselines/reference/moduleAugmentationNoNewNames.js +++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js @@ -33,12 +33,12 @@ let y = x.map(x => x + 1); exports.__esModule = true; //// [map.js] "use strict"; +exports.__esModule = true; var observable_1 = require("./observable"); observable_1.Observable.prototype.map = function () { }; -exports.__esModule = true; //// [main.js] "use strict"; +exports.__esModule = true; require("./map"); var x; var y = x.map(function (x) { return x + 1; }); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js index d41be36991757..9ad2aa842d0cc 100644 --- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js +++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js @@ -58,22 +58,23 @@ c.baz2().x.toLowerCase(); //// [out.js] define("m1", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var Cls = (function () { function Cls() { } return Cls; }()); exports.Cls = Cls; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); m1_1.Cls.prototype.foo = function () { return 1; }; m1_1.Cls.prototype.bar = function () { return "1"; }; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("m3", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var C1 = (function () { function C1() { } @@ -86,22 +87,21 @@ define("m3", ["require", "exports"], function (require, exports) { return C2; }()); exports.C2 = C2; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); m1_2.Cls.prototype.baz1 = function () { return undefined; }; m1_2.Cls.prototype.baz2 = function () { return undefined; }; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("test", ["require", "exports", "m2", "m4"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var c; c.foo().toExponential(); c.bar().toLowerCase(); c.baz1().x.toExponential(); c.baz2().x.toLowerCase(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js index 4f93e976dfca8..116c5c5e830f3 100644 --- a/tests/baselines/reference/moduleAugmentationsImports1.js +++ b/tests/baselines/reference/moduleAugmentationsImports1.js @@ -45,37 +45,37 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); /// define("d", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; + exports.__esModule = true; a_1.A.prototype.getB = function () { return undefined; }; a_1.A.prototype.getCls = function () { return undefined; }; - exports.__esModule = true; }); define("main", ["require", "exports", "d"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js index 94d418c7fc748..e13cbd8f3ddf9 100644 --- a/tests/baselines/reference/moduleAugmentationsImports2.js +++ b/tests/baselines/reference/moduleAugmentationsImports2.js @@ -50,41 +50,41 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); /// define("d", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; - a_1.A.prototype.getB = function () { return undefined; }; exports.__esModule = true; + a_1.A.prototype.getB = function () { return undefined; }; }); define("e", ["require", "exports", "a"], function (require, exports, a_2) { "use strict"; - a_2.A.prototype.getCls = function () { return undefined; }; exports.__esModule = true; + a_2.A.prototype.getCls = function () { return undefined; }; }); define("main", ["require", "exports", "d", "e"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js index 71f96df940c84..a4a6ccea84955 100644 --- a/tests/baselines/reference/moduleAugmentationsImports3.js +++ b/tests/baselines/reference/moduleAugmentationsImports3.js @@ -49,35 +49,35 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); define("e", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; - a_1.A.prototype.getCls = function () { return undefined; }; exports.__esModule = true; + a_1.A.prototype.getCls = function () { return undefined; }; }); define("main", ["require", "exports", "D", "e"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js index 2883d91d03c4c..4be17a61edbc6 100644 --- a/tests/baselines/reference/moduleAugmentationsImports4.js +++ b/tests/baselines/reference/moduleAugmentationsImports4.js @@ -50,30 +50,30 @@ let c = a.getCls().y.toLowerCase(); //// [f.js] define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); define("main", ["require", "exports", "D", "E"], function (require, exports) { "use strict"; + exports.__esModule = true; var a; var b = a.getB().x.toFixed(); var c = a.getCls().y.toLowerCase(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js index 8c396d4fcdd5e..ee6fd2ab3176b 100644 --- a/tests/baselines/reference/moduleCodeGenTest5.js +++ b/tests/baselines/reference/moduleCodeGenTest5.js @@ -23,6 +23,7 @@ var v = E2.B; //// [moduleCodeGenTest5.js] "use strict"; +exports.__esModule = true; exports.x = 0; var y = 0; function f1() { } @@ -53,4 +54,3 @@ var E2; E2[E2["B"] = 0] = "B"; })(E2 || (E2 = {})); var v = E2.B; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js index e66235ca2bcb4..f877ad74bc36a 100644 --- a/tests/baselines/reference/moduleCodegenTest4.js +++ b/tests/baselines/reference/moduleCodegenTest4.js @@ -6,10 +6,10 @@ void 0; //// [moduleCodegenTest4.js] "use strict"; +exports.__esModule = true; var Baz; (function (Baz) { Baz.x = "hello"; })(Baz = exports.Baz || (exports.Baz = {})); Baz.x = "goodbye"; void 0; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js index 1af231a9a6224..a2a099fca1d56 100644 --- a/tests/baselines/reference/moduleDuplicateIdentifiers.js +++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js @@ -42,6 +42,7 @@ export enum Utensils { // Shouldn't error //// [moduleDuplicateIdentifiers.js] "use strict"; +exports.__esModule = true; exports.Foo = 2; exports.Foo = 42; // Should error var FooBar; @@ -76,4 +77,3 @@ var Utensils; (function (Utensils) { Utensils[Utensils["Spork"] = 3] = "Spork"; })(Utensils = exports.Utensils || (exports.Utensils = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js index 7db2ce416ddd8..66c746c5f5189 100644 --- a/tests/baselines/reference/moduleExports1.js +++ b/tests/baselines/reference/moduleExports1.js @@ -16,6 +16,7 @@ if (!module.exports) module.exports = ""; //// [moduleExports1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var TypeScript; (function (TypeScript) { var Strasse; @@ -36,5 +37,4 @@ define(["require", "exports"], function (require, exports) { void 0; if (!module.exports) module.exports = ""; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js index 9e79d8d81b226..2ed22cfa4f0e3 100644 --- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js +++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js @@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C1 = (function () { function C1() { } @@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) { } return Test1; }(C1)); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js index 314460661b24b..7408db5c29111 100644 --- a/tests/baselines/reference/moduleInTypePosition1.js +++ b/tests/baselines/reference/moduleInTypePosition1.js @@ -13,14 +13,14 @@ var x = (w1: WinJS) => { }; //// [moduleInTypePosition1_0.js] "use strict"; +exports.__esModule = true; var Promise = (function () { function Promise() { } return Promise; }()); exports.Promise = Promise; -exports.__esModule = true; //// [moduleInTypePosition1_1.js] "use strict"; -var x = function (w1) { }; exports.__esModule = true; +var x = function (w1) { }; diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js index edf18bb7d583a..88531532acc70 100644 --- a/tests/baselines/reference/moduleMergeConstructor.js +++ b/tests/baselines/reference/moduleMergeConstructor.js @@ -30,11 +30,11 @@ class Test { //// [index.js] define(["require", "exports", "foo"], function (require, exports, foo) { "use strict"; + exports.__esModule = true; var Test = (function () { function Test() { this.bar = new foo.Foo(); } return Test; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js index 3ed09d2cd7aa6..7be89f236be00 100644 --- a/tests/baselines/reference/moduleNoneErrors.js +++ b/tests/baselines/reference/moduleNoneErrors.js @@ -6,10 +6,10 @@ export class Foo { //// [a.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js index cb53b78f03819..b38e5d95f2c53 100644 --- a/tests/baselines/reference/modulePrologueAMD.js +++ b/tests/baselines/reference/modulePrologueAMD.js @@ -6,11 +6,11 @@ export class Foo {} //// [modulePrologueAMD.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js index 2f2cf9d91488f..4f465a2ae2f19 100644 --- a/tests/baselines/reference/modulePrologueCommonjs.js +++ b/tests/baselines/reference/modulePrologueCommonjs.js @@ -5,10 +5,10 @@ export class Foo {} //// [modulePrologueCommonjs.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js index 7b39a9d12e312..c9b8c331bcf14 100644 --- a/tests/baselines/reference/modulePrologueUmd.js +++ b/tests/baselines/reference/modulePrologueUmd.js @@ -14,11 +14,11 @@ export class Foo {} } })(function (require, exports) { "use strict"; + exports.__esModule = true; var Foo = (function () { function Foo() { } return Foo; }()); exports.Foo = Foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js index 685a2ac02331f..86f681fa27af6 100644 --- a/tests/baselines/reference/moduleResolutionNoResolve.js +++ b/tests/baselines/reference/moduleResolutionNoResolve.js @@ -13,5 +13,5 @@ export var c = ''; exports.__esModule = true; //// [b.js] "use strict"; -exports.c = ''; exports.__esModule = true; +exports.c = ''; diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js index 3921729211785..33f692396fac6 100644 --- a/tests/baselines/reference/moduleResolutionNoTs.js +++ b/tests/baselines/reference/moduleResolutionNoTs.js @@ -23,12 +23,12 @@ import z2 from "./z"; //// [x.js] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; //// [y.jsx] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; //// [user.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js index d2ee65a508a41..b9a644a7209ad 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions.js @@ -27,8 +27,8 @@ import j from "./jquery.js" //// [a.js] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; // No extension: '.ts' added //// [b.js] "use strict"; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js index fb8904c5748e6..a9dc91d9a5516 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js @@ -12,8 +12,8 @@ import b from "./b"; //// [index.js] "use strict"; -exports["default"] = 0; exports.__esModule = true; +exports["default"] = 0; //// [a.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js index 014207d240027..7d67bde6509b9 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js @@ -14,5 +14,5 @@ import "normalize.css"; //// [a.js] "use strict"; -require("normalize.css"); exports.__esModule = true; +require("normalize.css"); diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js index c53efeb09613b..0a04d8a9077d6 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js @@ -14,5 +14,5 @@ import "foo"; //// [a.js] "use strict"; -require("foo"); exports.__esModule = true; +require("foo"); diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js index e0aebb04d76b3..520324cb22239 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js @@ -43,25 +43,25 @@ tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js // When symlinked files are in node_modules, they are resolved with realpath; // so a linked file does not create a duplicate SourceFile of the real one. "use strict"; +exports.__esModule = true; var MyClass = (function () { function MyClass() { } return MyClass; }()); exports.MyClass = MyClass; -exports.__esModule = true; //// [/src/library-b/index.js] "use strict"; +exports.__esModule = true; var library_a_1 = require("library-a"); exports.MyClass2 = library_a_1.MyClass; -exports.__esModule = true; //// [/src/app.js] "use strict"; +exports.__esModule = true; var x; var y; x = y; y = x; -exports.__esModule = true; /* # To reproduce in a real project: diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js index 55317e413bfcc..cde63e0604ded 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js @@ -18,18 +18,18 @@ x + x2; // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files. // See GH#10364. "use strict"; -exports.x = 0; exports.__esModule = true; +exports.x = 0; //// [/src/bin/shared2/abc.js] // When symlinked files are not in node_modules, realpath is not used. // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files. // See GH#10364. "use strict"; -exports.x = 0; exports.__esModule = true; +exports.x = 0; //// [/src/bin/app.js] "use strict"; +exports.__esModule = true; var abc_1 = require("./shared/abc"); var abc_2 = require("./shared2/abc"); abc_1.x + abc_2.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js index d4fb798e8c7c8..0bd77a1dcc78d 100644 --- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js +++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js @@ -22,22 +22,22 @@ y = x; //// [/src/bin/library-a/index.js] // Same as moduleResolutionWithSymlinks.ts, but with outDir "use strict"; +exports.__esModule = true; var MyClass = (function () { function MyClass() { } return MyClass; }()); exports.MyClass = MyClass; -exports.__esModule = true; //// [/src/bin/library-b/index.js] "use strict"; +exports.__esModule = true; var library_a_1 = require("library-a"); exports.MyClass2 = library_a_1.MyClass; -exports.__esModule = true; //// [/src/bin/app.js] "use strict"; +exports.__esModule = true; var x; var y; x = y; y = x; -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js index 0b50be0e5e419..c4d451ba9f9d3 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js @@ -12,20 +12,20 @@ export var foo = 42; //// [c.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [b.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } -__export(require("./c")); exports.__esModule = true; +__export(require("./c")); //// [a.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +exports.__esModule = true; __export(require("./b")); __export(require("./c")); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js index 7caaf1e55f69a..d1f6dc7abc7cf 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js @@ -15,23 +15,23 @@ export enum Animals { //// [c.js] "use strict"; +exports.__esModule = true; var Animals; (function (Animals) { Animals[Animals["Cat"] = 0] = "Cat"; Animals[Animals["Dog"] = 1] = "Dog"; })(Animals = exports.Animals || (exports.Animals = {})); ; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var c_1 = require("./c"); exports.Animals = c_1.Animals; -exports.__esModule = true; //// [a.js] "use strict"; function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } +exports.__esModule = true; __export(require("./b")); __export(require("./c")); -exports.__esModule = true; diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js index bee7a06ce6ffe..601d7e41fcde0 100644 --- a/tests/baselines/reference/moduleScoping.js +++ b/tests/baselines/reference/moduleScoping.js @@ -29,16 +29,16 @@ var v2 = 42; // Global scope var v4 = function () { return 5; }; //// [file3.js] "use strict"; +exports.__esModule = true; exports.v3 = true; var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope -exports.__esModule = true; //// [file4.js] "use strict"; +exports.__esModule = true; var file3 = require("./file3"); var t1 = v1; var t2 = v2; var t3 = file3.v3; var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module -exports.__esModule = true; //// [file5.js] var x = v2; // Should be global v2 of type number again diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js index afc2fa1f5bd58..07e353cb301b2 100644 --- a/tests/baselines/reference/multiImportExport.js +++ b/tests/baselines/reference/multiImportExport.js @@ -44,13 +44,13 @@ var Math = { module.exports = Math; //// [Drawing.js] "use strict"; -exports.Math = require("./Math/Math"); exports.__esModule = true; +exports.Math = require("./Math/Math"); //// [consumer.js] "use strict"; +exports.__esModule = true; var Drawing = require("./Drawing"); var addr = new Drawing.Math.Adder(); -exports.__esModule = true; //// [Adder.d.ts] diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js index 4ea2e7cb8f03e..98c170518094d 100644 --- a/tests/baselines/reference/multipleDefaultExports01.js +++ b/tests/baselines/reference/multipleDefaultExports01.js @@ -20,6 +20,7 @@ Entity(); //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var foo = (function () { function foo() { } @@ -31,9 +32,8 @@ function bar() { exports.default = bar; var x = 10; exports.default = x; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("./m1"); m1_1.default(); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js index 5fe294d193976..b129dba039232 100644 --- a/tests/baselines/reference/multipleDefaultExports02.js +++ b/tests/baselines/reference/multipleDefaultExports02.js @@ -17,15 +17,15 @@ Entity(); //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function foo() { } exports.default = foo; function bar() { } exports.default = bar; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("./m1"); m1_1.default(); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js index 436232c145ed7..897a3f00eb443 100644 --- a/tests/baselines/reference/multipleDefaultExports03.js +++ b/tests/baselines/reference/multipleDefaultExports03.js @@ -8,6 +8,7 @@ export default class C { //// [multipleDefaultExports03.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var C = (function () { function C() { } @@ -20,4 +21,3 @@ var C = (function () { return C; }()); exports.default = C; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js index b2c37ec5f0ef3..341f6f41c629e 100644 --- a/tests/baselines/reference/multipleDefaultExports04.js +++ b/tests/baselines/reference/multipleDefaultExports04.js @@ -8,10 +8,10 @@ export default function f() { //// [multipleDefaultExports04.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.default = f; function f() { } exports.default = f; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js index 4817012ab75dc..8375c2f9e6f3e 100644 --- a/tests/baselines/reference/multipleExportDefault1.js +++ b/tests/baselines/reference/multipleExportDefault1.js @@ -10,10 +10,10 @@ export default { //// [multipleExportDefault1.js] "use strict"; +exports.__esModule = true; function Foo() { } exports["default"] = Foo; exports["default"] = { uhoh: "another default" }; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js index e979b96fe7174..0c06385f9af46 100644 --- a/tests/baselines/reference/multipleExportDefault2.js +++ b/tests/baselines/reference/multipleExportDefault2.js @@ -9,9 +9,9 @@ export default function Foo() { } //// [multipleExportDefault2.js] "use strict"; +exports.__esModule = true; exports["default"] = { uhoh: "another default" }; function Foo() { } exports["default"] = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js index e889edc907a9f..1091af16301ec 100644 --- a/tests/baselines/reference/multipleExportDefault3.js +++ b/tests/baselines/reference/multipleExportDefault3.js @@ -9,6 +9,7 @@ export default class C { } //// [multipleExportDefault3.js] "use strict"; +exports.__esModule = true; exports["default"] = { uhoh: "another default" }; @@ -18,4 +19,3 @@ var C = (function () { return C; }()); exports["default"] = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js index d46cda4d8b3a4..b3e0ef3e87069 100644 --- a/tests/baselines/reference/multipleExportDefault4.js +++ b/tests/baselines/reference/multipleExportDefault4.js @@ -7,6 +7,7 @@ export default { //// [multipleExportDefault4.js] "use strict"; +exports.__esModule = true; var C = (function () { function C() { } @@ -16,4 +17,3 @@ exports["default"] = C; exports["default"] = { uhoh: "another default" }; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js index 5c10a1be95abe..a5032e45244c8 100644 --- a/tests/baselines/reference/multipleExportDefault5.js +++ b/tests/baselines/reference/multipleExportDefault5.js @@ -4,6 +4,7 @@ export default class C {} //// [multipleExportDefault5.js] "use strict"; +exports.__esModule = true; function bar() { } exports["default"] = bar; var C = (function () { @@ -12,4 +13,3 @@ var C = (function () { return C; }()); exports["default"] = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js index 3d990277993f6..aa372e4d4105c 100644 --- a/tests/baselines/reference/multipleExportDefault6.js +++ b/tests/baselines/reference/multipleExportDefault6.js @@ -9,10 +9,10 @@ export default { //// [multipleExportDefault6.js] "use strict"; +exports.__esModule = true; exports["default"] = { lol: 1 }; exports["default"] = { lol: 2 }; -exports.__esModule = true; diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js index 75a4e125f2119..052765914474b 100644 --- a/tests/baselines/reference/multipleExports.js +++ b/tests/baselines/reference/multipleExports.js @@ -14,6 +14,7 @@ export module M { //// [multipleExports.js] "use strict"; +exports.__esModule = true; var M; (function (M) { M.v = 0; @@ -22,4 +23,3 @@ var x = 0; (function (M) { M.v; })(M = exports.M || (exports.M = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js index 4677da0df7b89..149b6a0d59f8d 100644 --- a/tests/baselines/reference/nameDelimitedBySlashes.js +++ b/tests/baselines/reference/nameDelimitedBySlashes.js @@ -10,10 +10,10 @@ var x = foo.foo + 42; //// [foo_0.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./test/foo_0"); var x = foo.foo + 42; -exports.__esModule = true; diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js index de42c5ed60cae..3c1cf8dce663d 100644 --- a/tests/baselines/reference/nameWithFileExtension.js +++ b/tests/baselines/reference/nameWithFileExtension.js @@ -10,10 +10,10 @@ var x = foo.foo + 42; //// [foo_0.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./foo_0.js"); var x = foo.foo + 42; -exports.__esModule = true; diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js index e7c85322317a4..d070638417bdd 100644 --- a/tests/baselines/reference/nameWithRelativePaths.js +++ b/tests/baselines/reference/nameWithRelativePaths.js @@ -25,28 +25,28 @@ if(foo2.M2.x){ //// [foo_0.js] "use strict"; -exports.foo = 42; exports.__esModule = true; +exports.foo = 42; //// [foo_1.js] "use strict"; +exports.__esModule = true; function f() { return 42; } exports.f = f; -exports.__esModule = true; //// [foo_2.js] "use strict"; +exports.__esModule = true; var M2; (function (M2) { M2.x = true; })(M2 = exports.M2 || (exports.M2 = {})); -exports.__esModule = true; //// [foo_3.js] "use strict"; +exports.__esModule = true; var foo0 = require("../foo_0"); var foo1 = require("./test/foo_1"); var foo2 = require("./.././test/foo_2"); if (foo2.M2.x) { var x = foo0.foo + foo1.f(); } -exports.__esModule = true; diff --git a/tests/baselines/reference/narrowingConstrainedTypeParameter.js b/tests/baselines/reference/narrowingConstrainedTypeParameter.js index f148dc22ea1ec..4663e706d1b43 100644 --- a/tests/baselines/reference/narrowingConstrainedTypeParameter.js +++ b/tests/baselines/reference/narrowingConstrainedTypeParameter.js @@ -20,6 +20,7 @@ export function speak(pet: TPet, voice: (pet: TPet) => string) //// [narrowingConstrainedTypeParameter.js] // Repro from #10811 "use strict"; +exports.__esModule = true; function isPet(pet) { return typeof pet.name === "string"; } @@ -30,4 +31,3 @@ function speak(pet, voice) { return voice(pet); } exports.speak = speak; -exports.__esModule = true; diff --git a/tests/baselines/reference/nestedLoops.js b/tests/baselines/reference/nestedLoops.js index f4aae6dc91ced..6b01eae55cd9e 100644 --- a/tests/baselines/reference/nestedLoops.js +++ b/tests/baselines/reference/nestedLoops.js @@ -19,6 +19,7 @@ export class Test { //// [nestedLoops.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Test = (function () { function Test() { var outerArray = [1, 2, 3]; @@ -45,4 +46,3 @@ var Test = (function () { return Test; }()); exports.Test = Test; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js index 7c4e218549699..1e2231868a8f6 100644 --- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js +++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.js @@ -10,5 +10,5 @@ declare var a: number; //// [1.js] "use strict"; -exports.j = "hello"; // error exports.__esModule = true; +exports.j = "hello"; // error diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js index ed00183359438..f651d4f5b18f5 100644 --- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js +++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.js @@ -11,5 +11,5 @@ export var j = "hello"; // error //// [1.js] "use strict"; -exports.j = "hello"; // error exports.__esModule = true; +exports.j = "hello"; // error diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js index 85553b5265f8c..63788fd860ffe 100644 --- a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js +++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js @@ -13,6 +13,7 @@ export declare class Bar2 { //// [noImplicitAnyDestructuringInPrivateMethod.js] "use strict"; +exports.__esModule = true; var Bar = (function () { function Bar() { } @@ -23,7 +24,6 @@ var Bar = (function () { return Bar; }()); exports.Bar = Bar; -exports.__esModule = true; //// [noImplicitAnyDestructuringInPrivateMethod.d.ts] diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js index 8b3e7628e4e2d..387d5b9497b33 100644 --- a/tests/baselines/reference/noImplicitUseStrict_amd.js +++ b/tests/baselines/reference/noImplicitUseStrict_amd.js @@ -4,6 +4,6 @@ export var x = 0; //// [noImplicitUseStrict_amd.js] define(["require", "exports"], function (require, exports) { - exports.x = 0; exports.__esModule = true; + exports.x = 0; }); diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js index 30d507c8fc2bb..4b6fd2db6cd61 100644 --- a/tests/baselines/reference/noImplicitUseStrict_commonjs.js +++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js @@ -3,5 +3,5 @@ export var x = 0; //// [noImplicitUseStrict_commonjs.js] -exports.x = 0; exports.__esModule = true; +exports.x = 0; diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js index b48c5fde9a50c..484909c51fc84 100644 --- a/tests/baselines/reference/noImplicitUseStrict_umd.js +++ b/tests/baselines/reference/noImplicitUseStrict_umd.js @@ -12,6 +12,6 @@ export var x = 0; define(["require", "exports"], factory); } })(function (require, exports) { - exports.x = 0; exports.__esModule = true; + exports.x = 0; }); diff --git a/tests/baselines/reference/nodeResolution1.js b/tests/baselines/reference/nodeResolution1.js index 21f6e259d3d50..d3dad3355e617 100644 --- a/tests/baselines/reference/nodeResolution1.js +++ b/tests/baselines/reference/nodeResolution1.js @@ -9,8 +9,8 @@ import y = require("./a"); //// [a.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [b.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/nonMergedOverloads.js b/tests/baselines/reference/nonMergedOverloads.js index 8183e02d0f201..515792feb7055 100644 --- a/tests/baselines/reference/nonMergedOverloads.js +++ b/tests/baselines/reference/nonMergedOverloads.js @@ -7,8 +7,8 @@ export function f() { //// [nonMergedOverloads.js] "use strict"; +exports.__esModule = true; var f = 10; function f() { } exports.f = f; -exports.__esModule = true; diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js index 08dda7376dce3..c93172951e929 100644 --- a/tests/baselines/reference/objectIndexer.js +++ b/tests/baselines/reference/objectIndexer.js @@ -18,11 +18,11 @@ class Emitter { //// [objectIndexer.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Emitter = (function () { function Emitter() { this.listeners = {}; } return Emitter; }()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js index 47d356e3bf142..9166551315309 100644 --- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js +++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js @@ -13,15 +13,15 @@ export default function foo() { new Foo(); } //// [output.js] define("b", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); function foo() { new a_1.default(); } exports.default = foo; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("a", ["require", "exports", "b"], function (require, exports, b_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); class Foo { } exports.default = Foo; b_1.default(); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js index 0c2618e2a9e3c..fd3a4003ddf24 100644 --- a/tests/baselines/reference/outModuleConcatAmd.js +++ b/tests/baselines/reference/outModuleConcatAmd.js @@ -21,16 +21,17 @@ var __extends = (this && this.__extends) || (function () { })(); define("ref/a", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var A = (function () { function A() { } return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var B = (function (_super) { __extends(B, _super); function B() { @@ -39,7 +40,6 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { return B; }(a_1.A)); exports.B = B; - Object.defineProperty(exports, "__esModule", { value: true }); }); //# sourceMappingURL=all.js.map diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map index fa822fc1825e7..0e1c7d24100f4 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":[],"mappings":";;;;;;;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ 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,cAAC;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt index c2d000629a599..c18f4e4225237 100644 --- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt @@ -20,18 +20,19 @@ sourceFile:tests/cases/compiler/ref/a.ts >>>})(); >>>define("ref/a", ["require", "exports"], function (require, exports) { >>> "use strict"; +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>> var A = (function () { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(13, 5) Source(2, 1) + SourceIndex(0) +1 >Emitted(14, 5) Source(2, 1) + SourceIndex(0) --- >>> function A() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(14, 9) Source(2, 1) + SourceIndex(0) +1->Emitted(15, 9) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -39,16 +40,16 @@ sourceFile:tests/cases/compiler/ref/a.ts 3 > ^^^^^^^^^-> 1->export class A { 2 > } -1->Emitted(15, 9) Source(2, 18) + SourceIndex(0) -2 >Emitted(15, 10) Source(2, 19) + SourceIndex(0) +1->Emitted(16, 9) Source(2, 18) + SourceIndex(0) +2 >Emitted(16, 10) Source(2, 19) + SourceIndex(0) --- >>> return A; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(16, 9) Source(2, 18) + SourceIndex(0) -2 >Emitted(16, 17) Source(2, 19) + SourceIndex(0) +1->Emitted(17, 9) Source(2, 18) + SourceIndex(0) +2 >Emitted(17, 17) Source(2, 19) + SourceIndex(0) --- >>> }()); 1 >^^^^ @@ -60,48 +61,47 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > } 3 > 4 > export class A { } -1 >Emitted(17, 5) Source(2, 18) + SourceIndex(0) -2 >Emitted(17, 6) Source(2, 19) + SourceIndex(0) -3 >Emitted(17, 6) Source(2, 1) + SourceIndex(0) -4 >Emitted(17, 10) Source(2, 19) + SourceIndex(0) +1 >Emitted(18, 5) Source(2, 18) + SourceIndex(0) +2 >Emitted(18, 6) Source(2, 19) + SourceIndex(0) +3 >Emitted(18, 6) Source(2, 1) + SourceIndex(0) +4 >Emitted(18, 10) Source(2, 19) + SourceIndex(0) --- >>> exports.A = A; 1->^^^^ 2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > A -1->Emitted(18, 5) Source(2, 14) + SourceIndex(0) -2 >Emitted(18, 19) Source(2, 15) + SourceIndex(0) +1->Emitted(19, 5) Source(2, 14) + SourceIndex(0) +2 >Emitted(19, 19) Source(2, 15) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:all.js sourceFile:tests/cases/compiler/b.ts ------------------------------------------------------------------- ->>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { >>> "use strict"; +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>> var B = (function (_super) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->import {A} from "./ref/a"; +1 >import {A} from "./ref/a"; > -1->Emitted(23, 5) Source(2, 1) + SourceIndex(1) +1 >Emitted(24, 5) Source(2, 1) + SourceIndex(1) --- >>> __extends(B, _super); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(24, 9) Source(2, 24) + SourceIndex(1) -2 >Emitted(24, 30) Source(2, 25) + SourceIndex(1) +1->Emitted(25, 9) Source(2, 24) + SourceIndex(1) +2 >Emitted(25, 30) Source(2, 25) + SourceIndex(1) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(25, 9) Source(2, 1) + SourceIndex(1) +1 >Emitted(26, 9) Source(2, 1) + SourceIndex(1) --- >>> return _super !== null && _super.apply(this, arguments) || this; >>> } @@ -110,16 +110,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1->export class B extends A { 2 > } -1->Emitted(27, 9) Source(2, 28) + SourceIndex(1) -2 >Emitted(27, 10) Source(2, 29) + SourceIndex(1) +1->Emitted(28, 9) Source(2, 28) + SourceIndex(1) +2 >Emitted(28, 10) Source(2, 29) + SourceIndex(1) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(28, 9) Source(2, 28) + SourceIndex(1) -2 >Emitted(28, 17) Source(2, 29) + SourceIndex(1) +1->Emitted(29, 9) Source(2, 28) + SourceIndex(1) +2 >Emitted(29, 17) Source(2, 29) + SourceIndex(1) --- >>> }(a_1.A)); 1 >^^^^ @@ -135,22 +135,20 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(29, 5) Source(2, 28) + SourceIndex(1) -2 >Emitted(29, 6) Source(2, 29) + SourceIndex(1) -3 >Emitted(29, 6) Source(2, 1) + SourceIndex(1) -4 >Emitted(29, 7) Source(2, 24) + SourceIndex(1) -5 >Emitted(29, 12) Source(2, 25) + SourceIndex(1) -6 >Emitted(29, 15) Source(2, 29) + SourceIndex(1) +1 >Emitted(30, 5) Source(2, 28) + SourceIndex(1) +2 >Emitted(30, 6) Source(2, 29) + SourceIndex(1) +3 >Emitted(30, 6) Source(2, 1) + SourceIndex(1) +4 >Emitted(30, 7) Source(2, 24) + SourceIndex(1) +5 >Emitted(30, 12) Source(2, 25) + SourceIndex(1) +6 >Emitted(30, 15) Source(2, 29) + SourceIndex(1) --- >>> exports.B = B; 1->^^^^ 2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > B -1->Emitted(30, 5) Source(2, 14) + SourceIndex(1) -2 >Emitted(30, 19) Source(2, 15) + SourceIndex(1) +1->Emitted(31, 5) Source(2, 14) + SourceIndex(1) +2 >Emitted(31, 19) Source(2, 15) + SourceIndex(1) --- ->>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>//# sourceMappingURL=all.js.map \ No newline at end of file diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js index aee6038f988b9..c45414b5e6202 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.js +++ b/tests/baselines/reference/outModuleTripleSlashRefs.js @@ -49,6 +49,7 @@ var Foo = (function () { }()); define("ref/a", ["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); /// var A = (function () { function A() { @@ -56,10 +57,10 @@ define("ref/a", ["require", "exports"], function (require, exports) { return A; }()); exports.A = A; - Object.defineProperty(exports, "__esModule", { value: true }); }); define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var B = (function (_super) { __extends(B, _super); function B() { @@ -68,7 +69,6 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { return B; }(a_1.A)); exports.B = B; - Object.defineProperty(exports, "__esModule", { value: true }); }); //# sourceMappingURL=all.js.map diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map index a55c177680d7a..8b552ec3fb355 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":[],"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,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ 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,cAAC;;;;;ICDd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt index 5f71c12c2a34f..231da040f11f1 100644 --- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt +++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt @@ -81,27 +81,28 @@ sourceFile:tests/cases/compiler/ref/a.ts ------------------------------------------------------------------- >>>define("ref/a", ["require", "exports"], function (require, exports) { >>> "use strict"; +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>> /// 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1-> > 2 > /// -1->Emitted(19, 5) Source(2, 1) + SourceIndex(1) -2 >Emitted(19, 36) Source(2, 32) + SourceIndex(1) +1->Emitted(20, 5) Source(2, 1) + SourceIndex(1) +2 >Emitted(20, 36) Source(2, 32) + SourceIndex(1) --- >>> var A = (function () { 1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(20, 5) Source(3, 1) + SourceIndex(1) +1 >Emitted(21, 5) Source(3, 1) + SourceIndex(1) --- >>> function A() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(21, 9) Source(3, 1) + SourceIndex(1) +1->Emitted(22, 9) Source(3, 1) + SourceIndex(1) --- >>> } 1->^^^^^^^^ @@ -111,16 +112,16 @@ sourceFile:tests/cases/compiler/ref/a.ts > member: typeof GlobalFoo; > 2 > } -1->Emitted(22, 9) Source(5, 1) + SourceIndex(1) -2 >Emitted(22, 10) Source(5, 2) + SourceIndex(1) +1->Emitted(23, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(23, 10) Source(5, 2) + SourceIndex(1) --- >>> return A; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(23, 9) Source(5, 1) + SourceIndex(1) -2 >Emitted(23, 17) Source(5, 2) + SourceIndex(1) +1->Emitted(24, 9) Source(5, 1) + SourceIndex(1) +2 >Emitted(24, 17) Source(5, 2) + SourceIndex(1) --- >>> }()); 1 >^^^^ @@ -134,48 +135,47 @@ sourceFile:tests/cases/compiler/ref/a.ts 4 > export class A { > member: typeof GlobalFoo; > } -1 >Emitted(24, 5) Source(5, 1) + SourceIndex(1) -2 >Emitted(24, 6) Source(5, 2) + SourceIndex(1) -3 >Emitted(24, 6) Source(3, 1) + SourceIndex(1) -4 >Emitted(24, 10) Source(5, 2) + SourceIndex(1) +1 >Emitted(25, 5) Source(5, 1) + SourceIndex(1) +2 >Emitted(25, 6) Source(5, 2) + SourceIndex(1) +3 >Emitted(25, 6) Source(3, 1) + SourceIndex(1) +4 >Emitted(25, 10) Source(5, 2) + SourceIndex(1) --- >>> exports.A = A; 1->^^^^ 2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > A -1->Emitted(25, 5) Source(3, 14) + SourceIndex(1) -2 >Emitted(25, 19) Source(3, 15) + SourceIndex(1) +1->Emitted(26, 5) Source(3, 14) + SourceIndex(1) +2 >Emitted(26, 19) Source(3, 15) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:all.js sourceFile:tests/cases/compiler/b.ts ------------------------------------------------------------------- ->>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) { >>> "use strict"; +>>> Object.defineProperty(exports, "__esModule", { value: true }); >>> var B = (function (_super) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1->import {A} from "./ref/a"; +1 >import {A} from "./ref/a"; > -1->Emitted(30, 5) Source(2, 1) + SourceIndex(2) +1 >Emitted(31, 5) Source(2, 1) + SourceIndex(2) --- >>> __extends(B, _super); 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(31, 9) Source(2, 24) + SourceIndex(2) -2 >Emitted(31, 30) Source(2, 25) + SourceIndex(2) +1->Emitted(32, 9) Source(2, 24) + SourceIndex(2) +2 >Emitted(32, 30) Source(2, 25) + SourceIndex(2) --- >>> function B() { 1 >^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(32, 9) Source(2, 1) + SourceIndex(2) +1 >Emitted(33, 9) Source(2, 1) + SourceIndex(2) --- >>> return _super !== null && _super.apply(this, arguments) || this; >>> } @@ -184,16 +184,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1->export class B extends A { 2 > } -1->Emitted(34, 9) Source(2, 28) + SourceIndex(2) -2 >Emitted(34, 10) Source(2, 29) + SourceIndex(2) +1->Emitted(35, 9) Source(2, 28) + SourceIndex(2) +2 >Emitted(35, 10) Source(2, 29) + SourceIndex(2) --- >>> return B; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(35, 9) Source(2, 28) + SourceIndex(2) -2 >Emitted(35, 17) Source(2, 29) + SourceIndex(2) +1->Emitted(36, 9) Source(2, 28) + SourceIndex(2) +2 >Emitted(36, 17) Source(2, 29) + SourceIndex(2) --- >>> }(a_1.A)); 1 >^^^^ @@ -209,22 +209,20 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(36, 5) Source(2, 28) + SourceIndex(2) -2 >Emitted(36, 6) Source(2, 29) + SourceIndex(2) -3 >Emitted(36, 6) Source(2, 1) + SourceIndex(2) -4 >Emitted(36, 7) Source(2, 24) + SourceIndex(2) -5 >Emitted(36, 12) Source(2, 25) + SourceIndex(2) -6 >Emitted(36, 15) Source(2, 29) + SourceIndex(2) +1 >Emitted(37, 5) Source(2, 28) + SourceIndex(2) +2 >Emitted(37, 6) Source(2, 29) + SourceIndex(2) +3 >Emitted(37, 6) Source(2, 1) + SourceIndex(2) +4 >Emitted(37, 7) Source(2, 24) + SourceIndex(2) +5 >Emitted(37, 12) Source(2, 25) + SourceIndex(2) +6 >Emitted(37, 15) Source(2, 29) + SourceIndex(2) --- >>> exports.B = B; 1->^^^^ 2 > ^^^^^^^^^^^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > B -1->Emitted(37, 5) Source(2, 14) + SourceIndex(2) -2 >Emitted(37, 19) Source(2, 15) + SourceIndex(2) +1->Emitted(38, 5) Source(2, 14) + SourceIndex(2) +2 >Emitted(38, 19) Source(2, 15) + SourceIndex(2) --- ->>> Object.defineProperty(exports, "__esModule", { value: true }); >>>}); >>>//# 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 748854e38e867..783bf854a8424 100644 --- a/tests/baselines/reference/overloadModifiersMustAgree.js +++ b/tests/baselines/reference/overloadModifiersMustAgree.js @@ -17,6 +17,7 @@ interface I { //// [overloadModifiersMustAgree.js] "use strict"; +exports.__esModule = true; var baz = (function () { function baz() { } @@ -24,4 +25,3 @@ var baz = (function () { return baz; }()); function bar(s) { } -exports.__esModule = true; diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js index 85a743c6faa93..b4443e0413632 100644 --- a/tests/baselines/reference/parser0_004152.js +++ b/tests/baselines/reference/parser0_004152.js @@ -6,6 +6,7 @@ export class Game { //// [parser0_004152.js] "use strict"; +exports.__esModule = true; var Game = (function () { function Game() { this.position = new DisplayPosition([]); @@ -14,4 +15,3 @@ var Game = (function () { return Game; }()); exports.Game = Game; -exports.__esModule = true; diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js index 4b95b2719e65e..e99d1d1764d67 100644 --- a/tests/baselines/reference/parser509546.js +++ b/tests/baselines/reference/parser509546.js @@ -6,10 +6,10 @@ export class Logger { //// [parser509546.js] "use strict"; +exports.__esModule = true; var Logger = (function () { function Logger() { } return Logger; }()); exports.Logger = Logger; -exports.__esModule = true; diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js index 2b3afe47ac92f..3fc82755fbf91 100644 --- a/tests/baselines/reference/parser509546_1.js +++ b/tests/baselines/reference/parser509546_1.js @@ -6,10 +6,10 @@ export class Logger { //// [parser509546_1.js] "use strict"; +exports.__esModule = true; var Logger = (function () { function Logger() { } return Logger; }()); exports.Logger = Logger; -exports.__esModule = true; diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js index 071c57efb877c..c16f041b2db71 100644 --- a/tests/baselines/reference/parser509546_2.js +++ b/tests/baselines/reference/parser509546_2.js @@ -8,10 +8,10 @@ export class Logger { //// [parser509546_2.js] "use strict"; +exports.__esModule = true; var Logger = (function () { function Logger() { } return Logger; }()); exports.Logger = Logger; -exports.__esModule = true; diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js index 2898281f4938d..bfef06b061f70 100644 --- a/tests/baselines/reference/parser618973.js +++ b/tests/baselines/reference/parser618973.js @@ -6,6 +6,7 @@ export export class Foo { //// [parser618973.js] "use strict"; +exports.__esModule = true; var Foo = (function () { function Foo() { } @@ -14,4 +15,3 @@ var Foo = (function () { return Foo; }()); exports.Foo = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserArgumentList1.js b/tests/baselines/reference/parserArgumentList1.js index 167903245c1af..36c8f61923549 100644 --- a/tests/baselines/reference/parserArgumentList1.js +++ b/tests/baselines/reference/parserArgumentList1.js @@ -7,10 +7,10 @@ export function removeClass (node:HTMLElement, className:string) { //// [parserArgumentList1.js] "use strict"; +exports.__esModule = true; function removeClass(node, className) { node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) { return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : ''; }); } exports.removeClass = removeClass; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js index 97b8a7b056254..7fcbf29f242be 100644 --- a/tests/baselines/reference/parserClass1.js +++ b/tests/baselines/reference/parserClass1.js @@ -11,6 +11,7 @@ //// [parserClass1.js] "use strict"; +exports.__esModule = true; var NullLogger = (function () { function NullLogger() { } @@ -24,4 +25,3 @@ var NullLogger = (function () { return NullLogger; }()); exports.NullLogger = NullLogger; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js index d1df19e61632d..0d47a388accc3 100644 --- a/tests/baselines/reference/parserClass2.js +++ b/tests/baselines/reference/parserClass2.js @@ -9,6 +9,7 @@ //// [parserClass2.js] "use strict"; +exports.__esModule = true; var LoggerAdapter = (function () { function LoggerAdapter(logger) { this.logger = logger; @@ -17,4 +18,3 @@ var LoggerAdapter = (function () { return LoggerAdapter; }()); exports.LoggerAdapter = LoggerAdapter; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum1.js b/tests/baselines/reference/parserEnum1.js index 52971b2b9c2bb..43cdc626ab86a 100644 --- a/tests/baselines/reference/parserEnum1.js +++ b/tests/baselines/reference/parserEnum1.js @@ -10,6 +10,7 @@ //// [parserEnum1.js] "use strict"; +exports.__esModule = true; var SignatureFlags; (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; @@ -17,4 +18,3 @@ var SignatureFlags; SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer"; SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer"; })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum2.js b/tests/baselines/reference/parserEnum2.js index 47d5899990ddc..0fa0633d2801e 100644 --- a/tests/baselines/reference/parserEnum2.js +++ b/tests/baselines/reference/parserEnum2.js @@ -10,6 +10,7 @@ //// [parserEnum2.js] "use strict"; +exports.__esModule = true; var SignatureFlags; (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; @@ -17,4 +18,3 @@ var SignatureFlags; SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer"; SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer"; })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum3.js b/tests/baselines/reference/parserEnum3.js index e18a4c2069697..b9b9e743e4bdc 100644 --- a/tests/baselines/reference/parserEnum3.js +++ b/tests/baselines/reference/parserEnum3.js @@ -6,7 +6,7 @@ //// [parserEnum3.js] "use strict"; +exports.__esModule = true; var SignatureFlags; (function (SignatureFlags) { })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/parserEnum4.js b/tests/baselines/reference/parserEnum4.js index 90c0253e1f988..96d3c8757eda0 100644 --- a/tests/baselines/reference/parserEnum4.js +++ b/tests/baselines/reference/parserEnum4.js @@ -7,7 +7,7 @@ //// [parserEnum4.js] "use strict"; +exports.__esModule = true; var SignatureFlags; (function (SignatureFlags) { })(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.js b/tests/baselines/reference/parserModifierOnStatementInBlock1.js index e07e3ee904338..43c1e4bf84588 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock1.js +++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.js @@ -6,8 +6,8 @@ export function foo() { //// [parserModifierOnStatementInBlock1.js] "use strict"; +exports.__esModule = true; function foo() { export var x = this; } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.js b/tests/baselines/reference/parserModifierOnStatementInBlock3.js index 8d4f29558c881..85c3d6da0a4c5 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock3.js +++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.js @@ -7,9 +7,9 @@ export function foo() { //// [parserModifierOnStatementInBlock3.js] "use strict"; +exports.__esModule = true; function foo() { export function bar() { } } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js index 5bd983595dca3..484c74f721c62 100644 --- a/tests/baselines/reference/parserModule1.js +++ b/tests/baselines/reference/parserModule1.js @@ -33,6 +33,7 @@ //// [parserModule1.js] "use strict"; +exports.__esModule = true; var CompilerDiagnostics; (function (CompilerDiagnostics) { CompilerDiagnostics.debug = false; @@ -59,4 +60,3 @@ var CompilerDiagnostics; } CompilerDiagnostics.assert = assert; })(CompilerDiagnostics = exports.CompilerDiagnostics || (exports.CompilerDiagnostics = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js index 58199832ee60f..e8c026429f164 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js @@ -5,6 +5,6 @@ export var x = 1; //// [f1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js index d6692582fedb2..6439d35aadf48 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js @@ -4,5 +4,5 @@ export var x = 1; //// [f1.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js index 3e6e3a22d5c5f..df5115d536042 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js @@ -4,6 +4,6 @@ export var x = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js index 955fb4cf7ae96..a0c8d5df7ded6 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js @@ -3,5 +3,5 @@ export var x = 1; //// [file1.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js index e05006539a992..8809efa963a2a 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js @@ -22,25 +22,25 @@ export var y = 100; //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.y = 100; exports.__esModule = true; + exports.y = 100; }); //// [file2.js] define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) { "use strict"; - exports.x = file3_1.x + file4_1.y; exports.__esModule = true; + exports.x = file3_1.x + file4_1.y; }); //// [file1.js] // baseUrl set via command line define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { "use strict"; - use(file2_1.x.toExponential()); exports.__esModule = true; + use(file2_1.x.toExponential()); }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js index 515f6e517155e..cd0eb7d7794f3 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js @@ -21,17 +21,17 @@ export var y: number; //// [file3.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [file2.js] "use strict"; +exports.__esModule = true; var file3_1 = require("./file3"); // found with baseurl var file4_1 = require("file4"); // found with fallback exports.x = file3_1.x + file4_1.y; -exports.__esModule = true; //// [file1.js] // baseUrl set via command line "use strict"; +exports.__esModule = true; var file2_1 = require("folder2/file2"); use(file2_1.x.toExponential()); -exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js index 28b3eb8a902dc..2a8254fb69687 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js @@ -19,24 +19,24 @@ export var y = 100; //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.y = 100; exports.__esModule = true; + exports.y = 100; }); //// [file2.js] define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) { "use strict"; - exports.x = file3_1.x + file4_1.y; exports.__esModule = true; + exports.x = file3_1.x + file4_1.y; }); //// [file1.js] define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { "use strict"; - use(file2_1.x.toExponential()); exports.__esModule = true; + use(file2_1.x.toExponential()); }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js index cf9e143ebb02f..ff1a51662b062 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js @@ -18,16 +18,16 @@ export var y: number; //// [file3.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [file2.js] "use strict"; +exports.__esModule = true; var file3_1 = require("./file3"); // found with baseurl var file4_1 = require("file4"); // found with fallback exports.x = file3_1.x + file4_1.y; -exports.__esModule = true; //// [file1.js] "use strict"; +exports.__esModule = true; var file2_1 = require("folder2/file2"); use(file2_1.x.toExponential()); -exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js index 46244521fabc7..1b9782660d8e9 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js @@ -28,33 +28,33 @@ export var z1 = 1; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.y = 1; exports.__esModule = true; + exports.y = 1; }); //// [file3.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.z = 1; exports.__esModule = true; + exports.z = 1; }); //// [file4.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.z1 = 1; exports.__esModule = true; + exports.z1 = 1; }); //// [file1.js] define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { "use strict"; + exports.__esModule = true; use(file1_1.x.toExponential()); use(file2_1.y.toExponential()); use(file3_1.z.toExponential()); use(file4_1.z1.toExponential()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js index 69e5e16fe91a5..7d10c4d4a8bb5 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js @@ -27,18 +27,19 @@ export var z1 = 1; //// [file1.js] "use strict"; -exports.x = 1; exports.__esModule = true; +exports.x = 1; //// [file2.js] "use strict"; -exports.y = 1; exports.__esModule = true; +exports.y = 1; //// [file4.js] "use strict"; -exports.z1 = 1; exports.__esModule = true; +exports.z1 = 1; //// [file1.js] "use strict"; +exports.__esModule = true; var file1_1 = require("folder2/file1"); var file2_1 = require("folder3/file2"); var file3_1 = require("components/file3"); @@ -47,4 +48,3 @@ use(file1_1.x.toExponential()); use(file2_1.y.toExponential()); use(file3_1.z.toExponential()); use(file4_1.z1.toExponential()); -exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js index 12e8e5dbda5d9..3289efd02095f 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js @@ -14,12 +14,12 @@ export {x} from "../file2"; //// [file3.js] define(["require", "exports", "../file2"], function (require, exports, file2_1) { "use strict"; - exports.x = file2_1.x; exports.__esModule = true; + exports.x = file2_1.x; }); //// [file1.js] define(["require", "exports", "./project/file3"], function (require, exports, file3_1) { "use strict"; - use(file3_1.x.toExponential()); exports.__esModule = true; + use(file3_1.x.toExponential()); }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js index 5cc834d071271..74c0f40758abc 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js @@ -13,11 +13,11 @@ export {x} from "../file2"; //// [file3.js] "use strict"; +exports.__esModule = true; var file2_1 = require("../file2"); exports.x = file2_1.x; -exports.__esModule = true; //// [file1.js] "use strict"; +exports.__esModule = true; var file3_1 = require("./project/file3"); use(file3_1.x.toFixed()); -exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js index 9aa886aeb26a8..55aca054e8249 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js @@ -36,13 +36,13 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] define(["require", "exports", "module1", "templates/module2", "../file3"], function (require, exports, module1_1, module2_1, file3_1) { "use strict"; - exports.x = module1_1.a + module2_1.b + file3_1.x; exports.__esModule = true; + exports.x = module1_1.a + module2_1.b + file3_1.x; }); //// [file1.js] define(["require", "exports", "./project/file2", "module3"], function (require, exports, file2_1, module3_1) { "use strict"; + exports.__esModule = true; use(file2_1.x.toFixed()); use(module3_1.y.toFixed()); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js index 8095c4de6a1ad..303b98f4d83de 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js @@ -33,15 +33,15 @@ export let y: number; exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; var module1_1 = require("module1"); var module2_1 = require("templates/module2"); var file3_1 = require("../file3"); exports.x = module1_1.a + module2_1.b + file3_1.x; -exports.__esModule = true; //// [file1.js] "use strict"; +exports.__esModule = true; var file2_1 = require("./project/file2"); var module3_1 = require("module3"); use(file2_1.x.toFixed()); use(module3_1.y.toFixed()); -exports.__esModule = true; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js index 44a53df492aa9..a91cc9d8d5a47 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js @@ -14,14 +14,14 @@ import { bar } from "bar"; //// [foo.js] "use strict"; +exports.__esModule = true; function foo() { } exports.foo = foo; -exports.__esModule = true; //// [bar.js] "use strict"; +exports.__esModule = true; function bar() { } exports.bar = bar; -exports.__esModule = true; //// [a.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js index cdfcaad87437e..f7e41263237d6 100644 --- a/tests/baselines/reference/prespecializedGenericMembers1.js +++ b/tests/baselines/reference/prespecializedGenericMembers1.js @@ -22,6 +22,7 @@ var catBag = new CatBag(catThing); //// [prespecializedGenericMembers1.js] "use strict"; +exports.__esModule = true; var Cat = (function () { function Cat() { } @@ -39,4 +40,3 @@ var catThing = { barry: cat }; var catBag = new CatBag(catThing); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index a85eb6de60c17..9d077d19e0697 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -1061,6 +1061,7 @@ module publicModuleInGlobal { //// [privacyAccessorDeclFile_externalModule.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var privateClass = (function () { function privateClass() { } @@ -2498,7 +2499,6 @@ var privateModule; return privateClassWithPrivateModuleSetAccessorTypes; }()); })(privateModule || (privateModule = {})); -Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyAccessorDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index cbec9edb15460..d19869b0f0345 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -139,6 +139,7 @@ class privateClassWithPrivateModuleGetAccessorTypes { //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.js] //// [privacyCannotNameAccessorDeclFile_Widgets.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -164,9 +165,9 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); -Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyCannotNameAccessorDeclFile_exporter.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); /// var Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -186,9 +187,9 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; -Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyCannotNameAccessorDeclFile_consumer.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var exporter = require("./privacyCannotNameAccessorDeclFile_exporter"); var publicClassWithWithPrivateGetAccessorTypes = (function () { function publicClassWithWithPrivateGetAccessorTypes() { @@ -380,7 +381,6 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () { }); return privateClassWithPrivateModuleGetAccessorTypes; }()); -Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index 7f3ef5512ae29..df24bf7025993 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -103,6 +103,7 @@ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4() //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.js] //// [privacyCannotNameVarTypeDeclFile_Widgets.js] "use strict"; +exports.__esModule = true; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -128,9 +129,9 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); -exports.__esModule = true; //// [privacyCannotNameVarTypeDeclFile_exporter.js] "use strict"; +exports.__esModule = true; /// var Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -150,9 +151,9 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; -exports.__esModule = true; //// [privacyCannotNameVarTypeDeclFile_consumer.js] "use strict"; +exports.__esModule = true; var exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); var publicClassWithWithPrivatePropertyTypes = (function () { function publicClassWithWithPrivatePropertyTypes() { @@ -208,7 +209,6 @@ privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.cre privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); -exports.__esModule = true; //// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js index e150564b747ee..8ddcc60a8ff19 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js @@ -18,6 +18,7 @@ module Query { //// [privacyCheckAnonymousFunctionParameter.js] "use strict"; +exports.__esModule = true; exports.x = 1; // Makes this an external module var Query; (function (Query) { @@ -31,7 +32,6 @@ var Query; }); } })(Query || (Query = {})); -exports.__esModule = true; //// [privacyCheckAnonymousFunctionParameter.d.ts] diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js index 3dee88c4f718b..f18f47c20c312 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js @@ -17,6 +17,7 @@ module Q { //// [privacyCheckAnonymousFunctionParameter2.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.x = 1; // Makes this an external module var Q; (function (Q) { @@ -30,7 +31,6 @@ define(["require", "exports"], function (require, exports) { Q.foo(null); } })(Q || (Q = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js index faa22fe190f28..dc868d86bff76 100644 --- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js +++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js @@ -13,6 +13,7 @@ export class B { //// [privacyCheckOnTypeParameterReferenceInConstructorParameter.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A(callback) { var child = new B(this); @@ -26,7 +27,6 @@ define(["require", "exports"], function (require, exports) { return B; }()); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js index 40cff7997a74b..614bcedebe0de 100644 --- a/tests/baselines/reference/privacyCheckTypeOfFunction.js +++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js @@ -7,7 +7,7 @@ export var b = foo; //// [privacyCheckTypeOfFunction.js] "use strict"; +exports.__esModule = true; function foo() { } exports.b = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js index 4b08cf22e4f3b..95b12f4e2fa4f 100644 --- a/tests/baselines/reference/privacyClass.js +++ b/tests/baselines/reference/privacyClass.js @@ -139,6 +139,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var m1; (function (m1) { var m1_c_public = (function () { @@ -430,4 +431,3 @@ var glo_C12_public = (function (_super) { return glo_C12_public; }(glo_c_private)); exports.glo_C12_public = glo_C12_public; -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index 0c500f0ed2838..2803006c5b51e 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -109,6 +109,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var publicModule; (function (publicModule) { var publicClassInPublicModule = (function () { @@ -289,7 +290,6 @@ var publicClassExtendingFromPrivateModuleClass = (function (_super) { return publicClassExtendingFromPrivateModuleClass; }(privateModule.publicClassInPrivateModule)); exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass; -exports.__esModule = true; //// [privacyClassExtendsClauseDeclFile_GlobalFile.js] var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index 595889593cd6d..3d78f2a804800 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -96,6 +96,7 @@ class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceI //// [privacyClassImplementsClauseDeclFile_externalModule.js] "use strict"; +exports.__esModule = true; var publicModule; (function (publicModule) { var privateClassImplementingPublicInterfaceInModule = (function () { @@ -207,7 +208,6 @@ var publicClassImplementingFromPrivateModuleInterface = (function () { return publicClassImplementingFromPrivateModuleInterface; }()); exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface; -exports.__esModule = true; //// [privacyClassImplementsClauseDeclFile_GlobalFile.js] var publicModuleInGlobal; (function (publicModuleInGlobal) { diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js index 3304fbd1df373..00314bdceab46 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -159,6 +159,7 @@ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createE //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.js] //// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.js] "use strict"; +exports.__esModule = true; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -184,9 +185,9 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); -exports.__esModule = true; //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js] "use strict"; +exports.__esModule = true; /// var Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -206,9 +207,9 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; -exports.__esModule = true; //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js] "use strict"; +exports.__esModule = true; var exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { @@ -394,7 +395,6 @@ function privateFunctionWithPrivateModuleParameterTypes(param) { function privateFunctionWithPrivateModuleParameterTypes1(param) { if (param === void 0) { param = exporter.createExportedWidget4(); } } -exports.__esModule = true; //// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js index c354ed6832107..2124f8fbb24fa 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -166,6 +166,7 @@ function privateFunctionWithPrivateModuleReturnTypes1() { //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.js] //// [privacyFunctionReturnTypeDeclFile_Widgets.js] "use strict"; +exports.__esModule = true; var Widget1 = (function () { function Widget1() { this.name = 'one'; @@ -191,9 +192,9 @@ var SpecializedWidget; } SpecializedWidget.createWidget2 = createWidget2; })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); -exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_exporter.js] "use strict"; +exports.__esModule = true; /// var Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets"); var Widgets1 = require("GlobalWidgets"); @@ -213,9 +214,9 @@ function createExportedWidget4() { return Widgets1.SpecializedGlobalWidget.createWidget4(); } exports.createExportedWidget4 = createExportedWidget4; -exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_consumer.js] "use strict"; +exports.__esModule = true; var exporter = require("./privacyFunctionReturnTypeDeclFile_exporter"); var publicClassWithWithPrivateParmeterTypes = (function () { function publicClassWithWithPrivateParmeterTypes() { @@ -351,7 +352,6 @@ function privateFunctionWithPrivateModuleReturnTypes() { function privateFunctionWithPrivateModuleReturnTypes1() { return exporter.createExportedWidget4(); } -exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts] diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index c4968d843714d..255b8d68db6a2 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -688,6 +688,7 @@ module publicModuleInGlobal { //// [privacyFunctionParameterDeclFile_externalModule.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -1027,7 +1028,6 @@ var privateModule; function privateFunctionWithPrivateModuleParameterTypes(param) { } })(privateModule || (privateModule = {})); -exports.__esModule = true; //// [privacyFunctionParameterDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index 132c9e6a30c1f..1aba74efaa49f 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -1195,6 +1195,7 @@ module publicModuleInGlobal { //// [privacyFunctionReturnTypeDeclFile_externalModule.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -1819,7 +1820,6 @@ var privateModule; return new privateModule.publicClass(); } })(privateModule || (privateModule = {})); -exports.__esModule = true; //// [privacyFunctionReturnTypeDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js index fd8b8a3c68440..255d21edcdb83 100644 --- a/tests/baselines/reference/privacyGetter.js +++ b/tests/baselines/reference/privacyGetter.js @@ -210,6 +210,7 @@ class C8_private { //// [privacyGetter.js] define(["require", "exports"], function (require, exports) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var m1; (function (m1) { var C1_public = (function () { @@ -504,5 +505,4 @@ define(["require", "exports"], function (require, exports) { }); return C8_private; }()); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js index 8059f3da545d8..6bc177946809c 100644 --- a/tests/baselines/reference/privacyGloFunc.js +++ b/tests/baselines/reference/privacyGloFunc.js @@ -533,6 +533,7 @@ export function f12_public(): C5_private { //error //// [privacyGloFunc.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var m1; (function (m1) { var C1_public = (function () { @@ -983,5 +984,4 @@ define(["require", "exports"], function (require, exports) { return new C5_private(); //error } exports.f12_public = f12_public; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 3dcb212af95d5..1a3dc9d9b1891 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -358,6 +358,7 @@ export module m3 { //// [privacyImport.js] "use strict"; +exports.__esModule = true; var m1; (function (m1) { var m1_M1_public; @@ -701,4 +702,3 @@ var m3; //import m2 = require("use_glo_M1_public"); })(m4 || (m4 = {})); })(m3 = exports.m3 || (exports.m3 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js index b7cfd54247025..5a15a7280ecdf 100644 --- a/tests/baselines/reference/privacyImportParseErrors.js +++ b/tests/baselines/reference/privacyImportParseErrors.js @@ -358,6 +358,7 @@ export module m3 { //// [privacyImportParseErrors.js] "use strict"; +exports.__esModule = true; var m1; (function (m1) { var m1_M1_public; @@ -575,4 +576,3 @@ var m3; var a = 10; })(m4 || (m4 = {})); })(m3 = exports.m3 || (exports.m3 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js index 4b78192dc97db..360f1683b6a27 100644 --- a/tests/baselines/reference/privacyInterface.js +++ b/tests/baselines/reference/privacyInterface.js @@ -266,6 +266,7 @@ export interface glo_C6_public extends glo_i_private, glo_i_public { //// [privacyInterface.js] "use strict"; +exports.__esModule = true; var m1; (function (m1) { var C1_public = (function () { @@ -311,4 +312,3 @@ var C6_private = (function () { } return C6_private; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js index 5006bab0ad170..408abc049405b 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js @@ -154,6 +154,7 @@ module import_private { //// [privacyLocalInternalReferenceImportWithExport.js] "use strict"; +exports.__esModule = true; // private elements var m_private; (function (m_private) { @@ -294,4 +295,3 @@ var import_private; import_private.publicUse_im_private_mi_public = new import_private.im_private_mi_public.c(); var privateUse_im_private_mu_public; })(import_private || (import_private = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js index 9cc12f1c798f8..8b158d7cc3d18 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js @@ -155,6 +155,7 @@ module import_private { //// [privacyLocalInternalReferenceImportWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; // private elements var m_private; (function (m_private) { @@ -295,5 +296,4 @@ define(["require", "exports"], function (require, exports) { import_private.publicUse_im_private_mi_public = new im_private_mi_public.c(); var privateUse_im_private_mu_public; })(import_private || (import_private = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js index ae53d1bc51cec..312d682669c28 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js @@ -52,6 +52,7 @@ export var publicUse_im_public_mi_public = new im_public_mi_public.c_private(); //// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.js] //// [privacyTopLevelAmbientExternalModuleImportWithExport_require.js] "use strict"; +exports.__esModule = true; // Public elements var c_public = (function () { function c_public() { @@ -59,18 +60,18 @@ var c_public = (function () { return c_public; }()); exports.c_public = c_public; -exports.__esModule = true; //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js] "use strict"; +exports.__esModule = true; var c_public = (function () { function c_public() { } return c_public; }()); exports.c_public = c_public; -exports.__esModule = true; //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js] "use strict"; +exports.__esModule = true; /// /// // Privacy errors - importing private elements @@ -87,7 +88,6 @@ var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private() exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); -exports.__esModule = true; //// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts] diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js index af8b2fd9eae29..13b7de58ecff6 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js @@ -53,6 +53,7 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; // Public elements var c_public = (function () { function c_public() { @@ -60,22 +61,22 @@ define(["require", "exports"], function (require, exports) { return c_public; }()); exports.c_public = c_public; - exports.__esModule = true; }); //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var c_public = (function () { function c_public() { } return c_public; }()); exports.c_public = c_public; - exports.__esModule = true; }); //// [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"; + exports.__esModule = true; // 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(); @@ -85,7 +86,6 @@ define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleIm exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public(); var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js index d26782ef2dd32..a89d49609e9cc 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js @@ -102,6 +102,7 @@ export var publicUse_im_public_mu_public: im_public_mu_public.i; //// [privacyTopLevelInternalReferenceImportWithExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; // private elements var m_private; (function (m_private) { @@ -198,5 +199,4 @@ define(["require", "exports"], function (require, exports) { var privateUse_im_public_mi_public = new exports.im_public_mi_public.c(); exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c(); var privateUse_im_public_mu_public; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index 402e30c17a789..85a6cc3691a43 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -103,6 +103,7 @@ export var publicUse_im_private_mu_public: im_private_mu_public.i; //// [privacyTopLevelInternalReferenceImportWithoutExport.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; // private elements var m_private; (function (m_private) { @@ -199,5 +200,4 @@ define(["require", "exports"], function (require, exports) { var privateUse_im_private_mi_public = new im_private_mi_public.c(); exports.publicUse_im_private_mi_public = new im_private_mi_public.c(); var privateUse_im_private_mu_public; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js index 71683805c05c7..98e0a57d59ea3 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunction.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js @@ -134,6 +134,7 @@ function privateFunctionWithPublicTypeParametersWithoutExtends() { //// [privacyTypeParameterOfFunction.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -244,4 +245,3 @@ function publicFunctionWithPublicTypeParametersWithoutExtends() { exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends; function privateFunctionWithPublicTypeParametersWithoutExtends() { } -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index bc1be54d2e50c..f5fdf6dfff868 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -440,6 +440,7 @@ module privateModule { //// [privacyTypeParameterOfFunctionDeclFile.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -815,4 +816,3 @@ var privateModule; function privateFunctionWithPublicTypeParametersWithoutExtends() { } })(privateModule || (privateModule = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js index 50fe3b8b45634..ba1a9bd10e07a 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClass.js +++ b/tests/baselines/reference/privacyTypeParametersOfClass.js @@ -45,6 +45,7 @@ class privateClassWithPublicTypeParametersWithoutExtends { //// [privacyTypeParametersOfClass.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -108,4 +109,3 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () { }; return privateClassWithPublicTypeParametersWithoutExtends; }()); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index 6f012c1b34e7e..8e21589de4229 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -156,6 +156,7 @@ module privateModule { //// [privacyTypeParametersOfClassDeclFile.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -382,4 +383,3 @@ var privateModule; return privateClassWithPublicTypeParametersWithoutExtends; }()); })(privateModule || (privateModule = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js index e7fb531c77309..0b511a01f06d9 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterface.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js @@ -60,6 +60,7 @@ interface privateInterfaceWithPublicTypeParametersWithoutExtends { //// [privacyTypeParametersOfInterface.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -82,4 +83,3 @@ var publicClassT = (function () { return publicClassT; }()); exports.publicClassT = publicClassT; -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index d4929d9b329c6..f7d107b5855fb 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -192,6 +192,7 @@ module privateModule { //// [privacyTypeParametersOfInterfaceDeclFile.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -264,4 +265,3 @@ var privateModule; }()); privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT; })(privateModule || (privateModule = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js index f5ed884807ae9..4c97d273c3e98 100644 --- a/tests/baselines/reference/privacyVar.js +++ b/tests/baselines/reference/privacyVar.js @@ -176,6 +176,7 @@ export var glo_v24_public: glo_C2_private = new glo_C2_private(); // error //// [privacyVar.js] "use strict"; +exports.__esModule = true; var m1; (function (m1) { var C1_public = (function () { @@ -332,4 +333,3 @@ var glo_v21_private = new glo_C1_public(); exports.glo_v22_public = new glo_C1_public(); var glo_v23_private = new glo_C2_private(); exports.glo_v24_public = new glo_C2_private(); // error -exports.__esModule = true; diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index ab62eccebc968..eab997478494d 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -427,6 +427,7 @@ module publicModuleInGlobal { //// [privacyVarDeclFile_externalModule.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -574,7 +575,6 @@ var privateModule; }()); var privateVarWithPrivateModulePropertyTypes; })(privateModule || (privateModule = {})); -exports.__esModule = true; //// [privacyVarDeclFile_GlobalFile.js] var publicClassInGlobal = (function () { function publicClassInGlobal() { diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js index 2b058047aaaba..65e2129a5fc9f 100644 --- a/tests/baselines/reference/privatePropertyUsingObjectType.js +++ b/tests/baselines/reference/privatePropertyUsingObjectType.js @@ -12,11 +12,11 @@ export interface IFilterProvider { //// [privatePropertyUsingObjectType.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var FilterManager = (function () { function FilterManager() { } return FilterManager; }()); exports.FilterManager = FilterManager; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js index a8a506f23c3ae..1e03f7745d259 100644 --- a/tests/baselines/reference/project/baseline/amd/decl.js +++ b/tests/baselines/reference/project/baseline/amd/decl.js @@ -1,9 +1,9 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js index 5daa18796285e..b4d6d12445bc9 100644 --- a/tests/baselines/reference/project/baseline/amd/emit.js +++ b/tests/baselines/reference/project/baseline/amd/emit.js @@ -1,5 +1,5 @@ define(["require", "exports", "./decl"], function (require, exports, g) { "use strict"; - var p = g.point(10, 20); exports.__esModule = true; + 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 998ffaa559235..b7047c3f0473f 100644 --- a/tests/baselines/reference/project/baseline/node/decl.js +++ b/tests/baselines/reference/project/baseline/node/decl.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js index 17c96719d0b45..9410f82bc328e 100644 --- a/tests/baselines/reference/project/baseline/node/emit.js +++ b/tests/baselines/reference/project/baseline/node/emit.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; var g = require("./decl"); var p = g.point(10, 20); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js index a8a506f23c3ae..1e03f7745d259 100644 --- a/tests/baselines/reference/project/baseline2/amd/decl.js +++ b/tests/baselines/reference/project/baseline2/amd/decl.js @@ -1,9 +1,9 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js index 859d262e9c613..18dae0f6420b3 100644 --- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js @@ -1,5 +1,5 @@ define(["require", "exports"], function (require, exports) { "use strict"; - var p = { x: 10, y: 20 }; exports.__esModule = true; + 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 998ffaa559235..b7047c3f0473f 100644 --- a/tests/baselines/reference/project/baseline2/node/decl.js +++ b/tests/baselines/reference/project/baseline2/node/decl.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; ; function point(x, y) { return { x: x, y: y }; } exports.point = point; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js index c172dcd312fe7..ce766eee086a3 100644 --- a/tests/baselines/reference/project/baseline2/node/dont_emit.js +++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js @@ -1,3 +1,3 @@ "use strict"; -var p = { x: 10, y: 20 }; exports.__esModule = true; +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 3fa69311ffa10..c4f4e37489dbe 100644 --- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var outer; (function (outer) { var inner; @@ -8,5 +9,4 @@ define(["require", "exports"], function (require, exports) { inner.a = local; })(inner = outer.inner || (outer.inner = {})); })(outer = exports.outer || (exports.outer = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js index 9596b38253ae1..345fd8914cc6f 100644 --- a/tests/baselines/reference/project/baseline3/node/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var outer; (function (outer) { var inner; @@ -7,4 +8,3 @@ var outer; inner.a = local; })(inner = outer.inner || (outer.inner = {})); })(outer = exports.outer || (exports.outer = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js index 30c63965136d0..4db463a796620 100644 --- a/tests/baselines/reference/project/declarationDir/amd/a.js +++ b/tests/baselines/reference/project/declarationDir/amd/a.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js index 14c0c78edb83c..bdae3c44b0aa1 100644 --- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js index b62647beae072..ff657652a4a98 100644 --- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js index 7480c269a0555..2139e86c811c4 100644 --- a/tests/baselines/reference/project/declarationDir/node/a.js +++ b/tests/baselines/reference/project/declarationDir/node/a.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js index 3c9a75de66e6d..df27fec56d182 100644 --- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js index 6f1ce11cdc6f3..385b6df759167 100644 --- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js index 30c63965136d0..4db463a796620 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js index 14c0c78edb83c..bdae3c44b0aa1 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js index b62647beae072..ff657652a4a98 100644 --- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js @@ -1,10 +1,10 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js index 7480c269a0555..2139e86c811c4 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/a.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js index 3c9a75de66e6d..df27fec56d182 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js index 6f1ce11cdc6f3..385b6df759167 100644 --- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js +++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js index d190c7a5767b1..b90d4415806a6 100644 --- a/tests/baselines/reference/project/declarationDir3/amd/out.js +++ b/tests/baselines/reference/project/declarationDir3/amd/out.js @@ -1,30 +1,30 @@ define("subfolder/b", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var B = (function () { function B() { } return B; }()); exports.B = B; - exports.__esModule = true; }); define("a", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); define("subfolder/c", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js index 44111609dca35..1610052986d7e 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js @@ -1,7 +1,7 @@ define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) { "use strict"; + exports.__esModule = true; exports.useGlo_m4_x4 = glo_m4.x; exports.useGlo_m4_d4 = glo_m4.d; exports.useGlo_m4_f4 = glo_m4.foo(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js index b3ee7499e44d9..b7ddd253b1a93 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js @@ -1,6 +1,6 @@ "use strict"; +exports.__esModule = true; 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(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js index a6563ac4f7396..6ecb0c59793af 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js @@ -1,10 +1,10 @@ define(["require", "exports", "private_m4"], function (require, exports, private_m4) { "use strict"; + exports.__esModule = true; 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 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js index 24526ded58be4..79310d89c02b4 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; // only used privately no need to emit var private_m4 = require("private_m4"); var usePrivate_m4_m1; @@ -7,4 +8,3 @@ var usePrivate_m4_m1; var d3 = private_m4.d; var f3 = private_m4.foo(); })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js index b3dc7cc82f223..c6c57dabc810d 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js @@ -1,5 +1,5 @@ define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) { "use strict"; - exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); exports.__esModule = true; + exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); }); diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js index 8d74ebb2b6eb2..991afa567cffe 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; var fncOnly_m4 = require("fncOnly_m4"); exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js index 6f282e2614768..1a0305591ccbd 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js @@ -1,8 +1,8 @@ define(["require", "exports", "m4"], function (require, exports, m4) { "use strict"; + exports.__esModule = true; function foo2() { return new m4.d(); } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js index e9c49cd4ddcec..6f962bd42e5ed 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js @@ -1,10 +1,10 @@ define(["require", "exports", "m5"], function (require, exports, m5) { "use strict"; + exports.__esModule = true; exports.d = m5.foo2(); exports.x = m5.foo2; function n() { return m5.foo2(); } exports.n = n; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js index fd0ae21091eee..db280e7fd8e1b 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used function foo2() { return new m4.d(); } exports.foo2 = foo2; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js index f06725c106869..7cc88b54ff394 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; // Do not emit unused import var m5 = require("m5"); exports.d = m5.foo2(); @@ -7,4 +8,3 @@ function n() { return m5.foo2(); } exports.n = n; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js index 8af4110011c61..5375f44c01361 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js @@ -1,5 +1,6 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) { "use strict"; + exports.__esModule = true; exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); @@ -15,5 +16,4 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js index fc6900da8d5d5..395cbeee96693 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; @@ -17,4 +18,3 @@ 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(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js index 6f282e2614768..1a0305591ccbd 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js @@ -1,8 +1,8 @@ define(["require", "exports", "m4"], function (require, exports, m4) { "use strict"; + exports.__esModule = true; function foo2() { return new m4.d(); } exports.foo2 = foo2; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js index 7221b9e2e8f55..b8a22cfdc1f76 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js @@ -1,5 +1,6 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { "use strict"; + exports.__esModule = true; exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); @@ -13,5 +14,4 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); exports.d = m5.foo2(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js index fd0ae21091eee..db280e7fd8e1b 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used function foo2() { return new m4.d(); } exports.foo2 = foo2; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js index 7e7a43ce145d9..49958bb9814bc 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; @@ -15,4 +16,3 @@ var m1; // Do not emit unused import var m5 = require("m5"); exports.d = m5.foo2(); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js index 6b4aa7eeda6a3..d1c2d5f4aca40 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var d = (function () { function d() { } @@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) { return new d(); } exports.foo = foo; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js index 1c8e3a5a3082a..af5fcb7d87409 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js @@ -1,5 +1,6 @@ define(["require", "exports", "m4"], function (require, exports, m4) { "use strict"; + exports.__esModule = true; exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); @@ -12,5 +13,4 @@ define(["require", "exports", "m4"], function (require, exports, m4) { var d3 = m4.d; var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js index e89a132497cb8..1c9931a6d1dc8 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var d = (function () { function d() { } @@ -10,4 +11,3 @@ function foo() { return new d(); } exports.foo = foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js index ea2836708d217..3a5602a21664d 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; @@ -12,4 +13,3 @@ var m1; var d3 = m4.d; var f3 = m4.foo(); })(m1 = exports.m1 || (exports.m1 = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js index eddb9c577a6bc..6ec26abec8e44 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js @@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { }; define(["require", "exports", "angular2/core"], function (require, exports, ng) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var MyClass1 = (function () { function MyClass1(_elementRef) { this._elementRef = _elementRef; @@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng) ], MyClass1); exports.MyClass1 = MyClass1; var _a; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js index cbcf36973fddc..274520bc752b4 100644 --- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js +++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -21,4 +22,3 @@ MyClass1 = __decorate([ ], MyClass1); exports.MyClass1 = MyClass1; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index 2ef457654e2f6..7eeee43049b85 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 891c03b13f2e4..c44e24a081e88 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index b12b9bfe9bbd3..d393dda0c5749 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 30f6e242bc8aa..436eab5db94f2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 2ef457654e2f6..7eeee43049b85 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 891c03b13f2e4..c44e24a081e88 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index b12b9bfe9bbd3..d393dda0c5749 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 30f6e242bc8aa..436eab5db94f2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 225b233f3e1bc..1c199b7384adb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 e924809994328..df6d2c811c08e 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index ee9fb6673bed4..749fbd732a5b9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 9d5330f5c8154..0c75dbb2b0052 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 5db5f8f1bfb54..b49f0a04b531b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 62dc8a8d83fa4..c67e35d1b89b4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js index 2d386326fcd6a..1935dadfdb358 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 28136d8ffc30a..8f88c077a44d6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index 944360ae9cc37..fa9c56910474d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index dd409b9f2c3b1..b3b4c42289fee 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 78b4b9fcfe113..80d6ba438ba60 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index e7e1070403f0a..dabe72d27872a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js index bd73b1912c293..d28465d805ea8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f5f5dfcd793b1..6c7d26906a41e 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index aff7400b20fc2..46d82346a3749 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 6ba04afda9e2a..3813e4b2cca84 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 2d386326fcd6a..1935dadfdb358 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 28136d8ffc30a..8f88c077a44d6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index 944360ae9cc37..fa9c56910474d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index dd409b9f2c3b1..b3b4c42289fee 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 62dc8a8d83fa4..c67e35d1b89b4 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 5db5f8f1bfb54..b49f0a04b531b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index bd73b1912c293..d28465d805ea8 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f5f5dfcd793b1..6c7d26906a41e 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index aff7400b20fc2..46d82346a3749 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 6ba04afda9e2a..3813e4b2cca84 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index e7e1070403f0a..dabe72d27872a 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 78b4b9fcfe113..80d6ba438ba60 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 4b75cfaa75405..371d873f34591 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 d65b73465ef2b..783691c52eda8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index dd98ae30d59ec..1f3b6d7a6dcf5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 43b1caa625e11..16e1f5129239d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index c8ece24eda3ad..a112cba6d0e90 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 27d3a9788c460..a6a299a8a7eb0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 02f7bbcbb676a..d16575e8a9766 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js index 058f9c4c3a524..94e4facb645a8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 766ff607b5482..47915c9660bb0 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index dd98ae30d59ec..1f3b6d7a6dcf5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 43b1caa625e11..16e1f5129239d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index c8ece24eda3ad..a112cba6d0e90 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 27d3a9788c460..a6a299a8a7eb0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 02f7bbcbb676a..d16575e8a9766 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 058f9c4c3a524..94e4facb645a8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 766ff607b5482..47915c9660bb0 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 00530261d7682..c5e2f0c04bf73 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a30b607676c03..293a147898977 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1d0559224b84e..8359b4472ee37 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 a6d24f0f0204d..9cef03b071133 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index cb628091e33f6..32cd3e8915e13 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 99859780314e2..39f0b1365680c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 a23c18711264e..de654530492f1 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index 541d8dc4c2650..61925246a0e91 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index a758d2a1cd03e..4a1329681e840 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1d0559224b84e..8359b4472ee37 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 a6d24f0f0204d..9cef03b071133 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index cb628091e33f6..32cd3e8915e13 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index ba491a3c6fa57..f177799847747 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 99859780314e2..39f0b1365680c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 a23c18711264e..de654530492f1 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 541d8dc4c2650..61925246a0e91 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index a758d2a1cd03e..4a1329681e840 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 0f5938617e2c2..11d40e4d23be7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 173790ea04245..61dfeeeb8d386 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 30cf48ae0ef77..c467f0b8be0aa 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 0dab151470606..7c959ab940892 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index f7a19e1fa1411..d43267b1c9a13 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 14104ec68b946..15c5c91190e7f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 744aff01a0899..9a46a37deb80e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 0dab151470606..7c959ab940892 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index edf0e169c568a..727afdc29fd5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 14104ec68b946..15c5c91190e7f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 3f4ebdb191180..2a89c0fc929bc 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 b2efc9bf3d498..0b7f01fdec516 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index f1ed00eb13992..62af54d370044 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 95830bd2c255d..d4bfc44728001 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 4f51d470c8238..59de635378658 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 9cdad10a9660d..6cf63b567ba6e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.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 index 2df791f04e8db..2a191801c438a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ee8a26cafcfb4..301f83dab5587 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js index 1d1c53b36cf16..2dcea15d05055 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index e60e0fbfa7afc..6c74ce312be20 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 3c653ded70050..97b03befa2245 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index a889d6f19b358..28edf7546504a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.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 index 83cb52c7f14f8..9a8f5b774980b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 5f97087307dc1..bd9b5d0051a32 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js index 9ef0d252f050a..603b29da7fac8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 8c64bacf53325..3821a46478ada 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f50e1837a8698..4090486a73038 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ee8a26cafcfb4..301f83dab5587 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index 1222f92a7d238..f637a581e133f 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index e60e0fbfa7afc..6c74ce312be20 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index edafd9055b2df..fa97d15a89a17 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 4f51d470c8238..59de635378658 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3cfb1b4c03096..8de8d6f84b688 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 5f97087307dc1..bd9b5d0051a32 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 4e054f3269902..ca070c2062fb7 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 8c64bacf53325..3821a46478ada 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 931971b3f841a..6ce6e73202e8e 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 3c653ded70050..97b03befa2245 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 44a6d536eeda7..e4a7bb40897a2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 b4f33f056d675..83050ce43fe0b 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 8151fed382b8b..b890ae8232aa5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 611b73c5c7daf..df737e96f26d5 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js index fe1308aca7eeb..2cbff5fc156d3 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a6d5cebe7f182..84f19710abc71 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index b1a971bd89f12..a0cc81f5af957 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 733fa0fc069d6..ea360554f9228 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js index e4c81cdfc8e79..2cce36f74c262 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 86cfbeb5b6365..e395bf8648fdb 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index df8c82915fbcc..f5001a6551e1f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 611b73c5c7daf..df737e96f26d5 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index f361c1c091733..2fb4fbfd5c382 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a6d5cebe7f182..84f19710abc71 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7479c4aebee76..0110f9dce1662 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 733fa0fc069d6..ea360554f9228 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 7e4f77c1c695b..4849c53d0c431 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 86cfbeb5b6365..e395bf8648fdb 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 37af60df3eaca..587721fb87ae8 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 5721a33f4a544..5e9e5c8593de9 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 29a43275b499c..b99a41c8c3cc1 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dbfe0b5d9270f..dcfdb34145e7e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js index 62ec7868d7009..c4c2a04f642fd 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a8d6293492c13..2df46e6835c7c 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index debe15abde9f5..9574bd33b835a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 172c4d4804a02..44556b7866340 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js index 461809c985f5f..4ac58aea85631 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index ef62267d9579b..47558364d4b8a 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 09f9886020eb8..2885a499091ac 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dbfe0b5d9270f..dcfdb34145e7e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 5eab5555cbe86..0ee63c4207043 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index a8d6293492c13..2df46e6835c7c 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 81956eb2903c3..fa9502d4d6475 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 172c4d4804a02..44556b7866340 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index fd86ae84059f6..cabfd9f98d668 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index ef62267d9579b..47558364d4b8a 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 708517a1d9514..d6d1268972139 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a7416c83297ce..aa198a56dbe76 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c657ed8edce0c..4d37c4456a3b8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 56f12c2290391..6ba684e3841d3 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c657ed8edce0c..4d37c4456a3b8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 56f12c2290391..6ba684e3841d3 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 62e49557aab28..d9f0f5b153109 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 7618a616fa352..e84545ade7753 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5df712534f6bf..cc3f604524fcc 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 6a226fbc86c14..e115b1ebd64dd 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 3c1c9b64dc299..0b4d12cead18e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 587eac860102c..f6057bf162a8e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9bdc7ad550474..fa0bcf94a5d2c 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 3a4d618044a38..6a2bfc777e916 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 4103e499cbdef..29b98b193fb99 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index cfa86d8b53f71..9324632b44acb 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js index e3725479646dd..f590179583204 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 49f97b88a3888..f4de6b06e496d 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js index 4737d2e579bc4..e8734ca6d27b0 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 830a0ddd3e5fc..842d34fe73d4d 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9bdc7ad550474..fa0bcf94a5d2c 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 3a4d618044a38..6a2bfc777e916 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 587eac860102c..f6057bf162a8e 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 3c1c9b64dc299..0b4d12cead18e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index e3725479646dd..f590179583204 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 49f97b88a3888..f4de6b06e496d 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 4737d2e579bc4..e8734ca6d27b0 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 830a0ddd3e5fc..842d34fe73d4d 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index cfa86d8b53f71..9324632b44acb 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 4103e499cbdef..29b98b193fb99 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 058227b1276fb..1ea95ed9ba028 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 f80ee7e320867..cd6a7fab3776e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 eceec7b450a5e..f0cb61b0632d9 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d68dbf6eb9e6d..ed2f67c585b22 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b9de639cb1d4b..da3b77ba14625 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 826729aba8749..f4d0ecfe24be1 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 eceec7b450a5e..f0cb61b0632d9 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d68dbf6eb9e6d..ed2f67c585b22 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b9de639cb1d4b..da3b77ba14625 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 826729aba8749..f4d0ecfe24be1 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 16cec87f1e7e7..d19b91956859e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 c7b114195f232..ba2950b1a5e03 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 755cc1d0aaf44..2f6470b65ffe0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 957a73c648a60..a88a706d9b140 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f7e4388304886..5b58a2ee5719b 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 8baefdad92bbe..d4034d62c4a82 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 755cc1d0aaf44..2f6470b65ffe0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 957a73c648a60..a88a706d9b140 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f7e4388304886..5b58a2ee5719b 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 8baefdad92bbe..d4034d62c4a82 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index cf6d4730e1995..63e58be27dc68 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 d1ea7163910a3..12f2439e6f5a4 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index d1d1f0269e8e3..f373c246d4867 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index c55d97704369e..9557c3a613c1c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 62e49557aab28..d9f0f5b153109 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 33f8f550fbd92..92315bfcacc33 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5df712534f6bf..cc3f604524fcc 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 a60954292ba87..c98b66fadede7 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 587eac860102c..f6057bf162a8e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index cfa86d8b53f71..9324632b44acb 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js index e3725479646dd..f590179583204 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js index 4737d2e579bc4..e8734ca6d27b0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index 746d401dc820c..196a531920ba4 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index e1237d92b8ec9..b4a0aa2d25d1d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 587eac860102c..f6057bf162a8e 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index e3725479646dd..f590179583204 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 4737d2e579bc4..e8734ca6d27b0 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index cfa86d8b53f71..9324632b44acb 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 058227b1276fb..1ea95ed9ba028 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 9ca8e953224a8..5d14898713d71 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 44d9d5ddc2864..fc2d3408b2be8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b4651a0d0dd07..1e0dea14dc890 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5c9cea260f4dd..8a7e9f1069e62 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 693783c4c10d3..d7e6d6733402b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 16cec87f1e7e7..d19b91956859e 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 714b21374005a..f5849debd838d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1556b5c5d2f8d..5aa59f6dc9259 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index ad7acefc91b45..d56cdf72bf299 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 73def0e2583bd..b4abab78e9aaf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index bb09d33c72bb9..6bc25238daca8 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index cf6d4730e1995..63e58be27dc68 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a2fff6d9c9070..6f4defc3e4c78 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js index b5c401da717e2..65e3b33be1a80 100644 --- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js +++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js @@ -1,7 +1,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js index fb163c512b80e..4fc36cd0222e6 100644 --- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js +++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js @@ -1,6 +1,6 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js index 432701235d5dc..493e1b9636e3d 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js @@ -1,8 +1,8 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; m1.f1("test"); m1.f2.a = "10"; // Error: Should be number m1.rel = 42; // Error: Should be boolean m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any". - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js index 12d17b6070916..5137083683789 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js @@ -1,7 +1,7 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); m1.f1("test"); m1.f2.a = "10"; // Error: Should be number m1.rel = 42; // Error: Should be boolean m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any". -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js index 81c077dfd9c82..948a6d68b8338 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js @@ -1,8 +1,8 @@ define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) { "use strict"; + exports.__esModule = true; m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Should error if loaded the .js files correctly var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js index 0d06a91c2a62e..50feab5d27f86 100644 --- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js +++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js @@ -1,8 +1,8 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); var m4 = require("m4"); m1.f1("test"); m1.f2.a = 10; m1.f2.person.age = "10"; // Should error if loaded the .js files correctly var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js index 11da1c899c1d4..a6bce0ab2c63f 100644 --- a/tests/baselines/reference/project/nonRelative/amd/consume.js +++ b/tests/baselines/reference/project/nonRelative/amd/consume.js @@ -1,10 +1,10 @@ define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) { "use strict"; + exports.__esModule = true; x.hello(); y.hello(); var str = mod.call(); if (str !== "success") { fail(); } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js index 90d387773d3e2..d22c3ced24e55 100644 --- a/tests/baselines/reference/project/nonRelative/amd/decl.js +++ b/tests/baselines/reference/project/nonRelative/amd/decl.js @@ -1,8 +1,8 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function call() { return "success"; } exports.call = call; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js index 4731ff335a3f2..b92af88609dd4 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function hello() { } exports.hello = hello; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js index 4731ff335a3f2..b92af88609dd4 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function hello() { } exports.hello = hello; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js index 4731ff335a3f2..b92af88609dd4 100644 --- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; function hello() { } exports.hello = hello; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js index d4f9f6e288d02..51d811bb72ada 100644 --- a/tests/baselines/reference/project/nonRelative/node/consume.js +++ b/tests/baselines/reference/project/nonRelative/node/consume.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var mod = require("decl"); var x = require("lib/foo/a"); var y = require("lib/bar/a"); @@ -8,4 +9,3 @@ var str = mod.call(); if (str !== "success") { fail(); } -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js index 9bb5f2ac6edff..7cde1400c608e 100644 --- a/tests/baselines/reference/project/nonRelative/node/decl.js +++ b/tests/baselines/reference/project/nonRelative/node/decl.js @@ -1,6 +1,6 @@ "use strict"; +exports.__esModule = true; function call() { return "success"; } exports.call = call; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js index 819723f983325..c83848543b20f 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; function hello() { } exports.hello = hello; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js index 819723f983325..c83848543b20f 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; function hello() { } exports.hello = hello; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js index 819723f983325..c83848543b20f 100644 --- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js +++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js @@ -1,4 +1,4 @@ "use strict"; +exports.__esModule = true; function hello() { } exports.hello = hello; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js index e7791f9f3f5f6..257b2bbaa8fc8 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js index 90648dbececbc..7a90183baf30b 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; 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 e7791f9f3f5f6..257b2bbaa8fc8 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,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); 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 90648dbececbc..7a90183baf30b 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,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js index bc27e650743ab..ef652b9e92970 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index bc27e650743ab..ef652b9e92970 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js index e7791f9f3f5f6..257b2bbaa8fc8 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js index a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js index 87b3e0b685649..fb9329a59b47e 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js index 90648dbececbc..7a90183baf30b 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js index a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js index 313682ec06c76..18fccdca8bbd2 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,4 +16,3 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; 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 a56e5f0ea0bdc..b5ccdc63b22ee 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,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); 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 index 87b3e0b685649..fb9329a59b47e 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); 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 index e7791f9f3f5f6..257b2bbaa8fc8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); 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 a355a990939b1..52ebad557038b 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,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; 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 index 313682ec06c76..18fccdca8bbd2 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,4 +16,3 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; 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 index 90648dbececbc..7a90183baf30b 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,4 +12,3 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js index 5c65bc4968b62..adb1b5061b50d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,5 +47,4 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js index a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js index 39ac64cda823a..c062c0ac6d4a8 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js index a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js index e12a028abc09b..2e50e0b798937 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; 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 a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index 39ac64cda823a..c062c0ac6d4a8 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); 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 a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index e12a028abc09b..2e50e0b798937 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js index 4c036fa59a178..0a1f6b523c998 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,5 +30,4 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js index a56e5f0ea0bdc..b5ccdc63b22ee 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js index 865896d2602b5..0fdf8d91b324b 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js index a355a990939b1..52ebad557038b 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js index 8d4d683ff7c4e..33f201ce9d5e2 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; 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 a56e5f0ea0bdc..b5ccdc63b22ee 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,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 865896d2602b5..0fdf8d91b324b 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); 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 a355a990939b1..52ebad557038b 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,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,4 +12,3 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 8d4d683ff7c4e..33f201ce9d5e2 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,4 +14,3 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js index 7c40db25bb7e4..2ddfb9277a3ad 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,5 +30,4 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 e9a80c428b2b4..67693560dfcaf 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9f1206b5b146f..d188f8a16bd30 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 e9a80c428b2b4..67693560dfcaf 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9f1206b5b146f..d188f8a16bd30 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 57114f145bd00..3520f3c0a5f22 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 132d98cd87f6f..ed2de159383c9 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index ab7082a2e8e1a..bed0bf9b3e21a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 6bebdd113b6f3..616307fc2aaf0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 21c996978fdcc..ac1540d3d7cb3 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 06c30f32eaf7c..4281eb94fe562 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b757263c8667e..20f349632210f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index b123ccf13c8f4..e794023608c20 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 6bebdd113b6f3..616307fc2aaf0 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 21c996978fdcc..ac1540d3d7cb3 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index ab7082a2e8e1a..bed0bf9b3e21a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 b757263c8667e..20f349632210f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index b123ccf13c8f4..e794023608c20 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 06c30f32eaf7c..4281eb94fe562 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 bd89a9514f26b..5970dfad43ea7 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ffc39be804440..101e0b07546f6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6366b8c2d8595..5194b89b4a5d8 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 04bd4e10a3b47..6316b37945ca0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 9dc457a016701..ec26fbe336a51 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 ffc39be804440..101e0b07546f6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6366b8c2d8595..5194b89b4a5d8 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 04bd4e10a3b47..6316b37945ca0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 9dc457a016701..ec26fbe336a51 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 8718a3a9350e2..64a56e717148f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 cd798e72d8902..a8d5da3a201fb 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6738a871942dd..1628374eef408 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 81d64320d78de..f43884731e041 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index b2ea9133dfcb9..649377c06fca0 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 cd798e72d8902..a8d5da3a201fb 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 6738a871942dd..1628374eef408 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 81d64320d78de..f43884731e041 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index b2ea9133dfcb9..649377c06fca0 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 af3b647fcab17..bbf9b58c64f2c 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 560075530f1ae..d65693aee664a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 27abb47a45bbe..5d1100e38fa48 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 560075530f1ae..d65693aee664a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 27abb47a45bbe..5d1100e38fa48 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 5378b914fc796..544b444f69ac8 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 cd6b23ddc0f30..39cc19f0b0922 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map index 6b4ece94c1588..7571615de418a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 8271bf25be1bd..ad01eacc00c56 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 8be239f355348..343b30f743a46 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 c7ae549832a57..a7121ab0fb4bd 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 37adc61e54fdd..ddd4975937458 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 79b428ca3a1de..34026638960d8 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 8271bf25be1bd..ad01eacc00c56 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 8be239f355348..343b30f743a46 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 6b4ece94c1588..7571615de418a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 37adc61e54fdd..ddd4975937458 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index 79b428ca3a1de..34026638960d8 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index c7ae549832a57..a7121ab0fb4bd 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 66fd3cfe86711..12697408ddd4e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 29c8533aded52..f9a2fd1d74063 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 8086d9c04da05..70db4f7545c83 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 0d24a0e332a2a..0e6c49a9aec9a 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 29c8533aded52..f9a2fd1d74063 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 8086d9c04da05..70db4f7545c83 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 0d24a0e332a2a..0e6c49a9aec9a 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a5dcbdc600abe..1132db08bd04e 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 91793ab100241..07643a2c9dc34 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 00e388b171e2f..a9e9284e21daf 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 07178ab519f00..9b21b166c375e 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 91793ab100241..07643a2c9dc34 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index d713f6b7f5ee5..17545cd729ccb 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 00e388b171e2f..a9e9284e21daf 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 07178ab519f00..9b21b166c375e 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 d9e63184a83e2..5121f5c6a1e39 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c4bc3c327089b..a7a1fecb87f74 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 208dd329040a0..ba1b40abf87a2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 c0b56df8d9001..35edbb3cd9c4a 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 5e34d4494ddc1..3c66628ccf772 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 e924809994328..df6d2c811c08e 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 9d5330f5c8154..0c75dbb2b0052 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map index c4bc3c327089b..a7a1fecb87f74 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dcdf5faf89716..fb3dc7e5f1a0f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 096386e968d05..99618a3d6a791 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 208dd329040a0..ba1b40abf87a2 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 87fa414a454ee..5660dd850103f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a9dba1be1ddbd..308a0083438bc 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 2293c1a7c9602..8ba6985442776 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index d21a585cc41d5..1179d81203742 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 5d8cf325d5277..14fbdd65f4f18 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 49bb95f32d517..a42c40521a151 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a48d929a86067..86d72e20c9378 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index b9e5ddb335f92..18103b0a8b106 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 d65b73465ef2b..783691c52eda8 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dcdf5faf89716..fb3dc7e5f1a0f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 9a899efce6487..8072260980021 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 87fa414a454ee..5660dd850103f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 57b2f0a9935b7..90f1d966b1c3f 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 128c9957bf43b..2eb15ca540b14 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 50263c64897cd..742f4f4a9af84 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 40d0111893e18..c819ff2c52c1a 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index cc2b2e9b918e4..b94230beb69b4 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a30b607676c03..293a147898977 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 dcdf5faf89716..fb3dc7e5f1a0f 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 9a899efce6487..8072260980021 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 87fa414a454ee..5660dd850103f 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 6f71fb82f4c2d..6f61cbbee19ae 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 28136d8ffc30a..8f88c077a44d6 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 50263c64897cd..742f4f4a9af84 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 f5f5dfcd793b1..6c7d26906a41e 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 9c9d3ffec9263..ab37fc26b40e0 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 173790ea04245..61dfeeeb8d386 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 a1c9985be48e4..85be78ed9b411 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 9ccd44f3a018a..e7ecba5fc9208 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index b89b17f8f86a5..f070fff6f1cb8 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 33f8f550fbd92..92315bfcacc33 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js index 5273d0854a9fe..3e02cc09fcb7a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js @@ -10,6 +10,7 @@ function m1_f1() { } define("ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); /// /// 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 a60954292ba87..c98b66fadede7 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":[],"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;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 +{"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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;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/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 1f9e7b8617038..08855ec797b4d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# sourceMappingURL=m2.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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js index a2caf4c4d27bc..90f7f12fcb186 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 1ce56f5da036e..8ad833cd4eba9 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# sourceMappingURL=m2.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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js index 15438b46b3885..43d151f3fd963 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 9afdf343f77e1..8087b94c0c314 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file 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 index a2caf4c4d27bc..90f7f12fcb186 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2" exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 index 5000f3a49b9f2..a8f0695ded3d2 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":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1f9e7b8617038..08855ec797b4d 100644 --- 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 @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); //# 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 index 59ebd34cfe355..e8fba0d4b55a3 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 0f5e28ddbf724..56a4f46ae00e0 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file 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 index 15438b46b3885..43d151f3fd963 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); var m2 = require("../outputdir_module_multifolder_ref/m2"); exports.a1 = 10; @@ -15,5 +16,4 @@ function f1() { exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; -exports.__esModule = true; //# 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 index a39cd29ba7764..6ad9ecad59535 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":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js index 1ce56f5da036e..8ad833cd4eba9 100644 --- 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 @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -11,5 +12,4 @@ function m2_f1() { return exports.m2_instance1; } exports.m2_f1 = m2_f1; -exports.__esModule = true; //# 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 index 866e1007e240c..50a28887d0bf4 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ 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 index 9a2242a8aaac8..b77e0a462a773 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function ( return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m2_a1 = 10; var m2_c1 = (function () { function m2_c1() { @@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function ( return exports.m2_instance1; } exports.m2_f1 = m2_f1; - exports.__esModule = true; }); define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo exports.f1 = f1; exports.a2 = m1.m1_c1; exports.a3 = m2.m2_c1; - exports.__esModule = true; }); //# 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 9ca8e953224a8..5d14898713d71 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 1706ba768171b..caee4b20553d1 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js index b1cc860a9870b..e5ed53fd0e1a2 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 d134ab774afff..fa989919301b5 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js index 456acd3a25640..56c8debf9b699 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index d07c1aa067898..1ec67278ba398 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":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 7545a7d748117..cbe79e3318b88 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 714b21374005a..f5849debd838d 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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 b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js index f42866a661398..391c6ef6630d8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); //# 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 7e2762b41a45b..15b12e3a18934 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js index 601d3a94662be..c95451ac730f8 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js @@ -1,5 +1,6 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) { } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 index 07e9825a93a7a..43c2c887c6528 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":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 3eb09997f4ff7..02586d67fcc6d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -11,5 +12,4 @@ function m1_f1() { return exports.m1_instance1; } exports.m1_f1 = m1_f1; -exports.__esModule = true; //# 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 eb8832755683f..6e97669732b53 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":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file +{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js index 074abf07716b2..97ca26f319840 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var m1 = require("ref/m1"); exports.a1 = 10; var c1 = (function () { @@ -13,5 +14,4 @@ function f1() { } exports.f1 = f1; exports.a2 = m1.m1_c1; -exports.__esModule = true; //# 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 index 4f024886c03bb..badcd2b1b9c52 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":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,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,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ 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 index 5f9a96e405e88..22a9cf7b4d73d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js @@ -1,5 +1,6 @@ define("ref/m1", ["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.m1_a1 = 10; var m1_c1 = (function () { function m1_c1() { @@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) { return exports.m1_instance1; } exports.m1_f1 = m1_f1; - exports.__esModule = true; }); define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) { "use strict"; + exports.__esModule = true; exports.a1 = 10; var c1 = (function () { function c1() { @@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) } exports.f1 = f1; exports.a2 = m1.m1_c1; - exports.__esModule = true; }); //# 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 a2fff6d9c9070..6f4defc3e4c78 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":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,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,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js index d80da6d9e1b73..66facecde7f6b 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js @@ -1,5 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var RM = (function () { function RM() { } @@ -15,5 +16,4 @@ define(["require", "exports"], function (require, exports) { return RM; }()); exports.RM = RM; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js index a07a323df50fb..221c232222727 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js @@ -1,4 +1,5 @@ "use strict"; +exports.__esModule = true; var RM = (function () { function RM() { } @@ -14,4 +15,3 @@ var RM = (function () { return RM; }()); exports.RM = RM; -exports.__esModule = true; diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js index b16939b5d8f02..457f929fe623d 100644 --- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js +++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js @@ -31,6 +31,7 @@ var y: Foo2; //// [propertyIdentityWithPrivacyMismatch_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var x; var x; // Should be error (mod1.Foo !== mod2.Foo) var Foo1 = (function () { @@ -45,5 +46,4 @@ define(["require", "exports"], function (require, exports) { }()); var y; var y; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js index bec6247b7ccdf..cd306e411d500 100644 --- a/tests/baselines/reference/reExportDefaultExport.js +++ b/tests/baselines/reference/reExportDefaultExport.js @@ -16,15 +16,15 @@ foo(); //// [m1.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.default = f; exports.f = f; -Object.defineProperty(exports, "__esModule", { value: true }); //// [m2.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var m1_1 = require("./m1"); var m1_2 = require("./m1"); m1_2.f(); m1_1.default(); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/reExportUndefined2.js b/tests/baselines/reference/reExportUndefined2.js index 726b25c748d53..bde88442b33b7 100644 --- a/tests/baselines/reference/reExportUndefined2.js +++ b/tests/baselines/reference/reExportUndefined2.js @@ -12,11 +12,11 @@ use(undefined); //// [a.js] "use strict"; +exports.__esModule = true; var undefined; exports.undefined = undefined; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var a_1 = require("./a"); use(a_1.undefined); -exports.__esModule = true; diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.js b/tests/baselines/reference/reactNamespaceImportPresevation.js index 99eb5a94bacb4..682dd0f7882d8 100644 --- a/tests/baselines/reference/reactNamespaceImportPresevation.js +++ b/tests/baselines/reference/reactNamespaceImportPresevation.js @@ -16,6 +16,6 @@ declare var foo: any; //// [test.jsx] "use strict"; +exports.__esModule = true; var myReactLib = require("my-React-Lib"); // should not be elided ; -exports.__esModule = true; diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js index 87e85e9d20f18..3c41bed5e62ba 100644 --- a/tests/baselines/reference/recursiveMods.js +++ b/tests/baselines/reference/recursiveMods.js @@ -26,6 +26,7 @@ export module Foo { //// [recursiveMods.js] "use strict"; +exports.__esModule = true; var Foo; (function (Foo) { var C = (function () { @@ -51,4 +52,3 @@ var Foo; return; } })(Foo = exports.Foo || (exports.Foo = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js index 9bd5fb62e1ae3..aae728c9e2567 100644 --- a/tests/baselines/reference/reexportClassDefinition.js +++ b/tests/baselines/reference/reexportClassDefinition.js @@ -43,6 +43,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var foo2 = require("./foo2"); var x = (function (_super) { __extends(x, _super); @@ -51,4 +52,3 @@ var x = (function (_super) { } return x; }(foo2.x)); -exports.__esModule = true; diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js index 68fef5a3e9d5d..cf43ec2a5ca3e 100644 --- a/tests/baselines/reference/relativeNamesInClassicResolution.js +++ b/tests/baselines/reference/relativeNamesInClassicResolution.js @@ -15,6 +15,6 @@ define(["require", "exports"], function (require, exports) { //// [b.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; exports.__esModule = true; + exports.x = 1; }); diff --git a/tests/baselines/reference/relativePathMustResolve.js b/tests/baselines/reference/relativePathMustResolve.js index a8c841261fdfd..52e760a0240ea 100644 --- a/tests/baselines/reference/relativePathMustResolve.js +++ b/tests/baselines/reference/relativePathMustResolve.js @@ -10,6 +10,6 @@ var z = foo.x + 10; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./test/foo"); var z = foo.x + 10; -exports.__esModule = true; diff --git a/tests/baselines/reference/relativePathToDeclarationFile.js b/tests/baselines/reference/relativePathToDeclarationFile.js index 84a784779f65c..58cf090ad86d4 100644 --- a/tests/baselines/reference/relativePathToDeclarationFile.js +++ b/tests/baselines/reference/relativePathToDeclarationFile.js @@ -28,10 +28,10 @@ if(foo.M2.x){ //// [file1.js] "use strict"; +exports.__esModule = true; var foo = require("foo"); var other = require("./other"); var relMod = require("./sub/relMod"); if (foo.M2.x) { var x = new relMod(other.M2.x.charCodeAt(0)); } -exports.__esModule = true; diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js index 39a39fb1bbe73..f4eac77052a0b 100644 --- a/tests/baselines/reference/requireAsFunctionInExternalModule.js +++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js @@ -18,22 +18,22 @@ hello(); //// [c.js] "use strict"; +exports.__esModule = true; function require(a) { } exports["default"] = require; function has(a) { return true; } exports.has = has; -exports.__esModule = true; //// [m.js] "use strict"; +exports.__esModule = true; var c_1 = require("./c"); function hello() { } exports.hello = hello; if (c_1.has('ember-debug')) { c_1["default"]('ember-debug'); } -exports.__esModule = true; //// [m2.js] "use strict"; +exports.__esModule = true; var m_1 = require("./m"); m_1.hello(); -exports.__esModule = true; diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js index 6ef27122df474..667002efeaa67 100644 --- a/tests/baselines/reference/requireEmitSemicolon.js +++ b/tests/baselines/reference/requireEmitSemicolon.js @@ -22,6 +22,7 @@ export module Database { //// [requireEmitSemicolon_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Models; (function (Models) { var Person = (function () { @@ -31,11 +32,11 @@ define(["require", "exports"], function (require, exports) { }()); Models.Person = Person; })(Models = exports.Models || (exports.Models = {})); - exports.__esModule = true; }); //// [requireEmitSemicolon_1.js] define(["require", "exports", "requireEmitSemicolon_0"], function (require, exports, P) { "use strict"; + exports.__esModule = true; var Database; (function (Database) { var DB = (function () { @@ -48,5 +49,4 @@ define(["require", "exports", "requireEmitSemicolon_0"], function (require, expo }()); Database.DB = DB; })(Database = exports.Database || (exports.Database = {})); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js index 6b0941349e037..f172f37d05396 100644 --- a/tests/baselines/reference/reservedWords2.js +++ b/tests/baselines/reference/reservedWords2.js @@ -15,6 +15,7 @@ enum void {} //// [reservedWords2.js] "use strict"; +exports.__esModule = true; require(); while ( = require("dfdf")) ; @@ -37,4 +38,3 @@ if () (function () { })( || ( = {})); void {}; -exports.__esModule = true; diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js index c4d0a7745fa0d..d432daed2a721 100644 --- a/tests/baselines/reference/reuseInnerModuleMember.js +++ b/tests/baselines/reference/reuseInnerModuleMember.js @@ -20,9 +20,9 @@ module bar { exports.__esModule = true; //// [reuseInnerModuleMember_1.js] "use strict"; +exports.__esModule = true; /// var bar; (function (bar) { var x; })(bar || (bar = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js index 96dd8c0b28310..bc489268afd5c 100644 --- a/tests/baselines/reference/scannerClass2.js +++ b/tests/baselines/reference/scannerClass2.js @@ -9,6 +9,7 @@ //// [scannerClass2.js] "use strict"; +exports.__esModule = true; var LoggerAdapter = (function () { function LoggerAdapter(logger) { this.logger = logger; @@ -17,4 +18,3 @@ var LoggerAdapter = (function () { return LoggerAdapter; }()); exports.LoggerAdapter = LoggerAdapter; -exports.__esModule = true; diff --git a/tests/baselines/reference/scannerEnum1.js b/tests/baselines/reference/scannerEnum1.js index 17a0b66fde295..75c182206b942 100644 --- a/tests/baselines/reference/scannerEnum1.js +++ b/tests/baselines/reference/scannerEnum1.js @@ -6,9 +6,9 @@ //// [scannerEnum1.js] "use strict"; +exports.__esModule = true; var CodeGenTarget; (function (CodeGenTarget) { CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3"; CodeGenTarget[CodeGenTarget["ES5"] = 1] = "ES5"; })(CodeGenTarget = exports.CodeGenTarget || (exports.CodeGenTarget = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/shebangBeforeReferences.js b/tests/baselines/reference/shebangBeforeReferences.js index 67f0cbff69044..41f3cee97e1ad 100644 --- a/tests/baselines/reference/shebangBeforeReferences.js +++ b/tests/baselines/reference/shebangBeforeReferences.js @@ -18,6 +18,6 @@ use(x); //// [f.js] #!/usr/bin/env node "use strict"; +exports.__esModule = true; var test_1 = require("test"); use(test_1.x); -exports.__esModule = true; diff --git a/tests/baselines/reference/shorthand-property-es6-amd.js b/tests/baselines/reference/shorthand-property-es6-amd.js index f1a26e461443f..0935606ca5dc5 100644 --- a/tests/baselines/reference/shorthand-property-es6-amd.js +++ b/tests/baselines/reference/shorthand-property-es6-amd.js @@ -8,9 +8,9 @@ const bar = { foo, baz }; //// [test.js] define(["require", "exports", "./foo"], function (require, exports, foo_1) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); const baz = 42; const bar = { foo: foo_1.foo, baz }; - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js index 2e90d3a447484..b61620c8eb5c8 100644 --- a/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js +++ b/tests/baselines/reference/shorthandOfExportedEntity01_targetES2015_CommonJS.js @@ -9,12 +9,12 @@ export function foo () { //// [shorthandOfExportedEntity01_targetES2015_CommonJS.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.test = "test"; function foo() { const x = { test: exports.test }; } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [shorthandOfExportedEntity01_targetES2015_CommonJS.d.ts] diff --git a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js index 09130120de40e..9c63ca6aa2811 100644 --- a/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js +++ b/tests/baselines/reference/shorthandOfExportedEntity02_targetES5_CommonJS.js @@ -9,12 +9,12 @@ export function foo () { //// [shorthandOfExportedEntity02_targetES5_CommonJS.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); exports.test = "test"; function foo() { var x = { test: exports.test }; } exports.foo = foo; -Object.defineProperty(exports, "__esModule", { value: true }); //// [shorthandOfExportedEntity02_targetES5_CommonJS.d.ts] diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js index 339878ad4a56e..f5c7a53f307ad 100644 --- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js @@ -17,13 +17,13 @@ use(foo); //// [existingModule.js] "use strict"; -exports.x = 1; Object.defineProperty(exports, "__esModule", { value: true }); +exports.x = 1; //// [test.js] "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); const existingModule_1 = require("./existingModule"); const missingModule_1 = require("./missingModule"); const test = { x: existingModule_1.x, foo: missingModule_1.foo }; use(existingModule_1.x); use(missingModule_1.foo); -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js index 8dc10349c9025..537c3c071350c 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js +++ b/tests/baselines/reference/sourceMapValidationImport.js @@ -10,6 +10,7 @@ var y = new b(); //// [sourceMapValidationImport.js] "use strict"; +exports.__esModule = true; var m; (function (m) { var c = (function () { @@ -23,5 +24,4 @@ var a = m.c; exports.b = m.c; var x = new a(); var y = new exports.b(); -exports.__esModule = true; //# sourceMappingURL=sourceMapValidationImport.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 5b7870209a10e..bf6c7989cfc66 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":[],"mappings":";AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;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,QAAA,CAAC,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;IACX;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,QAAA,CAAC,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 235557adfba0b..d1fc9b1b72060 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/sourceMapValidationImport.js sourceFile:sourceMapValidationImport.ts ------------------------------------------------------------------- >>>"use strict"; +>>>exports.__esModule = true; >>>var m; 1 > 2 >^^^^ @@ -22,10 +23,10 @@ sourceFile:sourceMapValidationImport.ts > export class c { > } > } -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) +1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(3, 5) Source(1, 15) + SourceIndex(0) +3 >Emitted(3, 6) Source(1, 16) + SourceIndex(0) +4 >Emitted(3, 7) Source(4, 2) + SourceIndex(0) --- >>>(function (m) { 1-> @@ -35,22 +36,22 @@ sourceFile:sourceMapValidationImport.ts 1-> 2 >export module 3 > m -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) +1->Emitted(4, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(4, 12) Source(1, 15) + SourceIndex(0) +3 >Emitted(4, 13) Source(1, 16) + SourceIndex(0) --- >>> var c = (function () { 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^-> 1-> { > -1->Emitted(4, 5) Source(2, 5) + SourceIndex(0) +1->Emitted(5, 5) Source(2, 5) + SourceIndex(0) --- >>> function c() { 1->^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(5, 9) Source(2, 5) + SourceIndex(0) +1->Emitted(6, 9) Source(2, 5) + SourceIndex(0) --- >>> } 1->^^^^^^^^ @@ -59,16 +60,16 @@ sourceFile:sourceMapValidationImport.ts 1->export class c { > 2 > } -1->Emitted(6, 9) Source(3, 5) + SourceIndex(0) -2 >Emitted(6, 10) Source(3, 6) + SourceIndex(0) +1->Emitted(7, 9) Source(3, 5) + SourceIndex(0) +2 >Emitted(7, 10) Source(3, 6) + SourceIndex(0) --- >>> return c; 1->^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(7, 9) Source(3, 5) + SourceIndex(0) -2 >Emitted(7, 17) Source(3, 6) + SourceIndex(0) +1->Emitted(8, 9) Source(3, 5) + SourceIndex(0) +2 >Emitted(8, 17) Source(3, 6) + SourceIndex(0) --- >>> }()); 1 >^^^^ @@ -81,10 +82,10 @@ sourceFile:sourceMapValidationImport.ts 3 > 4 > export class c { > } -1 >Emitted(8, 5) Source(3, 5) + SourceIndex(0) -2 >Emitted(8, 6) Source(3, 6) + SourceIndex(0) -3 >Emitted(8, 6) Source(2, 5) + SourceIndex(0) -4 >Emitted(8, 10) Source(3, 6) + SourceIndex(0) +1 >Emitted(9, 5) Source(3, 5) + SourceIndex(0) +2 >Emitted(9, 6) Source(3, 6) + SourceIndex(0) +3 >Emitted(9, 6) Source(2, 5) + SourceIndex(0) +4 >Emitted(9, 10) Source(3, 6) + SourceIndex(0) --- >>> m.c = c; 1->^^^^ @@ -97,10 +98,10 @@ sourceFile:sourceMapValidationImport.ts 3 > { > } 4 > -1->Emitted(9, 5) Source(2, 18) + SourceIndex(0) -2 >Emitted(9, 8) Source(2, 19) + SourceIndex(0) -3 >Emitted(9, 12) Source(3, 6) + SourceIndex(0) -4 >Emitted(9, 13) Source(3, 6) + SourceIndex(0) +1->Emitted(10, 5) Source(2, 18) + SourceIndex(0) +2 >Emitted(10, 8) Source(2, 19) + SourceIndex(0) +3 >Emitted(10, 12) Source(3, 6) + SourceIndex(0) +4 >Emitted(10, 13) Source(3, 6) + SourceIndex(0) --- >>>})(m = exports.m || (exports.m = {})); 1-> @@ -125,15 +126,15 @@ sourceFile:sourceMapValidationImport.ts > export class c { > } > } -1->Emitted(10, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(10, 2) Source(4, 2) + SourceIndex(0) -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) +1->Emitted(11, 1) Source(4, 1) + SourceIndex(0) +2 >Emitted(11, 2) Source(4, 2) + SourceIndex(0) +3 >Emitted(11, 4) Source(1, 15) + SourceIndex(0) +4 >Emitted(11, 5) Source(1, 16) + SourceIndex(0) +5 >Emitted(11, 8) Source(1, 15) + SourceIndex(0) +6 >Emitted(11, 17) Source(1, 16) + SourceIndex(0) +7 >Emitted(11, 22) Source(1, 15) + SourceIndex(0) +8 >Emitted(11, 31) Source(1, 16) + SourceIndex(0) +9 >Emitted(11, 39) Source(4, 2) + SourceIndex(0) --- >>>var a = m.c; 1 > @@ -154,14 +155,14 @@ sourceFile:sourceMapValidationImport.ts 6 > . 7 > c 8 > ; -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) +1 >Emitted(12, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(12, 5) Source(5, 8) + SourceIndex(0) +3 >Emitted(12, 6) Source(5, 9) + SourceIndex(0) +4 >Emitted(12, 9) Source(5, 12) + SourceIndex(0) +5 >Emitted(12, 10) Source(5, 13) + SourceIndex(0) +6 >Emitted(12, 11) Source(5, 14) + SourceIndex(0) +7 >Emitted(12, 12) Source(5, 15) + SourceIndex(0) +8 >Emitted(12, 13) Source(5, 16) + SourceIndex(0) --- >>>exports.b = m.c; 1-> @@ -182,14 +183,14 @@ sourceFile:sourceMapValidationImport.ts 6 > . 7 > c 8 > ; -1->Emitted(12, 1) Source(6, 15) + SourceIndex(0) -2 >Emitted(12, 9) Source(6, 15) + SourceIndex(0) -3 >Emitted(12, 10) Source(6, 16) + SourceIndex(0) -4 >Emitted(12, 13) Source(6, 19) + SourceIndex(0) -5 >Emitted(12, 14) Source(6, 20) + SourceIndex(0) -6 >Emitted(12, 15) Source(6, 21) + SourceIndex(0) -7 >Emitted(12, 16) Source(6, 22) + SourceIndex(0) -8 >Emitted(12, 17) Source(6, 23) + SourceIndex(0) +1->Emitted(13, 1) Source(6, 15) + SourceIndex(0) +2 >Emitted(13, 9) Source(6, 15) + SourceIndex(0) +3 >Emitted(13, 10) Source(6, 16) + SourceIndex(0) +4 >Emitted(13, 13) Source(6, 19) + SourceIndex(0) +5 >Emitted(13, 14) Source(6, 20) + SourceIndex(0) +6 >Emitted(13, 15) Source(6, 21) + SourceIndex(0) +7 >Emitted(13, 16) Source(6, 22) + SourceIndex(0) +8 >Emitted(13, 17) Source(6, 23) + SourceIndex(0) --- >>>var x = new a(); 1-> @@ -210,14 +211,14 @@ sourceFile:sourceMapValidationImport.ts 6 > a 7 > () 8 > ; -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) +1->Emitted(14, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(14, 5) Source(7, 5) + SourceIndex(0) +3 >Emitted(14, 6) Source(7, 6) + SourceIndex(0) +4 >Emitted(14, 9) Source(7, 9) + SourceIndex(0) +5 >Emitted(14, 13) Source(7, 13) + SourceIndex(0) +6 >Emitted(14, 14) Source(7, 14) + SourceIndex(0) +7 >Emitted(14, 16) Source(7, 16) + SourceIndex(0) +8 >Emitted(14, 17) Source(7, 17) + SourceIndex(0) --- >>>var y = new exports.b(); 1-> @@ -228,7 +229,7 @@ sourceFile:sourceMapValidationImport.ts 6 > ^^^^^^^^^ 7 > ^^ 8 > ^ -9 > ^^^-> +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >var @@ -238,14 +239,13 @@ sourceFile:sourceMapValidationImport.ts 6 > b 7 > () 8 > ; -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) +1->Emitted(15, 1) Source(8, 1) + SourceIndex(0) +2 >Emitted(15, 5) Source(8, 5) + SourceIndex(0) +3 >Emitted(15, 6) Source(8, 6) + SourceIndex(0) +4 >Emitted(15, 9) Source(8, 9) + SourceIndex(0) +5 >Emitted(15, 13) Source(8, 13) + SourceIndex(0) +6 >Emitted(15, 22) Source(8, 14) + SourceIndex(0) +7 >Emitted(15, 24) Source(8, 16) + SourceIndex(0) +8 >Emitted(15, 25) Source(8, 17) + SourceIndex(0) --- ->>>exports.__esModule = true; >>>//# 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 823f2bc44ec9d..747aa93e63183 100644 --- a/tests/baselines/reference/staticInstanceResolution3.js +++ b/tests/baselines/reference/staticInstanceResolution3.js @@ -14,6 +14,7 @@ WinJS.Promise.timeout(10); //// [staticInstanceResolution3_0.js] "use strict"; +exports.__esModule = true; var Promise = (function () { function Promise() { } @@ -23,10 +24,9 @@ var Promise = (function () { return Promise; }()); exports.Promise = Promise; -exports.__esModule = true; //// [staticInstanceResolution3_1.js] "use strict"; +exports.__esModule = true; /// var WinJS = require("./staticInstanceResolution3_0"); WinJS.Promise.timeout(10); -exports.__esModule = true; diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js index da64e191cc899..0bbd1cf412f07 100644 --- a/tests/baselines/reference/staticInstanceResolution5.js +++ b/tests/baselines/reference/staticInstanceResolution5.js @@ -19,6 +19,7 @@ function z(w3: WinJS) { } //// [staticInstanceResolution5_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var Promise = (function () { function Promise() { } @@ -28,14 +29,13 @@ define(["require", "exports"], function (require, exports) { return Promise; }()); exports.Promise = Promise; - exports.__esModule = true; }); //// [staticInstanceResolution5_1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; // these 3 should be errors var x = function (w1) { }; var y = function (w2) { }; function z(w3) { } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js index e1694f4ed5f62..b8b5b030bcd87 100644 --- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js +++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js @@ -23,6 +23,7 @@ export class publicClassWithWithPrivateTypeParameters { //// [staticMethodWithTypeParameterExtendsClauseDeclFile.js] "use strict"; +exports.__esModule = true; var privateClass = (function () { function privateClass() { } @@ -52,7 +53,6 @@ var publicClassWithWithPrivateTypeParameters = (function () { return publicClassWithWithPrivateTypeParameters; }()); exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters; -exports.__esModule = true; //// [staticMethodWithTypeParameterExtendsClauseDeclFile.d.ts] diff --git a/tests/baselines/reference/topLevelAmbientModule.js b/tests/baselines/reference/topLevelAmbientModule.js index d496cfc4f852d..3e162170c87a1 100644 --- a/tests/baselines/reference/topLevelAmbientModule.js +++ b/tests/baselines/reference/topLevelAmbientModule.js @@ -14,7 +14,7 @@ var z = foo.x + 10; //// [foo_0.js] //// [foo_1.js] "use strict"; +exports.__esModule = true; /// var foo = require("foo"); var z = foo.x + 10; -exports.__esModule = true; diff --git a/tests/baselines/reference/topLevelExports.js b/tests/baselines/reference/topLevelExports.js index 8cb7a7cfe4e6f..5f58c44d2f262 100644 --- a/tests/baselines/reference/topLevelExports.js +++ b/tests/baselines/reference/topLevelExports.js @@ -8,8 +8,8 @@ void log(foo).toString(); //// [topLevelExports.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; exports.foo = 3; function log(n) { return n; } void log(exports.foo).toString(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js index cc97c8e2ffecd..8ff74cc89f48e 100644 --- a/tests/baselines/reference/topLevelFileModule.js +++ b/tests/baselines/reference/topLevelFileModule.js @@ -17,7 +17,7 @@ var z = foo.x + fum.y; exports.__esModule = true; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("./vs/foo_0"); var fum = require("./vs/fum"); var z = foo.x + fum.y; -exports.__esModule = true; diff --git a/tests/baselines/reference/topLevelFileModuleMissing.js b/tests/baselines/reference/topLevelFileModuleMissing.js index 0861d67389dda..37d9ac5b1506a 100644 --- a/tests/baselines/reference/topLevelFileModuleMissing.js +++ b/tests/baselines/reference/topLevelFileModuleMissing.js @@ -10,6 +10,6 @@ var z = foo.x + 10; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo = require("vs/foo"); var z = foo.x + 10; -exports.__esModule = true; diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js index 7cfdf18006354..5ccfb91bec7ae 100644 --- a/tests/baselines/reference/topLevelLambda4.js +++ b/tests/baselines/reference/topLevelLambda4.js @@ -5,6 +5,6 @@ export var x = () => this.window; define(["require", "exports"], function (require, exports) { "use strict"; var _this = this; - exports.x = function () { return _this.window; }; exports.__esModule = true; + exports.x = function () { return _this.window; }; }); diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js index 7ded460030058..8f4ecb37d3112 100644 --- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js +++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js @@ -19,8 +19,8 @@ var z2 = foo.y() + 10; // Should resolve //// [foo_1.js] //// [foo_2.js] "use strict"; +exports.__esModule = true; /// var foo = require("vs/foo_0"); var z1 = foo.x + 10; // Should error, as declaration should win var z2 = foo.y() + 10; // Should resolve -exports.__esModule = true; diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.js b/tests/baselines/reference/transformNestedGeneratorsWithTry.js index 6b3930271bb33..04bac08d307f5 100644 --- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js +++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js @@ -59,6 +59,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; +Object.defineProperty(exports, "__esModule", { value: true }); // https://github.com/Microsoft/TypeScript/issues/11177 var Bluebird = require("bluebird"); function a() { @@ -99,4 +100,3 @@ function a() { }); }); } -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js index a4356e562e751..cd4ce3c862e53 100644 --- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js +++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js @@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; +Object.defineProperty(exports, "__esModule", { value: true }); var ng = require("angular2/core"); var MyClass1 = (function () { function MyClass1(_elementRef) { @@ -20,5 +21,4 @@ MyClass1 = __decorate([ __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object]) ], MyClass1); var _a; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js index 7e30c98d6e899..4571caffa31e2 100644 --- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js +++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js index f350f205d5ac9..4d133b7655c9e 100644 --- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js +++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js @@ -1,5 +1,5 @@ "use strict"; +exports.__esModule = true; a; b; -exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js index 12a13d2aebf39..2c7bb7add09eb 100644 --- a/tests/baselines/reference/transpile/Generates module output.js +++ b/tests/baselines/reference/transpile/Generates module output.js @@ -1,6 +1,6 @@ define(["require", "exports"], function (require, exports) { "use strict"; - var x = 0; exports.__esModule = true; + var x = 0; }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js index 0b3dcfad991dc..04ba1d12e5e00 100644 --- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js +++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js @@ -1,5 +1,5 @@ "use strict"; +exports.__esModule = true; /// var x = 0; -exports.__esModule = true; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js index 7e30c98d6e899..4571caffa31e2 100644 --- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js +++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js index 7e30c98d6e899..4571caffa31e2 100644 --- a/tests/baselines/reference/transpile/No extra errors for file without extension.js +++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js index 4f5beb97d2cb9..c5ffb86a1aa34 100644 --- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js +++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js @@ -1,6 +1,6 @@ define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) { "use strict"; - use(SomeName_1.foo); exports.__esModule = true; + use(SomeName_1.foo); }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js index 97215e27b98a3..0ecfbce239727 100644 --- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js +++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js @@ -8,8 +8,8 @@ } })(function (require, exports) { "use strict"; + exports.__esModule = true; var SomeName_1 = require("SomeOtherName"); use(SomeName_1.foo); - exports.__esModule = true; }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js index 1ac09c54ab802..72e077de381af 100644 --- a/tests/baselines/reference/transpile/Support options with lib values.js +++ b/tests/baselines/reference/transpile/Support options with lib values.js @@ -1,4 +1,4 @@ "use strict"; -var a = 10; exports.__esModule = true; +var a = 10; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js index 1ac09c54ab802..72e077de381af 100644 --- a/tests/baselines/reference/transpile/Support options with types values.js +++ b/tests/baselines/reference/transpile/Support options with types values.js @@ -1,4 +1,4 @@ "use strict"; -var a = 10; exports.__esModule = true; +var a = 10; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js index e109ef9014f68..8ef38d2b61702 100644 --- a/tests/baselines/reference/transpile/Supports backslashes in file name.js +++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js @@ -1,4 +1,4 @@ "use strict"; -var x; exports.__esModule = true; +var x; //# sourceMappingURL=b.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowJs.js +++ b/tests/baselines/reference/transpile/Supports setting allowJs.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js +++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js +++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js +++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js +++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting baseUrl.js +++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting charset.js +++ b/tests/baselines/reference/transpile/Supports setting charset.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting declaration.js +++ b/tests/baselines/reference/transpile/Supports setting declaration.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting declarationDir.js +++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting emitBOM.js +++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js +++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js +++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js +++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js +++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting jsx.js +++ b/tests/baselines/reference/transpile/Supports setting jsx.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js +++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting lib.js +++ b/tests/baselines/reference/transpile/Supports setting lib.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting locale.js +++ b/tests/baselines/reference/transpile/Supports setting locale.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting module.js +++ b/tests/baselines/reference/transpile/Supports setting module.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js +++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting newLine.js +++ b/tests/baselines/reference/transpile/Supports setting newLine.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmit.js +++ b/tests/baselines/reference/transpile/Supports setting noEmit.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js +++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js +++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js +++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js +++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js index 5233b2a8e48f9..8124d51fde3be 100644 --- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js +++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js @@ -1,3 +1,3 @@ -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noLib.js +++ b/tests/baselines/reference/transpile/Supports setting noLib.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting noResolve.js +++ b/tests/baselines/reference/transpile/Supports setting noResolve.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting out.js +++ b/tests/baselines/reference/transpile/Supports setting out.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting outDir.js +++ b/tests/baselines/reference/transpile/Supports setting outDir.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting outFile.js +++ b/tests/baselines/reference/transpile/Supports setting outFile.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting paths.js +++ b/tests/baselines/reference/transpile/Supports setting paths.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js +++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js +++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting removeComments.js +++ b/tests/baselines/reference/transpile/Supports setting removeComments.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting rootDir.js +++ b/tests/baselines/reference/transpile/Supports setting rootDir.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting rootDirs.js +++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js +++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js +++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js +++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting stripInternal.js +++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js +++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js +++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting typeRoots.js +++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js index 5487d181a8429..f960e73bcb836 100644 --- a/tests/baselines/reference/transpile/Supports setting types.js +++ b/tests/baselines/reference/transpile/Supports setting types.js @@ -1,4 +1,4 @@ "use strict"; -x; exports.__esModule = true; +x; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js index 071466dd65f94..933981306d2da 100644 --- a/tests/baselines/reference/transpile/Supports urls in file name.js +++ b/tests/baselines/reference/transpile/Supports urls in file name.js @@ -1,4 +1,4 @@ "use strict"; -var x; exports.__esModule = true; +var x; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js index 54ceb0250e182..0b3bbaa8d7333 100644 --- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js +++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js @@ -1,4 +1,5 @@ "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); var db_1 = require("./db"); function someDecorator(target) { return target; @@ -16,5 +17,4 @@ MyClass = __decorate([ ], MyClass); exports.MyClass = MyClass; var _a; -Object.defineProperty(exports, "__esModule", { value: true }); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js index 2c2e8563d24a0..04042012d1821 100644 --- a/tests/baselines/reference/transpile/Uses correct newLine character.js +++ b/tests/baselines/reference/transpile/Uses correct newLine character.js @@ -1,4 +1,4 @@ "use strict"; -var x = 0; exports.__esModule = true; +var x = 0; //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js index 54832b9592841..b9048bd515d52 100644 --- a/tests/baselines/reference/transpile/transpile .js files.js +++ b/tests/baselines/reference/transpile/transpile .js files.js @@ -1,4 +1,4 @@ "use strict"; -var a = 10; exports.__esModule = true; +var a = 10; //# sourceMappingURL=input.js.map \ No newline at end of file diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js index ff03528b3e566..2a73615e4768f 100644 --- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js +++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js @@ -1,4 +1,4 @@ "use strict"; -var x = React.createElement("div", null); exports.__esModule = true; +var x = React.createElement("div", null); //# sourceMappingURL=file.js.map \ No newline at end of file diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js index 64f18cd24e0ea..235cca0be1c98 100644 --- a/tests/baselines/reference/tsxAttributeResolution10.js +++ b/tests/baselines/reference/tsxAttributeResolution10.js @@ -34,6 +34,7 @@ export class MyComponent { //// [file.jsx] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var MyComponent = (function () { function MyComponent() { } @@ -48,5 +49,4 @@ define(["require", "exports"], function (require, exports) { ; // Should be ok ; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js index 2375e5e32ff10..d7880c820d86d 100644 --- a/tests/baselines/reference/tsxAttributeResolution9.js +++ b/tests/baselines/reference/tsxAttributeResolution9.js @@ -30,6 +30,7 @@ export class MyComponent { //// [file.jsx] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var MyComponent = (function () { function MyComponent() { } @@ -40,5 +41,4 @@ define(["require", "exports"], function (require, exports) { exports.MyComponent = MyComponent; ; // ok ; // should be an error - exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js index 96f400740c3f6..f6403804fae29 100644 --- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js +++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var ShortDetails = (function (_super) { __extends(ShortDetails, _super); function ShortDetails() { @@ -44,4 +45,3 @@ var ShortDetails = (function (_super) { return ShortDetails; }(React.Component)); exports.ShortDetails = ShortDetails; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js index 210d92fa8842a..c918efb5f4fb5 100644 --- a/tests/baselines/reference/tsxDefaultImports.js +++ b/tests/baselines/reference/tsxDefaultImports.js @@ -16,6 +16,7 @@ let a = Def.E.one; //// [a.js] "use strict"; +exports.__esModule = true; var SomeEnum; (function (SomeEnum) { SomeEnum[SomeEnum["one"] = 0] = "one"; @@ -27,9 +28,8 @@ var SomeClass = (function () { }()); SomeClass.E = SomeEnum; exports["default"] = SomeClass; -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var a_1 = require("./a"); var a = a_1["default"].E.one; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js index 5c87d9a5eb997..4dd03843f155a 100644 --- a/tests/baselines/reference/tsxDynamicTagName5.js +++ b/tests/baselines/reference/tsxDynamicTagName5.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); var Text = (function (_super) { __extends(Text, _super); @@ -45,4 +46,3 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js index 8f1b47e2d107d..f4f230b995af9 100644 --- a/tests/baselines/reference/tsxDynamicTagName7.js +++ b/tests/baselines/reference/tsxDynamicTagName7.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); var Text = (function (_super) { __extends(Text, _super); @@ -46,4 +47,3 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js index ab57998ad3cd9..348574ebf42e8 100644 --- a/tests/baselines/reference/tsxDynamicTagName8.js +++ b/tests/baselines/reference/tsxDynamicTagName8.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); var Text = (function (_super) { __extends(Text, _super); @@ -45,4 +46,3 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js index 90608ed48f1fa..e720b2644a09f 100644 --- a/tests/baselines/reference/tsxDynamicTagName9.js +++ b/tests/baselines/reference/tsxDynamicTagName9.js @@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); var Text = (function (_super) { __extends(Text, _super); @@ -45,4 +46,3 @@ var Text = (function (_super) { return Text; }(React.Component)); exports.Text = Text; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxElementResolution17.js b/tests/baselines/reference/tsxElementResolution17.js index 9f56d05406e04..899498caf8da4 100644 --- a/tests/baselines/reference/tsxElementResolution17.js +++ b/tests/baselines/reference/tsxElementResolution17.js @@ -31,6 +31,6 @@ import s2 = require('elements2'); //// [consumer.jsx] define(["require", "exports", "elements1"], function (require, exports, s1) { "use strict"; - ; exports.__esModule = true; + ; }); diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js index 921d831809d44..02136e782dbd5 100644 --- a/tests/baselines/reference/tsxElementResolution19.js +++ b/tests/baselines/reference/tsxElementResolution19.js @@ -24,17 +24,17 @@ import {MyClass} from './file1'; //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var MyClass = (function () { function MyClass() { } return MyClass; }()); exports.MyClass = MyClass; - exports.__esModule = true; }); //// [file2.js] define(["require", "exports", "react", "./file1"], function (require, exports, React, file1_1) { "use strict"; - React.createElement(file1_1.MyClass, null); exports.__esModule = true; + React.createElement(file1_1.MyClass, null); }); diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js index e7135b49528f4..c8c64062d13c1 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit1.js +++ b/tests/baselines/reference/tsxExternalModuleEmit1.js @@ -43,6 +43,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); var Button = (function (_super) { __extends(Button, _super); @@ -55,7 +56,6 @@ var Button = (function (_super) { return Button; }(React.Component)); exports.Button = Button; -exports.__esModule = true; //// [app.jsx] "use strict"; var __extends = (this && this.__extends) || (function () { @@ -68,6 +68,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); // Should see var button_1 = require('./button') here var button_1 = require("./button"); @@ -82,4 +83,3 @@ var App = (function (_super) { return App; }(React.Component)); exports.App = App; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js index ae190baba4cb6..aae4802145778 100644 --- a/tests/baselines/reference/tsxExternalModuleEmit2.js +++ b/tests/baselines/reference/tsxExternalModuleEmit2.js @@ -27,9 +27,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) { } return t; }; +exports.__esModule = true; var mod_1 = require("mod"); // Should see mod_1['default'] in emit here React.createElement(Foo, { handler: mod_1["default"] }); // Should see mod_1['default'] in emit here React.createElement(Foo, __assign({}, mod_1["default"])); -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js index 4e227238f6c5e..585b603abfb26 100644 --- a/tests/baselines/reference/tsxPreserveEmit1.js +++ b/tests/baselines/reference/tsxPreserveEmit1.js @@ -36,6 +36,7 @@ module M { //// [test.jsx] define(["require", "exports", "react", "react-router"], function (require, exports, React, ReactRouter) { "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); var Route = ReactRouter.Route; var routes1 = ; var M; @@ -45,5 +46,4 @@ define(["require", "exports", "react", "react-router"], function (require, expor // Should emit 'M.X' in both opening and closing tags var y = ; })(M || (M = {})); - Object.defineProperty(exports, "__esModule", { value: true }); }); diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js index 88d9d6aa95e74..a6517352f9a57 100644 --- a/tests/baselines/reference/tsxReactEmit5.js +++ b/tests/baselines/reference/tsxReactEmit5.js @@ -31,9 +31,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) { } return t; }; +exports.__esModule = true; var test_1 = require("./test"); // Should emit test_1.React.createElement // and React.__spread var foo; var spread1 = test_1.React.createElement("div", __assign({ x: '' }, foo, { y: '' })); -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js index a67614a552288..64356eefe8374 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js +++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js @@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); function Greet(x) { return
Hello, {x}
; @@ -82,4 +83,3 @@ var g = ; var h =
; // Error - property not on ontextually typed intrinsic ref callback parameter var i =
; -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents3.js b/tests/baselines/reference/tsxStatelessFunctionComponents3.js index 6cc6e6638f2de..d66e105e3e548 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponents3.js +++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.js @@ -21,6 +21,7 @@ var App: React.StatelessComponent<{ children }> = ({children}) => ( //// [file.jsx] define(["require", "exports", "react"], function (require, exports, React) { "use strict"; + exports.__esModule = true; var Foo = function (props) { return
; }; // Should be OK var foo = ; @@ -34,5 +35,4 @@ define(["require", "exports", "react"], function (require, exports, React) {
); }; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js index 5c123cf634f8f..a0cd220c4e00a 100644 --- a/tests/baselines/reference/tsxUnionTypeComponent1.js +++ b/tests/baselines/reference/tsxUnionTypeComponent1.js @@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); +exports.__esModule = true; var React = require("react"); var MyComponent = (function (_super) { __extends(MyComponent, _super); @@ -59,4 +60,3 @@ var MyButtonComponent = (function (_super) { return MyButtonComponent; }(React.Component)); React.createElement(MyComponent, { AnyComponent: MyButtonComponent }); -exports.__esModule = true; diff --git a/tests/baselines/reference/tsxUnionTypeComponent2.js b/tests/baselines/reference/tsxUnionTypeComponent2.js index 725f3041855b7..ded3052dd5089 100644 --- a/tests/baselines/reference/tsxUnionTypeComponent2.js +++ b/tests/baselines/reference/tsxUnionTypeComponent2.js @@ -13,7 +13,7 @@ const X: Invalid1 = 1; //// [file.js] "use strict"; +exports.__esModule = true; var React = require("react"); var X = 1; React.createElement(X, null); -exports.__esModule = true; diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js index 82336a2e6b820..df12050eaf613 100644 --- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js +++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js @@ -13,17 +13,17 @@ f.foo(); //// [file1.js] "use strict"; +exports.__esModule = true; function foo() { var classes = undefined; return new classes(null); } exports.foo = foo; -exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; var f = require("./file1"); f.foo(); -exports.__esModule = true; //// [file1.d.ts] diff --git a/tests/baselines/reference/typeGuardsAsAssertions.js b/tests/baselines/reference/typeGuardsAsAssertions.js index 955b0b573f08d..84596dd99e2c9 100644 --- a/tests/baselines/reference/typeGuardsAsAssertions.js +++ b/tests/baselines/reference/typeGuardsAsAssertions.js @@ -125,6 +125,7 @@ function f6() { //// [typeGuardsAsAssertions.js] // Repro from #8513 "use strict"; +exports.__esModule = true; var cond; exports.none = { none: '' }; function isSome(value) { @@ -227,4 +228,3 @@ function f6() { x = ""; x.slice(); } -exports.__esModule = true; diff --git a/tests/baselines/reference/typeGuardsInExternalModule.js b/tests/baselines/reference/typeGuardsInExternalModule.js index 2039b875cfaae..0a5abd593738f 100644 --- a/tests/baselines/reference/typeGuardsInExternalModule.js +++ b/tests/baselines/reference/typeGuardsInExternalModule.js @@ -27,6 +27,7 @@ else { // Note that type guards affect types of variables and parameters only and // have no effect on members of objects such as properties. "use strict"; +exports.__esModule = true; // local variable in external module var num; var var1; @@ -45,4 +46,3 @@ if (typeof exports.var2 === "string") { else { strOrNum = exports.var2; // number | string } -exports.__esModule = true; diff --git a/tests/baselines/reference/typeInferenceLiteralUnion.js b/tests/baselines/reference/typeInferenceLiteralUnion.js index 9147b05a29eb9..289dd4130460b 100644 --- a/tests/baselines/reference/typeInferenceLiteralUnion.js +++ b/tests/baselines/reference/typeInferenceLiteralUnion.js @@ -38,6 +38,7 @@ extentMixed = extent([new NumCoercible(10), 13, '12', true]); //// [typeInferenceLiteralUnion.js] "use strict"; +exports.__esModule = true; // Not very useful, but meets Numeric var NumCoercible = (function () { function NumCoercible(a) { @@ -57,4 +58,3 @@ function extent(array) { exports.extent = extent; var extentMixed; extentMixed = extent([new NumCoercible(10), 13, '12', true]); -exports.__esModule = true; diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js index 0520bf5ac9b72..9a29313941771 100644 --- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js +++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js @@ -25,6 +25,7 @@ i2 = a2; // no error //// [typeParameterCompatibilityAccrossDeclarations.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var a = { x: function (y) { return null; } }; @@ -37,5 +38,4 @@ define(["require", "exports"], function (require, exports) { i = a; // error a2 = i2; // no error i2 = a2; // no error - exports.__esModule = true; }); diff --git a/tests/baselines/reference/typePredicateInLoop.js b/tests/baselines/reference/typePredicateInLoop.js index 15175a99b3d48..f5a99b689710f 100644 --- a/tests/baselines/reference/typePredicateInLoop.js +++ b/tests/baselines/reference/typePredicateInLoop.js @@ -24,6 +24,7 @@ export function y(arg: Type): void { //// [typePredicateInLoop.js] // Repro from #12101 "use strict"; +exports.__esModule = true; var guard = function (arg) { return arg.type === 1; }; var otherFunc = function (arg1, arg2) { }; function y(arg) { @@ -36,4 +37,3 @@ function y(arg) { } } exports.y = y; -exports.__esModule = true; diff --git a/tests/baselines/reference/typeReferenceDirectives7.js b/tests/baselines/reference/typeReferenceDirectives7.js index 485f48ae0133c..d44626f51d0c1 100644 --- a/tests/baselines/reference/typeReferenceDirectives7.js +++ b/tests/baselines/reference/typeReferenceDirectives7.js @@ -18,9 +18,9 @@ export let y = () => x //// [app.js] /// "use strict"; +exports.__esModule = true; exports.$ = 1; exports.y = function () { return exports.x; }; -exports.__esModule = true; //// [app.d.ts] diff --git a/tests/baselines/reference/typeReferenceDirectives8.js b/tests/baselines/reference/typeReferenceDirectives8.js index 436b04d5ce3e7..f19e63f7e07d6 100644 --- a/tests/baselines/reference/typeReferenceDirectives8.js +++ b/tests/baselines/reference/typeReferenceDirectives8.js @@ -16,14 +16,14 @@ export const bar = foo(); //// [mod1.js] "use strict"; +exports.__esModule = true; function foo() { return { x: 1 }; } exports.foo = foo; -exports.__esModule = true; //// [mod2.js] "use strict"; +exports.__esModule = true; var mod1_1 = require("./mod1"); exports.bar = mod1_1.foo(); -exports.__esModule = true; //// [mod1.d.ts] diff --git a/tests/baselines/reference/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js index f624eb6e488a5..6710abcad9765 100644 --- a/tests/baselines/reference/typeReferenceDirectives9.js +++ b/tests/baselines/reference/typeReferenceDirectives9.js @@ -35,27 +35,27 @@ export const bar = Cls.bar(); //// [main.js] "use strict"; +exports.__esModule = true; var Cls = (function () { function Cls() { } return Cls; }()); exports.Cls = Cls; -exports.__esModule = true; //// [mod1.js] /// "use strict"; +exports.__esModule = true; var main_1 = require("./main"); main_1.Cls.prototype.foo = function () { return undefined; }; -exports.__esModule = true; //// [mod2.js] "use strict"; +exports.__esModule = true; var main_1 = require("./main"); require("./mod1"); exports.cls = main_1.Cls; exports.foo = new main_1.Cls().foo(); exports.bar = main_1.Cls.bar(); -exports.__esModule = true; //// [main.d.ts] diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js index 184abcf3f8763..cb8a40cf0a6e6 100644 --- a/tests/baselines/reference/typeResolution.js +++ b/tests/baselines/reference/typeResolution.js @@ -113,6 +113,7 @@ module TopLevelModule2 { //// [typeResolution.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var TopLevelModule1; (function (TopLevelModule1) { var SubModule1; @@ -274,6 +275,5 @@ define(["require", "exports"], function (require, exports) { SubModule3.ClassA = ClassA; })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); })(TopLevelModule2 || (TopLevelModule2 = {})); - exports.__esModule = true; }); //# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map index 99d359bdbee39..5bf95ac5b29c3 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":[],"mappings":";;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;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;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,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;YACpB;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;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;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 +{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;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;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,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;YACpB;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;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;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 598d7f17ebefe..19e8b9991d154 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -10,6 +10,7 @@ sourceFile:typeResolution.ts ------------------------------------------------------------------- >>>define(["require", "exports"], function (require, exports) { >>> "use strict"; +>>> exports.__esModule = true; >>> var TopLevelModule1; 1 >^^^^ 2 > ^^^^ @@ -119,10 +120,10 @@ sourceFile:typeResolution.ts > export class ClassA { } > } > } -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) +1 >Emitted(4, 5) Source(1, 1) + SourceIndex(0) +2 >Emitted(4, 9) Source(1, 15) + SourceIndex(0) +3 >Emitted(4, 24) Source(1, 30) + SourceIndex(0) +4 >Emitted(4, 25) Source(100, 2) + SourceIndex(0) --- >>> (function (TopLevelModule1) { 1->^^^^ @@ -131,9 +132,9 @@ sourceFile:typeResolution.ts 1-> 2 > export module 3 > TopLevelModule1 -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) +1->Emitted(5, 5) Source(1, 1) + SourceIndex(0) +2 >Emitted(5, 16) Source(1, 15) + SourceIndex(0) +3 >Emitted(5, 31) Source(1, 30) + SourceIndex(0) --- >>> var SubModule1; 1 >^^^^^^^^ @@ -218,10 +219,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(5, 9) Source(2, 5) + SourceIndex(0) -2 >Emitted(5, 13) Source(2, 19) + SourceIndex(0) -3 >Emitted(5, 23) Source(2, 29) + SourceIndex(0) -4 >Emitted(5, 24) Source(74, 6) + SourceIndex(0) +1 >Emitted(6, 9) Source(2, 5) + SourceIndex(0) +2 >Emitted(6, 13) Source(2, 19) + SourceIndex(0) +3 >Emitted(6, 23) Source(2, 29) + SourceIndex(0) +4 >Emitted(6, 24) Source(74, 6) + SourceIndex(0) --- >>> (function (SubModule1) { 1->^^^^^^^^ @@ -231,9 +232,9 @@ sourceFile:typeResolution.ts 1-> 2 > export module 3 > SubModule1 -1->Emitted(6, 9) Source(2, 5) + SourceIndex(0) -2 >Emitted(6, 20) Source(2, 19) + SourceIndex(0) -3 >Emitted(6, 30) Source(2, 29) + SourceIndex(0) +1->Emitted(7, 9) Source(2, 5) + SourceIndex(0) +2 >Emitted(7, 20) Source(2, 19) + SourceIndex(0) +3 >Emitted(7, 30) Source(2, 29) + SourceIndex(0) --- >>> var SubSubModule1; 1->^^^^^^^^^^^^ @@ -302,10 +303,10 @@ sourceFile:typeResolution.ts > } > } > } -1->Emitted(7, 13) Source(3, 9) + SourceIndex(0) -2 >Emitted(7, 17) Source(3, 23) + SourceIndex(0) -3 >Emitted(7, 30) Source(3, 36) + SourceIndex(0) -4 >Emitted(7, 31) Source(59, 10) + SourceIndex(0) +1->Emitted(8, 13) Source(3, 9) + SourceIndex(0) +2 >Emitted(8, 17) Source(3, 23) + SourceIndex(0) +3 >Emitted(8, 30) Source(3, 36) + SourceIndex(0) +4 >Emitted(8, 31) Source(59, 10) + SourceIndex(0) --- >>> (function (SubSubModule1) { 1->^^^^^^^^^^^^ @@ -315,22 +316,22 @@ sourceFile:typeResolution.ts 1-> 2 > export module 3 > SubSubModule1 -1->Emitted(8, 13) Source(3, 9) + SourceIndex(0) -2 >Emitted(8, 24) Source(3, 23) + SourceIndex(0) -3 >Emitted(8, 37) Source(3, 36) + SourceIndex(0) +1->Emitted(9, 13) Source(3, 9) + SourceIndex(0) +2 >Emitted(9, 24) Source(3, 23) + SourceIndex(0) +3 >Emitted(9, 37) Source(3, 36) + SourceIndex(0) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> { > -1->Emitted(9, 17) Source(4, 13) + SourceIndex(0) +1->Emitted(10, 17) Source(4, 13) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(10, 21) Source(4, 13) + SourceIndex(0) +1->Emitted(11, 21) Source(4, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -357,8 +358,8 @@ sourceFile:typeResolution.ts > } > 2 > } -1->Emitted(11, 21) Source(23, 13) + SourceIndex(0) -2 >Emitted(11, 22) Source(23, 14) + SourceIndex(0) +1->Emitted(12, 21) Source(23, 13) + SourceIndex(0) +2 >Emitted(12, 22) Source(23, 14) + SourceIndex(0) --- >>> ClassA.prototype.AisIn1_1_1 = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -368,9 +369,9 @@ sourceFile:typeResolution.ts 1-> 2 > AisIn1_1_1 3 > -1->Emitted(12, 21) Source(5, 24) + SourceIndex(0) -2 >Emitted(12, 48) Source(5, 34) + SourceIndex(0) -3 >Emitted(12, 51) Source(5, 17) + SourceIndex(0) +1->Emitted(13, 21) Source(5, 24) + SourceIndex(0) +2 >Emitted(13, 48) Source(5, 34) + SourceIndex(0) +3 >Emitted(13, 51) Source(5, 17) + SourceIndex(0) --- >>> // Try all qualified names of this type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -378,8 +379,8 @@ sourceFile:typeResolution.ts 1->public AisIn1_1_1() { > 2 > // Try all qualified names of this type -1->Emitted(13, 25) Source(6, 21) + SourceIndex(0) -2 >Emitted(13, 64) Source(6, 60) + SourceIndex(0) +1->Emitted(14, 25) Source(6, 21) + SourceIndex(0) +2 >Emitted(14, 64) Source(6, 60) + SourceIndex(0) --- >>> var a1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -392,10 +393,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a1: ClassA 4 > ; -1 >Emitted(14, 25) Source(7, 21) + SourceIndex(0) -2 >Emitted(14, 29) Source(7, 25) + SourceIndex(0) -3 >Emitted(14, 31) Source(7, 35) + SourceIndex(0) -4 >Emitted(14, 32) Source(7, 36) + SourceIndex(0) +1 >Emitted(15, 25) Source(7, 21) + SourceIndex(0) +2 >Emitted(15, 29) Source(7, 25) + SourceIndex(0) +3 >Emitted(15, 31) Source(7, 35) + SourceIndex(0) +4 >Emitted(15, 32) Source(7, 36) + SourceIndex(0) --- >>> a1.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -410,12 +411,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(15, 25) Source(7, 37) + SourceIndex(0) -2 >Emitted(15, 27) Source(7, 39) + SourceIndex(0) -3 >Emitted(15, 28) Source(7, 40) + SourceIndex(0) -4 >Emitted(15, 38) Source(7, 50) + SourceIndex(0) -5 >Emitted(15, 40) Source(7, 52) + SourceIndex(0) -6 >Emitted(15, 41) Source(7, 53) + SourceIndex(0) +1->Emitted(16, 25) Source(7, 37) + SourceIndex(0) +2 >Emitted(16, 27) Source(7, 39) + SourceIndex(0) +3 >Emitted(16, 28) Source(7, 40) + SourceIndex(0) +4 >Emitted(16, 38) Source(7, 50) + SourceIndex(0) +5 >Emitted(16, 40) Source(7, 52) + SourceIndex(0) +6 >Emitted(16, 41) Source(7, 53) + SourceIndex(0) --- >>> var a2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -428,10 +429,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1 >Emitted(16, 25) Source(8, 21) + SourceIndex(0) -2 >Emitted(16, 29) Source(8, 25) + SourceIndex(0) -3 >Emitted(16, 31) Source(8, 49) + SourceIndex(0) -4 >Emitted(16, 32) Source(8, 50) + SourceIndex(0) +1 >Emitted(17, 25) Source(8, 21) + SourceIndex(0) +2 >Emitted(17, 29) Source(8, 25) + SourceIndex(0) +3 >Emitted(17, 31) Source(8, 49) + SourceIndex(0) +4 >Emitted(17, 32) Source(8, 50) + SourceIndex(0) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -446,12 +447,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(17, 25) Source(8, 51) + SourceIndex(0) -2 >Emitted(17, 27) Source(8, 53) + SourceIndex(0) -3 >Emitted(17, 28) Source(8, 54) + SourceIndex(0) -4 >Emitted(17, 38) Source(8, 64) + SourceIndex(0) -5 >Emitted(17, 40) Source(8, 66) + SourceIndex(0) -6 >Emitted(17, 41) Source(8, 67) + SourceIndex(0) +1->Emitted(18, 25) Source(8, 51) + SourceIndex(0) +2 >Emitted(18, 27) Source(8, 53) + SourceIndex(0) +3 >Emitted(18, 28) Source(8, 54) + SourceIndex(0) +4 >Emitted(18, 38) Source(8, 64) + SourceIndex(0) +5 >Emitted(18, 40) Source(8, 66) + SourceIndex(0) +6 >Emitted(18, 41) Source(8, 67) + SourceIndex(0) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -464,10 +465,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(18, 25) Source(9, 21) + SourceIndex(0) -2 >Emitted(18, 29) Source(9, 25) + SourceIndex(0) -3 >Emitted(18, 31) Source(9, 60) + SourceIndex(0) -4 >Emitted(18, 32) Source(9, 61) + SourceIndex(0) +1 >Emitted(19, 25) Source(9, 21) + SourceIndex(0) +2 >Emitted(19, 29) Source(9, 25) + SourceIndex(0) +3 >Emitted(19, 31) Source(9, 60) + SourceIndex(0) +4 >Emitted(19, 32) Source(9, 61) + SourceIndex(0) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -482,12 +483,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(19, 25) Source(9, 62) + SourceIndex(0) -2 >Emitted(19, 27) Source(9, 64) + SourceIndex(0) -3 >Emitted(19, 28) Source(9, 65) + SourceIndex(0) -4 >Emitted(19, 38) Source(9, 75) + SourceIndex(0) -5 >Emitted(19, 40) Source(9, 77) + SourceIndex(0) -6 >Emitted(19, 41) Source(9, 78) + SourceIndex(0) +1->Emitted(20, 25) Source(9, 62) + SourceIndex(0) +2 >Emitted(20, 27) Source(9, 64) + SourceIndex(0) +3 >Emitted(20, 28) Source(9, 65) + SourceIndex(0) +4 >Emitted(20, 38) Source(9, 75) + SourceIndex(0) +5 >Emitted(20, 40) Source(9, 77) + SourceIndex(0) +6 >Emitted(20, 41) Source(9, 78) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -500,10 +501,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(20, 25) Source(10, 21) + SourceIndex(0) -2 >Emitted(20, 29) Source(10, 25) + SourceIndex(0) -3 >Emitted(20, 31) Source(10, 76) + SourceIndex(0) -4 >Emitted(20, 32) Source(10, 77) + SourceIndex(0) +1 >Emitted(21, 25) Source(10, 21) + SourceIndex(0) +2 >Emitted(21, 29) Source(10, 25) + SourceIndex(0) +3 >Emitted(21, 31) Source(10, 76) + SourceIndex(0) +4 >Emitted(21, 32) Source(10, 77) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -519,12 +520,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(21, 25) Source(10, 78) + SourceIndex(0) -2 >Emitted(21, 27) Source(10, 80) + SourceIndex(0) -3 >Emitted(21, 28) Source(10, 81) + SourceIndex(0) -4 >Emitted(21, 38) Source(10, 91) + SourceIndex(0) -5 >Emitted(21, 40) Source(10, 93) + SourceIndex(0) -6 >Emitted(21, 41) Source(10, 94) + SourceIndex(0) +1->Emitted(22, 25) Source(10, 78) + SourceIndex(0) +2 >Emitted(22, 27) Source(10, 80) + SourceIndex(0) +3 >Emitted(22, 28) Source(10, 81) + SourceIndex(0) +4 >Emitted(22, 38) Source(10, 91) + SourceIndex(0) +5 >Emitted(22, 40) Source(10, 93) + SourceIndex(0) +6 >Emitted(22, 41) Source(10, 94) + SourceIndex(0) --- >>> // Two variants of qualifying a peer type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -533,8 +534,8 @@ sourceFile:typeResolution.ts > > 2 > // Two variants of qualifying a peer type -1->Emitted(22, 25) Source(12, 21) + SourceIndex(0) -2 >Emitted(22, 66) Source(12, 62) + SourceIndex(0) +1->Emitted(23, 25) Source(12, 21) + SourceIndex(0) +2 >Emitted(23, 66) Source(12, 62) + SourceIndex(0) --- >>> var b1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -547,10 +548,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b1: ClassB 4 > ; -1 >Emitted(23, 25) Source(13, 21) + SourceIndex(0) -2 >Emitted(23, 29) Source(13, 25) + SourceIndex(0) -3 >Emitted(23, 31) Source(13, 35) + SourceIndex(0) -4 >Emitted(23, 32) Source(13, 36) + SourceIndex(0) +1 >Emitted(24, 25) Source(13, 21) + SourceIndex(0) +2 >Emitted(24, 29) Source(13, 25) + SourceIndex(0) +3 >Emitted(24, 31) Source(13, 35) + SourceIndex(0) +4 >Emitted(24, 32) Source(13, 36) + SourceIndex(0) --- >>> b1.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -565,12 +566,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(24, 25) Source(13, 37) + SourceIndex(0) -2 >Emitted(24, 27) Source(13, 39) + SourceIndex(0) -3 >Emitted(24, 28) Source(13, 40) + SourceIndex(0) -4 >Emitted(24, 38) Source(13, 50) + SourceIndex(0) -5 >Emitted(24, 40) Source(13, 52) + SourceIndex(0) -6 >Emitted(24, 41) Source(13, 53) + SourceIndex(0) +1->Emitted(25, 25) Source(13, 37) + SourceIndex(0) +2 >Emitted(25, 27) Source(13, 39) + SourceIndex(0) +3 >Emitted(25, 28) Source(13, 40) + SourceIndex(0) +4 >Emitted(25, 38) Source(13, 50) + SourceIndex(0) +5 >Emitted(25, 40) Source(13, 52) + SourceIndex(0) +6 >Emitted(25, 41) Source(13, 53) + SourceIndex(0) --- >>> var b2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -583,10 +584,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB 4 > ; -1 >Emitted(25, 25) Source(14, 21) + SourceIndex(0) -2 >Emitted(25, 29) Source(14, 25) + SourceIndex(0) -3 >Emitted(25, 31) Source(14, 76) + SourceIndex(0) -4 >Emitted(25, 32) Source(14, 77) + SourceIndex(0) +1 >Emitted(26, 25) Source(14, 21) + SourceIndex(0) +2 >Emitted(26, 29) Source(14, 25) + SourceIndex(0) +3 >Emitted(26, 31) Source(14, 76) + SourceIndex(0) +4 >Emitted(26, 32) Source(14, 77) + SourceIndex(0) --- >>> b2.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -602,12 +603,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(26, 25) Source(14, 78) + SourceIndex(0) -2 >Emitted(26, 27) Source(14, 80) + SourceIndex(0) -3 >Emitted(26, 28) Source(14, 81) + SourceIndex(0) -4 >Emitted(26, 38) Source(14, 91) + SourceIndex(0) -5 >Emitted(26, 40) Source(14, 93) + SourceIndex(0) -6 >Emitted(26, 41) Source(14, 94) + SourceIndex(0) +1->Emitted(27, 25) Source(14, 78) + SourceIndex(0) +2 >Emitted(27, 27) Source(14, 80) + SourceIndex(0) +3 >Emitted(27, 28) Source(14, 81) + SourceIndex(0) +4 >Emitted(27, 38) Source(14, 91) + SourceIndex(0) +5 >Emitted(27, 40) Source(14, 93) + SourceIndex(0) +6 >Emitted(27, 41) Source(14, 94) + SourceIndex(0) --- >>> // Type only accessible from the root 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -616,8 +617,8 @@ sourceFile:typeResolution.ts > > 2 > // Type only accessible from the root -1->Emitted(27, 25) Source(16, 21) + SourceIndex(0) -2 >Emitted(27, 62) Source(16, 58) + SourceIndex(0) +1->Emitted(28, 25) Source(16, 21) + SourceIndex(0) +2 >Emitted(28, 62) Source(16, 58) + SourceIndex(0) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -630,10 +631,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(28, 25) Source(17, 21) + SourceIndex(0) -2 >Emitted(28, 29) Source(17, 25) + SourceIndex(0) -3 >Emitted(28, 31) Source(17, 76) + SourceIndex(0) -4 >Emitted(28, 32) Source(17, 77) + SourceIndex(0) +1 >Emitted(29, 25) Source(17, 21) + SourceIndex(0) +2 >Emitted(29, 29) Source(17, 25) + SourceIndex(0) +3 >Emitted(29, 31) Source(17, 76) + SourceIndex(0) +4 >Emitted(29, 32) Source(17, 77) + SourceIndex(0) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -649,12 +650,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(29, 25) Source(17, 78) + SourceIndex(0) -2 >Emitted(29, 27) Source(17, 80) + SourceIndex(0) -3 >Emitted(29, 28) Source(17, 81) + SourceIndex(0) -4 >Emitted(29, 38) Source(17, 91) + SourceIndex(0) -5 >Emitted(29, 40) Source(17, 93) + SourceIndex(0) -6 >Emitted(29, 41) Source(17, 94) + SourceIndex(0) +1->Emitted(30, 25) Source(17, 78) + SourceIndex(0) +2 >Emitted(30, 27) Source(17, 80) + SourceIndex(0) +3 >Emitted(30, 28) Source(17, 81) + SourceIndex(0) +4 >Emitted(30, 38) Source(17, 91) + SourceIndex(0) +5 >Emitted(30, 40) Source(17, 93) + SourceIndex(0) +6 >Emitted(30, 41) Source(17, 94) + SourceIndex(0) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -663,8 +664,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(30, 25) Source(19, 21) + SourceIndex(0) -2 >Emitted(30, 47) Source(19, 43) + SourceIndex(0) +1->Emitted(31, 25) Source(19, 21) + SourceIndex(0) +2 >Emitted(31, 47) Source(19, 43) + SourceIndex(0) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -677,10 +678,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(31, 25) Source(20, 21) + SourceIndex(0) -2 >Emitted(31, 29) Source(20, 25) + SourceIndex(0) -3 >Emitted(31, 31) Source(20, 39) + SourceIndex(0) -4 >Emitted(31, 32) Source(20, 40) + SourceIndex(0) +1 >Emitted(32, 25) Source(20, 21) + SourceIndex(0) +2 >Emitted(32, 29) Source(20, 25) + SourceIndex(0) +3 >Emitted(32, 31) Source(20, 39) + SourceIndex(0) +4 >Emitted(32, 32) Source(20, 40) + SourceIndex(0) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -695,12 +696,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(32, 25) Source(20, 41) + SourceIndex(0) -2 >Emitted(32, 27) Source(20, 43) + SourceIndex(0) -3 >Emitted(32, 28) Source(20, 44) + SourceIndex(0) -4 >Emitted(32, 38) Source(20, 54) + SourceIndex(0) -5 >Emitted(32, 40) Source(20, 56) + SourceIndex(0) -6 >Emitted(32, 41) Source(20, 57) + SourceIndex(0) +1->Emitted(33, 25) Source(20, 41) + SourceIndex(0) +2 >Emitted(33, 27) Source(20, 43) + SourceIndex(0) +3 >Emitted(33, 28) Source(20, 44) + SourceIndex(0) +4 >Emitted(33, 38) Source(20, 54) + SourceIndex(0) +5 >Emitted(33, 40) Source(20, 56) + SourceIndex(0) +6 >Emitted(33, 41) Source(20, 57) + SourceIndex(0) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -713,10 +714,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(33, 25) Source(21, 21) + SourceIndex(0) -2 >Emitted(33, 29) Source(21, 25) + SourceIndex(0) -3 >Emitted(33, 31) Source(21, 53) + SourceIndex(0) -4 >Emitted(33, 32) Source(21, 54) + SourceIndex(0) +1 >Emitted(34, 25) Source(21, 21) + SourceIndex(0) +2 >Emitted(34, 29) Source(21, 25) + SourceIndex(0) +3 >Emitted(34, 31) Source(21, 53) + SourceIndex(0) +4 >Emitted(34, 32) Source(21, 54) + SourceIndex(0) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -731,12 +732,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(34, 25) Source(21, 55) + SourceIndex(0) -2 >Emitted(34, 27) Source(21, 57) + SourceIndex(0) -3 >Emitted(34, 28) Source(21, 58) + SourceIndex(0) -4 >Emitted(34, 38) Source(21, 68) + SourceIndex(0) -5 >Emitted(34, 40) Source(21, 70) + SourceIndex(0) -6 >Emitted(34, 41) Source(21, 71) + SourceIndex(0) +1->Emitted(35, 25) Source(21, 55) + SourceIndex(0) +2 >Emitted(35, 27) Source(21, 57) + SourceIndex(0) +3 >Emitted(35, 28) Source(21, 58) + SourceIndex(0) +4 >Emitted(35, 38) Source(21, 68) + SourceIndex(0) +5 >Emitted(35, 40) Source(21, 70) + SourceIndex(0) +6 >Emitted(35, 41) Source(21, 71) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -745,8 +746,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(35, 21) Source(22, 17) + SourceIndex(0) -2 >Emitted(35, 22) Source(22, 18) + SourceIndex(0) +1 >Emitted(36, 21) Source(22, 17) + SourceIndex(0) +2 >Emitted(36, 22) Source(22, 18) + SourceIndex(0) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^^^^^ @@ -754,8 +755,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(36, 21) Source(23, 13) + SourceIndex(0) -2 >Emitted(36, 34) Source(23, 14) + SourceIndex(0) +1->Emitted(37, 21) Source(23, 13) + SourceIndex(0) +2 >Emitted(37, 34) Source(23, 14) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^^^^^ @@ -786,10 +787,10 @@ sourceFile:typeResolution.ts > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); > } > } -1 >Emitted(37, 17) Source(23, 13) + SourceIndex(0) -2 >Emitted(37, 18) Source(23, 14) + SourceIndex(0) -3 >Emitted(37, 18) Source(4, 13) + SourceIndex(0) -4 >Emitted(37, 22) Source(23, 14) + SourceIndex(0) +1 >Emitted(38, 17) Source(23, 13) + SourceIndex(0) +2 >Emitted(38, 18) Source(23, 14) + SourceIndex(0) +3 >Emitted(38, 18) Source(4, 13) + SourceIndex(0) +4 >Emitted(38, 22) Source(23, 14) + SourceIndex(0) --- >>> SubSubModule1.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ @@ -819,23 +820,23 @@ sourceFile:typeResolution.ts > } > } 4 > -1->Emitted(38, 17) Source(4, 26) + SourceIndex(0) -2 >Emitted(38, 37) Source(4, 32) + SourceIndex(0) -3 >Emitted(38, 46) Source(23, 14) + SourceIndex(0) -4 >Emitted(38, 47) Source(23, 14) + SourceIndex(0) +1->Emitted(39, 17) Source(4, 26) + SourceIndex(0) +2 >Emitted(39, 37) Source(4, 32) + SourceIndex(0) +3 >Emitted(39, 46) Source(23, 14) + SourceIndex(0) +4 >Emitted(39, 47) Source(23, 14) + SourceIndex(0) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(39, 17) Source(24, 13) + SourceIndex(0) +1 >Emitted(40, 17) Source(24, 13) + SourceIndex(0) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(40, 21) Source(24, 13) + SourceIndex(0) +1->Emitted(41, 21) Source(24, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -865,8 +866,8 @@ sourceFile:typeResolution.ts > } > 2 > } -1->Emitted(41, 21) Source(46, 13) + SourceIndex(0) -2 >Emitted(41, 22) Source(46, 14) + SourceIndex(0) +1->Emitted(42, 21) Source(46, 13) + SourceIndex(0) +2 >Emitted(42, 22) Source(46, 14) + SourceIndex(0) --- >>> ClassB.prototype.BisIn1_1_1 = function () { 1->^^^^^^^^^^^^^^^^^^^^ @@ -876,9 +877,9 @@ sourceFile:typeResolution.ts 1-> 2 > BisIn1_1_1 3 > -1->Emitted(42, 21) Source(25, 24) + SourceIndex(0) -2 >Emitted(42, 48) Source(25, 34) + SourceIndex(0) -3 >Emitted(42, 51) Source(25, 17) + SourceIndex(0) +1->Emitted(43, 21) Source(25, 24) + SourceIndex(0) +2 >Emitted(43, 48) Source(25, 34) + SourceIndex(0) +3 >Emitted(43, 51) Source(25, 17) + SourceIndex(0) --- >>> /** Exactly the same as above in AisIn1_1_1 **/ 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -886,8 +887,8 @@ sourceFile:typeResolution.ts 1->public BisIn1_1_1() { > 2 > /** Exactly the same as above in AisIn1_1_1 **/ -1->Emitted(43, 25) Source(26, 21) + SourceIndex(0) -2 >Emitted(43, 72) Source(26, 68) + SourceIndex(0) +1->Emitted(44, 25) Source(26, 21) + SourceIndex(0) +2 >Emitted(44, 72) Source(26, 68) + SourceIndex(0) --- >>> // Try all qualified names of this type 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -896,8 +897,8 @@ sourceFile:typeResolution.ts > > 2 > // Try all qualified names of this type -1 >Emitted(44, 25) Source(28, 21) + SourceIndex(0) -2 >Emitted(44, 64) Source(28, 60) + SourceIndex(0) +1 >Emitted(45, 25) Source(28, 21) + SourceIndex(0) +2 >Emitted(45, 64) Source(28, 60) + SourceIndex(0) --- >>> var a1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -910,10 +911,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a1: ClassA 4 > ; -1 >Emitted(45, 25) Source(29, 21) + SourceIndex(0) -2 >Emitted(45, 29) Source(29, 25) + SourceIndex(0) -3 >Emitted(45, 31) Source(29, 35) + SourceIndex(0) -4 >Emitted(45, 32) Source(29, 36) + SourceIndex(0) +1 >Emitted(46, 25) Source(29, 21) + SourceIndex(0) +2 >Emitted(46, 29) Source(29, 25) + SourceIndex(0) +3 >Emitted(46, 31) Source(29, 35) + SourceIndex(0) +4 >Emitted(46, 32) Source(29, 36) + SourceIndex(0) --- >>> a1.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -928,12 +929,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(46, 25) Source(29, 37) + SourceIndex(0) -2 >Emitted(46, 27) Source(29, 39) + SourceIndex(0) -3 >Emitted(46, 28) Source(29, 40) + SourceIndex(0) -4 >Emitted(46, 38) Source(29, 50) + SourceIndex(0) -5 >Emitted(46, 40) Source(29, 52) + SourceIndex(0) -6 >Emitted(46, 41) Source(29, 53) + SourceIndex(0) +1->Emitted(47, 25) Source(29, 37) + SourceIndex(0) +2 >Emitted(47, 27) Source(29, 39) + SourceIndex(0) +3 >Emitted(47, 28) Source(29, 40) + SourceIndex(0) +4 >Emitted(47, 38) Source(29, 50) + SourceIndex(0) +5 >Emitted(47, 40) Source(29, 52) + SourceIndex(0) +6 >Emitted(47, 41) Source(29, 53) + SourceIndex(0) --- >>> var a2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -946,10 +947,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1 >Emitted(47, 25) Source(30, 21) + SourceIndex(0) -2 >Emitted(47, 29) Source(30, 25) + SourceIndex(0) -3 >Emitted(47, 31) Source(30, 49) + SourceIndex(0) -4 >Emitted(47, 32) Source(30, 50) + SourceIndex(0) +1 >Emitted(48, 25) Source(30, 21) + SourceIndex(0) +2 >Emitted(48, 29) Source(30, 25) + SourceIndex(0) +3 >Emitted(48, 31) Source(30, 49) + SourceIndex(0) +4 >Emitted(48, 32) Source(30, 50) + SourceIndex(0) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -964,12 +965,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(48, 25) Source(30, 51) + SourceIndex(0) -2 >Emitted(48, 27) Source(30, 53) + SourceIndex(0) -3 >Emitted(48, 28) Source(30, 54) + SourceIndex(0) -4 >Emitted(48, 38) Source(30, 64) + SourceIndex(0) -5 >Emitted(48, 40) Source(30, 66) + SourceIndex(0) -6 >Emitted(48, 41) Source(30, 67) + SourceIndex(0) +1->Emitted(49, 25) Source(30, 51) + SourceIndex(0) +2 >Emitted(49, 27) Source(30, 53) + SourceIndex(0) +3 >Emitted(49, 28) Source(30, 54) + SourceIndex(0) +4 >Emitted(49, 38) Source(30, 64) + SourceIndex(0) +5 >Emitted(49, 40) Source(30, 66) + SourceIndex(0) +6 >Emitted(49, 41) Source(30, 67) + SourceIndex(0) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -982,10 +983,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(49, 25) Source(31, 21) + SourceIndex(0) -2 >Emitted(49, 29) Source(31, 25) + SourceIndex(0) -3 >Emitted(49, 31) Source(31, 60) + SourceIndex(0) -4 >Emitted(49, 32) Source(31, 61) + SourceIndex(0) +1 >Emitted(50, 25) Source(31, 21) + SourceIndex(0) +2 >Emitted(50, 29) Source(31, 25) + SourceIndex(0) +3 >Emitted(50, 31) Source(31, 60) + SourceIndex(0) +4 >Emitted(50, 32) Source(31, 61) + SourceIndex(0) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1000,12 +1001,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(50, 25) Source(31, 62) + SourceIndex(0) -2 >Emitted(50, 27) Source(31, 64) + SourceIndex(0) -3 >Emitted(50, 28) Source(31, 65) + SourceIndex(0) -4 >Emitted(50, 38) Source(31, 75) + SourceIndex(0) -5 >Emitted(50, 40) Source(31, 77) + SourceIndex(0) -6 >Emitted(50, 41) Source(31, 78) + SourceIndex(0) +1->Emitted(51, 25) Source(31, 62) + SourceIndex(0) +2 >Emitted(51, 27) Source(31, 64) + SourceIndex(0) +3 >Emitted(51, 28) Source(31, 65) + SourceIndex(0) +4 >Emitted(51, 38) Source(31, 75) + SourceIndex(0) +5 >Emitted(51, 40) Source(31, 77) + SourceIndex(0) +6 >Emitted(51, 41) Source(31, 78) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1018,10 +1019,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(51, 25) Source(32, 21) + SourceIndex(0) -2 >Emitted(51, 29) Source(32, 25) + SourceIndex(0) -3 >Emitted(51, 31) Source(32, 76) + SourceIndex(0) -4 >Emitted(51, 32) Source(32, 77) + SourceIndex(0) +1 >Emitted(52, 25) Source(32, 21) + SourceIndex(0) +2 >Emitted(52, 29) Source(32, 25) + SourceIndex(0) +3 >Emitted(52, 31) Source(32, 76) + SourceIndex(0) +4 >Emitted(52, 32) Source(32, 77) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1037,12 +1038,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(52, 25) Source(32, 78) + SourceIndex(0) -2 >Emitted(52, 27) Source(32, 80) + SourceIndex(0) -3 >Emitted(52, 28) Source(32, 81) + SourceIndex(0) -4 >Emitted(52, 38) Source(32, 91) + SourceIndex(0) -5 >Emitted(52, 40) Source(32, 93) + SourceIndex(0) -6 >Emitted(52, 41) Source(32, 94) + SourceIndex(0) +1->Emitted(53, 25) Source(32, 78) + SourceIndex(0) +2 >Emitted(53, 27) Source(32, 80) + SourceIndex(0) +3 >Emitted(53, 28) Source(32, 81) + SourceIndex(0) +4 >Emitted(53, 38) Source(32, 91) + SourceIndex(0) +5 >Emitted(53, 40) Source(32, 93) + SourceIndex(0) +6 >Emitted(53, 41) Source(32, 94) + SourceIndex(0) --- >>> // Two variants of qualifying a peer type 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1051,8 +1052,8 @@ sourceFile:typeResolution.ts > > 2 > // Two variants of qualifying a peer type -1->Emitted(53, 25) Source(34, 21) + SourceIndex(0) -2 >Emitted(53, 66) Source(34, 62) + SourceIndex(0) +1->Emitted(54, 25) Source(34, 21) + SourceIndex(0) +2 >Emitted(54, 66) Source(34, 62) + SourceIndex(0) --- >>> var b1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1065,10 +1066,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b1: ClassB 4 > ; -1 >Emitted(54, 25) Source(35, 21) + SourceIndex(0) -2 >Emitted(54, 29) Source(35, 25) + SourceIndex(0) -3 >Emitted(54, 31) Source(35, 35) + SourceIndex(0) -4 >Emitted(54, 32) Source(35, 36) + SourceIndex(0) +1 >Emitted(55, 25) Source(35, 21) + SourceIndex(0) +2 >Emitted(55, 29) Source(35, 25) + SourceIndex(0) +3 >Emitted(55, 31) Source(35, 35) + SourceIndex(0) +4 >Emitted(55, 32) Source(35, 36) + SourceIndex(0) --- >>> b1.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1083,12 +1084,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(55, 25) Source(35, 37) + SourceIndex(0) -2 >Emitted(55, 27) Source(35, 39) + SourceIndex(0) -3 >Emitted(55, 28) Source(35, 40) + SourceIndex(0) -4 >Emitted(55, 38) Source(35, 50) + SourceIndex(0) -5 >Emitted(55, 40) Source(35, 52) + SourceIndex(0) -6 >Emitted(55, 41) Source(35, 53) + SourceIndex(0) +1->Emitted(56, 25) Source(35, 37) + SourceIndex(0) +2 >Emitted(56, 27) Source(35, 39) + SourceIndex(0) +3 >Emitted(56, 28) Source(35, 40) + SourceIndex(0) +4 >Emitted(56, 38) Source(35, 50) + SourceIndex(0) +5 >Emitted(56, 40) Source(35, 52) + SourceIndex(0) +6 >Emitted(56, 41) Source(35, 53) + SourceIndex(0) --- >>> var b2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1101,10 +1102,10 @@ sourceFile:typeResolution.ts 2 > var 3 > b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB 4 > ; -1 >Emitted(56, 25) Source(36, 21) + SourceIndex(0) -2 >Emitted(56, 29) Source(36, 25) + SourceIndex(0) -3 >Emitted(56, 31) Source(36, 76) + SourceIndex(0) -4 >Emitted(56, 32) Source(36, 77) + SourceIndex(0) +1 >Emitted(57, 25) Source(36, 21) + SourceIndex(0) +2 >Emitted(57, 29) Source(36, 25) + SourceIndex(0) +3 >Emitted(57, 31) Source(36, 76) + SourceIndex(0) +4 >Emitted(57, 32) Source(36, 77) + SourceIndex(0) --- >>> b2.BisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1120,12 +1121,12 @@ sourceFile:typeResolution.ts 4 > BisIn1_1_1 5 > () 6 > ; -1->Emitted(57, 25) Source(36, 78) + SourceIndex(0) -2 >Emitted(57, 27) Source(36, 80) + SourceIndex(0) -3 >Emitted(57, 28) Source(36, 81) + SourceIndex(0) -4 >Emitted(57, 38) Source(36, 91) + SourceIndex(0) -5 >Emitted(57, 40) Source(36, 93) + SourceIndex(0) -6 >Emitted(57, 41) Source(36, 94) + SourceIndex(0) +1->Emitted(58, 25) Source(36, 78) + SourceIndex(0) +2 >Emitted(58, 27) Source(36, 80) + SourceIndex(0) +3 >Emitted(58, 28) Source(36, 81) + SourceIndex(0) +4 >Emitted(58, 38) Source(36, 91) + SourceIndex(0) +5 >Emitted(58, 40) Source(36, 93) + SourceIndex(0) +6 >Emitted(58, 41) Source(36, 94) + SourceIndex(0) --- >>> // Type only accessible from the root 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1134,8 +1135,8 @@ sourceFile:typeResolution.ts > > 2 > // Type only accessible from the root -1->Emitted(58, 25) Source(38, 21) + SourceIndex(0) -2 >Emitted(58, 62) Source(38, 58) + SourceIndex(0) +1->Emitted(59, 25) Source(38, 21) + SourceIndex(0) +2 >Emitted(59, 62) Source(38, 58) + SourceIndex(0) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1148,10 +1149,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(59, 25) Source(39, 21) + SourceIndex(0) -2 >Emitted(59, 29) Source(39, 25) + SourceIndex(0) -3 >Emitted(59, 31) Source(39, 76) + SourceIndex(0) -4 >Emitted(59, 32) Source(39, 77) + SourceIndex(0) +1 >Emitted(60, 25) Source(39, 21) + SourceIndex(0) +2 >Emitted(60, 29) Source(39, 25) + SourceIndex(0) +3 >Emitted(60, 31) Source(39, 76) + SourceIndex(0) +4 >Emitted(60, 32) Source(39, 77) + SourceIndex(0) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1166,12 +1167,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(60, 25) Source(39, 78) + SourceIndex(0) -2 >Emitted(60, 27) Source(39, 80) + SourceIndex(0) -3 >Emitted(60, 28) Source(39, 81) + SourceIndex(0) -4 >Emitted(60, 38) Source(39, 91) + SourceIndex(0) -5 >Emitted(60, 40) Source(39, 93) + SourceIndex(0) -6 >Emitted(60, 41) Source(39, 94) + SourceIndex(0) +1->Emitted(61, 25) Source(39, 78) + SourceIndex(0) +2 >Emitted(61, 27) Source(39, 80) + SourceIndex(0) +3 >Emitted(61, 28) Source(39, 81) + SourceIndex(0) +4 >Emitted(61, 38) Source(39, 91) + SourceIndex(0) +5 >Emitted(61, 40) Source(39, 93) + SourceIndex(0) +6 >Emitted(61, 41) Source(39, 94) + SourceIndex(0) --- >>> var c2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1184,10 +1185,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c2: TopLevelModule2.SubModule3.ClassA 4 > ; -1 >Emitted(61, 25) Source(40, 21) + SourceIndex(0) -2 >Emitted(61, 29) Source(40, 25) + SourceIndex(0) -3 >Emitted(61, 31) Source(40, 62) + SourceIndex(0) -4 >Emitted(61, 32) Source(40, 63) + SourceIndex(0) +1 >Emitted(62, 25) Source(40, 21) + SourceIndex(0) +2 >Emitted(62, 29) Source(40, 25) + SourceIndex(0) +3 >Emitted(62, 31) Source(40, 62) + SourceIndex(0) +4 >Emitted(62, 32) Source(40, 63) + SourceIndex(0) --- >>> c2.AisIn2_3(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1203,12 +1204,12 @@ sourceFile:typeResolution.ts 4 > AisIn2_3 5 > () 6 > ; -1->Emitted(62, 25) Source(40, 64) + SourceIndex(0) -2 >Emitted(62, 27) Source(40, 66) + SourceIndex(0) -3 >Emitted(62, 28) Source(40, 67) + SourceIndex(0) -4 >Emitted(62, 36) Source(40, 75) + SourceIndex(0) -5 >Emitted(62, 38) Source(40, 77) + SourceIndex(0) -6 >Emitted(62, 39) Source(40, 78) + SourceIndex(0) +1->Emitted(63, 25) Source(40, 64) + SourceIndex(0) +2 >Emitted(63, 27) Source(40, 66) + SourceIndex(0) +3 >Emitted(63, 28) Source(40, 67) + SourceIndex(0) +4 >Emitted(63, 36) Source(40, 75) + SourceIndex(0) +5 >Emitted(63, 38) Source(40, 77) + SourceIndex(0) +6 >Emitted(63, 39) Source(40, 78) + SourceIndex(0) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1217,8 +1218,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(63, 25) Source(42, 21) + SourceIndex(0) -2 >Emitted(63, 47) Source(42, 43) + SourceIndex(0) +1->Emitted(64, 25) Source(42, 21) + SourceIndex(0) +2 >Emitted(64, 47) Source(42, 43) + SourceIndex(0) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1231,10 +1232,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(64, 25) Source(43, 21) + SourceIndex(0) -2 >Emitted(64, 29) Source(43, 25) + SourceIndex(0) -3 >Emitted(64, 31) Source(43, 39) + SourceIndex(0) -4 >Emitted(64, 32) Source(43, 40) + SourceIndex(0) +1 >Emitted(65, 25) Source(43, 21) + SourceIndex(0) +2 >Emitted(65, 29) Source(43, 25) + SourceIndex(0) +3 >Emitted(65, 31) Source(43, 39) + SourceIndex(0) +4 >Emitted(65, 32) Source(43, 40) + SourceIndex(0) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1249,12 +1250,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(65, 25) Source(43, 41) + SourceIndex(0) -2 >Emitted(65, 27) Source(43, 43) + SourceIndex(0) -3 >Emitted(65, 28) Source(43, 44) + SourceIndex(0) -4 >Emitted(65, 38) Source(43, 54) + SourceIndex(0) -5 >Emitted(65, 40) Source(43, 56) + SourceIndex(0) -6 >Emitted(65, 41) Source(43, 57) + SourceIndex(0) +1->Emitted(66, 25) Source(43, 41) + SourceIndex(0) +2 >Emitted(66, 27) Source(43, 43) + SourceIndex(0) +3 >Emitted(66, 28) Source(43, 44) + SourceIndex(0) +4 >Emitted(66, 38) Source(43, 54) + SourceIndex(0) +5 >Emitted(66, 40) Source(43, 56) + SourceIndex(0) +6 >Emitted(66, 41) Source(43, 57) + SourceIndex(0) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1267,10 +1268,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(66, 25) Source(44, 21) + SourceIndex(0) -2 >Emitted(66, 29) Source(44, 25) + SourceIndex(0) -3 >Emitted(66, 31) Source(44, 53) + SourceIndex(0) -4 >Emitted(66, 32) Source(44, 54) + SourceIndex(0) +1 >Emitted(67, 25) Source(44, 21) + SourceIndex(0) +2 >Emitted(67, 29) Source(44, 25) + SourceIndex(0) +3 >Emitted(67, 31) Source(44, 53) + SourceIndex(0) +4 >Emitted(67, 32) Source(44, 54) + SourceIndex(0) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1285,12 +1286,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(67, 25) Source(44, 55) + SourceIndex(0) -2 >Emitted(67, 27) Source(44, 57) + SourceIndex(0) -3 >Emitted(67, 28) Source(44, 58) + SourceIndex(0) -4 >Emitted(67, 38) Source(44, 68) + SourceIndex(0) -5 >Emitted(67, 40) Source(44, 70) + SourceIndex(0) -6 >Emitted(67, 41) Source(44, 71) + SourceIndex(0) +1->Emitted(68, 25) Source(44, 55) + SourceIndex(0) +2 >Emitted(68, 27) Source(44, 57) + SourceIndex(0) +3 >Emitted(68, 28) Source(44, 58) + SourceIndex(0) +4 >Emitted(68, 38) Source(44, 68) + SourceIndex(0) +5 >Emitted(68, 40) Source(44, 70) + SourceIndex(0) +6 >Emitted(68, 41) Source(44, 71) + SourceIndex(0) --- >>> }; 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1299,8 +1300,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(68, 21) Source(45, 17) + SourceIndex(0) -2 >Emitted(68, 22) Source(45, 18) + SourceIndex(0) +1 >Emitted(69, 21) Source(45, 17) + SourceIndex(0) +2 >Emitted(69, 22) Source(45, 18) + SourceIndex(0) --- >>> return ClassB; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1308,8 +1309,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(69, 21) Source(46, 13) + SourceIndex(0) -2 >Emitted(69, 34) Source(46, 14) + SourceIndex(0) +1->Emitted(70, 21) Source(46, 13) + SourceIndex(0) +2 >Emitted(70, 34) Source(46, 14) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^^^^^ @@ -1343,10 +1344,10 @@ sourceFile:typeResolution.ts > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); > } > } -1 >Emitted(70, 17) Source(46, 13) + SourceIndex(0) -2 >Emitted(70, 18) Source(46, 14) + SourceIndex(0) -3 >Emitted(70, 18) Source(24, 13) + SourceIndex(0) -4 >Emitted(70, 22) Source(46, 14) + SourceIndex(0) +1 >Emitted(71, 17) Source(46, 13) + SourceIndex(0) +2 >Emitted(71, 18) Source(46, 14) + SourceIndex(0) +3 >Emitted(71, 18) Source(24, 13) + SourceIndex(0) +4 >Emitted(71, 22) Source(46, 14) + SourceIndex(0) --- >>> SubSubModule1.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ @@ -1380,10 +1381,10 @@ sourceFile:typeResolution.ts > } > } 4 > -1->Emitted(71, 17) Source(24, 26) + SourceIndex(0) -2 >Emitted(71, 37) Source(24, 32) + SourceIndex(0) -3 >Emitted(71, 46) Source(46, 14) + SourceIndex(0) -4 >Emitted(71, 47) Source(46, 14) + SourceIndex(0) +1->Emitted(72, 17) Source(24, 26) + SourceIndex(0) +2 >Emitted(72, 37) Source(24, 32) + SourceIndex(0) +3 >Emitted(72, 46) Source(46, 14) + SourceIndex(0) +4 >Emitted(72, 47) Source(46, 14) + SourceIndex(0) --- >>> var NonExportedClassQ = (function () { 1->^^^^^^^^^^^^^^^^ @@ -1391,21 +1392,21 @@ sourceFile:typeResolution.ts 1-> > export interface InterfaceX { XisIn1_1_1(); } > -1->Emitted(72, 17) Source(48, 13) + SourceIndex(0) +1->Emitted(73, 17) Source(48, 13) + SourceIndex(0) --- >>> function NonExportedClassQ() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1->class NonExportedClassQ { > -1->Emitted(73, 21) Source(49, 17) + SourceIndex(0) +1->Emitted(74, 21) Source(49, 17) + SourceIndex(0) --- >>> function QQ() { 1->^^^^^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->constructor() { > -1->Emitted(74, 25) Source(50, 21) + SourceIndex(0) +1->Emitted(75, 25) Source(50, 21) + SourceIndex(0) --- >>> /* Sampling of stuff from AisIn1_1_1 */ 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1413,8 +1414,8 @@ sourceFile:typeResolution.ts 1->function QQ() { > 2 > /* Sampling of stuff from AisIn1_1_1 */ -1->Emitted(75, 29) Source(51, 25) + SourceIndex(0) -2 >Emitted(75, 68) Source(51, 64) + SourceIndex(0) +1->Emitted(76, 29) Source(51, 25) + SourceIndex(0) +2 >Emitted(76, 68) Source(51, 64) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1427,10 +1428,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(76, 29) Source(52, 25) + SourceIndex(0) -2 >Emitted(76, 33) Source(52, 29) + SourceIndex(0) -3 >Emitted(76, 35) Source(52, 80) + SourceIndex(0) -4 >Emitted(76, 36) Source(52, 81) + SourceIndex(0) +1 >Emitted(77, 29) Source(52, 25) + SourceIndex(0) +2 >Emitted(77, 33) Source(52, 29) + SourceIndex(0) +3 >Emitted(77, 35) Source(52, 80) + SourceIndex(0) +4 >Emitted(77, 36) Source(52, 81) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1445,12 +1446,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(77, 29) Source(52, 82) + SourceIndex(0) -2 >Emitted(77, 31) Source(52, 84) + SourceIndex(0) -3 >Emitted(77, 32) Source(52, 85) + SourceIndex(0) -4 >Emitted(77, 42) Source(52, 95) + SourceIndex(0) -5 >Emitted(77, 44) Source(52, 97) + SourceIndex(0) -6 >Emitted(77, 45) Source(52, 98) + SourceIndex(0) +1->Emitted(78, 29) Source(52, 82) + SourceIndex(0) +2 >Emitted(78, 31) Source(52, 84) + SourceIndex(0) +3 >Emitted(78, 32) Source(52, 85) + SourceIndex(0) +4 >Emitted(78, 42) Source(52, 95) + SourceIndex(0) +5 >Emitted(78, 44) Source(52, 97) + SourceIndex(0) +6 >Emitted(78, 45) Source(52, 98) + SourceIndex(0) --- >>> var c1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1463,10 +1464,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA 4 > ; -1 >Emitted(78, 29) Source(53, 25) + SourceIndex(0) -2 >Emitted(78, 33) Source(53, 29) + SourceIndex(0) -3 >Emitted(78, 35) Source(53, 80) + SourceIndex(0) -4 >Emitted(78, 36) Source(53, 81) + SourceIndex(0) +1 >Emitted(79, 29) Source(53, 25) + SourceIndex(0) +2 >Emitted(79, 33) Source(53, 29) + SourceIndex(0) +3 >Emitted(79, 35) Source(53, 80) + SourceIndex(0) +4 >Emitted(79, 36) Source(53, 81) + SourceIndex(0) --- >>> c1.AisIn1_2_2(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1481,12 +1482,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_2_2 5 > () 6 > ; -1->Emitted(79, 29) Source(53, 82) + SourceIndex(0) -2 >Emitted(79, 31) Source(53, 84) + SourceIndex(0) -3 >Emitted(79, 32) Source(53, 85) + SourceIndex(0) -4 >Emitted(79, 42) Source(53, 95) + SourceIndex(0) -5 >Emitted(79, 44) Source(53, 97) + SourceIndex(0) -6 >Emitted(79, 45) Source(53, 98) + SourceIndex(0) +1->Emitted(80, 29) Source(53, 82) + SourceIndex(0) +2 >Emitted(80, 31) Source(53, 84) + SourceIndex(0) +3 >Emitted(80, 32) Source(53, 85) + SourceIndex(0) +4 >Emitted(80, 42) Source(53, 95) + SourceIndex(0) +5 >Emitted(80, 44) Source(53, 97) + SourceIndex(0) +6 >Emitted(80, 45) Source(53, 98) + SourceIndex(0) --- >>> var d1; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1499,10 +1500,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d1: InterfaceX 4 > ; -1 >Emitted(80, 29) Source(54, 25) + SourceIndex(0) -2 >Emitted(80, 33) Source(54, 29) + SourceIndex(0) -3 >Emitted(80, 35) Source(54, 43) + SourceIndex(0) -4 >Emitted(80, 36) Source(54, 44) + SourceIndex(0) +1 >Emitted(81, 29) Source(54, 25) + SourceIndex(0) +2 >Emitted(81, 33) Source(54, 29) + SourceIndex(0) +3 >Emitted(81, 35) Source(54, 43) + SourceIndex(0) +4 >Emitted(81, 36) Source(54, 44) + SourceIndex(0) --- >>> d1.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1517,12 +1518,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(81, 29) Source(54, 45) + SourceIndex(0) -2 >Emitted(81, 31) Source(54, 47) + SourceIndex(0) -3 >Emitted(81, 32) Source(54, 48) + SourceIndex(0) -4 >Emitted(81, 42) Source(54, 58) + SourceIndex(0) -5 >Emitted(81, 44) Source(54, 60) + SourceIndex(0) -6 >Emitted(81, 45) Source(54, 61) + SourceIndex(0) +1->Emitted(82, 29) Source(54, 45) + SourceIndex(0) +2 >Emitted(82, 31) Source(54, 47) + SourceIndex(0) +3 >Emitted(82, 32) Source(54, 48) + SourceIndex(0) +4 >Emitted(82, 42) Source(54, 58) + SourceIndex(0) +5 >Emitted(82, 44) Source(54, 60) + SourceIndex(0) +6 >Emitted(82, 45) Source(54, 61) + SourceIndex(0) --- >>> var c2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1535,10 +1536,10 @@ sourceFile:typeResolution.ts 2 > var 3 > c2: TopLevelModule2.SubModule3.ClassA 4 > ; -1 >Emitted(82, 29) Source(55, 25) + SourceIndex(0) -2 >Emitted(82, 33) Source(55, 29) + SourceIndex(0) -3 >Emitted(82, 35) Source(55, 66) + SourceIndex(0) -4 >Emitted(82, 36) Source(55, 67) + SourceIndex(0) +1 >Emitted(83, 29) Source(55, 25) + SourceIndex(0) +2 >Emitted(83, 33) Source(55, 29) + SourceIndex(0) +3 >Emitted(83, 35) Source(55, 66) + SourceIndex(0) +4 >Emitted(83, 36) Source(55, 67) + SourceIndex(0) --- >>> c2.AisIn2_3(); 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1553,12 +1554,12 @@ sourceFile:typeResolution.ts 4 > AisIn2_3 5 > () 6 > ; -1->Emitted(83, 29) Source(55, 68) + SourceIndex(0) -2 >Emitted(83, 31) Source(55, 70) + SourceIndex(0) -3 >Emitted(83, 32) Source(55, 71) + SourceIndex(0) -4 >Emitted(83, 40) Source(55, 79) + SourceIndex(0) -5 >Emitted(83, 42) Source(55, 81) + SourceIndex(0) -6 >Emitted(83, 43) Source(55, 82) + SourceIndex(0) +1->Emitted(84, 29) Source(55, 68) + SourceIndex(0) +2 >Emitted(84, 31) Source(55, 70) + SourceIndex(0) +3 >Emitted(84, 32) Source(55, 71) + SourceIndex(0) +4 >Emitted(84, 40) Source(55, 79) + SourceIndex(0) +5 >Emitted(84, 42) Source(55, 81) + SourceIndex(0) +6 >Emitted(84, 43) Source(55, 82) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1566,8 +1567,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(84, 25) Source(56, 21) + SourceIndex(0) -2 >Emitted(84, 26) Source(56, 22) + SourceIndex(0) +1 >Emitted(85, 25) Source(56, 21) + SourceIndex(0) +2 >Emitted(85, 26) Source(56, 22) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1576,8 +1577,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(85, 21) Source(57, 17) + SourceIndex(0) -2 >Emitted(85, 22) Source(57, 18) + SourceIndex(0) +1 >Emitted(86, 21) Source(57, 17) + SourceIndex(0) +2 >Emitted(86, 22) Source(57, 18) + SourceIndex(0) --- >>> return NonExportedClassQ; 1->^^^^^^^^^^^^^^^^^^^^ @@ -1585,8 +1586,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(86, 21) Source(58, 13) + SourceIndex(0) -2 >Emitted(86, 45) Source(58, 14) + SourceIndex(0) +1->Emitted(87, 21) Source(58, 13) + SourceIndex(0) +2 >Emitted(87, 45) Source(58, 14) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^^^^^ @@ -1608,10 +1609,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(87, 17) Source(58, 13) + SourceIndex(0) -2 >Emitted(87, 18) Source(58, 14) + SourceIndex(0) -3 >Emitted(87, 18) Source(48, 13) + SourceIndex(0) -4 >Emitted(87, 22) Source(58, 14) + SourceIndex(0) +1 >Emitted(88, 17) Source(58, 13) + SourceIndex(0) +2 >Emitted(88, 18) Source(58, 14) + SourceIndex(0) +3 >Emitted(88, 18) Source(48, 13) + SourceIndex(0) +4 >Emitted(88, 22) Source(58, 14) + SourceIndex(0) --- >>> })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {})); 1->^^^^^^^^^^^^ @@ -1689,15 +1690,15 @@ sourceFile:typeResolution.ts > } > } > } -1->Emitted(88, 13) Source(59, 9) + SourceIndex(0) -2 >Emitted(88, 14) Source(59, 10) + SourceIndex(0) -3 >Emitted(88, 16) Source(3, 23) + SourceIndex(0) -4 >Emitted(88, 29) Source(3, 36) + SourceIndex(0) -5 >Emitted(88, 32) Source(3, 23) + SourceIndex(0) -6 >Emitted(88, 56) Source(3, 36) + SourceIndex(0) -7 >Emitted(88, 61) Source(3, 23) + SourceIndex(0) -8 >Emitted(88, 85) Source(3, 36) + SourceIndex(0) -9 >Emitted(88, 93) Source(59, 10) + SourceIndex(0) +1->Emitted(89, 13) Source(59, 9) + SourceIndex(0) +2 >Emitted(89, 14) Source(59, 10) + SourceIndex(0) +3 >Emitted(89, 16) Source(3, 23) + SourceIndex(0) +4 >Emitted(89, 29) Source(3, 36) + SourceIndex(0) +5 >Emitted(89, 32) Source(3, 23) + SourceIndex(0) +6 >Emitted(89, 56) Source(3, 36) + SourceIndex(0) +7 >Emitted(89, 61) Source(3, 23) + SourceIndex(0) +8 >Emitted(89, 85) Source(3, 36) + SourceIndex(0) +9 >Emitted(89, 93) Source(59, 10) + SourceIndex(0) --- >>> // Should have no effect on S1.SS1.ClassA above because it is not exported 1 >^^^^^^^^^^^^ @@ -1706,29 +1707,29 @@ sourceFile:typeResolution.ts > > 2 > // Should have no effect on S1.SS1.ClassA above because it is not exported -1 >Emitted(89, 13) Source(61, 9) + SourceIndex(0) -2 >Emitted(89, 87) Source(61, 83) + SourceIndex(0) +1 >Emitted(90, 13) Source(61, 9) + SourceIndex(0) +2 >Emitted(90, 87) Source(61, 83) + SourceIndex(0) --- >>> var ClassA = (function () { 1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(90, 13) Source(62, 9) + SourceIndex(0) +1 >Emitted(91, 13) Source(62, 9) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^-> 1->class ClassA { > -1->Emitted(91, 17) Source(63, 13) + SourceIndex(0) +1->Emitted(92, 17) Source(63, 13) + SourceIndex(0) --- >>> function AA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^-> 1->constructor() { > -1->Emitted(92, 21) Source(64, 17) + SourceIndex(0) +1->Emitted(93, 21) Source(64, 17) + SourceIndex(0) --- >>> var a2; 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1741,10 +1742,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a2: SubSubModule1.ClassA 4 > ; -1->Emitted(93, 25) Source(65, 21) + SourceIndex(0) -2 >Emitted(93, 29) Source(65, 25) + SourceIndex(0) -3 >Emitted(93, 31) Source(65, 49) + SourceIndex(0) -4 >Emitted(93, 32) Source(65, 50) + SourceIndex(0) +1->Emitted(94, 25) Source(65, 21) + SourceIndex(0) +2 >Emitted(94, 29) Source(65, 25) + SourceIndex(0) +3 >Emitted(94, 31) Source(65, 49) + SourceIndex(0) +4 >Emitted(94, 32) Source(65, 50) + SourceIndex(0) --- >>> a2.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1759,12 +1760,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(94, 25) Source(65, 51) + SourceIndex(0) -2 >Emitted(94, 27) Source(65, 53) + SourceIndex(0) -3 >Emitted(94, 28) Source(65, 54) + SourceIndex(0) -4 >Emitted(94, 38) Source(65, 64) + SourceIndex(0) -5 >Emitted(94, 40) Source(65, 66) + SourceIndex(0) -6 >Emitted(94, 41) Source(65, 67) + SourceIndex(0) +1->Emitted(95, 25) Source(65, 51) + SourceIndex(0) +2 >Emitted(95, 27) Source(65, 53) + SourceIndex(0) +3 >Emitted(95, 28) Source(65, 54) + SourceIndex(0) +4 >Emitted(95, 38) Source(65, 64) + SourceIndex(0) +5 >Emitted(95, 40) Source(65, 66) + SourceIndex(0) +6 >Emitted(95, 41) Source(65, 67) + SourceIndex(0) --- >>> var a3; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1777,10 +1778,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a3: SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(95, 25) Source(66, 21) + SourceIndex(0) -2 >Emitted(95, 29) Source(66, 25) + SourceIndex(0) -3 >Emitted(95, 31) Source(66, 60) + SourceIndex(0) -4 >Emitted(95, 32) Source(66, 61) + SourceIndex(0) +1 >Emitted(96, 25) Source(66, 21) + SourceIndex(0) +2 >Emitted(96, 29) Source(66, 25) + SourceIndex(0) +3 >Emitted(96, 31) Source(66, 60) + SourceIndex(0) +4 >Emitted(96, 32) Source(66, 61) + SourceIndex(0) --- >>> a3.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1795,12 +1796,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(96, 25) Source(66, 62) + SourceIndex(0) -2 >Emitted(96, 27) Source(66, 64) + SourceIndex(0) -3 >Emitted(96, 28) Source(66, 65) + SourceIndex(0) -4 >Emitted(96, 38) Source(66, 75) + SourceIndex(0) -5 >Emitted(96, 40) Source(66, 77) + SourceIndex(0) -6 >Emitted(96, 41) Source(66, 78) + SourceIndex(0) +1->Emitted(97, 25) Source(66, 62) + SourceIndex(0) +2 >Emitted(97, 27) Source(66, 64) + SourceIndex(0) +3 >Emitted(97, 28) Source(66, 65) + SourceIndex(0) +4 >Emitted(97, 38) Source(66, 75) + SourceIndex(0) +5 >Emitted(97, 40) Source(66, 77) + SourceIndex(0) +6 >Emitted(97, 41) Source(66, 78) + SourceIndex(0) --- >>> var a4; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1813,10 +1814,10 @@ sourceFile:typeResolution.ts 2 > var 3 > a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA 4 > ; -1 >Emitted(97, 25) Source(67, 21) + SourceIndex(0) -2 >Emitted(97, 29) Source(67, 25) + SourceIndex(0) -3 >Emitted(97, 31) Source(67, 76) + SourceIndex(0) -4 >Emitted(97, 32) Source(67, 77) + SourceIndex(0) +1 >Emitted(98, 25) Source(67, 21) + SourceIndex(0) +2 >Emitted(98, 29) Source(67, 25) + SourceIndex(0) +3 >Emitted(98, 31) Source(67, 76) + SourceIndex(0) +4 >Emitted(98, 32) Source(67, 77) + SourceIndex(0) --- >>> a4.AisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1832,12 +1833,12 @@ sourceFile:typeResolution.ts 4 > AisIn1_1_1 5 > () 6 > ; -1->Emitted(98, 25) Source(67, 78) + SourceIndex(0) -2 >Emitted(98, 27) Source(67, 80) + SourceIndex(0) -3 >Emitted(98, 28) Source(67, 81) + SourceIndex(0) -4 >Emitted(98, 38) Source(67, 91) + SourceIndex(0) -5 >Emitted(98, 40) Source(67, 93) + SourceIndex(0) -6 >Emitted(98, 41) Source(67, 94) + SourceIndex(0) +1->Emitted(99, 25) Source(67, 78) + SourceIndex(0) +2 >Emitted(99, 27) Source(67, 80) + SourceIndex(0) +3 >Emitted(99, 28) Source(67, 81) + SourceIndex(0) +4 >Emitted(99, 38) Source(67, 91) + SourceIndex(0) +5 >Emitted(99, 40) Source(67, 93) + SourceIndex(0) +6 >Emitted(99, 41) Source(67, 94) + SourceIndex(0) --- >>> // Interface reference 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1846,8 +1847,8 @@ sourceFile:typeResolution.ts > > 2 > // Interface reference -1->Emitted(99, 25) Source(69, 21) + SourceIndex(0) -2 >Emitted(99, 47) Source(69, 43) + SourceIndex(0) +1->Emitted(100, 25) Source(69, 21) + SourceIndex(0) +2 >Emitted(100, 47) Source(69, 43) + SourceIndex(0) --- >>> var d2; 1 >^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1860,10 +1861,10 @@ sourceFile:typeResolution.ts 2 > var 3 > d2: SubSubModule1.InterfaceX 4 > ; -1 >Emitted(100, 25) Source(70, 21) + SourceIndex(0) -2 >Emitted(100, 29) Source(70, 25) + SourceIndex(0) -3 >Emitted(100, 31) Source(70, 53) + SourceIndex(0) -4 >Emitted(100, 32) Source(70, 54) + SourceIndex(0) +1 >Emitted(101, 25) Source(70, 21) + SourceIndex(0) +2 >Emitted(101, 29) Source(70, 25) + SourceIndex(0) +3 >Emitted(101, 31) Source(70, 53) + SourceIndex(0) +4 >Emitted(101, 32) Source(70, 54) + SourceIndex(0) --- >>> d2.XisIn1_1_1(); 1->^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1878,12 +1879,12 @@ sourceFile:typeResolution.ts 4 > XisIn1_1_1 5 > () 6 > ; -1->Emitted(101, 25) Source(70, 55) + SourceIndex(0) -2 >Emitted(101, 27) Source(70, 57) + SourceIndex(0) -3 >Emitted(101, 28) Source(70, 58) + SourceIndex(0) -4 >Emitted(101, 38) Source(70, 68) + SourceIndex(0) -5 >Emitted(101, 40) Source(70, 70) + SourceIndex(0) -6 >Emitted(101, 41) Source(70, 71) + SourceIndex(0) +1->Emitted(102, 25) Source(70, 55) + SourceIndex(0) +2 >Emitted(102, 27) Source(70, 57) + SourceIndex(0) +3 >Emitted(102, 28) Source(70, 58) + SourceIndex(0) +4 >Emitted(102, 38) Source(70, 68) + SourceIndex(0) +5 >Emitted(102, 40) Source(70, 70) + SourceIndex(0) +6 >Emitted(102, 41) Source(70, 71) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^^^^^ @@ -1891,8 +1892,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(102, 21) Source(71, 17) + SourceIndex(0) -2 >Emitted(102, 22) Source(71, 18) + SourceIndex(0) +1 >Emitted(103, 21) Source(71, 17) + SourceIndex(0) +2 >Emitted(103, 22) Source(71, 18) + SourceIndex(0) --- >>> } 1 >^^^^^^^^^^^^^^^^ @@ -1901,8 +1902,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(103, 17) Source(72, 13) + SourceIndex(0) -2 >Emitted(103, 18) Source(72, 14) + SourceIndex(0) +1 >Emitted(104, 17) Source(72, 13) + SourceIndex(0) +2 >Emitted(104, 18) Source(72, 14) + SourceIndex(0) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^ @@ -1910,8 +1911,8 @@ sourceFile:typeResolution.ts 1-> > 2 > } -1->Emitted(104, 17) Source(73, 9) + SourceIndex(0) -2 >Emitted(104, 30) Source(73, 10) + SourceIndex(0) +1->Emitted(105, 17) Source(73, 9) + SourceIndex(0) +2 >Emitted(105, 30) Source(73, 10) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^ @@ -1934,10 +1935,10 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(105, 13) Source(73, 9) + SourceIndex(0) -2 >Emitted(105, 14) Source(73, 10) + SourceIndex(0) -3 >Emitted(105, 14) Source(62, 9) + SourceIndex(0) -4 >Emitted(105, 18) Source(73, 10) + SourceIndex(0) +1 >Emitted(106, 13) Source(73, 9) + SourceIndex(0) +2 >Emitted(106, 14) Source(73, 10) + SourceIndex(0) +3 >Emitted(106, 14) Source(62, 9) + SourceIndex(0) +4 >Emitted(106, 18) Source(73, 10) + SourceIndex(0) --- >>> })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {})); 1->^^^^^^^^ @@ -2031,15 +2032,15 @@ sourceFile:typeResolution.ts > } > } > } -1->Emitted(106, 9) Source(74, 5) + SourceIndex(0) -2 >Emitted(106, 10) Source(74, 6) + SourceIndex(0) -3 >Emitted(106, 12) Source(2, 19) + SourceIndex(0) -4 >Emitted(106, 22) Source(2, 29) + SourceIndex(0) -5 >Emitted(106, 25) Source(2, 19) + SourceIndex(0) -6 >Emitted(106, 51) Source(2, 29) + SourceIndex(0) -7 >Emitted(106, 56) Source(2, 19) + SourceIndex(0) -8 >Emitted(106, 82) Source(2, 29) + SourceIndex(0) -9 >Emitted(106, 90) Source(74, 6) + SourceIndex(0) +1->Emitted(107, 9) Source(74, 5) + SourceIndex(0) +2 >Emitted(107, 10) Source(74, 6) + SourceIndex(0) +3 >Emitted(107, 12) Source(2, 19) + SourceIndex(0) +4 >Emitted(107, 22) Source(2, 29) + SourceIndex(0) +5 >Emitted(107, 25) Source(2, 19) + SourceIndex(0) +6 >Emitted(107, 51) Source(2, 29) + SourceIndex(0) +7 >Emitted(107, 56) Source(2, 19) + SourceIndex(0) +8 >Emitted(107, 82) Source(2, 29) + SourceIndex(0) +9 >Emitted(107, 90) Source(74, 6) + SourceIndex(0) --- >>> var SubModule2; 1 >^^^^^^^^ @@ -2064,10 +2065,10 @@ sourceFile:typeResolution.ts > > export interface InterfaceY { YisIn1_2(); } > } -1 >Emitted(107, 9) Source(76, 5) + SourceIndex(0) -2 >Emitted(107, 13) Source(76, 19) + SourceIndex(0) -3 >Emitted(107, 23) Source(76, 29) + SourceIndex(0) -4 >Emitted(107, 24) Source(87, 6) + SourceIndex(0) +1 >Emitted(108, 9) Source(76, 5) + SourceIndex(0) +2 >Emitted(108, 13) Source(76, 19) + SourceIndex(0) +3 >Emitted(108, 23) Source(76, 29) + SourceIndex(0) +4 >Emitted(108, 24) Source(87, 6) + SourceIndex(0) --- >>> (function (SubModule2) { 1->^^^^^^^^ @@ -2077,9 +2078,9 @@ sourceFile:typeResolution.ts 1-> 2 > export module 3 > SubModule2 -1->Emitted(108, 9) Source(76, 5) + SourceIndex(0) -2 >Emitted(108, 20) Source(76, 19) + SourceIndex(0) -3 >Emitted(108, 30) Source(76, 29) + SourceIndex(0) +1->Emitted(109, 9) Source(76, 5) + SourceIndex(0) +2 >Emitted(109, 20) Source(76, 19) + SourceIndex(0) +3 >Emitted(109, 30) Source(76, 29) + SourceIndex(0) --- >>> var SubSubModule2; 1->^^^^^^^^^^^^ @@ -2099,10 +2100,10 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > } -1->Emitted(109, 13) Source(77, 9) + SourceIndex(0) -2 >Emitted(109, 17) Source(77, 23) + SourceIndex(0) -3 >Emitted(109, 30) Source(77, 36) + SourceIndex(0) -4 >Emitted(109, 31) Source(84, 10) + SourceIndex(0) +1->Emitted(110, 13) Source(77, 9) + SourceIndex(0) +2 >Emitted(110, 17) Source(77, 23) + SourceIndex(0) +3 >Emitted(110, 30) Source(77, 36) + SourceIndex(0) +4 >Emitted(110, 31) Source(84, 10) + SourceIndex(0) --- >>> (function (SubSubModule2) { 1->^^^^^^^^^^^^ @@ -2112,9 +2113,9 @@ sourceFile:typeResolution.ts 1-> 2 > export module 3 > SubSubModule2 -1->Emitted(110, 13) Source(77, 9) + SourceIndex(0) -2 >Emitted(110, 24) Source(77, 23) + SourceIndex(0) -3 >Emitted(110, 37) Source(77, 36) + SourceIndex(0) +1->Emitted(111, 13) Source(77, 9) + SourceIndex(0) +2 >Emitted(111, 24) Source(77, 23) + SourceIndex(0) +3 >Emitted(111, 37) Source(77, 36) + SourceIndex(0) --- >>> // No code here since these are the mirror of the above calls 1->^^^^^^^^^^^^^^^^ @@ -2122,21 +2123,21 @@ sourceFile:typeResolution.ts 1-> { > 2 > // No code here since these are the mirror of the above calls -1->Emitted(111, 17) Source(78, 13) + SourceIndex(0) -2 >Emitted(111, 78) Source(78, 74) + SourceIndex(0) +1->Emitted(112, 17) Source(78, 13) + SourceIndex(0) +2 >Emitted(112, 78) Source(78, 74) + SourceIndex(0) --- >>> var ClassA = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(112, 17) Source(79, 13) + SourceIndex(0) +1 >Emitted(113, 17) Source(79, 13) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(113, 21) Source(79, 13) + SourceIndex(0) +1->Emitted(114, 21) Source(79, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2144,8 +2145,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassA { public AisIn1_2_2() { } 2 > } -1->Emitted(114, 21) Source(79, 59) + SourceIndex(0) -2 >Emitted(114, 22) Source(79, 60) + SourceIndex(0) +1->Emitted(115, 21) Source(79, 59) + SourceIndex(0) +2 >Emitted(115, 22) Source(79, 60) + SourceIndex(0) --- >>> ClassA.prototype.AisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2158,19 +2159,19 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn1_2_2() { 5 > } -1->Emitted(115, 21) Source(79, 42) + SourceIndex(0) -2 >Emitted(115, 48) Source(79, 52) + SourceIndex(0) -3 >Emitted(115, 51) Source(79, 35) + SourceIndex(0) -4 >Emitted(115, 65) Source(79, 57) + SourceIndex(0) -5 >Emitted(115, 66) Source(79, 58) + SourceIndex(0) +1->Emitted(116, 21) Source(79, 42) + SourceIndex(0) +2 >Emitted(116, 48) Source(79, 52) + SourceIndex(0) +3 >Emitted(116, 51) Source(79, 35) + SourceIndex(0) +4 >Emitted(116, 65) Source(79, 57) + SourceIndex(0) +5 >Emitted(116, 66) Source(79, 58) + SourceIndex(0) --- >>> return ClassA; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(116, 21) Source(79, 59) + SourceIndex(0) -2 >Emitted(116, 34) Source(79, 60) + SourceIndex(0) +1 >Emitted(117, 21) Source(79, 59) + SourceIndex(0) +2 >Emitted(117, 34) Source(79, 60) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^^^^^ @@ -2182,10 +2183,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { public AisIn1_2_2() { } } -1 >Emitted(117, 17) Source(79, 59) + SourceIndex(0) -2 >Emitted(117, 18) Source(79, 60) + SourceIndex(0) -3 >Emitted(117, 18) Source(79, 13) + SourceIndex(0) -4 >Emitted(117, 22) Source(79, 60) + SourceIndex(0) +1 >Emitted(118, 17) Source(79, 59) + SourceIndex(0) +2 >Emitted(118, 18) Source(79, 60) + SourceIndex(0) +3 >Emitted(118, 18) Source(79, 13) + SourceIndex(0) +4 >Emitted(118, 22) Source(79, 60) + SourceIndex(0) --- >>> SubSubModule2.ClassA = ClassA; 1->^^^^^^^^^^^^^^^^ @@ -2196,23 +2197,23 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { public AisIn1_2_2() { } } 4 > -1->Emitted(118, 17) Source(79, 26) + SourceIndex(0) -2 >Emitted(118, 37) Source(79, 32) + SourceIndex(0) -3 >Emitted(118, 46) Source(79, 60) + SourceIndex(0) -4 >Emitted(118, 47) Source(79, 60) + SourceIndex(0) +1->Emitted(119, 17) Source(79, 26) + SourceIndex(0) +2 >Emitted(119, 37) Source(79, 32) + SourceIndex(0) +3 >Emitted(119, 46) Source(79, 60) + SourceIndex(0) +4 >Emitted(119, 47) Source(79, 60) + SourceIndex(0) --- >>> var ClassB = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(119, 17) Source(80, 13) + SourceIndex(0) +1 >Emitted(120, 17) Source(80, 13) + SourceIndex(0) --- >>> function ClassB() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(120, 21) Source(80, 13) + SourceIndex(0) +1->Emitted(121, 21) Source(80, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2220,8 +2221,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassB { public BisIn1_2_2() { } 2 > } -1->Emitted(121, 21) Source(80, 59) + SourceIndex(0) -2 >Emitted(121, 22) Source(80, 60) + SourceIndex(0) +1->Emitted(122, 21) Source(80, 59) + SourceIndex(0) +2 >Emitted(122, 22) Source(80, 60) + SourceIndex(0) --- >>> ClassB.prototype.BisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2234,19 +2235,19 @@ sourceFile:typeResolution.ts 3 > 4 > public BisIn1_2_2() { 5 > } -1->Emitted(122, 21) Source(80, 42) + SourceIndex(0) -2 >Emitted(122, 48) Source(80, 52) + SourceIndex(0) -3 >Emitted(122, 51) Source(80, 35) + SourceIndex(0) -4 >Emitted(122, 65) Source(80, 57) + SourceIndex(0) -5 >Emitted(122, 66) Source(80, 58) + SourceIndex(0) +1->Emitted(123, 21) Source(80, 42) + SourceIndex(0) +2 >Emitted(123, 48) Source(80, 52) + SourceIndex(0) +3 >Emitted(123, 51) Source(80, 35) + SourceIndex(0) +4 >Emitted(123, 65) Source(80, 57) + SourceIndex(0) +5 >Emitted(123, 66) Source(80, 58) + SourceIndex(0) --- >>> return ClassB; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(123, 21) Source(80, 59) + SourceIndex(0) -2 >Emitted(123, 34) Source(80, 60) + SourceIndex(0) +1 >Emitted(124, 21) Source(80, 59) + SourceIndex(0) +2 >Emitted(124, 34) Source(80, 60) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^^^^^ @@ -2258,10 +2259,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassB { public BisIn1_2_2() { } } -1 >Emitted(124, 17) Source(80, 59) + SourceIndex(0) -2 >Emitted(124, 18) Source(80, 60) + SourceIndex(0) -3 >Emitted(124, 18) Source(80, 13) + SourceIndex(0) -4 >Emitted(124, 22) Source(80, 60) + SourceIndex(0) +1 >Emitted(125, 17) Source(80, 59) + SourceIndex(0) +2 >Emitted(125, 18) Source(80, 60) + SourceIndex(0) +3 >Emitted(125, 18) Source(80, 13) + SourceIndex(0) +4 >Emitted(125, 22) Source(80, 60) + SourceIndex(0) --- >>> SubSubModule2.ClassB = ClassB; 1->^^^^^^^^^^^^^^^^ @@ -2272,23 +2273,23 @@ sourceFile:typeResolution.ts 2 > ClassB 3 > { public BisIn1_2_2() { } } 4 > -1->Emitted(125, 17) Source(80, 26) + SourceIndex(0) -2 >Emitted(125, 37) Source(80, 32) + SourceIndex(0) -3 >Emitted(125, 46) Source(80, 60) + SourceIndex(0) -4 >Emitted(125, 47) Source(80, 60) + SourceIndex(0) +1->Emitted(126, 17) Source(80, 26) + SourceIndex(0) +2 >Emitted(126, 37) Source(80, 32) + SourceIndex(0) +3 >Emitted(126, 46) Source(80, 60) + SourceIndex(0) +4 >Emitted(126, 47) Source(80, 60) + SourceIndex(0) --- >>> var ClassC = (function () { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(126, 17) Source(81, 13) + SourceIndex(0) +1 >Emitted(127, 17) Source(81, 13) + SourceIndex(0) --- >>> function ClassC() { 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(127, 21) Source(81, 13) + SourceIndex(0) +1->Emitted(128, 21) Source(81, 13) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^^^^^ @@ -2296,8 +2297,8 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->export class ClassC { public CisIn1_2_2() { } 2 > } -1->Emitted(128, 21) Source(81, 59) + SourceIndex(0) -2 >Emitted(128, 22) Source(81, 60) + SourceIndex(0) +1->Emitted(129, 21) Source(81, 59) + SourceIndex(0) +2 >Emitted(129, 22) Source(81, 60) + SourceIndex(0) --- >>> ClassC.prototype.CisIn1_2_2 = function () { }; 1->^^^^^^^^^^^^^^^^^^^^ @@ -2310,19 +2311,19 @@ sourceFile:typeResolution.ts 3 > 4 > public CisIn1_2_2() { 5 > } -1->Emitted(129, 21) Source(81, 42) + SourceIndex(0) -2 >Emitted(129, 48) Source(81, 52) + SourceIndex(0) -3 >Emitted(129, 51) Source(81, 35) + SourceIndex(0) -4 >Emitted(129, 65) Source(81, 57) + SourceIndex(0) -5 >Emitted(129, 66) Source(81, 58) + SourceIndex(0) +1->Emitted(130, 21) Source(81, 42) + SourceIndex(0) +2 >Emitted(130, 48) Source(81, 52) + SourceIndex(0) +3 >Emitted(130, 51) Source(81, 35) + SourceIndex(0) +4 >Emitted(130, 65) Source(81, 57) + SourceIndex(0) +5 >Emitted(130, 66) Source(81, 58) + SourceIndex(0) --- >>> return ClassC; 1 >^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(130, 21) Source(81, 59) + SourceIndex(0) -2 >Emitted(130, 34) Source(81, 60) + SourceIndex(0) +1 >Emitted(131, 21) Source(81, 59) + SourceIndex(0) +2 >Emitted(131, 34) Source(81, 60) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^^^^^ @@ -2334,10 +2335,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassC { public CisIn1_2_2() { } } -1 >Emitted(131, 17) Source(81, 59) + SourceIndex(0) -2 >Emitted(131, 18) Source(81, 60) + SourceIndex(0) -3 >Emitted(131, 18) Source(81, 13) + SourceIndex(0) -4 >Emitted(131, 22) Source(81, 60) + SourceIndex(0) +1 >Emitted(132, 17) Source(81, 59) + SourceIndex(0) +2 >Emitted(132, 18) Source(81, 60) + SourceIndex(0) +3 >Emitted(132, 18) Source(81, 13) + SourceIndex(0) +4 >Emitted(132, 22) Source(81, 60) + SourceIndex(0) --- >>> SubSubModule2.ClassC = ClassC; 1->^^^^^^^^^^^^^^^^ @@ -2349,10 +2350,10 @@ sourceFile:typeResolution.ts 2 > ClassC 3 > { public CisIn1_2_2() { } } 4 > -1->Emitted(132, 17) Source(81, 26) + SourceIndex(0) -2 >Emitted(132, 37) Source(81, 32) + SourceIndex(0) -3 >Emitted(132, 46) Source(81, 60) + SourceIndex(0) -4 >Emitted(132, 47) Source(81, 60) + SourceIndex(0) +1->Emitted(133, 17) Source(81, 26) + SourceIndex(0) +2 >Emitted(133, 37) Source(81, 32) + SourceIndex(0) +3 >Emitted(133, 46) Source(81, 60) + SourceIndex(0) +4 >Emitted(133, 47) Source(81, 60) + SourceIndex(0) --- >>> })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); 1->^^^^^^^^^^^^ @@ -2383,15 +2384,15 @@ sourceFile:typeResolution.ts > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > } -1->Emitted(133, 13) Source(84, 9) + SourceIndex(0) -2 >Emitted(133, 14) Source(84, 10) + SourceIndex(0) -3 >Emitted(133, 16) Source(77, 23) + SourceIndex(0) -4 >Emitted(133, 29) Source(77, 36) + SourceIndex(0) -5 >Emitted(133, 32) Source(77, 23) + SourceIndex(0) -6 >Emitted(133, 56) Source(77, 36) + SourceIndex(0) -7 >Emitted(133, 61) Source(77, 23) + SourceIndex(0) -8 >Emitted(133, 85) Source(77, 36) + SourceIndex(0) -9 >Emitted(133, 93) Source(84, 10) + SourceIndex(0) +1->Emitted(134, 13) Source(84, 9) + SourceIndex(0) +2 >Emitted(134, 14) Source(84, 10) + SourceIndex(0) +3 >Emitted(134, 16) Source(77, 23) + SourceIndex(0) +4 >Emitted(134, 29) Source(77, 36) + SourceIndex(0) +5 >Emitted(134, 32) Source(77, 23) + SourceIndex(0) +6 >Emitted(134, 56) Source(77, 36) + SourceIndex(0) +7 >Emitted(134, 61) Source(77, 23) + SourceIndex(0) +8 >Emitted(134, 85) Source(77, 36) + SourceIndex(0) +9 >Emitted(134, 93) Source(84, 10) + SourceIndex(0) --- >>> })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); 1 >^^^^^^^^ @@ -2426,15 +2427,15 @@ sourceFile:typeResolution.ts > > export interface InterfaceY { YisIn1_2(); } > } -1 >Emitted(134, 9) Source(87, 5) + SourceIndex(0) -2 >Emitted(134, 10) Source(87, 6) + SourceIndex(0) -3 >Emitted(134, 12) Source(76, 19) + SourceIndex(0) -4 >Emitted(134, 22) Source(76, 29) + SourceIndex(0) -5 >Emitted(134, 25) Source(76, 19) + SourceIndex(0) -6 >Emitted(134, 51) Source(76, 29) + SourceIndex(0) -7 >Emitted(134, 56) Source(76, 19) + SourceIndex(0) -8 >Emitted(134, 82) Source(76, 29) + SourceIndex(0) -9 >Emitted(134, 90) Source(87, 6) + SourceIndex(0) +1 >Emitted(135, 9) Source(87, 5) + SourceIndex(0) +2 >Emitted(135, 10) Source(87, 6) + SourceIndex(0) +3 >Emitted(135, 12) Source(76, 19) + SourceIndex(0) +4 >Emitted(135, 22) Source(76, 29) + SourceIndex(0) +5 >Emitted(135, 25) Source(76, 19) + SourceIndex(0) +6 >Emitted(135, 51) Source(76, 29) + SourceIndex(0) +7 >Emitted(135, 56) Source(76, 19) + SourceIndex(0) +8 >Emitted(135, 82) Source(76, 29) + SourceIndex(0) +9 >Emitted(135, 90) Source(87, 6) + SourceIndex(0) --- >>> var ClassA = (function () { 1 >^^^^^^^^ @@ -2442,13 +2443,13 @@ sourceFile:typeResolution.ts 1 > > > -1 >Emitted(135, 9) Source(89, 5) + SourceIndex(0) +1 >Emitted(136, 9) Source(89, 5) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(136, 13) Source(89, 5) + SourceIndex(0) +1->Emitted(137, 13) Source(89, 5) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^ @@ -2458,8 +2459,8 @@ sourceFile:typeResolution.ts > public AisIn1() { } > 2 > } -1->Emitted(137, 13) Source(91, 5) + SourceIndex(0) -2 >Emitted(137, 14) Source(91, 6) + SourceIndex(0) +1->Emitted(138, 13) Source(91, 5) + SourceIndex(0) +2 >Emitted(138, 14) Source(91, 6) + SourceIndex(0) --- >>> ClassA.prototype.AisIn1 = function () { }; 1->^^^^^^^^^^^^ @@ -2472,11 +2473,11 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn1() { 5 > } -1->Emitted(138, 13) Source(90, 16) + SourceIndex(0) -2 >Emitted(138, 36) Source(90, 22) + SourceIndex(0) -3 >Emitted(138, 39) Source(90, 9) + SourceIndex(0) -4 >Emitted(138, 53) Source(90, 27) + SourceIndex(0) -5 >Emitted(138, 54) Source(90, 28) + SourceIndex(0) +1->Emitted(139, 13) Source(90, 16) + SourceIndex(0) +2 >Emitted(139, 36) Source(90, 22) + SourceIndex(0) +3 >Emitted(139, 39) Source(90, 9) + SourceIndex(0) +4 >Emitted(139, 53) Source(90, 27) + SourceIndex(0) +5 >Emitted(139, 54) Source(90, 28) + SourceIndex(0) --- >>> return ClassA; 1 >^^^^^^^^^^^^ @@ -2484,8 +2485,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(139, 13) Source(91, 5) + SourceIndex(0) -2 >Emitted(139, 26) Source(91, 6) + SourceIndex(0) +1 >Emitted(140, 13) Source(91, 5) + SourceIndex(0) +2 >Emitted(140, 26) Source(91, 6) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^ @@ -2499,10 +2500,10 @@ sourceFile:typeResolution.ts 4 > class ClassA { > public AisIn1() { } > } -1 >Emitted(140, 9) Source(91, 5) + SourceIndex(0) -2 >Emitted(140, 10) Source(91, 6) + SourceIndex(0) -3 >Emitted(140, 10) Source(89, 5) + SourceIndex(0) -4 >Emitted(140, 14) Source(91, 6) + SourceIndex(0) +1 >Emitted(141, 9) Source(91, 5) + SourceIndex(0) +2 >Emitted(141, 10) Source(91, 6) + SourceIndex(0) +3 >Emitted(141, 10) Source(89, 5) + SourceIndex(0) +4 >Emitted(141, 14) Source(91, 6) + SourceIndex(0) --- >>> var NotExportedModule; 1->^^^^^^^^ @@ -2522,10 +2523,10 @@ sourceFile:typeResolution.ts 4 > { > export class ClassA { } > } -1->Emitted(141, 9) Source(97, 5) + SourceIndex(0) -2 >Emitted(141, 13) Source(97, 12) + SourceIndex(0) -3 >Emitted(141, 30) Source(97, 29) + SourceIndex(0) -4 >Emitted(141, 31) Source(99, 6) + SourceIndex(0) +1->Emitted(142, 9) Source(97, 5) + SourceIndex(0) +2 >Emitted(142, 13) Source(97, 12) + SourceIndex(0) +3 >Emitted(142, 30) Source(97, 29) + SourceIndex(0) +4 >Emitted(142, 31) Source(99, 6) + SourceIndex(0) --- >>> (function (NotExportedModule) { 1->^^^^^^^^ @@ -2535,22 +2536,22 @@ sourceFile:typeResolution.ts 1-> 2 > module 3 > NotExportedModule -1->Emitted(142, 9) Source(97, 5) + SourceIndex(0) -2 >Emitted(142, 20) Source(97, 12) + SourceIndex(0) -3 >Emitted(142, 37) Source(97, 29) + SourceIndex(0) +1->Emitted(143, 9) Source(97, 5) + SourceIndex(0) +2 >Emitted(143, 20) Source(97, 12) + SourceIndex(0) +3 >Emitted(143, 37) Source(97, 29) + SourceIndex(0) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> { > -1->Emitted(143, 13) Source(98, 9) + SourceIndex(0) +1->Emitted(144, 13) Source(98, 9) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(144, 17) Source(98, 9) + SourceIndex(0) +1->Emitted(145, 17) Source(98, 9) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -2558,16 +2559,16 @@ sourceFile:typeResolution.ts 3 > ^^^^^^^^^^^^^^-> 1->export class ClassA { 2 > } -1->Emitted(145, 17) Source(98, 31) + SourceIndex(0) -2 >Emitted(145, 18) Source(98, 32) + SourceIndex(0) +1->Emitted(146, 17) Source(98, 31) + SourceIndex(0) +2 >Emitted(146, 18) Source(98, 32) + SourceIndex(0) --- >>> return ClassA; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^ 1-> 2 > } -1->Emitted(146, 17) Source(98, 31) + SourceIndex(0) -2 >Emitted(146, 30) Source(98, 32) + SourceIndex(0) +1->Emitted(147, 17) Source(98, 31) + SourceIndex(0) +2 >Emitted(147, 30) Source(98, 32) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^ @@ -2579,10 +2580,10 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > export class ClassA { } -1 >Emitted(147, 13) Source(98, 31) + SourceIndex(0) -2 >Emitted(147, 14) Source(98, 32) + SourceIndex(0) -3 >Emitted(147, 14) Source(98, 9) + SourceIndex(0) -4 >Emitted(147, 18) Source(98, 32) + SourceIndex(0) +1 >Emitted(148, 13) Source(98, 31) + SourceIndex(0) +2 >Emitted(148, 14) Source(98, 32) + SourceIndex(0) +3 >Emitted(148, 14) Source(98, 9) + SourceIndex(0) +4 >Emitted(148, 18) Source(98, 32) + SourceIndex(0) --- >>> NotExportedModule.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2594,10 +2595,10 @@ sourceFile:typeResolution.ts 2 > ClassA 3 > { } 4 > -1->Emitted(148, 13) Source(98, 22) + SourceIndex(0) -2 >Emitted(148, 37) Source(98, 28) + SourceIndex(0) -3 >Emitted(148, 46) Source(98, 32) + SourceIndex(0) -4 >Emitted(148, 47) Source(98, 32) + SourceIndex(0) +1->Emitted(149, 13) Source(98, 22) + SourceIndex(0) +2 >Emitted(149, 37) Source(98, 28) + SourceIndex(0) +3 >Emitted(149, 46) Source(98, 32) + SourceIndex(0) +4 >Emitted(149, 47) Source(98, 32) + SourceIndex(0) --- >>> })(NotExportedModule || (NotExportedModule = {})); 1->^^^^^^^^ @@ -2618,13 +2619,13 @@ sourceFile:typeResolution.ts 7 > { > export class ClassA { } > } -1->Emitted(149, 9) Source(99, 5) + SourceIndex(0) -2 >Emitted(149, 10) Source(99, 6) + SourceIndex(0) -3 >Emitted(149, 12) Source(97, 12) + SourceIndex(0) -4 >Emitted(149, 29) Source(97, 29) + SourceIndex(0) -5 >Emitted(149, 34) Source(97, 12) + SourceIndex(0) -6 >Emitted(149, 51) Source(97, 29) + SourceIndex(0) -7 >Emitted(149, 59) Source(99, 6) + SourceIndex(0) +1->Emitted(150, 9) Source(99, 5) + SourceIndex(0) +2 >Emitted(150, 10) Source(99, 6) + SourceIndex(0) +3 >Emitted(150, 12) Source(97, 12) + SourceIndex(0) +4 >Emitted(150, 29) Source(97, 29) + SourceIndex(0) +5 >Emitted(150, 34) Source(97, 12) + SourceIndex(0) +6 >Emitted(150, 51) Source(97, 29) + SourceIndex(0) +7 >Emitted(150, 59) Source(99, 6) + SourceIndex(0) --- >>> })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {})); 1->^^^^ @@ -2745,15 +2746,15 @@ sourceFile:typeResolution.ts > export class ClassA { } > } > } -1->Emitted(150, 5) Source(100, 1) + SourceIndex(0) -2 >Emitted(150, 6) Source(100, 2) + SourceIndex(0) -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) +1->Emitted(151, 5) Source(100, 1) + SourceIndex(0) +2 >Emitted(151, 6) Source(100, 2) + SourceIndex(0) +3 >Emitted(151, 8) Source(1, 15) + SourceIndex(0) +4 >Emitted(151, 23) Source(1, 30) + SourceIndex(0) +5 >Emitted(151, 26) Source(1, 15) + SourceIndex(0) +6 >Emitted(151, 49) Source(1, 30) + SourceIndex(0) +7 >Emitted(151, 54) Source(1, 15) + SourceIndex(0) +8 >Emitted(151, 77) Source(1, 30) + SourceIndex(0) +9 >Emitted(151, 85) Source(100, 2) + SourceIndex(0) --- >>> var TopLevelModule2; 1 >^^^^ @@ -2773,10 +2774,10 @@ sourceFile:typeResolution.ts > } > } > } -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) +1 >Emitted(152, 5) Source(102, 1) + SourceIndex(0) +2 >Emitted(152, 9) Source(102, 8) + SourceIndex(0) +3 >Emitted(152, 24) Source(102, 23) + SourceIndex(0) +4 >Emitted(152, 25) Source(108, 2) + SourceIndex(0) --- >>> (function (TopLevelModule2) { 1->^^^^ @@ -2785,9 +2786,9 @@ sourceFile:typeResolution.ts 1-> 2 > module 3 > TopLevelModule2 -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) +1->Emitted(153, 5) Source(102, 1) + SourceIndex(0) +2 >Emitted(153, 16) Source(102, 8) + SourceIndex(0) +3 >Emitted(153, 31) Source(102, 23) + SourceIndex(0) --- >>> var SubModule3; 1 >^^^^^^^^ @@ -2804,10 +2805,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1 >Emitted(153, 9) Source(103, 5) + SourceIndex(0) -2 >Emitted(153, 13) Source(103, 19) + SourceIndex(0) -3 >Emitted(153, 23) Source(103, 29) + SourceIndex(0) -4 >Emitted(153, 24) Source(107, 6) + SourceIndex(0) +1 >Emitted(154, 9) Source(103, 5) + SourceIndex(0) +2 >Emitted(154, 13) Source(103, 19) + SourceIndex(0) +3 >Emitted(154, 23) Source(103, 29) + SourceIndex(0) +4 >Emitted(154, 24) Source(107, 6) + SourceIndex(0) --- >>> (function (SubModule3) { 1->^^^^^^^^ @@ -2817,22 +2818,22 @@ sourceFile:typeResolution.ts 1-> 2 > export module 3 > SubModule3 -1->Emitted(154, 9) Source(103, 5) + SourceIndex(0) -2 >Emitted(154, 20) Source(103, 19) + SourceIndex(0) -3 >Emitted(154, 30) Source(103, 29) + SourceIndex(0) +1->Emitted(155, 9) Source(103, 5) + SourceIndex(0) +2 >Emitted(155, 20) Source(103, 19) + SourceIndex(0) +3 >Emitted(155, 30) Source(103, 29) + SourceIndex(0) --- >>> var ClassA = (function () { 1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> { > -1->Emitted(155, 13) Source(104, 9) + SourceIndex(0) +1->Emitted(156, 13) Source(104, 9) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(156, 17) Source(104, 9) + SourceIndex(0) +1->Emitted(157, 17) Source(104, 9) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -2842,8 +2843,8 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > 2 > } -1->Emitted(157, 17) Source(106, 9) + SourceIndex(0) -2 >Emitted(157, 18) Source(106, 10) + SourceIndex(0) +1->Emitted(158, 17) Source(106, 9) + SourceIndex(0) +2 >Emitted(158, 18) Source(106, 10) + SourceIndex(0) --- >>> ClassA.prototype.AisIn2_3 = function () { }; 1->^^^^^^^^^^^^^^^^ @@ -2856,11 +2857,11 @@ sourceFile:typeResolution.ts 3 > 4 > public AisIn2_3() { 5 > } -1->Emitted(158, 17) Source(105, 20) + SourceIndex(0) -2 >Emitted(158, 42) Source(105, 28) + SourceIndex(0) -3 >Emitted(158, 45) Source(105, 13) + SourceIndex(0) -4 >Emitted(158, 59) Source(105, 33) + SourceIndex(0) -5 >Emitted(158, 60) Source(105, 34) + SourceIndex(0) +1->Emitted(159, 17) Source(105, 20) + SourceIndex(0) +2 >Emitted(159, 42) Source(105, 28) + SourceIndex(0) +3 >Emitted(159, 45) Source(105, 13) + SourceIndex(0) +4 >Emitted(159, 59) Source(105, 33) + SourceIndex(0) +5 >Emitted(159, 60) Source(105, 34) + SourceIndex(0) --- >>> return ClassA; 1 >^^^^^^^^^^^^^^^^ @@ -2868,8 +2869,8 @@ sourceFile:typeResolution.ts 1 > > 2 > } -1 >Emitted(159, 17) Source(106, 9) + SourceIndex(0) -2 >Emitted(159, 30) Source(106, 10) + SourceIndex(0) +1 >Emitted(160, 17) Source(106, 9) + SourceIndex(0) +2 >Emitted(160, 30) Source(106, 10) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^ @@ -2883,10 +2884,10 @@ sourceFile:typeResolution.ts 4 > export class ClassA { > public AisIn2_3() { } > } -1 >Emitted(160, 13) Source(106, 9) + SourceIndex(0) -2 >Emitted(160, 14) Source(106, 10) + SourceIndex(0) -3 >Emitted(160, 14) Source(104, 9) + SourceIndex(0) -4 >Emitted(160, 18) Source(106, 10) + SourceIndex(0) +1 >Emitted(161, 13) Source(106, 9) + SourceIndex(0) +2 >Emitted(161, 14) Source(106, 10) + SourceIndex(0) +3 >Emitted(161, 14) Source(104, 9) + SourceIndex(0) +4 >Emitted(161, 18) Source(106, 10) + SourceIndex(0) --- >>> SubModule3.ClassA = ClassA; 1->^^^^^^^^^^^^ @@ -2900,10 +2901,10 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } 4 > -1->Emitted(161, 13) Source(104, 22) + SourceIndex(0) -2 >Emitted(161, 30) Source(104, 28) + SourceIndex(0) -3 >Emitted(161, 39) Source(106, 10) + SourceIndex(0) -4 >Emitted(161, 40) Source(106, 10) + SourceIndex(0) +1->Emitted(162, 13) Source(104, 22) + SourceIndex(0) +2 >Emitted(162, 30) Source(104, 28) + SourceIndex(0) +3 >Emitted(162, 39) Source(106, 10) + SourceIndex(0) +4 >Emitted(162, 40) Source(106, 10) + SourceIndex(0) --- >>> })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); 1->^^^^^^^^ @@ -2929,15 +2930,15 @@ sourceFile:typeResolution.ts > public AisIn2_3() { } > } > } -1->Emitted(162, 9) Source(107, 5) + SourceIndex(0) -2 >Emitted(162, 10) Source(107, 6) + SourceIndex(0) -3 >Emitted(162, 12) Source(103, 19) + SourceIndex(0) -4 >Emitted(162, 22) Source(103, 29) + SourceIndex(0) -5 >Emitted(162, 25) Source(103, 19) + SourceIndex(0) -6 >Emitted(162, 51) Source(103, 29) + SourceIndex(0) -7 >Emitted(162, 56) Source(103, 19) + SourceIndex(0) -8 >Emitted(162, 82) Source(103, 29) + SourceIndex(0) -9 >Emitted(162, 90) Source(107, 6) + SourceIndex(0) +1->Emitted(163, 9) Source(107, 5) + SourceIndex(0) +2 >Emitted(163, 10) Source(107, 6) + SourceIndex(0) +3 >Emitted(163, 12) Source(103, 19) + SourceIndex(0) +4 >Emitted(163, 22) Source(103, 29) + SourceIndex(0) +5 >Emitted(163, 25) Source(103, 19) + SourceIndex(0) +6 >Emitted(163, 51) Source(103, 29) + SourceIndex(0) +7 >Emitted(163, 56) Source(103, 19) + SourceIndex(0) +8 >Emitted(163, 82) Source(103, 29) + SourceIndex(0) +9 >Emitted(163, 90) Source(107, 6) + SourceIndex(0) --- >>> })(TopLevelModule2 || (TopLevelModule2 = {})); 1 >^^^^ @@ -2961,14 +2962,13 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(163, 5) Source(108, 1) + SourceIndex(0) -2 >Emitted(163, 6) Source(108, 2) + SourceIndex(0) -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) +1 >Emitted(164, 5) Source(108, 1) + SourceIndex(0) +2 >Emitted(164, 6) Source(108, 2) + SourceIndex(0) +3 >Emitted(164, 8) Source(102, 8) + SourceIndex(0) +4 >Emitted(164, 23) Source(102, 23) + SourceIndex(0) +5 >Emitted(164, 28) Source(102, 8) + SourceIndex(0) +6 >Emitted(164, 43) Source(102, 23) + SourceIndex(0) +7 >Emitted(164, 51) Source(108, 2) + SourceIndex(0) --- ->>> exports.__esModule = true; >>>}); >>>//# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js index 4e4d3810ed298..2ea407932bb7f 100644 --- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js +++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.js @@ -25,8 +25,8 @@ x + y + z; //// [a.js] "use strict"; +exports.__esModule = true; var xyz_1 = require("xyz"); var pdq_1 = require("pdq"); var abc_1 = require("abc"); xyz_1.x + pdq_1.y + abc_1.z; -exports.__esModule = true; diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js index d6e50572187a5..d21c51faee360 100644 --- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js +++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.js @@ -13,6 +13,6 @@ x; //// [a.js] "use strict"; +exports.__esModule = true; var xyz_1 = require("xyz"); xyz_1.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/typeUsedAsValueError2.js b/tests/baselines/reference/typeUsedAsValueError2.js index fc247b6443caa..2c068d4f4d27e 100644 --- a/tests/baselines/reference/typeUsedAsValueError2.js +++ b/tests/baselines/reference/typeUsedAsValueError2.js @@ -34,7 +34,7 @@ define(["require", "exports"], function (require, exports) { //// [world.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; HelloInterface.world; HelloNamespace.world; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js index a7528ade883e5..ba4451243cafe 100644 --- a/tests/baselines/reference/typeofANonExportedType.js +++ b/tests/baselines/reference/typeofANonExportedType.js @@ -53,6 +53,7 @@ export var r13: typeof foo; //// [typeofANonExportedType.js] "use strict"; +exports.__esModule = true; var x = 1; var y = { foo: '' }; var C = (function () { @@ -86,4 +87,3 @@ function foo() { } }()); foo.C = C; })(foo || (foo = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js index 7a11fae8f8ff4..2500193ebde82 100644 --- a/tests/baselines/reference/typeofAmbientExternalModules.js +++ b/tests/baselines/reference/typeofAmbientExternalModules.js @@ -20,13 +20,13 @@ y2 = ext; //// [typeofAmbientExternalModules_0.js] "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; -exports.__esModule = true; //// [typeofAmbientExternalModules_1.js] "use strict"; var D = (function () { @@ -37,6 +37,7 @@ var D = (function () { module.exports = D; //// [typeofAmbientExternalModules_2.js] "use strict"; +exports.__esModule = true; /// /// var ext = require("./typeofAmbientExternalModules_0"); @@ -45,4 +46,3 @@ var y1 = ext; y1 = exp; var y2 = exp; y2 = ext; -exports.__esModule = true; diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js index ab40a7c91a026..e166f6b745b19 100644 --- a/tests/baselines/reference/typeofAnExportedType.js +++ b/tests/baselines/reference/typeofAnExportedType.js @@ -53,6 +53,7 @@ export var r13: typeof foo; //// [typeofAnExportedType.js] "use strict"; +exports.__esModule = true; exports.x = 1; exports.y = { foo: '' }; var C = (function () { @@ -89,4 +90,3 @@ exports.foo = foo; }()); foo.C = C; })(foo = exports.foo || (exports.foo = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js index f28ff7e1033a2..97c6b6d7278a1 100644 --- a/tests/baselines/reference/typeofExternalModules.js +++ b/tests/baselines/reference/typeofExternalModules.js @@ -18,13 +18,13 @@ y2 = ext; //// [typeofExternalModules_external.js] "use strict"; +exports.__esModule = true; var C = (function () { function C() { } return C; }()); exports.C = C; -exports.__esModule = true; //// [typeofExternalModules_exportAssign.js] "use strict"; var D = (function () { @@ -35,10 +35,10 @@ var D = (function () { module.exports = D; //// [typeofExternalModules_core.js] "use strict"; +exports.__esModule = true; var ext = require("./typeofExternalModules_external"); var exp = require("./typeofExternalModules_exportAssign"); var y1 = ext; y1 = exp; var y2 = exp; y2 = ext; -exports.__esModule = true; diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js index c321e548181f3..4a93b9293a5c5 100644 --- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js +++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.js @@ -25,8 +25,8 @@ var y: {M2: Object} = foo0; exports.__esModule = true; //// [foo_1.js] "use strict"; +exports.__esModule = true; var foo0 = require("./foo_0"); // Per 11.2.3, foo_0 should still be "instantiated", albeit with no members var x = {}; var y = foo0; -exports.__esModule = true; diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js index c935d8b67282b..14fa083d53404 100644 --- a/tests/baselines/reference/typingsLookup4.js +++ b/tests/baselines/reference/typingsLookup4.js @@ -27,12 +27,12 @@ j + k + l; //// [lquery.js] "use strict"; -exports.l = 2; exports.__esModule = true; +exports.l = 2; //// [a.js] "use strict"; +exports.__esModule = true; var jquery_1 = require("jquery"); var kquery_1 = require("kquery"); var lquery_1 = require("lquery"); jquery_1.j + kquery_1.k + lquery_1.l; -exports.__esModule = true; diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js index 5665f5b202464..b04de61f1924c 100644 --- a/tests/baselines/reference/umd-augmentation-1.js +++ b/tests/baselines/reference/umd-augmentation-1.js @@ -41,6 +41,7 @@ var t = p.x; //// [b.js] "use strict"; +exports.__esModule = true; /// var m = require("math2d"); var v = new m.Vector(3, 2); @@ -48,4 +49,3 @@ var magnitude = m.getLength(v); var p = v.translate(5, 5); p = v.reverse(); var t = p.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js index 4cdd28a9552af..9c4c4b09ec699 100644 --- a/tests/baselines/reference/umd-augmentation-3.js +++ b/tests/baselines/reference/umd-augmentation-3.js @@ -47,6 +47,7 @@ var t = p.x; //// [b.js] "use strict"; +exports.__esModule = true; /// var m = require("math2d"); var v = new m.Vector(3, 2); @@ -54,4 +55,3 @@ var magnitude = m.getLength(v); var p = v.translate(5, 5); p = v.reverse(); var t = p.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js index 563b73ec5084f..a3208c0741af6 100644 --- a/tests/baselines/reference/umd3.js +++ b/tests/baselines/reference/umd3.js @@ -16,8 +16,8 @@ let y: number = x.n; //// [a.js] "use strict"; +exports.__esModule = true; var Foo = require("./foo"); Foo.fn(); var x; var y = x.n; -exports.__esModule = true; diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js index dcd720b866ab4..ca96540d305ce 100644 --- a/tests/baselines/reference/umd4.js +++ b/tests/baselines/reference/umd4.js @@ -16,8 +16,8 @@ let y: number = x.n; //// [a.js] "use strict"; +exports.__esModule = true; var Bar = require("./foo"); Bar.fn(); var x; var y = x.n; -exports.__esModule = true; diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js index cd99ace83b317..aa7ccc485c04e 100644 --- a/tests/baselines/reference/umd5.js +++ b/tests/baselines/reference/umd5.js @@ -18,10 +18,10 @@ let z = Foo; //// [a.js] "use strict"; +exports.__esModule = true; var Bar = require("./foo"); Bar.fn(); var x; var y = x.n; // should error var z = Foo; -exports.__esModule = true; diff --git a/tests/baselines/reference/umd8.js b/tests/baselines/reference/umd8.js index 0b9109873be13..c3e6617396ba2 100644 --- a/tests/baselines/reference/umd8.js +++ b/tests/baselines/reference/umd8.js @@ -23,8 +23,8 @@ let x: any = Foo; // Not OK in value position //// [a.js] "use strict"; +exports.__esModule = true; var y; // OK in type position y.foo(); var z; // OK in ns position var x = Foo; // Not OK in value position -exports.__esModule = true; diff --git a/tests/baselines/reference/umdDependencyComment2.js b/tests/baselines/reference/umdDependencyComment2.js index 1039bbac5006e..021ba5254b001 100644 --- a/tests/baselines/reference/umdDependencyComment2.js +++ b/tests/baselines/reference/umdDependencyComment2.js @@ -17,7 +17,7 @@ m1.f(); } })(function (require, exports) { "use strict"; + exports.__esModule = true; var m1 = require("m2"); m1.f(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/umdDependencyCommentName1.js b/tests/baselines/reference/umdDependencyCommentName1.js index 2f7326d8f8129..eba6f0cc16b74 100644 --- a/tests/baselines/reference/umdDependencyCommentName1.js +++ b/tests/baselines/reference/umdDependencyCommentName1.js @@ -17,7 +17,7 @@ m1.f(); } })(function (require, exports, b) { "use strict"; + exports.__esModule = true; var m1 = require("m2"); m1.f(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/umdDependencyCommentName2.js b/tests/baselines/reference/umdDependencyCommentName2.js index 9814a1d5e384b..2ca52848d1557 100644 --- a/tests/baselines/reference/umdDependencyCommentName2.js +++ b/tests/baselines/reference/umdDependencyCommentName2.js @@ -21,7 +21,7 @@ m1.f(); } })(function (require, exports, b, c) { "use strict"; + exports.__esModule = true; var m1 = require("m2"); m1.f(); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js index d83ed700a296e..f6b2c7e10626f 100644 --- a/tests/baselines/reference/unclosedExportClause01.js +++ b/tests/baselines/reference/unclosedExportClause01.js @@ -18,28 +18,28 @@ export { x as a, from "./t1" //// [t1.js] "use strict"; -exports.x = "x"; exports.__esModule = true; +exports.x = "x"; //// [t2.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.x = t1_1.x; exports.from = t1_1.from; -exports.__esModule = true; //// [t3.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.from = t1_1.from; -exports.__esModule = true; //// [t4.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.a = t1_1.x; exports.from = t1_1.from; -exports.__esModule = true; //// [t5.js] "use strict"; +exports.__esModule = true; var t1_1 = require("./t1"); exports.a = t1_1.x; exports.from = t1_1.from; -exports.__esModule = true; diff --git a/tests/baselines/reference/unclosedExportClause02.js b/tests/baselines/reference/unclosedExportClause02.js index 1ff1f585768fe..73a83a39b6283 100644 --- a/tests/baselines/reference/unclosedExportClause02.js +++ b/tests/baselines/reference/unclosedExportClause02.js @@ -22,21 +22,21 @@ export { x as a, from //// [t1.js] "use strict"; -exports.x = "x"; exports.__esModule = true; +exports.x = "x"; //// [t2.js] "use strict"; -"./t1"; exports.__esModule = true; +"./t1"; //// [t3.js] "use strict"; -"./t1"; exports.__esModule = true; +"./t1"; //// [t4.js] "use strict"; -"./t1"; exports.__esModule = true; +"./t1"; //// [t5.js] "use strict"; -"./t1"; exports.__esModule = true; +"./t1"; diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js index b8bec8ceb131a..927df99766eb4 100644 --- a/tests/baselines/reference/undeclaredModuleError.js +++ b/tests/baselines/reference/undeclaredModuleError.js @@ -18,6 +18,7 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat //// [undeclaredModuleError.js] define(["require", "exports", "fs"], function (require, exports, fs) { "use strict"; + exports.__esModule = true; function readdir(path, accept, callback) { } function join() { var paths = []; @@ -35,5 +36,4 @@ define(["require", "exports", "fs"], function (require, exports, fs) { }); }); } - exports.__esModule = true; }); diff --git a/tests/baselines/reference/untypedModuleImport.js b/tests/baselines/reference/untypedModuleImport.js index 7f088859221a0..90fb9ab5f4386 100644 --- a/tests/baselines/reference/untypedModuleImport.js +++ b/tests/baselines/reference/untypedModuleImport.js @@ -23,18 +23,18 @@ foo(bar()); //// [a.js] "use strict"; +exports.__esModule = true; var foo = require("foo"); foo.bar(); -exports.__esModule = true; //// [b.js] "use strict"; +exports.__esModule = true; var foo = require("foo"); foo(); -exports.__esModule = true; //// [c.js] "use strict"; +exports.__esModule = true; var foo_1 = require("foo"); require("./a"); require("./b"); foo_1["default"](foo_1.bar()); -exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_allowJs.js b/tests/baselines/reference/untypedModuleImport_allowJs.js index 3948c748286f7..5d60df6687c4b 100644 --- a/tests/baselines/reference/untypedModuleImport_allowJs.js +++ b/tests/baselines/reference/untypedModuleImport_allowJs.js @@ -12,6 +12,6 @@ foo.bar(); //// [a.js] "use strict"; +exports.__esModule = true; var foo_1 = require("foo"); foo_1["default"].bar(); -exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.js b/tests/baselines/reference/untypedModuleImport_vsAmbient.js index 6968f603061fd..4273033fe2264 100644 --- a/tests/baselines/reference/untypedModuleImport_vsAmbient.js +++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.js @@ -18,7 +18,7 @@ x; //// [a.js] "use strict"; +exports.__esModule = true; /// var foo_1 = require("foo"); foo_1.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.js b/tests/baselines/reference/untypedModuleImport_withAugmentation.js index e8fc892f4a0c0..9d1770f5497b7 100644 --- a/tests/baselines/reference/untypedModuleImport_withAugmentation.js +++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.js @@ -15,6 +15,6 @@ x; //// [a.js] "use strict"; +exports.__esModule = true; var foo_1 = require("foo"); foo_1.x; -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js index 9cffa5547fef7..37f88dc65c32a 100644 --- a/tests/baselines/reference/unusedImportDeclaration.js +++ b/tests/baselines/reference/unusedImportDeclaration.js @@ -25,11 +25,11 @@ var TesterB = (function () { module.exports = TesterB; //// [unusedImportDeclaration_testerA.js] "use strict"; +exports.__esModule = true; var thingy = { me: "A" }; foo("IN " + thingy.me + "!"); -exports.__esModule = true; //// [unusedImportDeclaration_testerB.d.ts] diff --git a/tests/baselines/reference/unusedImports1.js b/tests/baselines/reference/unusedImports1.js index 910070b89550a..4bfc7b31a4dcb 100644 --- a/tests/baselines/reference/unusedImports1.js +++ b/tests/baselines/reference/unusedImports1.js @@ -11,13 +11,13 @@ import {Calculator} from "./file1" //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } return Calculator; }()); exports.Calculator = Calculator; -exports.__esModule = true; //// [file2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js index be28b2f8d4018..3f65619c2ae6d 100644 --- a/tests/baselines/reference/unusedImports11.js +++ b/tests/baselines/reference/unusedImports11.js @@ -20,6 +20,7 @@ new r.Member(); //// [b.js] "use strict"; +exports.__esModule = true; var Member = (function () { function Member() { } @@ -27,9 +28,9 @@ var Member = (function () { }()); exports.Member = Member; exports["default"] = Member; -exports.__esModule = true; //// [a.js] "use strict"; +exports.__esModule = true; var b_1 = require("./b"); var b_2 = require("./b"); var ns = require("./b"); @@ -39,4 +40,3 @@ new b_2["default"](); new b_2.Member(); new ns.Member(); new r.Member(); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports12.js b/tests/baselines/reference/unusedImports12.js index 90e6446d48e8e..bd4dbacbf2635 100644 --- a/tests/baselines/reference/unusedImports12.js +++ b/tests/baselines/reference/unusedImports12.js @@ -15,6 +15,7 @@ import r = require("./b"); //// [b.js] "use strict"; +exports.__esModule = true; var Member = (function () { function Member() { } @@ -22,7 +23,6 @@ var Member = (function () { }()); exports.Member = Member; exports["default"] = Member; -exports.__esModule = true; //// [a.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports13.js b/tests/baselines/reference/unusedImports13.js index 2db07a7f9cbcb..6c5977eaea8aa 100644 --- a/tests/baselines/reference/unusedImports13.js +++ b/tests/baselines/reference/unusedImports13.js @@ -23,6 +23,6 @@ declare global { //// [foo.jsx] "use strict"; +exports.__esModule = true; var React = require("react"); exports.FooComponent =
; -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports14.js b/tests/baselines/reference/unusedImports14.js index e85a5d330457d..19a10f2a3a0ff 100644 --- a/tests/baselines/reference/unusedImports14.js +++ b/tests/baselines/reference/unusedImports14.js @@ -23,6 +23,6 @@ declare global { //// [foo.js] "use strict"; +exports.__esModule = true; var React = require("react"); exports.FooComponent = React.createElement("div", null); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports15.js b/tests/baselines/reference/unusedImports15.js index faacbaf71c9c9..78bd0aa6c7413 100644 --- a/tests/baselines/reference/unusedImports15.js +++ b/tests/baselines/reference/unusedImports15.js @@ -23,6 +23,6 @@ declare global { //// [foo.jsx] "use strict"; +exports.__esModule = true; var Element = require("react"); exports.FooComponent =
; -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports16.js b/tests/baselines/reference/unusedImports16.js index 884770ab22270..ffaafc45d4faa 100644 --- a/tests/baselines/reference/unusedImports16.js +++ b/tests/baselines/reference/unusedImports16.js @@ -23,6 +23,6 @@ declare global { //// [foo.js] "use strict"; +exports.__esModule = true; var Element = require("react"); exports.FooComponent = Element.createElement("div", null); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports2.js b/tests/baselines/reference/unusedImports2.js index d498a242a57c9..ccb57a8f3780e 100644 --- a/tests/baselines/reference/unusedImports2.js +++ b/tests/baselines/reference/unusedImports2.js @@ -19,6 +19,7 @@ x.handleChar(); //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -29,10 +30,9 @@ exports.Calculator = Calculator; function test() { } exports.test = test; -exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports3.js b/tests/baselines/reference/unusedImports3.js index a3ab3117b673e..e968ac64062f9 100644 --- a/tests/baselines/reference/unusedImports3.js +++ b/tests/baselines/reference/unusedImports3.js @@ -22,6 +22,7 @@ test2(); //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -35,10 +36,9 @@ exports.test = test; function test2() { } exports.test2 = test2; -exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; var file1_1 = require("./file1"); file1_1.test(); file1_1.test2(); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports4.js b/tests/baselines/reference/unusedImports4.js index 53e48513bc930..2a7f456fe9967 100644 --- a/tests/baselines/reference/unusedImports4.js +++ b/tests/baselines/reference/unusedImports4.js @@ -23,6 +23,7 @@ test2(); //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -36,11 +37,10 @@ exports.test = test; function test2() { } exports.test2 = test2; -exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); file1_1.test2(); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports5.js b/tests/baselines/reference/unusedImports5.js index 5856638cd0992..1d187f008b870 100644 --- a/tests/baselines/reference/unusedImports5.js +++ b/tests/baselines/reference/unusedImports5.js @@ -23,6 +23,7 @@ test(); //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -36,11 +37,10 @@ exports.test = test; function test2() { } exports.test2 = test2; -exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); file1_1.test(); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports6.js b/tests/baselines/reference/unusedImports6.js index 861862fe7a6bf..62386a5fa6cff 100644 --- a/tests/baselines/reference/unusedImports6.js +++ b/tests/baselines/reference/unusedImports6.js @@ -23,6 +23,7 @@ import d from "./file1" //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -36,7 +37,6 @@ exports.test = test; function test2() { } exports["default"] = test2; -exports.__esModule = true; //// [file2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports7.js b/tests/baselines/reference/unusedImports7.js index 519511fb9e190..2c2c87e56bfd5 100644 --- a/tests/baselines/reference/unusedImports7.js +++ b/tests/baselines/reference/unusedImports7.js @@ -21,6 +21,7 @@ import * as n from "./file1" //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -34,7 +35,6 @@ exports.test = test; function test2() { } exports["default"] = test2; -exports.__esModule = true; //// [file2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports8.js b/tests/baselines/reference/unusedImports8.js index aa2aa248ff71f..a095acd546603 100644 --- a/tests/baselines/reference/unusedImports8.js +++ b/tests/baselines/reference/unusedImports8.js @@ -23,6 +23,7 @@ t1(); //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -36,11 +37,10 @@ exports.test = test; function test2() { } exports.test2 = test2; -exports.__esModule = true; //// [file2.js] "use strict"; +exports.__esModule = true; var file1_1 = require("./file1"); var x = new file1_1.Calculator(); x.handleChar(); file1_1.test(); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedImports9.js b/tests/baselines/reference/unusedImports9.js index f6fdc1b9e6ff8..89108d10e17e2 100644 --- a/tests/baselines/reference/unusedImports9.js +++ b/tests/baselines/reference/unusedImports9.js @@ -19,6 +19,7 @@ import c = require('./file1') //// [file1.js] "use strict"; +exports.__esModule = true; var Calculator = (function () { function Calculator() { } @@ -32,7 +33,6 @@ exports.test = test; function test2() { } exports.test2 = test2; -exports.__esModule = true; //// [file2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js index a7121ec9d2494..3fb4ef5347b30 100644 --- a/tests/baselines/reference/unusedLocalsAndObjectSpread2.js +++ b/tests/baselines/reference/unusedLocalsAndObjectSpread2.js @@ -28,6 +28,7 @@ var __rest = (this && this.__rest) || function (s, e) { t[p[i]] = s[p[i]]; return t; }; +exports.__esModule = true; var children = props.children, // here! _a = props.active, // here! rest = __rest(props, ["children", "active"]); @@ -35,4 +36,3 @@ function foo() { var children = props.children, _a = props.active, rest = __rest(props, ["children", "active"]); } exports.asdf = 123; -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParameters.js b/tests/baselines/reference/unusedLocalsAndParameters.js index e538c9754b46e..dc575daad330c 100644 --- a/tests/baselines/reference/unusedLocalsAndParameters.js +++ b/tests/baselines/reference/unusedLocalsAndParameters.js @@ -86,6 +86,7 @@ namespace N { //// [unusedLocalsAndParameters.js] "use strict"; +exports.__esModule = true; // function declaration paramter function f(a) { } @@ -166,4 +167,3 @@ var N; (function (N) { var x; })(N || (N = {})); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js index b3088ac69c742..5d3e13e328b4e 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js +++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js @@ -162,6 +162,7 @@ N; //// [unusedLocalsAndParametersDeferred.js] "use strict"; +exports.__esModule = true; function defered(a) { return a(); } @@ -323,4 +324,3 @@ var N; }); })(N || (N = {})); N; -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js index 410620751feab..475b1ddb76993 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js +++ b/tests/baselines/reference/unusedLocalsAndParametersOverloadSignatures.js @@ -25,6 +25,7 @@ export function genericFunc(details: number, message: any): any { //// [unusedLocalsAndParametersOverloadSignatures.js] "use strict"; +exports.__esModule = true; function func(details, message) { return details + message; } @@ -43,4 +44,3 @@ function genericFunc(details, message) { return details + message; } exports.genericFunc = genericFunc; -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js index 20706997d5b65..0ff6ac828d03d 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js +++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases.js @@ -29,8 +29,8 @@ y[0](); //// [unusedLocalsAndParametersTypeAliases.js] "use strict"; +exports.__esModule = true; var x; x(); var y; y[0](); -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js index 7ab951c984d04..97c7129b4a92a 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js +++ b/tests/baselines/reference/unusedLocalsAndParametersTypeAliases2.js @@ -13,7 +13,7 @@ export {} //// [unusedLocalsAndParametersTypeAliases2.js] "use strict"; +exports.__esModule = true; function foo() { foo(); } -exports.__esModule = true; diff --git a/tests/baselines/reference/unusedVariablesinModules1.js b/tests/baselines/reference/unusedVariablesinModules1.js index 1320bb574484c..edfb384697a3d 100644 --- a/tests/baselines/reference/unusedVariablesinModules1.js +++ b/tests/baselines/reference/unusedVariablesinModules1.js @@ -8,5 +8,5 @@ export var y: string; //// [unusedVariablesinModules1.js] "use strict"; -var x; exports.__esModule = true; +var x; diff --git a/tests/baselines/reference/useStrictLikePrologueString01.js b/tests/baselines/reference/useStrictLikePrologueString01.js index bf5e88ba46cfa..6a1836f433238 100644 --- a/tests/baselines/reference/useStrictLikePrologueString01.js +++ b/tests/baselines/reference/useStrictLikePrologueString01.js @@ -9,7 +9,7 @@ export function f() { "hey!"; " use strict "; "use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); function f() { } exports.f = f; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js index fbadbc6ad31dc..9c790e7a48bbf 100644 --- a/tests/baselines/reference/varArgsOnConstructorTypes.js +++ b/tests/baselines/reference/varArgsOnConstructorTypes.js @@ -37,6 +37,7 @@ var __extends = (this && this.__extends) || (function () { })(); define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A(ctor) { } @@ -56,5 +57,4 @@ define(["require", "exports"], function (require, exports) { exports.B = B; var reg; reg.register(B); - exports.__esModule = true; }); diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js index dcc6a1364c2b5..a6d1b095894cc 100644 --- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js +++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js @@ -34,7 +34,7 @@ exports.__esModule = true; exports.__esModule = true; //// [visibilityOfCrossModuleTypeUsage_fs.js] "use strict"; +exports.__esModule = true; function run(configuration) { var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server); } -exports.__esModule = true; diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js index 922324c9c6046..9d8a3e73dbef2 100644 --- a/tests/baselines/reference/visibilityOfTypeParameters.js +++ b/tests/baselines/reference/visibilityOfTypeParameters.js @@ -8,6 +8,7 @@ export class MyClass { //// [visibilityOfTypeParameters.js] "use strict"; +exports.__esModule = true; var MyClass = (function () { function MyClass() { } @@ -17,7 +18,6 @@ var MyClass = (function () { return MyClass; }()); exports.MyClass = MyClass; -exports.__esModule = true; //// [visibilityOfTypeParameters.d.ts] diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js index 204482e75484d..4883f840ddbae 100644 --- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js +++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js @@ -15,14 +15,14 @@ function main() { //// [voidAsNonAmbiguousReturnType_0.js] "use strict"; +exports.__esModule = true; function mkdirSync(path, mode) { } exports.mkdirSync = mkdirSync; -exports.__esModule = true; //// [voidAsNonAmbiguousReturnType_1.js] "use strict"; +exports.__esModule = true; /// var fs = require("./voidAsNonAmbiguousReturnType_0"); function main() { fs.mkdirSync('test'); // should not error - return types are the same } -exports.__esModule = true; diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index 49cac46d21296..97d528ecd62f6 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -61,6 +61,7 @@ export var eVar3 = 10, eVar4, eVar5; //// [withExportDecl.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var simpleVar; var anotherVar; var varWithSimpleType; @@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) { exports.eVar2 = 10; var eVar22; exports.eVar3 = 10; - exports.__esModule = true; }); diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index feb48648252b4..f0a1a2d2f148d 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -46,17 +46,18 @@ b.foo; //// [withImportDecl_0.js] define(["require", "exports"], function (require, exports) { "use strict"; + exports.__esModule = true; var A = (function () { function A() { } return A; }()); exports.A = A; - exports.__esModule = true; }); //// [withImportDecl_1.js] define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) { "use strict"; + exports.__esModule = true; /// var simpleVar; var anotherVar; @@ -81,7 +82,6 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m })(m1 || (m1 = {})); var b = new m3.A(); b.foo; - exports.__esModule = true; }); From 1243e11a7bc63828c9791cdd7cdceb234cd6e53a Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 10 Feb 2017 13:26:21 -0800 Subject: [PATCH 092/116] Update unittests --- src/harness/unittests/compileOnSave.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts index 706fc45b6daf3..b2c46c5a18ce6 100644 --- a/src/harness/unittests/compileOnSave.ts +++ b/src/harness/unittests/compileOnSave.ts @@ -520,7 +520,7 @@ namespace ts.projectSystem { const expectedEmittedFileName = "/a/b/f1.js"; assert.isTrue(host.fileExists(expectedEmittedFileName)); - assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\nexports.__esModule = true;\r\n`); + assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nexports.__esModule = true;\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`); }); it("shoud not emit js files in external projects", () => { From ecfa0de449789b90436630a1e72ca2f904418f51 Mon Sep 17 00:00:00 2001 From: Matt McCutchen Date: Fri, 10 Feb 2017 16:28:00 -0500 Subject: [PATCH 093/116] lib: Fix documentation of String.replace first parameter. The documentation incorrectly suggested that if the first parameter is a string, it is interpreted as a regular expression. --- src/lib/es5.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts index 038d0344fda72..0894ddf11aabf 100644 --- a/src/lib/es5.d.ts +++ b/src/lib/es5.d.ts @@ -341,14 +341,14 @@ interface String { /** * Replaces text in a string, using a regular expression or search string. - * @param searchValue A string that represents the regular expression. + * @param searchValue A string to search for. * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string. */ replace(searchValue: string, replaceValue: string): string; /** * Replaces text in a string, using a regular expression or search string. - * @param searchValue A string that represents the regular expression. + * @param searchValue A string to search for. * @param replacer A function that returns the replacement text. */ replace(searchValue: string, replacer: (substring: string, ...args: any[]) => string): string; From 1c7628e6534cda58de2f29eaf5a51ef9aac33ce2 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Fri, 10 Feb 2017 14:01:47 -0800 Subject: [PATCH 094/116] Improve discriminated union error messages Assignability errors for discriminated unions now check the value of the discriminant to decide which member of the union to check for assignability. Previously, assignability didn't know about discriminated unions and would check every member, issuing errors for the last member of the union if assignability failed. For example: ```ts type Square = { kind: "sq", size: number } type Rectangle = { kind: "rt", x: number, y: number } type Circle = { kind: "cr", radius: number } type Shape = | Square | Rectangle | Circle; let shape: Shape = { kind: "sq", x: 12, y: 13, } ``` `typeRelatedToSomeType` now checks whether each property in the source type is a discriminant. It finds `kind` and proceeds to look for the type in the target union that has `kind: "sq"`. If it finds it, which it does in this example (`Square`), then it checks only assignbility to `Square`. The result is that the error now says that property 'size' is missing in type `{ kind: "sq", x: number, y: number }` instead of saying that that "sq" is not assignable to type "cr" like it did before. Fixes #10867 --- src/compiler/checker.ts | 22 ++++++++++++++++++ .../discriminatedUnionErrorMessage.errors.txt | 23 +++++++++++++++++++ .../discriminatedUnionErrorMessage.js | 21 +++++++++++++++++ .../discriminatedUnionErrorMessage.ts | 12 ++++++++++ 4 files changed, 78 insertions(+) create mode 100644 tests/baselines/reference/discriminatedUnionErrorMessage.errors.txt create mode 100644 tests/baselines/reference/discriminatedUnionErrorMessage.js create mode 100644 tests/cases/compiler/discriminatedUnionErrorMessage.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ac1135788cd1c..3735a01849b60 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7771,6 +7771,11 @@ namespace ts { if (target.flags & TypeFlags.Union && containsType(targetTypes, source)) { return Ternary.True; } + const discriminantType = findMatchingDiscriminantType(source, target); + if (discriminantType) { + return isRelatedTo(source, discriminantType, reportErrors); + } + const len = targetTypes.length; for (let i = 0; i < len; i++) { const related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1); @@ -7781,6 +7786,23 @@ namespace ts { return Ternary.False; } + function findMatchingDiscriminantType(source: Type, target: UnionOrIntersectionType) { + const sourceProperties = getPropertiesOfObjectType(source); + if (sourceProperties) { + for (const sourceProperty of sourceProperties) { + if (isDiscriminantProperty(target, sourceProperty.name)) { + const sourceType = getTypeOfSymbol(sourceProperty); + for (const type of target.types) { + const targetType = getTypeOfPropertyOfType(type, sourceProperty.name); + if (targetType && isRelatedTo(sourceType, targetType)) { + return type; + } + } + } + } + } + } + function typeRelatedToEachType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary { let result = Ternary.True; const targetTypes = target.types; diff --git a/tests/baselines/reference/discriminatedUnionErrorMessage.errors.txt b/tests/baselines/reference/discriminatedUnionErrorMessage.errors.txt new file mode 100644 index 0000000000000..6f1eb511d3714 --- /dev/null +++ b/tests/baselines/reference/discriminatedUnionErrorMessage.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/discriminatedUnionErrorMessage.ts(8,5): error TS2322: Type '{ kind: "sq"; x: number; y: number; }' is not assignable to type 'Shape'. + Type '{ kind: "sq"; x: number; y: number; }' is not assignable to type 'Square'. + Property 'size' is missing in type '{ kind: "sq"; x: number; y: number; }'. + + +==== tests/cases/compiler/discriminatedUnionErrorMessage.ts (1 errors) ==== + type Square = { kind: "sq", size: number } + type Rectangle = { kind: "rt", x: number, y: number } + type Circle = { kind: "cr", radius: number } + type Shape = + | Square + | Rectangle + | Circle; + let shape: Shape = { + ~~~~~ +!!! error TS2322: Type '{ kind: "sq"; x: number; y: number; }' is not assignable to type 'Shape'. +!!! error TS2322: Type '{ kind: "sq"; x: number; y: number; }' is not assignable to type 'Square'. +!!! error TS2322: Property 'size' is missing in type '{ kind: "sq"; x: number; y: number; }'. + kind: "sq", + x: 12, + y: 13, + } + \ No newline at end of file diff --git a/tests/baselines/reference/discriminatedUnionErrorMessage.js b/tests/baselines/reference/discriminatedUnionErrorMessage.js new file mode 100644 index 0000000000000..10c94b19a4460 --- /dev/null +++ b/tests/baselines/reference/discriminatedUnionErrorMessage.js @@ -0,0 +1,21 @@ +//// [discriminatedUnionErrorMessage.ts] +type Square = { kind: "sq", size: number } +type Rectangle = { kind: "rt", x: number, y: number } +type Circle = { kind: "cr", radius: number } +type Shape = + | Square + | Rectangle + | Circle; +let shape: Shape = { + kind: "sq", + x: 12, + y: 13, +} + + +//// [discriminatedUnionErrorMessage.js] +var shape = { + kind: "sq", + x: 12, + y: 13 +}; diff --git a/tests/cases/compiler/discriminatedUnionErrorMessage.ts b/tests/cases/compiler/discriminatedUnionErrorMessage.ts new file mode 100644 index 0000000000000..eb2b08e9436ec --- /dev/null +++ b/tests/cases/compiler/discriminatedUnionErrorMessage.ts @@ -0,0 +1,12 @@ +type Square = { kind: "sq", size: number } +type Rectangle = { kind: "rt", x: number, y: number } +type Circle = { kind: "cr", radius: number } +type Shape = + | Square + | Rectangle + | Circle; +let shape: Shape = { + kind: "sq", + x: 12, + y: 13, +} From 778fed96fda5df614751ebebd39174c2f57d3f12 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Mon, 13 Feb 2017 06:47:41 -0800 Subject: [PATCH 095/116] When performing find-all-refs for a keyword, use the first result as the definition. --- src/services/findAllReferences.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index cd1477c444898..6431451b9616c 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -406,20 +406,23 @@ namespace ts.FindAllReferences { function getAllReferencesForKeyword(sourceFiles: SourceFile[], keywordKind: ts.SyntaxKind, cancellationToken: CancellationToken): ReferencedSymbol[] { const name = tokenToString(keywordKind); + const references: ReferenceEntry[] = []; + for (const sourceFile of sourceFiles) { + cancellationToken.throwIfCancellationRequested(); + addReferencesForKeywordInFile(sourceFile, keywordKind, name, cancellationToken, references); + } + + if (!references.length) return undefined; + const definition: ReferencedSymbolDefinitionInfo = { containerKind: "", containerName: "", - fileName: "", + fileName: references[0].fileName, kind: ScriptElementKind.keyword, name, - textSpan: createTextSpan(0, 1), + textSpan: references[0].textSpan, displayParts: [{ text: name, kind: ScriptElementKind.keyword }] } - const references: ReferenceEntry[] = []; - for (const sourceFile of sourceFiles) { - cancellationToken.throwIfCancellationRequested(); - addReferencesForKeywordInFile(sourceFile, keywordKind, name, cancellationToken, references); - } return [{ definition, references }]; } From de400008149a20f1bb09a707b4c7de1fa4ba4b2e Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 13 Feb 2017 12:19:33 -0800 Subject: [PATCH 096/116] switch FileExtensionInfo to always mean .js file and deduplicate entries in getSupportedExtensions (#14046) * - switch FileExtensionInfo to always mean .js file - deduplicate entries in getSupportedExtensions * (PR feedback): updated comment --- src/compiler/commandLineParser.ts | 8 ++--- src/compiler/core.ts | 26 +++++++------- src/compiler/types.ts | 3 +- .../unittests/tsserverProjectSystem.ts | 35 +++++++++++++++++++ src/server/editorServices.ts | 4 +-- src/server/protocol.ts | 4 +-- 6 files changed, 56 insertions(+), 24 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 4ee76d7b817e5..52804dcd336de 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -840,7 +840,7 @@ namespace ts { * @param basePath A root directory to resolve relative path entries in the config * file to. e.g. outDir */ - export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string, resolutionStack: Path[] = [], extraFileExtensions: FileExtensionInfo[] = []): ParsedCommandLine { + export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string, resolutionStack: Path[] = [], extraFileExtensions: JsFileExtensionInfo[] = []): ParsedCommandLine { const errors: Diagnostic[] = []; basePath = normalizeSlashes(basePath); const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames); @@ -1186,7 +1186,7 @@ namespace ts { * @param host The host used to resolve files and directories. * @param errors An array for diagnostic reporting. */ - function matchFileNames(fileNames: string[], include: string[], exclude: string[], basePath: string, options: CompilerOptions, host: ParseConfigHost, errors: Diagnostic[], extraFileExtensions: FileExtensionInfo[]): ExpandResult { + function matchFileNames(fileNames: string[], include: string[], exclude: string[], basePath: string, options: CompilerOptions, host: ParseConfigHost, errors: Diagnostic[], extraFileExtensions: JsFileExtensionInfo[]): ExpandResult { basePath = normalizePath(basePath); // The exclude spec list is converted into a regular expression, which allows us to quickly @@ -1361,7 +1361,7 @@ namespace ts { */ function hasFileWithHigherPriorityExtension(file: string, literalFiles: Map, wildcardFiles: Map, extensions: string[], keyMapper: (value: string) => string) { const extensionPriority = getExtensionPriority(file, extensions); - const adjustedExtensionPriority = adjustExtensionPriority(extensionPriority); + const adjustedExtensionPriority = adjustExtensionPriority(extensionPriority, extensions); for (let i = ExtensionPriority.Highest; i < adjustedExtensionPriority; i++) { const higherPriorityExtension = extensions[i]; const higherPriorityPath = keyMapper(changeExtension(file, higherPriorityExtension)); @@ -1383,7 +1383,7 @@ namespace ts { */ function removeWildcardFilesWithLowerPriorityExtension(file: string, wildcardFiles: Map, extensions: string[], keyMapper: (value: string) => string) { const extensionPriority = getExtensionPriority(file, extensions); - const nextExtensionPriority = getNextLowestExtensionPriority(extensionPriority); + const nextExtensionPriority = getNextLowestExtensionPriority(extensionPriority, extensions); for (let i = nextExtensionPriority; i < extensions.length; i++) { const lowerPriorityExtension = extensions[i]; const lowerPriorityPath = keyMapper(changeExtension(file, lowerPriorityExtension)); diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 94e32dfdbb31e..43bbf86509ebb 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -2020,14 +2020,14 @@ namespace ts { export const supportedJavascriptExtensions = [".js", ".jsx"]; const allSupportedExtensions = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions); - export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: FileExtensionInfo[]): string[] { + export function getSupportedExtensions(options?: CompilerOptions, extraFileExtensions?: JsFileExtensionInfo[]): string[] { const needAllExtensions = options && options.allowJs; - if (!extraFileExtensions || extraFileExtensions.length === 0) { + if (!extraFileExtensions || extraFileExtensions.length === 0 || !needAllExtensions) { return needAllExtensions ? allSupportedExtensions : supportedTypeScriptExtensions; } - const extensions = (needAllExtensions ? allSupportedExtensions : supportedTypeScriptExtensions).slice(0); + const extensions = allSupportedExtensions.slice(0); for (const extInfo of extraFileExtensions) { - if (needAllExtensions || extInfo.scriptKind === ScriptKind.TS) { + if (extensions.indexOf(extInfo.extension) === -1) { extensions.push(extInfo.extension); } } @@ -2042,7 +2042,7 @@ namespace ts { return forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(fileName, extension)); } - export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions, extraFileExtensions?: FileExtensionInfo[]) { + export function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions, extraFileExtensions?: JsFileExtensionInfo[]) { if (!fileName) { return false; } for (const extension of getSupportedExtensions(compilerOptions, extraFileExtensions)) { @@ -2061,7 +2061,6 @@ namespace ts { export const enum ExtensionPriority { TypeScriptFiles = 0, DeclarationAndJavaScriptFiles = 2, - Limit = 5, Highest = TypeScriptFiles, Lowest = DeclarationAndJavaScriptFiles, @@ -2070,7 +2069,7 @@ namespace ts { export function getExtensionPriority(path: string, supportedExtensions: string[]): ExtensionPriority { for (let i = supportedExtensions.length - 1; i >= 0; i--) { if (fileExtensionIs(path, supportedExtensions[i])) { - return adjustExtensionPriority(i); + return adjustExtensionPriority(i, supportedExtensions); } } @@ -2082,27 +2081,26 @@ namespace ts { /** * Adjusts an extension priority to be the highest priority within the same range. */ - export function adjustExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority { + export function adjustExtensionPriority(extensionPriority: ExtensionPriority, supportedExtensions: string[]): ExtensionPriority { if (extensionPriority < ExtensionPriority.DeclarationAndJavaScriptFiles) { return ExtensionPriority.TypeScriptFiles; } - else if (extensionPriority < ExtensionPriority.Limit) { + else if (extensionPriority < supportedExtensions.length) { return ExtensionPriority.DeclarationAndJavaScriptFiles; } else { - return ExtensionPriority.Limit; - } - } + return supportedExtensions.length; + } } /** * Gets the next lowest extension priority for a given priority. */ - export function getNextLowestExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority { + export function getNextLowestExtensionPriority(extensionPriority: ExtensionPriority, supportedExtensions: string[]): ExtensionPriority { if (extensionPriority < ExtensionPriority.DeclarationAndJavaScriptFiles) { return ExtensionPriority.DeclarationAndJavaScriptFiles; } else { - return ExtensionPriority.Limit; + return supportedExtensions.length; } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index b93e4eff9f48a..e3128723aff28 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -3153,9 +3153,8 @@ ThisProperty } - export interface FileExtensionInfo { + export interface JsFileExtensionInfo { extension: string; - scriptKind: ScriptKind; isMixedContent: boolean; } diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts index e6f4abde38223..40a6c933242f9 100644 --- a/src/harness/unittests/tsserverProjectSystem.ts +++ b/src/harness/unittests/tsserverProjectSystem.ts @@ -1589,6 +1589,41 @@ namespace ts.projectSystem { checkProjectActualFiles(projectService.inferredProjects[1], [file2.path]); }); + it ("loading files with correct priority", () => { + const f1 = { + path: "/a/main.ts", + content: "let x = 1" + }; + const f2 = { + path: "/a/main.js", + content: "var y = 1" + }; + const config = { + path: "/a/tsconfig.json", + content: JSON.stringify({ + compilerOptions: { allowJs: true } + }) + }; + const host = createServerHost([f1, f2, config]); + const projectService = createProjectService(host); + projectService.setHostConfiguration({ + extraFileExtensions: [ + { extension: ".js", isMixedContent: false }, + { extension: ".html", isMixedContent: true } + ] + }); + projectService.openClientFile(f1.path); + projectService.checkNumberOfProjects({ configuredProjects: 1 }); + checkProjectActualFiles(projectService.configuredProjects[0], [ f1.path ]); + + projectService.closeClientFile(f1.path); + + projectService.openClientFile(f2.path); + projectService.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: 1 }); + checkProjectActualFiles(projectService.configuredProjects[0], [ f1.path ]); + checkProjectActualFiles(projectService.inferredProjects[0], [ f2.path ]); + }); + it("tsconfig script block support", () => { const file1 = { path: "/a/b/f1.ts", diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index edc4fab9a1935..36aa3939c838c 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -107,7 +107,7 @@ namespace ts.server { export interface HostConfiguration { formatCodeOptions: FormatCodeSettings; hostInfo: string; - extraFileExtensions?: FileExtensionInfo[]; + extraFileExtensions?: JsFileExtensionInfo[]; } interface ConfigFileConversionResult { @@ -132,7 +132,7 @@ namespace ts.server { interface FilePropertyReader { getFileName(f: T): string; getScriptKind(f: T): ScriptKind; - hasMixedContent(f: T, extraFileExtensions: FileExtensionInfo[]): boolean; + hasMixedContent(f: T, extraFileExtensions: JsFileExtensionInfo[]): boolean; } const fileNamePropertyReader: FilePropertyReader = { diff --git a/src/server/protocol.ts b/src/server/protocol.ts index c1b78e9dbaa3c..e82eca86ba968 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -1001,9 +1001,9 @@ namespace ts.server.protocol { formatOptions?: FormatCodeSettings; /** - * The host's additional supported file extensions + * The host's additional supported .js file extensions */ - extraFileExtensions?: FileExtensionInfo[]; + extraFileExtensions?: JsFileExtensionInfo[]; } /** From d7ae0df647b431090da05fe5f81f0c9ff03f0cc5 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 13 Feb 2017 12:50:44 -0800 Subject: [PATCH 097/116] Move interface Promise declaration to es5.d.ts --- src/lib/es2015.promise.d.ts | 50 ------------------------------------ src/lib/es5.d.ts | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/src/lib/es2015.promise.d.ts b/src/lib/es2015.promise.d.ts index e27da2ce11b6c..b1e736100c57c 100644 --- a/src/lib/es2015.promise.d.ts +++ b/src/lib/es2015.promise.d.ts @@ -1,53 +1,3 @@ -/** - * Represents the completion of an asynchronous operation - */ -interface Promise { - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled?: ((value: T) => T | PromiseLike) | undefined | null, onrejected?: ((reason: any) => T | PromiseLike) | undefined | null): Promise; - - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled: ((value: T) => T | PromiseLike) | undefined | null, onrejected: (reason: any) => TResult | PromiseLike): Promise; - - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: ((reason: any) => TResult | PromiseLike) | undefined | null): Promise; - - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; - - /** - * Attaches a callback for only the rejection of the Promise. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of the callback. - */ - catch(onrejected?: ((reason: any) => T | PromiseLike) | undefined | null): Promise; - - /** - * Attaches a callback for only the rejection of the Promise. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of the callback. - */ - catch(onrejected: (reason: any) => TResult | PromiseLike): Promise; -} interface PromiseConstructor { /** diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts index 038d0344fda72..951549e2dcc51 100644 --- a/src/lib/es5.d.ts +++ b/src/lib/es5.d.ts @@ -1351,6 +1351,57 @@ interface PromiseLike { onrejected: (reason: any) => TResult2 | PromiseLike): PromiseLike; } +/** + * Represents the completion of an asynchronous operation + */ +interface Promise { + /** + * Attaches callbacks for the resolution and/or rejection of the Promise. + * @param onfulfilled The callback to execute when the Promise is resolved. + * @param onrejected The callback to execute when the Promise is rejected. + * @returns A Promise for the completion of which ever callback is executed. + */ + then(onfulfilled?: ((value: T) => T | PromiseLike) | undefined | null, onrejected?: ((reason: any) => T | PromiseLike) | undefined | null): Promise; + + /** + * Attaches callbacks for the resolution and/or rejection of the Promise. + * @param onfulfilled The callback to execute when the Promise is resolved. + * @param onrejected The callback to execute when the Promise is rejected. + * @returns A Promise for the completion of which ever callback is executed. + */ + then(onfulfilled: ((value: T) => T | PromiseLike) | undefined | null, onrejected: (reason: any) => TResult | PromiseLike): Promise; + + /** + * Attaches callbacks for the resolution and/or rejection of the Promise. + * @param onfulfilled The callback to execute when the Promise is resolved. + * @param onrejected The callback to execute when the Promise is rejected. + * @returns A Promise for the completion of which ever callback is executed. + */ + then(onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: ((reason: any) => TResult | PromiseLike) | undefined | null): Promise; + + /** + * Attaches callbacks for the resolution and/or rejection of the Promise. + * @param onfulfilled The callback to execute when the Promise is resolved. + * @param onrejected The callback to execute when the Promise is rejected. + * @returns A Promise for the completion of which ever callback is executed. + */ + then(onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; + + /** + * Attaches a callback for only the rejection of the Promise. + * @param onrejected The callback to execute when the Promise is rejected. + * @returns A Promise for the completion of the callback. + */ + catch(onrejected?: ((reason: any) => T | PromiseLike) | undefined | null): Promise; + + /** + * Attaches a callback for only the rejection of the Promise. + * @param onrejected The callback to execute when the Promise is rejected. + * @returns A Promise for the completion of the callback. + */ + catch(onrejected: (reason: any) => TResult | PromiseLike): Promise; +} + interface ArrayLike { readonly length: number; readonly [n: number]: T; From 11929e33ed3514e2dc09a29ff065e4525d331587 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 13 Feb 2017 12:54:58 -0800 Subject: [PATCH 098/116] Address PR comments --- src/compiler/checker.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 3735a01849b60..6f213355679ed 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7771,18 +7771,14 @@ namespace ts { if (target.flags & TypeFlags.Union && containsType(targetTypes, source)) { return Ternary.True; } - const discriminantType = findMatchingDiscriminantType(source, target); - if (discriminantType) { - return isRelatedTo(source, discriminantType, reportErrors); - } - - const len = targetTypes.length; - for (let i = 0; i < len; i++) { - const related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1); + for (const type of targetTypes) { + const related = isRelatedTo(source, type, /*reportErrors*/ false); if (related) { return related; } } + const discriminantType = findMatchingDiscriminantType(source, target); + isRelatedTo(source, discriminantType || targetTypes[targetTypes.length - 1], reportErrors); return Ternary.False; } From c2cd4f66e715e89e9c7959064f0a4465d59b0443 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 13 Feb 2017 13:21:12 -0800 Subject: [PATCH 099/116] Address PR comments and fix lint --- src/compiler/checker.ts | 3 +-- src/compiler/declarationEmitter.ts | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ab4f961e3a019..3517f407f870f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3167,8 +3167,7 @@ namespace ts { /** Return the inferred type for a binding element */ function getTypeForBindingElement(declaration: BindingElement): Type { const pattern = declaration.parent; - let parentType = getTypeForBindingElementParent(pattern.parent); - + const parentType = getTypeForBindingElementParent(pattern.parent); // If parent has the unknown (error) type, then so does this binding element if (parentType === unknownType) { return unknownType; diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 95a56b12dd3b9..de8be5a27e80b 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -333,10 +333,8 @@ namespace ts { } else { errorNameNode = declaration.name; - let format = TypeFormatFlags.UseTypeOfFunction | TypeFormatFlags.UseTypeAliasValue; - if (shouldUseResolverType) { - format |= TypeFormatFlags.AddUndefined; - } + const format = TypeFormatFlags.UseTypeOfFunction | TypeFormatFlags.UseTypeAliasValue | + (shouldUseResolverType ? TypeFormatFlags.AddUndefined : 0); resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, format, writer); errorNameNode = undefined; } From 271ca80c75e30132cc2549a79f562a2abbb432a3 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Mon, 13 Feb 2017 13:35:07 -0800 Subject: [PATCH 100/116] Address PR comments --- 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 6f213355679ed..6f352c95aec4d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7777,8 +7777,10 @@ namespace ts { return related; } } - const discriminantType = findMatchingDiscriminantType(source, target); - isRelatedTo(source, discriminantType || targetTypes[targetTypes.length - 1], reportErrors); + if (reportErrors) { + const discriminantType = findMatchingDiscriminantType(source, target); + isRelatedTo(source, discriminantType || targetTypes[targetTypes.length - 1], /*reportErrors*/ true); + } return Ternary.False; } From 58b8a54e5fab608ce76d9d738334d80ea7ad38ac Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 13 Feb 2017 13:38:04 -0800 Subject: [PATCH 101/116] fix build break (#14049) --- tests/baselines/reference/packageJsonMain.js | 1 + tests/baselines/reference/packageJsonMain_isNonRecursive.js | 1 + tests/baselines/reference/typingsLookup4.js | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/baselines/reference/packageJsonMain.js b/tests/baselines/reference/packageJsonMain.js index c7f63af27f2b7..96509ab639ee5 100644 --- a/tests/baselines/reference/packageJsonMain.js +++ b/tests/baselines/reference/packageJsonMain.js @@ -28,6 +28,7 @@ foo + bar + baz; //// [a.js] "use strict"; +exports.__esModule = true; var foo = require("foo"); var bar = require("bar"); var baz = require("baz"); diff --git a/tests/baselines/reference/packageJsonMain_isNonRecursive.js b/tests/baselines/reference/packageJsonMain_isNonRecursive.js index edd56b359ee1e..97d7bbdf05b9b 100644 --- a/tests/baselines/reference/packageJsonMain_isNonRecursive.js +++ b/tests/baselines/reference/packageJsonMain_isNonRecursive.js @@ -16,3 +16,4 @@ import foo = require("foo"); //// [a.js] "use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/typingsLookup4.js b/tests/baselines/reference/typingsLookup4.js index b3bb2ed5ded8f..d2424644d1626 100644 --- a/tests/baselines/reference/typingsLookup4.js +++ b/tests/baselines/reference/typingsLookup4.js @@ -38,6 +38,7 @@ exports.__esModule = true; exports.l = 2; //// [index.js] "use strict"; +exports.__esModule = true; exports.m = 3; //// [a.js] "use strict"; From ab053bfe0e0a2906e1f8619e07c76874aa6efda5 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 13 Feb 2017 14:29:46 -0800 Subject: [PATCH 102/116] Accept baselines --- .../asyncAliasReturnType_es6.symbols | 2 +- .../asyncArrowFunction1_es2017.symbols | 2 +- .../reference/asyncArrowFunction1_es5.symbols | 2 +- .../reference/asyncArrowFunction1_es6.symbols | 2 +- ...syncAwaitWithCapturedBlockScopeVar.symbols | 2 +- .../reference/asyncAwait_es2017.symbols | 20 +- .../reference/asyncAwait_es5.symbols | 20 +- .../reference/asyncAwait_es6.symbols | 20 +- .../asyncFunctionDeclaration11_es2017.symbols | 2 +- .../asyncFunctionDeclaration11_es5.symbols | 2 +- .../asyncFunctionDeclaration11_es6.symbols | 2 +- .../asyncFunctionDeclaration14_es2017.symbols | 2 +- .../asyncFunctionDeclaration14_es5.symbols | 2 +- .../asyncFunctionDeclaration14_es6.symbols | 2 +- .../asyncFunctionDeclaration1_es2017.symbols | 2 +- .../asyncFunctionDeclaration1_es5.symbols | 2 +- .../asyncFunctionDeclaration1_es6.symbols | 2 +- .../reference/asyncFunctionReturnType.symbols | 52 +-- .../asyncFunctionsAndStrictNullChecks.symbols | 2 +- .../asyncImportedPromise_es5.symbols | 2 +- .../asyncQualifiedReturnType_es5.symbols | 2 +- ...nParenthesizedArrowFunction_es2017.symbols | 2 +- ...ncUnParenthesizedArrowFunction_es5.symbols | 2 +- ...ncUnParenthesizedArrowFunction_es6.symbols | 2 +- .../reference/asyncUseStrict_es2017.symbols | 4 +- .../reference/asyncUseStrict_es5.symbols | 4 +- .../reference/asyncUseStrict_es6.symbols | 4 +- .../awaitBinaryExpression1_es2017.symbols | 4 +- .../awaitBinaryExpression1_es5.symbols | 4 +- .../awaitBinaryExpression1_es6.symbols | 4 +- .../awaitBinaryExpression2_es2017.symbols | 4 +- .../awaitBinaryExpression2_es5.symbols | 4 +- .../awaitBinaryExpression2_es6.symbols | 4 +- .../awaitBinaryExpression3_es2017.symbols | 4 +- .../awaitBinaryExpression3_es5.symbols | 4 +- .../awaitBinaryExpression3_es6.symbols | 4 +- .../awaitBinaryExpression4_es2017.symbols | 4 +- .../awaitBinaryExpression4_es5.symbols | 4 +- .../awaitBinaryExpression4_es6.symbols | 4 +- .../awaitBinaryExpression5_es2017.symbols | 4 +- .../awaitBinaryExpression5_es5.symbols | 4 +- .../awaitBinaryExpression5_es6.symbols | 4 +- .../awaitCallExpression1_es2017.symbols | 8 +- .../awaitCallExpression1_es5.symbols | 8 +- .../awaitCallExpression1_es6.symbols | 8 +- .../awaitCallExpression2_es2017.symbols | 8 +- .../awaitCallExpression2_es5.symbols | 8 +- .../awaitCallExpression2_es6.symbols | 8 +- .../awaitCallExpression3_es2017.symbols | 8 +- .../awaitCallExpression3_es5.symbols | 8 +- .../awaitCallExpression3_es6.symbols | 8 +- .../awaitCallExpression4_es2017.symbols | 8 +- .../awaitCallExpression4_es5.symbols | 8 +- .../awaitCallExpression4_es6.symbols | 8 +- .../awaitCallExpression5_es2017.symbols | 8 +- .../awaitCallExpression5_es5.symbols | 8 +- .../awaitCallExpression5_es6.symbols | 8 +- .../awaitCallExpression6_es2017.symbols | 8 +- .../awaitCallExpression6_es5.symbols | 8 +- .../awaitCallExpression6_es6.symbols | 8 +- .../awaitCallExpression7_es2017.symbols | 8 +- .../awaitCallExpression7_es5.symbols | 8 +- .../awaitCallExpression7_es6.symbols | 8 +- .../awaitCallExpression8_es2017.symbols | 8 +- .../awaitCallExpression8_es5.symbols | 8 +- .../awaitCallExpression8_es6.symbols | 8 +- .../awaitClassExpression_es2017.symbols | 4 +- .../awaitClassExpression_es5.symbols | 4 +- .../awaitClassExpression_es6.symbols | 4 +- .../awaitInheritedPromise_es2017.symbols | 2 +- .../reference/controlFlowInstanceof.symbols | 2 +- .../decoratorMetadataPromise.symbols | 6 +- .../defaultExportInAwaitExpression01.symbols | 2 +- .../defaultExportInAwaitExpression02.symbols | 2 +- .../reference/es2017basicAsync.symbols | 18 +- ...es5-asyncFunctionBinaryExpressions.symbols | 2 +- .../es5-asyncFunctionReturnStatements.symbols | 12 +- .../es5-asyncFunctionTryStatements.symbols | 2 +- .../exportDefaultAsyncFunction.symbols | 2 +- .../exportDefaultAsyncFunction2.symbols | 2 +- .../reference/inferenceLimit.symbols | 14 +- ...ibrary_NoErrorDuplicateLibOptions1.symbols | 6 +- ...ibrary_NoErrorDuplicateLibOptions2.symbols | 6 +- ...larizeLibrary_TargetES5UsingES6Lib.symbols | 6 +- .../noImplicitReturnsInAsync1.symbols | 2 +- tests/baselines/reference/promiseTest.symbols | 26 +- tests/baselines/reference/promiseTest.types | 8 +- tests/baselines/reference/promiseType.symbols | 310 +++++++++--------- .../reference/promiseTypeInference.symbols | 18 +- .../reference/promiseTypeInference.types | 6 +- .../reference/promiseTypeStrictNull.symbols | 310 +++++++++--------- .../promiseVoidErrorCallback.symbols | 12 +- tests/baselines/reference/promises.symbols | 20 +- tests/baselines/reference/promises.types | 4 +- .../reference/promisesWithConstraints.symbols | 20 +- .../reference/promisesWithConstraints.types | 2 +- .../reference/specializationError.symbols | 14 +- .../reference/specializationError.types | 2 +- .../transformNestedGeneratorsWithTry.symbols | 4 +- 99 files changed, 635 insertions(+), 635 deletions(-) diff --git a/tests/baselines/reference/asyncAliasReturnType_es6.symbols b/tests/baselines/reference/asyncAliasReturnType_es6.symbols index 61de47e409252..fccb2e5c73796 100644 --- a/tests/baselines/reference/asyncAliasReturnType_es6.symbols +++ b/tests/baselines/reference/asyncAliasReturnType_es6.symbols @@ -2,7 +2,7 @@ type PromiseAlias = Promise; >PromiseAlias : Symbol(PromiseAlias, Decl(asyncAliasReturnType_es6.ts, 0, 0)) >T : Symbol(T, Decl(asyncAliasReturnType_es6.ts, 0, 18)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(asyncAliasReturnType_es6.ts, 0, 18)) async function f(): PromiseAlias { diff --git a/tests/baselines/reference/asyncArrowFunction1_es2017.symbols b/tests/baselines/reference/asyncArrowFunction1_es2017.symbols index 35fd033d6b4af..239a057aa8832 100644 --- a/tests/baselines/reference/asyncArrowFunction1_es2017.symbols +++ b/tests/baselines/reference/asyncArrowFunction1_es2017.symbols @@ -2,6 +2,6 @@ var foo = async (): Promise => { >foo : Symbol(foo, Decl(asyncArrowFunction1_es2017.ts, 1, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) }; diff --git a/tests/baselines/reference/asyncArrowFunction1_es5.symbols b/tests/baselines/reference/asyncArrowFunction1_es5.symbols index c37985dc34765..9f09c3ac9adcf 100644 --- a/tests/baselines/reference/asyncArrowFunction1_es5.symbols +++ b/tests/baselines/reference/asyncArrowFunction1_es5.symbols @@ -2,6 +2,6 @@ var foo = async (): Promise => { >foo : Symbol(foo, Decl(asyncArrowFunction1_es5.ts, 1, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) }; diff --git a/tests/baselines/reference/asyncArrowFunction1_es6.symbols b/tests/baselines/reference/asyncArrowFunction1_es6.symbols index a2f62f829909f..bc3557865ee04 100644 --- a/tests/baselines/reference/asyncArrowFunction1_es6.symbols +++ b/tests/baselines/reference/asyncArrowFunction1_es6.symbols @@ -2,6 +2,6 @@ var foo = async (): Promise => { >foo : Symbol(foo, Decl(asyncArrowFunction1_es6.ts, 1, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) }; diff --git a/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.symbols b/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.symbols index 12a60509f4f83..acd490f5266e2 100644 --- a/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.symbols +++ b/tests/baselines/reference/asyncAwaitWithCapturedBlockScopeVar.symbols @@ -65,7 +65,7 @@ async function fn3() { async function fn4(): Promise { >fn4 : Symbol(fn4, Decl(asyncAwaitWithCapturedBlockScopeVar.ts, 24, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) let ar = []; >ar : Symbol(ar, Decl(asyncAwaitWithCapturedBlockScopeVar.ts, 27, 7)) diff --git a/tests/baselines/reference/asyncAwait_es2017.symbols b/tests/baselines/reference/asyncAwait_es2017.symbols index 34dc9802a25de..a456a2242953c 100644 --- a/tests/baselines/reference/asyncAwait_es2017.symbols +++ b/tests/baselines/reference/asyncAwait_es2017.symbols @@ -2,16 +2,16 @@ type MyPromise = Promise; >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es2017.ts, 0, 0), Decl(asyncAwait_es2017.ts, 1, 11)) >T : Symbol(T, Decl(asyncAwait_es2017.ts, 0, 15)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(asyncAwait_es2017.ts, 0, 15)) declare var MyPromise: typeof Promise; >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es2017.ts, 0, 0), Decl(asyncAwait_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare var p: Promise; >p : Symbol(p, Decl(asyncAwait_es2017.ts, 2, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare var mp: MyPromise; >mp : Symbol(mp, Decl(asyncAwait_es2017.ts, 3, 11)) @@ -22,7 +22,7 @@ async function f0() { } async function f1(): Promise { } >f1 : Symbol(f1, Decl(asyncAwait_es2017.ts, 5, 23)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async function f3(): MyPromise { } >f3 : Symbol(f3, Decl(asyncAwait_es2017.ts, 6, 38)) @@ -33,7 +33,7 @@ let f4 = async function() { } let f5 = async function(): Promise { } >f5 : Symbol(f5, Decl(asyncAwait_es2017.ts, 10, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) let f6 = async function(): MyPromise { } >f6 : Symbol(f6, Decl(asyncAwait_es2017.ts, 11, 3)) @@ -44,7 +44,7 @@ let f7 = async () => { }; let f8 = async (): Promise => { }; >f8 : Symbol(f8, Decl(asyncAwait_es2017.ts, 14, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) let f9 = async (): MyPromise => { }; >f9 : Symbol(f9, Decl(asyncAwait_es2017.ts, 15, 3)) @@ -60,7 +60,7 @@ let f11 = async () => mp; let f12 = async (): Promise => mp; >f12 : Symbol(f12, Decl(asyncAwait_es2017.ts, 18, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >mp : Symbol(mp, Decl(asyncAwait_es2017.ts, 3, 11)) let f13 = async (): MyPromise => p; @@ -76,7 +76,7 @@ let o = { async m2(): Promise { }, >m2 : Symbol(m2, Decl(asyncAwait_es2017.ts, 22, 16)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async m3(): MyPromise { } >m3 : Symbol(m3, Decl(asyncAwait_es2017.ts, 23, 31)) @@ -92,7 +92,7 @@ class C { async m2(): Promise { } >m2 : Symbol(C.m2, Decl(asyncAwait_es2017.ts, 28, 15)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async m3(): MyPromise { } >m3 : Symbol(C.m3, Decl(asyncAwait_es2017.ts, 29, 30)) @@ -103,7 +103,7 @@ class C { static async m5(): Promise { } >m5 : Symbol(C.m5, Decl(asyncAwait_es2017.ts, 31, 22)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) static async m6(): MyPromise { } >m6 : Symbol(C.m6, Decl(asyncAwait_es2017.ts, 32, 37)) diff --git a/tests/baselines/reference/asyncAwait_es5.symbols b/tests/baselines/reference/asyncAwait_es5.symbols index 2f80a025ade2a..cdc52137ff472 100644 --- a/tests/baselines/reference/asyncAwait_es5.symbols +++ b/tests/baselines/reference/asyncAwait_es5.symbols @@ -2,16 +2,16 @@ type MyPromise = Promise; >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11)) >T : Symbol(T, Decl(asyncAwait_es5.ts, 0, 15)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >T : Symbol(T, Decl(asyncAwait_es5.ts, 0, 15)) declare var MyPromise: typeof Promise; >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es5.ts, 0, 0), Decl(asyncAwait_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare var p: Promise; >p : Symbol(p, Decl(asyncAwait_es5.ts, 2, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare var mp: MyPromise; >mp : Symbol(mp, Decl(asyncAwait_es5.ts, 3, 11)) @@ -22,7 +22,7 @@ async function f0() { } async function f1(): Promise { } >f1 : Symbol(f1, Decl(asyncAwait_es5.ts, 5, 23)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) async function f3(): MyPromise { } >f3 : Symbol(f3, Decl(asyncAwait_es5.ts, 6, 38)) @@ -33,7 +33,7 @@ let f4 = async function() { } let f5 = async function(): Promise { } >f5 : Symbol(f5, Decl(asyncAwait_es5.ts, 10, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) let f6 = async function(): MyPromise { } >f6 : Symbol(f6, Decl(asyncAwait_es5.ts, 11, 3)) @@ -44,7 +44,7 @@ let f7 = async () => { }; let f8 = async (): Promise => { }; >f8 : Symbol(f8, Decl(asyncAwait_es5.ts, 14, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) let f9 = async (): MyPromise => { }; >f9 : Symbol(f9, Decl(asyncAwait_es5.ts, 15, 3)) @@ -60,7 +60,7 @@ let f11 = async () => mp; let f12 = async (): Promise => mp; >f12 : Symbol(f12, Decl(asyncAwait_es5.ts, 18, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >mp : Symbol(mp, Decl(asyncAwait_es5.ts, 3, 11)) let f13 = async (): MyPromise => p; @@ -76,7 +76,7 @@ let o = { async m2(): Promise { }, >m2 : Symbol(m2, Decl(asyncAwait_es5.ts, 22, 16)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) async m3(): MyPromise { } >m3 : Symbol(m3, Decl(asyncAwait_es5.ts, 23, 31)) @@ -92,7 +92,7 @@ class C { async m2(): Promise { } >m2 : Symbol(C.m2, Decl(asyncAwait_es5.ts, 28, 15)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) async m3(): MyPromise { } >m3 : Symbol(C.m3, Decl(asyncAwait_es5.ts, 29, 30)) @@ -103,7 +103,7 @@ class C { static async m5(): Promise { } >m5 : Symbol(C.m5, Decl(asyncAwait_es5.ts, 31, 22)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) static async m6(): MyPromise { } >m6 : Symbol(C.m6, Decl(asyncAwait_es5.ts, 32, 37)) diff --git a/tests/baselines/reference/asyncAwait_es6.symbols b/tests/baselines/reference/asyncAwait_es6.symbols index 26295e72f783d..25032b1a94300 100644 --- a/tests/baselines/reference/asyncAwait_es6.symbols +++ b/tests/baselines/reference/asyncAwait_es6.symbols @@ -2,16 +2,16 @@ type MyPromise = Promise; >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11)) >T : Symbol(T, Decl(asyncAwait_es6.ts, 0, 15)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(asyncAwait_es6.ts, 0, 15)) declare var MyPromise: typeof Promise; >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare var p: Promise; >p : Symbol(p, Decl(asyncAwait_es6.ts, 2, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare var mp: MyPromise; >mp : Symbol(mp, Decl(asyncAwait_es6.ts, 3, 11)) @@ -22,7 +22,7 @@ async function f0() { } async function f1(): Promise { } >f1 : Symbol(f1, Decl(asyncAwait_es6.ts, 5, 23)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async function f3(): MyPromise { } >f3 : Symbol(f3, Decl(asyncAwait_es6.ts, 6, 38)) @@ -33,7 +33,7 @@ let f4 = async function() { } let f5 = async function(): Promise { } >f5 : Symbol(f5, Decl(asyncAwait_es6.ts, 10, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) let f6 = async function(): MyPromise { } >f6 : Symbol(f6, Decl(asyncAwait_es6.ts, 11, 3)) @@ -44,7 +44,7 @@ let f7 = async () => { }; let f8 = async (): Promise => { }; >f8 : Symbol(f8, Decl(asyncAwait_es6.ts, 14, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) let f9 = async (): MyPromise => { }; >f9 : Symbol(f9, Decl(asyncAwait_es6.ts, 15, 3)) @@ -60,7 +60,7 @@ let f11 = async () => mp; let f12 = async (): Promise => mp; >f12 : Symbol(f12, Decl(asyncAwait_es6.ts, 18, 3)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >mp : Symbol(mp, Decl(asyncAwait_es6.ts, 3, 11)) let f13 = async (): MyPromise => p; @@ -76,7 +76,7 @@ let o = { async m2(): Promise { }, >m2 : Symbol(m2, Decl(asyncAwait_es6.ts, 22, 16)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async m3(): MyPromise { } >m3 : Symbol(m3, Decl(asyncAwait_es6.ts, 23, 31)) @@ -92,7 +92,7 @@ class C { async m2(): Promise { } >m2 : Symbol(C.m2, Decl(asyncAwait_es6.ts, 28, 15)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async m3(): MyPromise { } >m3 : Symbol(C.m3, Decl(asyncAwait_es6.ts, 29, 30)) @@ -103,7 +103,7 @@ class C { static async m5(): Promise { } >m5 : Symbol(C.m5, Decl(asyncAwait_es6.ts, 31, 22)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) static async m6(): MyPromise { } >m6 : Symbol(C.m6, Decl(asyncAwait_es6.ts, 32, 37)) diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es2017.symbols b/tests/baselines/reference/asyncFunctionDeclaration11_es2017.symbols index 02c35d81d6230..d9ae9715c2ee8 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration11_es2017.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration11_es2017.symbols @@ -1,5 +1,5 @@ === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration11_es2017.ts === async function await(): Promise { >await : Symbol(await, Decl(asyncFunctionDeclaration11_es2017.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) } diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration11_es5.symbols index fc20251d5671e..f0a8bbd490369 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration11_es5.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration11_es5.symbols @@ -1,5 +1,5 @@ === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration11_es5.ts === async function await(): Promise { >await : Symbol(await, Decl(asyncFunctionDeclaration11_es5.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols b/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols index c9288f42763ae..4f1aea28635ff 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols @@ -1,5 +1,5 @@ === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts === async function await(): Promise { >await : Symbol(await, Decl(asyncFunctionDeclaration11_es6.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) } diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es2017.symbols b/tests/baselines/reference/asyncFunctionDeclaration14_es2017.symbols index 1b5bca844c062..0c410ece27de9 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration14_es2017.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration14_es2017.symbols @@ -1,7 +1,7 @@ === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration14_es2017.ts === async function foo(): Promise { >foo : Symbol(foo, Decl(asyncFunctionDeclaration14_es2017.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) return; } diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration14_es5.symbols index 1126618cfe73f..2458c22324a7d 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration14_es5.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration14_es5.symbols @@ -1,7 +1,7 @@ === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration14_es5.ts === async function foo(): Promise { >foo : Symbol(foo, Decl(asyncFunctionDeclaration14_es5.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) return; } diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols b/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols index d036632ff86c3..2aa5c7e0b2358 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols @@ -1,7 +1,7 @@ === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts === async function foo(): Promise { >foo : Symbol(foo, Decl(asyncFunctionDeclaration14_es6.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) return; } diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es2017.symbols b/tests/baselines/reference/asyncFunctionDeclaration1_es2017.symbols index a712df4589636..32b86eb69c72a 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration1_es2017.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration1_es2017.symbols @@ -1,5 +1,5 @@ === tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration1_es2017.ts === async function foo(): Promise { >foo : Symbol(foo, Decl(asyncFunctionDeclaration1_es2017.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) } diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es5.symbols b/tests/baselines/reference/asyncFunctionDeclaration1_es5.symbols index ba7616ac293d9..610af242e03bf 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration1_es5.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration1_es5.symbols @@ -1,5 +1,5 @@ === tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1_es5.ts === async function foo(): Promise { >foo : Symbol(foo, Decl(asyncFunctionDeclaration1_es5.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols b/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols index 019d2db4f0793..fc645fa038e6b 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols +++ b/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols @@ -1,5 +1,5 @@ === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts === async function foo(): Promise { >foo : Symbol(foo, Decl(asyncFunctionDeclaration1_es6.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) } diff --git a/tests/baselines/reference/asyncFunctionReturnType.symbols b/tests/baselines/reference/asyncFunctionReturnType.symbols index d5aa71c9e51a8..7939fe7e83c97 100644 --- a/tests/baselines/reference/asyncFunctionReturnType.symbols +++ b/tests/baselines/reference/asyncFunctionReturnType.symbols @@ -8,7 +8,7 @@ async function fAsync() { async function fAsyncExplicit(): Promise<[number, boolean]> { >fAsyncExplicit : Symbol(fAsyncExplicit, Decl(asyncFunctionReturnType.ts, 3, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) // This is contextually typed as a tuple. return [1, true]; @@ -29,7 +29,7 @@ async function fIndexedTypeForStringProp(obj: Obj): Promise { >fIndexedTypeForStringProp : Symbol(fIndexedTypeForStringProp, Decl(asyncFunctionReturnType.ts, 14, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 16, 41)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) return obj.stringProp; @@ -42,12 +42,12 @@ async function fIndexedTypeForPromiseOfStringProp(obj: Obj): PromisefIndexedTypeForPromiseOfStringProp : Symbol(fIndexedTypeForPromiseOfStringProp, Decl(asyncFunctionReturnType.ts, 18, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 20, 50)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) return Promise.resolve(obj.stringProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >obj.stringProp : Symbol(Obj.stringProp, Decl(asyncFunctionReturnType.ts, 11, 15)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 20, 50)) @@ -58,12 +58,12 @@ async function fIndexedTypeForExplicitPromiseOfStringProp(obj: Obj): PromisefIndexedTypeForExplicitPromiseOfStringProp : Symbol(fIndexedTypeForExplicitPromiseOfStringProp, Decl(asyncFunctionReturnType.ts, 22, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 24, 58)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) return Promise.resolve(obj.stringProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj.stringProp : Symbol(Obj.stringProp, Decl(asyncFunctionReturnType.ts, 11, 15)) @@ -75,7 +75,7 @@ async function fIndexedTypeForAnyProp(obj: Obj): Promise { >fIndexedTypeForAnyProp : Symbol(fIndexedTypeForAnyProp, Decl(asyncFunctionReturnType.ts, 26, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 28, 38)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) return obj.anyProp; @@ -88,12 +88,12 @@ async function fIndexedTypeForPromiseOfAnyProp(obj: Obj): PromisefIndexedTypeForPromiseOfAnyProp : Symbol(fIndexedTypeForPromiseOfAnyProp, Decl(asyncFunctionReturnType.ts, 30, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 32, 47)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) return Promise.resolve(obj.anyProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >obj.anyProp : Symbol(Obj.anyProp, Decl(asyncFunctionReturnType.ts, 12, 23)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 32, 47)) @@ -104,12 +104,12 @@ async function fIndexedTypeForExplicitPromiseOfAnyProp(obj: Obj): PromisefIndexedTypeForExplicitPromiseOfAnyProp : Symbol(fIndexedTypeForExplicitPromiseOfAnyProp, Decl(asyncFunctionReturnType.ts, 34, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 36, 55)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) return Promise.resolve(obj.anyProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj.anyProp : Symbol(Obj.anyProp, Decl(asyncFunctionReturnType.ts, 12, 23)) @@ -123,7 +123,7 @@ async function fGenericIndexedTypeForStringProp(obj: TObj): Pr >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 40, 66)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 40, 48)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 40, 48)) return obj.stringProp; @@ -138,12 +138,12 @@ async function fGenericIndexedTypeForPromiseOfStringProp(obj: >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 44, 75)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 44, 57)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 44, 57)) return Promise.resolve(obj.stringProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >obj.stringProp : Symbol(Obj.stringProp, Decl(asyncFunctionReturnType.ts, 11, 15)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 44, 75)) @@ -156,12 +156,12 @@ async function fGenericIndexedTypeForExplicitPromiseOfStringPropObj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 48, 83)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 48, 65)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 48, 65)) return Promise.resolve(obj.stringProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 48, 65)) >obj.stringProp : Symbol(Obj.stringProp, Decl(asyncFunctionReturnType.ts, 11, 15)) @@ -175,7 +175,7 @@ async function fGenericIndexedTypeForAnyProp(obj: TObj): Promi >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 52, 63)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 52, 45)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 52, 45)) return obj.anyProp; @@ -190,12 +190,12 @@ async function fGenericIndexedTypeForPromiseOfAnyProp(obj: TOb >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 56, 72)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 56, 54)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 56, 54)) return Promise.resolve(obj.anyProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >obj.anyProp : Symbol(Obj.anyProp, Decl(asyncFunctionReturnType.ts, 12, 23)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 56, 72)) @@ -208,12 +208,12 @@ async function fGenericIndexedTypeForExplicitPromiseOfAnyProp( >Obj : Symbol(Obj, Decl(asyncFunctionReturnType.ts, 8, 1)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 60, 80)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 60, 62)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 60, 62)) return Promise.resolve(obj.anyProp); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 60, 62)) >obj.anyProp : Symbol(Obj.anyProp, Decl(asyncFunctionReturnType.ts, 12, 23)) @@ -231,7 +231,7 @@ async function fGenericIndexedTypeForKPropTObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 64, 43)) >key : Symbol(key, Decl(asyncFunctionReturnType.ts, 64, 93)) >K : Symbol(K, Decl(asyncFunctionReturnType.ts, 64, 60)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 64, 43)) >K : Symbol(K, Decl(asyncFunctionReturnType.ts, 64, 60)) @@ -250,13 +250,13 @@ async function fGenericIndexedTypeForPromiseOfKPropTObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 68, 52)) >key : Symbol(key, Decl(asyncFunctionReturnType.ts, 68, 102)) >K : Symbol(K, Decl(asyncFunctionReturnType.ts, 68, 69)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 68, 52)) >K : Symbol(K, Decl(asyncFunctionReturnType.ts, 68, 69)) return Promise.resolve(obj[key]); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >obj : Symbol(obj, Decl(asyncFunctionReturnType.ts, 68, 92)) >key : Symbol(key, Decl(asyncFunctionReturnType.ts, 68, 102)) @@ -272,13 +272,13 @@ async function fGenericIndexedTypeForExplicitPromiseOfKPropTObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 72, 60)) >key : Symbol(key, Decl(asyncFunctionReturnType.ts, 72, 110)) >K : Symbol(K, Decl(asyncFunctionReturnType.ts, 72, 77)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 72, 60)) >K : Symbol(K, Decl(asyncFunctionReturnType.ts, 72, 77)) return Promise.resolve(obj[key]); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >TObj : Symbol(TObj, Decl(asyncFunctionReturnType.ts, 72, 60)) >K : Symbol(K, Decl(asyncFunctionReturnType.ts, 72, 77)) diff --git a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.symbols b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.symbols index 2d10183133d0d..116406f765213 100644 --- a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.symbols +++ b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.symbols @@ -106,7 +106,7 @@ declare function resolve1(value: T): Promise; >T : Symbol(T, Decl(asyncFunctionsAndStrictNullChecks.ts, 18, 26)) >value : Symbol(value, Decl(asyncFunctionsAndStrictNullChecks.ts, 18, 29)) >T : Symbol(T, Decl(asyncFunctionsAndStrictNullChecks.ts, 18, 26)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >T : Symbol(T, Decl(asyncFunctionsAndStrictNullChecks.ts, 18, 26)) declare function resolve2(value: T): Windows.Foundation.IPromise; diff --git a/tests/baselines/reference/asyncImportedPromise_es5.symbols b/tests/baselines/reference/asyncImportedPromise_es5.symbols index b889299bd7ebd..c4ff901f5b9d7 100644 --- a/tests/baselines/reference/asyncImportedPromise_es5.symbols +++ b/tests/baselines/reference/asyncImportedPromise_es5.symbols @@ -2,7 +2,7 @@ export class Task extends Promise { } >Task : Symbol(Task, Decl(task.ts, 0, 0)) >T : Symbol(T, Decl(task.ts, 0, 18)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >T : Symbol(T, Decl(task.ts, 0, 18)) === tests/cases/conformance/async/es5/test.ts === diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.symbols b/tests/baselines/reference/asyncQualifiedReturnType_es5.symbols index 1fcc5d4e60904..8964074ed6109 100644 --- a/tests/baselines/reference/asyncQualifiedReturnType_es5.symbols +++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.symbols @@ -5,7 +5,7 @@ namespace X { export class MyPromise extends Promise { >MyPromise : Symbol(MyPromise, Decl(asyncQualifiedReturnType_es5.ts, 0, 13)) >T : Symbol(T, Decl(asyncQualifiedReturnType_es5.ts, 1, 27)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >T : Symbol(T, Decl(asyncQualifiedReturnType_es5.ts, 1, 27)) } } diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.symbols b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.symbols index b5f83de6021ae..d1de246fa93b0 100644 --- a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.symbols +++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es2017.symbols @@ -3,7 +3,7 @@ declare function someOtherFunction(i: any): Promise; >someOtherFunction : Symbol(someOtherFunction, Decl(asyncUnParenthesizedArrowFunction_es2017.ts, 0, 0)) >i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es2017.ts, 1, 35)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) const x = async i => await someOtherFunction(i) >x : Symbol(x, Decl(asyncUnParenthesizedArrowFunction_es2017.ts, 2, 5)) diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.symbols b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.symbols index 0f43ba7773e01..82b73a199ea8e 100644 --- a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.symbols +++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es5.symbols @@ -3,7 +3,7 @@ declare function someOtherFunction(i: any): Promise; >someOtherFunction : Symbol(someOtherFunction, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 0, 0)) >i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 1, 35)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const x = async i => await someOtherFunction(i) >x : Symbol(x, Decl(asyncUnParenthesizedArrowFunction_es5.ts, 2, 5)) diff --git a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.symbols b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.symbols index 018c239925890..fee86b56cee12 100644 --- a/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.symbols +++ b/tests/baselines/reference/asyncUnParenthesizedArrowFunction_es6.symbols @@ -3,7 +3,7 @@ declare function someOtherFunction(i: any): Promise; >someOtherFunction : Symbol(someOtherFunction, Decl(asyncUnParenthesizedArrowFunction_es6.ts, 0, 0)) >i : Symbol(i, Decl(asyncUnParenthesizedArrowFunction_es6.ts, 1, 35)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) const x = async i => await someOtherFunction(i) >x : Symbol(x, Decl(asyncUnParenthesizedArrowFunction_es6.ts, 2, 5)) diff --git a/tests/baselines/reference/asyncUseStrict_es2017.symbols b/tests/baselines/reference/asyncUseStrict_es2017.symbols index 23fd654ca29d1..ecd5c992cd804 100644 --- a/tests/baselines/reference/asyncUseStrict_es2017.symbols +++ b/tests/baselines/reference/asyncUseStrict_es2017.symbols @@ -4,11 +4,11 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(asyncUseStrict_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async function func(): Promise { >func : Symbol(func, Decl(asyncUseStrict_es2017.ts, 1, 32)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) "use strict"; var b = await p || a; diff --git a/tests/baselines/reference/asyncUseStrict_es5.symbols b/tests/baselines/reference/asyncUseStrict_es5.symbols index a70f3ca546ab5..925f348249bbd 100644 --- a/tests/baselines/reference/asyncUseStrict_es5.symbols +++ b/tests/baselines/reference/asyncUseStrict_es5.symbols @@ -4,11 +4,11 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(asyncUseStrict_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) async function func(): Promise { >func : Symbol(func, Decl(asyncUseStrict_es5.ts, 1, 32)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) "use strict"; var b = await p || a; diff --git a/tests/baselines/reference/asyncUseStrict_es6.symbols b/tests/baselines/reference/asyncUseStrict_es6.symbols index f94c16664e7f0..8aa3606c3b4e1 100644 --- a/tests/baselines/reference/asyncUseStrict_es6.symbols +++ b/tests/baselines/reference/asyncUseStrict_es6.symbols @@ -4,11 +4,11 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(asyncUseStrict_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) async function func(): Promise { >func : Symbol(func, Decl(asyncUseStrict_es6.ts, 1, 32)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) "use strict"; var b = await p || a; diff --git a/tests/baselines/reference/awaitBinaryExpression1_es2017.symbols b/tests/baselines/reference/awaitBinaryExpression1_es2017.symbols index 827769b3db5c9..b763a454458ed 100644 --- a/tests/baselines/reference/awaitBinaryExpression1_es2017.symbols +++ b/tests/baselines/reference/awaitBinaryExpression1_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression1_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression1_es2017.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression1_es2017.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression1_es2017.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression1_es5.symbols b/tests/baselines/reference/awaitBinaryExpression1_es5.symbols index 84d3b17b126cb..b1b3b04d6aaee 100644 --- a/tests/baselines/reference/awaitBinaryExpression1_es5.symbols +++ b/tests/baselines/reference/awaitBinaryExpression1_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression1_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression1_es5.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression1_es5.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression1_es5.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols index 0f05f6521cb2f..f6782d3663661 100644 --- a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols +++ b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression1_es6.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression1_es6.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression1_es6.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression2_es2017.symbols b/tests/baselines/reference/awaitBinaryExpression2_es2017.symbols index 549eb49cf9297..7f97d409b51bd 100644 --- a/tests/baselines/reference/awaitBinaryExpression2_es2017.symbols +++ b/tests/baselines/reference/awaitBinaryExpression2_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression2_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression2_es2017.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression2_es2017.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression2_es2017.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression2_es5.symbols b/tests/baselines/reference/awaitBinaryExpression2_es5.symbols index e44238d4172a7..1f8bafa8a3707 100644 --- a/tests/baselines/reference/awaitBinaryExpression2_es5.symbols +++ b/tests/baselines/reference/awaitBinaryExpression2_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression2_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression2_es5.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression2_es5.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression2_es5.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols index 518e6eec528a0..e2b724e2c2d17 100644 --- a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols +++ b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression2_es6.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression2_es6.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression2_es6.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression3_es2017.symbols b/tests/baselines/reference/awaitBinaryExpression3_es2017.symbols index 29c8fb7f398ef..1d7e1ff74a011 100644 --- a/tests/baselines/reference/awaitBinaryExpression3_es2017.symbols +++ b/tests/baselines/reference/awaitBinaryExpression3_es2017.symbols @@ -4,7 +4,7 @@ declare var a: number; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression3_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression3_es2017.ts, 1, 31)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression3_es2017.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression3_es2017.ts, 1, 31)) diff --git a/tests/baselines/reference/awaitBinaryExpression3_es5.symbols b/tests/baselines/reference/awaitBinaryExpression3_es5.symbols index d9480fdf5248a..7e8cd107b424e 100644 --- a/tests/baselines/reference/awaitBinaryExpression3_es5.symbols +++ b/tests/baselines/reference/awaitBinaryExpression3_es5.symbols @@ -4,7 +4,7 @@ declare var a: number; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression3_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression3_es5.ts, 1, 31)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression3_es5.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression3_es5.ts, 1, 31)) diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols index 0d653c1ff7b42..afd2ae97641e8 100644 --- a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols +++ b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols @@ -4,7 +4,7 @@ declare var a: number; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression3_es6.ts, 1, 31)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression3_es6.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression3_es6.ts, 1, 31)) diff --git a/tests/baselines/reference/awaitBinaryExpression4_es2017.symbols b/tests/baselines/reference/awaitBinaryExpression4_es2017.symbols index 0db5a20e0c11e..cf01d5ec85804 100644 --- a/tests/baselines/reference/awaitBinaryExpression4_es2017.symbols +++ b/tests/baselines/reference/awaitBinaryExpression4_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression4_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression4_es2017.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression4_es2017.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression4_es2017.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression4_es5.symbols b/tests/baselines/reference/awaitBinaryExpression4_es5.symbols index ab2cbeadfc5cf..19ffe817b1557 100644 --- a/tests/baselines/reference/awaitBinaryExpression4_es5.symbols +++ b/tests/baselines/reference/awaitBinaryExpression4_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression4_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression4_es5.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression4_es5.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression4_es5.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols index 18a593225584c..61e12001c6a93 100644 --- a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols +++ b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression4_es6.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression4_es6.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression4_es6.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression5_es2017.symbols b/tests/baselines/reference/awaitBinaryExpression5_es2017.symbols index e2d30c658f711..4b684c44f77ca 100644 --- a/tests/baselines/reference/awaitBinaryExpression5_es2017.symbols +++ b/tests/baselines/reference/awaitBinaryExpression5_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression5_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression5_es2017.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression5_es2017.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression5_es2017.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression5_es5.symbols b/tests/baselines/reference/awaitBinaryExpression5_es5.symbols index ad258355d3872..b7255d25a5797 100644 --- a/tests/baselines/reference/awaitBinaryExpression5_es5.symbols +++ b/tests/baselines/reference/awaitBinaryExpression5_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression5_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression5_es5.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression5_es5.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression5_es5.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols index 57a7958a13cff..fb50640ce7cfa 100644 --- a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols +++ b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function before(): void; >before : Symbol(before, Decl(awaitBinaryExpression5_es6.ts, 1, 32)) @@ -14,7 +14,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitBinaryExpression5_es6.ts, 3, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitBinaryExpression5_es6.ts, 1, 32)) diff --git a/tests/baselines/reference/awaitCallExpression1_es2017.symbols b/tests/baselines/reference/awaitCallExpression1_es2017.symbols index 68c28d153507e..373654dd11a21 100644 --- a/tests/baselines/reference/awaitCallExpression1_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression1_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression1_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression1_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression1_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression1_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression1_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression1_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression1_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression1_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression1_es5.symbols b/tests/baselines/reference/awaitCallExpression1_es5.symbols index b172db760e37d..61851ae77f72e 100644 --- a/tests/baselines/reference/awaitCallExpression1_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression1_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression1_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression1_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression1_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression1_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression1_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression1_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression1_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression1_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression1_es6.symbols b/tests/baselines/reference/awaitCallExpression1_es6.symbols index 1b1deb0f5795f..a81586bc4fe91 100644 --- a/tests/baselines/reference/awaitCallExpression1_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression1_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression1_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression1_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression1_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression1_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression1_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression1_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression2_es2017.symbols b/tests/baselines/reference/awaitCallExpression2_es2017.symbols index 4528ae4c0743d..6bf77f40d1927 100644 --- a/tests/baselines/reference/awaitCallExpression2_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression2_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression2_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression2_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression2_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression2_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression2_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression2_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression2_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression2_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression2_es5.symbols b/tests/baselines/reference/awaitCallExpression2_es5.symbols index 95e1f65003099..71ecc53a3c93f 100644 --- a/tests/baselines/reference/awaitCallExpression2_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression2_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression2_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression2_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression2_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression2_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression2_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression2_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression2_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression2_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression2_es6.symbols b/tests/baselines/reference/awaitCallExpression2_es6.symbols index d7f3cc0d4bd0a..91de39742dcf5 100644 --- a/tests/baselines/reference/awaitCallExpression2_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression2_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression2_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression2_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression2_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression2_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression2_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression2_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression3_es2017.symbols b/tests/baselines/reference/awaitCallExpression3_es2017.symbols index a1120103fb070..f42254489ce1d 100644 --- a/tests/baselines/reference/awaitCallExpression3_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression3_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression3_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression3_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression3_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression3_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression3_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression3_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression3_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression3_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression3_es5.symbols b/tests/baselines/reference/awaitCallExpression3_es5.symbols index 2c18507340adc..66ef232948dd0 100644 --- a/tests/baselines/reference/awaitCallExpression3_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression3_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression3_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression3_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression3_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression3_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression3_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression3_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression3_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression3_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression3_es6.symbols b/tests/baselines/reference/awaitCallExpression3_es6.symbols index 14b6f35bc30de..6b559d847d97e 100644 --- a/tests/baselines/reference/awaitCallExpression3_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression3_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression3_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression3_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression3_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression3_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression3_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression3_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression4_es2017.symbols b/tests/baselines/reference/awaitCallExpression4_es2017.symbols index fb607d9841f4f..60fc9f643f9ce 100644 --- a/tests/baselines/reference/awaitCallExpression4_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression4_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression4_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression4_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression4_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression4_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression4_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression4_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression4_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression4_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression4_es5.symbols b/tests/baselines/reference/awaitCallExpression4_es5.symbols index 46a5b942956a8..f52e6d2b59e69 100644 --- a/tests/baselines/reference/awaitCallExpression4_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression4_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression4_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression4_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression4_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression4_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression4_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression4_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression4_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression4_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression4_es6.symbols b/tests/baselines/reference/awaitCallExpression4_es6.symbols index d7e90fc4a53e5..33117d2d80bbd 100644 --- a/tests/baselines/reference/awaitCallExpression4_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression4_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression4_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression4_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression4_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression4_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression4_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression4_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression4_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression4_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression5_es2017.symbols b/tests/baselines/reference/awaitCallExpression5_es2017.symbols index 3854353314aef..ffad2bda5a66b 100644 --- a/tests/baselines/reference/awaitCallExpression5_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression5_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression5_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression5_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression5_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression5_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression5_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression5_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression5_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression5_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression5_es5.symbols b/tests/baselines/reference/awaitCallExpression5_es5.symbols index 9f34c3e9fe81d..2d7b9bd875e04 100644 --- a/tests/baselines/reference/awaitCallExpression5_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression5_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression5_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression5_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression5_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression5_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression5_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression5_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression5_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression5_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression5_es6.symbols b/tests/baselines/reference/awaitCallExpression5_es6.symbols index ba8f987818827..cf6afde09ed28 100644 --- a/tests/baselines/reference/awaitCallExpression5_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression5_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression5_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression5_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression5_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression5_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression5_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression5_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression6_es2017.symbols b/tests/baselines/reference/awaitCallExpression6_es2017.symbols index 6a651510328a4..f540e418f4a68 100644 --- a/tests/baselines/reference/awaitCallExpression6_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression6_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression6_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression6_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression6_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression6_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression6_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression6_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression6_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression6_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression6_es5.symbols b/tests/baselines/reference/awaitCallExpression6_es5.symbols index fc3ae4cbdbb5c..a361b7ea7369d 100644 --- a/tests/baselines/reference/awaitCallExpression6_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression6_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression6_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression6_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression6_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression6_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression6_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression6_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression6_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression6_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression6_es6.symbols b/tests/baselines/reference/awaitCallExpression6_es6.symbols index 938c49d1d4111..35feb7c8ea037 100644 --- a/tests/baselines/reference/awaitCallExpression6_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression6_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression6_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression6_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression6_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression6_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression6_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression6_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression7_es2017.symbols b/tests/baselines/reference/awaitCallExpression7_es2017.symbols index e95078c68500a..525af85372964 100644 --- a/tests/baselines/reference/awaitCallExpression7_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression7_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression7_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression7_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression7_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression7_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression7_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression7_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression7_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression7_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression7_es5.symbols b/tests/baselines/reference/awaitCallExpression7_es5.symbols index 96a7252ef04d0..3b56d8520b014 100644 --- a/tests/baselines/reference/awaitCallExpression7_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression7_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression7_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression7_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression7_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression7_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression7_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression7_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression7_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression7_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression7_es6.symbols b/tests/baselines/reference/awaitCallExpression7_es6.symbols index f366417b23f9d..fe6c1fb0eeb49 100644 --- a/tests/baselines/reference/awaitCallExpression7_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression7_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression7_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression7_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression7_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression7_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression7_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression7_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression8_es2017.symbols b/tests/baselines/reference/awaitCallExpression8_es2017.symbols index e3fd465c120f0..53ba162671da3 100644 --- a/tests/baselines/reference/awaitCallExpression8_es2017.symbols +++ b/tests/baselines/reference/awaitCallExpression8_es2017.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression8_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression8_es2017.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression8_es2017.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es2017.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es2017.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression8_es2017.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression8_es2017.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression8_es2017.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es2017.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es2017.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression8_es2017.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression8_es2017.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression8_es5.symbols b/tests/baselines/reference/awaitCallExpression8_es5.symbols index 50b564481b960..e7f1659a7e7e4 100644 --- a/tests/baselines/reference/awaitCallExpression8_es5.symbols +++ b/tests/baselines/reference/awaitCallExpression8_es5.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression8_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression8_es5.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression8_es5.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es5.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es5.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression8_es5.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression8_es5.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression8_es5.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es5.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es5.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression8_es5.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression8_es5.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitCallExpression8_es6.symbols b/tests/baselines/reference/awaitCallExpression8_es6.symbols index 89441ea3e37da..037ab79b68f8a 100644 --- a/tests/baselines/reference/awaitCallExpression8_es6.symbols +++ b/tests/baselines/reference/awaitCallExpression8_es6.symbols @@ -4,7 +4,7 @@ declare var a: boolean; declare var p: Promise; >p : Symbol(p, Decl(awaitCallExpression8_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 1, 32)) @@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }; declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >pfn : Symbol(pfn, Decl(awaitCallExpression8_es6.ts, 4, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es6.ts, 4, 28)) >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 4, 42)) >arg2 : Symbol(arg2, Decl(awaitCallExpression8_es6.ts, 4, 57)) declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>; >po : Symbol(po, Decl(awaitCallExpression8_es6.ts, 5, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25)) >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es6.ts, 5, 29)) >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 5, 43)) @@ -42,7 +42,7 @@ declare function after(): void; async function func(): Promise { >func : Symbol(func, Decl(awaitCallExpression8_es6.ts, 7, 31)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) before(); >before : Symbol(before, Decl(awaitCallExpression8_es6.ts, 5, 84)) diff --git a/tests/baselines/reference/awaitClassExpression_es2017.symbols b/tests/baselines/reference/awaitClassExpression_es2017.symbols index bebffa2bbada4..1c497d8095181 100644 --- a/tests/baselines/reference/awaitClassExpression_es2017.symbols +++ b/tests/baselines/reference/awaitClassExpression_es2017.symbols @@ -4,12 +4,12 @@ declare class C { } declare var p: Promise; >p : Symbol(p, Decl(awaitClassExpression_es2017.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >C : Symbol(C, Decl(awaitClassExpression_es2017.ts, 0, 0)) async function func(): Promise { >func : Symbol(func, Decl(awaitClassExpression_es2017.ts, 1, 33)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) class D extends (await p) { >D : Symbol(D, Decl(awaitClassExpression_es2017.ts, 3, 38)) diff --git a/tests/baselines/reference/awaitClassExpression_es5.symbols b/tests/baselines/reference/awaitClassExpression_es5.symbols index 1f550576c0983..18b742e4437a8 100644 --- a/tests/baselines/reference/awaitClassExpression_es5.symbols +++ b/tests/baselines/reference/awaitClassExpression_es5.symbols @@ -4,12 +4,12 @@ declare class C { } declare var p: Promise; >p : Symbol(p, Decl(awaitClassExpression_es5.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >C : Symbol(C, Decl(awaitClassExpression_es5.ts, 0, 0)) async function func(): Promise { >func : Symbol(func, Decl(awaitClassExpression_es5.ts, 1, 33)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) class D extends (await p) { >D : Symbol(D, Decl(awaitClassExpression_es5.ts, 3, 38)) diff --git a/tests/baselines/reference/awaitClassExpression_es6.symbols b/tests/baselines/reference/awaitClassExpression_es6.symbols index 6d1e9f1a10316..b7c485e88c627 100644 --- a/tests/baselines/reference/awaitClassExpression_es6.symbols +++ b/tests/baselines/reference/awaitClassExpression_es6.symbols @@ -4,12 +4,12 @@ declare class C { } declare var p: Promise; >p : Symbol(p, Decl(awaitClassExpression_es6.ts, 1, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >C : Symbol(C, Decl(awaitClassExpression_es6.ts, 0, 0)) async function func(): Promise { >func : Symbol(func, Decl(awaitClassExpression_es6.ts, 1, 33)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) class D extends (await p) { >D : Symbol(D, Decl(awaitClassExpression_es6.ts, 3, 38)) diff --git a/tests/baselines/reference/awaitInheritedPromise_es2017.symbols b/tests/baselines/reference/awaitInheritedPromise_es2017.symbols index ef68d16b67818..f4cf33bfe83a6 100644 --- a/tests/baselines/reference/awaitInheritedPromise_es2017.symbols +++ b/tests/baselines/reference/awaitInheritedPromise_es2017.symbols @@ -1,7 +1,7 @@ === tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts === interface A extends Promise {} >A : Symbol(A, Decl(awaitInheritedPromise_es2017.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) declare var a: A; >a : Symbol(a, Decl(awaitInheritedPromise_es2017.ts, 1, 11)) diff --git a/tests/baselines/reference/controlFlowInstanceof.symbols b/tests/baselines/reference/controlFlowInstanceof.symbols index 3189482799013..19304ada88826 100644 --- a/tests/baselines/reference/controlFlowInstanceof.symbols +++ b/tests/baselines/reference/controlFlowInstanceof.symbols @@ -46,7 +46,7 @@ function f2(s: Set | Set) { if (s instanceof Promise) { >s : Symbol(s, Decl(controlFlowInstanceof.ts, 13, 12)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) s; // Set & Promise >s : Symbol(s, Decl(controlFlowInstanceof.ts, 13, 12)) diff --git a/tests/baselines/reference/decoratorMetadataPromise.symbols b/tests/baselines/reference/decoratorMetadataPromise.symbols index b0ebe05e8c1c4..6eec0fe46233e 100644 --- a/tests/baselines/reference/decoratorMetadataPromise.symbols +++ b/tests/baselines/reference/decoratorMetadataPromise.symbols @@ -18,7 +18,7 @@ class A { async bar(): Promise { return 0; } >bar : Symbol(A.bar, Decl(decoratorMetadataPromise.ts, 5, 18)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) @decorator >decorator : Symbol(decorator, Decl(decoratorMetadataPromise.ts, 1, 13)) @@ -26,8 +26,8 @@ class A { baz(n: Promise): Promise { return n; } >baz : Symbol(A.baz, Decl(decoratorMetadataPromise.ts, 7, 46)) >n : Symbol(n, Decl(decoratorMetadataPromise.ts, 9, 8)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >n : Symbol(n, Decl(decoratorMetadataPromise.ts, 9, 8)) } diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.symbols b/tests/baselines/reference/defaultExportInAwaitExpression01.symbols index eb833f63895ca..9b77ee1a68bfb 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression01.symbols +++ b/tests/baselines/reference/defaultExportInAwaitExpression01.symbols @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/modules/a.ts === const x = new Promise( ( resolve, reject ) => { resolve( {} ); } ); >x : Symbol(x, Decl(a.ts, 0, 5)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(resolve, Decl(a.ts, 0, 24)) >reject : Symbol(reject, Decl(a.ts, 0, 33)) >resolve : Symbol(resolve, Decl(a.ts, 0, 24)) diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.symbols b/tests/baselines/reference/defaultExportInAwaitExpression02.symbols index eb833f63895ca..9b77ee1a68bfb 100644 --- a/tests/baselines/reference/defaultExportInAwaitExpression02.symbols +++ b/tests/baselines/reference/defaultExportInAwaitExpression02.symbols @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/modules/a.ts === const x = new Promise( ( resolve, reject ) => { resolve( {} ); } ); >x : Symbol(x, Decl(a.ts, 0, 5)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(resolve, Decl(a.ts, 0, 24)) >reject : Symbol(reject, Decl(a.ts, 0, 33)) >resolve : Symbol(resolve, Decl(a.ts, 0, 24)) diff --git a/tests/baselines/reference/es2017basicAsync.symbols b/tests/baselines/reference/es2017basicAsync.symbols index d79faf1502af2..fc73741ba82a6 100644 --- a/tests/baselines/reference/es2017basicAsync.symbols +++ b/tests/baselines/reference/es2017basicAsync.symbols @@ -1,7 +1,7 @@ === tests/cases/compiler/es2017basicAsync.ts === async (): Promise => { ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 0; } @@ -14,7 +14,7 @@ async function asyncFunc() { const asyncArrowFunc = async (): Promise => { >asyncArrowFunc : Symbol(asyncArrowFunc, Decl(es2017basicAsync.ts, 9, 5)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 0; } @@ -25,20 +25,20 @@ async function asyncIIFE() { await 0; await (async function(): Promise { ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 1; })(); await (async function asyncNamedFunc(): Promise { >asyncNamedFunc : Symbol(asyncNamedFunc, Decl(es2017basicAsync.ts, 20, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 1; })(); await (async (): Promise => { ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 1; })(); @@ -49,7 +49,7 @@ class AsyncClass { asyncPropFunc = async function(): Promise { >asyncPropFunc : Symbol(AsyncClass.asyncPropFunc, Decl(es2017basicAsync.ts, 29, 18)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 2; } @@ -57,21 +57,21 @@ class AsyncClass { asyncPropNamedFunc = async function namedFunc(): Promise { >asyncPropNamedFunc : Symbol(AsyncClass.asyncPropNamedFunc, Decl(es2017basicAsync.ts, 32, 5)) >namedFunc : Symbol(namedFunc, Decl(es2017basicAsync.ts, 34, 24)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 2; } asyncPropArrowFunc = async (): Promise => { >asyncPropArrowFunc : Symbol(AsyncClass.asyncPropArrowFunc, Decl(es2017basicAsync.ts, 36, 5)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 2; } async asyncMethod(): Promise { >asyncMethod : Symbol(AsyncClass.asyncMethod, Decl(es2017basicAsync.ts, 40, 5)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) await 2; } diff --git a/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.symbols b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.symbols index 6c6a182071707..eada06414bf07 100644 --- a/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.symbols +++ b/tests/baselines/reference/es5-asyncFunctionBinaryExpressions.symbols @@ -259,7 +259,7 @@ async function binaryComma0() { async function binaryComma1(): Promise { >binaryComma1 : Symbol(binaryComma1, Decl(es5-asyncFunctionBinaryExpressions.ts, 117, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) return x, await y; >x : Symbol(x, Decl(es5-asyncFunctionBinaryExpressions.ts, 0, 11)) diff --git a/tests/baselines/reference/es5-asyncFunctionReturnStatements.symbols b/tests/baselines/reference/es5-asyncFunctionReturnStatements.symbols index 651af244e70d4..f2e6667c27e90 100644 --- a/tests/baselines/reference/es5-asyncFunctionReturnStatements.symbols +++ b/tests/baselines/reference/es5-asyncFunctionReturnStatements.symbols @@ -9,14 +9,14 @@ declare var x, y, z, a, b, c; async function returnStatement0(): Promise { >returnStatement0 : Symbol(returnStatement0, Decl(es5-asyncFunctionReturnStatements.ts, 0, 29)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) return; } async function returnStatement1(): Promise { >returnStatement1 : Symbol(returnStatement1, Decl(es5-asyncFunctionReturnStatements.ts, 4, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) return x; >x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11)) @@ -24,7 +24,7 @@ async function returnStatement1(): Promise { async function returnStatement2(): Promise { >returnStatement2 : Symbol(returnStatement2, Decl(es5-asyncFunctionReturnStatements.ts, 8, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) return await x; >x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11)) @@ -32,14 +32,14 @@ async function returnStatement2(): Promise { async function returnStatement3(): Promise { >returnStatement3 : Symbol(returnStatement3, Decl(es5-asyncFunctionReturnStatements.ts, 12, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) { return; } } async function returnStatement4(): Promise { >returnStatement4 : Symbol(returnStatement4, Decl(es5-asyncFunctionReturnStatements.ts, 16, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) await x; >x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11)) @@ -49,7 +49,7 @@ async function returnStatement4(): Promise { async function returnStatement5(): Promise{ >returnStatement5 : Symbol(returnStatement5, Decl(es5-asyncFunctionReturnStatements.ts, 21, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) { return await x; } >x : Symbol(x, Decl(es5-asyncFunctionReturnStatements.ts, 0, 11)) diff --git a/tests/baselines/reference/es5-asyncFunctionTryStatements.symbols b/tests/baselines/reference/es5-asyncFunctionTryStatements.symbols index 52a4ec8df769b..fc73f21f62248 100644 --- a/tests/baselines/reference/es5-asyncFunctionTryStatements.symbols +++ b/tests/baselines/reference/es5-asyncFunctionTryStatements.symbols @@ -66,7 +66,7 @@ async function tryCatch2() { async function tryCatch3(): Promise { >tryCatch3 : Symbol(tryCatch3, Decl(es5-asyncFunctionTryStatements.ts, 30, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) var x: any, y: any; diff --git a/tests/baselines/reference/exportDefaultAsyncFunction.symbols b/tests/baselines/reference/exportDefaultAsyncFunction.symbols index 47178519558f3..a86226fe678a7 100644 --- a/tests/baselines/reference/exportDefaultAsyncFunction.symbols +++ b/tests/baselines/reference/exportDefaultAsyncFunction.symbols @@ -1,7 +1,7 @@ === tests/cases/compiler/exportDefaultAsyncFunction.ts === export default async function foo(): Promise {} >foo : Symbol(foo, Decl(exportDefaultAsyncFunction.ts, 0, 0)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) foo(); >foo : Symbol(foo, Decl(exportDefaultAsyncFunction.ts, 0, 0)) diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.symbols b/tests/baselines/reference/exportDefaultAsyncFunction2.symbols index 013d0d7f697f7..cffbf284573b0 100644 --- a/tests/baselines/reference/exportDefaultAsyncFunction2.symbols +++ b/tests/baselines/reference/exportDefaultAsyncFunction2.symbols @@ -18,7 +18,7 @@ export default async(() => await(Promise.resolve(1))); >async : Symbol(async, Decl(a.ts, 0, 8)) >await : Symbol(await, Decl(a.ts, 0, 15)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) === tests/cases/compiler/b.ts === diff --git a/tests/baselines/reference/inferenceLimit.symbols b/tests/baselines/reference/inferenceLimit.symbols index 721e7af7560df..82aecd7e7938c 100644 --- a/tests/baselines/reference/inferenceLimit.symbols +++ b/tests/baselines/reference/inferenceLimit.symbols @@ -14,7 +14,7 @@ export class BrokenClass { >value : Symbol(value, Decl(file1.ts, 7, 36)) return new Promise>((resolve, reject) => { ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --)) >MyModule : Symbol(MyModule, Decl(file1.ts, 1, 6)) >MyModel : Symbol(MyModule.MyModel, Decl(mymodule.ts, 0, 0)) @@ -32,19 +32,19 @@ export class BrokenClass { >order : Symbol(order, Decl(file1.ts, 12, 25)) return new Promise((resolve, reject) => { ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(resolve, Decl(file1.ts, 13, 26)) >reject : Symbol(reject, Decl(file1.ts, 13, 34)) this.doStuff(order.id) ->this.doStuff(order.id) .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>this.doStuff(order.id) .then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >this.doStuff : Symbol(BrokenClass.doStuff, Decl(file1.ts, 27, 3)) >this : Symbol(BrokenClass, Decl(file1.ts, 1, 39)) >doStuff : Symbol(BrokenClass.doStuff, Decl(file1.ts, 27, 3)) >order : Symbol(order, Decl(file1.ts, 12, 25)) .then((items) => { ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >items : Symbol(items, Decl(file1.ts, 15, 17)) order.items = items; @@ -60,9 +60,9 @@ export class BrokenClass { }; return Promise.all(result.map(populateItems)) ->Promise.all(result.map(populateItems)) .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>Promise.all(result.map(populateItems)) .then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.all : Symbol(PromiseConstructor.all, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >all : Symbol(PromiseConstructor.all, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >result.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >result : Symbol(result, Decl(file1.ts, 10, 7)) @@ -70,7 +70,7 @@ export class BrokenClass { >populateItems : Symbol(populateItems, Decl(file1.ts, 12, 7)) .then((orders: Array) => { ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >orders : Symbol(orders, Decl(file1.ts, 23, 13)) >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --)) >MyModule : Symbol(MyModule, Decl(file1.ts, 1, 6)) diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols index d8520698e6cd3..ed7bb2697ab4f 100644 --- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols +++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols @@ -112,7 +112,7 @@ async function out() { >out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 45, 37)) return new Promise(function (resolve, reject) {}); ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >resolve : Symbol(resolve, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 49, 33)) >reject : Symbol(reject, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 49, 41)) } @@ -121,9 +121,9 @@ declare var console: any; >console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 52, 11)) out().then(() => { ->out().then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>out().then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 45, 37)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) console.log("Yea!"); >console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 52, 11)) diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols index ea1eb599c6fb0..22c2173db42ec 100644 --- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols +++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols @@ -112,7 +112,7 @@ async function out() { >out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 45, 37)) return new Promise(function (resolve, reject) {}); ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >resolve : Symbol(resolve, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 49, 33)) >reject : Symbol(reject, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 49, 41)) } @@ -121,9 +121,9 @@ declare var console: any; >console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 52, 11)) out().then(() => { ->out().then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>out().then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 45, 37)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) console.log("Yea!"); >console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 52, 11)) diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols index ed1fb96ded3aa..cc74a4e843a7b 100644 --- a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols +++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols @@ -112,7 +112,7 @@ async function out() { >out : Symbol(out, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 45, 37)) return new Promise(function (resolve, reject) {}); ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >resolve : Symbol(resolve, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 49, 33)) >reject : Symbol(reject, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 49, 41)) } @@ -121,9 +121,9 @@ declare var console: any; >console : Symbol(console, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 52, 11)) out().then(() => { ->out().then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>out().then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >out : Symbol(out, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 45, 37)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) console.log("Yea!"); >console : Symbol(console, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 52, 11)) diff --git a/tests/baselines/reference/noImplicitReturnsInAsync1.symbols b/tests/baselines/reference/noImplicitReturnsInAsync1.symbols index 7bf70fbf04e1e..58d14c2a6d04e 100644 --- a/tests/baselines/reference/noImplicitReturnsInAsync1.symbols +++ b/tests/baselines/reference/noImplicitReturnsInAsync1.symbols @@ -12,6 +12,6 @@ async function test(isError: boolean = false) { let x = await Promise.resolve("The test is passed without an error."); >x : Symbol(x, Decl(noImplicitReturnsInAsync1.ts, 5, 7)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) } diff --git a/tests/baselines/reference/promiseTest.symbols b/tests/baselines/reference/promiseTest.symbols index 6cf4ff98d8fc5..547e2de52feb6 100644 --- a/tests/baselines/reference/promiseTest.symbols +++ b/tests/baselines/reference/promiseTest.symbols @@ -1,44 +1,44 @@ === tests/cases/compiler/promiseTest.ts === interface Promise { ->Promise : Symbol(Promise, Decl(promiseTest.ts, 0, 0)) ->T : Symbol(T, Decl(promiseTest.ts, 1, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 18)) then(success?: (value: T) => Promise): Promise; ->then : Symbol(Promise.then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) >A : Symbol(A, Decl(promiseTest.ts, 2, 9)) >success : Symbol(success, Decl(promiseTest.ts, 2, 12)) >value : Symbol(value, Decl(promiseTest.ts, 2, 23)) ->T : Symbol(T, Decl(promiseTest.ts, 1, 18)) ->Promise : Symbol(Promise, Decl(promiseTest.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 0, 0)) >A : Symbol(A, Decl(promiseTest.ts, 2, 9)) ->Promise : Symbol(Promise, Decl(promiseTest.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 0, 0)) >A : Symbol(A, Decl(promiseTest.ts, 2, 9)) then(success?: (value: T) => B): Promise; ->then : Symbol(Promise.then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) >B : Symbol(B, Decl(promiseTest.ts, 3, 9)) >success : Symbol(success, Decl(promiseTest.ts, 3, 12)) >value : Symbol(value, Decl(promiseTest.ts, 3, 23)) ->T : Symbol(T, Decl(promiseTest.ts, 1, 18)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 18)) >B : Symbol(B, Decl(promiseTest.ts, 3, 9)) ->Promise : Symbol(Promise, Decl(promiseTest.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 0, 0)) >B : Symbol(B, Decl(promiseTest.ts, 3, 9)) data: T; >data : Symbol(Promise.data, Decl(promiseTest.ts, 3, 51)) ->T : Symbol(T, Decl(promiseTest.ts, 1, 18)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 18)) } var p: Promise = null; >p : Symbol(p, Decl(promiseTest.ts, 7, 3)) ->Promise : Symbol(Promise, Decl(promiseTest.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 0, 0)) var p2 = p.then(function (x) { >p2 : Symbol(p2, Decl(promiseTest.ts, 8, 3)) ->p.then : Symbol(Promise.then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) +>p.then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) >p : Symbol(p, Decl(promiseTest.ts, 7, 3)) ->then : Symbol(Promise.then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60)) >x : Symbol(x, Decl(promiseTest.ts, 8, 26)) return p; diff --git a/tests/baselines/reference/promiseTest.types b/tests/baselines/reference/promiseTest.types index 5ec43b9f42b39..fdcc05203f837 100644 --- a/tests/baselines/reference/promiseTest.types +++ b/tests/baselines/reference/promiseTest.types @@ -5,7 +5,7 @@ interface Promise { >T : T then(success?: (value: T) => Promise): Promise; ->then : { (success?: (value: T) => Promise): Promise; (success?: (value: T) => B): Promise; } +>then : { (onfulfilled?: (value: T) => T | PromiseLike, onrejected?: (reason: any) => T | PromiseLike): Promise; (onfulfilled: (value: T) => T | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: T) => Promise): Promise; (success?: (value: T) => B): Promise; } >A : A >success : (value: T) => Promise >value : T @@ -16,7 +16,7 @@ interface Promise { >A : A then(success?: (value: T) => B): Promise; ->then : { (success?: (value: T) => Promise): Promise; (success?: (value: T) => B): Promise; } +>then : { (onfulfilled?: (value: T) => T | PromiseLike, onrejected?: (reason: any) => T | PromiseLike): Promise; (onfulfilled: (value: T) => T | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: T) => Promise): Promise; (success?: (value: T) => B): Promise; } >B : B >success : (value: T) => B >value : T @@ -38,9 +38,9 @@ var p: Promise = null; var p2 = p.then(function (x) { >p2 : Promise >p.then(function (x) { return p;} ) : Promise ->p.then : { (success?: (value: number) => Promise): Promise; (success?: (value: number) => B): Promise; } +>p.then : { (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise): Promise; (success?: (value: number) => B): Promise; } >p : Promise ->then : { (success?: (value: number) => Promise): Promise; (success?: (value: number) => B): Promise; } +>then : { (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise): Promise; (success?: (value: number) => B): Promise; } >function (x) { return p;} : (x: number) => Promise >x : number diff --git a/tests/baselines/reference/promiseType.symbols b/tests/baselines/reference/promiseType.symbols index 845aed26d5e32..23a9450137186 100644 --- a/tests/baselines/reference/promiseType.symbols +++ b/tests/baselines/reference/promiseType.symbols @@ -1,88 +1,88 @@ === tests/cases/compiler/promiseType.ts === declare var p: Promise; >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) const a = p.then(); >a : Symbol(a, Decl(promiseType.ts, 2, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const b = p.then(b => 1); >b : Symbol(b, Decl(promiseType.ts, 3, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseType.ts, 3, 17)) const c = p.then(b => 1, e => 'error'); >c : Symbol(c, Decl(promiseType.ts, 4, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseType.ts, 4, 17)) >e : Symbol(e, Decl(promiseType.ts, 4, 24)) const d = p.then(b => 1, e => { }); >d : Symbol(d, Decl(promiseType.ts, 5, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseType.ts, 5, 17)) >e : Symbol(e, Decl(promiseType.ts, 5, 24)) const e = p.then(b => 1, e => { throw Error(); }); >e : Symbol(e, Decl(promiseType.ts, 6, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseType.ts, 6, 17)) >e : Symbol(e, Decl(promiseType.ts, 6, 24)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const f = p.then(b => 1, e => Promise.reject(Error())); >f : Symbol(f, Decl(promiseType.ts, 7, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseType.ts, 7, 17)) >e : Symbol(e, Decl(promiseType.ts, 7, 24)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const g = p.catch(e => 'error'); >g : Symbol(g, Decl(promiseType.ts, 8, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseType.ts, 8, 18)) const h = p.catch(e => { }); >h : Symbol(h, Decl(promiseType.ts, 9, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseType.ts, 9, 18)) const i = p.catch(e => { throw Error(); }); >i : Symbol(i, Decl(promiseType.ts, 10, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseType.ts, 10, 18)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const j = p.catch(e => Promise.reject(Error())); >j : Symbol(j, Decl(promiseType.ts, 11, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseType.ts, 11, 18)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) @@ -167,7 +167,7 @@ async function F() { return Promise.reject(Error()); >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } @@ -226,7 +226,7 @@ async function I() { return Promise.reject(Error()); >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } @@ -236,405 +236,405 @@ async function I() { const p00 = p.catch(); >p00 : Symbol(p00, Decl(promiseType.ts, 96, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p01 = p.catch(undefined); >p01 : Symbol(p01, Decl(promiseType.ts, 97, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p07 = p.catch(null); >p07 : Symbol(p07, Decl(promiseType.ts, 98, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p02 = p.catch(() => 1); >p02 : Symbol(p02, Decl(promiseType.ts, 99, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p03 = p.catch(() => {}); >p03 : Symbol(p03, Decl(promiseType.ts, 100, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p04 = p.catch(() => {throw 1}); >p04 : Symbol(p04, Decl(promiseType.ts, 101, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p05 = p.catch(() => Promise.reject(1)); >p05 : Symbol(p05, Decl(promiseType.ts, 102, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p06 = p.catch(() => Promise.resolve(1)); >p06 : Symbol(p06, Decl(promiseType.ts, 103, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p10 = p.then(); >p10 : Symbol(p10, Decl(promiseType.ts, 105, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p20 = p.then(undefined); >p20 : Symbol(p20, Decl(promiseType.ts, 107, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p21 = p.then(() => 1); >p21 : Symbol(p21, Decl(promiseType.ts, 108, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p22 = p.then(() => {}); >p22 : Symbol(p22, Decl(promiseType.ts, 109, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p23 = p.then(() => {throw 1}); >p23 : Symbol(p23, Decl(promiseType.ts, 110, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p24 = p.then(() => Promise.resolve(1)); >p24 : Symbol(p24, Decl(promiseType.ts, 111, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p25 = p.then(() => Promise.reject(1)); >p25 : Symbol(p25, Decl(promiseType.ts, 112, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p30 = p.then(undefined, undefined); >p30 : Symbol(p30, Decl(promiseType.ts, 114, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) >undefined : Symbol(undefined) const p31 = p.then(undefined, () => 1); >p31 : Symbol(p31, Decl(promiseType.ts, 115, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p32 = p.then(undefined, () => {}); >p32 : Symbol(p32, Decl(promiseType.ts, 116, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p33 = p.then(undefined, () => {throw 1}); >p33 : Symbol(p33, Decl(promiseType.ts, 117, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p34 = p.then(undefined, () => Promise.resolve(1)); >p34 : Symbol(p34, Decl(promiseType.ts, 118, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p35 = p.then(undefined, () => Promise.reject(1)); >p35 : Symbol(p35, Decl(promiseType.ts, 119, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p40 = p.then(() => "1", undefined); >p40 : Symbol(p40, Decl(promiseType.ts, 121, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p41 = p.then(() => "1", () => 1); >p41 : Symbol(p41, Decl(promiseType.ts, 122, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p42 = p.then(() => "1", () => {}); >p42 : Symbol(p42, Decl(promiseType.ts, 123, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p43 = p.then(() => "1", () => {throw 1}); >p43 : Symbol(p43, Decl(promiseType.ts, 124, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p44 = p.then(() => "1", () => Promise.resolve(1)); >p44 : Symbol(p44, Decl(promiseType.ts, 125, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p45 = p.then(() => "1", () => Promise.reject(1)); >p45 : Symbol(p45, Decl(promiseType.ts, 126, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p50 = p.then(() => {}, undefined); >p50 : Symbol(p50, Decl(promiseType.ts, 128, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p51 = p.then(() => {}, () => 1); >p51 : Symbol(p51, Decl(promiseType.ts, 129, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p52 = p.then(() => {}, () => {}); >p52 : Symbol(p52, Decl(promiseType.ts, 130, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p53 = p.then(() => {}, () => {throw 1}); >p53 : Symbol(p53, Decl(promiseType.ts, 131, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p54 = p.then(() => {}, () => Promise.resolve(1)); >p54 : Symbol(p54, Decl(promiseType.ts, 132, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p55 = p.then(() => {}, () => Promise.reject(1)); >p55 : Symbol(p55, Decl(promiseType.ts, 133, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p60 = p.then(() => {throw 1}, undefined); >p60 : Symbol(p60, Decl(promiseType.ts, 135, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p61 = p.then(() => {throw 1}, () => 1); >p61 : Symbol(p61, Decl(promiseType.ts, 136, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p62 = p.then(() => {throw 1}, () => {}); >p62 : Symbol(p62, Decl(promiseType.ts, 137, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p63 = p.then(() => {throw 1}, () => {throw 1}); >p63 : Symbol(p63, Decl(promiseType.ts, 138, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p64 = p.then(() => {throw 1}, () => Promise.resolve(1)); >p64 : Symbol(p64, Decl(promiseType.ts, 139, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p65 = p.then(() => {throw 1}, () => Promise.reject(1)); >p65 : Symbol(p65, Decl(promiseType.ts, 140, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p70 = p.then(() => Promise.resolve("1"), undefined); >p70 : Symbol(p70, Decl(promiseType.ts, 142, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >undefined : Symbol(undefined) const p71 = p.then(() => Promise.resolve("1"), () => 1); >p71 : Symbol(p71, Decl(promiseType.ts, 143, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p72 = p.then(() => Promise.resolve("1"), () => {}); >p72 : Symbol(p72, Decl(promiseType.ts, 144, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p73 = p.then(() => Promise.resolve("1"), () => {throw 1}); >p73 : Symbol(p73, Decl(promiseType.ts, 145, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1)); >p74 : Symbol(p74, Decl(promiseType.ts, 146, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1)); >p75 : Symbol(p75, Decl(promiseType.ts, 147, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p80 = p.then(() => Promise.reject(1), undefined); >p80 : Symbol(p80, Decl(promiseType.ts, 149, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >undefined : Symbol(undefined) const p81 = p.then(() => Promise.reject(1), () => 1); >p81 : Symbol(p81, Decl(promiseType.ts, 150, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p82 = p.then(() => Promise.reject(1), () => {}); >p82 : Symbol(p82, Decl(promiseType.ts, 151, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p83 = p.then(() => Promise.reject(1), () => {throw 1}); >p83 : Symbol(p83, Decl(promiseType.ts, 152, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1)); >p84 : Symbol(p84, Decl(promiseType.ts, 153, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1)); >p85 : Symbol(p85, Decl(promiseType.ts, 154, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseType.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) diff --git a/tests/baselines/reference/promiseTypeInference.symbols b/tests/baselines/reference/promiseTypeInference.symbols index 1dcf037b8b388..427158c88eb60 100644 --- a/tests/baselines/reference/promiseTypeInference.symbols +++ b/tests/baselines/reference/promiseTypeInference.symbols @@ -1,17 +1,17 @@ === tests/cases/compiler/promiseTypeInference.ts === declare class Promise { ->Promise : Symbol(Promise, Decl(promiseTypeInference.ts, 0, 0)) ->T : Symbol(T, Decl(promiseTypeInference.ts, 0, 22)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 22)) then(success?: (value: T) => Promise): Promise; ->then : Symbol(Promise.then, Decl(promiseTypeInference.ts, 0, 26)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 26)) >U : Symbol(U, Decl(promiseTypeInference.ts, 1, 9)) >success : Symbol(success, Decl(promiseTypeInference.ts, 1, 12)) >value : Symbol(value, Decl(promiseTypeInference.ts, 1, 23)) ->T : Symbol(T, Decl(promiseTypeInference.ts, 0, 22)) ->Promise : Symbol(Promise, Decl(promiseTypeInference.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 22)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 0)) >U : Symbol(U, Decl(promiseTypeInference.ts, 1, 9)) ->Promise : Symbol(Promise, Decl(promiseTypeInference.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 0)) >U : Symbol(U, Decl(promiseTypeInference.ts, 1, 9)) } interface IPromise { @@ -32,7 +32,7 @@ interface IPromise { declare function load(name: string): Promise; >load : Symbol(load, Decl(promiseTypeInference.ts, 5, 1)) >name : Symbol(name, Decl(promiseTypeInference.ts, 6, 22)) ->Promise : Symbol(Promise, Decl(promiseTypeInference.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 0)) declare function convert(s: string): IPromise; >convert : Symbol(convert, Decl(promiseTypeInference.ts, 6, 53)) @@ -41,9 +41,9 @@ declare function convert(s: string): IPromise; var $$x = load("something").then(s => convert(s)); >$$x : Symbol($$x, Decl(promiseTypeInference.ts, 9, 3)) ->load("something").then : Symbol(Promise.then, Decl(promiseTypeInference.ts, 0, 26)) +>load("something").then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 26)) >load : Symbol(load, Decl(promiseTypeInference.ts, 5, 1)) ->then : Symbol(Promise.then, Decl(promiseTypeInference.ts, 0, 26)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promiseTypeInference.ts, 0, 26)) >s : Symbol(s, Decl(promiseTypeInference.ts, 9, 33)) >convert : Symbol(convert, Decl(promiseTypeInference.ts, 6, 53)) >s : Symbol(s, Decl(promiseTypeInference.ts, 9, 33)) diff --git a/tests/baselines/reference/promiseTypeInference.types b/tests/baselines/reference/promiseTypeInference.types index f3026c68f2123..cd1a57d6414ea 100644 --- a/tests/baselines/reference/promiseTypeInference.types +++ b/tests/baselines/reference/promiseTypeInference.types @@ -4,7 +4,7 @@ declare class Promise { >T : T then(success?: (value: T) => Promise): Promise; ->then : (success?: (value: T) => Promise) => Promise +>then : { (onfulfilled?: (value: T) => T | PromiseLike, onrejected?: (reason: any) => T | PromiseLike): Promise; (onfulfilled: (value: T) => T | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: T) => Promise): Promise; } >U : U >success : (value: T) => Promise >value : T @@ -42,11 +42,11 @@ declare function convert(s: string): IPromise; var $$x = load("something").then(s => convert(s)); >$$x : Promise >load("something").then(s => convert(s)) : Promise ->load("something").then : (success?: (value: string) => Promise) => Promise +>load("something").then : { (onfulfilled?: (value: string) => string | PromiseLike, onrejected?: (reason: any) => string | PromiseLike): Promise; (onfulfilled: (value: string) => string | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: string) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: string) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: string) => Promise): Promise; } >load("something") : Promise >load : (name: string) => Promise >"something" : "something" ->then : (success?: (value: string) => Promise) => Promise +>then : { (onfulfilled?: (value: string) => string | PromiseLike, onrejected?: (reason: any) => string | PromiseLike): Promise; (onfulfilled: (value: string) => string | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: string) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: string) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: string) => Promise): Promise; } >s => convert(s) : (s: string) => IPromise >s : string >convert(s) : IPromise diff --git a/tests/baselines/reference/promiseTypeStrictNull.symbols b/tests/baselines/reference/promiseTypeStrictNull.symbols index bf14c51656e05..f7972286d2f39 100644 --- a/tests/baselines/reference/promiseTypeStrictNull.symbols +++ b/tests/baselines/reference/promiseTypeStrictNull.symbols @@ -1,88 +1,88 @@ === tests/cases/compiler/promiseTypeStrictNull.ts === declare var p: Promise; >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) const a = p.then(); >a : Symbol(a, Decl(promiseTypeStrictNull.ts, 2, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const b = p.then(b => 1); >b : Symbol(b, Decl(promiseTypeStrictNull.ts, 3, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseTypeStrictNull.ts, 3, 17)) const c = p.then(b => 1, e => 'error'); >c : Symbol(c, Decl(promiseTypeStrictNull.ts, 4, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseTypeStrictNull.ts, 4, 17)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 4, 24)) const d = p.then(b => 1, e => { }); >d : Symbol(d, Decl(promiseTypeStrictNull.ts, 5, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseTypeStrictNull.ts, 5, 17)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 5, 24)) const e = p.then(b => 1, e => { throw Error(); }); >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 6, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseTypeStrictNull.ts, 6, 17)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 6, 24)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const f = p.then(b => 1, e => Promise.reject(Error())); >f : Symbol(f, Decl(promiseTypeStrictNull.ts, 7, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >b : Symbol(b, Decl(promiseTypeStrictNull.ts, 7, 17)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 7, 24)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const g = p.catch(e => 'error'); >g : Symbol(g, Decl(promiseTypeStrictNull.ts, 8, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 8, 18)) const h = p.catch(e => { }); >h : Symbol(h, Decl(promiseTypeStrictNull.ts, 9, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 9, 18)) const i = p.catch(e => { throw Error(); }); >i : Symbol(i, Decl(promiseTypeStrictNull.ts, 10, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 10, 18)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const j = p.catch(e => Promise.reject(Error())); >j : Symbol(j, Decl(promiseTypeStrictNull.ts, 11, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >e : Symbol(e, Decl(promiseTypeStrictNull.ts, 11, 18)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) @@ -167,7 +167,7 @@ async function F() { return Promise.reject(Error()); >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } @@ -226,7 +226,7 @@ async function I() { return Promise.reject(Error()); >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) } @@ -236,405 +236,405 @@ async function I() { const p00 = p.catch(); >p00 : Symbol(p00, Decl(promiseTypeStrictNull.ts, 96, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p01 = p.catch(undefined); >p01 : Symbol(p01, Decl(promiseTypeStrictNull.ts, 97, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p07 = p.catch(null); >p07 : Symbol(p07, Decl(promiseTypeStrictNull.ts, 98, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p02 = p.catch(() => 1); >p02 : Symbol(p02, Decl(promiseTypeStrictNull.ts, 99, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p03 = p.catch(() => {}); >p03 : Symbol(p03, Decl(promiseTypeStrictNull.ts, 100, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p04 = p.catch(() => {throw 1}); >p04 : Symbol(p04, Decl(promiseTypeStrictNull.ts, 101, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p05 = p.catch(() => Promise.reject(1)); >p05 : Symbol(p05, Decl(promiseTypeStrictNull.ts, 102, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p06 = p.catch(() => Promise.resolve(1)); >p06 : Symbol(p06, Decl(promiseTypeStrictNull.ts, 103, 5)) ->p.catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->catch : Symbol(Promise.catch, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>catch : Symbol(Promise.catch, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p10 = p.then(); >p10 : Symbol(p10, Decl(promiseTypeStrictNull.ts, 105, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p20 = p.then(undefined); >p20 : Symbol(p20, Decl(promiseTypeStrictNull.ts, 107, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p21 = p.then(() => 1); >p21 : Symbol(p21, Decl(promiseTypeStrictNull.ts, 108, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p22 = p.then(() => {}); >p22 : Symbol(p22, Decl(promiseTypeStrictNull.ts, 109, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p23 = p.then(() => {throw 1}); >p23 : Symbol(p23, Decl(promiseTypeStrictNull.ts, 110, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p24 = p.then(() => Promise.resolve(1)); >p24 : Symbol(p24, Decl(promiseTypeStrictNull.ts, 111, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p25 = p.then(() => Promise.reject(1)); >p25 : Symbol(p25, Decl(promiseTypeStrictNull.ts, 112, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p30 = p.then(undefined, undefined); >p30 : Symbol(p30, Decl(promiseTypeStrictNull.ts, 114, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) >undefined : Symbol(undefined) const p31 = p.then(undefined, () => 1); >p31 : Symbol(p31, Decl(promiseTypeStrictNull.ts, 115, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p32 = p.then(undefined, () => {}); >p32 : Symbol(p32, Decl(promiseTypeStrictNull.ts, 116, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p33 = p.then(undefined, () => {throw 1}); >p33 : Symbol(p33, Decl(promiseTypeStrictNull.ts, 117, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p34 = p.then(undefined, () => Promise.resolve(1)); >p34 : Symbol(p34, Decl(promiseTypeStrictNull.ts, 118, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p35 = p.then(undefined, () => Promise.reject(1)); >p35 : Symbol(p35, Decl(promiseTypeStrictNull.ts, 119, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p40 = p.then(() => "1", undefined); >p40 : Symbol(p40, Decl(promiseTypeStrictNull.ts, 121, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p41 = p.then(() => "1", () => 1); >p41 : Symbol(p41, Decl(promiseTypeStrictNull.ts, 122, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p42 = p.then(() => "1", () => {}); >p42 : Symbol(p42, Decl(promiseTypeStrictNull.ts, 123, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p43 = p.then(() => "1", () => {throw 1}); >p43 : Symbol(p43, Decl(promiseTypeStrictNull.ts, 124, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p44 = p.then(() => "1", () => Promise.resolve(1)); >p44 : Symbol(p44, Decl(promiseTypeStrictNull.ts, 125, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p45 = p.then(() => "1", () => Promise.reject(1)); >p45 : Symbol(p45, Decl(promiseTypeStrictNull.ts, 126, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p50 = p.then(() => {}, undefined); >p50 : Symbol(p50, Decl(promiseTypeStrictNull.ts, 128, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p51 = p.then(() => {}, () => 1); >p51 : Symbol(p51, Decl(promiseTypeStrictNull.ts, 129, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p52 = p.then(() => {}, () => {}); >p52 : Symbol(p52, Decl(promiseTypeStrictNull.ts, 130, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p53 = p.then(() => {}, () => {throw 1}); >p53 : Symbol(p53, Decl(promiseTypeStrictNull.ts, 131, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p54 = p.then(() => {}, () => Promise.resolve(1)); >p54 : Symbol(p54, Decl(promiseTypeStrictNull.ts, 132, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p55 = p.then(() => {}, () => Promise.reject(1)); >p55 : Symbol(p55, Decl(promiseTypeStrictNull.ts, 133, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p60 = p.then(() => {throw 1}, undefined); >p60 : Symbol(p60, Decl(promiseTypeStrictNull.ts, 135, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >undefined : Symbol(undefined) const p61 = p.then(() => {throw 1}, () => 1); >p61 : Symbol(p61, Decl(promiseTypeStrictNull.ts, 136, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p62 = p.then(() => {throw 1}, () => {}); >p62 : Symbol(p62, Decl(promiseTypeStrictNull.ts, 137, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p63 = p.then(() => {throw 1}, () => {throw 1}); >p63 : Symbol(p63, Decl(promiseTypeStrictNull.ts, 138, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) const p64 = p.then(() => {throw 1}, () => Promise.resolve(1)); >p64 : Symbol(p64, Decl(promiseTypeStrictNull.ts, 139, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p65 = p.then(() => {throw 1}, () => Promise.reject(1)); >p65 : Symbol(p65, Decl(promiseTypeStrictNull.ts, 140, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p70 = p.then(() => Promise.resolve("1"), undefined); >p70 : Symbol(p70, Decl(promiseTypeStrictNull.ts, 142, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >undefined : Symbol(undefined) const p71 = p.then(() => Promise.resolve("1"), () => 1); >p71 : Symbol(p71, Decl(promiseTypeStrictNull.ts, 143, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p72 = p.then(() => Promise.resolve("1"), () => {}); >p72 : Symbol(p72, Decl(promiseTypeStrictNull.ts, 144, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p73 = p.then(() => Promise.resolve("1"), () => {throw 1}); >p73 : Symbol(p73, Decl(promiseTypeStrictNull.ts, 145, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p74 = p.then(() => Promise.resolve("1"), () => Promise.resolve(1)); >p74 : Symbol(p74, Decl(promiseTypeStrictNull.ts, 146, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p75 = p.then(() => Promise.resolve("1"), () => Promise.reject(1)); >p75 : Symbol(p75, Decl(promiseTypeStrictNull.ts, 147, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p80 = p.then(() => Promise.reject(1), undefined); >p80 : Symbol(p80, Decl(promiseTypeStrictNull.ts, 149, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >undefined : Symbol(undefined) const p81 = p.then(() => Promise.reject(1), () => 1); >p81 : Symbol(p81, Decl(promiseTypeStrictNull.ts, 150, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p82 = p.then(() => Promise.reject(1), () => {}); >p82 : Symbol(p82, Decl(promiseTypeStrictNull.ts, 151, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p83 = p.then(() => Promise.reject(1), () => {throw 1}); >p83 : Symbol(p83, Decl(promiseTypeStrictNull.ts, 152, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p84 = p.then(() => Promise.reject(1), () => Promise.resolve(1)); >p84 : Symbol(p84, Decl(promiseTypeStrictNull.ts, 153, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) const p85 = p.then(() => Promise.reject(1), () => Promise.reject(1)); >p85 : Symbol(p85, Decl(promiseTypeStrictNull.ts, 154, 5)) ->p.then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>p.then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >p : Symbol(p, Decl(promiseTypeStrictNull.ts, 0, 11)) ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >Promise.reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >reject : Symbol(PromiseConstructor.reject, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) diff --git a/tests/baselines/reference/promiseVoidErrorCallback.symbols b/tests/baselines/reference/promiseVoidErrorCallback.symbols index 67747f5f1500d..722cd771890e6 100644 --- a/tests/baselines/reference/promiseVoidErrorCallback.symbols +++ b/tests/baselines/reference/promiseVoidErrorCallback.symbols @@ -22,12 +22,12 @@ interface T3 { function f1(): Promise { >f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >T1 : Symbol(T1, Decl(promiseVoidErrorCallback.ts, 0, 0)) return Promise.resolve({ __t1: "foo_t1" }); >Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) >resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) >__t1 : Symbol(__t1, Decl(promiseVoidErrorCallback.ts, 13, 28)) } @@ -47,12 +47,12 @@ function f2(x: T1): T2 { var x3 = f1() >x3 : Symbol(x3, Decl(promiseVoidErrorCallback.ts, 20, 3)) ->f1() .then(f2, (e: Error) => { throw e;}) .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) ->f1() .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>f1() .then(f2, (e: Error) => { throw e;}) .then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>f1() .then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1)) .then(f2, (e: Error) => { ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >f2 : Symbol(f2, Decl(promiseVoidErrorCallback.ts, 14, 1)) >e : Symbol(e, Decl(promiseVoidErrorCallback.ts, 21, 15)) >Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) @@ -62,7 +62,7 @@ var x3 = f1() }) .then((x: T2) => { ->then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --)) +>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >x : Symbol(x, Decl(promiseVoidErrorCallback.ts, 24, 11)) >T2 : Symbol(T2, Decl(promiseVoidErrorCallback.ts, 2, 1)) diff --git a/tests/baselines/reference/promises.symbols b/tests/baselines/reference/promises.symbols index 623a9cfb20a50..e8f66a92cbb65 100644 --- a/tests/baselines/reference/promises.symbols +++ b/tests/baselines/reference/promises.symbols @@ -1,31 +1,31 @@ === tests/cases/compiler/promises.ts === interface Promise { ->Promise : Symbol(Promise, Decl(promises.ts, 0, 0)) ->T : Symbol(T, Decl(promises.ts, 0, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 18)) then(success?: (value: T) => U): Promise; ->then : Symbol(Promise.then, Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51)) >U : Symbol(U, Decl(promises.ts, 1, 9)) >success : Symbol(success, Decl(promises.ts, 1, 12)) >value : Symbol(value, Decl(promises.ts, 1, 23)) ->T : Symbol(T, Decl(promises.ts, 0, 18)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 18)) >U : Symbol(U, Decl(promises.ts, 1, 9)) ->Promise : Symbol(Promise, Decl(promises.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 0)) >U : Symbol(U, Decl(promises.ts, 1, 9)) then(success?: (value: T) => Promise): Promise; ->then : Symbol(Promise.then, Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51)) >U : Symbol(U, Decl(promises.ts, 2, 9)) >success : Symbol(success, Decl(promises.ts, 2, 12)) >value : Symbol(value, Decl(promises.ts, 2, 23)) ->T : Symbol(T, Decl(promises.ts, 0, 18)) ->Promise : Symbol(Promise, Decl(promises.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 0)) >U : Symbol(U, Decl(promises.ts, 2, 9)) ->Promise : Symbol(Promise, Decl(promises.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 0)) >U : Symbol(U, Decl(promises.ts, 2, 9)) value: T; >value : Symbol(Promise.value, Decl(promises.ts, 2, 60)) ->T : Symbol(T, Decl(promises.ts, 0, 18)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promises.ts, 0, 18)) } diff --git a/tests/baselines/reference/promises.types b/tests/baselines/reference/promises.types index 639d28677d732..90372af206b78 100644 --- a/tests/baselines/reference/promises.types +++ b/tests/baselines/reference/promises.types @@ -4,7 +4,7 @@ interface Promise { >T : T then(success?: (value: T) => U): Promise; ->then : { (success?: (value: T) => U): Promise; (success?: (value: T) => Promise): Promise; } +>then : { (onfulfilled?: (value: T) => T | PromiseLike, onrejected?: (reason: any) => T | PromiseLike): Promise; (onfulfilled: (value: T) => T | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: T) => U): Promise; (success?: (value: T) => Promise): Promise; } >U : U >success : (value: T) => U >value : T @@ -14,7 +14,7 @@ interface Promise { >U : U then(success?: (value: T) => Promise): Promise; ->then : { (success?: (value: T) => U): Promise; (success?: (value: T) => Promise): Promise; } +>then : { (onfulfilled?: (value: T) => T | PromiseLike, onrejected?: (reason: any) => T | PromiseLike): Promise; (onfulfilled: (value: T) => T | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: T) => U): Promise; (success?: (value: T) => Promise): Promise; } >U : U >success : (value: T) => Promise >value : T diff --git a/tests/baselines/reference/promisesWithConstraints.symbols b/tests/baselines/reference/promisesWithConstraints.symbols index a180a26135cca..c6ced6b291d0b 100644 --- a/tests/baselines/reference/promisesWithConstraints.symbols +++ b/tests/baselines/reference/promisesWithConstraints.symbols @@ -1,17 +1,17 @@ === tests/cases/compiler/promisesWithConstraints.ts === interface Promise { ->Promise : Symbol(Promise, Decl(promisesWithConstraints.ts, 0, 0)) ->T : Symbol(T, Decl(promisesWithConstraints.ts, 0, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 18)) then(cb: (x: T) => Promise): Promise; ->then : Symbol(Promise.then, Decl(promisesWithConstraints.ts, 0, 22)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 22)) >U : Symbol(U, Decl(promisesWithConstraints.ts, 1, 9)) >cb : Symbol(cb, Decl(promisesWithConstraints.ts, 1, 12)) >x : Symbol(x, Decl(promisesWithConstraints.ts, 1, 17)) ->T : Symbol(T, Decl(promisesWithConstraints.ts, 0, 18)) ->Promise : Symbol(Promise, Decl(promisesWithConstraints.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0)) >U : Symbol(U, Decl(promisesWithConstraints.ts, 1, 9)) ->Promise : Symbol(Promise, Decl(promisesWithConstraints.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0)) >U : Symbol(U, Decl(promisesWithConstraints.ts, 1, 9)) } @@ -27,9 +27,9 @@ interface CPromise { >cb : Symbol(cb, Decl(promisesWithConstraints.ts, 5, 32)) >x : Symbol(x, Decl(promisesWithConstraints.ts, 5, 37)) >T : Symbol(T, Decl(promisesWithConstraints.ts, 4, 19)) ->Promise : Symbol(Promise, Decl(promisesWithConstraints.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0)) >U : Symbol(U, Decl(promisesWithConstraints.ts, 5, 9)) ->Promise : Symbol(Promise, Decl(promisesWithConstraints.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0)) >U : Symbol(U, Decl(promisesWithConstraints.ts, 5, 9)) } @@ -44,12 +44,12 @@ interface Bar { x; y; } var a: Promise; >a : Symbol(a, Decl(promisesWithConstraints.ts, 11, 3)) ->Promise : Symbol(Promise, Decl(promisesWithConstraints.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0)) >Foo : Symbol(Foo, Decl(promisesWithConstraints.ts, 6, 1)) var b: Promise; >b : Symbol(b, Decl(promisesWithConstraints.ts, 12, 3)) ->Promise : Symbol(Promise, Decl(promisesWithConstraints.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(promisesWithConstraints.ts, 0, 0)) >Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 20)) a = b; // ok diff --git a/tests/baselines/reference/promisesWithConstraints.types b/tests/baselines/reference/promisesWithConstraints.types index a8c4c64d3fd1c..d8ebc002a4f4d 100644 --- a/tests/baselines/reference/promisesWithConstraints.types +++ b/tests/baselines/reference/promisesWithConstraints.types @@ -4,7 +4,7 @@ interface Promise { >T : T then(cb: (x: T) => Promise): Promise; ->then : (cb: (x: T) => Promise) => Promise +>then : { (onfulfilled?: (value: T) => T | PromiseLike, onrejected?: (reason: any) => T | PromiseLike): Promise; (onfulfilled: (value: T) => T | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (cb: (x: T) => Promise): Promise; } >U : U >cb : (x: T) => Promise >x : T diff --git a/tests/baselines/reference/specializationError.symbols b/tests/baselines/reference/specializationError.symbols index b866a7034df3d..42b37b40c83bc 100644 --- a/tests/baselines/reference/specializationError.symbols +++ b/tests/baselines/reference/specializationError.symbols @@ -1,13 +1,13 @@ === tests/cases/compiler/specializationError.ts === interface Promise { ->Promise : Symbol(Promise, Decl(specializationError.ts, 0, 0)) ->T : Symbol(T, Decl(specializationError.ts, 0, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(specializationError.ts, 0, 0)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(specializationError.ts, 0, 18)) then(value: T): void; ->then : Symbol(Promise.then, Decl(specializationError.ts, 0, 22)) +>then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(specializationError.ts, 0, 22)) >U : Symbol(U, Decl(specializationError.ts, 1, 9)) >value : Symbol(value, Decl(specializationError.ts, 1, 12)) ->T : Symbol(T, Decl(specializationError.ts, 0, 18)) +>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(specializationError.ts, 0, 18)) } interface Bar { @@ -16,21 +16,21 @@ interface Bar { bar(value: "Menu"): Promise; >bar : Symbol(Bar.bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55)) >value : Symbol(value, Decl(specializationError.ts, 5, 8)) ->Promise : Symbol(Promise, Decl(specializationError.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(specializationError.ts, 0, 0)) bar(value: string, element: string): Promise; >bar : Symbol(Bar.bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55)) >T : Symbol(T, Decl(specializationError.ts, 6, 8)) >value : Symbol(value, Decl(specializationError.ts, 6, 11)) >element : Symbol(element, Decl(specializationError.ts, 6, 25)) ->Promise : Symbol(Promise, Decl(specializationError.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(specializationError.ts, 0, 0)) >T : Symbol(T, Decl(specializationError.ts, 6, 8)) bar(value: string): Promise; >bar : Symbol(Bar.bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55)) >T : Symbol(T, Decl(specializationError.ts, 7, 8)) >value : Symbol(value, Decl(specializationError.ts, 7, 11)) ->Promise : Symbol(Promise, Decl(specializationError.ts, 0, 0)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(specializationError.ts, 0, 0)) >T : Symbol(T, Decl(specializationError.ts, 7, 8)) } diff --git a/tests/baselines/reference/specializationError.types b/tests/baselines/reference/specializationError.types index c79816eaf8add..4260ca399befc 100644 --- a/tests/baselines/reference/specializationError.types +++ b/tests/baselines/reference/specializationError.types @@ -4,7 +4,7 @@ interface Promise { >T : T then(value: T): void; ->then : (value: T) => void +>then : { (onfulfilled?: (value: T) => T | PromiseLike, onrejected?: (reason: any) => T | PromiseLike): Promise; (onfulfilled: (value: T) => T | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: T) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (value: T): void; } >U : U >value : T >T : T diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols b/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols index e966202c2777a..88f62aa6273cb 100644 --- a/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols +++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.symbols @@ -36,12 +36,12 @@ declare module "bluebird" { type Bluebird = Promise; >Bluebird : Symbol(Bluebird, Decl(bluebird.d.ts, 0, 27), Decl(bluebird.d.ts, 2, 9)) >T : Symbol(T, Decl(bluebird.d.ts, 1, 18)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >T : Symbol(T, Decl(bluebird.d.ts, 1, 18)) const Bluebird: typeof Promise; >Bluebird : Symbol(Bluebird, Decl(bluebird.d.ts, 0, 27), Decl(bluebird.d.ts, 2, 9)) ->Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --)) +>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export = Bluebird; >Bluebird : Symbol(Bluebird, Decl(bluebird.d.ts, 0, 27), Decl(bluebird.d.ts, 2, 9)) From f673f48fad7eaff4dadb09e90d42a321c072a3b0 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 13 Feb 2017 14:36:12 -0800 Subject: [PATCH 103/116] inject pre-finally and after-finally edges into flow graph to possible ignore pre-finally during flow walk (#13845) --- src/compiler/binder.ts | 35 ++++++++++++++++++- src/compiler/checker.ts | 20 ++++++++++- src/compiler/types.ts | 15 ++++++++ .../baselines/reference/flowAfterFinally1.js | 25 +++++++++++++ .../reference/flowAfterFinally1.symbols | 29 +++++++++++++++ .../reference/flowAfterFinally1.types | 33 +++++++++++++++++ tests/cases/compiler/flowAfterFinally1.ts | 14 ++++++++ 7 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/flowAfterFinally1.js create mode 100644 tests/baselines/reference/flowAfterFinally1.symbols create mode 100644 tests/baselines/reference/flowAfterFinally1.types create mode 100644 tests/cases/compiler/flowAfterFinally1.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 04dc4011a1591..41bf7b58c187b 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1045,7 +1045,35 @@ namespace ts { if (node.finallyBlock) { // in finally flow is combined from pre-try/flow from try/flow from catch // pre-flow is necessary to make sure that finally is reachable even if finally flows in both try and finally blocks are unreachable - addAntecedent(preFinallyLabel, preTryFlow); + + // also for finally blocks we inject two extra edges into the flow graph. + // first -> edge that connects pre-try flow with the label at the beginning of the finally block, it has lock associated with it + // second -> edge that represents post-finally flow. + // these edges are used in following scenario: + // let a; (1) + // try { a = someOperation(); (2)} + // finally { (3) console.log(a) } (4) + // (5) a + + // flow graph for this case looks roughly like this (arrows show ): + // (1-pre-try-flow) <--.. <-- (2-post-try-flow) + // ^ ^ + // |*****(3-pre-finally-label) -----| + // ^ + // |-- ... <-- (4-post-finally-label) <--- (5) + // In case when we walk the flow starting from inside the finally block we want to take edge '*****' into account + // since it ensures that finally is always reachable. However when we start outside the finally block and go through label (5) + // then edge '*****' should be discarded because label 4 is only reachable if post-finally label-4 is reachable + // Simply speaking code inside finally block is treated as reachable as pre-try-flow + // since we conservatively assume that any line in try block can throw or return in which case we'll enter finally. + // However code after finally is reachable only if control flow was not abrupted in try/catch or finally blocks - it should be composed from + // final flows of these blocks without taking pre-try flow into account. + // + // extra edges that we inject allows to control this behavior + // if when walking the flow we step on post-finally edge - we can mark matching pre-finally edge as locked so it will be skipped. + const preFinallyFlow: PreFinallyFlow = { flags: FlowFlags.PreFinally, antecedent: preTryFlow, lock: {} }; + addAntecedent(preFinallyLabel, preFinallyFlow); + currentFlow = finishFlowLabel(preFinallyLabel); bind(node.finallyBlock); // if flow after finally is unreachable - keep it @@ -1061,6 +1089,11 @@ namespace ts { : unreachableFlow; } } + if (!(currentFlow.flags & FlowFlags.Unreachable)) { + const afterFinallyFlow: AfterFinallyFlow = { flags: FlowFlags.AfterFinally, antecedent: currentFlow }; + preFinallyFlow.lock = afterFinallyFlow; + currentFlow = afterFinallyFlow; + } } else { currentFlow = finishFlowLabel(preFinallyLabel); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index fadf49aa16b0c..2b059e29d09b5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -9916,7 +9916,19 @@ namespace ts { } } let type: FlowType; - if (flow.flags & FlowFlags.Assignment) { + if (flow.flags & FlowFlags.AfterFinally) { + // block flow edge: finally -> pre-try (for larger explanation check comment in binder.ts - bindTryStatement + (flow).locked = true; + type = getTypeAtFlowNode((flow).antecedent); + (flow).locked = false; + } + else if (flow.flags & FlowFlags.PreFinally) { + // locked pre-finally flows are filtered out in getTypeAtFlowBranchLabel + // so here just redirect to antecedent + flow = (flow).antecedent; + continue; + } + else if (flow.flags & FlowFlags.Assignment) { type = getTypeAtFlowAssignment(flow); if (!type) { flow = (flow).antecedent; @@ -10072,6 +10084,12 @@ namespace ts { let subtypeReduction = false; let seenIncomplete = false; for (const antecedent of flow.antecedents) { + if (antecedent.flags & FlowFlags.PreFinally && (antecedent).lock.locked) { + // if flow correspond to branch from pre-try to finally and this branch is locked - this means that + // we initially have started following the flow outside the finally block. + // in this case we should ignore this branch. + continue; + } const flowType = getTypeAtFlowNode(antecedent); const type = getTypeFromFlowType(flowType); // If the type at a particular antecedent path is the declared type and the diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 7fb71d12b9966..4d8dcaa8ad7ab 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2071,10 +2071,25 @@ ArrayMutation = 1 << 8, // Potential array mutation Referenced = 1 << 9, // Referenced as antecedent once Shared = 1 << 10, // Referenced as antecedent more than once + PreFinally = 1 << 11, // Injected edge that links pre-finally label and pre-try flow + AfterFinally = 1 << 12, // Injected edge that links post-finally flow with the rest of the graph Label = BranchLabel | LoopLabel, Condition = TrueCondition | FalseCondition } + export interface FlowLock { + locked?: boolean; + } + + export interface AfterFinallyFlow extends FlowNode, FlowLock { + antecedent: FlowNode; + } + + export interface PreFinallyFlow extends FlowNode { + antecedent: FlowNode; + lock: FlowLock; + } + export interface FlowNode { flags: FlowFlags; id?: number; // Node id used by flow type cache in checker diff --git a/tests/baselines/reference/flowAfterFinally1.js b/tests/baselines/reference/flowAfterFinally1.js new file mode 100644 index 0000000000000..93f3425d50625 --- /dev/null +++ b/tests/baselines/reference/flowAfterFinally1.js @@ -0,0 +1,25 @@ +//// [flowAfterFinally1.ts] +declare function openFile(): void +declare function closeFile(): void +declare function someOperation(): {} + +var result: {} +openFile() +try { + result = someOperation() +} finally { + closeFile() +} + +result // should not error here + +//// [flowAfterFinally1.js] +var result; +openFile(); +try { + result = someOperation(); +} +finally { + closeFile(); +} +result; // should not error here diff --git a/tests/baselines/reference/flowAfterFinally1.symbols b/tests/baselines/reference/flowAfterFinally1.symbols new file mode 100644 index 0000000000000..ad0ffbeb5cfd0 --- /dev/null +++ b/tests/baselines/reference/flowAfterFinally1.symbols @@ -0,0 +1,29 @@ +=== tests/cases/compiler/flowAfterFinally1.ts === +declare function openFile(): void +>openFile : Symbol(openFile, Decl(flowAfterFinally1.ts, 0, 0)) + +declare function closeFile(): void +>closeFile : Symbol(closeFile, Decl(flowAfterFinally1.ts, 0, 33)) + +declare function someOperation(): {} +>someOperation : Symbol(someOperation, Decl(flowAfterFinally1.ts, 1, 34)) + +var result: {} +>result : Symbol(result, Decl(flowAfterFinally1.ts, 4, 3)) + +openFile() +>openFile : Symbol(openFile, Decl(flowAfterFinally1.ts, 0, 0)) + +try { + result = someOperation() +>result : Symbol(result, Decl(flowAfterFinally1.ts, 4, 3)) +>someOperation : Symbol(someOperation, Decl(flowAfterFinally1.ts, 1, 34)) + +} finally { + closeFile() +>closeFile : Symbol(closeFile, Decl(flowAfterFinally1.ts, 0, 33)) +} + +result // should not error here +>result : Symbol(result, Decl(flowAfterFinally1.ts, 4, 3)) + diff --git a/tests/baselines/reference/flowAfterFinally1.types b/tests/baselines/reference/flowAfterFinally1.types new file mode 100644 index 0000000000000..93aae4764b689 --- /dev/null +++ b/tests/baselines/reference/flowAfterFinally1.types @@ -0,0 +1,33 @@ +=== tests/cases/compiler/flowAfterFinally1.ts === +declare function openFile(): void +>openFile : () => void + +declare function closeFile(): void +>closeFile : () => void + +declare function someOperation(): {} +>someOperation : () => {} + +var result: {} +>result : {} + +openFile() +>openFile() : void +>openFile : () => void + +try { + result = someOperation() +>result = someOperation() : {} +>result : {} +>someOperation() : {} +>someOperation : () => {} + +} finally { + closeFile() +>closeFile() : void +>closeFile : () => void +} + +result // should not error here +>result : {} + diff --git a/tests/cases/compiler/flowAfterFinally1.ts b/tests/cases/compiler/flowAfterFinally1.ts new file mode 100644 index 0000000000000..74df6a1be2e56 --- /dev/null +++ b/tests/cases/compiler/flowAfterFinally1.ts @@ -0,0 +1,14 @@ +// @strictNullChecks: true +declare function openFile(): void +declare function closeFile(): void +declare function someOperation(): {} + +var result: {} +openFile() +try { + result = someOperation() +} finally { + closeFile() +} + +result // should not error here \ No newline at end of file From aa5c88f5a6c7751f23c4713b7ccd15f994b4b199 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Mon, 13 Feb 2017 14:42:51 -0800 Subject: [PATCH 104/116] Detect non-tag uses of `<` in TSX completions --- src/services/completions.ts | 30 ++++++++++++++----- .../fourslash/tsxCompletionNonTagLessThan.ts | 14 +++++++++ 2 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 tests/cases/fourslash/tsxCompletionNonTagLessThan.ts diff --git a/src/services/completions.ts b/src/services/completions.ts index df78ab931d158..d5fe54df7192e 100644 --- a/src/services/completions.ts +++ b/src/services/completions.ts @@ -915,13 +915,29 @@ namespace ts.Completions { } } else if (sourceFile.languageVariant === LanguageVariant.JSX) { - if (kind === SyntaxKind.LessThanToken) { - isRightOfOpenTag = true; - location = contextToken; - } - else if (kind === SyntaxKind.SlashToken && contextToken.parent.kind === SyntaxKind.JsxClosingElement) { - isStartingCloseTag = true; - location = contextToken; + switch (contextToken.parent.kind) { + case SyntaxKind.JsxClosingElement: + if (kind === SyntaxKind.SlashToken) { + isStartingCloseTag = true; + location = contextToken; + } + break; + + case SyntaxKind.BinaryExpression: + if (!((contextToken.parent as BinaryExpression).left.flags & NodeFlags.ThisNodeHasError)) { + // It has a left-hand side, so we're not in an opening JSX tag. + break; + } + // fall through + + case SyntaxKind.JsxSelfClosingElement: + case SyntaxKind.JsxElement: + case SyntaxKind.JsxOpeningElement: + if (kind === SyntaxKind.LessThanToken) { + isRightOfOpenTag = true; + location = contextToken; + } + break; } } } diff --git a/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts new file mode 100644 index 0000000000000..d40201146a3c2 --- /dev/null +++ b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts @@ -0,0 +1,14 @@ +/// + +////var x: Array Date: Mon, 13 Feb 2017 14:29:46 -0800 Subject: [PATCH 105/116] Report a specialized error message for missing `Promise` constructor declaration when `Promise` type is available --- src/compiler/checker.ts | 10 +++++++++- src/compiler/diagnosticMessages.json | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index d2b8c2cbad85b..394e95598ed9a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -14299,6 +14299,9 @@ namespace ts { error(func, Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option); return unknownType; } + else if (!getGlobalPromiseConstructorSymbol()) { + error(func, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option); + } return promiseType; } @@ -16895,7 +16898,12 @@ namespace ts { const promiseConstructorSymbol = resolveEntityName(promiseConstructorName, SymbolFlags.Value, /*ignoreErrors*/ true); const promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : unknownType; if (promiseConstructorType === unknownType) { - error(node.type, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName)); + if (promiseConstructorName.kind === SyntaxKind.Identifier && promiseConstructorName.text === "Promise" && getTargetType(returnType) === tryGetGlobalPromiseType()) { + error(node.type, Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option); + } + else { + error(node.type, Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, entityNameToString(promiseConstructorName)); + } return unknownType; } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 9f67b95c4d000..ec6067751a28f 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2055,6 +2055,10 @@ "category": "Error", "code": 2704 }, + "An async function or method in ES5/ES3 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.": { + "category": "Error", + "code": 2705 + }, "Import declaration '{0}' is using private name '{1}'.": { "category": "Error", From 765e57b3182c059cf7feef5190bce633a5485438 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 13 Feb 2017 14:29:46 -0800 Subject: [PATCH 106/116] Update tests --- tests/cases/compiler/bluebirdStaticThis.ts | 7 ++----- tests/cases/compiler/promiseIdentity.ts | 2 +- tests/cases/compiler/promiseIdentity2.ts | 4 ++-- tests/cases/compiler/promiseIdentityWithAny.ts | 4 ++-- tests/cases/compiler/promiseIdentityWithAny2.ts | 2 +- tests/cases/compiler/promiseIdentityWithConstraints.ts | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/cases/compiler/bluebirdStaticThis.ts b/tests/cases/compiler/bluebirdStaticThis.ts index 55b1d0022d863..21b4d244decc6 100644 --- a/tests/cases/compiler/bluebirdStaticThis.ts +++ b/tests/cases/compiler/bluebirdStaticThis.ts @@ -2,7 +2,7 @@ // and all the comments. // Then it adds explicit `this` arguments to the static members. // Tests by: Bart van der Schoor -declare class Promise implements Promise.Thenable { +export declare class Promise implements Promise.Thenable { constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable) => void, reject: (error: any) => void) => void); static try(dit: typeof Promise, fn: () => Promise.Thenable, args?: any[], ctx?: any): Promise; static try(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise; @@ -108,7 +108,7 @@ declare class Promise implements Promise.Thenable { static filter(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; } -declare module Promise { +export declare module Promise { export interface Thenable { then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; @@ -118,9 +118,6 @@ declare module Promise { } -declare module 'bluebird' { - export = Promise; -} interface Foo { a: number; b: string; diff --git a/tests/cases/compiler/promiseIdentity.ts b/tests/cases/compiler/promiseIdentity.ts index d568d75dfaaae..c9d7beabbdb5e 100644 --- a/tests/cases/compiler/promiseIdentity.ts +++ b/tests/cases/compiler/promiseIdentity.ts @@ -1,4 +1,4 @@ -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } interface Promise { diff --git a/tests/cases/compiler/promiseIdentity2.ts b/tests/cases/compiler/promiseIdentity2.ts index b60cf92c12483..4454df6875bbf 100644 --- a/tests/cases/compiler/promiseIdentity2.ts +++ b/tests/cases/compiler/promiseIdentity2.ts @@ -1,7 +1,7 @@ -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } -interface Promise { +export interface Promise { then(callback: (x: T) => Promise): Promise; } diff --git a/tests/cases/compiler/promiseIdentityWithAny.ts b/tests/cases/compiler/promiseIdentityWithAny.ts index 7240eaca5467c..4cdc7c51b57cc 100644 --- a/tests/cases/compiler/promiseIdentityWithAny.ts +++ b/tests/cases/compiler/promiseIdentityWithAny.ts @@ -1,7 +1,7 @@ -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } -interface Promise { +export interface Promise { then(callback: (x: T) => Promise): Promise; } diff --git a/tests/cases/compiler/promiseIdentityWithAny2.ts b/tests/cases/compiler/promiseIdentityWithAny2.ts index 0572caeb7fd1c..e7a69077d033e 100644 --- a/tests/cases/compiler/promiseIdentityWithAny2.ts +++ b/tests/cases/compiler/promiseIdentityWithAny2.ts @@ -1,4 +1,4 @@ -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } interface Promise { diff --git a/tests/cases/compiler/promiseIdentityWithConstraints.ts b/tests/cases/compiler/promiseIdentityWithConstraints.ts index fc0368cbf7918..af94a6998bf98 100644 --- a/tests/cases/compiler/promiseIdentityWithConstraints.ts +++ b/tests/cases/compiler/promiseIdentityWithConstraints.ts @@ -1,7 +1,7 @@ -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } -interface Promise { +export interface Promise { then(callback: (x: T) => Promise): Promise; } From 3f00197fce37b9771b2fab78463d8ea43e2e28e8 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 13 Feb 2017 14:29:46 -0800 Subject: [PATCH 107/116] Accept baselines --- .../asyncFunctionNoReturnType.errors.txt | 16 +++------- .../reference/bluebirdStaticThis.errors.txt | 31 +++++++++---------- .../baselines/reference/bluebirdStaticThis.js | 9 +++--- tests/baselines/reference/promiseIdentity.js | 4 ++- .../reference/promiseIdentity.symbols | 8 ++--- .../baselines/reference/promiseIdentity.types | 2 +- .../reference/promiseIdentity2.errors.txt | 4 +-- tests/baselines/reference/promiseIdentity2.js | 6 ++-- .../reference/promiseIdentityWithAny.js | 6 ++-- .../reference/promiseIdentityWithAny.symbols | 20 ++++++------ .../reference/promiseIdentityWithAny.types | 4 +-- .../promiseIdentityWithAny2.errors.txt | 2 +- .../reference/promiseIdentityWithAny2.js | 4 ++- .../promiseIdentityWithConstraints.js | 6 ++-- .../promiseIdentityWithConstraints.symbols | 28 ++++++++--------- .../promiseIdentityWithConstraints.types | 4 +-- .../reference/promisePermutations.errors.txt | 24 +++++++------- .../reference/promisePermutations2.errors.txt | 24 +++++++------- .../reference/promisePermutations3.errors.txt | 28 ++++++++--------- 19 files changed, 115 insertions(+), 115 deletions(-) diff --git a/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt b/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt index 89a61ff648fd3..5d4a87a186ca4 100644 --- a/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt +++ b/tests/baselines/reference/asyncFunctionNoReturnType.errors.txt @@ -1,22 +1,16 @@ -error TS2318: Cannot find global type 'Promise'. -tests/cases/compiler/asyncFunctionNoReturnType.ts(1,1): error TS2697: An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option. -tests/cases/compiler/asyncFunctionNoReturnType.ts(1,1): error TS7030: Not all code paths return a value. +error TS2468: Cannot find global value 'Promise'. +tests/cases/compiler/asyncFunctionNoReturnType.ts(1,1): error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option. tests/cases/compiler/asyncFunctionNoReturnType.ts(2,9): error TS2304: Cannot find name 'window'. -tests/cases/compiler/asyncFunctionNoReturnType.ts(3,9): error TS7030: Not all code paths return a value. -!!! error TS2318: Cannot find global type 'Promise'. -==== tests/cases/compiler/asyncFunctionNoReturnType.ts (4 errors) ==== +!!! error TS2468: Cannot find global value 'Promise'. +==== tests/cases/compiler/asyncFunctionNoReturnType.ts (2 errors) ==== async () => { ~~~~~~~~~~~~~ -!!! error TS2697: An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option. - ~~~~~~~~~~~~~ -!!! error TS7030: Not all code paths return a value. +!!! error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option. if (window) ~~~~~~ !!! error TS2304: Cannot find name 'window'. return; - ~~~~~~~ -!!! error TS7030: Not all code paths return a value. } \ No newline at end of file diff --git a/tests/baselines/reference/bluebirdStaticThis.errors.txt b/tests/baselines/reference/bluebirdStaticThis.errors.txt index 1c22a12c34179..b9e28711715a0 100644 --- a/tests/baselines/reference/bluebirdStaticThis.errors.txt +++ b/tests/baselines/reference/bluebirdStaticThis.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/bluebirdStaticThis.ts(5,15): error TS2420: Class 'Promise' incorrectly implements interface 'Thenable'. +tests/cases/compiler/bluebirdStaticThis.ts(5,22): error TS2420: Class 'Promise' incorrectly implements interface 'Thenable'. Property 'then' is missing in type 'Promise'. -tests/cases/compiler/bluebirdStaticThis.ts(22,51): error TS2694: Namespace 'Promise' has no exported member 'Resolver'. -tests/cases/compiler/bluebirdStaticThis.ts(57,109): error TS2694: Namespace 'Promise' has no exported member 'Inspection'. -tests/cases/compiler/bluebirdStaticThis.ts(58,91): error TS2694: Namespace 'Promise' has no exported member 'Inspection'. -tests/cases/compiler/bluebirdStaticThis.ts(59,91): error TS2694: Namespace 'Promise' has no exported member 'Inspection'. -tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace 'Promise' has no exported member 'Inspection'. +tests/cases/compiler/bluebirdStaticThis.ts(22,51): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Resolver'. +tests/cases/compiler/bluebirdStaticThis.ts(57,109): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. +tests/cases/compiler/bluebirdStaticThis.ts(58,91): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. +tests/cases/compiler/bluebirdStaticThis.ts(59,91): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. +tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. ==== tests/cases/compiler/bluebirdStaticThis.ts (6 errors) ==== @@ -12,8 +12,8 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace 'Prom // and all the comments. // Then it adds explicit `this` arguments to the static members. // Tests by: Bart van der Schoor - declare class Promise implements Promise.Thenable { - ~~~~~~~ + export declare class Promise implements Promise.Thenable { + ~~~~~~~ !!! error TS2420: Class 'Promise' incorrectly implements interface 'Thenable'. !!! error TS2420: Property 'then' is missing in type 'Promise'. constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable) => void, reject: (error: any) => void) => void); @@ -34,7 +34,7 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace 'Prom static defer(dit: typeof Promise): Promise.Resolver; ~~~~~~~~ -!!! error TS2694: Namespace 'Promise' has no exported member 'Resolver'. +!!! error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Resolver'. static cast(dit: typeof Promise, value: Promise.Thenable): Promise; static cast(dit: typeof Promise, value: R): Promise; @@ -71,16 +71,16 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace 'Prom static settle(dit: typeof Promise, values: Promise.Thenable[]>): Promise[]>; ~~~~~~~~~~ -!!! error TS2694: Namespace 'Promise' has no exported member 'Inspection'. +!!! error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. static settle(dit: typeof Promise, values: Promise.Thenable): Promise[]>; ~~~~~~~~~~ -!!! error TS2694: Namespace 'Promise' has no exported member 'Inspection'. +!!! error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. static settle(dit: typeof Promise, values: Promise.Thenable[]): Promise[]>; ~~~~~~~~~~ -!!! error TS2694: Namespace 'Promise' has no exported member 'Inspection'. +!!! error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. static settle(dit: typeof Promise, values: R[]): Promise[]>; ~~~~~~~~~~ -!!! error TS2694: Namespace 'Promise' has no exported member 'Inspection'. +!!! error TS2694: Namespace '"tests/cases/compiler/bluebirdStaticThis".Promise' has no exported member 'Inspection'. static any(dit: typeof Promise, values: Promise.Thenable[]>): Promise; static any(dit: typeof Promise, values: Promise.Thenable): Promise; @@ -131,7 +131,7 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace 'Prom static filter(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; } - declare module Promise { + export declare module Promise { export interface Thenable { then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; @@ -141,9 +141,6 @@ tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2694: Namespace 'Prom } - declare module 'bluebird' { - export = Promise; - } interface Foo { a: number; b: string; diff --git a/tests/baselines/reference/bluebirdStaticThis.js b/tests/baselines/reference/bluebirdStaticThis.js index 606f778323fdb..1d8d8f2ec43a2 100644 --- a/tests/baselines/reference/bluebirdStaticThis.js +++ b/tests/baselines/reference/bluebirdStaticThis.js @@ -3,7 +3,7 @@ // and all the comments. // Then it adds explicit `this` arguments to the static members. // Tests by: Bart van der Schoor -declare class Promise implements Promise.Thenable { +export declare class Promise implements Promise.Thenable { constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable) => void, reject: (error: any) => void) => void); static try(dit: typeof Promise, fn: () => Promise.Thenable, args?: any[], ctx?: any): Promise; static try(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise; @@ -109,7 +109,7 @@ declare class Promise implements Promise.Thenable { static filter(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise; } -declare module Promise { +export declare module Promise { export interface Thenable { then(onFulfilled: (value: R) => Thenable, onRejected: (error: any) => Thenable): Thenable; then(onFulfilled: (value: R) => Thenable, onRejected?: (error: any) => U): Thenable; @@ -119,9 +119,6 @@ declare module Promise { } -declare module 'bluebird' { - export = Promise; -} interface Foo { a: number; b: string; @@ -142,6 +139,8 @@ fooProm = Promise.try(Promise, () => { }, arr, x); //// [bluebirdStaticThis.js] +"use strict"; +exports.__esModule = true; var x; var arr; var foo; diff --git a/tests/baselines/reference/promiseIdentity.js b/tests/baselines/reference/promiseIdentity.js index 5b57709e991e8..526bae62c0812 100644 --- a/tests/baselines/reference/promiseIdentity.js +++ b/tests/baselines/reference/promiseIdentity.js @@ -1,5 +1,5 @@ //// [promiseIdentity.ts] -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } interface Promise { @@ -22,6 +22,8 @@ var y: IPromise2; var y: Promise2; //// [promiseIdentity.js] +"use strict"; +exports.__esModule = true; var x; var x; // Ok because T in this particular Promise2 is any, as are all the U and W references. diff --git a/tests/baselines/reference/promiseIdentity.symbols b/tests/baselines/reference/promiseIdentity.symbols index f1404eaf7b194..f103f5b4199dd 100644 --- a/tests/baselines/reference/promiseIdentity.symbols +++ b/tests/baselines/reference/promiseIdentity.symbols @@ -1,14 +1,14 @@ === tests/cases/compiler/promiseIdentity.ts === -interface IPromise { +export interface IPromise { >IPromise : Symbol(IPromise, Decl(promiseIdentity.ts, 0, 0)) ->T : Symbol(T, Decl(promiseIdentity.ts, 0, 19)) +>T : Symbol(T, Decl(promiseIdentity.ts, 0, 26)) then(callback: (x: T) => IPromise): IPromise; ->then : Symbol(IPromise.then, Decl(promiseIdentity.ts, 0, 23)) +>then : Symbol(IPromise.then, Decl(promiseIdentity.ts, 0, 30)) >U : Symbol(U, Decl(promiseIdentity.ts, 1, 9)) >callback : Symbol(callback, Decl(promiseIdentity.ts, 1, 12)) >x : Symbol(x, Decl(promiseIdentity.ts, 1, 23)) ->T : Symbol(T, Decl(promiseIdentity.ts, 0, 19)) +>T : Symbol(T, Decl(promiseIdentity.ts, 0, 26)) >IPromise : Symbol(IPromise, Decl(promiseIdentity.ts, 0, 0)) >U : Symbol(U, Decl(promiseIdentity.ts, 1, 9)) >IPromise : Symbol(IPromise, Decl(promiseIdentity.ts, 0, 0)) diff --git a/tests/baselines/reference/promiseIdentity.types b/tests/baselines/reference/promiseIdentity.types index 2be853c996467..af8bc9908bf0a 100644 --- a/tests/baselines/reference/promiseIdentity.types +++ b/tests/baselines/reference/promiseIdentity.types @@ -1,5 +1,5 @@ === tests/cases/compiler/promiseIdentity.ts === -interface IPromise { +export interface IPromise { >IPromise : IPromise >T : T diff --git a/tests/baselines/reference/promiseIdentity2.errors.txt b/tests/baselines/reference/promiseIdentity2.errors.txt index 6b8223c3bdad4..edfba2f42bcd4 100644 --- a/tests/baselines/reference/promiseIdentity2.errors.txt +++ b/tests/baselines/reference/promiseIdentity2.errors.txt @@ -2,10 +2,10 @@ tests/cases/compiler/promiseIdentity2.ts(11,5): error TS2403: Subsequent variabl ==== tests/cases/compiler/promiseIdentity2.ts (1 errors) ==== - interface IPromise { + export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } - interface Promise { + export interface Promise { then(callback: (x: T) => Promise): Promise; } diff --git a/tests/baselines/reference/promiseIdentity2.js b/tests/baselines/reference/promiseIdentity2.js index 8bb4139a7375f..81beb44d78a74 100644 --- a/tests/baselines/reference/promiseIdentity2.js +++ b/tests/baselines/reference/promiseIdentity2.js @@ -1,8 +1,8 @@ //// [promiseIdentity2.ts] -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } -interface Promise { +export interface Promise { then(callback: (x: T) => Promise): Promise; } @@ -12,6 +12,8 @@ var x: IPromise; var x: Promise; //// [promiseIdentity2.js] +"use strict"; +exports.__esModule = true; // error because T is string in the first declaration, and T is boolean in the second // Return type and callback return type are ok because T is any in this particular Promise var x; diff --git a/tests/baselines/reference/promiseIdentityWithAny.js b/tests/baselines/reference/promiseIdentityWithAny.js index 1a516067c8e3d..422d00a131272 100644 --- a/tests/baselines/reference/promiseIdentityWithAny.js +++ b/tests/baselines/reference/promiseIdentityWithAny.js @@ -1,8 +1,8 @@ //// [promiseIdentityWithAny.ts] -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } -interface Promise { +export interface Promise { then(callback: (x: T) => Promise): Promise; } @@ -11,6 +11,8 @@ var x: IPromise; var x: Promise; //// [promiseIdentityWithAny.js] +"use strict"; +exports.__esModule = true; // Should be ok because signature type parameters get erased to any var x; var x; diff --git a/tests/baselines/reference/promiseIdentityWithAny.symbols b/tests/baselines/reference/promiseIdentityWithAny.symbols index 8bcf096a0a37c..65881f53a321e 100644 --- a/tests/baselines/reference/promiseIdentityWithAny.symbols +++ b/tests/baselines/reference/promiseIdentityWithAny.symbols @@ -1,16 +1,16 @@ === tests/cases/compiler/promiseIdentityWithAny.ts === -interface IPromise { +export interface IPromise { >IPromise : Symbol(IPromise, Decl(promiseIdentityWithAny.ts, 0, 0)) ->T : Symbol(T, Decl(promiseIdentityWithAny.ts, 0, 19)) ->V : Symbol(V, Decl(promiseIdentityWithAny.ts, 0, 21)) +>T : Symbol(T, Decl(promiseIdentityWithAny.ts, 0, 26)) +>V : Symbol(V, Decl(promiseIdentityWithAny.ts, 0, 28)) then(callback: (x: T) => IPromise): IPromise; ->then : Symbol(IPromise.then, Decl(promiseIdentityWithAny.ts, 0, 26)) +>then : Symbol(IPromise.then, Decl(promiseIdentityWithAny.ts, 0, 33)) >U : Symbol(U, Decl(promiseIdentityWithAny.ts, 1, 9)) >W : Symbol(W, Decl(promiseIdentityWithAny.ts, 1, 11)) >callback : Symbol(callback, Decl(promiseIdentityWithAny.ts, 1, 15)) >x : Symbol(x, Decl(promiseIdentityWithAny.ts, 1, 26)) ->T : Symbol(T, Decl(promiseIdentityWithAny.ts, 0, 19)) +>T : Symbol(T, Decl(promiseIdentityWithAny.ts, 0, 26)) >IPromise : Symbol(IPromise, Decl(promiseIdentityWithAny.ts, 0, 0)) >U : Symbol(U, Decl(promiseIdentityWithAny.ts, 1, 9)) >W : Symbol(W, Decl(promiseIdentityWithAny.ts, 1, 11)) @@ -18,18 +18,18 @@ interface IPromise { >U : Symbol(U, Decl(promiseIdentityWithAny.ts, 1, 9)) >W : Symbol(W, Decl(promiseIdentityWithAny.ts, 1, 11)) } -interface Promise { +export interface Promise { >Promise : Symbol(Promise, Decl(promiseIdentityWithAny.ts, 2, 1)) ->T : Symbol(T, Decl(promiseIdentityWithAny.ts, 3, 18)) ->V : Symbol(V, Decl(promiseIdentityWithAny.ts, 3, 20)) +>T : Symbol(T, Decl(promiseIdentityWithAny.ts, 3, 25)) +>V : Symbol(V, Decl(promiseIdentityWithAny.ts, 3, 27)) then(callback: (x: T) => Promise): Promise; ->then : Symbol(Promise.then, Decl(promiseIdentityWithAny.ts, 3, 25)) +>then : Symbol(Promise.then, Decl(promiseIdentityWithAny.ts, 3, 32)) >U : Symbol(U, Decl(promiseIdentityWithAny.ts, 4, 9)) >W : Symbol(W, Decl(promiseIdentityWithAny.ts, 4, 11)) >callback : Symbol(callback, Decl(promiseIdentityWithAny.ts, 4, 15)) >x : Symbol(x, Decl(promiseIdentityWithAny.ts, 4, 26)) ->T : Symbol(T, Decl(promiseIdentityWithAny.ts, 3, 18)) +>T : Symbol(T, Decl(promiseIdentityWithAny.ts, 3, 25)) >Promise : Symbol(Promise, Decl(promiseIdentityWithAny.ts, 2, 1)) >Promise : Symbol(Promise, Decl(promiseIdentityWithAny.ts, 2, 1)) } diff --git a/tests/baselines/reference/promiseIdentityWithAny.types b/tests/baselines/reference/promiseIdentityWithAny.types index f96e6d903639c..d5efb5a6f8b97 100644 --- a/tests/baselines/reference/promiseIdentityWithAny.types +++ b/tests/baselines/reference/promiseIdentityWithAny.types @@ -1,5 +1,5 @@ === tests/cases/compiler/promiseIdentityWithAny.ts === -interface IPromise { +export interface IPromise { >IPromise : IPromise >T : T >V : V @@ -18,7 +18,7 @@ interface IPromise { >U : U >W : W } -interface Promise { +export interface Promise { >Promise : Promise >T : T >V : V diff --git a/tests/baselines/reference/promiseIdentityWithAny2.errors.txt b/tests/baselines/reference/promiseIdentityWithAny2.errors.txt index 36492d3f37acd..9d01438b88c49 100644 --- a/tests/baselines/reference/promiseIdentityWithAny2.errors.txt +++ b/tests/baselines/reference/promiseIdentityWithAny2.errors.txt @@ -3,7 +3,7 @@ tests/cases/compiler/promiseIdentityWithAny2.ts(22,5): error TS2403: Subsequent ==== tests/cases/compiler/promiseIdentityWithAny2.ts (2 errors) ==== - interface IPromise { + export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } interface Promise { diff --git a/tests/baselines/reference/promiseIdentityWithAny2.js b/tests/baselines/reference/promiseIdentityWithAny2.js index ec98b5ed4d971..a26cfd0508448 100644 --- a/tests/baselines/reference/promiseIdentityWithAny2.js +++ b/tests/baselines/reference/promiseIdentityWithAny2.js @@ -1,5 +1,5 @@ //// [promiseIdentityWithAny2.ts] -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } interface Promise { @@ -23,6 +23,8 @@ var y: IPromise2; var y: Promise2; //// [promiseIdentityWithAny2.js] +"use strict"; +exports.__esModule = true; // Error because type parameter arity doesn't match var x; var x; diff --git a/tests/baselines/reference/promiseIdentityWithConstraints.js b/tests/baselines/reference/promiseIdentityWithConstraints.js index 0130d22df8f61..5c0549dc99d78 100644 --- a/tests/baselines/reference/promiseIdentityWithConstraints.js +++ b/tests/baselines/reference/promiseIdentityWithConstraints.js @@ -1,8 +1,8 @@ //// [promiseIdentityWithConstraints.ts] -interface IPromise { +export interface IPromise { then(callback: (x: T) => IPromise): IPromise; } -interface Promise { +export interface Promise { then(callback: (x: T) => Promise): Promise; } @@ -11,6 +11,8 @@ var x: IPromise; var x: Promise; //// [promiseIdentityWithConstraints.js] +"use strict"; +exports.__esModule = true; // Error because constraint V doesn't match var x; var x; diff --git a/tests/baselines/reference/promiseIdentityWithConstraints.symbols b/tests/baselines/reference/promiseIdentityWithConstraints.symbols index 00308362b18f4..bcdc3c441bdeb 100644 --- a/tests/baselines/reference/promiseIdentityWithConstraints.symbols +++ b/tests/baselines/reference/promiseIdentityWithConstraints.symbols @@ -1,18 +1,18 @@ === tests/cases/compiler/promiseIdentityWithConstraints.ts === -interface IPromise { +export interface IPromise { >IPromise : Symbol(IPromise, Decl(promiseIdentityWithConstraints.ts, 0, 0)) ->T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 0, 19)) ->V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 0, 21)) +>T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 0, 26)) +>V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 0, 28)) then(callback: (x: T) => IPromise): IPromise; ->then : Symbol(IPromise.then, Decl(promiseIdentityWithConstraints.ts, 0, 26)) +>then : Symbol(IPromise.then, Decl(promiseIdentityWithConstraints.ts, 0, 33)) >U : Symbol(U, Decl(promiseIdentityWithConstraints.ts, 1, 9)) ->T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 0, 19)) +>T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 0, 26)) >W : Symbol(W, Decl(promiseIdentityWithConstraints.ts, 1, 21)) ->V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 0, 21)) +>V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 0, 28)) >callback : Symbol(callback, Decl(promiseIdentityWithConstraints.ts, 1, 35)) >x : Symbol(x, Decl(promiseIdentityWithConstraints.ts, 1, 46)) ->T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 0, 19)) +>T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 0, 26)) >IPromise : Symbol(IPromise, Decl(promiseIdentityWithConstraints.ts, 0, 0)) >U : Symbol(U, Decl(promiseIdentityWithConstraints.ts, 1, 9)) >W : Symbol(W, Decl(promiseIdentityWithConstraints.ts, 1, 21)) @@ -20,20 +20,20 @@ interface IPromise { >U : Symbol(U, Decl(promiseIdentityWithConstraints.ts, 1, 9)) >W : Symbol(W, Decl(promiseIdentityWithConstraints.ts, 1, 21)) } -interface Promise { +export interface Promise { >Promise : Symbol(Promise, Decl(promiseIdentityWithConstraints.ts, 2, 1)) ->T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 3, 18)) ->V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 3, 20)) +>T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 3, 25)) +>V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 3, 27)) then(callback: (x: T) => Promise): Promise; ->then : Symbol(Promise.then, Decl(promiseIdentityWithConstraints.ts, 3, 25)) +>then : Symbol(Promise.then, Decl(promiseIdentityWithConstraints.ts, 3, 32)) >U : Symbol(U, Decl(promiseIdentityWithConstraints.ts, 4, 9)) ->T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 3, 18)) +>T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 3, 25)) >W : Symbol(W, Decl(promiseIdentityWithConstraints.ts, 4, 21)) ->V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 3, 20)) +>V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 3, 27)) >callback : Symbol(callback, Decl(promiseIdentityWithConstraints.ts, 4, 35)) >x : Symbol(x, Decl(promiseIdentityWithConstraints.ts, 4, 46)) ->T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 3, 18)) +>T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 3, 25)) >Promise : Symbol(Promise, Decl(promiseIdentityWithConstraints.ts, 2, 1)) >U : Symbol(U, Decl(promiseIdentityWithConstraints.ts, 4, 9)) >W : Symbol(W, Decl(promiseIdentityWithConstraints.ts, 4, 21)) diff --git a/tests/baselines/reference/promiseIdentityWithConstraints.types b/tests/baselines/reference/promiseIdentityWithConstraints.types index 5bc321cbb16cc..9c52a9581b8cb 100644 --- a/tests/baselines/reference/promiseIdentityWithConstraints.types +++ b/tests/baselines/reference/promiseIdentityWithConstraints.types @@ -1,5 +1,5 @@ === tests/cases/compiler/promiseIdentityWithConstraints.ts === -interface IPromise { +export interface IPromise { >IPromise : IPromise >T : T >V : V @@ -20,7 +20,7 @@ interface IPromise { >U : U >W : W } -interface Promise { +export interface Promise { >Promise : Promise >T : T >V : V diff --git a/tests/baselines/reference/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt index 13fc071859691..661d66a4a446b 100644 --- a/tests/baselines/reference/promisePermutations.errors.txt +++ b/tests/baselines/reference/promisePermutations.errors.txt @@ -51,9 +51,9 @@ tests/cases/compiler/promisePermutations.ts(144,12): error TS2453: The type argu tests/cases/compiler/promisePermutations.ts(152,12): error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly. Type argument candidate 'Promise' is not a valid type argument because it is not a supertype of candidate 'IPromise'. Types of property 'then' are incompatible. - Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. - Types of parameters 'success' and 'success' are incompatible. - Type '(value: number) => Promise' is not assignable to type '(value: string) => IPromise'. + Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. + Types of parameters 'success' and 'onfulfilled' are incompatible. + Type '(value: number) => number | PromiseLike' is not assignable to type '(value: string) => IPromise'. Types of parameters 'value' and 'value' are incompatible. Type 'string' is not assignable to type 'number'. tests/cases/compiler/promisePermutations.ts(156,21): error TS2345: Argument of type '{ (x: number): IPromise; (x: string): IPromise; }' is not assignable to parameter of type '(value: number) => IPromise'. @@ -68,9 +68,9 @@ tests/cases/compiler/promisePermutations.ts(159,21): error TS2345: Argument of t tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of type '{ (x: number): Promise; (x: string): Promise; }' is not assignable to parameter of type '(value: number) => IPromise'. Type 'Promise' is not assignable to type 'IPromise'. Types of property 'then' are incompatible. - Type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. - Types of parameters 'success' and 'success' are incompatible. - Type '(value: string) => IPromise' is not assignable to type '(value: number) => Promise'. + Type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. + Types of parameters 'onfulfilled' and 'success' are incompatible. + Type '(value: string) => IPromise' is not assignable to type '(value: number) => number | PromiseLike'. Types of parameters 'value' and 'value' are incompatible. Type 'number' is not assignable to type 'string'. @@ -310,9 +310,9 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t !!! error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly. !!! error TS2453: Type argument candidate 'Promise' is not a valid type argument because it is not a supertype of candidate 'IPromise'. !!! error TS2453: Types of property 'then' are incompatible. -!!! error TS2453: Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. -!!! error TS2453: Types of parameters 'success' and 'success' are incompatible. -!!! error TS2453: Type '(value: number) => Promise' is not assignable to type '(value: string) => IPromise'. +!!! error TS2453: Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. +!!! error TS2453: Types of parameters 'success' and 'onfulfilled' are incompatible. +!!! error TS2453: Type '(value: number) => number | PromiseLike' is not assignable to type '(value: string) => IPromise'. !!! error TS2453: Types of parameters 'value' and 'value' are incompatible. !!! error TS2453: Type 'string' is not assignable to type 'number'. var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok @@ -339,9 +339,9 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t !!! error TS2345: Argument of type '{ (x: number): Promise; (x: string): Promise; }' is not assignable to parameter of type '(value: number) => IPromise'. !!! error TS2345: Type 'Promise' is not assignable to type 'IPromise'. !!! error TS2345: Types of property 'then' are incompatible. -!!! error TS2345: Type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. -!!! error TS2345: Types of parameters 'success' and 'success' are incompatible. -!!! error TS2345: Type '(value: string) => IPromise' is not assignable to type '(value: number) => Promise'. +!!! error TS2345: Type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. +!!! error TS2345: Types of parameters 'onfulfilled' and 'success' are incompatible. +!!! error TS2345: Type '(value: string) => IPromise' is not assignable to type '(value: number) => number | PromiseLike'. !!! error TS2345: Types of parameters 'value' and 'value' are incompatible. !!! error TS2345: Type 'number' is not assignable to type 'string'. diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt index b21a3a3920886..b133801f7763b 100644 --- a/tests/baselines/reference/promisePermutations2.errors.txt +++ b/tests/baselines/reference/promisePermutations2.errors.txt @@ -51,9 +51,9 @@ tests/cases/compiler/promisePermutations2.ts(143,12): error TS2453: The type arg tests/cases/compiler/promisePermutations2.ts(151,12): error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly. Type argument candidate 'Promise' is not a valid type argument because it is not a supertype of candidate 'IPromise'. Types of property 'then' are incompatible. - Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise'. - Types of parameters 'success' and 'success' are incompatible. - Type '(value: number) => any' is not assignable to type '(value: string) => IPromise'. + Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. + Types of parameters 'success' and 'onfulfilled' are incompatible. + Type '(value: number) => number | PromiseLike' is not assignable to type '(value: string) => IPromise'. Types of parameters 'value' and 'value' are incompatible. Type 'string' is not assignable to type 'number'. tests/cases/compiler/promisePermutations2.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise; (x: string): IPromise; }' is not assignable to parameter of type '(value: number) => IPromise'. @@ -68,9 +68,9 @@ tests/cases/compiler/promisePermutations2.ts(158,21): error TS2345: Argument of tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of type '{ (x: number): Promise; (x: string): Promise; }' is not assignable to parameter of type '(value: number) => IPromise'. Type 'Promise' is not assignable to type 'IPromise'. Types of property 'then' are incompatible. - Type '(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. - Types of parameters 'success' and 'success' are incompatible. - Type '(value: string) => IPromise' is not assignable to type '(value: number) => any'. + Type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. + Types of parameters 'onfulfilled' and 'success' are incompatible. + Type '(value: string) => IPromise' is not assignable to type '(value: number) => number | PromiseLike'. Types of parameters 'value' and 'value' are incompatible. Type 'number' is not assignable to type 'string'. @@ -309,9 +309,9 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of !!! error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly. !!! error TS2453: Type argument candidate 'Promise' is not a valid type argument because it is not a supertype of candidate 'IPromise'. !!! error TS2453: Types of property 'then' are incompatible. -!!! error TS2453: Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise'. -!!! error TS2453: Types of parameters 'success' and 'success' are incompatible. -!!! error TS2453: Type '(value: number) => any' is not assignable to type '(value: string) => IPromise'. +!!! error TS2453: Type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }' is not assignable to type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. +!!! error TS2453: Types of parameters 'success' and 'onfulfilled' are incompatible. +!!! error TS2453: Type '(value: number) => number | PromiseLike' is not assignable to type '(value: string) => IPromise'. !!! error TS2453: Types of parameters 'value' and 'value' are incompatible. !!! error TS2453: Type 'string' is not assignable to type 'number'. var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok @@ -338,9 +338,9 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of !!! error TS2345: Argument of type '{ (x: number): Promise; (x: string): Promise; }' is not assignable to parameter of type '(value: number) => IPromise'. !!! error TS2345: Type 'Promise' is not assignable to type 'IPromise'. !!! error TS2345: Types of property 'then' are incompatible. -!!! error TS2345: Type '(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. -!!! error TS2345: Types of parameters 'success' and 'success' are incompatible. -!!! error TS2345: Type '(value: string) => IPromise' is not assignable to type '(value: number) => any'. +!!! error TS2345: Type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '{ (success?: (value: string) => IPromise, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => IPromise, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => IPromise, progress?: (progress: any) => void): IPromise; (success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise; }'. +!!! error TS2345: Types of parameters 'onfulfilled' and 'success' are incompatible. +!!! error TS2345: Type '(value: string) => IPromise' is not assignable to type '(value: number) => number | PromiseLike'. !!! error TS2345: Types of parameters 'value' and 'value' are incompatible. !!! error TS2345: Type 'number' is not assignable to type 'string'. diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt index 1a33d1083aac3..b6c2a1cdfc726 100644 --- a/tests/baselines/reference/promisePermutations3.errors.txt +++ b/tests/baselines/reference/promisePermutations3.errors.txt @@ -54,9 +54,9 @@ tests/cases/compiler/promisePermutations3.ts(143,12): error TS2453: The type arg tests/cases/compiler/promisePermutations3.ts(151,12): error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly. Type argument candidate 'Promise' is not a valid type argument because it is not a supertype of candidate 'IPromise'. Types of property 'then' are incompatible. - Type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. - Types of parameters 'success' and 'success' are incompatible. - Type '(value: number) => Promise' is not assignable to type '(value: string) => any'. + Type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. + Types of parameters 'success' and 'onfulfilled' are incompatible. + Type '(value: number) => number | PromiseLike' is not assignable to type '(value: string) => any'. Types of parameters 'value' and 'value' are incompatible. Type 'string' is not assignable to type 'number'. tests/cases/compiler/promisePermutations3.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise; (x: string): IPromise; }' is not assignable to parameter of type '(value: number) => IPromise'. @@ -71,15 +71,15 @@ tests/cases/compiler/promisePermutations3.ts(158,21): error TS2345: Argument of tests/cases/compiler/promisePermutations3.ts(159,21): error TS2345: Argument of type '{ (x: number): Promise; (x: string): Promise; }' is not assignable to parameter of type '(value: number) => IPromise'. Type 'Promise' is not assignable to type 'IPromise'. Types of property 'then' are incompatible. - Type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise'. - Types of parameters 'success' and 'success' are incompatible. - Type '(value: string) => any' is not assignable to type '(value: number) => Promise'. + Type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise'. + Types of parameters 'onfulfilled' and 'success' are incompatible. + Type '(value: string) => any' is not assignable to type '(value: number) => number | PromiseLike'. Types of parameters 'value' and 'value' are incompatible. 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'. 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 '(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (onfulfilled?: (value: any) => any, onrejected?: (reason: any) => any): Promise; (onfulfilled: (value: any) => any, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: any) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: any) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (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'. @@ -321,9 +321,9 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of !!! error TS2453: The type argument for type parameter 'U' cannot be inferred from the usage. Consider specifying the type arguments explicitly. !!! error TS2453: Type argument candidate 'Promise' is not a valid type argument because it is not a supertype of candidate 'IPromise'. !!! error TS2453: Types of property 'then' are incompatible. -!!! error TS2453: Type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. -!!! error TS2453: Types of parameters 'success' and 'success' are incompatible. -!!! error TS2453: Type '(value: number) => Promise' is not assignable to type '(value: string) => any'. +!!! error TS2453: Type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }'. +!!! error TS2453: Types of parameters 'success' and 'onfulfilled' are incompatible. +!!! error TS2453: Type '(value: number) => number | PromiseLike' is not assignable to type '(value: string) => any'. !!! error TS2453: Types of parameters 'value' and 'value' are incompatible. !!! error TS2453: Type 'string' is not assignable to type 'number'. var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok @@ -350,9 +350,9 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of !!! error TS2345: Argument of type '{ (x: number): Promise; (x: string): Promise; }' is not assignable to parameter of type '(value: number) => IPromise'. !!! error TS2345: Type 'Promise' is not assignable to type 'IPromise'. !!! error TS2345: Types of property 'then' are incompatible. -!!! error TS2345: Type '{ (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise'. -!!! error TS2345: Types of parameters 'success' and 'success' are incompatible. -!!! error TS2345: Type '(value: string) => any' is not assignable to type '(value: number) => Promise'. +!!! error TS2345: Type '{ (onfulfilled?: (value: number) => number | PromiseLike, onrejected?: (reason: any) => number | PromiseLike): Promise; (onfulfilled: (value: number) => number | PromiseLike, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: number) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (success?: (value: number) => Promise, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => Promise, error?: (error: any) => U, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => Promise, progress?: (progress: any) => void): Promise; (success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise; }' is not assignable to type '(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise'. +!!! error TS2345: Types of parameters 'onfulfilled' and 'success' are incompatible. +!!! error TS2345: Type '(value: string) => any' is not assignable to type '(value: number) => number | PromiseLike'. !!! error TS2345: Types of parameters 'value' and 'value' are incompatible. !!! error TS2345: Type 'number' is not assignable to type 'string'. @@ -365,6 +365,6 @@ 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: 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 '(success?: (value: any) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise' is not assignable to type '{ (onfulfilled?: (value: any) => any, onrejected?: (reason: any) => any): Promise; (onfulfilled: (value: any) => any, onrejected: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: any) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; (onfulfilled: (value: any) => TResult1 | PromiseLike, onrejected: (reason: any) => TResult2 | PromiseLike): Promise; (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 21355982fd2c0c72ee507faed0d4b5a2f848245c Mon Sep 17 00:00:00 2001 From: Arthur Ozga Date: Mon, 13 Feb 2017 16:58:14 -0800 Subject: [PATCH 108/116] Offer missing abstract codefix once * per class that is missing potentially many abstract members. --- src/harness/fourslash.ts | 17 +++++++++++++++++ src/services/services.ts | 8 +++++++- .../codeFixClassExtendAbstractProperty.ts | 6 +++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index fc85fb7276c03..62770a96e7aa9 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2153,12 +2153,29 @@ namespace FourSlash { const diagnostics: ts.Diagnostic[] = this.getDiagnostics(fileName); let actions: ts.CodeAction[] = undefined; + + const checkedDiagnostics = ts.createMap(); + for (const diagnostic of diagnostics) { if (errorCode && errorCode !== diagnostic.code) { continue; } + const summary = JSON.stringify({ + start: diagnostic.start, + length: diagnostic.length, + code: diagnostic.code + }); + + if (checkedDiagnostics.has(summary)) { + // Don't want to ask for code fixes in an identical position for the same error code twice. + continue; + } + else { + checkedDiagnostics.set(summary, true); + } + const newActions = this.languageService.getCodeFixesAtPosition(fileName, diagnostic.start, diagnostic.length, [diagnostic.code]); if (newActions && newActions.length) { actions = actions ? actions.concat(newActions) : newActions; diff --git a/src/services/services.ts b/src/services/services.ts index b83995e31ed63..35588a1902adb 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1688,7 +1688,13 @@ namespace ts { let allFixes: CodeAction[] = []; - forEach(errorCodes, error => { + // De-duplicate error codes. + const errorCodeSet: number[] = []; + for (const code of errorCodes) { + errorCodeSet[code] = code; + } + + forEach(errorCodeSet, error => { cancellationToken.throwIfCancellationRequested(); const context = { diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts b/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts index 46de88f7511e4..3160a3b9a080c 100644 --- a/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts +++ b/tests/cases/fourslash/codeFixClassExtendAbstractProperty.ts @@ -2,11 +2,15 @@ //// abstract class A { //// abstract x: number; +//// abstract foo(): number; //// } //// //// class C extends A {[| //// |]} verify.rangeAfterCodeFix(` -x: number; + x: number; + foo(): number { + throw new Error('Method not implemented.'); + } `); From 53d095bd698de6264d767136005e911a3a131281 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 13 Feb 2017 20:35:54 -0800 Subject: [PATCH 109/116] Update version --- package.json | 2 +- src/compiler/core.ts | 2 +- src/services/shims.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c49162343a274..817ce333b0add 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "http://typescriptlang.org/", - "version": "2.2.0", + "version": "2.3.0", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 43bbf86509ebb..71c0f55c9afbe 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -3,7 +3,7 @@ namespace ts { /** The version of the TypeScript compiler release */ - export const version = "2.2.0"; + export const version = "2.3.0"; } /* @internal */ diff --git a/src/services/shims.ts b/src/services/shims.ts index 487947ee458de..6fe9aed144e7c 100644 --- a/src/services/shims.ts +++ b/src/services/shims.ts @@ -1269,4 +1269,4 @@ namespace TypeScript.Services { // TODO: it should be moved into a namespace though. /* @internal */ -const toolsVersion = "2.2"; \ No newline at end of file +const toolsVersion = "2.3"; \ No newline at end of file From 6feafc9483db9d1894dadc8cdbfd634584d1ded4 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 13 Feb 2017 20:49:37 -0800 Subject: [PATCH 110/116] Remove extra overload --- src/lib/es5.d.ts | 6 --- ...signingFromObjectToAnythingElse.errors.txt | 20 +++---- .../baselines/reference/objectCreate.symbols | 40 +++++++------- tests/baselines/reference/objectCreate.types | 48 ++++++++--------- .../baselines/reference/objectCreate2.symbols | 40 +++++++------- tests/baselines/reference/objectCreate2.types | 52 +++++++++---------- 6 files changed, 100 insertions(+), 106 deletions(-) diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts index 516bc890d4c08..23bb06c5d2e18 100644 --- a/src/lib/es5.d.ts +++ b/src/lib/es5.d.ts @@ -136,12 +136,6 @@ interface ObjectConstructor { */ getOwnPropertyNames(o: any): string[]; - /** - * Creates an object that has the specified prototype. - * @param o Object to use as a prototype. - */ - create(o: T): T; - /** * Creates an object that has the specified prototype or that has null prototype. * @param o Object to use as a prototype. May be null. diff --git a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt index 289883d747148..070339e47262c 100644 --- a/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt +++ b/tests/baselines/reference/assigningFromObjectToAnythingElse.errors.txt @@ -1,11 +1,11 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(3,1): error TS2322: Type 'Object' is not assignable to type 'RegExp'. The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead? Property 'exec' is missing in type 'Object'. -tests/cases/compiler/assigningFromObjectToAnythingElse.ts(5,5): error TS2322: Type 'Object' is not assignable to type 'String'. - The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead? - Property 'charAt' is missing in type 'Object'. -tests/cases/compiler/assigningFromObjectToAnythingElse.ts(6,5): error TS2322: Type 'Number' is not assignable to type 'String'. - Property 'charAt' is missing in type 'Number'. +tests/cases/compiler/assigningFromObjectToAnythingElse.ts(5,5): error TS2322: Type 'object | Object' is not assignable to type 'String'. + Type 'object' is not assignable to type 'String'. + Property 'charAt' is missing in type '{}'. +tests/cases/compiler/assigningFromObjectToAnythingElse.ts(6,5): error TS2322: Type 'object | Number' is not assignable to type 'String'. + Type 'object' is not assignable to type 'String'. tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Type 'Object' is not assignable to type 'Error'. The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead? Property 'name' is missing in type 'Object'. @@ -22,13 +22,13 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Ty var a: String = Object.create(""); ~ -!!! error TS2322: Type 'Object' is not assignable to type 'String'. -!!! error TS2322: The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead? -!!! error TS2322: Property 'charAt' is missing in type 'Object'. +!!! error TS2322: Type 'object | Object' is not assignable to type 'String'. +!!! error TS2322: Type 'object' is not assignable to type 'String'. +!!! error TS2322: Property 'charAt' is missing in type '{}'. var c: String = Object.create(1); ~ -!!! error TS2322: Type 'Number' is not assignable to type 'String'. -!!! error TS2322: Property 'charAt' is missing in type 'Number'. +!!! error TS2322: Type 'object | Number' is not assignable to type 'String'. +!!! error TS2322: Type 'object' is not assignable to type 'String'. var w: Error = new Object(); ~ diff --git a/tests/baselines/reference/objectCreate.symbols b/tests/baselines/reference/objectCreate.symbols index 44cee102787e2..7ae0a796cc85d 100644 --- a/tests/baselines/reference/objectCreate.symbols +++ b/tests/baselines/reference/objectCreate.symbols @@ -7,67 +7,67 @@ declare var union: null | { a: number, b: string }; var n = Object.create(null); // object >n : Symbol(n, Decl(objectCreate.ts, 3, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } >t : Symbol(t, Decl(objectCreate.ts, 4, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >a : Symbol(a, Decl(objectCreate.ts, 4, 23)) >b : Symbol(b, Decl(objectCreate.ts, 4, 29)) var u = Object.create(union); // object | {a: number, b: string } >u : Symbol(u, Decl(objectCreate.ts, 5, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >union : Symbol(union, Decl(objectCreate.ts, 1, 11)) var e = Object.create({}); // {} >e : Symbol(e, Decl(objectCreate.ts, 6, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var o = Object.create({}); // object >o : Symbol(o, Decl(objectCreate.ts, 7, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var a = Object.create(null, {}); // any >a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var a = Object.create({ a: 1, b: "" }, {}); >a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >a : Symbol(a, Decl(objectCreate.ts, 10, 23)) >b : Symbol(b, Decl(objectCreate.ts, 10, 29)) var a = Object.create(union, {}); >a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >union : Symbol(union, Decl(objectCreate.ts, 1, 11)) var a = Object.create({}, {}); >a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var a = Object.create({}, {}); >a : Symbol(a, Decl(objectCreate.ts, 9, 3), Decl(objectCreate.ts, 10, 3), Decl(objectCreate.ts, 11, 3), Decl(objectCreate.ts, 12, 3), Decl(objectCreate.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) diff --git a/tests/baselines/reference/objectCreate.types b/tests/baselines/reference/objectCreate.types index 3c698cf54ff41..028c98af8175f 100644 --- a/tests/baselines/reference/objectCreate.types +++ b/tests/baselines/reference/objectCreate.types @@ -9,17 +9,17 @@ declare var union: null | { a: number, b: string }; var n = Object.create(null); // object >n : object >Object.create(null) : object ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >null : null var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } ->t : { a: number; b: string; } ->Object.create({ a: 1, b: "" }) : { a: number; b: string; } ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>t : object | { a: number; b: string; } +>Object.create({ a: 1, b: "" }) : object | { a: number; b: string; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >{ a: 1, b: "" } : { a: number; b: string; } >a : number >1 : 1 @@ -29,43 +29,43 @@ var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } var u = Object.create(union); // object | {a: number, b: string } >u : object | { a: number; b: string; } >Object.create(union) : object | { a: number; b: string; } ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >union : { a: number; b: string; } | null var e = Object.create({}); // {} ->e : {} ->Object.create({}) : {} ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>e : object | {} +>Object.create({}) : object | {} +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >{} : {} var o = Object.create({}); // object >o : object >Object.create({}) : object ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >{} : object >{} : {} var a = Object.create(null, {}); // any >a : any >Object.create(null, {}) : any ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >null : null >{} : {} var a = Object.create({ a: 1, b: "" }, {}); >a : any >Object.create({ a: 1, b: "" }, {}) : any ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >{ a: 1, b: "" } : { a: number; b: string; } >a : number >1 : 1 @@ -76,27 +76,27 @@ var a = Object.create({ a: 1, b: "" }, {}); var a = Object.create(union, {}); >a : any >Object.create(union, {}) : any ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >union : { a: number; b: string; } | null >{} : {} var a = Object.create({}, {}); >a : any >Object.create({}, {}) : any ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >{} : {} >{} : {} var a = Object.create({}, {}); >a : any >Object.create({}, {}) : any ->Object.create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } +>create : { (o: T | null): object | T; (o: object | null, properties: PropertyDescriptorMap): any; } >{} : object >{} : {} >{} : {} diff --git a/tests/baselines/reference/objectCreate2.symbols b/tests/baselines/reference/objectCreate2.symbols index e10db7899c158..bf57b6d5e073d 100644 --- a/tests/baselines/reference/objectCreate2.symbols +++ b/tests/baselines/reference/objectCreate2.symbols @@ -7,67 +7,67 @@ declare var union: null | { a: number, b: string }; var n = Object.create(null); // any >n : Symbol(n, Decl(objectCreate2.ts, 3, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } >t : Symbol(t, Decl(objectCreate2.ts, 4, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >a : Symbol(a, Decl(objectCreate2.ts, 4, 23)) >b : Symbol(b, Decl(objectCreate2.ts, 4, 29)) var u = Object.create(union); // {a: number, b: string } >u : Symbol(u, Decl(objectCreate2.ts, 5, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >union : Symbol(union, Decl(objectCreate2.ts, 1, 11)) var e = Object.create({}); // {} >e : Symbol(e, Decl(objectCreate2.ts, 6, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var o = Object.create({}); // object >o : Symbol(o, Decl(objectCreate2.ts, 7, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var a = Object.create(null, {}); // any >a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var a = Object.create({ a: 1, b: "" }, {}); >a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >a : Symbol(a, Decl(objectCreate2.ts, 10, 23)) >b : Symbol(b, Decl(objectCreate2.ts, 10, 29)) var a = Object.create(union, {}); >a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >union : Symbol(union, Decl(objectCreate2.ts, 1, 11)) var a = Object.create({}, {}); >a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) var a = Object.create({}, {}); >a : Symbol(a, Decl(objectCreate2.ts, 9, 3), Decl(objectCreate2.ts, 10, 3), Decl(objectCreate2.ts, 11, 3), Decl(objectCreate2.ts, 12, 3), Decl(objectCreate2.ts, 13, 3)) ->Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>Object.create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>create : Symbol(ObjectConstructor.create, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) diff --git a/tests/baselines/reference/objectCreate2.types b/tests/baselines/reference/objectCreate2.types index 1066688772bdd..1b33723b0c94b 100644 --- a/tests/baselines/reference/objectCreate2.types +++ b/tests/baselines/reference/objectCreate2.types @@ -9,17 +9,17 @@ declare var union: null | { a: number, b: string }; var n = Object.create(null); // any >n : any >Object.create(null) : any ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >null : null var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } ->t : { a: number; b: string; } ->Object.create({ a: 1, b: "" }) : { a: number; b: string; } ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>t : object | { a: number; b: string; } +>Object.create({ a: 1, b: "" }) : object | { a: number; b: string; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >{ a: 1, b: "" } : { a: number; b: string; } >a : number >1 : 1 @@ -27,45 +27,45 @@ var t = Object.create({ a: 1, b: "" }); // {a: number, b: string } >"" : "" var u = Object.create(union); // {a: number, b: string } ->u : { a: number; b: string; } ->Object.create(union) : { a: number; b: string; } ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>u : object | { a: number; b: string; } +>Object.create(union) : object | { a: number; b: string; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >union : { a: number; b: string; } var e = Object.create({}); // {} ->e : {} ->Object.create({}) : {} ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>e : object | {} +>Object.create({}) : object | {} +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >{} : {} var o = Object.create({}); // object >o : object >Object.create({}) : object ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >{} : object >{} : {} var a = Object.create(null, {}); // any >a : any >Object.create(null, {}) : any ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >null : null >{} : {} var a = Object.create({ a: 1, b: "" }, {}); >a : any >Object.create({ a: 1, b: "" }, {}) : any ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >{ a: 1, b: "" } : { a: number; b: string; } >a : number >1 : 1 @@ -76,27 +76,27 @@ var a = Object.create({ a: 1, b: "" }, {}); var a = Object.create(union, {}); >a : any >Object.create(union, {}) : any ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >union : { a: number; b: string; } >{} : {} var a = Object.create({}, {}); >a : any >Object.create({}, {}) : any ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >{} : {} >{} : {} var a = Object.create({}, {}); >a : any >Object.create({}, {}) : any ->Object.create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>Object.create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >Object : ObjectConstructor ->create : { (o: T): T; (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } +>create : { (o: T): object | T; (o: object, properties: PropertyDescriptorMap): any; } >{} : object >{} : {} >{} : {} From 84111fa5813e89341446a02bf1569300fbfadfa7 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 14 Feb 2017 11:29:14 -0800 Subject: [PATCH 111/116] Use `Promise` instead of `PromiseLike` in the library --- src/lib/dom.generated.d.ts | 130 +++++++++++++++---------------- src/lib/webworker.generated.d.ts | 70 ++++++++--------- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts index b4217c131f966..5d4bb9ce6e4a2 100644 --- a/src/lib/dom.generated.d.ts +++ b/src/lib/dom.generated.d.ts @@ -1331,7 +1331,7 @@ interface AudioContextBase extends EventTarget { onstatechange: (this: AudioContext, ev: Event) => any; readonly sampleRate: number; readonly state: string; - close(): PromiseLike; + close(): Promise; createAnalyser(): AnalyserNode; createBiquadFilter(): BiquadFilterNode; createBuffer(numberOfChannels: number, length: number, sampleRate: number): AudioBuffer; @@ -1351,14 +1351,14 @@ interface AudioContextBase extends EventTarget { createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode; createStereoPanner(): StereoPannerNode; createWaveShaper(): WaveShaperNode; - decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): PromiseLike; - resume(): PromiseLike; + decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): Promise; + resume(): Promise; addEventListener(type: K, listener: (this: AudioContext, ev: AudioContextEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } interface AudioContext extends AudioContextBase { - suspend(): PromiseLike; + suspend(): Promise; } declare var AudioContext: { @@ -2076,13 +2076,13 @@ declare var CSSSupportsRule: { } interface Cache { - add(request: RequestInfo): PromiseLike; - addAll(requests: RequestInfo[]): PromiseLike; - delete(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + add(request: RequestInfo): Promise; + addAll(requests: RequestInfo[]): Promise; + delete(request: RequestInfo, options?: CacheQueryOptions): Promise; keys(request?: RequestInfo, options?: CacheQueryOptions): any; - match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + match(request: RequestInfo, options?: CacheQueryOptions): Promise; matchAll(request?: RequestInfo, options?: CacheQueryOptions): any; - put(request: RequestInfo, response: Response): PromiseLike; + put(request: RequestInfo, response: Response): Promise; } declare var Cache: { @@ -2091,11 +2091,11 @@ declare var Cache: { } interface CacheStorage { - delete(cacheName: string): PromiseLike; - has(cacheName: string): PromiseLike; + delete(cacheName: string): Promise; + has(cacheName: string): Promise; keys(): any; - match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; - open(cacheName: string): PromiseLike; + match(request: RequestInfo, options?: CacheQueryOptions): Promise; + open(cacheName: string): Promise; } declare var CacheStorage: { @@ -5716,7 +5716,7 @@ interface HTMLMediaElement extends HTMLElement { * Loads and starts playback of a media resource. */ play(): void; - setMediaKeys(mediaKeys: MediaKeys | null): PromiseLike; + setMediaKeys(mediaKeys: MediaKeys | null): Promise; readonly HAVE_CURRENT_DATA: number; readonly HAVE_ENOUGH_DATA: number; readonly HAVE_FUTURE_DATA: number; @@ -7294,7 +7294,7 @@ interface MSApp { execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void; execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any; getCurrentPriority(): string; - getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike; + getHtmlPrintDocumentSourceAsync(htmlDoc: any): Promise; getViewId(view: any): any; isTaskScheduledAtPriorityOrHigher(priority: string): boolean; pageHandlesAllApplicationActivations(enabled: boolean): void; @@ -7355,8 +7355,8 @@ declare var MSBlobBuilder: { } interface MSCredentials { - getAssertion(challenge: string, filter?: MSCredentialFilter, params?: MSSignatureParameters): PromiseLike; - makeCredential(accountInfo: MSAccountInfo, params: MSCredentialParameters[], challenge?: string): PromiseLike; + getAssertion(challenge: string, filter?: MSCredentialFilter, params?: MSSignatureParameters): Promise; + makeCredential(accountInfo: MSAccountInfo, params: MSCredentialParameters[], challenge?: string): Promise; } declare var MSCredentials: { @@ -7744,7 +7744,7 @@ interface MediaDevices extends EventTarget { ondevicechange: (this: MediaDevices, ev: Event) => any; enumerateDevices(): any; getSupportedConstraints(): MediaTrackSupportedConstraints; - getUserMedia(constraints: MediaStreamConstraints): PromiseLike; + getUserMedia(constraints: MediaStreamConstraints): Promise; addEventListener(type: K, listener: (this: MediaDevices, ev: MediaDevicesEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -7803,15 +7803,15 @@ declare var MediaKeyMessageEvent: { } interface MediaKeySession extends EventTarget { - readonly closed: PromiseLike; + readonly closed: Promise; readonly expiration: number; readonly keyStatuses: MediaKeyStatusMap; readonly sessionId: string; - close(): PromiseLike; - generateRequest(initDataType: string, initData: any): PromiseLike; - load(sessionId: string): PromiseLike; - remove(): PromiseLike; - update(response: any): PromiseLike; + close(): Promise; + generateRequest(initDataType: string, initData: any): Promise; + load(sessionId: string): Promise; + remove(): Promise; + update(response: any): Promise; } declare var MediaKeySession: { @@ -7833,7 +7833,7 @@ declare var MediaKeyStatusMap: { interface MediaKeySystemAccess { readonly keySystem: string; - createMediaKeys(): PromiseLike; + createMediaKeys(): Promise; getConfiguration(): MediaKeySystemConfiguration; } @@ -7844,7 +7844,7 @@ declare var MediaKeySystemAccess: { interface MediaKeys { createSession(sessionType?: string): MediaKeySession; - setServerCertificate(serverCertificate: any): PromiseLike; + setServerCertificate(serverCertificate: any): Promise; } declare var MediaKeys: { @@ -7983,7 +7983,7 @@ interface MediaStreamTrack extends EventTarget { readonly readonly: boolean; readonly readyState: string; readonly remote: boolean; - applyConstraints(constraints: MediaTrackConstraints): PromiseLike; + applyConstraints(constraints: MediaTrackConstraints): Promise; clone(): MediaStreamTrack; getCapabilities(): MediaTrackCapabilities; getConstraints(): MediaTrackConstraints; @@ -8217,7 +8217,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte getGamepads(): Gamepad[]; javaEnabled(): boolean; msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void; - requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): PromiseLike; + requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): Promise; vibrate(pattern: number | number[]): boolean; } @@ -8377,7 +8377,7 @@ interface Notification extends EventTarget { declare var Notification: { prototype: Notification; new(title: string, options?: NotificationOptions): Notification; - requestPermission(callback?: NotificationPermissionCallback): PromiseLike; + requestPermission(callback?: NotificationPermissionCallback): Promise; } interface OES_element_index_uint { @@ -8448,8 +8448,8 @@ interface OfflineAudioContextEventMap extends AudioContextEventMap { interface OfflineAudioContext extends AudioContextBase { readonly length: number; oncomplete: (this: OfflineAudioContext, ev: OfflineAudioCompletionEvent) => any; - startRendering(): PromiseLike; - suspend(suspendTime: number): PromiseLike; + startRendering(): Promise; + suspend(suspendTime: number): Promise; addEventListener(type: K, listener: (this: OfflineAudioContext, ev: OfflineAudioContextEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8564,8 +8564,8 @@ interface PaymentRequest extends EventTarget { readonly shippingAddress: PaymentAddress | null; readonly shippingOption: string | null; readonly shippingType: string | null; - abort(): PromiseLike; - show(): PromiseLike; + abort(): Promise; + show(): Promise; addEventListener(type: K, listener: (this: PaymentRequest, ev: PaymentRequestEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -8576,7 +8576,7 @@ declare var PaymentRequest: { } interface PaymentRequestUpdateEvent extends Event { - updateWith(d: PromiseLike): void; + updateWith(d: Promise): void; } declare var PaymentRequestUpdateEvent: { @@ -8592,7 +8592,7 @@ interface PaymentResponse { readonly payerPhone: string | null; readonly shippingAddress: PaymentAddress | null; readonly shippingOption: string | null; - complete(result?: string): PromiseLike; + complete(result?: string): Promise; toJSON(): any; } @@ -8918,9 +8918,9 @@ declare var ProgressEvent: { } interface PushManager { - getSubscription(): PromiseLike; - permissionState(options?: PushSubscriptionOptionsInit): PromiseLike; - subscribe(options?: PushSubscriptionOptionsInit): PromiseLike; + getSubscription(): Promise; + permissionState(options?: PushSubscriptionOptionsInit): Promise; + subscribe(options?: PushSubscriptionOptionsInit): Promise; } declare var PushManager: { @@ -8933,7 +8933,7 @@ interface PushSubscription { readonly options: PushSubscriptionOptions; getKey(name: string): ArrayBuffer | null; toJSON(): any; - unsubscribe(): PromiseLike; + unsubscribe(): Promise; } declare var PushSubscription: { @@ -9127,19 +9127,19 @@ interface RTCPeerConnection extends EventTarget { onsignalingstatechange: (this: RTCPeerConnection, ev: Event) => any; readonly remoteDescription: RTCSessionDescription | null; readonly signalingState: string; - addIceCandidate(candidate: RTCIceCandidate, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + addIceCandidate(candidate: RTCIceCandidate, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): Promise; addStream(stream: MediaStream): void; close(): void; - createAnswer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; - createOffer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback, options?: RTCOfferOptions): PromiseLike; + createAnswer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback): Promise; + createOffer(successCallback?: RTCSessionDescriptionCallback, failureCallback?: RTCPeerConnectionErrorCallback, options?: RTCOfferOptions): Promise; getConfiguration(): RTCConfiguration; getLocalStreams(): MediaStream[]; getRemoteStreams(): MediaStream[]; - getStats(selector: MediaStreamTrack | null, successCallback?: RTCStatsCallback, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + getStats(selector: MediaStreamTrack | null, successCallback?: RTCStatsCallback, failureCallback?: RTCPeerConnectionErrorCallback): Promise; getStreamById(streamId: string): MediaStream | null; removeStream(stream: MediaStream): void; - setLocalDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; - setRemoteDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): PromiseLike; + setLocalDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): Promise; + setRemoteDescription(description: RTCSessionDescription, successCallback?: VoidFunction, failureCallback?: RTCPeerConnectionErrorCallback): Promise; addEventListener(type: K, listener: (this: RTCPeerConnection, ev: RTCPeerConnectionEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -9245,8 +9245,8 @@ declare var RTCSsrcConflictEvent: { } interface RTCStatsProvider extends EventTarget { - getStats(): PromiseLike; - msGetStats(): PromiseLike; + getStats(): Promise; + msGetStats(): Promise; } declare var RTCStatsProvider: { @@ -9300,7 +9300,7 @@ declare var Range: { interface ReadableStream { readonly locked: boolean; - cancel(): PromiseLike; + cancel(): Promise; getReader(): ReadableStreamReader; } @@ -9310,8 +9310,8 @@ declare var ReadableStream: { } interface ReadableStreamReader { - cancel(): PromiseLike; - read(): PromiseLike; + cancel(): Promise; + read(): Promise; releaseLock(): void; } @@ -11285,10 +11285,10 @@ interface ServiceWorkerContainer extends EventTarget { readonly controller: ServiceWorker | null; oncontrollerchange: (this: ServiceWorkerContainer, ev: Event) => any; onmessage: (this: ServiceWorkerContainer, ev: ServiceWorkerMessageEvent) => any; - readonly ready: PromiseLike; - getRegistration(clientURL?: USVString): PromiseLike; + readonly ready: Promise; + getRegistration(clientURL?: USVString): Promise; getRegistrations(): any; - register(scriptURL: USVString, options?: RegistrationOptions): PromiseLike; + register(scriptURL: USVString, options?: RegistrationOptions): Promise; addEventListener(type: K, listener: (this: ServiceWorkerContainer, ev: ServiceWorkerContainerEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -11324,9 +11324,9 @@ interface ServiceWorkerRegistration extends EventTarget { readonly sync: SyncManager; readonly waiting: ServiceWorker | null; getNotifications(filter?: GetNotificationOptions): any; - showNotification(title: string, options?: NotificationOptions): PromiseLike; - unregister(): PromiseLike; - update(): PromiseLike; + showNotification(title: string, options?: NotificationOptions): Promise; + unregister(): Promise; + update(): Promise; addEventListener(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -11561,7 +11561,7 @@ declare var SubtleCrypto: { interface SyncManager { getTags(): any; - register(tag: string): PromiseLike; + register(tag: string): Promise; } declare var SyncManager: { @@ -11975,8 +11975,8 @@ declare var WaveShaperNode: { } interface WebAuthentication { - getAssertion(assertionChallenge: any, options?: AssertionOptions): PromiseLike; - makeCredential(accountInformation: Account, cryptoParameters: ScopedCredentialParameters[], attestationChallenge: any, options?: ScopedCredentialOptions): PromiseLike; + getAssertion(assertionChallenge: any, options?: AssertionOptions): Promise; + makeCredential(accountInformation: Account, cryptoParameters: ScopedCredentialParameters[], attestationChallenge: any, options?: ScopedCredentialOptions): Promise; } declare var WebAuthentication: { @@ -13469,10 +13469,10 @@ interface AbstractWorker { interface Body { readonly bodyUsed: boolean; - arrayBuffer(): PromiseLike; - blob(): PromiseLike; - json(): PromiseLike; - text(): PromiseLike; + arrayBuffer(): Promise; + blob(): Promise; + json(): Promise; + text(): Promise; } interface CanvasPathMethods { @@ -13613,7 +13613,7 @@ interface GlobalEventHandlers { } interface GlobalFetch { - fetch(input: RequestInfo, init?: RequestInit): PromiseLike; + fetch(input: RequestInfo, init?: RequestInit): Promise; } interface HTMLTableAlignment { @@ -14870,7 +14870,7 @@ declare var onwheel: (this: Window, ev: WheelEvent) => any; declare var indexedDB: IDBFactory; declare function atob(encodedString: string): string; declare function btoa(rawString: string): string; -declare function fetch(input: RequestInfo, init?: RequestInit): PromiseLike; +declare function fetch(input: RequestInfo, init?: RequestInit): Promise; declare function addEventListener(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void; declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; type AAGUID = string; diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts index e949526641bbd..e9563db1bcdc4 100644 --- a/src/lib/webworker.generated.d.ts +++ b/src/lib/webworker.generated.d.ts @@ -168,13 +168,13 @@ declare var Blob: { } interface Cache { - add(request: RequestInfo): PromiseLike; - addAll(requests: RequestInfo[]): PromiseLike; - delete(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + add(request: RequestInfo): Promise; + addAll(requests: RequestInfo[]): Promise; + delete(request: RequestInfo, options?: CacheQueryOptions): Promise; keys(request?: RequestInfo, options?: CacheQueryOptions): any; - match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; + match(request: RequestInfo, options?: CacheQueryOptions): Promise; matchAll(request?: RequestInfo, options?: CacheQueryOptions): any; - put(request: RequestInfo, response: Response): PromiseLike; + put(request: RequestInfo, response: Response): Promise; } declare var Cache: { @@ -183,11 +183,11 @@ declare var Cache: { } interface CacheStorage { - delete(cacheName: string): PromiseLike; - has(cacheName: string): PromiseLike; + delete(cacheName: string): Promise; + has(cacheName: string): Promise; keys(): any; - match(request: RequestInfo, options?: CacheQueryOptions): PromiseLike; - open(cacheName: string): PromiseLike; + match(request: RequestInfo, options?: CacheQueryOptions): Promise; + open(cacheName: string): Promise; } declare var CacheStorage: { @@ -746,7 +746,7 @@ interface Notification extends EventTarget { declare var Notification: { prototype: Notification; new(title: string, options?: NotificationOptions): Notification; - requestPermission(callback?: NotificationPermissionCallback): PromiseLike; + requestPermission(callback?: NotificationPermissionCallback): Promise; } interface Performance { @@ -862,9 +862,9 @@ declare var ProgressEvent: { } interface PushManager { - getSubscription(): PromiseLike; - permissionState(options?: PushSubscriptionOptionsInit): PromiseLike; - subscribe(options?: PushSubscriptionOptionsInit): PromiseLike; + getSubscription(): Promise; + permissionState(options?: PushSubscriptionOptionsInit): Promise; + subscribe(options?: PushSubscriptionOptionsInit): Promise; } declare var PushManager: { @@ -877,7 +877,7 @@ interface PushSubscription { readonly options: PushSubscriptionOptions; getKey(name: string): ArrayBuffer | null; toJSON(): any; - unsubscribe(): PromiseLike; + unsubscribe(): Promise; } declare var PushSubscription: { @@ -897,7 +897,7 @@ declare var PushSubscriptionOptions: { interface ReadableStream { readonly locked: boolean; - cancel(): PromiseLike; + cancel(): Promise; getReader(): ReadableStreamReader; } @@ -907,8 +907,8 @@ declare var ReadableStream: { } interface ReadableStreamReader { - cancel(): PromiseLike; - read(): PromiseLike; + cancel(): Promise; + read(): Promise; releaseLock(): void; } @@ -986,9 +986,9 @@ interface ServiceWorkerRegistration extends EventTarget { readonly sync: SyncManager; readonly waiting: ServiceWorker | null; getNotifications(filter?: GetNotificationOptions): any; - showNotification(title: string, options?: NotificationOptions): PromiseLike; - unregister(): PromiseLike; - update(): PromiseLike; + showNotification(title: string, options?: NotificationOptions): Promise; + unregister(): Promise; + update(): Promise; addEventListener(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -1000,7 +1000,7 @@ declare var ServiceWorkerRegistration: { interface SyncManager { getTags(): any; - register(tag: string): PromiseLike; + register(tag: string): Promise; } declare var SyncManager: { @@ -1130,14 +1130,14 @@ interface AbstractWorker { interface Body { readonly bodyUsed: boolean; - arrayBuffer(): PromiseLike; - blob(): PromiseLike; - json(): PromiseLike; - text(): PromiseLike; + arrayBuffer(): Promise; + blob(): Promise; + json(): Promise; + text(): Promise; } interface GlobalFetch { - fetch(input: RequestInfo, init?: RequestInit): PromiseLike; + fetch(input: RequestInfo, init?: RequestInit): Promise; } interface MSBaseReaderEventMap { @@ -1234,10 +1234,10 @@ declare var Client: { } interface Clients { - claim(): PromiseLike; - get(id: string): PromiseLike; + claim(): Promise; + get(id: string): Promise; matchAll(options?: ClientQueryOptions): any; - openWindow(url: USVString): PromiseLike; + openWindow(url: USVString): Promise; } declare var Clients: { @@ -1263,7 +1263,7 @@ declare var DedicatedWorkerGlobalScope: { } interface ExtendableEvent extends Event { - waitUntil(f: PromiseLike): void; + waitUntil(f: Promise): void; } declare var ExtendableEvent: { @@ -1288,7 +1288,7 @@ interface FetchEvent extends ExtendableEvent { readonly clientId: string | null; readonly isReload: boolean; readonly request: Request; - respondWith(r: PromiseLike): void; + respondWith(r: Promise): void; } declare var FetchEvent: { @@ -1363,7 +1363,7 @@ interface ServiceWorkerGlobalScope extends WorkerGlobalScope { onpushsubscriptionchange: (this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any; onsync: (this: ServiceWorkerGlobalScope, ev: SyncEvent) => any; readonly registration: ServiceWorkerRegistration; - skipWaiting(): PromiseLike; + skipWaiting(): Promise; addEventListener(type: K, listener: (this: ServiceWorkerGlobalScope, ev: ServiceWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } @@ -1386,8 +1386,8 @@ declare var SyncEvent: { interface WindowClient extends Client { readonly focused: boolean; readonly visibilityState: string; - focus(): PromiseLike; - navigate(url: USVString): PromiseLike; + focus(): Promise; + navigate(url: USVString): Promise; } declare var WindowClient: { @@ -1715,7 +1715,7 @@ declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number declare function atob(encodedString: string): string; declare function btoa(rawString: string): string; declare var console: Console; -declare function fetch(input: RequestInfo, init?: RequestInit): PromiseLike; +declare function fetch(input: RequestInfo, init?: RequestInit): Promise; declare function dispatchEvent(evt: Event): boolean; declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void; declare function addEventListener(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void; From 6c2c2f8f3fb92d55c138262c7c20587d68673f61 Mon Sep 17 00:00:00 2001 From: Arthur Ozga Date: Tue, 14 Feb 2017 11:30:19 -0800 Subject: [PATCH 112/116] use deduplicate --- src/harness/fourslash.ts | 27 +++++++++------------------ src/services/services.ts | 8 +------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 62770a96e7aa9..458eaeb2c29f8 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2150,32 +2150,23 @@ namespace FourSlash { * @param fileName Path to file where error should be retrieved from. */ private getCodeFixActions(fileName: string, errorCode?: number): ts.CodeAction[] { - const diagnostics: ts.Diagnostic[] = this.getDiagnostics(fileName); + const diagnosticsForCodeFix = this.getDiagnostics(fileName).map(diagnostic => { + return { + start: diagnostic.start, + length: diagnostic.length, + code: diagnostic.code + } + }); + const dedupedDiagnositcs = ts.deduplicate(diagnosticsForCodeFix, ts.equalOwnProperties); let actions: ts.CodeAction[] = undefined; - const checkedDiagnostics = ts.createMap(); - - for (const diagnostic of diagnostics) { + for (const diagnostic of dedupedDiagnositcs) { if (errorCode && errorCode !== diagnostic.code) { continue; } - const summary = JSON.stringify({ - start: diagnostic.start, - length: diagnostic.length, - code: diagnostic.code - }); - - if (checkedDiagnostics.has(summary)) { - // Don't want to ask for code fixes in an identical position for the same error code twice. - continue; - } - else { - checkedDiagnostics.set(summary, true); - } - const newActions = this.languageService.getCodeFixesAtPosition(fileName, diagnostic.start, diagnostic.length, [diagnostic.code]); if (newActions && newActions.length) { actions = actions ? actions.concat(newActions) : newActions; diff --git a/src/services/services.ts b/src/services/services.ts index 35588a1902adb..2b1d414f4c3f0 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1688,13 +1688,7 @@ namespace ts { let allFixes: CodeAction[] = []; - // De-duplicate error codes. - const errorCodeSet: number[] = []; - for (const code of errorCodes) { - errorCodeSet[code] = code; - } - - forEach(errorCodeSet, error => { + forEach(deduplicate(errorCodes), error => { cancellationToken.throwIfCancellationRequested(); const context = { From e74c03aca3e44419c301b526b8b7a0277cc6811b Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Tue, 14 Feb 2017 12:17:18 -0800 Subject: [PATCH 113/116] Add missing filename to tsx test --- tests/cases/fourslash/tsxCompletionNonTagLessThan.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts index d40201146a3c2..be71543843776 100644 --- a/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts +++ b/tests/cases/fourslash/tsxCompletionNonTagLessThan.ts @@ -1,5 +1,6 @@ /// +// @Filename: /a.tsx ////var x: Array Date: Tue, 14 Feb 2017 13:18:42 -0800 Subject: [PATCH 114/116] Enable per-request cancellation (#12371) enable -per-request cancellation * restore request for deferred calls * add tests * introduce MultistepOperation * (test) subsequent request cancels the preceding one --- src/harness/harnessLanguageService.ts | 2 +- src/harness/unittests/compileOnSave.ts | 1 + src/harness/unittests/session.ts | 2 +- .../unittests/tsserverProjectSystem.ts | 241 +++++++++++++++++- .../cancellationToken/cancellationToken.ts | 68 +++-- src/server/client.ts | 39 +-- src/server/protocol.ts | 14 + src/server/server.ts | 8 +- src/server/session.ts | 223 +++++++++++++--- 9 files changed, 513 insertions(+), 85 deletions(-) diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 59930fd98ba6c..ca2db231ef7cf 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -738,7 +738,7 @@ namespace Harness.LanguageService { // host to answer server queries about files on disk const serverHost = new SessionServerHost(clientHost); const server = new ts.server.Session(serverHost, - { isCancellationRequested: () => false }, + ts.server.nullCancellationToken, /*useOneInferredProject*/ false, /*typingsInstaller*/ undefined, Utils.byteLength, diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts index b2c46c5a18ce6..48558b5c1a3d5 100644 --- a/src/harness/unittests/compileOnSave.ts +++ b/src/harness/unittests/compileOnSave.ts @@ -4,6 +4,7 @@ namespace ts.projectSystem { import CommandNames = server.CommandNames; + const nullCancellationToken = server.nullCancellationToken; function createTestTypingsInstaller(host: server.ServerHost) { return new TestTypingsInstaller("/a/data/", /*throttleLimit*/5, host); diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts index 15c43d9e76bf7..8d306a6099b2a 100644 --- a/src/harness/unittests/session.ts +++ b/src/harness/unittests/session.ts @@ -27,7 +27,7 @@ namespace ts.server { clearImmediate: noop, createHash: s => s }; - const nullCancellationToken: HostCancellationToken = { isCancellationRequested: () => false }; + const mockLogger: Logger = { close: noop, hasLevel(): boolean { return false; }, diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts index 40a6c933242f9..ce8fa7351a202 100644 --- a/src/harness/unittests/tsserverProjectSystem.ts +++ b/src/harness/unittests/tsserverProjectSystem.ts @@ -34,10 +34,6 @@ namespace ts.projectSystem { getLogFileName: (): string => undefined }; - export const nullCancellationToken: HostCancellationToken = { - isCancellationRequested: () => false - }; - export const { content: libFileContent } = Harness.getDefaultLibraryFile(Harness.IO); export const libFile: FileOrFolder = { path: "/a/lib/lib.d.ts", @@ -158,17 +154,33 @@ namespace ts.projectSystem { } class TestSession extends server.Session { + private seq = 0; + getProjectService() { return this.projectService; } + + public getSeq() { + return this.seq; + } + + public getNextSeq() { + return this.seq + 1; + } + + public executeCommandSeq(request: Partial) { + this.seq++; + request.seq = this.seq; + request.type = "request"; + return this.executeCommand(request); + } }; - export function createSession(host: server.ServerHost, typingsInstaller?: server.ITypingsInstaller, projectServiceEventHandler?: server.ProjectServiceEventHandler) { + export function createSession(host: server.ServerHost, typingsInstaller?: server.ITypingsInstaller, projectServiceEventHandler?: server.ProjectServiceEventHandler, cancellationToken?: server.ServerCancellationToken) { if (typingsInstaller === undefined) { typingsInstaller = new TestTypingsInstaller("/a/data/", /*throttleLimit*/5, host); } - - return new TestSession(host, nullCancellationToken, /*useSingleInferredProject*/ false, typingsInstaller, Utils.byteLength, process.hrtime, nullLogger, /*canUseEvents*/ projectServiceEventHandler !== undefined, projectServiceEventHandler); + return new TestSession(host, cancellationToken || server.nullCancellationToken, /*useSingleInferredProject*/ false, typingsInstaller, Utils.byteLength, process.hrtime, nullLogger, /*canUseEvents*/ projectServiceEventHandler !== undefined, projectServiceEventHandler); } export interface CreateProjectServiceParameters { @@ -191,7 +203,7 @@ namespace ts.projectSystem { } } export function createProjectService(host: server.ServerHost, parameters: CreateProjectServiceParameters = {}) { - const cancellationToken = parameters.cancellationToken || nullCancellationToken; + const cancellationToken = parameters.cancellationToken || server.nullCancellationToken; const logger = parameters.logger || nullLogger; const useSingleInferredProject = parameters.useSingleInferredProject !== undefined ? parameters.useSingleInferredProject : false; return new TestProjectService(host, logger, cancellationToken, useSingleInferredProject, parameters.typingsInstaller, parameters.eventHandler); @@ -328,6 +340,8 @@ namespace ts.projectSystem { export class TestServerHost implements server.ServerHost { args: string[] = []; + private readonly output: string[] = []; + private fs: ts.FileMap; private getCanonicalFileName: (s: string) => string; private toPath: (f: string) => Path; @@ -477,6 +491,10 @@ namespace ts.projectSystem { this.timeoutCallbacks.invoke(); } + runQueuedImmediateCallbacks() { + this.immediateCallbacks.invoke(); + } + setImmediate(callback: TimeOutCallback, _time: number, ...args: any[]) { return this.immediateCallbacks.register(callback, args); } @@ -509,7 +527,17 @@ namespace ts.projectSystem { this.reloadFS(filesOrFolders); } - write() { } + write(message: string) { + this.output.push(message); + } + + getOutput(): ReadonlyArray { + return this.output; + } + + clearOutput() { + this.output.length = 0; + } readonly readFile = (s: string) => (this.fs.get(this.toPath(s))).content; readonly resolvePath = (s: string) => s; @@ -3131,6 +3159,200 @@ namespace ts.projectSystem { }); }); + describe("cancellationToken", () => { + it("is attached to request", () => { + const f1 = { + path: "/a/b/app.ts", + content: "let xyz = 1;" + }; + const host = createServerHost([f1]); + let expectedRequestId: number; + const cancellationToken: server.ServerCancellationToken = { + isCancellationRequested: () => false, + setRequest: requestId => { + if (expectedRequestId === undefined) { + assert.isTrue(false, "unexpected call") + } + assert.equal(requestId, expectedRequestId); + }, + resetRequest: noop + } + const session = createSession(host, /*typingsInstaller*/ undefined, /*projectServiceEventHandler*/ undefined, cancellationToken); + + expectedRequestId = session.getNextSeq(); + session.executeCommandSeq({ + command: "open", + arguments: { file: f1.path } + }); + + expectedRequestId = session.getNextSeq(); + session.executeCommandSeq({ + command: "geterr", + arguments: { files: [f1.path] } + }); + + expectedRequestId = session.getNextSeq(); + session.executeCommandSeq({ + command: "occurrences", + arguments: { file: f1.path, line: 1, offset: 6 } + }); + + expectedRequestId = 2; + host.runQueuedImmediateCallbacks(); + expectedRequestId = 2; + host.runQueuedImmediateCallbacks(); + }); + + it("Geterr is cancellable", () => { + const f1 = { + path: "/a/app.ts", + content: "let x = 1" + }; + const config = { + path: "/a/tsconfig.json", + content: JSON.stringify({ + compilerOptions: {} + }) + }; + + let requestToCancel = -1; + const cancellationToken: server.ServerCancellationToken = (function(){ + let currentId: number; + return { + setRequest(requestId) { + currentId = requestId; + }, + resetRequest(requestId) { + assert.equal(requestId, currentId, "unexpected request id in cancellation") + currentId = undefined; + }, + isCancellationRequested() { + return requestToCancel === currentId; + } + } + })(); + const host = createServerHost([f1, config]); + const session = createSession(host, /*typingsInstaller*/ undefined, () => {}, cancellationToken); + { + session.executeCommandSeq({ + command: "open", + arguments: { file: f1.path } + }); + // send geterr for missing file + session.executeCommandSeq({ + command: "geterr", + arguments: { files: ["/a/missing"] } + }); + // no files - expect 'completed' event + assert.equal(host.getOutput().length, 1, "expect 1 message"); + verifyRequestCompleted(session.getSeq(), 0); + } + { + const getErrId = session.getNextSeq(); + // send geterr for a valid file + session.executeCommandSeq({ + command: "geterr", + arguments: { files: [f1.path] } + }); + + assert.equal(host.getOutput().length, 0, "expect 0 messages"); + + // run new request + session.executeCommandSeq({ + command: "projectInfo", + arguments: { file: f1.path } + }); + host.clearOutput(); + + // cancel previously issued Geterr + requestToCancel = getErrId; + host.runQueuedTimeoutCallbacks(); + + assert.equal(host.getOutput().length, 1, "expect 1 message"); + verifyRequestCompleted(getErrId, 0); + + requestToCancel = -1; + } + { + const getErrId = session.getNextSeq(); + session.executeCommandSeq({ + command: "geterr", + arguments: { files: [f1.path] } + }); + assert.equal(host.getOutput().length, 0, "expect 0 messages"); + + // run first step + host.runQueuedTimeoutCallbacks(); + assert.equal(host.getOutput().length, 1, "expect 1 messages"); + const e1 = getMessage(0); + assert.equal(e1.event, "syntaxDiag"); + host.clearOutput(); + + requestToCancel = getErrId; + host.runQueuedImmediateCallbacks(); + assert.equal(host.getOutput().length, 1, "expect 1 message"); + verifyRequestCompleted(getErrId, 0); + + requestToCancel = -1; + } + { + const getErrId = session.getNextSeq(); + session.executeCommandSeq({ + command: "geterr", + arguments: { files: [f1.path] } + }); + assert.equal(host.getOutput().length, 0, "expect 0 messages"); + + // run first step + host.runQueuedTimeoutCallbacks(); + assert.equal(host.getOutput().length, 1, "expect 1 messages"); + const e1 = getMessage(0); + assert.equal(e1.event, "syntaxDiag"); + host.clearOutput(); + + host.runQueuedImmediateCallbacks(); + assert.equal(host.getOutput().length, 2, "expect 2 messages"); + const e2 = getMessage(0); + assert.equal(e2.event, "semanticDiag"); + verifyRequestCompleted(getErrId, 1); + + requestToCancel = -1; + } + { + const getErr1 = session.getNextSeq(); + session.executeCommandSeq({ + command: "geterr", + arguments: { files: [f1.path] } + }); + assert.equal(host.getOutput().length, 0, "expect 0 messages"); + // run first step + host.runQueuedTimeoutCallbacks(); + assert.equal(host.getOutput().length, 1, "expect 1 messages"); + const e1 = getMessage(0); + assert.equal(e1.event, "syntaxDiag"); + host.clearOutput(); + + session.executeCommandSeq({ + command: "geterr", + arguments: { files: [f1.path] } + }); + // make sure that getErr1 is completed + verifyRequestCompleted(getErr1, 0); + } + + function verifyRequestCompleted(expectedSeq: number, n: number) { + const event = getMessage(n); + assert.equal(event.event, "requestCompleted"); + assert.equal(event.body.request_seq, expectedSeq, "expectedSeq"); + host.clearOutput(); + } + + function getMessage(n: number) { + return JSON.parse(server.extractMessage(host.getOutput()[n])); + } + }); + }); + describe("maxNodeModuleJsDepth for inferred projects", () => { it("should be set to 2 if the project has js root files", () => { const file1: FileOrFolder = { @@ -3184,5 +3406,4 @@ namespace ts.projectSystem { assert.isUndefined(project.getCompilerOptions().maxNodeModuleJsDepth); }); }); - } \ No newline at end of file diff --git a/src/server/cancellationToken/cancellationToken.ts b/src/server/cancellationToken/cancellationToken.ts index de59f3a1bcebc..71a31d14016a6 100644 --- a/src/server/cancellationToken/cancellationToken.ts +++ b/src/server/cancellationToken/cancellationToken.ts @@ -1,14 +1,24 @@ -/// +/// +import fs = require("fs"); -// TODO: extract services types -interface HostCancellationToken { +interface ServerCancellationToken { isCancellationRequested(): boolean; + setRequest(requestId: number): void; + resetRequest(requestId: number): void; } -import fs = require("fs"); +function pipeExists(name: string): boolean { + try { + fs.statSync(name); + return true; + } + catch (e) { + return false; + } +} -function createCancellationToken(args: string[]): HostCancellationToken { +function createCancellationToken(args: string[]): ServerCancellationToken { let cancellationPipeName: string; for (let i = 0; i < args.length - 1; i++) { if (args[i] === "--cancellationPipeName") { @@ -17,18 +27,44 @@ function createCancellationToken(args: string[]): HostCancellationToken { } } if (!cancellationPipeName) { - return { isCancellationRequested: () => false }; + return { + isCancellationRequested: () => false, + setRequest: (_requestId: number): void => void 0, + resetRequest: (_requestId: number): void => void 0 + }; } - return { - isCancellationRequested() { - try { - fs.statSync(cancellationPipeName); - return true; - } - catch (e) { - return false; - } + // cancellationPipeName is a string without '*' inside that can optionally end with '*' + // when client wants to signal cancellation it should create a named pipe with name= + // server will synchronously check the presence of the pipe and treat its existance as indicator that current request should be canceled. + // in case if client prefers to use more fine-grained schema than one name for all request it can add '*' to the end of cancelellationPipeName. + // in this case pipe name will be build dynamically as . + if (cancellationPipeName.charAt(cancellationPipeName.length - 1) === "*") { + const namePrefix = cancellationPipeName.slice(0, -1); + if (namePrefix.length === 0 || namePrefix.indexOf("*") >= 0) { + throw new Error("Invalid name for template cancellation pipe: it should have length greater than 2 characters and contain only one '*'."); } - }; + let perRequestPipeName: string; + let currentRequestId: number; + return { + isCancellationRequested: () => perRequestPipeName !== undefined && pipeExists(perRequestPipeName), + setRequest(requestId: number) { + currentRequestId = currentRequestId; + perRequestPipeName = namePrefix + requestId; + }, + resetRequest(requestId: number) { + if (currentRequestId !== requestId) { + throw new Error(`Mismatched request id, expected ${currentRequestId}, actual ${requestId}`); + } + perRequestPipeName = undefined; + } + }; + } + else { + return { + isCancellationRequested: () => pipeExists(cancellationPipeName), + setRequest: (_requestId: number): void => void 0, + resetRequest: (_requestId: number): void => void 0 + }; + } } export = createCancellationToken; \ No newline at end of file diff --git a/src/server/client.ts b/src/server/client.ts index d9e93769bd9ea..6f784db1682d2 100644 --- a/src/server/client.ts +++ b/src/server/client.ts @@ -13,6 +13,25 @@ namespace ts.server { findInComments: boolean; } + /* @internal */ + export function extractMessage(message: string) { + // Read the content length + const contentLengthPrefix = "Content-Length: "; + const lines = message.split(/\r?\n/); + Debug.assert(lines.length >= 2, "Malformed response: Expected 3 lines in the response."); + + const contentLengthText = lines[0]; + Debug.assert(contentLengthText.indexOf(contentLengthPrefix) === 0, "Malformed response: Response text did not contain content-length header."); + const contentLength = parseInt(contentLengthText.substring(contentLengthPrefix.length)); + + // Read the body + const responseBody = lines[2]; + + // Verify content length + Debug.assert(responseBody.length + 1 === contentLength, "Malformed response: Content length did not match the response's body length."); + return responseBody; + } + export class SessionClient implements LanguageService { private sequence: number = 0; private lineMaps: ts.Map = ts.createMap(); @@ -84,7 +103,7 @@ namespace ts.server { while (!foundResponseMessage) { lastMessage = this.messages.shift(); Debug.assert(!!lastMessage, "Did not receive any responses."); - const responseBody = processMessage(lastMessage); + const responseBody = extractMessage(lastMessage); try { response = JSON.parse(responseBody); // the server may emit events before emitting the response. We @@ -109,24 +128,6 @@ namespace ts.server { Debug.assert(!!response.body, "Malformed response: Unexpected empty response body."); return response; - - function processMessage(message: string) { - // Read the content length - const contentLengthPrefix = "Content-Length: "; - const lines = message.split("\r\n"); - Debug.assert(lines.length >= 2, "Malformed response: Expected 3 lines in the response."); - - const contentLengthText = lines[0]; - Debug.assert(contentLengthText.indexOf(contentLengthPrefix) === 0, "Malformed response: Response text did not contain content-length header."); - const contentLength = parseInt(contentLengthText.substring(contentLengthPrefix.length)); - - // Read the body - const responseBody = lines[2]; - - // Verify content length - Debug.assert(responseBody.length + 1 === contentLength, "Malformed response: Content length did not match the response's body length."); - return responseBody; - } } openFile(fileName: string, content?: string, scriptKindName?: "TS" | "JS" | "TSX" | "JSX"): void { diff --git a/src/server/protocol.ts b/src/server/protocol.ts index e82eca86ba968..4d583cb66d9d5 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -1766,6 +1766,20 @@ namespace ts.server.protocol { arguments: GeterrRequestArgs; } + export type RequestCompletedEventName = "requestCompleted"; + + /** + * Event that is sent when server have finished processing request with specified id. + */ + export interface RequestCompletedEvent extends Event { + event: RequestCompletedEventName; + body: RequestCompletedEventBody; + } + + export interface RequestCompletedEventBody { + request_seq: number; + } + /** * Item of diagnostic information found in a DiagnosticEvent message. */ diff --git a/src/server/server.ts b/src/server/server.ts index e689a2fc7824f..9488d8037bbf0 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -354,7 +354,7 @@ namespace ts.server { class IOSession extends Session { constructor( host: ServerHost, - cancellationToken: HostCancellationToken, + cancellationToken: ServerCancellationToken, installerEventPort: number, canUseEvents: boolean, useSingleInferredProject: boolean, @@ -593,15 +593,13 @@ namespace ts.server { sys.gc = () => global.gc(); } - let cancellationToken: HostCancellationToken; + let cancellationToken: ServerCancellationToken; try { const factory = require("./cancellationToken"); cancellationToken = factory(sys.args); } catch (e) { - cancellationToken = { - isCancellationRequested: () => false - }; + cancellationToken = nullCancellationToken; }; let eventPort: number; diff --git a/src/server/session.ts b/src/server/session.ts index 5d745fc796531..262ba8da1da53 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -8,6 +8,17 @@ namespace ts.server { stack?: string; } + export interface ServerCancellationToken extends HostCancellationToken { + setRequest(requestId: number): void; + resetRequest(requestId: number): void; + } + + export const nullCancellationToken: ServerCancellationToken = { + isCancellationRequested: () => false, + setRequest: () => void 0, + resetRequest: () => void 0 + }; + function hrTimeToMilliseconds(time: number[]): number { const seconds = time[0]; const nanoseconds = time[1]; @@ -193,18 +204,134 @@ namespace ts.server { return `Content-Length: ${1 + len}\r\n\r\n${json}${newLine}`; } + /** + * Allows to schedule next step in multistep operation + */ + interface NextStep { + immediate(action: () => void): void; + delay(ms: number, action: () => void): void; + } + + /** + * External capabilities used by multistep operation + */ + interface MultistepOperationHost { + getCurrentRequestId(): number; + sendRequestCompletedEvent(requestId: number): void; + getServerHost(): ServerHost; + isCancellationRequested(): boolean; + executeWithRequestId(requestId: number, action: () => void): void; + logError(error: Error, message: string): void; + } + + /** + * Represents operation that can schedule its next step to be executed later. + * Scheduling is done via instance of NextStep. If on current step subsequent step was not scheduled - operation is assumed to be completed. + */ + class MultistepOperation { + private requestId: number; + private timerHandle: any; + private immediateId: any; + private completed = true; + private readonly next: NextStep; + + constructor(private readonly operationHost: MultistepOperationHost) { + this.next = { + immediate: action => this.immediate(action), + delay: (ms, action) => this.delay(ms, action) + } + } + + public startNew(action: (next: NextStep) => void) { + this.complete(); + this.requestId = this.operationHost.getCurrentRequestId(); + this.completed = false; + this.executeAction(action); + } + + private complete() { + if (!this.completed) { + if (this.requestId) { + this.operationHost.sendRequestCompletedEvent(this.requestId); + } + this.completed = true; + } + this.setTimerHandle(undefined); + this.setImmediateId(undefined); + } + + private immediate(action: () => void) { + const requestId = this.requestId; + Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "immediate: incorrect request id") + this.setImmediateId(this.operationHost.getServerHost().setImmediate(() => { + this.immediateId = undefined; + this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action)); + })); + } + + private delay(ms: number, action: () => void) { + const requestId = this.requestId; + Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "delay: incorrect request id") + this.setTimerHandle(this.operationHost.getServerHost().setTimeout(() => { + this.timerHandle = undefined; + this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action)); + }, ms)); + } + + private executeAction(action: (next: NextStep) => void) { + let stop = false; + try { + if (this.operationHost.isCancellationRequested()) { + stop = true; + } + else { + action(this.next); + } + } + catch (e) { + stop = true; + // ignore cancellation request + if (!(e instanceof OperationCanceledException)) { + this.operationHost.logError(e, `delayed processing of request ${this.requestId}`); + } + } + if (stop || !this.hasPendingWork()) { + this.complete(); + } + } + + private setTimerHandle(timerHandle: any) {; + if (this.timerHandle !== undefined) { + this.operationHost.getServerHost().clearTimeout(this.timerHandle); + } + this.timerHandle = timerHandle; + } + + private setImmediateId(immediateId: number) { + if (this.immediateId !== undefined) { + this.operationHost.getServerHost().clearImmediate(this.immediateId); + } + this.immediateId = immediateId; + } + + private hasPendingWork() { + return !!this.timerHandle || !!this.immediateId; + } + } + export class Session implements EventSender { private readonly gcTimer: GcTimer; protected projectService: ProjectService; - private errorTimer: any; /*NodeJS.Timer | number*/ - private immediateId: any; private changeSeq = 0; + private currentRequestId: number; + private errorCheck: MultistepOperation; + private eventHander: ProjectServiceEventHandler; constructor( private host: ServerHost, - cancellationToken: HostCancellationToken, + private readonly cancellationToken: ServerCancellationToken, useSingleInferredProject: boolean, protected readonly typingsInstaller: ITypingsInstaller, private byteLength: (buf: string, encoding?: string) => number, @@ -217,17 +344,35 @@ namespace ts.server { ? eventHandler || (event => this.defaultEventHandler(event)) : undefined; + const multistepOperationHost: MultistepOperationHost = { + executeWithRequestId: (requestId, action) => this.executeWithRequestId(requestId, action), + getCurrentRequestId: () => this.currentRequestId, + getServerHost: () => this.host, + logError: (err, cmd) => this.logError(err, cmd), + sendRequestCompletedEvent: requestId => this.sendRequestCompletedEvent(requestId), + isCancellationRequested: () => cancellationToken.isCancellationRequested() + } + this.errorCheck = new MultistepOperation(multistepOperationHost); this.projectService = new ProjectService(host, logger, cancellationToken, useSingleInferredProject, typingsInstaller, this.eventHander); this.gcTimer = new GcTimer(host, /*delay*/ 7000, logger); } + private sendRequestCompletedEvent(requestId: number): void { + const event: protocol.RequestCompletedEvent = { + seq: 0, + type: "event", + event: "requestCompleted", + body: { request_seq: requestId } + }; + this.send(event); + } + private defaultEventHandler(event: ProjectServiceEvent) { switch (event.eventName) { case ContextEvent: const { project, fileName } = event.data; this.projectService.logger.info(`got context event, updating diagnostics for ${fileName}`); - this.updateErrorCheck([{ fileName, project }], this.changeSeq, - (n) => n === this.changeSeq, 100); + this.errorCheck.startNew(next => this.updateErrorCheck(next, [{ fileName, project }], this.changeSeq, (n) => n === this.changeSeq, 100)); break; case ConfigFileDiagEvent: const { triggerFile, configFileName, diagnostics } = event.data; @@ -284,7 +429,7 @@ namespace ts.server { seq: 0, type: "event", event: eventName, - body: info, + body: info }; this.send(ev); } @@ -342,18 +487,11 @@ namespace ts.server { }, ms); } - private updateErrorCheck(checkList: PendingErrorCheck[], seq: number, - matchSeq: (seq: number) => boolean, ms = 1500, followMs = 200, requireOpen = true) { + private updateErrorCheck(next: NextStep, checkList: PendingErrorCheck[], seq: number, matchSeq: (seq: number) => boolean, ms = 1500, followMs = 200, requireOpen = true) { if (followMs > ms) { followMs = ms; } - if (this.errorTimer) { - this.host.clearTimeout(this.errorTimer); - } - if (this.immediateId) { - this.host.clearImmediate(this.immediateId); - this.immediateId = undefined; - } + let index = 0; const checkOne = () => { if (matchSeq(seq)) { @@ -361,21 +499,18 @@ namespace ts.server { index++; if (checkSpec.project.containsFile(checkSpec.fileName, requireOpen)) { this.syntacticCheck(checkSpec.fileName, checkSpec.project); - this.immediateId = this.host.setImmediate(() => { + next.immediate(() => { this.semanticCheck(checkSpec.fileName, checkSpec.project); - this.immediateId = undefined; if (checkList.length > index) { - this.errorTimer = this.host.setTimeout(checkOne, followMs); - } - else { - this.errorTimer = undefined; + next.delay(followMs, checkOne); } }); } } }; + if ((checkList.length > index) && (matchSeq(seq))) { - this.errorTimer = this.host.setTimeout(checkOne, ms); + next.delay(ms, checkOne); } } @@ -1087,7 +1222,7 @@ namespace ts.server { } } - private getDiagnostics(delay: number, fileNames: string[]) { + private getDiagnostics(next: NextStep, delay: number, fileNames: string[]): void { const checkList = fileNames.reduce((accum: PendingErrorCheck[], uncheckedFileName: string) => { const fileName = toNormalizedPath(uncheckedFileName); const project = this.projectService.getDefaultProjectForFile(fileName, /*refreshInferredProjects*/ true); @@ -1098,7 +1233,7 @@ namespace ts.server { }, []); if (checkList.length > 0) { - this.updateErrorCheck(checkList, this.changeSeq, (n) => n === this.changeSeq, delay); + this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n === this.changeSeq, delay); } } @@ -1335,7 +1470,7 @@ namespace ts.server { : spans; } - getDiagnosticsForProject(delay: number, fileName: string) { + private getDiagnosticsForProject(next: NextStep, delay: number, fileName: string): void { const { fileNames, languageServiceDisabled } = this.getProjectInfoWorker(fileName, /*projectFileName*/ undefined, /*needFileNameList*/ true); if (languageServiceDisabled) { return; @@ -1373,7 +1508,7 @@ namespace ts.server { const checkList = fileNamesInProject.map(fileName => ({ fileName, project })); // Project level error analysis runs on background files too, therefore // doesn't require the file to be opened - this.updateErrorCheck(checkList, this.changeSeq, (n) => n == this.changeSeq, delay, 200, /*requireOpen*/ false); + this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n == this.changeSeq, delay, 200, /*requireOpen*/ false); } } @@ -1550,13 +1685,13 @@ namespace ts.server { [CommandNames.SyntacticDiagnosticsSync]: (request: protocol.SyntacticDiagnosticsSyncRequest) => { return this.requiredResponse(this.getSyntacticDiagnosticsSync(request.arguments)); }, - [CommandNames.Geterr]: (request: protocol.Request) => { - const geterrArgs = request.arguments; - return { response: this.getDiagnostics(geterrArgs.delay, geterrArgs.files), responseRequired: false }; + [CommandNames.Geterr]: (request: protocol.GeterrRequest) => { + this.errorCheck.startNew(next => this.getDiagnostics(next, request.arguments.delay, request.arguments.files)); + return this.notRequired(); }, - [CommandNames.GeterrForProject]: (request: protocol.Request) => { - const { file, delay } = request.arguments; - return { response: this.getDiagnosticsForProject(delay, file), responseRequired: false }; + [CommandNames.GeterrForProject]: (request: protocol.GeterrForProjectRequest) => { + this.errorCheck.startNew(next => this.getDiagnosticsForProject(next, request.arguments.delay, request.arguments.file)); + return this.notRequired(); }, [CommandNames.Change]: (request: protocol.ChangeRequest) => { this.change(request.arguments); @@ -1643,10 +1778,32 @@ namespace ts.server { this.handlers.set(command, handler); } + private setCurrentRequest(requestId: number): void { + Debug.assert(this.currentRequestId === undefined); + this.currentRequestId = requestId; + this.cancellationToken.setRequest(requestId); + } + + private resetCurrentRequest(requestId: number): void { + Debug.assert(this.currentRequestId === requestId); + this.currentRequestId = undefined; + this.cancellationToken.resetRequest(requestId); + } + + public executeWithRequestId(requestId: number, f: () => T) { + try { + this.setCurrentRequest(requestId); + return f(); + } + finally { + this.resetCurrentRequest(requestId); + } + } + public executeCommand(request: protocol.Request): { response?: any, responseRequired?: boolean } { const handler = this.handlers.get(request.command); if (handler) { - return handler(request); + return this.executeWithRequestId(request.seq, () => handler(request)); } else { this.logger.msg(`Unrecognized JSON command: ${JSON.stringify(request)}`, Msg.Err); From aec310996cc52bde83dd5829e208ea61867cc270 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 14 Feb 2017 13:35:16 -0800 Subject: [PATCH 115/116] Language service extensibility --- scripts/buildProtocol.ts | 2 +- src/compiler/commandLineParser.ts | 10 +++ src/compiler/moduleNameResolver.ts | 7 +- src/compiler/types.ts | 12 ++- src/harness/fourslash.ts | 14 +++ src/harness/harnessLanguageService.ts | 89 +++++++++++++++++- src/server/project.ts | 109 ++++++++++++++++++++++- src/server/protocol.ts | 1 + src/server/server.ts | 12 +++ src/server/types.ts | 2 + tests/cases/fourslash/server/ngProxy1.ts | 19 ++++ tests/cases/fourslash/server/ngProxy2.ts | 20 +++++ tests/cases/fourslash/server/ngProxy3.ts | 20 +++++ tests/cases/fourslash/server/ngProxy4.ts | 20 +++++ 14 files changed, 325 insertions(+), 12 deletions(-) create mode 100644 tests/cases/fourslash/server/ngProxy1.ts create mode 100644 tests/cases/fourslash/server/ngProxy2.ts create mode 100644 tests/cases/fourslash/server/ngProxy3.ts create mode 100644 tests/cases/fourslash/server/ngProxy4.ts diff --git a/scripts/buildProtocol.ts b/scripts/buildProtocol.ts index 66f29f577d933..37ebd0105ae6f 100644 --- a/scripts/buildProtocol.ts +++ b/scripts/buildProtocol.ts @@ -167,7 +167,7 @@ function generateProtocolFile(protocolTs: string, typeScriptServicesDts: string) const sanityCheckProgram = getProgramWithProtocolText(protocolDts, /*includeTypeScriptServices*/ false); const diagnostics = [...sanityCheckProgram.getSyntacticDiagnostics(), ...sanityCheckProgram.getSemanticDiagnostics(), ...sanityCheckProgram.getGlobalDiagnostics()]; if (diagnostics.length) { - const flattenedDiagnostics = diagnostics.map(d => ts.flattenDiagnosticMessageText(d.messageText, "\n")).join("\n"); + const flattenedDiagnostics = diagnostics.map(d => `${ts.flattenDiagnosticMessageText(d.messageText, "\n")} at ${d.file.fileName} line ${d.start}`).join("\n"); throw new Error(`Unexpected errors during sanity check: ${flattenedDiagnostics}`); } return protocolDts; diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 52804dcd336de..ebb6a9ec39f41 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -459,6 +459,16 @@ namespace ts { name: "alwaysStrict", type: "boolean", description: Diagnostics.Parse_in_strict_mode_and_emit_use_strict_for_each_source_file + }, + { + // A list of plugins to load in the language service + name: "plugins", + type: "list", + isTSConfigOnly: true, + element: { + name: "plugin", + type: "object" + } } ]; diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 68b043f1439ff..c35bf3da28c6b 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -675,13 +675,18 @@ namespace ts { } export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations { + return nodeModuleNameResolverWorker(moduleName, containingFile, compilerOptions, host, cache, /* jsOnly*/ false); + } + + /* @internal */ + export function nodeModuleNameResolverWorker(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, jsOnly = false): ResolvedModuleWithFailedLookupLocations { const containingDirectory = getDirectoryPath(containingFile); const traceEnabled = isTraceEnabled(compilerOptions, host); const failedLookupLocations: string[] = []; const state: ModuleResolutionState = { compilerOptions, host, traceEnabled }; - const result = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript); + const result = jsOnly ? tryResolve(Extensions.JavaScript) : (tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript)); if (result && result.value) { const { resolved, isExternalLibraryImport } = result.value; return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4d8dcaa8ad7ab..bdc4eea98da09 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -3215,7 +3215,11 @@ NodeJs = 2 } - export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike; + export interface PluginImport { + name: string + } + + export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike | PluginImport[]; export interface CompilerOptions { allowJs?: boolean; @@ -3270,6 +3274,7 @@ outDir?: string; outFile?: string; paths?: MapLike; + /*@internal*/ plugins?: PluginImport[]; preserveConstEnums?: boolean; project?: string; /* @internal */ pretty?: DiagnosticStyle; @@ -3353,7 +3358,8 @@ JS = 1, JSX = 2, TS = 3, - TSX = 4 + TSX = 4, + External = 5 } export const enum ScriptTarget { @@ -3428,7 +3434,7 @@ /* @internal */ export interface CommandLineOptionOfListType extends CommandLineOptionBase { type: "list"; - element: CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType; + element: CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType | TsConfigOnlyOption; } /* @internal */ diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index d0a5f35d8ed2f..34aa9580d6d78 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -263,6 +263,20 @@ namespace FourSlash { // Create map between fileName and its content for easily looking up when resolveReference flag is specified this.inputFiles.set(file.fileName, file.content); if (ts.getBaseFileName(file.fileName).toLowerCase() === "tsconfig.json") { + const configJson = ts.parseConfigFileTextToJson(file.fileName, file.content); + if (configJson.config === undefined) { + throw new Error(`Failed to parse test tsconfig.json: ${configJson.error.messageText}`); + } + + // Extend our existing compiler options so that we can also support tsconfig only options + if (configJson.config.compilerOptions) { + const baseDirectory = ts.normalizePath(ts.getDirectoryPath(file.fileName)); + const tsConfig = ts.convertCompilerOptionsFromJson(configJson.config.compilerOptions, baseDirectory, file.fileName); + + if (!tsConfig.errors || !tsConfig.errors.length) { + compilationOptions = ts.extend(compilationOptions, tsConfig.options); + } + } configFileName = file.fileName; } diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index ca2db231ef7cf..202b429fcbc6a 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -126,7 +126,7 @@ namespace Harness.LanguageService { protected virtualFileSystem: Utils.VirtualFileSystem = new Utils.VirtualFileSystem(virtualFileSystemRoot, /*useCaseSensitiveFilenames*/false); constructor(protected cancellationToken = DefaultHostCancellationToken.Instance, - protected settings = ts.getDefaultCompilerOptions()) { + protected settings = ts.getDefaultCompilerOptions()) { } public getNewLine(): string { @@ -135,7 +135,7 @@ namespace Harness.LanguageService { public getFilenames(): string[] { const fileNames: string[] = []; - for (const virtualEntry of this.virtualFileSystem.getAllFileEntries()){ + for (const virtualEntry of this.virtualFileSystem.getAllFileEntries()) { const scriptInfo = virtualEntry.content; if (scriptInfo.isRootFile) { // only include root files here @@ -211,8 +211,8 @@ namespace Harness.LanguageService { readDirectory(path: string, extensions?: string[], exclude?: string[], include?: string[]): string[] { return ts.matchFiles(path, extensions, exclude, include, /*useCaseSensitiveFileNames*/false, - this.getCurrentDirectory(), - (p) => this.virtualFileSystem.getAccessibleFileSystemEntries(p)); + this.getCurrentDirectory(), + (p) => this.virtualFileSystem.getAccessibleFileSystemEntries(p)); } readFile(path: string): string { const snapshot = this.getScriptSnapshot(path); @@ -724,6 +724,87 @@ namespace Harness.LanguageService { createHash(s: string) { return s; } + + require(_initialDir: string, _moduleName: string): ts.server.RequireResult { + switch (_moduleName) { + // Adds to the Quick Info a fixed string and a string from the config file + // and replaces the first display part + case "quickinfo-augmeneter": + return { + module: () => ({ + create(info: ts.server.PluginCreateInfo) { + const proxy = makeDefaultProxy(info); + const langSvc: any = info.languageService; + proxy.getQuickInfoAtPosition = function () { + const parts = langSvc.getQuickInfoAtPosition.apply(langSvc, arguments); + if (parts.displayParts.length > 0) { + parts.displayParts[0].text = "Proxied"; + } + parts.displayParts.push({ text: info.config.message, kind: "punctuation" }); + return parts; + }; + + return proxy; + } + }), + error: undefined + }; + + // Throws during initialization + case "create-thrower": + return { + module: () => ({ + create() { + throw new Error("I am not a well-behaved plugin"); + } + }), + error: undefined + }; + + // Adds another diagnostic + case "diagnostic-adder": + return { + module: () => ({ + create(info: ts.server.PluginCreateInfo) { + const proxy = makeDefaultProxy(info); + proxy.getSemanticDiagnostics = function (filename: string) { + const prev = info.languageService.getSemanticDiagnostics(filename); + const sourceFile: ts.SourceFile = info.languageService.getSourceFile(filename); + prev.push({ + category: ts.DiagnosticCategory.Warning, + file: sourceFile, + code: 9999, + length: 3, + messageText: `Plugin diagnostic`, + start: 0 + }); + return prev; + } + return proxy; + } + }), + error: undefined + }; + + default: + return { + module: undefined, + error: "Could not resolve module" + }; + } + + function makeDefaultProxy(info: ts.server.PluginCreateInfo) { + // tslint:disable-next-line:no-null-keyword + const proxy = Object.create(null); + const langSvc: any = info.languageService; + for (const k of Object.keys(langSvc)) { + proxy[k] = function () { + return langSvc[k].apply(langSvc, arguments); + }; + } + return proxy; + } + } } export class ServerLanguageServiceAdapter implements LanguageServiceAdapter { diff --git a/src/server/project.ts b/src/server/project.ts index 6042fd9a62be6..5a48b6c0d1b9e 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -91,19 +91,38 @@ namespace ts.server { } } + export interface PluginCreateInfo { + project: Project; + languageService: LanguageService; + languageServiceHost: LanguageServiceHost; + serverHost: ServerHost; + config: any; + } + + export interface PluginModule { + create(createInfo: PluginCreateInfo): LanguageService; + getExternalFiles?(proj: Project): string[]; + } + + export interface PluginModuleFactory { + (mod: { typescript: typeof ts }): PluginModule; + } + export abstract class Project { private rootFiles: ScriptInfo[] = []; private rootFilesMap: FileMap = createFileMap(); - private lsHost: LSHost; private program: ts.Program; private cachedUnresolvedImportsPerFile = new UnresolvedImportsMap(); private lastCachedUnresolvedImportsList: SortedReadonlyArray; - private readonly languageService: LanguageService; + // wrapper over the real language service that will suppress all semantic operations + protected languageService: LanguageService; public languageServiceEnabled = true; + protected readonly lsHost: LSHost; + builder: Builder; /** * Set of files names that were updated since the last call to getChangesSinceVersion. @@ -150,6 +169,17 @@ namespace ts.server { return this.cachedUnresolvedImportsPerFile; } + public static resolveModule(moduleName: string, initialDir: string, host: ServerHost, log: (message: string) => void): {} { + const resolvedPath = normalizeSlashes(host.resolvePath(combinePaths(initialDir, "node_modules"))); + log(`Loading ${moduleName} from ${initialDir} (resolved to ${resolvedPath})`); + const result = host.require(resolvedPath, moduleName); + if (result.error) { + log(`Failed to load module: ${JSON.stringify(result.error)}`); + return undefined; + } + return result.module; + } + constructor( private readonly projectName: string, readonly projectKind: ProjectKind, @@ -237,6 +267,10 @@ namespace ts.server { abstract getProjectRootPath(): string | undefined; abstract getTypeAcquisition(): TypeAcquisition; + getExternalFiles(): string[] { + return []; + } + getSourceFile(path: Path) { if (!this.program) { return undefined; @@ -804,10 +838,12 @@ namespace ts.server { private typeRootsWatchers: FileWatcher[]; readonly canonicalConfigFilePath: NormalizedPath; + private plugins: PluginModule[] = []; + /** Used for configured projects which may have multiple open roots */ openRefCount = 0; - constructor(configFileName: NormalizedPath, + constructor(private configFileName: NormalizedPath, projectService: ProjectService, documentRegistry: ts.DocumentRegistry, hasExplicitListOfFiles: boolean, @@ -817,12 +853,64 @@ namespace ts.server { public compileOnSaveEnabled: boolean) { super(configFileName, ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled); this.canonicalConfigFilePath = asNormalizedPath(projectService.toCanonicalFileName(configFileName)); + this.enablePlugins(); } getConfigFilePath() { return this.getProjectName(); } + enablePlugins() { + const host = this.projectService.host; + const options = this.getCompilerOptions(); + const log = (message: string) => { + this.projectService.logger.info(message); + }; + + if (!(options.plugins && options.plugins.length)) { + this.projectService.logger.info("No plugins exist"); + // No plugins + return; + } + + if (!host.require) { + this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded"); + return; + } + + for (const pluginConfigEntry of options.plugins) { + const searchPath = getDirectoryPath(this.configFileName); + const resolvedModule = Project.resolveModule(pluginConfigEntry.name, searchPath, host, log); + if (resolvedModule) { + this.enableProxy(resolvedModule, pluginConfigEntry); + } + } + } + + private enableProxy(pluginModuleFactory: PluginModuleFactory, configEntry: PluginImport) { + try { + if (typeof pluginModuleFactory !== "function") { + this.projectService.logger.info(`Skipped loading plugin ${configEntry.name} because it did expose a proper factory function`); + return; + } + + const info: PluginCreateInfo = { + config: configEntry, + project: this, + languageService: this.languageService, + languageServiceHost: this.lsHost, + serverHost: this.projectService.host + }; + + const pluginModule = pluginModuleFactory({ typescript: ts }); + this.languageService = pluginModule.create(info); + this.plugins.push(pluginModule); + } + catch (e) { + this.projectService.logger.info(`Plugin activation failed: ${e}`); + } + } + getProjectRootPath() { return getDirectoryPath(this.getConfigFilePath()); } @@ -839,6 +927,21 @@ namespace ts.server { return this.typeAcquisition; } + getExternalFiles(): string[] { + const items: string[] = []; + for (const plugin of this.plugins) { + if (typeof plugin.getExternalFiles === "function") { + try { + items.push(...plugin.getExternalFiles(this)); + } + catch (e) { + this.projectService.logger.info(`A plugin threw an exception in getExternalFiles: ${e}`); + } + } + } + return items; + } + watchConfigFile(callback: (project: ConfiguredProject) => void) { this.projectFileWatcher = this.projectService.host.watchFile(this.getConfigFilePath(), _ => callback(this)); } diff --git a/src/server/protocol.ts b/src/server/protocol.ts index 4d583cb66d9d5..d8faad28b108f 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -2267,6 +2267,7 @@ namespace ts.server.protocol { outDir?: string; outFile?: string; paths?: MapLike; + plugins?: PluginImport[]; preserveConstEnums?: boolean; project?: string; reactNamespace?: string; diff --git a/src/server/server.ts b/src/server/server.ts index 9488d8037bbf0..fd4fcb87bbfa4 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -99,6 +99,8 @@ namespace ts.server { birthtime: Date; } + type RequireResult = { module: {}, error: undefined } | { module: undefined, error: {} }; + const readline: { createInterface(options: ReadLineOptions): NodeJS.EventEmitter; } = require("readline"); @@ -593,6 +595,16 @@ namespace ts.server { sys.gc = () => global.gc(); } + sys.require = (initialDir: string, moduleName: string): RequireResult => { + const result = nodeModuleNameResolver(moduleName, initialDir + "/program.ts", { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, sys, undefined, /*jsOnly*/ true); + try { + return { module: require(result.resolvedModule.resolvedFileName), error: undefined }; + } + catch (e) { + return { module: undefined, error: e }; + } + }; + let cancellationToken: ServerCancellationToken; try { const factory = require("./cancellationToken"); diff --git a/src/server/types.ts b/src/server/types.ts index 2c18f275202be..6edf424cbe6b6 100644 --- a/src/server/types.ts +++ b/src/server/types.ts @@ -9,6 +9,7 @@ declare namespace ts.server { data: any; } + type RequireResult = { module: {}, error: undefined } | { module: undefined, error: {} }; export interface ServerHost extends System { setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any; clearTimeout(timeoutId: any): void; @@ -16,6 +17,7 @@ declare namespace ts.server { clearImmediate(timeoutId: any): void; gc?(): void; trace?(s: string): void; + require?(initialPath: string, moduleName: string): RequireResult; } export interface SortedReadonlyArray extends ReadonlyArray { diff --git a/tests/cases/fourslash/server/ngProxy1.ts b/tests/cases/fourslash/server/ngProxy1.ts new file mode 100644 index 0000000000000..9c75a21e83861 --- /dev/null +++ b/tests/cases/fourslash/server/ngProxy1.ts @@ -0,0 +1,19 @@ +/// + +// @Filename: tsconfig.json +//// { +//// "compilerOptions": { +//// "plugins": [ +//// { "name": "quickinfo-augmeneter", "message": "hello world" } +//// ] +//// }, +//// "files": ["a.ts"] +//// } + +// @Filename: a.ts +//// let x = [1, 2]; +//// x/**/ +//// + +goTo.marker(); +verify.quickInfoIs('Proxied x: number[]hello world'); diff --git a/tests/cases/fourslash/server/ngProxy2.ts b/tests/cases/fourslash/server/ngProxy2.ts new file mode 100644 index 0000000000000..33f28eb31d53c --- /dev/null +++ b/tests/cases/fourslash/server/ngProxy2.ts @@ -0,0 +1,20 @@ +/// + +// @Filename: tsconfig.json +//// { +//// "compilerOptions": { +//// "plugins": [ +//// { "name": "invalidmodulename" } +//// ] +//// }, +//// "files": ["a.ts"] +//// } + +// @Filename: a.ts +//// let x = [1, 2]; +//// x/**/ +//// + +// LS shouldn't crash/fail if a plugin fails to load +goTo.marker(); +verify.quickInfoIs('let x: number[]'); diff --git a/tests/cases/fourslash/server/ngProxy3.ts b/tests/cases/fourslash/server/ngProxy3.ts new file mode 100644 index 0000000000000..5b9ea26d1dd88 --- /dev/null +++ b/tests/cases/fourslash/server/ngProxy3.ts @@ -0,0 +1,20 @@ +/// + +// @Filename: tsconfig.json +//// { +//// "compilerOptions": { +//// "plugins": [ +//// { "name": "create-thrower" } +//// ] +//// }, +//// "files": ["a.ts"] +//// } + +// @Filename: a.ts +//// let x = [1, 2]; +//// x/**/ +//// + +// LS shouldn't crash/fail if a plugin fails to init correctly +goTo.marker(); +verify.quickInfoIs('let x: number[]'); diff --git a/tests/cases/fourslash/server/ngProxy4.ts b/tests/cases/fourslash/server/ngProxy4.ts new file mode 100644 index 0000000000000..69455903dfbc9 --- /dev/null +++ b/tests/cases/fourslash/server/ngProxy4.ts @@ -0,0 +1,20 @@ +/// + +// @Filename: tsconfig.json +//// { +//// "compilerOptions": { +//// "plugins": [ +//// { "name": "diagnostic-adder" } +//// ] +//// }, +//// "files": ["a.ts"] +//// } + +// @Filename: a.ts +//// let x = [1, 2]; +//// x/**/ +//// + +// Test adding an error message +goTo.marker(); +verify.numberOfErrorsInCurrentFile(1); From 86cc40528668793cfb49cf977bed2d77f84b2f5e Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 14 Feb 2017 13:45:19 -0800 Subject: [PATCH 116/116] Fix downstream use --- src/server/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/server.ts b/src/server/server.ts index fd4fcb87bbfa4..d828a717a4150 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -596,7 +596,7 @@ namespace ts.server { } sys.require = (initialDir: string, moduleName: string): RequireResult => { - const result = nodeModuleNameResolver(moduleName, initialDir + "/program.ts", { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, sys, undefined, /*jsOnly*/ true); + const result = nodeModuleNameResolverWorker(moduleName, initialDir + "/program.ts", { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, sys, undefined, /*jsOnly*/ true); try { return { module: require(result.resolvedModule.resolvedFileName), error: undefined }; }