@timber-js/app 0.2.0-alpha.239 → 0.2.0-alpha.240

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (332) hide show
  1. package/dist/_chunks/{actions-Top9GftB.js → actions-DIgnvDrG.js} +4 -4
  2. package/dist/_chunks/{actions-Top9GftB.js.map → actions-DIgnvDrG.js.map} +1 -1
  3. package/dist/_chunks/{als-registry-DpygwCp0.js → als-registry-PPYstxK0.js} +2 -1
  4. package/dist/_chunks/{als-registry-DpygwCp0.js.map → als-registry-PPYstxK0.js.map} +1 -1
  5. package/dist/_chunks/{cache-api-Bo8c7XVF.js → cache-api-uWQwuxWb.js} +5 -5
  6. package/dist/_chunks/{cache-api-Bo8c7XVF.js.map → cache-api-uWQwuxWb.js.map} +1 -1
  7. package/dist/_chunks/{chains-DMoHX4yH.js → chains-C7CExrUI.js} +2 -2
  8. package/dist/_chunks/{chains-DMoHX4yH.js.map → chains-C7CExrUI.js.map} +1 -1
  9. package/dist/_chunks/chains-CSslTUdI.js +1 -0
  10. package/dist/_chunks/{classify-BwyAd-dZ.js → classify-Cj9EeZoL.js} +2 -2
  11. package/dist/_chunks/{classify-BwyAd-dZ.js.map → classify-Cj9EeZoL.js.map} +1 -1
  12. package/dist/_chunks/{cli-check-DQAD9MLo.js → cli-check-C3QOAru7.js} +3 -3
  13. package/dist/_chunks/{cli-check-DQAD9MLo.js.map → cli-check-C3QOAru7.js.map} +1 -1
  14. package/dist/_chunks/{cli-schema-sync-C_xNLqBj.js → cli-schema-sync-BRxZz66D.js} +1 -1
  15. package/dist/_chunks/{cli-schema-sync-CmGls3dc.js → cli-schema-sync-DQUS_o3V.js} +2 -2
  16. package/dist/_chunks/{cli-schema-sync-CmGls3dc.js.map → cli-schema-sync-DQUS_o3V.js.map} +1 -1
  17. package/dist/_chunks/{client-dep-entries-C5BTQtFS.js → client-dep-entries-ZETBdLgv.js} +2 -2
  18. package/dist/_chunks/{client-dep-entries-C5BTQtFS.js.map → client-dep-entries-ZETBdLgv.js.map} +1 -1
  19. package/dist/_chunks/{convention-lint-GQA6WTRo.js → convention-lint-BoVISNS6.js} +3 -3
  20. package/dist/_chunks/{convention-lint-GQA6WTRo.js.map → convention-lint-BoVISNS6.js.map} +1 -1
  21. package/dist/_chunks/dev-server-B8roKA3Q.js +1 -0
  22. package/dist/_chunks/{dev-server-Cr3_Fu5A.js → dev-server-C5R6jx8Q.js} +2 -2
  23. package/dist/_chunks/{dev-server-Cr3_Fu5A.js.map → dev-server-C5R6jx8Q.js.map} +1 -1
  24. package/dist/_chunks/{dev-span-RsVeYYc_.js → dev-span-0aG7Q_Ph.js} +3 -7
  25. package/dist/_chunks/dev-span-0aG7Q_Ph.js.map +1 -0
  26. package/dist/_chunks/{error-boundary-Bh-egWUI.js → error-boundary-DB51f9ih.js} +98 -419
  27. package/dist/_chunks/error-boundary-DB51f9ih.js.map +1 -0
  28. package/dist/_chunks/{flight-source-node-BsrlUjMO.js → flight-source-node-D9cHBhjP.js} +7 -4
  29. package/dist/_chunks/flight-source-node-D9cHBhjP.js.map +1 -0
  30. package/dist/_chunks/{json-lossy-check-D47R9Fp5.js → json-lossy-check-Y1GxqVX_.js} +2 -2
  31. package/dist/_chunks/{json-lossy-check-D47R9Fp5.js.map → json-lossy-check-Y1GxqVX_.js.map} +1 -1
  32. package/dist/_chunks/{live-graph-HcLScfiV.js → live-graph-BDQWvnMm.js} +4 -4
  33. package/dist/_chunks/{live-graph-HcLScfiV.js.map → live-graph-BDQWvnMm.js.map} +1 -1
  34. package/dist/_chunks/{logger-DDLtp5e-.js → logger-DmRR9tmZ.js} +2 -2
  35. package/dist/_chunks/{logger-DDLtp5e-.js.map → logger-DmRR9tmZ.js.map} +1 -1
  36. package/dist/_chunks/metadata-routes-MXNjWOt5.js.map +1 -1
  37. package/dist/_chunks/{node-response-omewa8e6.js → node-response-yp8zdyRp.js} +2 -2
  38. package/dist/_chunks/{node-response-omewa8e6.js.map → node-response-yp8zdyRp.js.map} +1 -1
  39. package/dist/_chunks/plugin-context-BtaQcMuh.js.map +1 -1
  40. package/dist/_chunks/{poison-scan-DONdiCGX.js → poison-scan-WQgUydF_.js} +2 -2
  41. package/dist/_chunks/{poison-scan-DONdiCGX.js.map → poison-scan-WQgUydF_.js.map} +1 -1
  42. package/dist/_chunks/{scanner-DSAJjH0x.js → scanner-C9Lrf77z.js} +3 -2
  43. package/dist/_chunks/{scanner-DSAJjH0x.js.map → scanner-C9Lrf77z.js.map} +1 -1
  44. package/dist/_chunks/{sizeof-DVhEVN_y.js → sizeof-BISkSaU0.js} +2 -2
  45. package/dist/_chunks/{sizeof-DVhEVN_y.js.map → sizeof-BISkSaU0.js.map} +1 -1
  46. package/dist/_chunks/{walkers-96YopJds.js → walkers-Bxv4v7tX.js} +3 -3
  47. package/dist/_chunks/{walkers-96YopJds.js.map → walkers-Bxv4v7tX.js.map} +1 -1
  48. package/dist/adapters/cloudflare-kv-cache.js +1 -1
  49. package/dist/analyze/crawl-entry.js +3 -3
  50. package/dist/analyze/graph-command.js +2 -2
  51. package/dist/cache/index.js +2 -2
  52. package/dist/cache/stores/memory.js +1 -1
  53. package/dist/cdn/workers-cache-purge.js +1 -1
  54. package/dist/cli.js +3 -3
  55. package/dist/client/browser-entry/action-dispatch.d.ts.map +1 -1
  56. package/dist/client/browser-entry/hydrate.d.ts +1 -1
  57. package/dist/client/browser-entry/router-init.d.ts.map +1 -1
  58. package/dist/client/error-boundary.d.ts +1 -0
  59. package/dist/client/error-boundary.d.ts.map +1 -1
  60. package/dist/client/error-boundary.js +1 -1
  61. package/dist/client/history.d.ts +4 -5
  62. package/dist/client/history.d.ts.map +1 -1
  63. package/dist/client/index.js +6 -7
  64. package/dist/client/index.js.map +1 -1
  65. package/dist/client/internal.d.ts +1 -1
  66. package/dist/client/internal.d.ts.map +1 -1
  67. package/dist/client/internal.js +194 -55
  68. package/dist/client/internal.js.map +1 -1
  69. package/dist/client/navigation-commit.d.ts +6 -25
  70. package/dist/client/navigation-commit.d.ts.map +1 -1
  71. package/dist/client/outlet-content-cache.d.ts +59 -0
  72. package/dist/client/outlet-content-cache.d.ts.map +1 -0
  73. package/dist/client/outlet-scope-context.d.ts +30 -0
  74. package/dist/client/outlet-scope-context.d.ts.map +1 -0
  75. package/dist/client/params-context.d.ts +10 -11
  76. package/dist/client/params-context.d.ts.map +1 -1
  77. package/dist/client/router-pipeline.d.ts +5 -5
  78. package/dist/client/router-pipeline.d.ts.map +1 -1
  79. package/dist/client/router-types.d.ts +10 -24
  80. package/dist/client/router-types.d.ts.map +1 -1
  81. package/dist/client/router.d.ts.map +1 -1
  82. package/dist/client/rsc-fetch.d.ts +4 -17
  83. package/dist/client/rsc-fetch.d.ts.map +1 -1
  84. package/dist/client/segment-cache.d.ts +15 -103
  85. package/dist/client/segment-cache.d.ts.map +1 -1
  86. package/dist/client/segment-outlet.d.ts +28 -52
  87. package/dist/client/segment-outlet.d.ts.map +1 -1
  88. package/dist/client/stale-segment.d.ts +39 -0
  89. package/dist/client/stale-segment.d.ts.map +1 -0
  90. package/dist/client/use-segment-params.d.ts +1 -1
  91. package/dist/config-types.d.ts +7 -6
  92. package/dist/config-types.d.ts.map +1 -1
  93. package/dist/index.d.ts.map +1 -1
  94. package/dist/index.js +9 -732
  95. package/dist/index.js.map +1 -1
  96. package/dist/native/rsc/manifest.json +6 -4
  97. package/dist/native/rsc/routing/segment-keys.js +3 -11
  98. package/dist/native/rsc/routing/segment-keys.js.map +1 -1
  99. package/dist/native/rsc/server/access-gate.js +3 -7
  100. package/dist/native/rsc/server/access-gate.js.map +1 -1
  101. package/dist/native/rsc/server/als-registry.js +2 -1
  102. package/dist/native/rsc/server/als-registry.js.map +1 -1
  103. package/dist/native/rsc/server/build-manifest.js.map +1 -1
  104. package/dist/native/rsc/server/chain-url-parts.js +1 -6
  105. package/dist/native/rsc/server/chain-url-parts.js.map +1 -1
  106. package/dist/native/rsc/server/client-state-tree.js +33 -0
  107. package/dist/native/rsc/server/client-state-tree.js.map +1 -0
  108. package/dist/native/rsc/server/flight-source-node.js +5 -2
  109. package/dist/native/rsc/server/flight-source-node.js.map +1 -1
  110. package/dist/native/rsc/server/flight-source.js +46 -7
  111. package/dist/native/rsc/server/flight-source.js.map +1 -1
  112. package/dist/native/rsc/server/pipeline-interception.js +1 -1
  113. package/dist/native/rsc/server/publish-params.js.map +1 -1
  114. package/dist/native/rsc/server/route-element-builder.js +43 -61
  115. package/dist/native/rsc/server/route-element-builder.js.map +1 -1
  116. package/dist/native/rsc/server/rsc-entry/helpers.js +5 -28
  117. package/dist/native/rsc/server/rsc-entry/helpers.js.map +1 -1
  118. package/dist/native/rsc/server/rsc-entry/render-route.js +33 -7
  119. package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
  120. package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +2 -1
  121. package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js.map +1 -1
  122. package/dist/native/rsc/server/rsc-entry/rsc-payload.js +2 -5
  123. package/dist/native/rsc/server/rsc-entry/rsc-payload.js.map +1 -1
  124. package/dist/native/rsc/server/rsc-entry/rsc-stream.js +44 -40
  125. package/dist/native/rsc/server/rsc-entry/rsc-stream.js.map +1 -1
  126. package/dist/native/rsc/server/rsc-entry/ssr-renderer.js +1 -1
  127. package/dist/native/rsc/server/rsc-entry/ssr-renderer.js.map +1 -1
  128. package/dist/native/rsc/server/segment-hash/capture.js +107 -0
  129. package/dist/native/rsc/server/segment-hash/capture.js.map +1 -0
  130. package/dist/native/rsc/server/segment-hash/outlet.js +81 -0
  131. package/dist/native/rsc/server/segment-hash/outlet.js.map +1 -0
  132. package/dist/native/rsc/server/segment-hash/stream-tap.js +139 -0
  133. package/dist/native/rsc/server/segment-hash/stream-tap.js.map +1 -0
  134. package/dist/native/rsc/server/segment-hash/value-hash.js +171 -0
  135. package/dist/native/rsc/server/segment-hash/value-hash.js.map +1 -0
  136. package/dist/native/rsc/server/slot-resolver.js +20 -124
  137. package/dist/native/rsc/server/slot-resolver.js.map +1 -1
  138. package/dist/native/rsc/server/vite-handoff-rsc.js.map +1 -1
  139. package/dist/native/rsc/shared/outlet-decision.js +5 -0
  140. package/dist/native/rsc/shared/outlet-decision.js.map +1 -0
  141. package/dist/native/ssr/client/error-boundary.js +16 -3
  142. package/dist/native/ssr/client/error-boundary.js.map +1 -1
  143. package/dist/native/ssr/client/navigation-commit.js +1 -5
  144. package/dist/native/ssr/client/navigation-commit.js.map +1 -1
  145. package/dist/native/ssr/client/outlet-content-cache.js +53 -0
  146. package/dist/native/ssr/client/outlet-content-cache.js.map +1 -0
  147. package/dist/native/ssr/client/outlet-scope-context.js +12 -0
  148. package/dist/native/ssr/client/outlet-scope-context.js.map +1 -0
  149. package/dist/native/ssr/client/params-context.js.map +1 -1
  150. package/dist/native/ssr/client/rsc-fetch.js +1 -12
  151. package/dist/native/ssr/client/rsc-fetch.js.map +1 -1
  152. package/dist/native/ssr/client/segment-outlet.js +34 -13
  153. package/dist/native/ssr/client/segment-outlet.js.map +1 -1
  154. package/dist/native/ssr/client/stale-segment.js +29 -0
  155. package/dist/native/ssr/client/stale-segment.js.map +1 -0
  156. package/dist/native/ssr/manifest.json +5 -4
  157. package/dist/native/ssr/routing/segment-keys.js +5 -1
  158. package/dist/native/ssr/routing/segment-keys.js.map +1 -1
  159. package/dist/native/ssr/server/access-gate.js +3 -7
  160. package/dist/native/ssr/server/access-gate.js.map +1 -1
  161. package/dist/native/ssr/server/als-registry.js +1 -0
  162. package/dist/native/ssr/server/als-registry.js.map +1 -1
  163. package/dist/native/ssr/server/build-manifest.js.map +1 -1
  164. package/dist/native/ssr/server/client-state-tree.js +33 -0
  165. package/dist/native/ssr/server/client-state-tree.js.map +1 -0
  166. package/dist/native/ssr/server/flight-source-node.js +5 -2
  167. package/dist/native/ssr/server/flight-source-node.js.map +1 -1
  168. package/dist/native/ssr/server/flight-source.js +1 -0
  169. package/dist/native/ssr/server/flight-source.js.map +1 -1
  170. package/dist/native/ssr/server/pipeline-interception.js +1 -1
  171. package/dist/native/ssr/server/segment-hash/value-hash.js +162 -0
  172. package/dist/native/ssr/server/segment-hash/value-hash.js.map +1 -0
  173. package/dist/native/ssr/server/ssr-wrappers.js.map +1 -1
  174. package/dist/native/ssr/server/vite-handoff-rsc.js.map +1 -1
  175. package/dist/native/ssr/shared/payload-root.js.map +1 -1
  176. package/dist/plugin-context.d.ts +0 -16
  177. package/dist/plugin-context.d.ts.map +1 -1
  178. package/dist/plugins/build-manifest.d.ts.map +1 -1
  179. package/dist/routing/index.js +2 -2
  180. package/dist/routing/segment-keys.d.ts +8 -21
  181. package/dist/routing/segment-keys.d.ts.map +1 -1
  182. package/dist/server/access-gate.d.ts +0 -14
  183. package/dist/server/access-gate.d.ts.map +1 -1
  184. package/dist/server/als-registry.d.ts +16 -0
  185. package/dist/server/als-registry.d.ts.map +1 -1
  186. package/dist/server/build-manifest.d.ts +1 -10
  187. package/dist/server/build-manifest.d.ts.map +1 -1
  188. package/dist/server/chain-url-parts.d.ts +3 -13
  189. package/dist/server/chain-url-parts.d.ts.map +1 -1
  190. package/dist/server/client-state-tree.d.ts +31 -0
  191. package/dist/server/client-state-tree.d.ts.map +1 -0
  192. package/dist/server/flight-source-node.d.ts +6 -1
  193. package/dist/server/flight-source-node.d.ts.map +1 -1
  194. package/dist/server/flight-source.d.ts +27 -0
  195. package/dist/server/flight-source.d.ts.map +1 -1
  196. package/dist/server/index.js +2 -2
  197. package/dist/server/internal.js +48 -47
  198. package/dist/server/internal.js.map +1 -1
  199. package/dist/server/publish-params.d.ts +5 -4
  200. package/dist/server/publish-params.d.ts.map +1 -1
  201. package/dist/server/route-element-builder.d.ts +4 -19
  202. package/dist/server/route-element-builder.d.ts.map +1 -1
  203. package/dist/server/rsc-entry/helpers.d.ts +7 -13
  204. package/dist/server/rsc-entry/helpers.d.ts.map +1 -1
  205. package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
  206. package/dist/server/rsc-entry/revalidate-renderer.d.ts.map +1 -1
  207. package/dist/server/rsc-entry/rsc-payload.d.ts +1 -2
  208. package/dist/server/rsc-entry/rsc-payload.d.ts.map +1 -1
  209. package/dist/server/rsc-entry/rsc-stream.d.ts +11 -2
  210. package/dist/server/rsc-entry/rsc-stream.d.ts.map +1 -1
  211. package/dist/server/rsc-entry/ssr-renderer.d.ts +0 -2
  212. package/dist/server/rsc-entry/ssr-renderer.d.ts.map +1 -1
  213. package/dist/server/segment-hash/capture.d.ts +77 -0
  214. package/dist/server/segment-hash/capture.d.ts.map +1 -0
  215. package/dist/server/segment-hash/outlet.d.ts +65 -0
  216. package/dist/server/segment-hash/outlet.d.ts.map +1 -0
  217. package/dist/server/segment-hash/stream-tap.d.ts +49 -0
  218. package/dist/server/segment-hash/stream-tap.d.ts.map +1 -0
  219. package/dist/server/segment-hash/value-hash.d.ts +70 -0
  220. package/dist/server/segment-hash/value-hash.d.ts.map +1 -0
  221. package/dist/server/slot-resolver.d.ts +13 -78
  222. package/dist/server/slot-resolver.d.ts.map +1 -1
  223. package/dist/server/ssr-wrappers.d.ts +7 -9
  224. package/dist/server/ssr-wrappers.d.ts.map +1 -1
  225. package/dist/server/vite-handoff-rsc.d.ts +10 -1
  226. package/dist/server/vite-handoff-rsc.d.ts.map +1 -1
  227. package/dist/shared/outlet-decision.d.ts +48 -0
  228. package/dist/shared/outlet-decision.d.ts.map +1 -0
  229. package/dist/shared/payload-root.d.ts +5 -8
  230. package/dist/shared/payload-root.d.ts.map +1 -1
  231. package/dist/shared/segment-info.d.ts +13 -28
  232. package/dist/shared/segment-info.d.ts.map +1 -1
  233. package/package.json +1 -1
  234. package/src/client/browser-entry/action-dispatch.ts +1 -15
  235. package/src/client/browser-entry/hydrate.ts +3 -3
  236. package/src/client/browser-entry/router-init.ts +28 -47
  237. package/src/client/error-boundary.tsx +49 -9
  238. package/src/client/history.ts +4 -5
  239. package/src/client/internal.ts +1 -1
  240. package/src/client/navigation-commit.ts +25 -83
  241. package/src/client/outlet-content-cache.ts +119 -0
  242. package/src/client/outlet-scope-context.ts +42 -0
  243. package/src/client/params-context.ts +11 -12
  244. package/src/client/router-pipeline.ts +10 -74
  245. package/src/client/router-types.ts +11 -26
  246. package/src/client/router.ts +7 -22
  247. package/src/client/rsc-fetch.ts +5 -30
  248. package/src/client/segment-cache.ts +19 -264
  249. package/src/client/segment-outlet.tsx +80 -72
  250. package/src/client/stale-segment.ts +60 -0
  251. package/src/client/use-segment-params.ts +1 -1
  252. package/src/config-types.ts +7 -6
  253. package/src/index.ts +0 -2
  254. package/src/plugin-context.ts +0 -16
  255. package/src/plugins/build-manifest.ts +1 -22
  256. package/src/routing/scanner.ts +12 -0
  257. package/src/routing/segment-keys.ts +9 -35
  258. package/src/rsc-runtime/vendor-types.d.ts +8 -0
  259. package/src/server/access-gate.tsx +3 -32
  260. package/src/server/als-registry.ts +23 -0
  261. package/src/server/build-manifest.ts +1 -11
  262. package/src/server/chain-url-parts.ts +3 -21
  263. package/src/server/client-state-tree.ts +75 -0
  264. package/src/server/flight-source-node.ts +7 -2
  265. package/src/server/flight-source.ts +102 -9
  266. package/src/server/pipeline-interception.ts +1 -1
  267. package/src/server/publish-params.ts +5 -4
  268. package/src/server/route-element-builder.ts +77 -206
  269. package/src/server/rsc-entry/helpers.ts +11 -65
  270. package/src/server/rsc-entry/render-route.ts +54 -28
  271. package/src/server/rsc-entry/revalidate-renderer.ts +2 -1
  272. package/src/server/rsc-entry/rsc-payload.ts +11 -39
  273. package/src/server/rsc-entry/rsc-stream.ts +123 -101
  274. package/src/server/rsc-entry/ssr-renderer.ts +1 -3
  275. package/src/server/segment-hash/capture.ts +232 -0
  276. package/src/server/segment-hash/outlet.ts +185 -0
  277. package/src/server/segment-hash/stream-tap.ts +244 -0
  278. package/src/server/segment-hash/value-hash.ts +338 -0
  279. package/src/server/slot-resolver.ts +37 -323
  280. package/src/server/ssr-wrappers.tsx +7 -9
  281. package/src/server/vite-handoff-rsc.ts +12 -1
  282. package/src/shared/outlet-decision.ts +54 -0
  283. package/src/shared/payload-root.ts +5 -8
  284. package/src/shared/segment-info.ts +13 -28
  285. package/dist/_chunks/chains-CmzbpG-6.js +0 -1
  286. package/dist/_chunks/dev-server--4_Ogy_6.js +0 -1
  287. package/dist/_chunks/dev-span-RsVeYYc_.js.map +0 -1
  288. package/dist/_chunks/error-boundary-Bh-egWUI.js.map +0 -1
  289. package/dist/_chunks/flight-source-node-BsrlUjMO.js.map +0 -1
  290. package/dist/client/segment-update-context.d.ts +0 -15
  291. package/dist/client/segment-update-context.d.ts.map +0 -1
  292. package/dist/client/slot-content-cache-context.d.ts +0 -35
  293. package/dist/client/slot-content-cache-context.d.ts.map +0 -1
  294. package/dist/native/rsc/server/request-dep.js +0 -12
  295. package/dist/native/rsc/server/request-dep.js.map +0 -1
  296. package/dist/native/rsc/server/route-element-helpers.js +0 -20
  297. package/dist/native/rsc/server/route-element-helpers.js.map +0 -1
  298. package/dist/native/rsc/server/skippable-prefix.js +0 -72
  299. package/dist/native/rsc/server/skippable-prefix.js.map +0 -1
  300. package/dist/native/rsc/server/state-tree-diff.js +0 -35
  301. package/dist/native/rsc/server/state-tree-diff.js.map +0 -1
  302. package/dist/native/ssr/client/segment-cache.js +0 -119
  303. package/dist/native/ssr/client/segment-cache.js.map +0 -1
  304. package/dist/native/ssr/client/segment-update-context.js +0 -9
  305. package/dist/native/ssr/client/segment-update-context.js.map +0 -1
  306. package/dist/native/ssr/client/slot-content-cache-context.js +0 -8
  307. package/dist/native/ssr/client/slot-content-cache-context.js.map +0 -1
  308. package/dist/native/ssr/server/state-tree-diff.js +0 -23
  309. package/dist/native/ssr/server/state-tree-diff.js.map +0 -1
  310. package/dist/plugins/request-dep/analysis.d.ts +0 -106
  311. package/dist/plugins/request-dep/analysis.d.ts.map +0 -1
  312. package/dist/plugins/request-dep/index.d.ts +0 -75
  313. package/dist/plugins/request-dep/index.d.ts.map +0 -1
  314. package/dist/plugins/request-dep/origin.d.ts +0 -61
  315. package/dist/plugins/request-dep/origin.d.ts.map +0 -1
  316. package/dist/server/request-dep.d.ts +0 -15
  317. package/dist/server/request-dep.d.ts.map +0 -1
  318. package/dist/server/route-element-helpers.d.ts +0 -12
  319. package/dist/server/route-element-helpers.d.ts.map +0 -1
  320. package/dist/server/skippable-prefix.d.ts +0 -29
  321. package/dist/server/skippable-prefix.d.ts.map +0 -1
  322. package/dist/server/state-tree-diff.d.ts +0 -78
  323. package/dist/server/state-tree-diff.d.ts.map +0 -1
  324. package/src/client/segment-update-context.ts +0 -23
  325. package/src/client/slot-content-cache-context.ts +0 -43
  326. package/src/plugins/request-dep/analysis.ts +0 -447
  327. package/src/plugins/request-dep/index.ts +0 -376
  328. package/src/plugins/request-dep/origin.ts +0 -310
  329. package/src/server/request-dep.ts +0 -37
  330. package/src/server/route-element-helpers.ts +0 -37
  331. package/src/server/skippable-prefix.ts +0 -172
  332. package/src/server/state-tree-diff.ts +0 -132
