Adds the Transform Flags concept for tree transformations #6983
Moved modifier related flags to separate enum
- Loading branch information
commit 5b8cf9602842de5825ed4a88e41d405b7f9a0c14
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 |
|---|---|---|
|
|
@@ -37,7 +37,7 @@ namespace ts { | |
| return ModuleInstanceState.ConstEnumOnly; | ||
| } | ||
| // 3. non-exported import declarations | ||
| else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && !(getModifierFlags(node) & ModifierFlags.Export)) { | ||
| return ModuleInstanceState.NonInstantiated; | ||
| } | ||
| // 4. other uninstantiated module declarations. | ||
|
|
@@ -256,7 +256,7 @@ namespace ts { | |
|
|
||
| case SyntaxKind.FunctionDeclaration: | ||
| case SyntaxKind.ClassDeclaration: | ||
| return getModifierFlags(node) & ModifierFlags.Default ? "default" : undefined; | ||
| case SyntaxKind.JSDocFunctionType: | ||
| return isJSDocConstructSignature(node) ? "__new" : "__call"; | ||
| case SyntaxKind.Parameter: | ||
|
|
@@ -284,7 +284,7 @@ namespace ts { | |
| function declareSymbol(symbolTable: SymbolTable, parent: Symbol, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags): Symbol { | ||
| Debug.assert(!hasDynamicName(node)); | ||
|
|
||
| const isDefaultExport = getModifierFlags(node) & ModifierFlags.Default; | ||
| // The exported symbol for an export default function/class node is always named "default" | ||
| const name = isDefaultExport && parent ? "default" : getDeclarationName(node); | ||
|
|
||
|
|
@@ -329,7 +329,7 @@ namespace ts { | |
| : Diagnostics.Duplicate_identifier_0; | ||
|
|
||
| forEach(symbol.declarations, declaration => { | ||
| if (getModifierFlags(declaration) & ModifierFlags.Default) { | ||
| message = Diagnostics.A_module_cannot_have_multiple_default_exports; | ||
| } | ||
| }); | ||
|
|
@@ -353,7 +353,7 @@ namespace ts { | |
| } | ||
|
|
||
| function declareModuleMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags): Symbol { | ||
| const hasExportModifier = getCombinedModifierFlags(node) & ModifierFlags.Export; | ||
| if (symbolFlags & SymbolFlags.Alias) { | ||
| if (node.kind === SyntaxKind.ExportSpecifier || (node.kind === SyntaxKind.ImportEqualsDeclaration && hasExportModifier)) { | ||
| return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); | ||
|
|
@@ -862,7 +862,7 @@ namespace ts { | |
| } | ||
|
|
||
| function declareClassMember(node: Declaration, symbolFlags: SymbolFlags, symbolExcludes: SymbolFlags) { | ||
| return getModifierFlags(node) & ModifierFlags.Static | ||
| ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) | ||
| : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); | ||
| } | ||
|
|
@@ -899,7 +899,7 @@ namespace ts { | |
| function bindModuleDeclaration(node: ModuleDeclaration) { | ||
| setExportContextFlag(node); | ||
| if (isAmbientModule(node)) { | ||
| if (getModifierFlags(node) & ModifierFlags.Export) { | ||
| errorOnFirstToken(node, Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible); | ||
| } | ||
| declareSymbolAndAddToSymbolTable(node, SymbolFlags.ValueModule, SymbolFlags.ValueModuleExcludes); | ||
|
|
@@ -1800,7 +1800,7 @@ namespace ts { | |
| */ | ||
| export function computeTransformFlagsForNode(node: Node, subtreeFlags: TransformFlags): TransformFlags { | ||
| // Ambient nodes are TypeScript syntax and the flags of their subtree are ignored. | ||
| if (getModifierFlags(node) & ModifierFlags.Ambient) { | ||
| return (node.transformFlags = TransformFlags.AssertTypeScript) | ||
| & ~(node.excludeTransformFlags = TransformFlags.NodeExcludes); | ||
| } | ||
|
|
@@ -2008,7 +2008,7 @@ namespace ts { | |
| } | ||
|
|
||
| // If a parameter has an accessibility modifier, then it is TypeScript syntax. | ||
| if (getModifierFlags(node) & ModifierFlags.AccessibilityModifier) { | ||
| transformFlags |= TransformFlags.AssertTypeScript | TransformFlags.ContainsParameterPropertyAssignments; | ||
| } | ||
|
|
||
|
|
@@ -2033,7 +2033,7 @@ namespace ts { | |
| } | ||
|
|
||
| // An async arrow function is TypeScript syntax. | ||
| if (getModifierFlags(node) & ModifierFlags.Async) { | ||
| transformFlags |= TransformFlags.AssertTypeScript; | ||
| } | ||
|
|
||
|
|
@@ -2052,7 +2052,7 @@ namespace ts { | |
| } | ||
|
|
||
| // An async function expression is TypeScript syntax. | ||
| if (getModifierFlags(node) & ModifierFlags.Async) { | ||
| transformFlags |= TransformFlags.AssertTypeScript; | ||
| } | ||
|
|
||
|
|
@@ -2072,14 +2072,14 @@ namespace ts { | |
| // subtree has marked the container as needing to capture the lexical `this`, | ||
| // then this node is ES6 syntax. | ||
| if ((<FunctionDeclaration>node).asteriskToken | ||
| || getModifierFlags(node) & ModifierFlags.Export | ||
| || subtreeFlags & TransformFlags.ContainsCapturedLexicalThis | ||
| || subtreeFlags & TransformFlags.ContainsDefaultValueAssignments) { | ||
| transformFlags |= TransformFlags.AssertES6; | ||
| } | ||
|
|
||
| // An async function declaration is TypeScript syntax. | ||
| if (getModifierFlags(node) & ModifierFlags.Async) { | ||
| transformFlags |= TransformFlags.AssertTypeScript; | ||
| } | ||
|
|
||
|
|
@@ -2103,7 +2103,7 @@ namespace ts { | |
|
|
||
| case SyntaxKind.VariableStatement: | ||
| // If a VariableStatement is exported, then it is either ES6 or TypeScript syntax. | ||
| if (getModifierFlags(node) & ModifierFlags.Export) { | ||
| transformFlags |= TransformFlags.AssertES6 | TransformFlags.AssertTypeScript; | ||
| } | ||
|
|
||
|
|
@@ -2204,8 +2204,7 @@ namespace ts { | |
| // generic, or has both a computed property name and a decorator. | ||
| if ((<MethodDeclaration>node).body === undefined | ||
| || (<MethodDeclaration>node).typeParameters !== undefined | ||
| || getModifierFlags(node) & (ModifierFlags.Async | ModifierFlags.Abstract) | ||
| || (subtreeFlags & TransformFlags.ContainsDecorators | ||
| && subtreeFlags & TransformFlags.ContainsComputedPropertyName)) { | ||
|
Contributor
There was a problem hiding this comment. why you care about
Contributor
Author
There was a problem hiding this comment. This has to do with decorators. We don't want to re-evaluate the expression of the computed property name: // ts
class C {
@dec
[generateRandomMethodName()]() {
}
}
// js
class C {
[_a = generateRandomMethodName()]() {
}
}
__decorate([dec], C.prototype, _a, null);
var _a;We need to flag the method itself as needing a specific transformation in this case, to transform the computed property name. |
||
| transformFlags |= TransformFlags.AssertTypeScript; | ||
|
|
@@ -2220,7 +2219,7 @@ namespace ts { | |
|
|
||
| // A GetAccessor or SetAccessor is TypeScript syntax if it is either abstract, | ||
| // or has both a computed property name and a decorator. | ||
| if (getModifierFlags(node) & ModifierFlags.Abstract || | ||
| subtreeFlags & TransformFlags.ContainsDecorators && | ||
| subtreeFlags & TransformFlags.ContainsComputedPropertyName) { | ||
|
Contributor
There was a problem hiding this comment. why you care about ContainsComputedPropertyName to set the flag with AssertTypeScript?
Contributor
Author
There was a problem hiding this comment. See #6983 (comment) above for rationale. |
||
| transformFlags |= TransformFlags.AssertTypeScript; | ||
|
|
||
Oops, something went wrong.
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.
Not sure I understand why there is 'tilde' here?
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.
Bitwise not?
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.
Yes,
~gets the ones-complement of the operand. The result here is thetransformFlagsof the node, excludingexcludeTransformFlagsof the node.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.
Gotcha . Thanks @weswigham and @rbuckton. Also could you put return type in the signature?