@timber-js/app 0.2.0-alpha.241 → 0.2.0-alpha.243
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-BCYVyoFl.js → actions-DoTj0Jd3.js} +78 -32
- package/dist/_chunks/actions-DoTj0Jd3.js.map +1 -0
- package/dist/_chunks/{als-registry-fabsRnPY.js → als-registry-C-iwbtvI.js} +1 -2
- package/dist/_chunks/{als-registry-fabsRnPY.js.map → als-registry-C-iwbtvI.js.map} +1 -1
- package/dist/_chunks/{cache-api-n5FL4wFs.js → cache-api-D3HmgsFh.js} +5 -5
- package/dist/_chunks/{cache-api-n5FL4wFs.js.map → cache-api-D3HmgsFh.js.map} +1 -1
- package/dist/_chunks/{chains-IswOWMnq.js → chains-BpvDwp08.js} +2 -2
- package/dist/_chunks/{chains-IswOWMnq.js.map → chains-BpvDwp08.js.map} +1 -1
- package/dist/_chunks/chains-CjlZZ5ad.js +1 -0
- package/dist/_chunks/{classify-B08RCF6s.js → classify-Bbb_lKjH.js} +2 -2
- package/dist/_chunks/{classify-B08RCF6s.js.map → classify-Bbb_lKjH.js.map} +1 -1
- package/dist/_chunks/{cli-check-tpFb6pBU.js → cli-check-DlQBSKIN.js} +3 -3
- package/dist/_chunks/{cli-check-tpFb6pBU.js.map → cli-check-DlQBSKIN.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-DRNJutey.js → cli-schema-sync-CWkGFlYu.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-DRNJutey.js.map → cli-schema-sync-CWkGFlYu.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-C0pXBtzG.js → cli-schema-sync-Dyvdkv_I.js} +1 -1
- package/dist/_chunks/{client-dep-entries-Dw5Dvatr.js → client-dep-entries-Dka67elj.js} +2 -2
- package/dist/_chunks/{client-dep-entries-Dw5Dvatr.js.map → client-dep-entries-Dka67elj.js.map} +1 -1
- package/dist/_chunks/{convention-lint-BfC_dAhZ.js → convention-lint-CGGcseNn.js} +19 -5
- package/dist/_chunks/convention-lint-CGGcseNn.js.map +1 -0
- package/dist/_chunks/dev-server-DrjLscqT.js +1 -0
- package/dist/_chunks/{dev-server-3R6Bl9_R.js → dev-server-LO4McfQi.js} +3 -4
- package/dist/_chunks/dev-server-LO4McfQi.js.map +1 -0
- package/dist/_chunks/{error-boundary-Dfhxigko.js → error-boundary-wuNvAJ4n.js} +8 -15
- package/dist/_chunks/error-boundary-wuNvAJ4n.js.map +1 -0
- package/dist/_chunks/{flight-source-node-QOpWZATb.js → flight-source-node-BeF00Wo_.js} +4 -7
- package/dist/_chunks/flight-source-node-BeF00Wo_.js.map +1 -0
- package/dist/_chunks/{interception-CtNt9jPt.js → interception-D1dCGNmQ.js} +6 -6
- package/dist/_chunks/{interception-CtNt9jPt.js.map → interception-D1dCGNmQ.js.map} +1 -1
- package/dist/_chunks/{json-lossy-check-5KFcC1yt.js → json-lossy-check-DpXneTBm.js} +2 -2
- package/dist/_chunks/{json-lossy-check-5KFcC1yt.js.map → json-lossy-check-DpXneTBm.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-D1dfVqoT.js → live-graph-DXhz6A_X.js} +4 -4
- package/dist/_chunks/{live-graph-D1dfVqoT.js.map → live-graph-DXhz6A_X.js.map} +1 -1
- package/dist/_chunks/{logger-BvGxPd1e.js → logger-D1sWX2I0.js} +18 -3
- package/dist/_chunks/logger-D1sWX2I0.js.map +1 -0
- package/dist/_chunks/metadata-routes-MXNjWOt5.js.map +1 -1
- package/dist/_chunks/{node-response-D5cfiyWP.js → node-response-Cp62CtH1.js} +2 -2
- package/dist/_chunks/{node-response-D5cfiyWP.js.map → node-response-Cp62CtH1.js.map} +1 -1
- package/dist/_chunks/{poison-scan-CX02ilxN.js → poison-scan-DdkJoHvP.js} +2 -2
- package/dist/_chunks/{poison-scan-CX02ilxN.js.map → poison-scan-DdkJoHvP.js.map} +1 -1
- package/dist/_chunks/{scanner-DneYxQoY.js → scanner-B6V2RqqF.js} +20 -3
- package/dist/_chunks/scanner-B6V2RqqF.js.map +1 -0
- package/dist/_chunks/{sizeof-BtQ3ErLf.js → sizeof-BKA6qOZq.js} +2 -2
- package/dist/_chunks/{sizeof-BtQ3ErLf.js.map → sizeof-BKA6qOZq.js.map} +1 -1
- package/dist/_chunks/{walkers-C9R2A4jN.js → walkers-BAZoAlfI.js} +3 -3
- package/dist/_chunks/{walkers-C9R2A4jN.js.map → walkers-BAZoAlfI.js.map} +1 -1
- package/dist/adapters/cloudflare-kv-cache.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.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/document-withdrawal.d.ts +2 -0
- package/dist/client/document-withdrawal.d.ts.map +1 -0
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/index.js +1 -1
- package/dist/client/index.js.map +1 -1
- package/dist/client/internal.js +3 -5
- package/dist/client/internal.js.map +1 -1
- package/dist/client/navigation-commit.d.ts +0 -7
- package/dist/client/navigation-commit.d.ts.map +1 -1
- package/dist/client/outlet-content-cache.d.ts +28 -42
- package/dist/client/outlet-content-cache.d.ts.map +1 -1
- package/dist/client/outlet-scope-context.d.ts +9 -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 -15
- 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 +2 -18
- package/dist/config-types.d.ts.map +1 -1
- package/dist/config-validation.d.ts.map +1 -1
- package/dist/index.js +7 -8
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/manifest.json +3 -4
- package/dist/native/rsc/routing/segment-keys.js.map +1 -1
- package/dist/native/rsc/server/als-registry.js +1 -2
- package/dist/native/rsc/server/als-registry.js.map +1 -1
- package/dist/native/rsc/server/client-state-tree.js +1 -5
- package/dist/native/rsc/server/client-state-tree.js.map +1 -1
- package/dist/native/rsc/server/cookie-context.js +7 -7
- package/dist/native/rsc/server/cookie-context.js.map +1 -1
- package/dist/native/rsc/server/deny-boundary.js +2 -1
- package/dist/native/rsc/server/deny-boundary.js.map +1 -1
- package/dist/native/rsc/server/dev-overlay-report.js +13 -0
- package/dist/native/rsc/server/dev-overlay-report.js.map +1 -0
- 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 +6 -41
- package/dist/native/rsc/server/flight-source.js.map +1 -1
- package/dist/native/rsc/server/framework-stack-frames.js.map +1 -1
- package/dist/native/rsc/server/logger.js +6 -1
- package/dist/native/rsc/server/logger.js.map +1 -1
- package/dist/native/rsc/server/pipeline-interception.js +4 -1
- package/dist/native/rsc/server/pipeline-interception.js.map +1 -1
- package/dist/native/rsc/server/pipeline.js.map +1 -1
- package/dist/native/rsc/server/request-context.js +6 -6
- package/dist/native/rsc/server/request-context.js.map +1 -1
- package/dist/native/rsc/server/route-element-builder.js +5 -5
- package/dist/native/rsc/server/route-element-builder.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +4 -30
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +0 -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/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 +45 -12
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-scope.js +50 -8
- package/dist/native/rsc/server/segment-lifetime/read-scope.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/segment-key.js +17 -3
- package/dist/native/rsc/server/segment-lifetime/segment-key.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js +4 -4
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js.map +1 -1
- package/dist/native/rsc/server/slot-resolver.js +8 -7
- package/dist/native/rsc/server/slot-resolver.js.map +1 -1
- package/dist/native/rsc/server/slot-subtree-contain.js +2 -1
- package/dist/native/rsc/server/slot-subtree-contain.js.map +1 -1
- package/dist/native/rsc/server/subtree-walk.js +14 -5
- package/dist/native/rsc/server/subtree-walk.js.map +1 -1
- package/dist/native/rsc/server/vite-handoff-rsc.js.map +1 -1
- 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/ssr/client/document-withdrawal.js +17 -0
- package/dist/native/ssr/client/document-withdrawal.js.map +1 -0
- package/dist/native/ssr/client/outlet-content-cache.js +10 -25
- 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 +17 -21
- package/dist/native/ssr/client/segment-outlet.js.map +1 -1
- package/dist/native/ssr/manifest.json +6 -1
- package/dist/native/ssr/server/als-registry.js +0 -1
- package/dist/native/ssr/server/als-registry.js.map +1 -1
- package/dist/native/ssr/server/client-state-tree.js +1 -5
- package/dist/native/ssr/server/client-state-tree.js.map +1 -1
- package/dist/native/ssr/server/cookie-context.js +7 -7
- package/dist/native/ssr/server/cookie-context.js.map +1 -1
- package/dist/native/ssr/server/deny-boundary.js +2 -1
- package/dist/native/ssr/server/deny-boundary.js.map +1 -1
- package/dist/native/ssr/server/dev-overlay-report.js +6 -0
- package/dist/native/ssr/server/dev-overlay-report.js.map +1 -0
- 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 +0 -1
- package/dist/native/ssr/server/flight-source.js.map +1 -1
- package/dist/native/ssr/server/framework-stack-frames.js.map +1 -1
- package/dist/native/ssr/server/logger.js +6 -1
- package/dist/native/ssr/server/logger.js.map +1 -1
- package/dist/native/ssr/server/pipeline-interception.js +4 -1
- package/dist/native/ssr/server/pipeline-interception.js.map +1 -1
- package/dist/native/ssr/server/pipeline.js.map +1 -1
- package/dist/native/ssr/server/request-context.js +6 -6
- package/dist/native/ssr/server/request-context.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js +11 -0
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js.map +1 -0
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +45 -12
- package/dist/native/ssr/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/read-scope.js +16 -0
- package/dist/native/ssr/server/segment-lifetime/read-scope.js.map +1 -0
- package/dist/native/ssr/server/subtree-walk.js +149 -0
- package/dist/native/ssr/server/subtree-walk.js.map +1 -0
- package/dist/native/ssr/server/utils/element-type.js +21 -9
- package/dist/native/ssr/server/utils/element-type.js.map +1 -1
- package/dist/native/ssr/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/ssr/shared/key-headers.js +13 -0
- package/dist/native/ssr/shared/key-headers.js.map +1 -0
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/routing/index.js +3 -3
- package/dist/routing/route-options.d.ts.map +1 -1
- package/dist/routing/segment-keys.d.ts +3 -4
- package/dist/routing/segment-keys.d.ts.map +1 -1
- package/dist/routing/slot-placement.d.ts +23 -4
- package/dist/routing/slot-placement.d.ts.map +1 -1
- package/dist/server/als-registry.d.ts +20 -16
- package/dist/server/als-registry.d.ts.map +1 -1
- package/dist/server/client-state-tree.d.ts +5 -11
- package/dist/server/client-state-tree.d.ts.map +1 -1
- package/dist/server/deny-boundary.d.ts.map +1 -1
- package/dist/server/dev-overlay-report.d.ts +13 -0
- package/dist/server/dev-overlay-report.d.ts.map +1 -0
- 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 +0 -27
- package/dist/server/flight-source.d.ts.map +1 -1
- package/dist/server/framework-stack-frames.d.ts +1 -4
- package/dist/server/framework-stack-frames.d.ts.map +1 -1
- package/dist/server/index.js +2 -2
- package/dist/server/internal.js +105 -26
- package/dist/server/internal.js.map +1 -1
- package/dist/server/logger.d.ts +10 -0
- package/dist/server/logger.d.ts.map +1 -1
- package/dist/server/pipeline-interception.d.ts.map +1 -1
- package/dist/server/pipeline.d.ts +13 -1
- package/dist/server/pipeline.d.ts.map +1 -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/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 +0 -1
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- 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/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 +19 -13
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-scope.d.ts +48 -6
- package/dist/server/segment-lifetime/read-scope.d.ts.map +1 -1
- package/dist/server/segment-lifetime/segment-key.d.ts +3 -0
- package/dist/server/segment-lifetime/segment-key.d.ts.map +1 -1
- package/dist/server/segment-lifetime/slot-outlets.d.ts +3 -3
- package/dist/server/segment-lifetime/slot-outlets.d.ts.map +1 -1
- package/dist/server/slot-resolver.d.ts +5 -5
- package/dist/server/slot-resolver.d.ts.map +1 -1
- package/dist/server/slot-subtree-contain.d.ts.map +1 -1
- package/dist/server/subtree-walk.d.ts +17 -3
- package/dist/server/subtree-walk.d.ts.map +1 -1
- package/dist/server/types.d.ts +8 -2
- package/dist/server/types.d.ts.map +1 -1
- package/dist/server/vite-handoff-rsc.d.ts +3 -10
- package/dist/server/vite-handoff-rsc.d.ts.map +1 -1
- 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 +13 -44
- package/dist/shared/outlet-decision.d.ts.map +1 -1
- package/dist/shared/payload-root.d.ts +1 -1
- package/dist/shared/segment-info.d.ts +3 -7
- package/dist/shared/segment-info.d.ts.map +1 -1
- package/docs/api/30-api-server.mdx +1 -1
- package/docs/api/34-api-config.mdx +1 -1
- package/package.json +1 -1
- package/src/client/browser-entry/index.ts +0 -2
- package/src/client/browser-entry/router-init.ts +2 -4
- package/src/client/document-withdrawal.tsx +41 -0
- package/src/client/error-boundary.tsx +1 -1
- package/src/client/navigation-commit.ts +4 -18
- package/src/client/outlet-content-cache.ts +38 -60
- package/src/client/outlet-scope-context.ts +10 -5
- package/src/client/params-context.ts +1 -1
- package/src/client/router-types.ts +3 -14
- package/src/client/router.ts +0 -2
- package/src/client/rsc-fetch.ts +1 -1
- package/src/client/segment-cache.ts +2 -2
- package/src/client/segment-outlet.tsx +28 -54
- package/src/client/stale-segment.ts +2 -2
- package/src/config-types.ts +2 -18
- package/src/config-validation.ts +0 -1
- package/src/plugins/entries.ts +0 -1
- package/src/routing/interception.ts +5 -5
- package/src/routing/route-options.ts +20 -4
- package/src/routing/scanner.ts +1 -1
- package/src/routing/segment-keys.ts +3 -4
- package/src/routing/slot-placement.ts +41 -4
- package/src/rsc-runtime/vendor-types.d.ts +1 -1
- package/src/server/als-registry.ts +16 -23
- package/src/server/client-state-tree.ts +7 -18
- package/src/server/cookie-context.ts +7 -7
- package/src/server/deny-boundary.ts +4 -1
- package/src/server/dev-overlay-report.ts +22 -0
- package/src/server/flight-source-node.ts +1 -5
- package/src/server/flight-source.ts +1 -81
- package/src/server/framework-stack-frames.ts +1 -4
- package/src/server/logger.ts +13 -0
- package/src/server/pipeline-interception.ts +11 -2
- package/src/server/pipeline.ts +13 -1
- package/src/server/request-context.ts +12 -11
- package/src/server/route-element-builder.ts +15 -16
- package/src/server/rsc-entry/helpers.ts +1 -1
- package/src/server/rsc-entry/index.ts +7 -3
- package/src/server/rsc-entry/render-route.ts +7 -54
- package/src/server/rsc-entry/revalidate-renderer.ts +0 -2
- package/src/server/rsc-entry/rsc-stream.ts +3 -23
- package/src/server/segment-lifetime/outlet-gate.ts +102 -0
- package/src/server/segment-lifetime/read-rule.ts +110 -22
- package/src/server/segment-lifetime/read-scope.ts +131 -15
- package/src/server/segment-lifetime/segment-key.ts +31 -3
- package/src/server/segment-lifetime/slot-outlets.ts +6 -6
- package/src/server/slot-resolver.ts +30 -18
- package/src/server/slot-subtree-contain.ts +2 -1
- package/src/server/subtree-walk.ts +34 -9
- package/src/server/types.ts +8 -2
- package/src/server/vite-handoff-rsc.ts +3 -12
- package/src/shared/key-headers.ts +42 -0
- package/src/shared/outlet-decision.ts +13 -48
- package/src/shared/payload-root.ts +1 -1
- package/src/shared/segment-info.ts +3 -7
- package/dist/_chunks/actions-BCYVyoFl.js.map +0 -1
- package/dist/_chunks/chains-DPZAMMav.js +0 -1
- package/dist/_chunks/convention-lint-BfC_dAhZ.js.map +0 -1
- package/dist/_chunks/dev-server-3DNTXQV-.js +0 -1
- package/dist/_chunks/dev-server-3R6Bl9_R.js.map +0 -1
- package/dist/_chunks/error-boundary-Dfhxigko.js.map +0 -1
- package/dist/_chunks/flight-source-node-QOpWZATb.js.map +0 -1
- package/dist/_chunks/logger-BvGxPd1e.js.map +0 -1
- package/dist/_chunks/scanner-DneYxQoY.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 -101
- 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 -93
- 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 -229
- package/src/server/segment-hash/stream-tap.ts +0 -244
- package/src/server/segment-hash/value-hash.ts +0 -338
|
@@ -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,36 +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 hashing = deps.clientSegmentCache && !clientJsDisabled;
|
|
23
|
-
const tap = hashing ? createSegmentHashTap({
|
|
24
|
-
timeoutMs: deps.renderTimeoutMs,
|
|
25
|
-
isOutlet: isOutletType,
|
|
26
|
-
decode: (stream) => createFromReadableStream(stream)
|
|
27
|
-
}) : null;
|
|
28
|
-
const relayedDigests = new Set();
|
|
29
|
-
let mainOnError = null;
|
|
30
19
|
const clientState = isRscRequest(req) ? parseClientStateTree(req) : null;
|
|
31
20
|
const signer = clientJsDisabled ? null : deps.keyDigestSigner;
|
|
32
|
-
const
|
|
33
|
-
clientHashes: hashing ? clientState?.hashes ?? null : null,
|
|
21
|
+
const segmentRender = {
|
|
34
22
|
documents: signer ? {
|
|
35
23
|
client: clientState?.documents ?? null,
|
|
36
24
|
signer
|
|
37
25
|
} : null,
|
|
38
|
-
defaultLayoutLifetime: deps.defaultLayoutLifetime
|
|
39
|
-
tap,
|
|
40
|
-
captureTimeoutMs: deps.renderTimeoutMs,
|
|
41
|
-
signal: req.signal,
|
|
42
|
-
onCaptureError(error) {
|
|
43
|
-
const digest = mainOnError?.(error);
|
|
44
|
-
if (typeof digest === "string") relayedDigests.add(digest);
|
|
45
|
-
return digest;
|
|
46
|
-
}
|
|
26
|
+
defaultLayoutLifetime: deps.defaultLayoutLifetime
|
|
47
27
|
};
|
|
48
28
|
let routeResult;
|
|
49
29
|
const _buildStart = performance.now();
|
|
50
30
|
try {
|
|
51
|
-
routeResult = await buildRouteElement(req, match, interception,
|
|
31
|
+
routeResult = await buildRouteElement(req, match, interception, segmentRender, buildManifest.metadataRouteHashes);
|
|
52
32
|
} catch (error) {
|
|
53
33
|
if (error instanceof NoPageComponentError) {
|
|
54
34
|
if (process.env.NODE_ENV !== "production") console.warn(`[timber] ${error.message}`);
|
|
@@ -73,13 +53,7 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
73
53
|
if (preloadUrls.length > 0) headHtml += buildModulepreloadTags(preloadUrls);
|
|
74
54
|
}
|
|
75
55
|
const _rscStart = performance.now();
|
|
76
|
-
const { rscStream, signals
|
|
77
|
-
if (tap) {
|
|
78
|
-
mainOnError = onError;
|
|
79
|
-
tap.onEnd(() => {
|
|
80
|
-
mainOnError = null;
|
|
81
|
-
});
|
|
82
|
-
}
|
|
56
|
+
const { rscStream, signals } = renderRscStream(payload, req, deps.renderTimeoutMs, leafDenyChain);
|
|
83
57
|
recordTiming({
|
|
84
58
|
name: "rsc-init",
|
|
85
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
|
|
@@ -119,7 +118,6 @@ function createRevalidateRendererFactory(deps) {
|
|
|
119
118
|
if (overlay) applyRequestHeaderOverlay(overlay);
|
|
120
119
|
return {
|
|
121
120
|
payload: (await buildRouteElement(revalidateReq, match, void 0, {
|
|
122
|
-
...NO_SEGMENT_HASHING,
|
|
123
121
|
documents: deps.keyDigestSigner ? {
|
|
124
122
|
client: null,
|
|
125
123
|
signer: deps.keyDigestSigner
|
|
@@ -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,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"}
|
|
@@ -1,30 +1,63 @@
|
|
|
1
1
|
import { documentReadScopeAls } from "../als-registry.js";
|
|
2
|
+
import { isUnkeyableHeader } from "../../shared/key-headers.js";
|
|
3
|
+
import { logDocumentReadOutsideKey } from "../logger.js";
|
|
2
4
|
// src/server/segment-lifetime/read-rule.ts
|
|
3
5
|
function currentReadScope() {
|
|
4
6
|
return documentReadScopeAls.getStore();
|
|
5
7
|
}
|
|
6
|
-
function
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
function refuseRead(scope, what, part, fixOverride) {
|
|
9
|
+
scope.call.read = true;
|
|
10
|
+
const active = currentReadScope();
|
|
11
|
+
if (active) active.call.read = true;
|
|
12
|
+
if (scope.reported.done) return;
|
|
13
|
+
scope.reported.done = true;
|
|
14
|
+
logDocumentReadOutsideKey(readOutsideKey(scope, what, part, fixOverride), { segment: scope.segmentPath });
|
|
9
15
|
}
|
|
10
|
-
function
|
|
16
|
+
function readOutsideKey(scope, what, part, fixOverride) {
|
|
17
|
+
const fix = fixOverride ?? (part ? `Add it to key.${part}, or declare lifetime: 'request'.` : "A 'document' segment cannot depend on it; declare lifetime: 'request'.");
|
|
18
|
+
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; until it is fixed, it renders as lifetime: 'request' for this client instead. See design/53-segment-lifetime.md §"What a 'document' segment may read".`);
|
|
19
|
+
}
|
|
20
|
+
function keyedHeaders(headers, scope) {
|
|
21
|
+
const keyed = (name) => {
|
|
22
|
+
if (scope.headers.has(name.toLowerCase())) return name;
|
|
23
|
+
const what = `the header "${name}"`;
|
|
24
|
+
if (name.toLowerCase() === "cookie") refuseRead(scope, what, "cookies", "Read cookies through a cookie definition in key.cookies.");
|
|
25
|
+
else if (isUnkeyableHeader(name)) refuseRead(scope, what, void 0, "A key may not name a credential; declare lifetime: 'request'.");
|
|
26
|
+
else refuseRead(scope, what, "headers");
|
|
27
|
+
return name;
|
|
28
|
+
};
|
|
29
|
+
const all = () => {
|
|
30
|
+
refuseRead(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'.");
|
|
31
|
+
return headers;
|
|
32
|
+
};
|
|
33
|
+
return {
|
|
34
|
+
get: (name) => headers.get(keyed(name)),
|
|
35
|
+
has: (name) => headers.has(keyed(name)),
|
|
36
|
+
entries: () => all().entries(),
|
|
37
|
+
keys: () => all().keys(),
|
|
38
|
+
values: () => all().values(),
|
|
39
|
+
forEach: (callback, thisArg) => all().forEach(callback, thisArg),
|
|
40
|
+
[Symbol.iterator]: () => all()[Symbol.iterator]()
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
function checkUnscopedRead(what) {
|
|
11
44
|
const scope = currentReadScope();
|
|
12
|
-
if (scope)
|
|
45
|
+
if (scope) refuseRead(scope, what);
|
|
13
46
|
}
|
|
14
|
-
function
|
|
47
|
+
function checkSearchParamsRead(reader) {
|
|
15
48
|
const scope = currentReadScope();
|
|
16
49
|
if (!scope) return;
|
|
17
50
|
const outside = Object.keys(reader.codecs).filter((field) => {
|
|
18
51
|
const keyed = scope.searchParams.get(field);
|
|
19
52
|
return !keyed || keyed.codec !== reader.codecs[field] || keyed.urlKey !== (reader.urlKeys[field] ?? field);
|
|
20
53
|
});
|
|
21
|
-
if (outside.length > 0)
|
|
54
|
+
if (outside.length > 0) refuseRead(scope, `the search params ${outside.join(", ")}`, "searchParams");
|
|
22
55
|
}
|
|
23
|
-
function
|
|
56
|
+
function checkCookieRead(name, codec) {
|
|
24
57
|
const scope = currentReadScope();
|
|
25
58
|
if (!scope) return;
|
|
26
|
-
if (!scope.cookies.has(name))
|
|
27
|
-
if (codec === void 0 || scope.cookies.get(name) !== codec)
|
|
59
|
+
if (!scope.cookies.has(name)) refuseRead(scope, `the cookie "${name}"`, "cookies");
|
|
60
|
+
else if (codec === void 0 || scope.cookies.get(name) !== codec) refuseRead(scope, `the raw value of the cookie "${name}" (read it through the definition in its key)`, "cookies");
|
|
28
61
|
}
|
|
29
62
|
var OBJECT_PROBES = new Set([
|
|
30
63
|
"then",
|
|
@@ -43,7 +76,7 @@ function scopedParams(params) {
|
|
|
43
76
|
const target = Object.assign(Object.create(Object.getPrototypeOf(params)), params);
|
|
44
77
|
return new Proxy(target, {
|
|
45
78
|
get(target, name, receiver) {
|
|
46
|
-
if (refused(name))
|
|
79
|
+
if (refused(name)) refuseRead(scope, `the segment param "${String(name)}"`, "segmentParams");
|
|
47
80
|
return Reflect.get(target, name, receiver);
|
|
48
81
|
},
|
|
49
82
|
has: (target, name) => allowed(name) && Reflect.has(target, name),
|
|
@@ -51,6 +84,6 @@ function scopedParams(params) {
|
|
|
51
84
|
getOwnPropertyDescriptor: (target, name) => allowed(name) ? Reflect.getOwnPropertyDescriptor(target, name) : void 0
|
|
52
85
|
});
|
|
53
86
|
}
|
|
54
|
-
export {
|
|
87
|
+
export { checkCookieRead, checkSearchParamsRead, checkUnscopedRead, currentReadScope, keyedHeaders, scopedParams };
|
|
55
88
|
|
|
56
89
|
//# sourceMappingURL=read-rule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-rule.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-rule.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-rule.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-rule.ts"],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { documentReadScopeAls } from "../als-registry.js";
|
|
2
|
-
import { isOutletGateElement } from "
|
|
3
|
-
import { callAndRewrite } from "../subtree-walk.js";
|
|
4
|
-
import {
|
|
2
|
+
import { isOutletGateElement } from "./outlet-gate.js";
|
|
3
|
+
import { callAndRewrite, isThenable } from "../subtree-walk.js";
|
|
4
|
+
import { clientComponents } from "../vite-handoff-rsc.js";
|
|
5
|
+
import { Fragment, createElement } from "../../_react/react.js";
|
|
5
6
|
// src/server/segment-lifetime/read-scope.ts
|
|
6
7
|
function readScopeFor(segmentPath, lifetime, pathParams) {
|
|
7
8
|
const { key } = lifetime;
|
|
@@ -12,16 +13,45 @@ function readScopeFor(segmentPath, lifetime, pathParams) {
|
|
|
12
13
|
codec,
|
|
13
14
|
urlKey: key.searchParams?.urlKeys[field] ?? field
|
|
14
15
|
}])),
|
|
15
|
-
cookies: new Map((key.cookies ?? []).map((cookie) => [cookie.name, cookie.codec]))
|
|
16
|
+
cookies: new Map((key.cookies ?? []).map((cookie) => [cookie.name, cookie.codec])),
|
|
17
|
+
headers: new Set((key.headers ?? []).map((name) => name.toLowerCase())),
|
|
18
|
+
reported: { done: false },
|
|
19
|
+
call: { read: false }
|
|
16
20
|
};
|
|
17
21
|
}
|
|
18
22
|
function inReadScope(component, scope) {
|
|
19
23
|
const rule = scopeRule(scope);
|
|
20
|
-
return (props) =>
|
|
24
|
+
return (props) => runCall(scope, () => callAndRewrite(component, props, rule));
|
|
21
25
|
}
|
|
22
26
|
function ScopedServerComponent(props) {
|
|
23
27
|
const { component, componentProps, scope } = props;
|
|
24
|
-
return
|
|
28
|
+
return runCall(scope, () => callAndRewrite(component, componentProps, scopeRule(scope)));
|
|
29
|
+
}
|
|
30
|
+
function runCall(scope, call) {
|
|
31
|
+
const frame = {
|
|
32
|
+
...scope,
|
|
33
|
+
call: { read: false }
|
|
34
|
+
};
|
|
35
|
+
const thrown = (error) => {
|
|
36
|
+
if (frame.call.read && typeof error === "object" && error !== null) THROWN_AFTER_READ.add(error);
|
|
37
|
+
throw error;
|
|
38
|
+
};
|
|
39
|
+
let output;
|
|
40
|
+
try {
|
|
41
|
+
output = documentReadScopeAls.run(frame, call);
|
|
42
|
+
} catch (error) {
|
|
43
|
+
return thrown(error);
|
|
44
|
+
}
|
|
45
|
+
if (isThenable(output)) return Promise.resolve(output).then((node) => frame.call.read ? withMarker(node) : node, thrown);
|
|
46
|
+
return frame.call.read ? withMarker(output) : output;
|
|
47
|
+
}
|
|
48
|
+
var THROWN_AFTER_READ = new WeakSet();
|
|
49
|
+
function fallbackAfter(error, fallback) {
|
|
50
|
+
return typeof error === "object" && error !== null && THROWN_AFTER_READ.has(error) ? withMarker(fallback) : fallback;
|
|
51
|
+
}
|
|
52
|
+
function withMarker(node) {
|
|
53
|
+
const { DocumentWithdrawal } = clientComponents();
|
|
54
|
+
return createElement(Fragment, null, node, createElement(DocumentWithdrawal));
|
|
25
55
|
}
|
|
26
56
|
function scopeRule(scope) {
|
|
27
57
|
return {
|
|
@@ -32,9 +62,21 @@ function scopeRule(scope) {
|
|
|
32
62
|
...key !== null ? { key } : void 0
|
|
33
63
|
}),
|
|
34
64
|
isOpaque: isOutletGateElement,
|
|
35
|
-
|
|
65
|
+
iterate: () => {
|
|
66
|
+
const frame = {
|
|
67
|
+
...scope,
|
|
68
|
+
call: { read: false }
|
|
69
|
+
};
|
|
70
|
+
let marked = false;
|
|
71
|
+
const due = () => frame.call.read && !marked && (marked = true);
|
|
72
|
+
return {
|
|
73
|
+
run: (fn) => documentReadScopeAls.run(frame, fn),
|
|
74
|
+
yielded: (value) => due() ? withMarker(value) : value,
|
|
75
|
+
beforeClose: () => due() ? withMarker(null) : void 0
|
|
76
|
+
};
|
|
77
|
+
}
|
|
36
78
|
};
|
|
37
79
|
}
|
|
38
|
-
export { inReadScope, readScopeFor };
|
|
80
|
+
export { fallbackAfter, inReadScope, readScopeFor };
|
|
39
81
|
|
|
40
82
|
//# sourceMappingURL=read-scope.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-scope.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-scope.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-scope.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-scope.ts"],"mappings":";;;;;;AA6EA,SAAgB,aACd,aACA,UACA,YACmB;CACnB,MAAM,EAAE,QAAQ;CAChB,OAAO;EACL;EACA,QAAQ,IAAI,IAAI,IAAI,iBAAiB,UAAU;EAC/C,cAAc,IAAI,IAChB,OAAO,QAAQ,IAAI,cAAc,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CACrE,OACA;GAAE;GAAO,QAAQ,IAAI,cAAc,QAAQ,UAAU;EAAM,CAC7D,CAAC,CACH;EACA,SAAS,IAAI,KAAK,IAAI,WAAW,CAAC,EAAA,CAAG,KAAK,WAAW,CAAC,OAAO,MAAM,OAAO,KAAK,CAAC,CAAC;EACjF,SAAS,IAAI,KAAK,IAAI,WAAW,CAAC,EAAA,CAAG,KAAK,SAAS,KAAK,YAAY,CAAC,CAAC;EACtE,UAAU,EAAE,MAAM,MAAM;EACxB,MAAM,EAAE,MAAM,MAAM;CACtB;AACF;AAMA,SAAgB,YAAY,WAA4B,OAA2C;CACjG,MAAM,OAAO,UAAU,KAAK;CAC5B,QAAQ,UAAU,QAAQ,aAAa,eAAe,WAAW,OAAO,IAAI,CAAC;AAC/E;AAQA,SAAS,sBAAsB,OAII;CACjC,MAAM,EAAE,WAAW,gBAAgB,UAAU;CAC7C,OAAO,QAAQ,aAAa,eAAe,WAAW,gBAAgB,UAAU,KAAK,CAAC,CAAC;AACzF;AAQA,SAAS,QACP,OACA,MACgC;CAChC,MAAM,QAA2B;EAAE,GAAG;EAAO,MAAM,EAAE,MAAM,MAAM;CAAE;CACnE,MAAM,UAAU,UAA0B;EACxC,IAAI,MAAM,KAAK,QAAQ,OAAO,UAAU,YAAY,UAAU,MAC5D,kBAAkB,IAAI,KAAK;EAE7B,MAAM;CACR;CACA,IAAI;CACJ,IAAI;EACF,SAAS,qBAAqB,IAAI,OAAO,IAAI;CAC/C,SAAS,OAAO;EACd,OAAO,OAAO,KAAK;CACrB;CACA,IAAI,WAAW,MAAM,GACnB,OAAO,QAAQ,QAAQ,MAAM,CAAC,CAAC,MAC5B,SAAU,MAAM,KAAK,OAAO,WAAW,IAAI,IAAI,MAChD,MACF;CAEF,OAAO,MAAM,KAAK,OAAO,WAAW,MAAM,IAAI;AAChD;AAMA,IAAM,oBAAoB,IAAI,QAAgB;AAQ9C,SAAgB,cAAmC,OAAgB,UAA+B;CAEhG,OADe,OAAO,UAAU,YAAY,UAAU,QAAQ,kBAAkB,IAAI,KAAK,IACzE,WAAW,QAAQ,IAAI;AACzC;AAOA,SAAS,WAAW,MAA+B;CACjD,MAAM,EAAE,uBAAuB,iBAAiB;CAChD,OAAO,cAAc,UAAU,MAAM,MAAM,cAAc,kBAAkB,CAAC;AAC9E;AAEA,SAAS,UAAU,OAAuC;CACxD,OAAO;EACL,OAAO,WAAW,gBAAgB,QAChC,cAAe,wBACX,SACA,cAAc,uBAAuB;GACnC;GACA;GACA;GACA,GAAI,QAAQ,OAAO,EAAE,IAAI,IAAI;EAC/B,CAAC;EAEP,UAAU;EAQV,eAAe;GACb,MAAM,QAA2B;IAAE,GAAG;IAAO,MAAM,EAAE,MAAM,MAAM;GAAE;GACnE,IAAI,SAAS;GACb,MAAM,YAAY,MAAM,KAAK,QAAQ,CAAC,WAAW,SAAS;GAC1D,OAAO;IACL,MAAM,OAAO,qBAAqB,IAAI,OAAO,EAAE;IAE/C,UAAU,UAAW,IAAI,IAAI,WAAW,KAAkB,IAAI;IAC9D,mBAAoB,IAAI,IAAI,WAAW,IAAI,IAAI;GACjD;EACF;CACF;AACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ROUTE_OPTIONS_EXPORT } from "../../shared/route-options-export.js";
|
|
2
2
|
import { getCookieJar } from "../cookie-context.js";
|
|
3
|
-
import { getSearchParams } from "../request-context.js";
|
|
3
|
+
import { getHeaders, getSearchParams } from "../request-context.js";
|
|
4
|
+
import { headerKeyProblem } from "../../shared/key-headers.js";
|
|
4
5
|
// src/server/segment-lifetime/segment-key.ts
|
|
5
6
|
function defaultLayoutLifetimeAt(chain, appDefault) {
|
|
6
7
|
return chain.some((segment) => segment.segmentType === "intercepting") ? "request" : appDefault;
|
|
@@ -10,7 +11,17 @@ function readDocumentLifetime(mod, kind, defaultLifetime) {
|
|
|
10
11
|
const options = typeof exported === "object" && exported !== null ? exported : {};
|
|
11
12
|
if ((("lifetime" in options ? options.lifetime : void 0) ?? defaultLifetime) !== "document") return void 0;
|
|
12
13
|
const key = "key" in options ? options.key : void 0;
|
|
13
|
-
|
|
14
|
+
const segmentKey = typeof key === "object" && key !== null ? key : {};
|
|
15
|
+
assertKeyableHeaders(segmentKey.headers);
|
|
16
|
+
return { key: segmentKey };
|
|
17
|
+
}
|
|
18
|
+
function assertKeyableHeaders(headers) {
|
|
19
|
+
if (headers === void 0) return;
|
|
20
|
+
if (!Array.isArray(headers) || !headers.every((h) => typeof h === "string")) throw new Error("[timber] key.headers must be an array of header names.");
|
|
21
|
+
for (const name of headers) {
|
|
22
|
+
const problem = headerKeyProblem(name);
|
|
23
|
+
if (problem) throw new Error(`[timber] ${problem}`);
|
|
24
|
+
}
|
|
14
25
|
}
|
|
15
26
|
function readKeyValues(lifetime, pathParams, params) {
|
|
16
27
|
const { key } = lifetime;
|
|
@@ -19,10 +30,13 @@ function readKeyValues(lifetime, pathParams, params) {
|
|
|
19
30
|
const searchParams = definition ? definition.buildSearchParams(definition.parse(getSearchParams())) : null;
|
|
20
31
|
const jar = key.cookies && key.cookies.length > 0 ? getCookieJar() : null;
|
|
21
32
|
const cookies = (key.cookies ?? []).map((cookie) => [cookie.name, cookie.codec.serialize(cookie.codec.parse(jar?.get(cookie.name)))]);
|
|
33
|
+
const requestHeaders = key.headers && key.headers.length > 0 ? getHeaders() : null;
|
|
34
|
+
const headers = (key.headers ?? []).map((name) => [name.toLowerCase(), requestHeaders?.get(name) ?? null]);
|
|
22
35
|
return JSON.stringify([
|
|
23
36
|
segmentParams,
|
|
24
37
|
searchParams,
|
|
25
|
-
cookies
|
|
38
|
+
cookies,
|
|
39
|
+
headers
|
|
26
40
|
]);
|
|
27
41
|
}
|
|
28
42
|
function canonicalParam(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segment-key.js","names":[],"sources":["../../../../../src/server/segment-lifetime/segment-key.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"segment-key.js","names":[],"sources":["../../../../../src/server/segment-lifetime/segment-key.ts"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { childrenOutletKey, layoutOutletKey, pageOutletKey, slotChainTreePath } from "../../routing/segment-keys.js";
|
|
2
|
-
import { outletGate } from "
|
|
2
|
+
import { outletGate } from "./outlet-gate.js";
|
|
3
3
|
import { documentOutletFor } from "./document-outlet.js";
|
|
4
4
|
import { defaultLayoutLifetimeAt, readDocumentLifetime } from "./segment-key.js";
|
|
5
5
|
import { inReadScope, readScopeFor } from "./read-scope.js";
|
|
@@ -28,7 +28,7 @@ var SlotDocumentOutlets = class {
|
|
|
28
28
|
document: await this.decision(node, segmentPath, lifetime)
|
|
29
29
|
};
|
|
30
30
|
this.unclaimed = [spec];
|
|
31
|
-
return outletGate(spec
|
|
31
|
+
return outletGate(spec);
|
|
32
32
|
}
|
|
33
33
|
async layout(node, lifetime, children, buildLayout) {
|
|
34
34
|
const segmentPath = layoutOutletKey(this.treePath(node));
|
|
@@ -39,12 +39,12 @@ var SlotDocumentOutlets = class {
|
|
|
39
39
|
};
|
|
40
40
|
const spec = {
|
|
41
41
|
segmentPath,
|
|
42
|
-
content: buildLayout(outletGate(childrenOutlet
|
|
42
|
+
content: buildLayout(outletGate(childrenOutlet)),
|
|
43
43
|
nested: [childrenOutlet],
|
|
44
44
|
document: await this.decision(node, segmentPath, lifetime)
|
|
45
45
|
};
|
|
46
46
|
this.unclaimed = [spec];
|
|
47
|
-
return outletGate(spec
|
|
47
|
+
return outletGate(spec);
|
|
48
48
|
}
|
|
49
49
|
scoped(node, kind, lifetime, component) {
|
|
50
50
|
const treePath = this.treePath(node);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slot-outlets.js","names":[],"sources":["../../../../../src/server/segment-lifetime/slot-outlets.ts"],"mappings":";;;;;;AAgEA,IAAa,sBAAb,MAAiC;CAGF;CAF7B,YAAkC,CAAC;CAEnC,YAAY,KAA2C;EAA1B,KAAA,MAAA;CAA2B;CAGxD,YAA0B;EACxB,OAAO,KAAK;CACd;CAOA,WACE,MACA,KACA,MAC8B;EAC9B,IAAI,SAAS,QAAQ,OAAO,qBAAqB,KAAK,MAAM,SAAS;EACrE,MAAM,QAAQ,CAAC,GAAG,KAAK,IAAI,YAAY,GAAG,KAAK,IAAI,MAAM,MAAM,GAAG,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC;EACvF,MAAM,WAAW,wBAAwB,OAAO,KAAK,IAAI,OAAO,qBAAqB;EACrF,OAAO,qBAAqB,KAAK,MAAM,QAAQ;CACjD;CAGA,MAAM,KACJ,MACA,UACA,SACuB;EACvB,MAAM,cAAc,cAAc,KAAK,SAAS,IAAI,CAAC;EACrD,MAAM,OAAmB;GACvB;GACA,SAAS;GACT,QAAQ,KAAK;GACb,UAAU,MAAM,KAAK,SAAS,MAAM,aAAa,QAAQ;EAC3D;EACA,KAAK,YAAY,CAAC,IAAI;EACtB,OAAO,WAAW,
|
|
1
|
+
{"version":3,"file":"slot-outlets.js","names":[],"sources":["../../../../../src/server/segment-lifetime/slot-outlets.ts"],"mappings":";;;;;;AAgEA,IAAa,sBAAb,MAAiC;CAGF;CAF7B,YAAkC,CAAC;CAEnC,YAAY,KAA2C;EAA1B,KAAA,MAAA;CAA2B;CAGxD,YAA0B;EACxB,OAAO,KAAK;CACd;CAOA,WACE,MACA,KACA,MAC8B;EAC9B,IAAI,SAAS,QAAQ,OAAO,qBAAqB,KAAK,MAAM,SAAS;EACrE,MAAM,QAAQ,CAAC,GAAG,KAAK,IAAI,YAAY,GAAG,KAAK,IAAI,MAAM,MAAM,GAAG,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC;EACvF,MAAM,WAAW,wBAAwB,OAAO,KAAK,IAAI,OAAO,qBAAqB;EACrF,OAAO,qBAAqB,KAAK,MAAM,QAAQ;CACjD;CAGA,MAAM,KACJ,MACA,UACA,SACuB;EACvB,MAAM,cAAc,cAAc,KAAK,SAAS,IAAI,CAAC;EACrD,MAAM,OAAmB;GACvB;GACA,SAAS;GACT,QAAQ,KAAK;GACb,UAAU,MAAM,KAAK,SAAS,MAAM,aAAa,QAAQ;EAC3D;EACA,KAAK,YAAY,CAAC,IAAI;EACtB,OAAO,WAAW,IAAI;CACxB;CAMA,MAAM,OACJ,MACA,UACA,UACA,aACuB;EACvB,MAAM,cAAc,gBAAgB,KAAK,SAAS,IAAI,CAAC;EACvD,MAAM,iBAA6B;GACjC,aAAa,kBAAkB,WAAW;GAC1C,SAAS;GACT,QAAQ,KAAK;EACf;EACA,MAAM,OAAmB;GACvB;GACA,SAAS,YAAY,WAAW,cAAc,CAAC;GAC/C,QAAQ,CAAC,cAAc;GACvB,UAAU,MAAM,KAAK,SAAS,MAAM,aAAa,QAAQ;EAC3D;EACA,KAAK,YAAY,CAAC,IAAI;EACtB,OAAO,WAAW,IAAI;CACxB;CAMA,OACE,MACA,MACA,UACA,WACiB;EACjB,MAAM,WAAW,KAAK,SAAS,IAAI;EACnC,MAAM,cAAc,SAAS,SAAS,cAAc,QAAQ,IAAI,gBAAgB,QAAQ;EACxF,OAAO,YAAY,WAAW,aAAa,aAAa,UAAU,KAAK,WAAW,IAAI,CAAC,CAAC;CAC1F;CAEA,SAAiB,MAA2B,aAAqB,UAA4B;EAC3F,OAAO,kBACL,KAAK,IAAI,QACT,aACA,UACA,KAAK,WAAW,IAAI,GACpB,KAAK,IAAI,OAAO,CAClB;CACF;CAGA,WAAmB,MAAqC;EACtD,MAAM,aAAa,KAAK,IAAI,MACzB,MAAM,GAAG,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,CAC9B,SAAS,MAAO,EAAE,YAAY,CAAC,EAAE,SAAS,IAAI,CAAC,CAAE;EACpD,OAAO,CAAC,GAAG,KAAK,IAAI,aAAa,GAAG,UAAU;CAChD;CAGA,SAAiB,MAAmC;EAClD,OAAO,kBACL,KAAK,IAAI,MAAM,MAAM,GAAG,KAAK,MAAM,IAAI,IAAI,CAAC,GAC5C,KAAK,IAAI,cACX;CACF;CAEA,MAAc,MAAmC;EAC/C,MAAM,QAAQ,KAAK,IAAI,MAAM,QAAQ,IAAI;EACzC,IAAI,UAAU,IAAI,MAAM,IAAI,MAAM,YAAY,KAAK,YAAY,4BAA4B;EAC3F,OAAO;CACT;AACF"}
|
|
@@ -12,9 +12,10 @@ import { matchUrlParts } from "./tree-match.js";
|
|
|
12
12
|
import { extractUrlParts } from "./chain-url-parts.js";
|
|
13
13
|
import { findInterceptingMatch } from "./slot-interception.js";
|
|
14
14
|
import { computeSlotKey, slotChainTreePath } from "../routing/segment-keys.js";
|
|
15
|
-
import {
|
|
15
|
+
import { LIVE_ONLY_RENDER, outletGate } from "./segment-lifetime/outlet-gate.js";
|
|
16
16
|
import { pathParamNames } from "./segment-lifetime/document-outlet.js";
|
|
17
17
|
import { SlotDocumentOutlets } from "./segment-lifetime/slot-outlets.js";
|
|
18
|
+
import { fallbackAfter } from "./segment-lifetime/read-scope.js";
|
|
18
19
|
import { clientComponents } from "./vite-handoff-rsc.js";
|
|
19
20
|
// src/server/slot-resolver.ts
|
|
20
21
|
async function loadComponent(loader) {
|
|
@@ -26,8 +27,8 @@ async function renderDefaultFallback(slotNode, h) {
|
|
|
26
27
|
if (!DefaultComp) return null;
|
|
27
28
|
return h(DefaultComp, {});
|
|
28
29
|
}
|
|
29
|
-
async function resolveSlotElement(slotNode, match, h, req, interception, parentTreePath, render =
|
|
30
|
-
const intercepting = interception ? findInterceptingMatch(slotNode, interception.targetPathname) : null;
|
|
30
|
+
async function resolveSlotElement(slotNode, match, h, req, interception, parentTreePath, render = LIVE_ONLY_RENDER) {
|
|
31
|
+
const intercepting = interception && interception.interceptingScope === parentTreePath ? findInterceptingMatch(slotNode, interception.targetPathname) : null;
|
|
31
32
|
const slotMatch = intercepting ?? findSlotMatch(slotNode, match);
|
|
32
33
|
if (slotMatch) {
|
|
33
34
|
const coerced = coerceSlotParams(slotMatch.chain, slotMatch.slotParams);
|
|
@@ -64,9 +65,9 @@ async function resolveSlotElement(slotNode, match, h, req, interception, parentT
|
|
|
64
65
|
return containSlotSubtree(rendered, denyFallback);
|
|
65
66
|
} catch (error) {
|
|
66
67
|
if (isRedirectSignal(error)) throw error;
|
|
67
|
-
if (isDenySignal(error)) return denyFallback;
|
|
68
|
+
if (isDenySignal(error)) return fallbackAfter(error, denyFallback);
|
|
68
69
|
reportRenderError(error, req, { segments: match.segments });
|
|
69
|
-
return denyFallback;
|
|
70
|
+
return fallbackAfter(error, denyFallback);
|
|
70
71
|
}
|
|
71
72
|
};
|
|
72
73
|
element = h(SafeSlotPage, {});
|
|
@@ -116,7 +117,7 @@ function ScopedSlotLayout(props) {
|
|
|
116
117
|
try {
|
|
117
118
|
rendered = traceCall("timber.layout", props.spanAttributes, () => props.scope(() => props.layout({ children: props.children })));
|
|
118
119
|
} catch (error) {
|
|
119
|
-
if (isDenySignal(error)) return props.denyFallback;
|
|
120
|
+
if (isDenySignal(error)) return fallbackAfter(error, props.denyFallback);
|
|
120
121
|
throw error;
|
|
121
122
|
}
|
|
122
123
|
return containSlotSubtree(rendered, props.denyFallback, props.children);
|
|
@@ -191,7 +192,7 @@ async function resolveSlotProps({ segment, segmentId, match, h, interception, pa
|
|
|
191
192
|
nested
|
|
192
193
|
};
|
|
193
194
|
outlets.push(spec);
|
|
194
|
-
props[slotName] = outletGate(spec
|
|
195
|
+
props[slotName] = outletGate(spec);
|
|
195
196
|
}
|
|
196
197
|
return {
|
|
197
198
|
props,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slot-resolver.js","names":[],"sources":["../../../../src/server/slot-resolver.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"slot-resolver.js","names":[],"sources":["../../../../src/server/slot-resolver.ts"],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { isDenySignal } from "./signal-identity.js";
|
|
2
2
|
import { isThenable, rewriteSubtree } from "./subtree-walk.js";
|
|
3
|
+
import { fallbackAfter } from "./segment-lifetime/read-scope.js";
|
|
3
4
|
import { createElement } from "../_react/react.js";
|
|
4
5
|
// src/server/slot-subtree-contain.ts
|
|
5
6
|
function denyToFallback(fallback) {
|
|
6
7
|
return (error) => {
|
|
7
|
-
if (isDenySignal(error)) return fallback;
|
|
8
|
+
if (isDenySignal(error)) return fallbackAfter(error, fallback);
|
|
8
9
|
throw error;
|
|
9
10
|
};
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slot-subtree-contain.js","names":[],"sources":["../../../../src/server/slot-subtree-contain.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"slot-subtree-contain.js","names":[],"sources":["../../../../src/server/slot-subtree-contain.ts"],"mappings":";;;;;AA+CA,SAAS,eAAe,UAAoD;CAC1E,QAAQ,UAAU;EAChB,IAAI,aAAa,KAAK,GAAG,OAAO,cAAc,OAAO,QAAQ;EAC7D,MAAM;CACR;AACF;AAQA,SAAS,YAAY,UAAqB,QAA8B;CACtE,OAAO;EACL,OAAO,WAAW,gBAAgB,QAChC,cAAe,yBACX,SACA,cAAc,wBAAwB;GACpC;GACA;GACA;GACA,GAAI,QAAQ,OAAO,EAAE,IAAI,IAAI;EAC/B,CAAC;EACP,WAAW,SAAS,WAAW,UAAa,SAAS;EACrD,YAAY,eAAe,QAAQ;CACrC;AACF;AAUA,SAAS,uBAAuB,OAIG;CACjC,MAAM,EAAE,WAAW,WAAW,gBAAgB,aAAa;CAC3D,MAAM,OAAO,YAAY,UAAU,MAAS;CAC5C,IAAI;CACJ,IAAI;EACF,SAAS,UAAU,cAAc;CACnC,SAAS,OAAO;EACd,OAAO,eAAe,QAAQ,CAAC,CAAC,KAAK;CACvC;CAGA,IAAI,WAAW,MAAM,GACnB,OAAO,QAAQ,QAAQ,MAAM,CAAC,CAAC,MAC5B,UAAU,eAAe,OAAO,IAAI,GACrC,eAAe,QAAQ,CACzB;CAEF,OAAO,eAAe,QAAQ,IAAI;AACpC;AAcA,SAAgB,mBACd,MACA,UACA,QACW;CACX,OAAO,eAAe,MAAM,YAAY,UAAU,MAAM,CAAC;AAC3D"}
|