@@ -87,6 +87,7 @@
87
87
  "server/chain-url-parts.ts": "server/chain-url-parts.js",
88
88
  "server/children-interception.ts": "server/children-interception.js",
89
89
  "server/client-error-message.ts": "server/client-error-message.js",
90
+ "server/client-state-tree.ts": "server/client-state-tree.js",
90
91
  "server/coalesce-tick.ts": "server/coalesce-tick.js",
91
92
  "server/cookie-context.ts": "server/cookie-context.js",
92
93
  "server/cookie-parsing.ts": "server/cookie-parsing.js",
@@ -157,11 +158,9 @@
157
158
  "server/render-timeout.ts": "server/render-timeout.js",
158
159
  "server/render-utils.ts": "server/render-utils.js",
159
160
  "server/request-context.ts": "server/request-context.js",
160
- "server/request-dep.ts": "server/request-dep.js",
161
161
  "server/response-cache-policy.ts": "server/response-cache-policy.js",
162
162
  "server/response-framing.ts": "server/response-framing.js",
163
163
  "server/route-element-builder.ts": "server/route-element-builder.js",
164
- "server/route-element-helpers.ts": "server/route-element-helpers.js",
165
164
  "server/route-handler.ts": "server/route-handler.js",
166
165
  "server/route-matcher.ts": "server/route-matcher.js",
