[BUGFIX stable] Allow store to be injected on Route
#20482
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
gitKrystan
reviewed
Jun 28, 2023
chriskrycho
force-pushed
the
types/router-store-fix
branch
from
8796c93
to
e1c62b5
Compare
In the public types, TypeScript (correctly) complains when users try to inject the store with `@service store` on a `Route` subclass, because the item is an accessor on `Route` itself, and the service injection "happens" to work only because the `set store(value)` smashes itself as well as the corresponding `get store()` using `defineProperty`. Work around this by renaming the getter in question to `_store` and updating the one usage to check for a `store` property before falling back to the `_store` property. Happily, this also dovetails with the plan to deprecate the automatic `findModel` behavior this exists to support: once that is removed, this entire code path can be cleaned up trivially.
chriskrycho
force-pushed
the
types/router-store-fix
branch
from
e1c62b5
to
2ea2a23
Compare
wagenet
approved these changes
Jun 29, 2023
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.
In the public types, TypeScript (correctly) complains when users try to inject the store with
@service storeon aRoutesubclass, because the item is an accessor onRouteitself, and the service injection "happens" to work only because theset store(value)smashes itself as well as the correspondingget store()usingdefineProperty.Work around this by renaming the getter in question to
_storeand updating the one usage to check for astoreproperty before falling back to the_storeproperty. Happily, this also dovetails with the plan to deprecate the automaticfindModelbehavior this exists to support: once that is removed, this entire code path can be cleaned up trivially.