microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-10 15:25:54 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Always emit "__esModule" unless there is export =

Browse Source
This commit is contained in:
Kanchalai Tanglertsampan 2017-02-07 14:05:18 -08:00
parent eedc465763
commit bc6860428c
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/compiler/transformers/module/module.ts
View File

@ -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<Modifier>;
@ -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;
}