167
166
  "server/route-methods.ts": "server/route-methods.js",
@@ -183,17 +182,19 @@
183
182
  "server/rsc-prop-warnings.ts": "server/rsc-prop-warnings.js",
184
183
  "server/safe-load.ts": "server/safe-load.js",
185
184
  "server/schema-introspection.ts": "server/schema-introspection.js",
185
+ "server/segment-hash/capture.ts": "server/segment-hash/capture.js",
186
+ "server/segment-hash/outlet.ts": "server/segment-hash/outlet.js",
187
+ "server/segment-hash/stream-tap.ts": "server/segment-hash/stream-tap.js",
188
+ "server/segment-hash/value-hash.ts": "server/segment-hash/value-hash.js",
186
189
  "server/sensitive-fields.ts": "server/sensitive-fields.js",
187
190
  "server/server-only-guard-noop.js": "server/server-only-guard-noop.js",
188
191
  "server/server-timing.ts": "server/server-timing.js",
189
192
  "server/signal-identity.ts": "server/signal-identity.js",
190
193
  "server/sitemap-generator.ts": "server/sitemap-generator.js",
191
194
  "server/sitemap-handler.ts": "server/sitemap-handler.js",
192
- "server/skippable-prefix.ts": "server/skippable-prefix.js",
193
195
  "server/slot-interception.ts": "server/slot-interception.js",
194
196
  "server/slot-resolver.ts": "server/slot-resolver.js",
195
197
  "server/slot-subtree-contain.ts": "server/slot-subtree-contain.js",
196
- "server/state-tree-diff.ts": "server/state-tree-diff.js",
197
198
  "server/static-generator.ts": "server/static-generator.js",
198
199
  "server/static-not-found.ts": "server/static-not-found.js",
199
200
  "server/status-code-resolver.ts": "server/status-code-resolver.js",
@@ -216,6 +217,7 @@
216
217
  "shared/href-validation.ts": "shared/href-validation.js",
217
218
  "shared/href.ts": "shared/href.js",
218
219
  "shared/merge-search-params.ts": "shared/merge-search-params.js",
220
+ "shared/outlet-decision.ts": "shared/outlet-decision.js",
219
221
  "shared/param-value.ts": "shared/param-value.js",
220
222
  "shared/redirect-type.ts": "shared/redirect-type.js",
221
223
  "shared/rsc-cache-key.ts": "shared/rsc-cache-key.js",
@@ -42,17 +42,9 @@ function computeSlotKey(parentSegmentId, slotName) {
42
42
  const name = slotName.startsWith("@") ? slotName : `@${slotName}`;
43
43
  return `${parentSegmentId === "/" ? "" : parentSegmentId}/${name}`;
44
44
  }
