Skip to content

Fix commonjs module.exports= merging #27368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sandersn merged 1 commit into from
Sep 26, 2018
Merged

Fix commonjs module.exports= merging #27368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2340,7 +2340,7 @@ namespace ts {
}

function getCommonJsExportEquals(exported: Symbol | undefined, moduleSymbol: Symbol): Symbol | undefined {
if (!exported || moduleSymbol.exports!.size === 1) {
if (!exported || exported === unknownSymbol || moduleSymbol.exports!.size === 1) {
return exported;
}
const merged = cloneSymbol(exported);
Expand Down
12 changes: 12 additions & 0 deletions tests/baselines/reference/moduleExportAliasUnknown.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
tests/cases/conformance/salsa/bug27025.js(1,25): error TS2339: Property 'nonprop' does not exist on type 'Window'.
tests/cases/conformance/salsa/bug27025.js(2,15): error TS2304: Cannot find name 'bar'.


==== tests/cases/conformance/salsa/bug27025.js (2 errors) ====
module.exports = window.nonprop;
~~~~~~~
!!! error TS2339: Property 'nonprop' does not exist on type 'Window'.
exports.foo = bar;
~~~
!!! error TS2304: Cannot find name 'bar'.

11 changes: 11 additions & 0 deletions tests/baselines/reference/moduleExportAliasUnknown.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
=== tests/cases/conformance/salsa/bug27025.js ===
module.exports = window.nonprop;
>module.exports : Symbol("tests/cases/conformance/salsa/bug27025", Decl(bug27025.js, 0, 0))
>module : Symbol(export=, Decl(bug27025.js, 0, 0))
>exports : Symbol(export=, Decl(bug27025.js, 0, 0))
>window : Symbol(window, Decl(lib.dom.d.ts, --, --))

exports.foo = bar;
>exports : Symbol(foo, Decl(bug27025.js, 0, 32))
>foo : Symbol(foo, Decl(bug27025.js, 0, 32))

17 changes: 17 additions & 0 deletions tests/baselines/reference/moduleExportAliasUnknown.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
=== tests/cases/conformance/salsa/bug27025.js ===
module.exports = window.nonprop;
>module.exports = window.nonprop : any
>module.exports : any
>module : { "tests/cases/conformance/salsa/bug27025": any; }
>exports : any
>window.nonprop : any
>window : Window
>nonprop : any

exports.foo = bar;
>exports.foo = bar : any
>exports.foo : any
>exports : any
>foo : any
>bar : any

6 changes: 6 additions & 0 deletions tests/cases/conformance/salsa/moduleExportAliasUnknown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @allowJs: true
// @noEmit: true
// @checkJs: true
// @Filename: bug27025.js
module.exports = window.nonprop;
exports.foo = bar;