Repository navigation
Commit c18940e
authored
fix: use ObservableMixins helpers before RxAppBuilder initialization (#4410)
## What kind of change does this PR introduce?
Bug fix.
## What is the new behavior?
`ObservableMixins` no longer forces ReactiveUI initialization. Its pure
helpers can be
called before `RxAppBuilder...BuildApp()` has run:
- `WhereNotNull` and the internal `FromAsyncWithAllNotifications`
overloads work without
any builder setup, because none of them touch `RxApp`, the dependency
resolver, or the
schedulers.
- The `static ObservableMixins()` constructor that called
`RxAppBuilder.EnsureInitialized()`
has been removed. Every member of the class was verified to be pure, so
no per-member
initialization guard is required.
The nested observable helpers (`WhereNotNullObservable`,
`DeferredValueObservable`,
`FromAsyncObservable`) are now `internal` so their async-notification,
error, and
cancellation paths are exercised by real tests through
`InternalsVisibleTo`. The
unreachable linked-token-source disposal race is isolated behind a
single
`[ExcludeFromCodeCoverage]` helper, leaving no dead code.
## What is the current behavior?
Calling a pure helper such as `ObservableMixins.WhereNotNull(...)`
before the app was
built threw `TypeInitializationException` wrapping
`InvalidOperationException: ReactiveUI has not been initialized`,
because the type
initializer called `RxAppBuilder.EnsureInitialized()` even though
nothing in the class
depended on runtime state.
Closes #4360
## What might this PR break?
None. Public API is unchanged (the helpers were already returned as
interfaces, and the
nested types moved from `private` to `internal`, not `public`). Behavior
only changes for
the previously-failing pre-initialization path, which now succeeds.
## Checklist
- [x] I have read the [Contribute
guide](https://www.reactiveui.net/contribute/index.html)
- [x] Tests have been added or updated (for bug fixes / features)
- [ ] Docs have been added or updated (for bug fixes / features)
- [x] Changes target the `main` branch
- [x] PR title follows [Conventional
Commits](https://www.conventionalcommits.org/)
## Additional information
Coverage: `ObservableMixins.cs` is at 100% line and 100% branch (77/77
lines), measured
across the full `ReactiveUI.Tests` suite (1976 tests passing on net9.0).
Sibling-mixin audit (recommended follow-up, not changed here). Every
mixin in
`src/ReactiveUI.Shared/Mixins` carries the same `static X() =>
RxAppBuilder.EnsureInitialized();`
pattern. Auditing each:
- `MutableDependencyResolverExtensions` - pure; operates only on the
passed-in
`IMutableDependencyResolver`. Forced init appears unnecessary.
- `MutableDependencyResolverAOTExtensions` - pure; operates only on the
passed-in resolver.
Forced init appears unnecessary.
- `ObservedChangedMixins` - pure; expression/reflection helpers over
`IObservedChange`, no
global state. Forced init appears unnecessary.
- `ObservableLoggingMixins` - pure with respect to the builder flag;
uses Splat's `.Log()`
(its own locator, which has a default logger). Forced init appears
unnecessary.
- `ReactiveNotifyPropertyChangedMixins` - genuinely needs
initialization:
`AppLocator.Current.GetServices<ICreatesObservableForProperty>()`
requires services that
`BuildApp`/`WithCoreServices` register. Keep an init guard (scoped to
the member, per the
no-class-wide-ctor guidance).
- `AutoPersistHelperMixins` - genuinely needs initialization: uses
`RxSchedulers.MainThreadScheduler`/`TaskpoolScheduler` and `WhenAny`,
all configured by
`BuildApp`. Keep an init guard.
Recommendation: apply the same removal to the four pure mixins in a
follow-up, and replace
the class-wide constructor on the two init-dependent mixins with a
member-scoped
`EnsureInitialized()` call rather than a type-initializer side effect.1 parent 9f1b734 commit c18940e
2 files changed
Lines changed: 248 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | 23 | | |
26 | 24 | | |
27 | 25 | | |
| |||
145 | 143 | | |
146 | 144 | | |
147 | 145 | | |
148 | | - | |
| 146 | + | |
149 | 147 | | |
150 | 148 | | |
151 | 149 | | |
| |||
182 | 180 | | |
183 | 181 | | |
184 | 182 | | |
185 | | - | |
| 183 | + | |
186 | 184 | | |
187 | 185 | | |
188 | 186 | | |
| |||
213 | 211 | | |
214 | 212 | | |
215 | 213 | | |
216 | | - | |
| 214 | + | |
217 | 215 | | |
218 | 216 | | |
219 | 217 | | |
| |||
266 | 264 | | |
267 | 265 | | |
268 | 266 | | |
269 | | - | |
| 267 | + | |
270 | 268 | | |
271 | 269 | | |
272 | 270 | | |
| |||
298 | 296 | | |
299 | 297 | | |
300 | 298 | | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
301 | 307 | | |
302 | 308 | | |
303 | 309 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
6 | 12 | | |
7 | 13 | | |
8 | 14 | | |
9 | 15 | | |
10 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
11 | 42 | | |
12 | 43 | | |
13 | 44 | | |
| |||
96 | 127 | | |
97 | 128 | | |
98 | 129 | | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
99 | 334 | | |
100 | 335 | | |
101 | 336 | | |
| |||
0 commit comments