[Transforms] Merge master 06/06/2016 #8991
Address PR comment
- Loading branch information
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,19 +26,24 @@ namespace ts { | |
| const languageVersion = getEmitScriptTarget(compilerOptions); | ||
| const moduleKind = getEmitModuleKind(compilerOptions); | ||
| const previousOnSubstituteNode = context.onSubstituteNode; | ||
| const previousOnEmitNode = context.onEmitNode; | ||
| context.onSubstituteNode = onSubstituteNode; | ||
| context.onEmitNode = onEmitNode; | ||
| context.enableSubstitution(SyntaxKind.Identifier); | ||
| context.enableSubstitution(SyntaxKind.BinaryExpression); | ||
| context.enableSubstitution(SyntaxKind.PrefixUnaryExpression); | ||
| context.enableSubstitution(SyntaxKind.PostfixUnaryExpression); | ||
| context.enableSubstitution(SyntaxKind.ShorthandPropertyAssignment); | ||
| context.enableEmitNotification(SyntaxKind.SourceFile); | ||
|
|
||
| let currentSourceFile: SourceFile; | ||
| let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[]; | ||
| let exportSpecifiers: Map<ExportSpecifier[]>; | ||
| let exportEquals: ExportAssignment; | ||
| let currentSourceFileIdDuringSubstitution: number; | ||
| // Subset of exportSpecifiers that is a binding-name. | ||
| // This is to reduce amount of memory we have to keep around even after we done with module-transformer | ||
| let bindingNameExportSpecifiersForFileMap: Map<Map<ExportSpecifier[]>>; | ||
| let hasExportStarsToExportValues: boolean; | ||
|
|
||
| return transformSourceFile; | ||
|
|
@@ -659,14 +664,14 @@ namespace ts { | |
| } | ||
| else { | ||
| if (!exportEquals && exportSpecifiers && hasProperty(exportSpecifiers, name.text)) { | ||
| if (!bindingNameExportSpecifiersForFileMap) { | ||
| bindingNameExportSpecifiersForFileMap = {}; | ||
| } | ||
| const sourceFileId = getOriginalNodeId(currentSourceFile); | ||
| if (!bindingNameExportSpecifiersForFileMap[sourceFileId]) { | ||
| bindingNameExportSpecifiersForFileMap[sourceFileId] = {}; | ||
| } | ||
| bindingNameExportSpecifiersForFileMap[sourceFileId][name.text] = exportSpecifiers[name.text]; | ||
| addExportMemberAssignments(resultStatements, name); | ||
| } | ||
| } | ||
|
|
@@ -814,6 +819,18 @@ namespace ts { | |
| return node.name ? getSynthesizedClone(node.name) : getGeneratedNameForNode(node); | ||
| } | ||
|
|
||
| function onEmitNode(node: Node, emit: (node: Node) => void): void { | ||
| if (node.kind === SyntaxKind.SourceFile) { | ||
| const savedCurrentSourceFileIdDuringSubstitution = currentSourceFileIdDuringSubstitution; | ||
| currentSourceFileIdDuringSubstitution = getOriginalNodeId(node); | ||
| previousOnEmitNode(node, emit); | ||
| currentSourceFileIdDuringSubstitution = savedCurrentSourceFileIdDuringSubstitution; | ||
| } | ||
| else { | ||
| previousOnEmitNode(node, emit); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Hooks node substitutions. | ||
| * | ||
|
|
@@ -871,12 +888,13 @@ namespace ts { | |
| const left = node.left; | ||
| // If the left-hand-side of the binaryExpression is an identifier and its is export through export Specifier | ||
| if (isIdentifier(left) && isAssignmentOperator(node.operatorToken.kind)) { | ||
| if (bindingNameExportSpecifiersForFileMap && | ||
| bindingNameExportSpecifiersForFileMap[currentSourceFileIdDuringSubstitution] && | ||
|
Contributor
There was a problem hiding this comment. Can we store the result of this lookup in a local variable so we aren't performing the same lookup twice in a row? |
||
| hasProperty(bindingNameExportSpecifiersForFileMap[currentSourceFileIdDuringSubstitution], left.text)) { | ||
|
|
||
| setNodeEmitFlags(node, NodeEmitFlags.NoSubstitution); | ||
| let nestedExportAssignment: BinaryExpression; | ||
| for (const specifier of bindingNameExportSpecifiersForFileMap[currentSourceFileIdDuringSubstitution][left.text]) { | ||
|
Contributor
There was a problem hiding this comment. As above, use a local variable to hold this so we aren't performing the lookup a third time. |
||
| nestedExportAssignment = nestedExportAssignment ? | ||
| createExportAssignment(specifier.name, nestedExportAssignment) : | ||
| createExportAssignment(specifier.name, node); | ||
|
|
@@ -892,24 +910,25 @@ namespace ts { | |
| // We don't need to check that the operator has SyntaxKind.plusplus or SyntaxKind.minusminus | ||
| const operator = node.operator; | ||
| const operand = node.operand; | ||
| if (isIdentifier(operand) && bindingNameExportSpecifiersForFileMap) { | ||
| if (bindingNameExportSpecifiersForFileMap && | ||
| bindingNameExportSpecifiersForFileMap[currentSourceFileIdDuringSubstitution] && | ||
|
Contributor
There was a problem hiding this comment. As above, create a local variable to hold this so we aren't performing the same lookup multiple times. |
||
| hasProperty(bindingNameExportSpecifiersForFileMap[currentSourceFileIdDuringSubstitution], operand.text)) { | ||
|
|
||
| setNodeEmitFlags(node, NodeEmitFlags.NoSubstitution); | ||
| let transformedUnaryExpression: BinaryExpression; | ||
| if (node.kind === SyntaxKind.PostfixUnaryExpression) { | ||
| transformedUnaryExpression = createBinaryWithOperatorToken( | ||
| operand, | ||
| createNode(operator === SyntaxKind.PlusPlusToken ? SyntaxKind.PlusEqualsToken : SyntaxKind.MinusEqualsToken), | ||
| createLiteral(1), | ||
| /*location*/ node | ||
| ); | ||
| // We have to set no substitution flag here to prevent visit the binary expression and substitute it again as we will preform all necessary substitution in here | ||
| setNodeEmitFlags(transformedUnaryExpression, NodeEmitFlags.NoSubstitution); | ||
| } | ||
| let nestedExportAssignment: BinaryExpression; | ||
| for (const specifier of bindingNameExportSpecifiersForFileMap[currentSourceFileIdDuringSubstitution][operand.text]) { | ||
| nestedExportAssignment = nestedExportAssignment ? | ||
| createExportAssignment(specifier.name, nestedExportAssignment) : | ||
| createExportAssignment(specifier.name, transformedUnaryExpression || node); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to enable emit notification for source files so that you know the current source file during substitution.