Repository navigation
Commit 849f96b
authored
* refactor(router): extract middleware merge-and-clone Response builder (#568)
Replace 3 near-identical merge-and-clone Response sites in executeMiddleware
(end-of-chain next() and short-circuit) and executeInterceptMiddleware with a
private mergeResponse(base, stub, {stubOverridesNonCookie, mergeReqCtx}) helper.
The two flags encode the only real differences: stubOverridesNonCookie (chain
ran vs explicit short-circuit) and mergeReqCtx (false ONLY for the intercept
path -- the one deliberate divergence, pinned by intercept-middleware-headers).
WebSocket-upgrade early returns + the hasStubHeaders gate stay at the call
sites. Behavior-preserving; semantic matrix + middleware e2e green.
* refactor(router): extract shared cache-hit fresh-loader resolution (#568)
yieldFromStore (prerender-store path) and withCacheLookup (runtime cache-hit
path) duplicated the fresh-loader-on-cache-hit block verbatim (loaders are never
cached): the isFullMatch branch, resolveLoadersOnly[WithRevalidation] calls,
state.matchedIds update, and the loader-resolve + cache-hit metrics. Extract
resolveFreshLoadersAndYield(). The router resolve fns are passed in (captured
early by each caller) rather than re-read from the ALS-backed getRouterContext()
inside the helper, preserving workerd ALS-disruption robustness. The render
barrier + cacheSource assignment stay at each call site (they differ). Behavior-
preserving; semantic matrix + cache e2e (dev+prod) green.
* refactor(router): replace loader-cache ctx.use chain with a stable interceptor (#568)
resolveLoaderData rebound ctx.use once per cached loader, chaining one wrapper
per loader (O(N) dispatch) and relying on an undocumented synchronous
capture-before-overwrite invariant. Install ONE stable interceptor on the first
cached loader that consults a per-ctx override table (_loaderCacheOverrides);
each subsequent cached loader just primes the table (O(1) dispatch). The
cache-miss execute runs through the captured pre-interceptor ctx.use
(_loaderCacheOriginalUse), so a loader never awaits its own in-flight promise.
Stays agnostic to which setup mode installed ctx.use (loader/silent/build), like
the old rebind. Adds a multi-cached-loader accumulation test. Behavior-
preserving; matrix + loader-cache unit + cache e2e green.
* refactor(router): extract parallel-slot component resolution (#568)
resolveParallelSegmentsWithRevalidation and the orphan-inlined loop in
resolveOrphanLayoutWithRevalidation duplicated the parallel-slot
component-resolution block (~45 lines): tryStaticSlot, then run the slot handler
with the _currentSegmentId slot-id pin, handlerRan flag, and streamed-handler
wrap. Extract resolveParallelSlotComponent() returning {component, handlerRan}.
The block is byte-identical between the two and SEPARABLE from their known
divergences: the defaultOverride/shouldResolve seed is computed by the caller
before the call, and loader-resolution ordering stays at the call site (orphan
before push, main after) -- neither is touched. Behavior-preserving; semantic
matrix + parallel-revalidate-fns + parallel-reval e2e green.
1 parent dce9296 commit 849f96b
6 files changed
Lines changed: 323 additions & 255 deletions
File tree
- packages/rangojs-router/src
- __tests__
- router
- match-middleware
- segment-resolution
- types
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
646 | 646 | | |
647 | 647 | | |
648 | 648 | | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
649 | 686 | | |
650 | 687 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | | - | |
| 96 | + | |
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
| |||
150 | 150 | | |
151 | 151 | | |
152 | 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 | + | |
153 | 228 | | |
154 | 229 | | |
155 | 230 | | |
| |||
216 | 291 | | |
217 | 292 | | |
218 | 293 | | |
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 | | - | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
277 | 303 | | |
278 | 304 | | |
279 | 305 | | |
| |||
550 | 576 | | |
551 | 577 | | |
552 | 578 | | |
553 | | - | |
554 | | - | |
555 | | - | |
556 | | - | |
557 | | - | |
558 | | - | |
559 | | - | |
560 | | - | |
561 | | - | |
562 | | - | |
563 | | - | |
564 | | - | |
565 | | - | |
566 | | - | |
567 | | - | |
568 | | - | |
569 | | - | |
570 | | - | |
571 | | - | |
572 | | - | |
573 | | - | |
574 | | - | |
575 | | - | |
576 | | - | |
577 | | - | |
578 | | - | |
579 | | - | |
580 | | - | |
581 | | - | |
582 | | - | |
583 | | - | |
584 | | - | |
585 | | - | |
586 | | - | |
587 | | - | |
588 | | - | |
589 | | - | |
590 | | - | |
591 | | - | |
592 | | - | |
593 | | - | |
594 | | - | |
595 | | - | |
596 | | - | |
597 | | - | |
598 | | - | |
599 | | - | |
600 | | - | |
601 | | - | |
602 | | - | |
603 | | - | |
604 | | - | |
605 | | - | |
606 | | - | |
607 | | - | |
608 | | - | |
609 | | - | |
610 | | - | |
611 | | - | |
612 | | - | |
613 | | - | |
614 | | - | |
615 | | - | |
616 | | - | |
617 | | - | |
618 | | - | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
619 | 589 | | |
620 | 590 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
326 | 326 | | |
327 | 327 | | |
328 | 328 | | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
329 | 352 | | |
330 | 353 | | |
331 | 354 | | |
| |||
364 | 387 | | |
365 | 388 | | |
366 | 389 | | |
367 | | - | |
368 | | - | |
369 | | - | |
370 | | - | |
371 | 390 | | |
372 | 391 | | |
373 | 392 | | |
374 | 393 | | |
375 | 394 | | |
376 | | - | |
377 | | - | |
378 | | - | |
379 | | - | |
380 | | - | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
381 | 400 | | |
382 | 401 | | |
383 | 402 | | |
| |||
476 | 495 | | |
477 | 496 | | |
478 | 497 | | |
479 | | - | |
480 | | - | |
481 | | - | |
482 | | - | |
483 | | - | |
484 | | - | |
485 | | - | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
486 | 503 | | |
487 | 504 | | |
488 | 505 | | |
| |||
637 | 654 | | |
638 | 655 | | |
639 | 656 | | |
640 | | - | |
641 | | - | |
642 | | - | |
643 | | - | |
644 | | - | |
645 | | - | |
646 | | - | |
647 | | - | |
648 | | - | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
649 | 664 | | |
650 | 665 | | |
651 | 666 | | |
| |||
0 commit comments