maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix emit when binder treats exported const as namespace

Browse source
This commit is contained in:
Ron Buckton 2018-02-12 13:02:47 -08:00
parent 641f787006
commit c84b7caa25
5 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/checker.ts
View file

@ -25054,7 +25054,7 @@ namespace ts {
// we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
// kinds that we do NOT prefix.
const exportSymbol = getMergedSymbol(symbol.exportSymbol);
if (!prefixLocals && exportSymbol.flags & SymbolFlags.ExportHasLocal) {
if (!prefixLocals && exportSymbol.flags & SymbolFlags.ExportHasLocal && !(exportSymbol.flags & SymbolFlags.Variable)) {
return undefined;
}
symbol = exportSymbol;

18
tests/baselines/reference/typeFromPropertyAssignmentWithExport.js Normal file
View file

@ -0,0 +1,18 @@
//// [a.js]
// this is a javascript file...
export const Adapter = {};
Adapter.prop = {};
// comment this out, and it works
Adapter.asyncMethod = function() {}
//// [a.js]
"use strict";
// this is a javascript file...
exports.__esModule = true;
exports.Adapter = {};
exports.Adapter.prop = {};
// comment this out, and it works
exports.Adapter.asyncMethod = function () { };

13
tests/baselines/reference/typeFromPropertyAssignmentWithExport.symbols Normal file
View file

@ -0,0 +1,13 @@
=== tests/cases/conformance/salsa/a.js ===
// this is a javascript file...
export const Adapter = {};
>Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 4, 18))
Adapter.prop = {};
>Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 4, 18))
// comment this out, and it works
Adapter.asyncMethod = function() {}
>Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 4, 18))

22
tests/baselines/reference/typeFromPropertyAssignmentWithExport.types Normal file
View file

@ -0,0 +1,22 @@
=== tests/cases/conformance/salsa/a.js ===
// this is a javascript file...
export const Adapter = {};
>Adapter : { [x: string]: any; }
>{} : { [x: string]: any; }
Adapter.prop = {};
>Adapter.prop = {} : {}
>Adapter.prop : any
>Adapter : { [x: string]: any; }
>prop : any
>{} : {}
// comment this out, and it works
Adapter.asyncMethod = function() {}
>Adapter.asyncMethod = function() {} : () => void
>Adapter.asyncMethod : any
>Adapter : { [x: string]: any; }
>asyncMethod : any
>function() {} : () => void

12
tests/cases/conformance/salsa/typeFromPropertyAssignmentWithExport.ts Normal file
View file

@ -0,0 +1,12 @@
// @allowJs: true
// @checkJs: true
// @Filename: a.js
// @outDir: dist
// this is a javascript file...
export const Adapter = {};
Adapter.prop = {};
// comment this out, and it works
Adapter.asyncMethod = function() {}