Small decorators optimization #2773
Merged
Conversation
This file contains 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
🦋 Changeset detectedLatest commit: ffb60fc The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
mweststrate
reviewed
Feb 2, 2021
| @@ -61,7 +62,7 @@ function make_(adm: ObservableObjectAdministration, key: PropertyKey): void { | |||
| } | |||
| if (annotated) { | |||
| recordAnnotationApplied(adm, this, key) | |||
| } else if (!this.isDecorator_) { | |||
| } else if (!adm.target_[storedAnnotationsSymbol]) { | |||
There was a problem hiding this comment.
Probably I misunderstand the logic, but should this be adm.target_[storedAnnotationsSymbol]?.[key]?
There was a problem hiding this comment.
Actually not a bad idea :) I think I was worried it would return false if recordAnnotationApplied is called before (it removes the annotation from adm.target_[storedAnnotationsSymbol]), but that can't happen here...
mweststrate
approved these changes
Feb 2, 2021
Merged
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.
Avoids an annotation object copy per decorator application.
Since mixing decorators/annotations is not officialy supported (it may actually work, but there are not tests for it), annotation itself doesn't have to know that it's decorator -
once target hasstoredAnnotationsSymbol- meaning at least one decorator was applied - we assume that all annotations are decorators.If one would try to mix decorators/annotation (unsupported), this change breaks check for non-existing prop (it won't throw).
The decorator detection could be made a bit more realiable by changing
make_to accept additionalisDecoratorparam and calling:adm.make_(key, annotations![key], !annotations)frommakeObservable.Not sure if worth it ATM, but at least good to have this noted here.
EDIT: Changed to check for specific key, should work equally well in this case.