Fix serialisation of static class members in JS #37780
Merged
Conversation
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
Previously static class members would be treated the same way as expando
namespace assignments to a class:
```ts
class C {
static get x() { return 1 }
}
C.y = 12
```
This PR adds a syntactic check to the static/namespace filter that
treats symbols whose valueDeclaration.parent is a class as statics.
Fixes #37289
sandersn
commented
Apr 3, 2020
| && (p.flags & SymbolFlags.Optional) === (getPropertyOfType(baseType, p.escapedName)!.flags & SymbolFlags.Optional) | ||
| && isTypeIdenticalTo(getTypeOfSymbol(p), getTypeOfPropertyOfType(baseType, p.escapedName)!))) { | ||
| if (p.flags & SymbolFlags.Prototype || | ||
| (baseType && getPropertyOfType(baseType, p.escapedName) |
There was a problem hiding this comment.
this is just a formatting change to make obvious that it's x || (y && z && ka && ki ...)
weswigham
approved these changes
Apr 3, 2020
| getPropertiesOfType(staticType), | ||
| p => !(p.flags & SymbolFlags.Prototype) && p.escapedName !== "prototype" | ||
| p => !(p.flags & SymbolFlags.Prototype) && p.escapedName !== "prototype" && p.valueDeclaration && isClassLike(p.valueDeclaration.parent) |
There was a problem hiding this comment.
Should we extract this predicate to a function, so it's obvious each place is using the same predicate (albeit inverted)?
There was a problem hiding this comment.
yes, although it reveals that this usage is not quite the same as the others, because it needs to (1) accept static members (the opposite of the others) but (2) exclude prototype (same as the others)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously static class members would be treated the same way as expando
namespace assignments to a class:
This PR adds a syntactic check to the static/namespace filter that
treats symbols whose valueDeclaration.parent is a class as statics.
Fixes #37289