45
- function computeSlotContentKey(slotKey, ownerParts, entryFile, slotParams) {
46
- return [
47
- slotKey,
48
- ownerParts.join("/"),
49
- entryFile ?? "",
50
- ...Object.keys(slotParams).sort().map((k) => {
51
- const v = slotParams[k];
52
- return Array.isArray(v) ? `${k}=${v.map(String).join("")}` : `${k}=${String(v)}`;
53
- })
54
- ].join("\0");
45
+ function childrenOutletKey(segmentId) {
46
+ return computeSlotKey(segmentId, "@children");
55
47
  }
56
- export { computeSegmentKeys, computeSegmentTreePaths, computeSlotContentKey, computeSlotKey, treePathDepth, treePathNames };
48
+ export { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths, computeSlotKey, treePathDepth, treePathNames };
57
49
 
58
50
  //# sourceMappingURL=segment-keys.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"segment-keys.js","names":[],"sources":["../../../../src/routing/segment-keys.ts"],"mappings":";AAuDA,SAAgB,mBAAmB,UAAuC;CACxE,MAAM,OAAiB,CAAC;CACxB,IAAI,UAAU;CACd,IAAI,qBAAqB;CAEzB,KAAK,MAAM,WAAW,UAAU;EAC9B,IAAI,QAAQ,gBAAgB,gBAAgB,qBAAqB;EACjE,IAAI,QAAQ,gBAAgB,WAAW,oBAAoB;GAEzD,MAAM,MAAM,GADC,YAAY,MAAM,KAAK,QAChB,GAAG,QAAQ;GAC/B,KAAK,KAAK,GAAG;GACb,UAAU;EACZ,OAAO;GACL,KAAK,KAAK,QAAQ,OAAO;GACzB,UAAU,QAAQ;EACpB;CACF;CAEA,OAAO;AACT;AAiBA,SAAgB,wBAAwB,UAAuC;CAC7E,MAAM,QAAkB,CAAC;CACzB,IAAI,OAAO;CAEX,KAAK,MAAM,WAAW,UAAU;EAC9B,MAAM,OAAO,QAAQ,eAAe;EACpC,IAAI,CAAC,MAAM;GAET,MAAM,KAAK,GAAG;GACd,OAAO;GACP;EACF;EAEA,MAAM,OAAO,GADA,SAAS,MAAM,KAAK,KACZ,GAAG;EACxB,MAAM,KAAK,IAAI;EACf,OAAO;CACT;CAEA,OAAO;AACT;AAaA,SAAgB,cAAc,UAA4B;CACxD,OAAO,aAAa,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG;AAC5D;AAWA,SAAgB,cAAc,UAA0B;CACtD,OAAO,cAAc,QAAQ,CAAC,CAAC;AACjC;AAMA,SAAgB,eAAe,iBAAyB,UAA0B;CAChF,MAAM,OAAO,SAAS,WAAW,GAAG,IAAI,WAAW,IAAI;CAEvD,OAAO,GADQ,oBAAoB,MAAM,KAAK,gBAC7B,GAAG;AACtB;AAuBA,SAAgB,sBACd,SACA,YACA,WACA,YACQ;CAQR,OAAO;EAAC;EAPM,WAAW,KAAK,GAOb;EANH,aAAa;EAMI,GALb,OAAO,KAAK,UAAU,CAAC,CAAC,KACvB,CAAA,CAAU,KAAK,MAAM;GACtC,MAAM,IAAI,WAAW;GACrB,OAAO,MAAM,QAAQ,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,IAAI,MAAM,CAAC,CAAC,KAAK,GAAM,MAAM,GAAG,EAAE,GAAG,OAAO,CAAC;EACnF,CACkC;CAAU,CAAC,CAAC,KAAK,IAAI;AACzD"}
1
+ {"version":3,"file":"segment-keys.js","names":[],"sources":["../../../../src/routing/segment-keys.ts"],"mappings":";AAqDA,SAAgB,mBAAmB,UAAuC;CACxE,MAAM,OAAiB,CAAC;CACxB,IAAI,UAAU;CACd,IAAI,qBAAqB;CAEzB,KAAK,MAAM,WAAW,UAAU;EAC9B,IAAI,QAAQ,gBAAgB,gBAAgB,qBAAqB;EACjE,IAAI,QAAQ,gBAAgB,WAAW,oBAAoB;GAEzD,MAAM,MAAM,GADC,YAAY,MAAM,KAAK,QAChB,GAAG,QAAQ;GAC/B,KAAK,KAAK,GAAG;GACb,UAAU;EACZ,OAAO;GACL,KAAK,KAAK,QAAQ,OAAO;GACzB,UAAU,QAAQ;EACpB;CACF;CAEA,OAAO;AACT;AAiBA,SAAgB,wBAAwB,UAAuC;CAC7E,MAAM,QAAkB,CAAC;CACzB,IAAI,OAAO;CAEX,KAAK,MAAM,WAAW,UAAU;EAC9B,MAAM,OAAO,QAAQ,eAAe;EACpC,IAAI,CAAC,MAAM;GAET,MAAM,KAAK,GAAG;GACd,OAAO;GACP;EACF;EAEA,MAAM,OAAO,GADA,SAAS,MAAM,KAAK,KACZ,GAAG;EACxB,MAAM,KAAK,IAAI;EACf,OAAO;CACT;CAEA,OAAO;AACT;AAaA,SAAgB,cAAc,UAA4B;CACxD,OAAO,aAAa,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG;AAC5D;AAWA,SAAgB,cAAc,UAA0B;CACtD,OAAO,cAAc,QAAQ,CAAC,CAAC;AACjC;AAMA,SAAgB,eAAe,iBAAyB,UAA0B;CAChF,MAAM,OAAO,SAAS,WAAW,GAAG,IAAI,WAAW,IAAI;CAEvD,OAAO,GADQ,oBAAoB,MAAM,KAAK,gBAC7B,GAAG;AACtB;AAWA,SAAgB,kBAAkB,WAA2B;CAC3D,OAAO,eAAe,WAAW,WAAW;AAC9C"}
@@ -4,10 +4,10 @@ import { isDebug } from "./debug.js";
4
4
  import { handleCaughtDeny, setFirstDeniedSegmentIndex } from "./deny-boundary.js";
5
5
  // src/server/access-gate.tsx
6
6
  function AccessGate(props) {
7
- const { accessFn, segmentName, segmentKey, segmentIndex, denyPages, skippedSegment, outsideTree, children } = props;
8
- return accessGateFallback(accessFn, segmentName, segmentKey, segmentIndex, skippedSegment ? void 0 : denyPages, skippedSegment, outsideTree, children);
7
+ const { accessFn, segmentName, segmentKey, segmentIndex, denyPages, outsideTree, children } = props;
8
+ return accessGateFallback(accessFn, segmentName, segmentKey, segmentIndex, denyPages, outsideTree, children);
9
9
  }
10
- async function accessGateFallback(accessFn, segmentName, segmentKey, segmentIndex, denyPages, skippedSegment, outsideTree, children) {
10
+ async function accessGateFallback(accessFn, segmentName, segmentKey, segmentIndex, denyPages, outsideTree, children) {
11
11
  try {
12
12
  await runTracedAccess(accessFn, segmentName);
13
13
  } catch (error) {
@@ -18,10 +18,6 @@ async function accessGateFallback(accessFn, segmentName, segmentKey, segmentInde
18
18
  error._leaveSpa = true;
19
19
  throw error;
20
20
  }
21
- if (skippedSegment) {
22
- error._hardNavigate = true;
23
- throw error;
24
- }
25
21
  if (denyPages) return handleCaughtDeny(denyPages, error, segmentKey);
26
22
  }
27
23
  throw error;
@@ -1 +1 @@
1
- {"version":3,"file":"access-gate.js","names":[],"sources":["../../../../src/server/access-gate.tsx"],"mappings":";;;;;AA+IA,SAAgB,WAAW,OAA4C;CACrE,MAAM,EACJ,UACA,aACA,YACA,cACA,WACA,gBACA,aACA,aACE;CAEJ,OAAO,mBACL,UACA,aACA,YACA,cACA,iBAAiB,SAAY,WAC7B,gBACA,aACA,QACF;AACF;AAMA,eAAe,mBACb,UACA,aACA,YACA,cACA,WACA,gBACA,aACA,UACoB;CACpB,IAAI;EACF,MAAM,gBAAgB,UAAU,WAAW;CAC7C,SAAS,OAAgB;EACvB,IAAI,aAAa,KAAK,GAAG;GACvB,IAAI,iBAAiB,QACnB,2BAA2B,YAAY;GAGzC,IAAI,aAAa;IACf,MAAM,gBAAgB;IACtB,MAAM,YAAY;IAClB,MAAM;GACR;GAEA,IAAI,gBAAgB;IAClB,MAAM,gBAAgB;IACtB,MAAM;GACR;GAEA,IAAI,WACF,OAAO,iBAAiB,WAAW,OAAO,UAAU;EAExD;EACA,MAAM;CACR;CAEA,OAAO;AACT;AAkBA,eAAsB,eAAe,OAAgD;CACnF,MAAM,EAAE,UAAU,iBAAiB,UAAU,eAAe,iBAAiB,aAAa;CAE1F,IAAI;EACF,MAAM,SAAS;CACjB,SAAS,OAAgB;EAGvB,IAAI,aAAa,KAAK,GACpB,OACE,oBAAoB,iBAAiB,UAAU,MAAM,MAAM,aAAa,KACxE,mBACA;EAQJ,IAAI,iBAAiB,KAAK,GAAG;GAC3B,IAAI,QAAQ,GACV,QAAQ,MACN,+MAGF;GAGF,OACE,oBAAoB,iBAAiB,UAAU,QAAW,aAAa,KACvE,mBACA;EAEJ;EAIA,IAAI,QAAQ,GACV,QAAQ,KACN,oGAEA,KACF;EAEF,MAAM;CACR;CAGA,OAAO;AACT;AAMA,SAAS,oBACP,iBACA,UACA,MACA,eACkB;CAClB,IAAI,CAAC,iBAAiB,OAAO;CAC7B,OAAO,cAAc,iBAAiB;EACpC,MAAM;EACN;CACF,CAAC;AACH"}
1
+ {"version":3,"file":"access-gate.js","names":[],"sources":["../../../../src/server/access-gate.tsx"],"mappings":";;;;;AAiIA,SAAgB,WAAW,OAA4C;CACrE,MAAM,EAAE,UAAU,aAAa,YAAY,cAAc,WAAW,aAAa,aAC/E;CAEF,OAAO,mBACL,UACA,aACA,YACA,cACA,WACA,aACA,QACF;AACF;AAMA,eAAe,mBACb,UACA,aACA,YACA,cACA,WACA,aACA,UACoB;CACpB,IAAI;EACF,MAAM,gBAAgB,UAAU,WAAW;CAC7C,SAAS,OAAgB;EACvB,IAAI,aAAa,KAAK,GAAG;GACvB,IAAI,iBAAiB,QACnB,2BAA2B,YAAY;GAGzC,IAAI,aAAa;IACf,MAAM,gBAAgB;IACtB,MAAM,YAAY;IAClB,MAAM;GACR;GAEA,IAAI,WACF,OAAO,iBAAiB,WAAW,OAAO,UAAU;EAExD;EACA,MAAM;CACR;CAEA,OAAO;AACT;AAkBA,eAAsB,eAAe,OAAgD;CACnF,MAAM,EAAE,UAAU,iBAAiB,UAAU,eAAe,iBAAiB,aAAa;CAE1F,IAAI;EACF,MAAM,SAAS;CACjB,SAAS,OAAgB;EAGvB,IAAI,aAAa,KAAK,GACpB,OACE,oBAAoB,iBAAiB,UAAU,MAAM,MAAM,aAAa,KACxE,mBACA;EAQJ,IAAI,iBAAiB,KAAK,GAAG;GAC3B,IAAI,QAAQ,GACV,QAAQ,MACN,+MAGF;GAGF,OACE,oBAAoB,iBAAiB,UAAU,QAAW,aAAa,KACvE,mBACA;EAEJ;EAIA,IAAI,QAAQ,GACV,QAAQ,KACN,oGAEA,KACF;EAEF,MAAM;CACR;CAGA,OAAO;AACT;AAMA,SAAS,oBACP,iBACA,UACA,MACA,eACkB;CAClB,IAAI,CAAC,iBAAiB,OAAO;CAC7B,OAAO,cAAc,iBAAiB;EACpC,MAAM;EACN;CACF,CAAC;AACH"}
@@ -18,6 +18,7 @@ var waitUntilAls = getOrCreateAls(Symbol.for("timber:wait-until-als"));
18
18
  var workersCachePurgeAls = getOrCreateAls(Symbol.for("timber:workers-cache-purge-als"));
19
19
  var reactCacheScopeAls = getOrCreateAls(Symbol.for("timber:react-cache-scope-als"));
20
20
  var prebuiltCaptureAls = getOrCreateAls(Symbol.for("timber:prebuilt-capture-als"));
21
- export { earlyHintsSenderAls, prebuiltCaptureAls, reactCacheScopeAls, requestContextAls, revalidationAls, timingAls, traceAls, waitUntilAls, workersCachePurgeAls };
21
+ var segmentCaptureAls = getOrCreateAls(Symbol.for("timber:segment-capture-als"));
22
+ export { earlyHintsSenderAls, prebuiltCaptureAls, reactCacheScopeAls, requestContextAls, revalidationAls, segmentCaptureAls, timingAls, traceAls, waitUntilAls, workersCachePurgeAls };
22
23
 
23
24
  //# sourceMappingURL=als-registry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"als-registry.js","names":[],"sources":["../../../../src/server/als-registry.ts"],"mappings":";;;AAgDA,SAAS,eAAkB,QAAsC;CAC/D,MAAM,IAAI;CACV,MAAM,WAAW,EAAE;CACnB,IAAI,oBAAoB,mBACtB,OAAO;CAET,MAAM,UAAU,IAAI,kBAAqB;CACzC,EAAE,UAAU;CACZ,OAAO;AACT;AAOA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC;AAiKA,IAAa,WAAW,eAA2B,OAAO,IAAI,kBAAkB,CAAC;AAWjF,IAAa,YAAY,eAA4B,OAAO,IAAI,mBAAmB,CAAC;AAqBpF,IAAa,kBAAkB,eAC7B,OAAO,IAAI,yBAAyB,CACtC;AAUA,IAAa,sBAAsB,eACjC,OAAO,IAAI,+BAA+B,CAC5C;AAUA,IAAa,eAAe,eAA4B,OAAO,IAAI,uBAAuB,CAAC;AAY3F,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C;AAeA,IAAa,qBAAqB,eAChC,OAAO,IAAI,8BAA8B,CAC3C;AAwBA,IAAa,qBAAqB,eAChC,OAAO,IAAI,6BAA6B,CAC1C"}
1
+ {"version":3,"file":"als-registry.js","names":[],"sources":["../../../../src/server/als-registry.ts"],"mappings":";;;AAgDA,SAAS,eAAkB,QAAsC;CAC/D,MAAM,IAAI;CACV,MAAM,WAAW,EAAE;CACnB,IAAI,oBAAoB,mBACtB,OAAO;CAET,MAAM,UAAU,IAAI,kBAAqB;CACzC,EAAE,UAAU;CACZ,OAAO;AACT;AAOA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC;AAiKA,IAAa,WAAW,eAA2B,OAAO,IAAI,kBAAkB,CAAC;AAWjF,IAAa,YAAY,eAA4B,OAAO,IAAI,mBAAmB,CAAC;AAqBpF,IAAa,kBAAkB,eAC7B,OAAO,IAAI,yBAAyB,CACtC;AAUA,IAAa,sBAAsB,eACjC,OAAO,IAAI,+BAA+B,CAC5C;AAUA,IAAa,eAAe,eAA4B,OAAO,IAAI,uBAAuB,CAAC;AAY3F,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C;AAeA,IAAa,qBAAqB,eAChC,OAAO,IAAI,8BAA8B,CAC3C;AAwBA,IAAa,qBAAqB,eAChC,OAAO,IAAI,6BAA6B,CAC1C;AAqBA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC"}
@@ -1 +1 @@
1
- {"version":3,"file":"build-manifest.js","names":[],"sources":["../../../../src/server/build-manifest.ts"],"mappings":"AAqFA,SAAgB,gBAAgB,UAA8B,UAAmC;CAC/F,MAAM,OAAO,IAAI,IAAY;CAC7B,MAAM,SAAmB,CAAC;CAE1B,KAAK,MAAM,WAAW,UACpB,KAAK,MAAM,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,IAAI,GAAG;EACjD,IAAI,CAAC,MAAM;EACX,MAAM,WAAW,SAAS,IAAI,KAAK;EACnC,IAAI,CAAC,UAAU;EACf,KAAK,MAAM,OAAO,UAChB,IAAI,CAAC,KAAK,IAAI,GAAG,GAAG;GAClB,KAAK,IAAI,GAAG;GACZ,OAAO,KAAK,GAAG;EACjB;CAEJ;CAGF,OAAO;AACT;AAQA,SAAgB,iBAAiB,SAA2B;CAO1D,OAAO,QAAQ,KAAK,QAAQ,gCAAgC,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE;AAC9E;AAUA,SAAgB,kBACd,UACA,UACqB;CACrB,MAAM,OAAO,IAAI,IAAY;CAC7B,MAAM,SAA8B,CAAC;CAErC,KAAK,MAAM,WAAW,UACpB,KAAK,MAAM,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,IAAI,GAAG;EACjD,IAAI,CAAC,MAAM;EACX,MAAM,QAAQ,SAAS,MAAM,KAAK;EAClC,IAAI,CAAC,OAAO;EACZ,KAAK,MAAM,SAAS,OAClB,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,GAAG;GACzB,KAAK,IAAI,MAAM,IAAI;GACnB,OAAO,KAAK,KAAK;EACnB;CAEJ;CAGF,OAAO;AACT;AAQA,SAAgB,qBAAqB,OAAoC;CACvE,OAAO,MACJ,KACE,MACC,6BAA6B,EAAE,KAAK,yBAAyB,EAAE,OAAO,iBAAiB,EAAE,YAAY,GACzG,CAAC,CACA,KAAK,EAAE;AACZ;AAUA,SAAgB,2BACd,UACA,UACU;CACV,MAAM,OAAO,IAAI,IAAY;CAC7B,MAAM,SAAmB,CAAC;CAE1B,KAAK,MAAM,WAAW,UACpB,KAAK,MAAM,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,IAAI,GAAG;EACjD,IAAI,CAAC,MAAM;EACX,MAAM,WAAW,SAAS,cAAc,KAAK;EAC7C,IAAI,CAAC,UAAU;EACf,KAAK,MAAM,OAAO,UAChB,IAAI,CAAC,KAAK,IAAI,GAAG,GAAG;GAClB,KAAK,IAAI,GAAG;GACZ,OAAO,KAAK,GAAG;EACjB;CAEJ;CAGF,OAAO;AACT;AAQA,SAAgB,uBAAuB,MAAwB;CAC7D,OAAO,KAAK,KAAK,QAAQ,mCAAmC,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE;AAC9E"}
1
+ {"version":3,"file":"build-manifest.js","names":[],"sources":["../../../../src/server/build-manifest.ts"],"mappings":"AA2EA,SAAgB,gBAAgB,UAA8B,UAAmC;CAC/F,MAAM,OAAO,IAAI,IAAY;CAC7B,MAAM,SAAmB,CAAC;CAE1B,KAAK,MAAM,WAAW,UACpB,KAAK,MAAM,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,IAAI,GAAG;EACjD,IAAI,CAAC,MAAM;EACX,MAAM,WAAW,SAAS,IAAI,KAAK;EACnC,IAAI,CAAC,UAAU;EACf,KAAK,MAAM,OAAO,UAChB,IAAI,CAAC,KAAK,IAAI,GAAG,GAAG;GAClB,KAAK,IAAI,GAAG;GACZ,OAAO,KAAK,GAAG;EACjB;CAEJ;CAGF,OAAO;AACT;AAQA,SAAgB,iBAAiB,SAA2B;CAO1D,OAAO,QAAQ,KAAK,QAAQ,gCAAgC,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE;AAC9E;AAUA,SAAgB,kBACd,UACA,UACqB;CACrB,MAAM,OAAO,IAAI,IAAY;CAC7B,MAAM,SAA8B,CAAC;CAErC,KAAK,MAAM,WAAW,UACpB,KAAK,MAAM,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,IAAI,GAAG;EACjD,IAAI,CAAC,MAAM;EACX,MAAM,QAAQ,SAAS,MAAM,KAAK;EAClC,IAAI,CAAC,OAAO;EACZ,KAAK,MAAM,SAAS,OAClB,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,GAAG;GACzB,KAAK,IAAI,MAAM,IAAI;GACnB,OAAO,KAAK,KAAK;EACnB;CAEJ;CAGF,OAAO;AACT;AAQA,SAAgB,qBAAqB,OAAoC;CACvE,OAAO,MACJ,KACE,MACC,6BAA6B,EAAE,KAAK,yBAAyB,EAAE,OAAO,iBAAiB,EAAE,YAAY,GACzG,CAAC,CACA,KAAK,EAAE;AACZ;AAUA,SAAgB,2BACd,UACA,UACU;CACV,MAAM,OAAO,IAAI,IAAY;CAC7B,MAAM,SAAmB,CAAC;CAE1B,KAAK,MAAM,WAAW,UACpB,KAAK,MAAM,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,IAAI,GAAG;EACjD,IAAI,CAAC,MAAM;EACX,MAAM,WAAW,SAAS,cAAc,KAAK;EAC7C,IAAI,CAAC,UAAU;EACf,KAAK,MAAM,OAAO,UAChB,IAAI,CAAC,KAAK,IAAI,GAAG,GAAG;GAClB,KAAK,IAAI,GAAG;GACZ,OAAO,KAAK,GAAG;EACjB;CAEJ;CAGF,OAAO;AACT;AAQA,SAAgB,uBAAuB,MAAwB;CAC7D,OAAO,KAAK,KAAK,QAAQ,mCAAmC,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE;AAC9E"}
@@ -39,11 +39,6 @@ function consumedUrlParts(segments, index, match) {
39
39
  if (index < interception.index) return targetPrefix.slice(0, Math.min(partsThrough(0, index).length, interception.anchor));
40
40
  return [...targetPrefix, ...partsThrough(interception.index, index)];
41
41
  }
42
- function consumedPartsThroughSegment(segment, match) {
43
- const index = match.segments.indexOf(segment);
44
- if (index < 0) return [];
45
- return consumedUrlParts(match.segments, index, match);
46
- }
47
- export { consumedPartsThroughSegment, consumedUrlParts, extractUrlParts };
42
+ export { consumedUrlParts, extractUrlParts };
48
43
 
49
44
  //# sourceMappingURL=chain-url-parts.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"chain-url-parts.js","names":[],"sources":["../../../../src/server/chain-url-parts.ts"],"mappings":";;;AAoDA,SAAgB,gBACd,UACA,YACU;CACV,MAAM,QAAkB,CAAC;CACzB,KAAK,MAAM,QAAQ,UAAU;EAC3B,MAAM,MAAM,oBAAoB,IAAI;EAGpC,IAAI,IAAI,gBAAgB,SAAS;EACjC,IAAI,KAAK,gBAAgB,IAAI;EAC7B,IAAI,IAAI,gBAAgB,UACtB,MAAM,KAAK,IAAI,WAAW;OACrB,IAAI,IAAI,WAAW;GACxB,MAAM,QAAQ,WAAW,IAAI;GAC7B,IAAI,MAAM,QAAQ,KAAK,GACrB,MAAM,KAAK,GAAG,MAAM,IAAI,MAAM,CAAC;QAC1B,IAAI,UAAU,QAAW;IAK9B,MAAM,SAAS,IAAI,eAAe;IAClC,MAAM,SAAS,IAAI,eAAe;IAClC,MAAM,KAAK,SAAS,OAAO,KAAK,IAAI,MAAM;GAC5C;EACF;CACF;CACA,OAAO;AACT;AAWA,SAAS,mBACP,UAC0C;CAC1C,MAAM,QAAQ,SAAS,WAAW,MAAM,EAAE,gBAAgB,cAAc;CACxE,IAAI,SAAS,GAAG,OAAO;CAEvB,MAAM,QAAQ,SAAS,QAAQ;CAC/B,MAAM,OAAO,uBAAuB,MAAM,SAAS,SAAS,MAAM,CAAC,sBAAsB,KAAK;CAC9F,OAAO;EAAE;EAAO,QAAQ,SAAS,MAAM,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;CAAO;AAC7E;AAyBA,SAAgB,iBACd,UACA,OACA,OACU;CACV,MAAM,YAAY,MAAM;CACxB,MAAM,gBAAgB,MAAc,OAClC,gBAAgB,SAAS,MAAM,MAAM,KAAK,CAAC,GAAG,SAAS;CAEzD,MAAM,eAAe,mBAAmB,QAAQ;CAChD,IAAI,CAAC,cAAc,OAAO,aAAa,GAAG,KAAK;CAE/C,MAAM,eAAe,aAAa,GAAG,aAAa,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,aAAa,MAAM;CAEzF,IAAI,QAAQ,aAAa,OAEvB,OAAO,aAAa,MAAM,GAAG,KAAK,IAAI,aAAa,GAAG,KAAK,CAAC,CAAC,QAAQ,aAAa,MAAM,CAAC;CAG3F,OAAO,CAAC,GAAG,cAAc,GAAG,aAAa,aAAa,OAAO,KAAK,CAAC;AACrE;AASA,SAAgB,4BACd,SACA,OACU;CACV,MAAM,QAAQ,MAAM,SAAS,QAAQ,OAAO;CAC5C,IAAI,QAAQ,GAAG,OAAO,CAAC;CACvB,OAAO,iBAAiB,MAAM,UAAmC,OAAO,KAAK;AAC/E"}
1
+ {"version":3,"file":"chain-url-parts.js","names":[],"sources":["../../../../src/server/chain-url-parts.ts"],"mappings":";;;AAkDA,SAAgB,gBACd,UACA,YACU;CACV,MAAM,QAAkB,CAAC;CACzB,KAAK,MAAM,QAAQ,UAAU;EAC3B,MAAM,MAAM,oBAAoB,IAAI;EAGpC,IAAI,IAAI,gBAAgB,SAAS;EACjC,IAAI,KAAK,gBAAgB,IAAI;EAC7B,IAAI,IAAI,gBAAgB,UACtB,MAAM,KAAK,IAAI,WAAW;OACrB,IAAI,IAAI,WAAW;GACxB,MAAM,QAAQ,WAAW,IAAI;GAC7B,IAAI,MAAM,QAAQ,KAAK,GACrB,MAAM,KAAK,GAAG,MAAM,IAAI,MAAM,CAAC;QAC1B,IAAI,UAAU,QAAW;IAK9B,MAAM,SAAS,IAAI,eAAe;IAClC,MAAM,SAAS,IAAI,eAAe;IAClC,MAAM,KAAK,SAAS,OAAO,KAAK,IAAI,MAAM;GAC5C;EACF;CACF;CACA,OAAO;AACT;AAWA,SAAS,mBACP,UAC0C;CAC1C,MAAM,QAAQ,SAAS,WAAW,MAAM,EAAE,gBAAgB,cAAc;CACxE,IAAI,SAAS,GAAG,OAAO;CAEvB,MAAM,QAAQ,SAAS,QAAQ;CAC/B,MAAM,OAAO,uBAAuB,MAAM,SAAS,SAAS,MAAM,CAAC,sBAAsB,KAAK;CAC9F,OAAO;EAAE;EAAO,QAAQ,SAAS,MAAM,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;CAAO;AAC7E;AAyBA,SAAgB,iBACd,UACA,OACA,OACU;CACV,MAAM,YAAY,MAAM;CACxB,MAAM,gBAAgB,MAAc,OAClC,gBAAgB,SAAS,MAAM,MAAM,KAAK,CAAC,GAAG,SAAS;CAEzD,MAAM,eAAe,mBAAmB,QAAQ;CAChD,IAAI,CAAC,cAAc,OAAO,aAAa,GAAG,KAAK;CAE/C,MAAM,eAAe,aAAa,GAAG,aAAa,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,aAAa,MAAM;CAEzF,IAAI,QAAQ,aAAa,OAEvB,OAAO,aAAa,MAAM,GAAG,KAAK,IAAI,aAAa,GAAG,KAAK,CAAC,CAAC,QAAQ,aAAa,MAAM,CAAC;CAG3F,OAAO,CAAC,GAAG,cAAc,GAAG,aAAa,aAAa,OAAO,KAAK,CAAC;AACrE"}
@@ -0,0 +1,33 @@
1
+ import "./segment-hash/value-hash.js";
2
+ import { swallow } from "./logger.js";
3
+ // src/server/client-state-tree.ts
4
+ var MAX_HASHES = 512;
5
+ var HASH_SHAPE = new RegExp(`^[A-Za-z0-9_-]{22}$`);
6
+ function parseClientStateTree(req) {
7
+ const header = req.headers.get("X-Timber-State-Tree");
8
+ if (!header) return null;
9
+ let parsed;
10
+ try {
11
+ parsed = JSON.parse(header);
12
+ } catch (err) {
13
+ swallow(err, "malformed X-Timber-State-Tree header");
14
+ return null;
15
+ }
16
+ if (!parsed || typeof parsed !== "object") return null;
17
+ const hashes = new Map();
18
+ if (parsed.hashes && typeof parsed.hashes === "object" && !Array.isArray(parsed.hashes)) {
19
+ const entries = Object.entries(parsed.hashes);
20
+ if (entries.length <= MAX_HASHES) {
21
+ for (const [path, hash] of entries) if (typeof hash === "string" && HASH_SHAPE.test(hash)) hashes.set(path, hash);
22
+ }
23
+ }
24
+ const treePaths = Array.isArray(parsed.treePaths) ? new Set(parsed.treePaths.filter((p) => typeof p === "string")) : new Set();
25
+ if (hashes.size === 0 && treePaths.size === 0) return null;
26
+ return {
27
+ hashes: hashes.size > 0 ? hashes : null,
28
+ treePaths: treePaths.size > 0 ? treePaths : null
29
+ };
30
+ }
31
+ export { parseClientStateTree };
32
+
33
+ //# sourceMappingURL=client-state-tree.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client-state-tree.js","names":[],"sources":["../../../../src/server/client-state-tree.ts"],"mappings":";;;AAkCA,IAAM,aAAa;AAEnB,IAAM,aAAa,IAAI,OAAO,qBAAyC;AAMvE,SAAgB,qBAAqB,KAAsC;CACzE,MAAM,SAAS,IAAI,QAAQ,IAAI,qBAAqB;CACpD,IAAI,CAAC,QAAQ,OAAO;CAEpB,IAAI;CACJ,IAAI;EACF,SAAS,KAAK,MAAM,MAAM;CAC5B,SAAS,KAAK;EACZ,QAAQ,KAAK,sCAAsC;EACnD,OAAO;CACT;CACA,IAAI,CAAC,UAAU,OAAO,WAAW,UAAU,OAAO;CAElD,MAAM,SAAS,IAAI,IAAoB;CACvC,IAAI,OAAO,UAAU,OAAO,OAAO,WAAW,YAAY,CAAC,MAAM,QAAQ,OAAO,MAAM,GAAG;EACvF,MAAM,UAAU,OAAO,QAAQ,OAAO,MAAiC;EACvE,IAAI,QAAQ,UAAU,YACpB;QAAK,MAAM,CAAC,MAAM,SAAS,SACzB,IAAI,OAAO,SAAS,YAAY,WAAW,KAAK,IAAI,GAAG,OAAO,IAAI,MAAM,IAAI;EAC9E;CAEJ;CAEA,MAAM,YAAY,MAAM,QAAQ,OAAO,SAAS,IAC5C,IAAI,IAAI,OAAO,UAAU,QAAQ,MAAmB,OAAO,MAAM,QAAQ,CAAC,IAC1E,IAAI,IAAY;CAEpB,IAAI,OAAO,SAAS,KAAK,UAAU,SAAS,GAAG,OAAO;CACtD,OAAO;EACL,QAAQ,OAAO,OAAO,IAAI,SAAS;EACnC,WAAW,UAAU,OAAO,IAAI,YAAY;CAC9C;AACF"}
@@ -12,15 +12,18 @@ function destroyNodeFlight(stream, reason) {
12
12
  const error = reason === void 0 || reason === null ? void 0 : reason instanceof Error ? reason : new Error(String(reason));
13
13
  stream.destroy(error);
14
14
  }
15
- function pipeFlightToNode(flight, { signal, timeoutMs }) {
15
+ function pipeFlightToNode(flight, { signal, timeoutMs, tap }) {
16
16
  const scope = new AbortController();
17
17
  const timer = timeoutMs === void 0 ? void 0 : setTimeout(() => flight.abort(new RenderTimeoutError(timeoutMs, "Flight render")), timeoutMs);
18
18
  const stream = new Transform({
19
19
  objectMode: true,
20
20
  transform(chunk, _encoding, callback) {
21
- callback(null, typeof chunk === "string" ? chunk.toWellFormed() : chunk);
21
+ const out = typeof chunk === "string" ? chunk.toWellFormed() : chunk;
22
+ tap?.observe(typeof out === "string" ? Buffer.from(out) : out);
23
+ callback(null, out);
22
24
  },
23
25
  destroy(error, callback) {
26
+ tap?.end();
24
27
  endScope(scope);
25
28
  clearTimeout(timer);
26
29
  if (error == null && stream.writableEnded) {
@@ -1 +1 @@
1
- {"version":3,"file":"flight-source-node.js","names":[],"sources":["../../../../src/server/flight-source-node.ts"],"mappings":"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"}
1
+ {"version":3,"file":"flight-source-node.js","names":[],"sources":["../../../../src/server/flight-source-node.ts"],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { nodeStreamsPlatform } from "./node-streams-platform.js";
2
2
  import { releaseReason } from "./render-utils.js";
3
+ import { withTimeout } from "./render-timeout.js";
3
4
  import { concatBytes, drainWithDeadline, teeWithErrorPropagation } from "./stream-utils.js";
4
5
  // src/server/flight-source.ts
5
6
  var nodeFlight = nodeStreamsPlatform ? await import("./flight-source-node.js") : null;
@@ -16,18 +17,56 @@ function createRenderFlight(web, node) {
16
17
  const { pipeFlightToNode } = requireNodeFlight();
17
18
  return (model, options = {}) => ({
18
19
  kind: "node",
19
- stream: pipeFlightToNode(node(model, { onError: options.onError }), {
20
+ stream: pipeFlightToNode(node(model, {
21
+ onError: options.onError,
22
+ temporaryReferences: options.temporaryReferences,
23
+ identifierPrefix: options.identifierPrefix
24
+ }), {
20
25
  signal: options.signal,
21
- timeoutMs: options.timeoutMs ?? defaultRenderTimeoutMs
26
+ timeoutMs: options.timeoutMs ?? defaultRenderTimeoutMs,
27
+ tap: options.tap
22
28
  })
23
29
  });
24
30
  }
25
- return (model, options = {}) => ({
26
- kind: "web",
27
- stream: web(model, {
31
+ return (model, options = {}) => {
32
+ const stream = web(model, {
28
33
  onError: options.onError,
29
- signal: options.signal
30
- })
34
+ signal: options.signal,
35
+ temporaryReferences: options.temporaryReferences,
36
+ identifierPrefix: options.identifierPrefix
37
+ });
38
+ const timeoutMs = options.timeoutMs ?? defaultRenderTimeoutMs;
39
+ return {
40
+ kind: "web",
41
+ stream: options.tap ? tapWebFlight(stream, options.tap, timeoutMs) : stream
42
+ };
43
+ };
44
+ }
45
+ function tapWebFlight(source, tap, timeoutMs) {
46
+ const reader = source.getReader();
47
+ const deadline = timeoutMs === void 0 ? void 0 : Date.now() + timeoutMs;
48
+ return new ReadableStream({
49
+ async pull(controller) {
50
+ try {
51
+ const read = reader.read();
52
+ const result = deadline === void 0 ? await read : await withTimeout(read, Math.max(0, deadline - Date.now()), "Flight render");
53
+ if (result.done) {
54
+ tap.end();
55
+ controller.close();
56
+ return;
57
+ }
58
+ tap.observe(result.value);
59
+ controller.enqueue(result.value);
60
+ } catch (error) {
61
+ tap.end();
62
+ reader.cancel(releaseReason(error)).catch(() => {});
63
+ controller.error(error);
64
+ }
65
+ },
66
+ cancel(reason) {
67
+ tap.end();
68
+ return reader.cancel(releaseReason(reason));
69
+ }
31
70
  });
32
71
  }
33
72
  function openFlightReader(source) {
@@ -1 +1 @@
1
- {"version":3,"file":"flight-source.js","names":[],"sources":["../../../../src/server/flight-source.ts"],"mappings":"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"}
1
+ {"version":3,"file":"flight-source.js","names":[],"sources":["../../../../src/server/flight-source.ts"],"mappings":"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"}
@@ -2,7 +2,7 @@ import { classifyUrlSegment } from "../routing/segment-classify.js";
2
2
  import { computeSegmentTreePaths } from "../routing/segment-keys.js";
3
3
  import { isRscRequest } from "../shared/rsc-media-type.js";
4
4
  import { canonicalize } from "./canonicalize.js";
5
- import { parseClientStateTree } from "./state-tree-diff.js";
5
+ import { parseClientStateTree } from "./client-state-tree.js";
6
6
  import { collectMiddlewareChain, matchedSegmentPath } from "./route-matcher.js";
7
7
  import { runWithSegmentParams } from "./request-context.js";
8
8
  // src/server/pipeline-interception.ts
@@ -1 +1 @@
1
- {"version":3,"file":"publish-params.js","names":[],"sources":["../../../../src/server/publish-params.ts"],"mappings":";;;AAmCA,SAAgB,oBAAoB,SAA6C;CAC/E,OAAO;EACL,MAAM;EACN,QAAQ,cAAc,0BAA0B,CAAC;EACjD,YAAY,cAAc,uBAAuB,KAAK,IAAI;CAC5D;AACF"}
1
+ {"version":3,"file":"publish-params.js","names":[],"sources":["../../../../src/server/publish-params.ts"],"mappings":";;;AAoCA,SAAgB,oBAAoB,SAA6C;CAC/E,OAAO;EACL,MAAM;EACN,QAAQ,cAAc,0BAA0B,CAAC;EACjD,YAAY,cAAc,uBAAuB,KAAK,IAAI;CAC5D;AACF"}
@@ -6,14 +6,14 @@ import { loadRouteModules } from "./route-module-loader.js";
6
6
  import { MetadataCollector, MetadataHead } from "./metadata-collector.js";
7
7
  import { AccessGate } from "./access-gate.js";
8
8
  import { PageDenyBoundary, buildDenyPageChain, handleCaughtDeny, setFirstDeniedSegmentIndex } from "./deny-boundary.js";
9
- import { emitSlotInfoForSkippedLayout, publishSlotSegmentParams, resolveSlotProps } from "./slot-resolver.js";
9
+ import { resolveSlotProps } from "./slot-resolver.js";
10
10
  import { consumedUrlParts } from "./chain-url-parts.js";
11
11
  import { withPublishedParams } from "./publish-params.js";
12
12
  import { wrapSegmentWithErrorBoundaries } from "./error-boundary-wrapper.js";
13
- import { computeSkippableSet } from "./skippable-prefix.js";
14
- import { computeSegmentKeys, computeSegmentTreePaths } from "../routing/segment-keys.js";
13
+ import { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths } from "../routing/segment-keys.js";
14
+ import { outletGate } from "./segment-hash/outlet.js";
15
+ import { METADATA_OUTLET_PATH } from "../shared/outlet-decision.js";
15
16
  import { loadFallbackModule } from "./pipeline-helpers.js";
16
- import { replaceOutermostSegmentOutlet } from "./route-element-helpers.js";
17
17
  import { getActionErrorForRender } from "./request-context.js";
18
18
  import { loadInterceptionGates } from "./interception-gates.js";
19
19
  import { Fragment, createElement } from "../_react/react.js";
@@ -44,12 +44,11 @@ function wrapAccessGate(element, opts, h) {
44
44
  segmentName: opts.segment.segmentName,
45
45
  segmentKey: opts.segmentKey,
46
46
  segmentIndex: opts.segmentIndex,
47
- ...opts.skippedSegment ? { skippedSegment: true } : {},
48
47
  ...opts.denyPages ? { denyPages: opts.denyPages } : {},
49
48
  children: element
50
49
  });
51
50
  }
52
- async function buildRouteElement(req, match, interception, clientStateTree, metadataRouteHashes) {
51
+ async function buildRouteElement(req, match, interception, render, metadataRouteHashes) {
53
52
  const segments = match.segments;
54
53
  const loadBoundaryModule = (file) => loadFallbackModule(file, req, segments);
55
54
  const { metadataSources, layoutComponents, PageComponent, deferSuspenseFor, accessFns } = await loadRouteModules(segments, req.url);
@@ -85,38 +84,22 @@ async function buildRouteElement(req, match, interception, clientStateTree, meta
85
84
  };
86
85
  element = h(TracedPage, {});
87
86
  }
88
- element = h(Fragment, null, h(MetadataHead, {
89
- segments,
90
- rawSegmentParams: match.rawSegmentParams,
91
- requestUrl: req.url,
92
- metadataRouteHashes
93
- }), element);
87
+ const metadataOutlet = {
88
+ segmentPath: METADATA_OUTLET_PATH,
89
+ content: h(MetadataHead, {
90
+ segments,
91
+ rawSegmentParams: match.rawSegmentParams,
92
+ requestUrl: req.url,
93
+ metadataRouteHashes
94
+ }),
95
+ nested: []
96
+ };
97
+ element = h(Fragment, null, outletGate(metadataOutlet, render), element);
94
98
  const layoutBySegment = new Map(layoutComponents.map(({ component, segment }) => [segment, component]));
95
- const skippedSegments = [];
96
- const skippableSet = computeSkippableSet(segments, segmentKeys, layoutBySegment, clientStateTree, match, req);
97
- let outermostSegmentProvider = null;
98
- const destinationUrl = req.url;
99
- const slotSkipInfo = [];
99
+ let unclaimedOutlets = [metadataOutlet];
100
100
  for (let i = segments.length - 1; i >= 0; i--) {
101
101
  const segment = segments[i];
102
- segments.length - 1;
103
102
  const layoutComponent = layoutBySegment.get(segment);
104
- if (skippableSet.has(i)) {
105
- skippedSegments.unshift(segmentKeys[i]);
106
- publishSlotSegmentParams(segment, match, destinationUrl, segmentTreePaths[i]);
107
- emitSlotInfoForSkippedLayout(segment, segmentKeys[i], match, destinationUrl, slotSkipInfo);
108
- const skippedMeta = metadataSources.filter((s) => s.segmentIndex === i).reverse();
109
- element = wrapMetadataCollectors(element, skippedMeta, h);
110
- const accessFn = gateFor(i);
111
- if (accessFn) element = wrapAccessGate(element, {
112
- accessFn,
113
- segment,
114
- segmentKey: segmentKeys[i],
115
- segmentIndex: i,
116
- skippedSegment: true
117
- }, h);
118
- continue;
119
- }
120
103
  const segmentMetadata = metadataSources.filter((s) => s.segmentIndex === i).reverse();
121
104
  element = wrapMetadataCollectors(element, segmentMetadata, h);
122
105
  element = await wrapSegmentWithErrorBoundaries(segment, element, {
@@ -127,25 +110,29 @@ async function buildRouteElement(req, match, interception, clientStateTree, meta
127
110
  });
128
111
  if (layoutComponent) {
129
112
  const segmentId = segmentKeys[i];
130
- const parentTreePath = segmentTreePaths[i];
131
- const slotProps = await resolveSlotProps({
113
+ const childrenOutlet = {
114
+ segmentPath: childrenOutletKey(segmentId),
115
+ content: element,
116
+ nested: unclaimedOutlets
117
+ };
118
+ const slots = await resolveSlotProps({
132
119
  segment,
133
120
  segmentId,
134
121
  match,
135
122
  h,
136
123
  interception,
137
- parentTreePath,
124
+ parentTreePath: segmentTreePaths[i],
138
125
  req,
139
- clientStateTree: clientStateTree ?? null,
140
- slotSkipInfo
126
+ render
141
127
  });
142
128
  const segmentPath = computeLayoutSegmentPath(segments, i, match);
143
129
  const parallelRouteKeys = Object.keys(segment.slots ?? {});
130
+ const layoutProps = {
131
+ ...slots.props,
132
+ children: outletGate(childrenOutlet, render)
133
+ };
144
134
  let layoutElement;
145
- if (isClientReference(layoutComponent)) layoutElement = h(layoutComponent, {
146
- ...slotProps,
147
- children: element
148
- });
135
+ if (isClientReference(layoutComponent)) layoutElement = h(layoutComponent, layoutProps);
149
136
  else {
150
137
  const layoutComponentRef = layoutComponent;
151
138
  const layoutDenyPages = denyPageChains.get(i);
@@ -160,10 +147,7 @@ async function buildRouteElement(req, match, interception, clientStateTree, meta
160
147
  throw error;
161
148
  }
162
149
  };
163
- layoutElement = h(TracedLayout, {
164
- ...slotProps,
165
- children: element
166
- });
150
+ layoutElement = h(TracedLayout, layoutProps);
167
151
  layoutElement = await wrapSegmentWithErrorBoundaries(segment, layoutElement, {
168
152
  loadModule: loadBoundaryModule,
169
153
  createElement: h,
@@ -172,17 +156,18 @@ async function buildRouteElement(req, match, interception, clientStateTree, meta
172
156
  denyOnly: true
173
157
  });
174
158
  }
175
- const segmentProviderElement = h(clientComponents().SegmentProvider, {
176
- segments: segmentPath,
177
- segmentId,
178
- parallelRouteKeys,
179
- children: layoutElement
180
- });
181
- element = h(clientComponents().SegmentOutlet, {
159
+ const layoutOutlet = {
182
160
  segmentPath: segmentId,
183
- children: segmentProviderElement
184
- });
185
- outermostSegmentProvider = segmentProviderElement;
161
+ content: h(clientComponents().SegmentProvider, {
162
+ segments: segmentPath,
163
+ segmentId,
164
+ parallelRouteKeys,
165
+ children: layoutElement
166
+ }),
167
+ nested: [childrenOutlet, ...slots.outlets]
168
+ };
169
+ element = outletGate(layoutOutlet, render);
170
+ unclaimedOutlets = [layoutOutlet];
186
171
  }
187
172
  const accessFn = gateFor(i);
188
173
  if (accessFn) element = wrapAccessGate(element, {
@@ -194,8 +179,7 @@ async function buildRouteElement(req, match, interception, clientStateTree, meta
194
179
  }, h);
195
180
  }
196
181
  if (interceptionGates) element = interceptionGates.wrap(element, h);
197
- if (skippedSegments.length > 0 && outermostSegmentProvider) element = replaceOutermostSegmentOutlet(element, outermostSegmentProvider);
198
- if (skippedSegments.length === 0) element = h(clientComponents().TimberErrorBoundary, {
182
+ element = h(clientComponents().TimberErrorBoundary, {
199
183
  lastResort: true,
200
184
  fallbackComponent: clientComponents().DenyLastResort,
201
185
  children: element
@@ -205,8 +189,6 @@ async function buildRouteElement(req, match, interception, clientStateTree, meta
205
189
  layoutComponents,
206
190
  segments,
207
191
  deferSuspenseFor,
208
- skippedSegments,
209
- slotSkipInfo,
210
192
  leafDenyChain: leafDenyPages
211
193
  };
212
194
  }
@@ -1 +1 @@
1
- {"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"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"}
1
+ {"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"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"}
@@ -1,44 +1,21 @@
1
1
  import { computeSegmentKeys, computeSegmentTreePaths } from "../../routing/segment-keys.js";
2
- import { isClientReference } from "../utils/element-type.js";
3
- import { isStaticRequestDependent } from "../request-dep.js";
4
2
  import { isAbortError } from "../render-utils.js";
5
3
  import "../utils/escape-html.js";
6
4
  // src/server/rsc-entry/helpers.ts
7
- function buildSegmentInfo(segments, layoutComponents, slotSkipInfo, skippedSegmentKeys, firstDeniedIndex = Infinity) {
8
- const layoutBySegment = new Map(layoutComponents.map(({ component, segment }) => [segment, component]));
5
+ function buildSegmentInfo(segments, layoutComponents, firstDeniedIndex = Infinity) {
6
+ const withLayout = new Set(layoutComponents.map(({ segment }) => segment));
9
7
  const segmentKeys = computeSegmentKeys(segments);
10
8
  const treePaths = computeSegmentTreePaths(segments);
11
- const skippedSet = skippedSegmentKeys ? new Set(skippedSegmentKeys) : null;
12
9
  const result = [];
13
10
  for (let i = 0; i < segments.length; i++) {
14
11
  if (i >= firstDeniedIndex) break;
15
12
  const segment = segments[i];
16
- const component = layoutBySegment.get(segment);
17
- if (!component) continue;
18
- const segmentId = segmentKeys[i];
19
- let isRequestDependent;
20
- if (isClientReference(component)) isRequestDependent = false;
21
- else if (skippedSet?.has(segmentId)) isRequestDependent = false;
22
- else if (segment.layout) isRequestDependent = isStaticRequestDependent(segment.layout.filePath);
23
- else isRequestDependent = true;
13
+ if (!withLayout.has(segment)) continue;
24
14
  const entry = {
25
15
  path: segment.urlPath,
26
- treePath: treePaths[i],
27
- isRequestDependent
16
+ treePath: treePaths[i]
28
17
  };
29
- if (segmentId !== segment.urlPath) entry.segmentId = segmentId;
30
- result.push(entry);
31
- }
32
- if (slotSkipInfo) for (const slot of slotSkipInfo) {
33
- const entry = {
34
- path: slot.slotKey,
35
- isRequestDependent: slot.isRequestDependent,
36
- slot: true,
37
- parentSegment: slot.parentSegmentId,
38
- contentKey: slot.contentKey
39
- };
40
- if (slot.skipped) entry.skipped = true;
41
- if (slot.denied) entry.denied = true;
18
+ if (segmentKeys[i] !== segment.urlPath) entry.segmentId = segmentKeys[i];
42
19
  result.push(entry);
43
20
  }
44
21
  return result;
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","names":[],"sources":["../../../../../src/server/rsc-entry/helpers.ts"],"mappings":";;;;;;AA0BA,SAAgB,iBACd,UACA,kBAIA,cACA,oBACA,mBAAmB,UACJ;CACf,MAAM,kBAAkB,IAAI,IAC1B,iBAAiB,KAAK,EAAE,WAAW,cAAc,CAAC,SAAS,SAAS,CAAC,CACvE;CAEA,MAAM,cAAc,mBAAmB,QAAQ;CAM/C,MAAM,YAAY,wBAAwB,QAAQ;CAClD,MAAM,aAAa,qBAAqB,IAAI,IAAI,kBAAkB,IAAI;CACtE,MAAM,SAAwB,CAAC;CAI/B,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EAOxC,IAAI,KAAK,kBAAkB;EAE3B,MAAM,UAAU,SAAS;EACzB,MAAM,YAAY,gBAAgB,IAAI,OAAO;EAE7C,IAAI,CAAC,WAAW;EAEhB,MAAM,YAAY,YAAY;EAC9B,IAAI;EACJ,IAAI,kBAAkB,SAAS,GAC7B,qBAAqB;OAChB,IAAI,YAAY,IAAI,SAAS,GAClC,qBAAqB;OAChB,IAAI,QAAQ,QACjB,qBAAqB,yBAAyB,QAAQ,OAAO,QAAQ;OAErE,qBAAqB;EAGvB,MAAM,QAAqB;GACzB,MAAM,QAAQ;GACd,UAAU,UAAU;GACpB;EACF;EACA,IAAI,cAAc,QAAQ,SACxB,MAAM,YAAY;EAEpB,OAAO,KAAK,KAAK;CACnB;CAEA,IAAI,cACF,KAAK,MAAM,QAAQ,cAAc;EAC/B,MAAM,QAAqB;GACzB,MAAM,KAAK;GACX,oBAAoB,KAAK;GACzB,MAAM;GACN,eAAe,KAAK;GACpB,YAAY,KAAK;EACnB;EACA,IAAI,KAAK,SAAS,MAAM,UAAU;EAClC,IAAI,KAAK,QAAQ,MAAM,SAAS;EAChC,OAAO,KAAK,KAAK;CACnB;CAGF,OAAO;AACT"}
1
+ {"version":3,"file":"helpers.js","names":[],"sources":["../../../../../src/server/rsc-entry/helpers.ts"],"mappings":";;;;AAmBA,SAAgB,iBACd,UACA,kBACA,mBAAmB,UACJ;CACf,MAAM,aAAa,IAAI,IAAI,iBAAiB,KAAK,EAAE,cAAc,OAAO,CAAC;CACzE,MAAM,cAAc,mBAAmB,QAAQ;CAM/C,MAAM,YAAY,wBAAwB,QAAQ;CAClD,MAAM,SAAwB,CAAC;CAE/B,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EAOxC,IAAI,KAAK,kBAAkB;EAC3B,MAAM,UAAU,SAAS;EACzB,IAAI,CAAC,WAAW,IAAI,OAAO,GAAG;EAE9B,MAAM,QAAqB;GAAE,MAAM,QAAQ;GAAS,UAAU,UAAU;EAAG;EAC3E,IAAI,YAAY,OAAO,QAAQ,SAAS,MAAM,YAAY,YAAY;EACtE,OAAO,KAAK,KAAK;CACnB;CAEA,OAAO;AACT"}