Skip to content

Fix emit for shorthand properties when they refer to CommonJS exports. #9151

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
DanielRosenwasser merged 4 commits into from
Jun 14, 2016
Merged

Fix emit for shorthand properties when they refer to CommonJS exports. #9151

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
318e957
Added tests.
DanielRosenwasser Jun 14, 2016
d54094c
Accepted baselines.
DanielRosenwasser Jun 14, 2016
eae289c
Emit 'exports.' if the shorthand is a general export.
DanielRosenwasser Jun 14, 2016
e8a7e0c
Accepted baselines.
DanielRosenwasser Jun 14, 2016
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
Prev Previous commit
Next Next commit
Emit 'exports.' if the shorthand is a general export.
  • Loading branch information
@DanielRosenwasser
DanielRosenwasser committed Jun 14, 2016
commit eae289c7b7e645e14f9d1655e918d0c4660f903f
8 changes: 4 additions & 4 deletions src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2150,9 +2150,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
}

// Return true if identifier resolves to an exported member of a namespace
function isNamespaceExportReference(node: Identifier) {
function isExportReference(node: Identifier) {
const container = resolver.getReferencedExportContainer(node);
return container && container.kind !== SyntaxKind.SourceFile;
return !!container;
Copy link
Copy Markdown
Contributor

@mhegazy mhegazy Jun 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how can the container not be a sourceFile here?

Copy link
Copy Markdown
Member Author

@DanielRosenwasser DanielRosenwasser Jun 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you had a namespace, then the container is probably a namespace (i.e. ModuleDeclaration or ModuleBlock).

Are there any other containers I need to be aware of? Potentially statics on a class?

}

// Return true if identifier resolves to an imported identifier
Expand Down Expand Up @@ -2185,10 +2185,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
// const foo_1 = require('./foo');
// exports.baz = { foo: foo_1.foo };
//
if (languageVersion < ScriptTarget.ES6 || (modulekind !== ModuleKind.ES6 && isImportedReference(node.name)) || isNamespaceExportReference(node.name) ) {
if (languageVersion < ScriptTarget.ES6 || (modulekind !== ModuleKind.ES6 && isImportedReference(node.name)) || isExportReference(node.name)) {
// Emit identifier as an identifier
write(": ");
emit(node.name);
emitExpressionIdentifier(node.name);
}

if (languageVersion >= ScriptTarget.ES6 && node.objectAssignmentInitializer) {
Expand Down