@timber-js/app 0.2.0-alpha.240 → 0.2.0-alpha.242
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.
- package/dist/_chunks/{actions-DIgnvDrG.js → actions-BkwgRwCl.js} +146 -12
- package/dist/_chunks/actions-BkwgRwCl.js.map +1 -0
- package/dist/_chunks/{als-registry-PPYstxK0.js → als-registry-C-iwbtvI.js} +4 -3
- package/dist/_chunks/{als-registry-PPYstxK0.js.map → als-registry-C-iwbtvI.js.map} +1 -1
- package/dist/_chunks/{als-slots-kbQrHTzm.js → als-slots-CVTF-AMz.js} +3 -3
- package/dist/_chunks/als-slots-CVTF-AMz.js.map +1 -0
- package/dist/_chunks/{cache-api-uWQwuxWb.js → cache-api-BGA7c5qJ.js} +5 -5
- package/dist/_chunks/{cache-api-uWQwuxWb.js.map → cache-api-BGA7c5qJ.js.map} +1 -1
- package/dist/_chunks/{chains-C7CExrUI.js → chains-Cuwwjv6T.js} +2 -2
- package/dist/_chunks/{chains-C7CExrUI.js.map → chains-Cuwwjv6T.js.map} +1 -1
- package/dist/_chunks/chains-LGjBHfSN.js +1 -0
- package/dist/_chunks/{classify-Cj9EeZoL.js → classify-Y8S9C0Na.js} +2 -2
- package/dist/_chunks/{classify-Cj9EeZoL.js.map → classify-Y8S9C0Na.js.map} +1 -1
- package/dist/_chunks/{cli-check-C3QOAru7.js → cli-check-KeE1QaIx.js} +7 -6
- package/dist/_chunks/cli-check-KeE1QaIx.js.map +1 -0
- package/dist/_chunks/{cli-schema-sync-DQUS_o3V.js → cli-schema-sync-DZEF31wd.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-DQUS_o3V.js.map → cli-schema-sync-DZEF31wd.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-BRxZz66D.js → cli-schema-sync-_y5O6MIg.js} +1 -1
- package/dist/_chunks/{client-dep-entries-ZETBdLgv.js → client-dep-entries-DpiwvoDi.js} +2 -2
- package/dist/_chunks/{client-dep-entries-ZETBdLgv.js.map → client-dep-entries-DpiwvoDi.js.map} +1 -1
- package/dist/_chunks/{cloudflare-Dk5Hqo-O.js → cloudflare-9dbhVOxS.js} +2 -2
- package/dist/_chunks/{cloudflare-Dk5Hqo-O.js.map → cloudflare-9dbhVOxS.js.map} +1 -1
- package/dist/_chunks/{convention-lint-BoVISNS6.js → convention-lint-0AEsPK2T.js} +378 -10
- package/dist/_chunks/convention-lint-0AEsPK2T.js.map +1 -0
- package/dist/_chunks/dev-server-CboXr8zX.js +1 -0
- package/dist/_chunks/{dev-server-C5R6jx8Q.js → dev-server-DYDr8KIc.js} +9 -3
- package/dist/_chunks/dev-server-DYDr8KIc.js.map +1 -0
- package/dist/_chunks/{dist-C1Rjlo6s.js → dist-GyaJm4GA.js} +18 -2
- package/dist/_chunks/dist-GyaJm4GA.js.map +1 -0
- package/dist/_chunks/{error-boundary-DB51f9ih.js → error-boundary-wuNvAJ4n.js} +11 -14
- package/dist/_chunks/error-boundary-wuNvAJ4n.js.map +1 -0
- package/dist/_chunks/{flight-source-node-D9cHBhjP.js → flight-source-node-KQsX_OhS.js} +4 -7
- package/dist/_chunks/flight-source-node-KQsX_OhS.js.map +1 -0
- package/dist/_chunks/{json-lossy-check-Y1GxqVX_.js → json-lossy-check-BVDALqMf.js} +2 -2
- package/dist/_chunks/{json-lossy-check-Y1GxqVX_.js.map → json-lossy-check-BVDALqMf.js.map} +1 -1
- package/dist/_chunks/key-headers-uIig1_mU.js +40 -0
- package/dist/_chunks/key-headers-uIig1_mU.js.map +1 -0
- package/dist/_chunks/{live-graph-BDQWvnMm.js → live-graph-VhzO7Ol9.js} +4 -4
- package/dist/_chunks/{live-graph-BDQWvnMm.js.map → live-graph-VhzO7Ol9.js.map} +1 -1
- package/dist/_chunks/{logger-DmRR9tmZ.js → logger-C4m8rfMy.js} +2 -2
- package/dist/_chunks/{logger-DmRR9tmZ.js.map → logger-C4m8rfMy.js.map} +1 -1
- package/dist/_chunks/metadata-routes-MXNjWOt5.js.map +1 -1
- package/dist/_chunks/{node-response-yp8zdyRp.js → node-response-8Vz29cGS.js} +2 -2
- package/dist/_chunks/{node-response-yp8zdyRp.js.map → node-response-8Vz29cGS.js.map} +1 -1
- package/dist/_chunks/{poison-scan-WQgUydF_.js → poison-scan-Dpl3ibG-.js} +2 -2
- package/dist/_chunks/{poison-scan-WQgUydF_.js.map → poison-scan-Dpl3ibG-.js.map} +1 -1
- package/dist/_chunks/{rsc-cache-key-D0cb0Gmc.js → rsc-cache-key-BGvUtMtN.js} +40 -4
- package/dist/_chunks/{rsc-cache-key-D0cb0Gmc.js.map → rsc-cache-key-BGvUtMtN.js.map} +1 -1
- package/dist/_chunks/{scanner-C9Lrf77z.js → scanner-CCEHN9Jg.js} +14 -81
- package/dist/_chunks/scanner-CCEHN9Jg.js.map +1 -0
- package/dist/_chunks/{sizeof-BISkSaU0.js → sizeof-CIF7fwSJ.js} +2 -2
- package/dist/_chunks/{sizeof-BISkSaU0.js.map → sizeof-CIF7fwSJ.js.map} +1 -1
- package/dist/_chunks/{walkers-Bxv4v7tX.js → walkers-BbotBhNG.js} +3 -3
- package/dist/_chunks/{walkers-Bxv4v7tX.js.map → walkers-BbotBhNG.js.map} +1 -1
- package/dist/adapters/cloudflare-dev.js +1 -1
- package/dist/adapters/cloudflare-kv-cache.js +2 -2
- package/dist/adapters/cloudflare.js +1 -1
- package/dist/analyze/crawl-entry.js +3 -3
- package/dist/analyze/graph-command.js +2 -2
- package/dist/cache/index.js +2 -2
- package/dist/cache/stores/memory.js +1 -1
- package/dist/cdn/workers-cache-purge.js +1 -1
- package/dist/cli-check.d.ts +3 -0
- package/dist/cli-check.d.ts.map +1 -1
- package/dist/cli.js +3 -3
- package/dist/client/browser-entry/router-init.d.ts +0 -1
- package/dist/client/browser-entry/router-init.d.ts.map +1 -1
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/index.js +2 -2
- package/dist/client/index.js.map +1 -1
- package/dist/client/internal.js +4 -5
- package/dist/client/internal.js.map +1 -1
- package/dist/client/navigation-commit.d.ts +3 -5
- package/dist/client/navigation-commit.d.ts.map +1 -1
- package/dist/client/outlet-content-cache.d.ts +25 -30
- package/dist/client/outlet-content-cache.d.ts.map +1 -1
- package/dist/client/outlet-scope-context.d.ts +4 -4
- package/dist/client/outlet-scope-context.d.ts.map +1 -1
- package/dist/client/params-context.d.ts +1 -1
- package/dist/client/router-types.d.ts +3 -13
- package/dist/client/router-types.d.ts.map +1 -1
- package/dist/client/router.d.ts.map +1 -1
- package/dist/client/segment-cache.d.ts +2 -2
- package/dist/client/segment-outlet.d.ts +12 -13
- package/dist/client/segment-outlet.d.ts.map +1 -1
- package/dist/client/stale-segment.d.ts +2 -2
- package/dist/config-types.d.ts +22 -15
- package/dist/config-types.d.ts.map +1 -1
- package/dist/config-validation.d.ts.map +1 -1
- package/dist/cookies/define-cookie.d.ts.map +1 -1
- package/dist/cookies/index.js +5 -2
- package/dist/cookies/index.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +109 -26
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/cookies/define-cookie.js +6 -2
- package/dist/native/rsc/cookies/define-cookie.js.map +1 -1
- package/dist/native/rsc/manifest.json +12 -4
- package/dist/native/rsc/routing/segment-keys.js +11 -1
- package/dist/native/rsc/routing/segment-keys.js.map +1 -1
- package/dist/native/rsc/search-params/define.js +4 -1
- package/dist/native/rsc/search-params/define.js.map +1 -1
- package/dist/native/rsc/server/als-registry.js +2 -2
- package/dist/native/rsc/server/als-registry.js.map +1 -1
- package/dist/native/rsc/server/client-state-tree.js +13 -12
- package/dist/native/rsc/server/client-state-tree.js.map +1 -1
- package/dist/native/rsc/server/cookie-context.js +12 -0
- package/dist/native/rsc/server/cookie-context.js.map +1 -1
- package/dist/native/rsc/server/flight-source-node.js +2 -5
- package/dist/native/rsc/server/flight-source-node.js.map +1 -1
- package/dist/native/rsc/server/flight-source.js +8 -40
- package/dist/native/rsc/server/flight-source.js.map +1 -1
- package/dist/native/rsc/server/framework-stack-frames.js +18 -0
- package/dist/native/rsc/server/framework-stack-frames.js.map +1 -0
- package/dist/native/rsc/server/prebuilt-builder.js +15 -1
- package/dist/native/rsc/server/prebuilt-builder.js.map +1 -1
- package/dist/native/rsc/server/request-context.js +11 -5
- package/dist/native/rsc/server/request-context.js.map +1 -1
- package/dist/native/rsc/server/route-element-builder.js +29 -11
- package/dist/native/rsc/server/route-element-builder.js.map +1 -1
- package/dist/native/rsc/server/route-module-loader.js +14 -6
- package/dist/native/rsc/server/route-module-loader.js.map +1 -1
- package/dist/native/rsc/server/rsc-cache-key-guard.js +5 -1
- package/dist/native/rsc/server/rsc-cache-key-guard.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +10 -29
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +7 -2
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/rsc-stream.js +2 -5
- package/dist/native/rsc/server/rsc-entry/rsc-stream.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/document-outlet.js +24 -0
- package/dist/native/rsc/server/segment-lifetime/document-outlet.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/key-digest.js +74 -0
- package/dist/native/rsc/server/segment-lifetime/key-digest.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js +44 -0
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/read-rule.js +78 -0
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/read-scope.js +41 -0
- package/dist/native/rsc/server/segment-lifetime/read-scope.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/segment-key.js +64 -0
- package/dist/native/rsc/server/segment-lifetime/segment-key.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js +72 -0
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js.map +1 -0
- package/dist/native/rsc/server/slot-resolver.js +51 -27
- package/dist/native/rsc/server/slot-resolver.js.map +1 -1
- package/dist/native/rsc/server/slot-subtree-contain.js +17 -89
- package/dist/native/rsc/server/slot-subtree-contain.js.map +1 -1
- package/dist/native/rsc/server/subtree-walk.js +140 -0
- package/dist/native/rsc/server/subtree-walk.js.map +1 -0
- package/dist/native/rsc/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/rsc/shared/als-slots.js +2 -2
- package/dist/native/rsc/shared/als-slots.js.map +1 -1
- package/dist/native/rsc/shared/cookie-read-through.js +5 -0
- package/dist/native/rsc/shared/cookie-read-through.js.map +1 -0
- package/dist/native/rsc/shared/key-headers.js +20 -0
- package/dist/native/rsc/shared/key-headers.js.map +1 -0
- package/dist/native/rsc/shared/outlet-decision.js.map +1 -1
- package/dist/native/rsc/shared/route-options-export.js +8 -0
- package/dist/native/rsc/shared/route-options-export.js.map +1 -0
- package/dist/native/rsc/shared/rsc-cache-key.js +19 -3
- package/dist/native/rsc/shared/rsc-cache-key.js.map +1 -1
- package/dist/native/rsc/shims/headers.js +3 -4
- package/dist/native/rsc/shims/headers.js.map +1 -1
- package/dist/native/ssr/client/outlet-content-cache.js +12 -18
- package/dist/native/ssr/client/outlet-content-cache.js.map +1 -1
- package/dist/native/ssr/client/outlet-scope-context.js.map +1 -1
- package/dist/native/ssr/client/segment-outlet.js +6 -19
- package/dist/native/ssr/client/segment-outlet.js.map +1 -1
- package/dist/native/ssr/cookies/define-cookie.js +6 -2
- package/dist/native/ssr/cookies/define-cookie.js.map +1 -1
- package/dist/native/ssr/manifest.json +5 -1
- package/dist/native/ssr/search-params/define.js +4 -1
- package/dist/native/ssr/search-params/define.js.map +1 -1
- package/dist/native/ssr/server/als-registry.js +2 -2
- package/dist/native/ssr/server/als-registry.js.map +1 -1
- package/dist/native/ssr/server/client-state-tree.js +13 -12
- package/dist/native/ssr/server/client-state-tree.js.map +1 -1
- package/dist/native/ssr/server/cookie-context.js +12 -0
- package/dist/native/ssr/server/cookie-context.js.map +1 -1
- package/dist/native/ssr/server/flight-source-node.js +2 -5
- package/dist/native/ssr/server/flight-source-node.js.map +1 -1
- package/dist/native/ssr/server/flight-source.js +1 -1
- package/dist/native/ssr/server/flight-source.js.map +1 -1
- package/dist/native/ssr/server/framework-stack-frames.js +18 -0
- package/dist/native/ssr/server/framework-stack-frames.js.map +1 -0
- package/dist/native/ssr/server/request-context.js +11 -5
- package/dist/native/ssr/server/request-context.js.map +1 -1
- package/dist/native/ssr/server/rsc-cache-key-guard.js +5 -1
- package/dist/native/ssr/server/rsc-cache-key-guard.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/key-digest.js +6 -0
- package/dist/native/ssr/server/segment-lifetime/key-digest.js.map +1 -0
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +78 -0
- package/dist/native/ssr/server/segment-lifetime/read-rule.js.map +1 -0
- package/dist/native/ssr/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/ssr/shared/als-slots.js +2 -2
- package/dist/native/ssr/shared/als-slots.js.map +1 -1
- package/dist/native/ssr/shared/cookie-read-through.js +5 -0
- package/dist/native/ssr/shared/cookie-read-through.js.map +1 -0
- package/dist/native/ssr/shared/key-headers.js +13 -0
- package/dist/native/ssr/shared/key-headers.js.map +1 -0
- package/dist/native/ssr/shared/rsc-cache-key.js +19 -3
- package/dist/native/ssr/shared/rsc-cache-key.js.map +1 -1
- package/dist/native/ssr/shims/headers.js +3 -4
- package/dist/native/ssr/shims/headers.js.map +1 -1
- package/dist/plugins/callsite-jsx.d.ts +8 -1
- package/dist/plugins/callsite-jsx.d.ts.map +1 -1
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/plugins/prerender-sugar.d.ts +9 -8
- package/dist/plugins/prerender-sugar.d.ts.map +1 -1
- package/dist/plugins/routing.d.ts.map +1 -1
- package/dist/routing/convention-lint.d.ts +11 -3
- package/dist/routing/convention-lint.d.ts.map +1 -1
- package/dist/routing/export-detect.d.ts +50 -23
- package/dist/routing/export-detect.d.ts.map +1 -1
- package/dist/routing/index.js +2 -2
- package/dist/routing/route-options-lint.d.ts +36 -0
- package/dist/routing/route-options-lint.d.ts.map +1 -0
- package/dist/routing/route-options.d.ts +55 -0
- package/dist/routing/route-options.d.ts.map +1 -0
- package/dist/routing/segment-keys.d.ts +38 -4
- package/dist/routing/segment-keys.d.ts.map +1 -1
- package/dist/search-params/index.js +5 -2
- package/dist/search-params/index.js.map +1 -1
- package/dist/server/als-registry.d.ts +22 -13
- package/dist/server/als-registry.d.ts.map +1 -1
- package/dist/server/client-state-tree.d.ts +11 -10
- package/dist/server/client-state-tree.d.ts.map +1 -1
- package/dist/server/cookie-context.d.ts +3 -0
- package/dist/server/cookie-context.d.ts.map +1 -1
- package/dist/server/flight-source-node.d.ts +1 -6
- package/dist/server/flight-source-node.d.ts.map +1 -1
- package/dist/server/flight-source.d.ts +4 -28
- package/dist/server/flight-source.d.ts.map +1 -1
- package/dist/server/framework-stack-frames.d.ts +20 -0
- package/dist/server/framework-stack-frames.d.ts.map +1 -0
- package/dist/server/index.d.ts +1 -0
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +2 -2
- package/dist/server/internal.js +102 -28
- package/dist/server/internal.js.map +1 -1
- package/dist/server/prebuilt/capture-routes.d.ts +1 -1
- package/dist/server/prebuilt-builder.d.ts.map +1 -1
- package/dist/server/request-context.d.ts +6 -1
- package/dist/server/request-context.d.ts.map +1 -1
- package/dist/server/route-element-builder.d.ts +2 -2
- package/dist/server/route-element-builder.d.ts.map +1 -1
- package/dist/server/route-module-loader.d.ts +10 -2
- package/dist/server/route-module-loader.d.ts.map +1 -1
- package/dist/server/rsc-cache-key-guard.d.ts +3 -1
- package/dist/server/rsc-cache-key-guard.d.ts.map +1 -1
- package/dist/server/rsc-entry/helpers.d.ts +1 -1
- package/dist/server/rsc-entry/index.d.ts.map +1 -1
- package/dist/server/rsc-entry/render-route.d.ts +10 -1
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- package/dist/server/rsc-entry/revalidate-renderer.d.ts +12 -0
- package/dist/server/rsc-entry/revalidate-renderer.d.ts.map +1 -1
- package/dist/server/rsc-entry/rsc-stream.d.ts +2 -11
- package/dist/server/rsc-entry/rsc-stream.d.ts.map +1 -1
- package/dist/server/segment-lifetime/document-outlet.d.ts +66 -0
- package/dist/server/segment-lifetime/document-outlet.d.ts.map +1 -0
- package/dist/server/segment-lifetime/key-digest.d.ts +46 -0
- package/dist/server/segment-lifetime/key-digest.d.ts.map +1 -0
- package/dist/server/segment-lifetime/outlet-gate.d.ts +58 -0
- package/dist/server/segment-lifetime/outlet-gate.d.ts.map +1 -0
- package/dist/server/segment-lifetime/read-rule.d.ts +53 -0
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -0
- package/dist/server/segment-lifetime/read-scope.d.ts +40 -0
- package/dist/server/segment-lifetime/read-scope.d.ts.map +1 -0
- package/dist/server/segment-lifetime/segment-key.d.ts +63 -0
- package/dist/server/segment-lifetime/segment-key.d.ts.map +1 -0
- package/dist/server/segment-lifetime/slot-outlets.d.ts +81 -0
- package/dist/server/segment-lifetime/slot-outlets.d.ts.map +1 -0
- package/dist/server/slot-resolver.d.ts +10 -5
- package/dist/server/slot-resolver.d.ts.map +1 -1
- package/dist/server/slot-subtree-contain.d.ts +2 -6
- package/dist/server/slot-subtree-contain.d.ts.map +1 -1
- package/dist/server/subtree-walk.d.ts +56 -0
- package/dist/server/subtree-walk.d.ts.map +1 -0
- package/dist/server/types.d.ts +75 -0
- package/dist/server/types.d.ts.map +1 -1
- package/dist/server/vite-handoff-rsc.d.ts +1 -10
- package/dist/server/vite-handoff-rsc.d.ts.map +1 -1
- package/dist/shared/als-slots.d.ts +12 -2
- package/dist/shared/als-slots.d.ts.map +1 -1
- package/dist/shared/cookie-read-through.d.ts +18 -0
- package/dist/shared/cookie-read-through.d.ts.map +1 -0
- package/dist/shared/key-headers.d.ts +13 -0
- package/dist/shared/key-headers.d.ts.map +1 -0
- package/dist/shared/outlet-decision.d.ts +16 -28
- package/dist/shared/outlet-decision.d.ts.map +1 -1
- package/dist/shared/payload-root.d.ts +1 -1
- package/dist/shared/route-options-export.d.ts +13 -0
- package/dist/shared/route-options-export.d.ts.map +1 -0
- package/dist/shared/rsc-cache-key.d.ts +22 -0
- package/dist/shared/rsc-cache-key.d.ts.map +1 -1
- package/dist/shared/segment-info.d.ts +7 -5
- package/dist/shared/segment-info.d.ts.map +1 -1
- package/dist/shims/headers.d.ts.map +1 -1
- package/docs/api/30-api-server.mdx +29 -0
- package/docs/api/32-api-cache.mdx +10 -4
- package/docs/api/34-api-config.mdx +5 -0
- package/docs/learn/09-streaming.mdx +6 -2
- package/docs/learn/10-caching.mdx +10 -4
- package/package.json +1 -1
- package/src/cli-check.ts +11 -3
- package/src/client/browser-entry/index.ts +0 -2
- package/src/client/browser-entry/router-init.ts +2 -4
- package/src/client/error-boundary.tsx +1 -1
- package/src/client/navigation-commit.ts +9 -14
- package/src/client/outlet-content-cache.ts +36 -42
- package/src/client/outlet-scope-context.ts +5 -5
- package/src/client/params-context.ts +1 -1
- package/src/client/router-types.ts +3 -14
- package/src/client/router.ts +1 -2
- package/src/client/rsc-fetch.ts +1 -1
- package/src/client/segment-cache.ts +2 -2
- package/src/client/segment-outlet.tsx +19 -45
- package/src/client/stale-segment.ts +2 -2
- package/src/config-types.ts +23 -15
- package/src/config-validation.ts +17 -1
- package/src/cookies/define-cookie.ts +5 -1
- package/src/index.ts +2 -1
- package/src/plugins/callsite-jsx.ts +104 -6
- package/src/plugins/entries.ts +3 -1
- package/src/plugins/prerender-sugar.ts +34 -18
- package/src/plugins/routing.ts +3 -1
- package/src/routing/convention-lint.ts +18 -7
- package/src/routing/export-detect.ts +14 -117
- package/src/routing/route-options-lint.ts +153 -0
- package/src/routing/route-options.ts +439 -0
- package/src/routing/scanner.ts +1 -1
- package/src/routing/segment-keys.ts +53 -4
- package/src/rsc-runtime/vendor-types.d.ts +5 -1
- package/src/search-params/define.ts +1 -1
- package/src/server/als-registry.ts +25 -17
- package/src/server/client-state-tree.ts +30 -27
- package/src/server/cookie-context.ts +17 -0
- package/src/server/flight-source-node.ts +1 -5
- package/src/server/flight-source.ts +8 -82
- package/src/server/framework-stack-frames.ts +41 -0
- package/src/server/index.ts +7 -0
- package/src/server/prebuilt/capture-routes.ts +1 -1
- package/src/server/prebuilt-builder.ts +30 -2
- package/src/server/request-context.ts +31 -6
- package/src/server/route-element-builder.ts +92 -18
- package/src/server/route-module-loader.ts +43 -10
- package/src/server/rsc-cache-key-guard.ts +17 -2
- package/src/server/rsc-entry/helpers.ts +1 -1
- package/src/server/rsc-entry/index.ts +16 -3
- package/src/server/rsc-entry/render-route.ts +22 -51
- package/src/server/rsc-entry/revalidate-renderer.ts +16 -2
- package/src/server/rsc-entry/rsc-stream.ts +3 -23
- package/src/server/segment-lifetime/document-outlet.ts +98 -0
- package/src/server/segment-lifetime/key-digest.ts +139 -0
- package/src/server/segment-lifetime/outlet-gate.ts +102 -0
- package/src/server/segment-lifetime/read-rule.ts +193 -0
- package/src/server/segment-lifetime/read-scope.ts +101 -0
- package/src/server/segment-lifetime/segment-key.ts +168 -0
- package/src/server/segment-lifetime/slot-outlets.ts +180 -0
- package/src/server/slot-resolver.ts +103 -60
- package/src/server/slot-subtree-contain.ts +35 -182
- package/src/server/subtree-walk.ts +316 -0
- package/src/server/types.ts +91 -0
- package/src/server/vite-handoff-rsc.ts +1 -12
- package/src/shared/als-slots.ts +19 -8
- package/src/shared/cookie-read-through.ts +18 -0
- package/src/shared/key-headers.ts +42 -0
- package/src/shared/outlet-decision.ts +16 -30
- package/src/shared/payload-root.ts +1 -1
- package/src/shared/route-options-export.ts +14 -0
- package/src/shared/rsc-cache-key.ts +41 -2
- package/src/shared/segment-info.ts +7 -5
- package/src/shims/headers.ts +5 -4
- package/dist/_chunks/actions-DIgnvDrG.js.map +0 -1
- package/dist/_chunks/als-slots-kbQrHTzm.js.map +0 -1
- package/dist/_chunks/chains-CSslTUdI.js +0 -1
- package/dist/_chunks/cli-check-C3QOAru7.js.map +0 -1
- package/dist/_chunks/convention-lint-BoVISNS6.js.map +0 -1
- package/dist/_chunks/dev-server-B8roKA3Q.js +0 -1
- package/dist/_chunks/dev-server-C5R6jx8Q.js.map +0 -1
- package/dist/_chunks/dist-C1Rjlo6s.js.map +0 -1
- package/dist/_chunks/error-boundary-DB51f9ih.js.map +0 -1
- package/dist/_chunks/flight-source-node-D9cHBhjP.js.map +0 -1
- package/dist/_chunks/scanner-C9Lrf77z.js.map +0 -1
- package/dist/native/rsc/server/segment-hash/capture.js +0 -107
- package/dist/native/rsc/server/segment-hash/capture.js.map +0 -1
- package/dist/native/rsc/server/segment-hash/outlet.js +0 -81
- package/dist/native/rsc/server/segment-hash/outlet.js.map +0 -1
- package/dist/native/rsc/server/segment-hash/stream-tap.js +0 -139
- package/dist/native/rsc/server/segment-hash/stream-tap.js.map +0 -1
- package/dist/native/rsc/server/segment-hash/value-hash.js +0 -171
- package/dist/native/rsc/server/segment-hash/value-hash.js.map +0 -1
- package/dist/native/ssr/server/segment-hash/value-hash.js +0 -162
- package/dist/native/ssr/server/segment-hash/value-hash.js.map +0 -1
- package/dist/server/segment-hash/capture.d.ts +0 -77
- package/dist/server/segment-hash/capture.d.ts.map +0 -1
- package/dist/server/segment-hash/outlet.d.ts +0 -65
- package/dist/server/segment-hash/outlet.d.ts.map +0 -1
- package/dist/server/segment-hash/stream-tap.d.ts +0 -49
- package/dist/server/segment-hash/stream-tap.d.ts.map +0 -1
- package/dist/server/segment-hash/value-hash.d.ts +0 -70
- package/dist/server/segment-hash/value-hash.d.ts.map +0 -1
- package/src/server/segment-hash/capture.ts +0 -232
- package/src/server/segment-hash/outlet.ts +0 -185
- package/src/server/segment-hash/stream-tap.ts +0 -244
- package/src/server/segment-hash/value-hash.ts +0 -338
|
@@ -10,11 +10,13 @@ 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 { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths } from "../routing/segment-keys.js";
|
|
14
|
-
import {
|
|
13
|
+
import { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths, layoutOutletKey, pageOutletKey } from "../routing/segment-keys.js";
|
|
14
|
+
import { documentOutletFor, pathParamNames } from "./segment-lifetime/document-outlet.js";
|
|
15
|
+
import { getActionErrorForRender, getSegmentParams } from "./request-context.js";
|
|
16
|
+
import { inReadScope, readScopeFor } from "./segment-lifetime/read-scope.js";
|
|
17
|
+
import { outletGate } from "./segment-lifetime/outlet-gate.js";
|
|
15
18
|
import { METADATA_OUTLET_PATH } from "../shared/outlet-decision.js";
|
|
16
19
|
import { loadFallbackModule } from "./pipeline-helpers.js";
|
|
17
|
-
import { getActionErrorForRender } from "./request-context.js";
|
|
18
20
|
import { loadInterceptionGates } from "./interception-gates.js";
|
|
19
21
|
import { Fragment, createElement } from "../_react/react.js";
|
|
20
22
|
// src/server/route-element-builder.ts
|
|
@@ -51,11 +53,13 @@ function wrapAccessGate(element, opts, h) {
|
|
|
51
53
|
async function buildRouteElement(req, match, interception, render, metadataRouteHashes) {
|
|
52
54
|
const segments = match.segments;
|
|
53
55
|
const loadBoundaryModule = (file) => loadFallbackModule(file, req, segments);
|
|
54
|
-
const { metadataSources, layoutComponents, PageComponent, deferSuspenseFor, accessFns } = await loadRouteModules(segments, req.url);
|
|
56
|
+
const { metadataSources, layoutComponents, PageComponent: LoadedPage, deferSuspenseFor, accessFns, documentLifetimes } = await loadRouteModules(segments, req.url, render.defaultLayoutLifetime);
|
|
57
|
+
const mainParams = documentLifetimes.page !== void 0 || documentLifetimes.layouts.some(Boolean) ? getSegmentParams() : {};
|
|
55
58
|
const interceptionGates = await loadInterceptionGates(match);
|
|
56
59
|
const gateFor = (i) => i < (interceptionGates?.sharedCount ?? 0) ? void 0 : accessFns[i];
|
|
57
60
|
const segmentKeys = computeSegmentKeys(segments);
|
|
58
61
|
const segmentTreePaths = computeSegmentTreePaths(segments);
|
|
62
|
+
const PageComponent = documentLifetimes.page && !isClientReference(LoadedPage) ? inReadScope(LoadedPage, readScopeFor(pageOutletKey(segmentTreePaths[segments.length - 1]), documentLifetimes.page, pathParamNames(segments, segments.length - 1))) : LoadedPage;
|
|
59
63
|
const denyPageChains = new Map();
|
|
60
64
|
for (let i = 0; i < segments.length; i++) {
|
|
61
65
|
const chain = await buildDenyPageChain(segments, i, segmentKeys, req);
|
|
@@ -84,6 +88,17 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
84
88
|
};
|
|
85
89
|
element = h(TracedPage, {});
|
|
86
90
|
}
|
|
91
|
+
let pageOutlet;
|
|
92
|
+
if (documentLifetimes.page) {
|
|
93
|
+
const segmentPath = pageOutletKey(segmentTreePaths[leafIndex]);
|
|
94
|
+
pageOutlet = {
|
|
95
|
+
segmentPath,
|
|
96
|
+
content: element,
|
|
97
|
+
nested: [],
|
|
98
|
+
document: await documentOutletFor(render, segmentPath, documentLifetimes.page, pathParamNames(segments, leafIndex), mainParams)
|
|
99
|
+
};
|
|
100
|
+
element = outletGate(pageOutlet);
|
|
101
|
+
}
|
|
87
102
|
const metadataOutlet = {
|
|
88
103
|
segmentPath: METADATA_OUTLET_PATH,
|
|
89
104
|
content: h(MetadataHead, {
|
|
@@ -94,9 +109,9 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
94
109
|
}),
|
|
95
110
|
nested: []
|
|
96
111
|
};
|
|
97
|
-
element = h(Fragment, null, outletGate(metadataOutlet
|
|
112
|
+
element = h(Fragment, null, outletGate(metadataOutlet), element);
|
|
98
113
|
const layoutBySegment = new Map(layoutComponents.map(({ component, segment }) => [segment, component]));
|
|
99
|
-
let unclaimedOutlets = [metadataOutlet];
|
|
114
|
+
let unclaimedOutlets = pageOutlet ? [metadataOutlet, pageOutlet] : [metadataOutlet];
|
|
100
115
|
for (let i = segments.length - 1; i >= 0; i--) {
|
|
101
116
|
const segment = segments[i];
|
|
102
117
|
const layoutComponent = layoutBySegment.get(segment);
|
|
@@ -110,6 +125,8 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
110
125
|
});
|
|
111
126
|
if (layoutComponent) {
|
|
112
127
|
const segmentId = segmentKeys[i];
|
|
128
|
+
const layoutLifetime = documentLifetimes.layouts[i];
|
|
129
|
+
const layoutOutletPath = layoutLifetime ? layoutOutletKey(segmentTreePaths[i]) : segmentId;
|
|
113
130
|
const childrenOutlet = {
|
|
114
131
|
segmentPath: childrenOutletKey(segmentId),
|
|
115
132
|
content: element,
|
|
@@ -129,12 +146,12 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
129
146
|
const parallelRouteKeys = Object.keys(segment.slots ?? {});
|
|
130
147
|
const layoutProps = {
|
|
131
148
|
...slots.props,
|
|
132
|
-
children: outletGate(childrenOutlet
|
|
149
|
+
children: outletGate(childrenOutlet)
|
|
133
150
|
};
|
|
134
151
|
let layoutElement;
|
|
135
152
|
if (isClientReference(layoutComponent)) layoutElement = h(layoutComponent, layoutProps);
|
|
136
153
|
else {
|
|
137
|
-
const layoutComponentRef = layoutComponent;
|
|
154
|
+
const layoutComponentRef = layoutLifetime ? inReadScope(layoutComponent, readScopeFor(layoutOutletPath, layoutLifetime, pathParamNames(segments, i))) : layoutComponent;
|
|
138
155
|
const layoutDenyPages = denyPageChains.get(i);
|
|
139
156
|
const TracedLayout = async (props) => {
|
|
140
157
|
try {
|
|
@@ -157,16 +174,17 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
157
174
|
});
|
|
158
175
|
}
|
|
159
176
|
const layoutOutlet = {
|
|
160
|
-
segmentPath:
|
|
177
|
+
segmentPath: layoutOutletPath,
|
|
161
178
|
content: h(clientComponents().SegmentProvider, {
|
|
162
179
|
segments: segmentPath,
|
|
163
180
|
segmentId,
|
|
164
181
|
parallelRouteKeys,
|
|
165
182
|
children: layoutElement
|
|
166
183
|
}),
|
|
167
|
-
nested: [childrenOutlet, ...slots.outlets]
|
|
184
|
+
nested: [childrenOutlet, ...slots.outlets],
|
|
185
|
+
document: await documentOutletFor(render, layoutOutletPath, layoutLifetime, pathParamNames(segments, i), mainParams, segmentPath.length)
|
|
168
186
|
};
|
|
169
|
-
element = outletGate(layoutOutlet
|
|
187
|
+
element = outletGate(layoutOutlet);
|
|
170
188
|
unclaimedOutlets = [layoutOutlet];
|
|
171
189
|
}
|
|
172
190
|
const accessFn = gateFor(i);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"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"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { loadModule } from "./safe-load.js";
|
|
2
|
+
import { ROUTE_OPTIONS_EXPORT } from "../shared/route-options-export.js";
|
|
2
3
|
import { NoPageComponentError } from "./route-element-builder.js";
|
|
4
|
+
import { defaultLayoutLifetimeAt, readDocumentLifetime } from "./segment-lifetime/segment-key.js";
|
|
3
5
|
// src/server/route-module-loader.ts
|
|
4
6
|
function rejectLegacyGenerateMetadata(mod, filePath) {
|
|
5
7
|
if ("generateMetadata" in mod) throw new Error(`${filePath}: "generateMetadata" is not a valid export. Export an async function named "metadata" instead.\n\n // Before\n export async function generateMetadata({ params }) { ... }\n\n // After\n export async function metadata() { ... }`);
|
|
6
8
|
}
|
|
7
|
-
function extractDeferSuspenseFor(mod, current) {
|
|
8
|
-
|
|
9
|
-
return current;
|
|
9
|
+
function extractDeferSuspenseFor(mod, isPage, current) {
|
|
10
|
+
const options = mod[ROUTE_OPTIONS_EXPORT[isPage ? "page" : "layout"]];
|
|
11
|
+
if (typeof options !== "object" || options === null || !("deferSuspenseFor" in options)) return current;
|
|
12
|
+
const value = options.deferSuspenseFor;
|
|
13
|
+
return typeof value === "number" && value > current ? value : current;
|
|
10
14
|
}
|
|
11
15
|
function collectModuleExports(mod, segment, segmentIndex, isPage, metadataSources, currentDefer) {
|
|
12
16
|
rejectLegacyGenerateMetadata(mod, (isPage ? segment.page?.filePath : segment.layout?.filePath) ?? segment.urlPath);
|
|
@@ -16,19 +20,21 @@ function collectModuleExports(mod, segment, segmentIndex, isPage, metadataSource
|
|
|
16
20
|
isPage,
|
|
17
21
|
segmentIndex
|
|
18
22
|
});
|
|
19
|
-
return extractDeferSuspenseFor(mod, currentDefer);
|
|
23
|
+
return extractDeferSuspenseFor(mod, isPage, currentDefer);
|
|
20
24
|
}
|
|
21
|
-
async function loadRouteModules(segments, requestUrl) {
|
|
25
|
+
async function loadRouteModules(segments, requestUrl, defaultLayoutLifetime) {
|
|
22
26
|
const metadataSources = [];
|
|
23
27
|
const layoutComponents = [];
|
|
24
28
|
const accessFns = [];
|
|
25
29
|
let PageComponent = null;
|
|
26
30
|
let deferSuspenseFor = 0;
|
|
31
|
+
const documentLifetimes = { layouts: [] };
|
|
27
32
|
for (let i = 0; i < segments.length; i++) {
|
|
28
33
|
const segment = segments[i];
|
|
29
34
|
const isLeaf = i === segments.length - 1;
|
|
30
35
|
if (segment.layout) {
|
|
31
36
|
const mod = await loadModule(segment.layout);
|
|
37
|
+
documentLifetimes.layouts[i] = readDocumentLifetime(mod, "layout", defaultLayoutLifetimeAt(segments.slice(0, i + 1), defaultLayoutLifetime));
|
|
32
38
|
if (mod.default) layoutComponents.push({
|
|
33
39
|
component: mod.default,
|
|
34
40
|
segment
|
|
@@ -38,6 +44,7 @@ async function loadRouteModules(segments, requestUrl) {
|
|
|
38
44
|
if (isLeaf && segment.page) {
|
|
39
45
|
const mod = await loadModule(segment.page);
|
|
40
46
|
if (mod.default) PageComponent = mod.default;
|
|
47
|
+
documentLifetimes.page = readDocumentLifetime(mod, "page", "request");
|
|
41
48
|
deferSuspenseFor = collectModuleExports(mod, segment, i, true, metadataSources, deferSuspenseFor);
|
|
42
49
|
}
|
|
43
50
|
if (segment.access) {
|
|
@@ -54,7 +61,8 @@ async function loadRouteModules(segments, requestUrl) {
|
|
|
54
61
|
layoutComponents,
|
|
55
62
|
PageComponent,
|
|
56
63
|
deferSuspenseFor,
|
|
57
|
-
accessFns
|
|
64
|
+
accessFns,
|
|
65
|
+
documentLifetimes
|
|
58
66
|
};
|
|
59
67
|
}
|
|
60
68
|
export { loadRouteModules };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-module-loader.js","names":[],"sources":["../../../../src/server/route-module-loader.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-module-loader.js","names":[],"sources":["../../../../src/server/route-module-loader.ts"],"mappings":";;;;;AA+CA,SAAS,6BAA6B,KAA8B,UAAwB;CAC1F,IAAI,sBAAsB,KACxB,MAAM,IAAI,MACR,GAAG,SAAS,sOAMd;AAEJ;AASA,SAAS,wBACP,KACA,QACA,SACQ;CACR,MAAM,UAAU,IAAI,qBAAqB,SAAS,SAAS;CAC3D,IAAI,OAAO,YAAY,YAAY,YAAY,QAAQ,EAAE,sBAAsB,UAC7E,OAAO;CAET,MAAM,QAAQ,QAAQ;CACtB,OAAO,OAAO,UAAU,YAAY,QAAQ,UAAU,QAAQ;AAChE;AAMA,SAAS,qBACP,KACA,SACA,cACA,QACA,iBACA,cACQ;CAER,6BAA6B,MADX,SAAS,QAAQ,MAAM,WAAW,QAAQ,QAAQ,aAAa,QAAQ,OAC/C;CAC1C,IAAI,IAAI,UACN,gBAAgB,KAAK;EACnB,gBAAgB,IAAI;EACpB,aAAa,QAAQ,eAAe,QAAQ;EAC5C;EACA;CACF,CAAC;CAEH,OAAO,wBAAwB,KAAK,QAAQ,YAAY;AAC1D;AAQA,eAAsB,iBACpB,UACA,YAEA,uBAC6B;CAC7B,MAAM,kBAAoC,CAAC;CAC3C,MAAM,mBAA2C,CAAC;CAClD,MAAM,YAA6B,CAAC;CACpC,IAAI,gBAA0D;CAC9D,IAAI,mBAAmB;CACvB,MAAM,oBAA6D,EAAE,SAAS,CAAC,EAAE;CAEjF,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EACxC,MAAM,UAAU,SAAS;EACzB,MAAM,SAAS,MAAM,SAAS,SAAS;EAEvC,IAAI,QAAQ,QAAQ;GAClB,MAAM,MAAM,MAAM,WAAW,QAAQ,MAAM;GAC3C,kBAAkB,QAAQ,KAAK,qBAC7B,KACA,UACA,wBAAwB,SAAS,MAAM,GAAG,IAAI,CAAC,GAAG,qBAAqB,CACzE;GACA,IAAI,IAAI,SACN,iBAAiB,KAAK;IACpB,WAAW,IAAI;IACf;GACF,CAAC;GAEH,mBAAmB,qBACjB,KACA,SACA,GACA,OACA,iBACA,gBACF;EACF;EAEA,IAAI,UAAU,QAAQ,MAAM;GAC1B,MAAM,MAAM,MAAM,WAAW,QAAQ,IAAI;GACzC,IAAI,IAAI,SACN,gBAAgB,IAAI;GAEtB,kBAAkB,OAAO,qBAAqB,KAAK,QAAQ,SAAS;GACpE,mBAAmB,qBACjB,KACA,SACA,GACA,MACA,iBACA,gBACF;EACF;EAEA,IAAI,QAAQ,QAAQ;GAClB,MAAM,YAAY,MAAM,WAAW,QAAQ,MAAM;GACjD,UAAU,KAAK,UAAU;EAC3B;CACF;CAEA,IAAI,CAAC,eAAe;EAClB,MAAM,cAAc,SACjB,KACE,GAAG,MACF,MAAM,EAAE,IAAI,EAAE,YAAY,UAAU,EAAE,OAAO,QAAQ,KAAK,YAAY,EAAE,SAAS,QAAQ,KAAK,cAAc,EAAE,UAAU,UAAU,EAAE,GAAG,MAAM,SAAS,SAAS,IAAI,YAAY,IACnL,CAAC,CACA,KAAK,IAAI;EACZ,MAAM,IAAI,qBACR,sCAAsC,IAAI,IAAI,UAAU,CAAC,CAAC,SAAS,uBAAuB,aAC5F;CACF;CAEA,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;CACF;AACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RSC_KEY_PARAM, isRscCacheKeyShape, rscCacheKey } from "../shared/rsc-cache-key.js";
|
|
1
|
+
import { RSC_KEY_PARAM, isRscCacheKeyShape, rscCacheKey, stateTreeHasDocuments } from "../shared/rsc-cache-key.js";
|
|
2
2
|
import { isRscContentType } from "../shared/rsc-media-type.js";
|
|
3
3
|
import { preventResponseCaching } from "./response-cache-policy.js";
|
|
4
4
|
// src/server/rsc-cache-key-guard.ts
|
|
@@ -21,6 +21,10 @@ function hardenRscPayloadResponse(response) {
|
|
|
21
21
|
response.headers.set("X-Content-Type-Options", "nosniff");
|
|
22
22
|
}
|
|
23
23
|
async function enforceRscCacheKey(req, response) {
|
|
24
|
+
if (stateTreeHasDocuments(req.headers.get("X-Timber-State-Tree"))) {
|
|
25
|
+
preventResponseCaching(response.headers);
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
24
28
|
if (await hasValidRscCacheKey(req)) return;
|
|
25
29
|
preventResponseCaching(response.headers);
|
|
26
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rsc-cache-key-guard.js","names":[],"sources":["../../../../src/server/rsc-cache-key-guard.ts"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"rsc-cache-key-guard.js","names":[],"sources":["../../../../src/server/rsc-cache-key-guard.ts"],"mappings":";;;;AAgDA,eAAsB,oBAAoB,KAAgC;CASxE,IAAI,CAAC,IAAI,IAAI,SAAS,GAAG,GAAG,OAAO;CACnC,IAAI;CACJ,IAAI;EACF,SAAS,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,aAAa,OAAO,aAAa;CAC7D,QAAQ;EAEN,OAAO;CACT;CAKA,MAAM,SAAS,OAAO,OAAO,kBAAkB;CAC/C,IAAI,OAAO,WAAW,GAAG,OAAO;CAChC,MAAM,WAAW,MAAM,aAAa,SAAS,IAAI,QAAQ,IAAI,IAAI,CAAC;CAIlE,IAAI,aAAa,MAAM,OAAO;CAI9B,OAAO,OAAO,OAAO,UAAU,UAAU,QAAQ;AACnD;AAiBA,SAAgB,yBAAyB,UAA0B;CACjE,IAAI,CAAC,iBAAiB,SAAS,QAAQ,IAAI,cAAc,CAAC,GAAG;CAC7D,SAAS,QAAQ,IAAI,0BAA0B,SAAS;AAC1D;AAyBA,eAAsB,mBAAmB,KAAc,UAAmC;CAKxF,IAAI,sBAAsB,IAAI,QAAQ,IAAI,qBAAqB,CAAC,GAAG;EACjE,uBAAuB,SAAS,OAAO;EACvC;CACF;CACA,IAAI,MAAM,oBAAoB,GAAG,GAAG;CACpC,uBAAuB,SAAS,OAAO;AACzC"}
|
|
@@ -3,9 +3,6 @@ import { DenySignal } from "../primitives.js";
|
|
|
3
3
|
import { NoPageComponentError, buildRouteElement } from "../route-element-builder.js";
|
|
4
4
|
import { recordTiming } from "../server-timing.js";
|
|
5
5
|
import { parseClientStateTree } from "../client-state-tree.js";
|
|
6
|
-
import { isOutletType } from "../segment-hash/outlet.js";
|
|
7
|
-
import { createFromReadableStream } from "../vite-handoff-rsc.js";
|
|
8
|
-
import { createSegmentHashTap } from "../segment-hash/stream-tap.js";
|
|
9
6
|
import { handleApiRoute } from "./api-handler.js";
|
|
10
7
|
import { isRscRequest } from "../../shared/rsc-media-type.js";
|
|
11
8
|
import { buildRscPayloadResponse } from "./rsc-payload.js";
|
|
@@ -19,29 +16,19 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
19
16
|
const segments = match.segments;
|
|
20
17
|
const leaf = segments[segments.length - 1];
|
|
21
18
|
if (leaf.route && !leaf.page) return handleApiRoute(req, segments, responseHeaders);
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const segmentHashRender = {
|
|
31
|
-
clientHashes: hashing && isRscRequest(req) ? parseClientStateTree(req)?.hashes ?? null : null,
|
|
32
|
-
tap,
|
|
33
|
-
captureTimeoutMs: deps.renderTimeoutMs,
|
|
34
|
-
signal: req.signal,
|
|
35
|
-
onCaptureError(error) {
|
|
36
|
-
const digest = mainOnError?.(error);
|
|
37
|
-
if (typeof digest === "string") relayedDigests.add(digest);
|
|
38
|
-
return digest;
|
|
39
|
-
}
|
|
19
|
+
const clientState = isRscRequest(req) ? parseClientStateTree(req) : null;
|
|
20
|
+
const signer = clientJsDisabled ? null : deps.keyDigestSigner;
|
|
21
|
+
const segmentRender = {
|
|
22
|
+
documents: signer ? {
|
|
23
|
+
client: clientState?.documents ?? null,
|
|
24
|
+
signer
|
|
25
|
+
} : null,
|
|
26
|
+
defaultLayoutLifetime: deps.defaultLayoutLifetime
|
|
40
27
|
};
|
|
41
28
|
let routeResult;
|
|
42
29
|
const _buildStart = performance.now();
|
|
43
30
|
try {
|
|
44
|
-
routeResult = await buildRouteElement(req, match, interception,
|
|
31
|
+
routeResult = await buildRouteElement(req, match, interception, segmentRender, buildManifest.metadataRouteHashes);
|
|
45
32
|
} catch (error) {
|
|
46
33
|
if (error instanceof NoPageComponentError) {
|
|
47
34
|
if (process.env.NODE_ENV !== "production") console.warn(`[timber] ${error.message}`);
|
|
@@ -66,13 +53,7 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
66
53
|
if (preloadUrls.length > 0) headHtml += buildModulepreloadTags(preloadUrls);
|
|
67
54
|
}
|
|
68
55
|
const _rscStart = performance.now();
|
|
69
|
-
const { rscStream, signals
|
|
70
|
-
if (tap) {
|
|
71
|
-
mainOnError = onError;
|
|
72
|
-
tap.onEnd(() => {
|
|
73
|
-
mainOnError = null;
|
|
74
|
-
});
|
|
75
|
-
}
|
|
56
|
+
const { rscStream, signals } = renderRscStream(payload, req, deps.renderTimeoutMs, leafDenyChain);
|
|
76
57
|
recordTiming({
|
|
77
58
|
name: "rsc-init",
|
|
78
59
|
dur: Math.round(performance.now() - _rscStart),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":";;;;;;;;;;;;;AAmFA,eAAsB,YACpB,KACA,OACA,iBACA,MACA,cACmB;CACnB,MAAM,EAAE,iBAAiB,kBAAkB,eAAe,gBAAgB;CAC1E,MAAM,WAAW,MAAM;CACvB,MAAM,OAAO,SAAS,SAAS,SAAS;CAKxC,IAAI,KAAK,SAAS,CAAC,KAAK,MACtB,OAAO,eAAe,KAAK,UAAU,eAAe;CAOtD,MAAM,cAAc,aAAa,GAAG,IAAI,qBAAqB,GAAG,IAAI;CACpE,MAAM,SAAS,mBAAmB,OAAO,KAAK;CAC9C,MAAM,gBAA+B;EACnC,WAAW,SAAS;GAAE,QAAQ,aAAa,aAAa;GAAM;EAAO,IAAI;EACzE,uBAAuB,KAAK;CAC9B;CAOA,IAAI;CACJ,MAAM,cAAc,YAAY,IAAI;CACpC,IAAI;EACF,cAAc,MAAM,kBAClB,KACA,OACA,cACA,eACA,cAAc,mBAChB;CACF,SAAS,OAAO;EAMd,IAAI,iBAAiB,sBAAsB;GACzC,IAAA,QAAA,IAAA,aAA6B,cAC3B,QAAQ,KAAK,YAAY,MAAM,SAAS;GAE1C,OAAO,KAAK,mBAAmB,IAAI,WAAW,GAAG,GAAG,KAAK,eAAe;EAC1E;EACA,MAAM;CACR;CAEA,MAAM,YAAY,YAAY,IAAI;CAClC,aAAa;EACX,MAAM;EACN,KAAK,KAAK,MAAM,YAAY,WAAW;EACvC,MAAM;CACR,CAAC;CAED,MAAM,EAAE,SAAS,kBAAkB,kBAAkB,kBAAkB;CASvE,IAAI,WAAW;CAcf,MAAM,cAAc,kBAAkB,UAAU,aAAa;CAC7D,IAAI,YAAY,SAAS,GACvB,YAAY,qBAAqB,WAAW;CAQ9C,MAAM,UAAU,gBAAgB,UAAU,aAAa;CACvD,IAAI,QAAQ,SAAS,GACnB,YAAY,iBAAiB,OAAO;CAItC,IAAI,CAAC,kBAAkB;EACrB,MAAM,cAAc,2BAA2B,UAAU,aAAa;EACtE,IAAI,YAAY,SAAS,GACvB,YAAY,uBAAuB,WAAW;CAElD;CAQA,MAAM,YAAY,YAAY,IAAI;CAClC,MAAM,EAAE,WAAW,YAAY,gBAAgB,SAAS,KAAK,KAAK,iBAAiB,aAAa;CAEhG,aAAa;EACX,MAAM;EACN,KAAK,KAAK,MAAM,YAAY,IAAI,IAAI,SAAS;EAC7C,MAAM;CACR,CAAC;CAKD,IAAI,aAAa,GAAG,GAClB,OAAO,wBAAwB,WAAW,SAAS,UAAU,kBAAkB,eAAe;CAShG,MAAM,mBAAmB,mBAAmB;CAC5C,MAAM,YAAY,mBACd,MAAM,gBAAgB,kBAAkB,KAAK,iBAAiB,IAAI,MAAM,IACxE;CAGJ,OAAO,kBAAkB;EACvB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF,CAAC;AACH"}
|
|
@@ -9,7 +9,6 @@ import { buildRouteElement } from "../route-element-builder.js";
|
|
|
9
9
|
import { createReactCacheScope } from "../react-cache-scope.js";
|
|
10
10
|
import { RevalidationDropped } from "../actions.js";
|
|
11
11
|
import { runMiddlewareForAction } from "./action-middleware-runner.js";
|
|
12
|
-
import { NO_SEGMENT_HASHING } from "../segment-hash/outlet.js";
|
|
13
12
|
import { RSC_CONTENT_TYPE } from "../../shared/rsc-media-type.js";
|
|
14
13
|
import { stringifyCookie } from "cookie";
|
|
15
14
|
// src/server/rsc-entry/revalidate-renderer.ts
|
|
@@ -118,7 +117,13 @@ function createRevalidateRendererFactory(deps) {
|
|
|
118
117
|
setSegmentParams(match.segmentParams);
|
|
119
118
|
if (overlay) applyRequestHeaderOverlay(overlay);
|
|
120
119
|
return {
|
|
121
|
-
payload: (await buildRouteElement(revalidateReq, match, void 0,
|
|
120
|
+
payload: (await buildRouteElement(revalidateReq, match, void 0, {
|
|
121
|
+
documents: deps.keyDigestSigner ? {
|
|
122
|
+
client: null,
|
|
123
|
+
signer: deps.keyDigestSigner
|
|
124
|
+
} : null,
|
|
125
|
+
defaultLayoutLifetime: deps.defaultLayoutLifetime
|
|
126
|
+
}, deps.buildManifest.metadataRouteHashes)).payload,
|
|
122
127
|
reactCacheScope
|
|
123
128
|
};
|
|
124
129
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"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"}
|
|
@@ -12,10 +12,9 @@ import { createSignalRecorder } from "./render-signals.js";
|
|
|
12
12
|
import { isDebug } from "../debug.js";
|
|
13
13
|
import { randomUUID } from "node:crypto";
|
|
14
14
|
// src/server/rsc-entry/rsc-stream.ts
|
|
15
|
-
function renderRscStream(payload, req, renderTimeoutMs, leafDenyChain
|
|
15
|
+
function renderRscStream(payload, req, renderTimeoutMs, leafDenyChain) {
|
|
16
16
|
const recorder = createSignalRecorder();
|
|
17
17
|
const onError = (error) => {
|
|
18
|
-
if (typeof error === "object" && error !== null && "digest" in error && typeof error.digest === "string" && relayedDigests?.has(error.digest)) return error.digest;
|
|
19
18
|
if (isAbortError(error) || req.signal?.aborted) return;
|
|
20
19
|
if (isDenySignal(error)) {
|
|
21
20
|
if (!error.owners && leafDenyChain && !error._leaveSpa) {
|
|
@@ -60,11 +59,9 @@ Request: ${req.method} ${new URL(req.url).pathname}`);
|
|
|
60
59
|
rscStream: renderFlight(payload, {
|
|
61
60
|
signal: req.signal,
|
|
62
61
|
timeoutMs: renderTimeoutMs,
|
|
63
|
-
tap,
|
|
64
62
|
onError
|
|
65
63
|
}),
|
|
66
|
-
signals: recorder.signals
|
|
67
|
-
onError
|
|
64
|
+
signals: recorder.signals
|
|
68
65
|
};
|
|
69
66
|
}
|
|
70
67
|
function reportedErrorId(error, req) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rsc-stream.js","names":[],"sources":["../../../../../src/server/rsc-entry/rsc-stream.ts"],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"rsc-stream.js","names":[],"sources":["../../../../../src/server/rsc-entry/rsc-stream.ts"],"mappings":";;;;;;;;;;;;;;AAkDA,SAAgB,gBACd,SACA,KACA,iBACA,eACiB;CACjB,MAAM,WAAW,qBAAqB;CAEtC,MAAM,WAAW,UAAkC;EAGjD,IAAI,aAAa,KAAK,KAAK,IAAI,QAAQ,SAAS;EAChD,IAAI,aAAa,KAAK,GAAG;GAWvB,IAAI,CAAC,MAAM,UAAU,iBAAiB,CAAC,MAAM,WAAW;IACtD,MAAM,UAAU,iBAAiB,eAAe,MAAM,MAAM;IAC5D,IAAI,QAAQ,SAAS,GACnB,MAAM,SAAS,QAAQ,KAAK,MAAM,EAAE,QAAQ;GAEhD;GACA,SAAS,KAAK,KAAK;GACnB,OAAO,KAAK,UAAU;IACpB,MAAM;IACN,QAAQ,MAAM;IACd,MAAM,MAAM;IACZ,QAAQ,MAAM;IACd,UAAU,MAAM;GAClB,CAAC;EACH;EACA,IAAI,iBAAiB,KAAK,GAAG;GAC3B,SAAS,SAAS,KAAK;GACvB,OAAO,KAAK,UAAU;IACpB,MAAM;IACN,UAAU,MAAM;IAChB,QAAQ,MAAM;GAChB,CAAC;EACH;EAQA,IAAI,QAAQ,KAAK,iBAAiB,SAAS,MAAM,QAAQ,SAAS,mBAAmB,GACnF,QAAQ,MACN;;;;;;;WAOc,IAAI,OAAO,GAAG,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,UAC/C;EAMF,IAAI,iBAAiB,OACnB,yBAAyB,OAAO,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,QAAQ;EAU3D,SAAS,eAAe;EAqBxB,MAAM,cAAc,wBAAwB;EAC5C,MAAM,UACJ,eAAe,YAAY,UAAU,QACjC,YAAY,UACZ,gBAAgB,OAAO,GAAG;EAChC,OAAO,kBAAkB;GAAE,SAAS,mBAAmB,KAAK;GAAG;EAAQ,CAAC;CAC1E;CAQA,OAAO;EAAE,WANS,aAAa,SAAS;GACtC,QAAQ,IAAI;GACZ,WAAW;GACX;EACF,CAES;EAAW,SAAS,SAAS;CAAQ;AAChD;AAGA,SAAS,gBAAgB,OAAgB,KAAsB;CAC7D,MAAM,UAAU,WAAW;CAC3B,kBAAkB,OAAO,KAAK,EAAE,QAAQ,CAAC;CACzC,OAAO;AACT"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { readKeyValues } from "./segment-key.js";
|
|
2
|
+
// src/server/segment-lifetime/document-outlet.ts
|
|
3
|
+
async function prepareDocumentOutlet(keys, segmentPath, values) {
|
|
4
|
+
if (!keys) return void 0;
|
|
5
|
+
const claimed = keys.client?.get(segmentPath);
|
|
6
|
+
if (claimed !== void 0 && await keys.signer.verify(claimed, segmentPath, values)) return { held: claimed };
|
|
7
|
+
return { issued: await keys.signer.issue(segmentPath, values) };
|
|
8
|
+
}
|
|
9
|
+
async function documentOutletFor(render, segmentPath, lifetime, pathParams, params, urlDepth) {
|
|
10
|
+
if (!lifetime || !render.documents) return void 0;
|
|
11
|
+
const keyValues = readKeyValues(lifetime, pathParams, params);
|
|
12
|
+
return prepareDocumentOutlet(render.documents, segmentPath, urlDepth === void 0 ? keyValues : JSON.stringify([keyValues, urlDepth]));
|
|
13
|
+
}
|
|
14
|
+
function pathParamNames(segments, index) {
|
|
15
|
+
const names = [];
|
|
16
|
+
for (let i = 0; i <= index; i++) {
|
|
17
|
+
const name = segments[i]?.paramName;
|
|
18
|
+
if (name) names.push(name);
|
|
19
|
+
}
|
|
20
|
+
return names;
|
|
21
|
+
}
|
|
22
|
+
export { documentOutletFor, pathParamNames, prepareDocumentOutlet };
|
|
23
|
+
|
|
24
|
+
//# sourceMappingURL=document-outlet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"document-outlet.js","names":[],"sources":["../../../../../src/server/segment-lifetime/document-outlet.ts"],"mappings":";;AA2CA,eAAsB,sBACpB,MACA,aACA,QACqC;CACrC,IAAI,CAAC,MAAM,OAAO;CAClB,MAAM,UAAU,KAAK,QAAQ,IAAI,WAAW;CAC5C,IAAI,YAAY,UAAc,MAAM,KAAK,OAAO,OAAO,SAAS,aAAa,MAAM,GACjF,OAAO,EAAE,MAAM,QAAQ;CAEzB,OAAO,EAAE,QAAQ,MAAM,KAAK,OAAO,MAAM,aAAa,MAAM,EAAE;AAChE;AAMA,eAAsB,kBACpB,QACA,aACA,UACA,YACA,QAMA,UACqC;CACrC,IAAI,CAAC,YAAY,CAAC,OAAO,WAAW,OAAO;CAC3C,MAAM,YAAY,cAAc,UAAU,YAAY,MAAM;CAC5D,OAAO,sBACL,OAAO,WACP,aACA,aAAa,SAAY,YAAY,KAAK,UAAU,CAAC,WAAW,QAAQ,CAAC,CAC3E;AACF;AAOA,SAAgB,eACd,UACA,OACU;CACV,MAAM,QAAkB,CAAC;CACzB,KAAK,IAAI,IAAI,GAAG,KAAK,OAAO,KAAK;EAC/B,MAAM,OAAO,SAAS,EAAE,EAAE;EAC1B,IAAI,MAAM,MAAM,KAAK,IAAI;CAC3B;CACA,OAAO;AACT"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
// src/server/segment-lifetime/key-digest.ts
|
|
2
|
+
var PART_LENGTH = 22;
|
|
3
|
+
var PART_BYTES = 16;
|
|
4
|
+
var KEY_DIGEST_SHAPE = new RegExp(`^[A-Za-z0-9_-]{${PART_LENGTH}}\\.[A-Za-z0-9_-]{${PART_LENGTH}}$`);
|
|
5
|
+
var HKDF_INFO = "timber segment key digest v1";
|
|
6
|
+
function createKeyDigestSigner(secretSource) {
|
|
7
|
+
let keyPromise;
|
|
8
|
+
const macKey = () => {
|
|
9
|
+
keyPromise ??= Promise.resolve(secretSource()).then(async (secret) => {
|
|
10
|
+
const material = await crypto.subtle.importKey("raw", base64ToBytes(secret), "HKDF", false, ["deriveKey"]);
|
|
11
|
+
return crypto.subtle.deriveKey({
|
|
12
|
+
name: "HKDF",
|
|
13
|
+
hash: "SHA-256",
|
|
14
|
+
salt: new Uint8Array(0),
|
|
15
|
+
info: new TextEncoder().encode(HKDF_INFO)
|
|
16
|
+
}, material, {
|
|
17
|
+
name: "HMAC",
|
|
18
|
+
hash: "SHA-256",
|
|
19
|
+
length: 256
|
|
20
|
+
}, false, ["sign"]);
|
|
21
|
+
});
|
|
22
|
+
keyPromise.catch(() => {
|
|
23
|
+
keyPromise = void 0;
|
|
24
|
+
});
|
|
25
|
+
return keyPromise;
|
|
26
|
+
};
|
|
27
|
+
async function mac(nonce, segmentPath, values) {
|
|
28
|
+
const message = new TextEncoder().encode(JSON.stringify([segmentPath, values]));
|
|
29
|
+
const input = new Uint8Array(nonce.byteLength + message.byteLength);
|
|
30
|
+
input.set(nonce, 0);
|
|
31
|
+
input.set(message, nonce.byteLength);
|
|
32
|
+
const signature = await crypto.subtle.sign("HMAC", await macKey(), input);
|
|
33
|
+
return new Uint8Array(signature, 0, PART_BYTES);
|
|
34
|
+
}
|
|
35
|
+
return {
|
|
36
|
+
async issue(segmentPath, values) {
|
|
37
|
+
const nonce = crypto.getRandomValues(new Uint8Array(PART_BYTES));
|
|
38
|
+
const tag = await mac(nonce, segmentPath, values);
|
|
39
|
+
return `${bytesToBase64Url(nonce)}.${bytesToBase64Url(tag)}`;
|
|
40
|
+
},
|
|
41
|
+
async verify(token, segmentPath, values) {
|
|
42
|
+
if (!KEY_DIGEST_SHAPE.test(token)) return false;
|
|
43
|
+
const [noncePart, tagPart] = token.split(".");
|
|
44
|
+
const nonce = base64UrlToBytes(noncePart);
|
|
45
|
+
const claimed = base64UrlToBytes(tagPart);
|
|
46
|
+
if (nonce.byteLength !== PART_BYTES || claimed.byteLength !== PART_BYTES) return false;
|
|
47
|
+
return constantTimeEqual(await mac(nonce, segmentPath, values), claimed);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
function constantTimeEqual(a, b) {
|
|
52
|
+
if (a.byteLength !== b.byteLength) return false;
|
|
53
|
+
let diff = 0;
|
|
54
|
+
for (let i = 0; i < a.byteLength; i++) diff |= a[i] ^ b[i];
|
|
55
|
+
return diff === 0;
|
|
56
|
+
}
|
|
57
|
+
function base64ToBytes(base64) {
|
|
58
|
+
const binary = atob(base64);
|
|
59
|
+
const bytes = new Uint8Array(binary.length);
|
|
60
|
+
for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
|
|
61
|
+
return bytes;
|
|
62
|
+
}
|
|
63
|
+
function base64UrlToBytes(value) {
|
|
64
|
+
const base64 = value.replace(/-/g, "+").replace(/_/g, "/");
|
|
65
|
+
return base64ToBytes(base64 + "=".repeat((4 - base64.length % 4) % 4));
|
|
66
|
+
}
|
|
67
|
+
function bytesToBase64Url(bytes) {
|
|
68
|
+
let binary = "";
|
|
69
|
+
for (const byte of bytes) binary += String.fromCharCode(byte);
|
|
70
|
+
return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
|
|
71
|
+
}
|
|
72
|
+
export { KEY_DIGEST_SHAPE, createKeyDigestSigner };
|
|
73
|
+
|
|
74
|
+
//# sourceMappingURL=key-digest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"key-digest.js","names":[],"sources":["../../../../../src/server/segment-lifetime/key-digest.ts"],"mappings":";AAgCA,IAAM,cAAc;AACpB,IAAM,aAAa;AAGnB,IAAa,mBAAmB,IAAI,OAClC,kBAAkB,YAAY,oBAAoB,YAAY,GAChE;AAGA,IAAM,YAAY;AAelB,SAAgB,sBACd,cACiB;CACjB,IAAI;CACJ,MAAM,eAAmC;EAGvC,eAAe,QAAQ,QAAQ,aAAa,CAAC,CAAC,CAAC,KAAK,OAAO,WAAW;GACpE,MAAM,WAAW,MAAM,OAAO,OAAO,UAAU,OAAO,cAAc,MAAM,GAAG,QAAQ,OAAO,CAC1F,WACF,CAAC;GACD,OAAO,OAAO,OAAO,UACnB;IACE,MAAM;IACN,MAAM;IACN,MAAM,IAAI,WAAW,CAAC;IACtB,MAAM,IAAI,YAAY,CAAC,CAAC,OAAO,SAAS;GAC1C,GACA,UACA;IAAE,MAAM;IAAQ,MAAM;IAAW,QAAQ;GAAI,GAC7C,OACA,CAAC,MAAM,CACT;EACF,CAAC;EACD,WAAW,YAAY;GACrB,aAAa;EACf,CAAC;EACD,OAAO;CACT;CAEA,eAAe,IAAI,OAAmB,aAAqB,QAAqC;EAG9F,MAAM,UAAU,IAAI,YAAY,CAAC,CAAC,OAAO,KAAK,UAAU,CAAC,aAAa,MAAM,CAAC,CAAC;EAC9E,MAAM,QAAQ,IAAI,WAAW,MAAM,aAAa,QAAQ,UAAU;EAClE,MAAM,IAAI,OAAO,CAAC;EAClB,MAAM,IAAI,SAAS,MAAM,UAAU;EACnC,MAAM,YAAY,MAAM,OAAO,OAAO,KAAK,QAAQ,MAAM,OAAO,GAAG,KAAK;EACxE,OAAO,IAAI,WAAW,WAAW,GAAG,UAAU;CAChD;CAEA,OAAO;EACL,MAAM,MAAM,aAAa,QAAQ;GAC/B,MAAM,QAAQ,OAAO,gBAAgB,IAAI,WAAW,UAAU,CAAC;GAC/D,MAAM,MAAM,MAAM,IAAI,OAAO,aAAa,MAAM;GAChD,OAAO,GAAG,iBAAiB,KAAK,EAAE,GAAG,iBAAiB,GAAG;EAC3D;EACA,MAAM,OAAO,OAAO,aAAa,QAAQ;GACvC,IAAI,CAAC,iBAAiB,KAAK,KAAK,GAAG,OAAO;GAC1C,MAAM,CAAC,WAAW,WAAW,MAAM,MAAM,GAAG;GAC5C,MAAM,QAAQ,iBAAiB,SAAS;GACxC,MAAM,UAAU,iBAAiB,OAAO;GACxC,IAAI,MAAM,eAAe,cAAc,QAAQ,eAAe,YAAY,OAAO;GACjF,OAAO,kBAAkB,MAAM,IAAI,OAAO,aAAa,MAAM,GAAG,OAAO;EACzE;CACF;AACF;AAGA,SAAS,kBAAkB,GAAe,GAAwB;CAChE,IAAI,EAAE,eAAe,EAAE,YAAY,OAAO;CAC1C,IAAI,OAAO;CACX,KAAK,IAAI,IAAI,GAAG,IAAI,EAAE,YAAY,KAAK,QAAQ,EAAE,KAAK,EAAE;CACxD,OAAO,SAAS;AAClB;AAEA,SAAS,cAAc,QAAyC;CAC9D,MAAM,SAAS,KAAK,MAAM;CAC1B,MAAM,QAAQ,IAAI,WAAW,OAAO,MAAM;CAC1C,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK,MAAM,KAAK,OAAO,WAAW,CAAC;CACtE,OAAO;AACT;AAEA,SAAS,iBAAiB,OAA2B;CACnD,MAAM,SAAS,MAAM,QAAQ,MAAM,GAAG,CAAC,CAAC,QAAQ,MAAM,GAAG;CACzD,OAAO,cAAc,SAAS,IAAI,QAAQ,IAAK,OAAO,SAAS,KAAM,CAAC,CAAC;AACzE;AAEA,SAAS,iBAAiB,OAA2B;CACnD,IAAI,SAAS;CACb,KAAK,MAAM,QAAQ,OAAO,UAAU,OAAO,aAAa,IAAI;CAC5D,OAAO,KAAK,MAAM,CAAC,CAAC,QAAQ,OAAO,GAAG,CAAC,CAAC,QAAQ,OAAO,GAAG,CAAC,CAAC,QAAQ,OAAO,EAAE;AAC/E"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { clientComponents } from "../vite-handoff-rsc.js";
|
|
2
|
+
import { createElement } from "../../_react/react.js";
|
|
3
|
+
// src/server/segment-lifetime/outlet-gate.ts
|
|
4
|
+
var LIVE_ONLY_RENDER = {
|
|
5
|
+
documents: null,
|
|
6
|
+
defaultLayoutLifetime: "request"
|
|
7
|
+
};
|
|
8
|
+
function outletGate(spec) {
|
|
9
|
+
function OutletGate() {
|
|
10
|
+
const { SegmentOutlet } = clientComponents();
|
|
11
|
+
return createElement(SegmentOutlet, {
|
|
12
|
+
segmentPath: spec.segmentPath,
|
|
13
|
+
decision: decide(spec)
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
OUTLET_GATES.add(OutletGate);
|
|
17
|
+
return createElement(OutletGate);
|
|
18
|
+
}
|
|
19
|
+
var OUTLET_GATES = new WeakSet();
|
|
20
|
+
function isOutletGateElement(node) {
|
|
21
|
+
if (typeof node !== "object" || node === null || !("type" in node)) return false;
|
|
22
|
+
const type = node.type;
|
|
23
|
+
return typeof type === "function" && OUTLET_GATES.has(type);
|
|
24
|
+
}
|
|
25
|
+
function decide(spec) {
|
|
26
|
+
if (!spec.document) return { children: spec.content };
|
|
27
|
+
if ("issued" in spec.document) return {
|
|
28
|
+
children: spec.content,
|
|
29
|
+
digest: spec.document.issued
|
|
30
|
+
};
|
|
31
|
+
return documentSkip(spec, spec.document.held);
|
|
32
|
+
}
|
|
33
|
+
function documentSkip(spec, digest) {
|
|
34
|
+
const outlets = {};
|
|
35
|
+
for (const nested of spec.nested) outlets[nested.segmentPath] = decide(nested);
|
|
36
|
+
return {
|
|
37
|
+
skip: true,
|
|
38
|
+
digest,
|
|
39
|
+
outlets
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
export { LIVE_ONLY_RENDER, isOutletGateElement, outletGate };
|
|
43
|
+
|
|
44
|
+
//# sourceMappingURL=outlet-gate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"outlet-gate.js","names":[],"sources":["../../../../../src/server/segment-lifetime/outlet-gate.ts"],"mappings":";;;AA8CA,IAAa,mBAAkC;CAC7C,WAAW;CACX,uBAAuB;AACzB;AAUA,SAAgB,WAAW,MAAgC;CACzD,SAAS,aAA2B;EAClC,MAAM,EAAE,kBAAkB,iBAAiB;EAC3C,OAAO,cAAc,eAAe;GAAE,aAAa,KAAK;GAAa,UAAU,OAAO,IAAI;EAAE,CAAC;CAC/F;CACA,aAAa,IAAI,UAAU;CAC3B,OAAO,cAAc,UAAU;AACjC;AAGA,IAAM,eAAe,IAAI,QAAgB;AAQzC,SAAgB,oBAAoB,MAAwB;CAC1D,IAAI,OAAO,SAAS,YAAY,SAAS,QAAQ,EAAE,UAAU,OAAO,OAAO;CAC3E,MAAM,OAAQ,KAA2B;CACzC,OAAO,OAAO,SAAS,cAAc,aAAa,IAAI,IAAI;AAC5D;AAEA,SAAS,OAAO,MAAkC;CAChD,IAAI,CAAC,KAAK,UAAU,OAAO,EAAE,UAAU,KAAK,QAAQ;CACpD,IAAI,YAAY,KAAK,UAAU,OAAO;EAAE,UAAU,KAAK;EAAS,QAAQ,KAAK,SAAS;CAAO;CAC7F,OAAO,aAAa,MAAM,KAAK,SAAS,IAAI;AAC9C;AAUA,SAAS,aAAa,MAAkB,QAAgC;CACtE,MAAM,UAA0C,CAAC;CACjD,KAAK,MAAM,UAAU,KAAK,QAAQ,QAAQ,OAAO,eAAe,OAAO,MAAM;CAC7E,OAAO;EAAE,MAAM;EAAM;EAAQ;CAAQ;AACvC"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { documentReadScopeAls } from "../als-registry.js";
|
|
2
|
+
import { isUnkeyableHeader } from "../../shared/key-headers.js";
|
|
3
|
+
// src/server/segment-lifetime/read-rule.ts
|
|
4
|
+
function currentReadScope() {
|
|
5
|
+
return documentReadScopeAls.getStore();
|
|
6
|
+
}
|
|
7
|
+
function readOutsideKey(scope, what, part, fixOverride) {
|
|
8
|
+
const fix = fixOverride ?? (part ? `Add it to key.${part}, or declare lifetime: 'request'.` : "A 'document' segment cannot depend on it; declare lifetime: 'request'.");
|
|
9
|
+
return new Error(`[timber] ${scope.segmentPath} is lifetime: 'document' (declared, or from defaultLayoutLifetime) and read ${what}, which is not in its key. ${fix} The segment is skipped without rendering while its key is unchanged, so the read would freeze at its first value. See design/53-segment-lifetime.md §"What a 'document' segment may read".`);
|
|
10
|
+
}
|
|
11
|
+
function keyedHeaders(headers, scope) {
|
|
12
|
+
const keyed = (name) => {
|
|
13
|
+
if (scope.headers.has(name.toLowerCase())) return name;
|
|
14
|
+
const what = `the header "${name}"`;
|
|
15
|
+
if (name.toLowerCase() === "cookie") throw readOutsideKey(scope, what, "cookies", "Read cookies through a cookie definition in key.cookies.");
|
|
16
|
+
if (isUnkeyableHeader(name)) throw readOutsideKey(scope, what, void 0, "A key may not name a credential; declare lifetime: 'request'.");
|
|
17
|
+
throw readOutsideKey(scope, what, "headers");
|
|
18
|
+
};
|
|
19
|
+
const all = () => {
|
|
20
|
+
throw readOutsideKey(scope, "every request header", void 0, "Read each header you need with getHeaders().get(name) and add it to key.headers, or declare lifetime: 'request'.");
|
|
21
|
+
};
|
|
22
|
+
return {
|
|
23
|
+
get: (name) => headers.get(keyed(name)),
|
|
24
|
+
has: (name) => headers.has(keyed(name)),
|
|
25
|
+
entries: all,
|
|
26
|
+
keys: all,
|
|
27
|
+
values: all,
|
|
28
|
+
forEach: all,
|
|
29
|
+
[Symbol.iterator]: all
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
function assertUnscopedRead(what) {
|
|
33
|
+
const scope = currentReadScope();
|
|
34
|
+
if (scope) throw readOutsideKey(scope, what);
|
|
35
|
+
}
|
|
36
|
+
function assertSearchParamsRead(reader) {
|
|
37
|
+
const scope = currentReadScope();
|
|
38
|
+
if (!scope) return;
|
|
39
|
+
const outside = Object.keys(reader.codecs).filter((field) => {
|
|
40
|
+
const keyed = scope.searchParams.get(field);
|
|
41
|
+
return !keyed || keyed.codec !== reader.codecs[field] || keyed.urlKey !== (reader.urlKeys[field] ?? field);
|
|
42
|
+
});
|
|
43
|
+
if (outside.length > 0) throw readOutsideKey(scope, `the search params ${outside.join(", ")}`, "searchParams");
|
|
44
|
+
}
|
|
45
|
+
function assertCookieRead(name, codec) {
|
|
46
|
+
const scope = currentReadScope();
|
|
47
|
+
if (!scope) return;
|
|
48
|
+
if (!scope.cookies.has(name)) throw readOutsideKey(scope, `the cookie "${name}"`, "cookies");
|
|
49
|
+
if (codec === void 0 || scope.cookies.get(name) !== codec) throw readOutsideKey(scope, `the raw value of the cookie "${name}" (read it through the definition in its key)`, "cookies");
|
|
50
|
+
}
|
|
51
|
+
var OBJECT_PROBES = new Set([
|
|
52
|
+
"then",
|
|
53
|
+
"toJSON",
|
|
54
|
+
"$$typeof",
|
|
55
|
+
"constructor",
|
|
56
|
+
"valueOf",
|
|
57
|
+
"toString",
|
|
58
|
+
"__proto__"
|
|
59
|
+
]);
|
|
60
|
+
function scopedParams(params) {
|
|
61
|
+
const scope = currentReadScope();
|
|
62
|
+
if (!scope) return params;
|
|
63
|
+
const refused = (name) => typeof name === "string" && !scope.params.has(name) && !OBJECT_PROBES.has(name);
|
|
64
|
+
const allowed = (name) => !refused(name);
|
|
65
|
+
const target = Object.assign(Object.create(Object.getPrototypeOf(params)), params);
|
|
66
|
+
return new Proxy(target, {
|
|
67
|
+
get(target, name, receiver) {
|
|
68
|
+
if (refused(name)) throw readOutsideKey(scope, `the segment param "${String(name)}"`, "segmentParams");
|
|
69
|
+
return Reflect.get(target, name, receiver);
|
|
70
|
+
},
|
|
71
|
+
has: (target, name) => allowed(name) && Reflect.has(target, name),
|
|
72
|
+
ownKeys: (target) => Reflect.ownKeys(target).filter(allowed),
|
|
73
|
+
getOwnPropertyDescriptor: (target, name) => allowed(name) ? Reflect.getOwnPropertyDescriptor(target, name) : void 0
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
export { assertCookieRead, assertSearchParamsRead, assertUnscopedRead, currentReadScope, keyedHeaders, readOutsideKey, scopedParams };
|
|
77
|
+
|
|
78
|
+
//# sourceMappingURL=read-rule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read-rule.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-rule.ts"],"mappings":"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"}
|