@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
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { documentReadScopeAls } from "../als-registry.js";
|
|
2
|
+
import { isOutletGateElement } from "./outlet-gate.js";
|
|
3
|
+
import { callAndRewrite } from "../subtree-walk.js";
|
|
4
|
+
import { createElement } from "../../_react/react.js";
|
|
5
|
+
// src/server/segment-lifetime/read-scope.ts
|
|
6
|
+
function readScopeFor(segmentPath, lifetime, pathParams) {
|
|
7
|
+
const { key } = lifetime;
|
|
8
|
+
return {
|
|
9
|
+
segmentPath,
|
|
10
|
+
params: new Set(key.segmentParams ?? pathParams),
|
|
11
|
+
searchParams: new Map(Object.entries(key.searchParams?.codecs ?? {}).map(([field, codec]) => [field, {
|
|
12
|
+
codec,
|
|
13
|
+
urlKey: key.searchParams?.urlKeys[field] ?? field
|
|
14
|
+
}])),
|
|
15
|
+
cookies: new Map((key.cookies ?? []).map((cookie) => [cookie.name, cookie.codec])),
|
|
16
|
+
headers: new Set((key.headers ?? []).map((name) => name.toLowerCase()))
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
function inReadScope(component, scope) {
|
|
20
|
+
const rule = scopeRule(scope);
|
|
21
|
+
return (props) => documentReadScopeAls.run(scope, () => callAndRewrite(component, props, rule));
|
|
22
|
+
}
|
|
23
|
+
function ScopedServerComponent(props) {
|
|
24
|
+
const { component, componentProps, scope } = props;
|
|
25
|
+
return documentReadScopeAls.run(scope, () => callAndRewrite(component, componentProps, scopeRule(scope)));
|
|
26
|
+
}
|
|
27
|
+
function scopeRule(scope) {
|
|
28
|
+
return {
|
|
29
|
+
wrap: (component, componentProps, key) => component === ScopedServerComponent ? void 0 : createElement(ScopedServerComponent, {
|
|
30
|
+
component,
|
|
31
|
+
componentProps,
|
|
32
|
+
scope,
|
|
33
|
+
...key !== null ? { key } : void 0
|
|
34
|
+
}),
|
|
35
|
+
isOpaque: isOutletGateElement,
|
|
36
|
+
runIn: (fn) => documentReadScopeAls.run(scope, fn)
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
export { inReadScope, readScopeFor };
|
|
40
|
+
|
|
41
|
+
//# sourceMappingURL=read-scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read-scope.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-scope.ts"],"mappings":";;;;;AAsCA,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;CACxE;AACF;AAMA,SAAgB,YAAY,WAA4B,OAA2C;CACjG,MAAM,OAAO,UAAU,KAAK;CAC5B,QAAQ,UAAU,qBAAqB,IAAI,aAAa,eAAe,WAAW,OAAO,IAAI,CAAC;AAChG;AAQA,SAAS,sBAAsB,OAII;CACjC,MAAM,EAAE,WAAW,gBAAgB,UAAU;CAC7C,OAAO,qBAAqB,IAAI,aAC9B,eAAe,WAAW,gBAAgB,UAAU,KAAK,CAAC,CAC5D;AACF;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;EAEV,QAAQ,OAAO,qBAAqB,IAAI,OAAO,EAAE;CACnD;AACF"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { ROUTE_OPTIONS_EXPORT } from "../../shared/route-options-export.js";
|
|
2
|
+
import { getCookieJar } from "../cookie-context.js";
|
|
3
|
+
import { getHeaders, getSearchParams } from "../request-context.js";
|
|
4
|
+
import { headerKeyProblem } from "../../shared/key-headers.js";
|
|
5
|
+
// src/server/segment-lifetime/segment-key.ts
|
|
6
|
+
function defaultLayoutLifetimeAt(chain, appDefault) {
|
|
7
|
+
return chain.some((segment) => segment.segmentType === "intercepting") ? "request" : appDefault;
|
|
8
|
+
}
|
|
9
|
+
function readDocumentLifetime(mod, kind, defaultLifetime) {
|
|
10
|
+
const exported = mod[ROUTE_OPTIONS_EXPORT[kind]];
|
|
11
|
+
const options = typeof exported === "object" && exported !== null ? exported : {};
|
|
12
|
+
if ((("lifetime" in options ? options.lifetime : void 0) ?? defaultLifetime) !== "document") return void 0;
|
|
13
|
+
const key = "key" in options ? options.key : void 0;
|
|
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
|
+
}
|
|
25
|
+
}
|
|
26
|
+
function readKeyValues(lifetime, pathParams, params) {
|
|
27
|
+
const { key } = lifetime;
|
|
28
|
+
const segmentParams = (key.segmentParams ?? pathParams).map((name) => [name, canonicalParam(params[name])]);
|
|
29
|
+
const definition = key.searchParams;
|
|
30
|
+
const searchParams = definition ? definition.buildSearchParams(definition.parse(getSearchParams())) : null;
|
|
31
|
+
const jar = key.cookies && key.cookies.length > 0 ? getCookieJar() : null;
|
|
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]);
|
|
35
|
+
return JSON.stringify([
|
|
36
|
+
segmentParams,
|
|
37
|
+
searchParams,
|
|
38
|
+
cookies,
|
|
39
|
+
headers
|
|
40
|
+
]);
|
|
41
|
+
}
|
|
42
|
+
function canonicalParam(value) {
|
|
43
|
+
return JSON.stringify(tagged(value));
|
|
44
|
+
}
|
|
45
|
+
function tagged(value) {
|
|
46
|
+
if (value === void 0) return ["u"];
|
|
47
|
+
if (value === null) return ["n"];
|
|
48
|
+
switch (typeof value) {
|
|
49
|
+
case "string": return ["s", value];
|
|
50
|
+
case "boolean": return ["b", value];
|
|
51
|
+
case "bigint": return ["i", value.toString()];
|
|
52
|
+
case "number": return ["f", Object.is(value, -0) ? "-0" : String(value)];
|
|
53
|
+
case "object": break;
|
|
54
|
+
default: return ["?", String(value)];
|
|
55
|
+
}
|
|
56
|
+
if (Array.isArray(value)) return ["a", value.map(tagged)];
|
|
57
|
+
if (value instanceof Date) return ["d", Number.isNaN(value.getTime()) ? "invalid" : value.toISOString()];
|
|
58
|
+
if (value instanceof Map) return ["m", [...value].map(([k, v]) => [tagged(k), tagged(v)])];
|
|
59
|
+
if (value instanceof Set) return ["t", [...value].map(tagged)];
|
|
60
|
+
return ["o", Object.entries(value).map(([k, v]) => [k, tagged(v)])];
|
|
61
|
+
}
|
|
62
|
+
export { defaultLayoutLifetimeAt, readDocumentLifetime, readKeyValues };
|
|
63
|
+
|
|
64
|
+
//# sourceMappingURL=segment-key.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"segment-key.js","names":[],"sources":["../../../../../src/server/segment-lifetime/segment-key.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { childrenOutletKey, layoutOutletKey, pageOutletKey, slotChainTreePath } from "../../routing/segment-keys.js";
|
|
2
|
+
import { outletGate } from "./outlet-gate.js";
|
|
3
|
+
import { documentOutletFor } from "./document-outlet.js";
|
|
4
|
+
import { defaultLayoutLifetimeAt, readDocumentLifetime } from "./segment-key.js";
|
|
5
|
+
import { inReadScope, readScopeFor } from "./read-scope.js";
|
|
6
|
+
// src/server/segment-lifetime/slot-outlets.ts
|
|
7
|
+
var SlotDocumentOutlets = class {
|
|
8
|
+
ctx;
|
|
9
|
+
unclaimed = [];
|
|
10
|
+
constructor(ctx) {
|
|
11
|
+
this.ctx = ctx;
|
|
12
|
+
}
|
|
13
|
+
outermost() {
|
|
14
|
+
return this.unclaimed;
|
|
15
|
+
}
|
|
16
|
+
lifetimeOf(node, mod, kind) {
|
|
17
|
+
if (kind === "page") return readDocumentLifetime(mod, kind, "request");
|
|
18
|
+
const chain = [...this.ctx.ownerChain, ...this.ctx.chain.slice(0, this.depth(node) + 1)];
|
|
19
|
+
const fallback = defaultLayoutLifetimeAt(chain, this.ctx.render.defaultLayoutLifetime);
|
|
20
|
+
return readDocumentLifetime(mod, kind, fallback);
|
|
21
|
+
}
|
|
22
|
+
async page(node, lifetime, element) {
|
|
23
|
+
const segmentPath = pageOutletKey(this.treePath(node));
|
|
24
|
+
const spec = {
|
|
25
|
+
segmentPath,
|
|
26
|
+
content: element,
|
|
27
|
+
nested: this.unclaimed,
|
|
28
|
+
document: await this.decision(node, segmentPath, lifetime)
|
|
29
|
+
};
|
|
30
|
+
this.unclaimed = [spec];
|
|
31
|
+
return outletGate(spec);
|
|
32
|
+
}
|
|
33
|
+
async layout(node, lifetime, children, buildLayout) {
|
|
34
|
+
const segmentPath = layoutOutletKey(this.treePath(node));
|
|
35
|
+
const childrenOutlet = {
|
|
36
|
+
segmentPath: childrenOutletKey(segmentPath),
|
|
37
|
+
content: children,
|
|
38
|
+
nested: this.unclaimed
|
|
39
|
+
};
|
|
40
|
+
const spec = {
|
|
41
|
+
segmentPath,
|
|
42
|
+
content: buildLayout(outletGate(childrenOutlet)),
|
|
43
|
+
nested: [childrenOutlet],
|
|
44
|
+
document: await this.decision(node, segmentPath, lifetime)
|
|
45
|
+
};
|
|
46
|
+
this.unclaimed = [spec];
|
|
47
|
+
return outletGate(spec);
|
|
48
|
+
}
|
|
49
|
+
scoped(node, kind, lifetime, component) {
|
|
50
|
+
const treePath = this.treePath(node);
|
|
51
|
+
const segmentPath = kind === "page" ? pageOutletKey(treePath) : layoutOutletKey(treePath);
|
|
52
|
+
return inReadScope(component, readScopeFor(segmentPath, lifetime, this.pathParams(node)));
|
|
53
|
+
}
|
|
54
|
+
decision(node, segmentPath, lifetime) {
|
|
55
|
+
return documentOutletFor(this.ctx.render, segmentPath, lifetime, this.pathParams(node), this.ctx.params());
|
|
56
|
+
}
|
|
57
|
+
pathParams(node) {
|
|
58
|
+
const slotParams = this.ctx.chain.slice(0, this.depth(node) + 1).flatMap((n) => n.paramName ? [n.paramName] : []);
|
|
59
|
+
return [...this.ctx.ownerParams, ...slotParams];
|
|
60
|
+
}
|
|
61
|
+
treePath(node) {
|
|
62
|
+
return slotChainTreePath(this.ctx.chain.slice(0, this.depth(node) + 1), this.ctx.parentTreePath);
|
|
63
|
+
}
|
|
64
|
+
depth(node) {
|
|
65
|
+
const depth = this.ctx.chain.indexOf(node);
|
|
66
|
+
if (depth === -1) throw new Error(`[timber] ${node.segmentName} is not on the slot's chain`);
|
|
67
|
+
return depth;
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
export { SlotDocumentOutlets };
|
|
71
|
+
|
|
72
|
+
//# sourceMappingURL=slot-outlets.js.map
|
|
@@ -0,0 +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,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"}
|
|
@@ -6,13 +6,15 @@ import { loadModule } from "./safe-load.js";
|
|
|
6
6
|
import { isDenySignal, isRedirectSignal } from "./signal-identity.js";
|
|
7
7
|
import { traceCall, withSpan } from "./tracing.js";
|
|
8
8
|
import { loadFallbackModule, reportRenderError } from "./pipeline-helpers.js";
|
|
9
|
-
import { runWithSlotSegmentParams, setSlotParams } from "./request-context.js";
|
|
9
|
+
import { getSegmentParams, runWithSlotSegmentParams, setSlotParams } from "./request-context.js";
|
|
10
10
|
import { coerceSlotParams } from "./param-coercion.js";
|
|
11
11
|
import { matchUrlParts } from "./tree-match.js";
|
|
12
12
|
import { extractUrlParts } from "./chain-url-parts.js";
|
|
13
13
|
import { findInterceptingMatch } from "./slot-interception.js";
|
|
14
|
-
import { computeSlotKey } from "../routing/segment-keys.js";
|
|
15
|
-
import { outletGate } from "./segment-
|
|
14
|
+
import { computeSlotKey, slotChainTreePath } from "../routing/segment-keys.js";
|
|
15
|
+
import { LIVE_ONLY_RENDER, outletGate } from "./segment-lifetime/outlet-gate.js";
|
|
16
|
+
import { pathParamNames } from "./segment-lifetime/document-outlet.js";
|
|
17
|
+
import { SlotDocumentOutlets } from "./segment-lifetime/slot-outlets.js";
|
|
16
18
|
import { clientComponents } from "./vite-handoff-rsc.js";
|
|
17
19
|
// src/server/slot-resolver.ts
|
|
18
20
|
async function loadComponent(loader) {
|
|
@@ -24,14 +26,31 @@ async function renderDefaultFallback(slotNode, h) {
|
|
|
24
26
|
if (!DefaultComp) return null;
|
|
25
27
|
return h(DefaultComp, {});
|
|
26
28
|
}
|
|
27
|
-
async function resolveSlotElement(slotNode, match, h, req, interception, parentTreePath) {
|
|
28
|
-
const
|
|
29
|
+
async function resolveSlotElement(slotNode, match, h, req, interception, parentTreePath, render = LIVE_ONLY_RENDER) {
|
|
30
|
+
const intercepting = interception ? findInterceptingMatch(slotNode, interception.targetPathname) : null;
|
|
31
|
+
const slotMatch = intercepting ?? findSlotMatch(slotNode, match);
|
|
29
32
|
if (slotMatch) {
|
|
30
33
|
const coerced = coerceSlotParams(slotMatch.chain, slotMatch.slotParams);
|
|
31
|
-
const fullSlotPath =
|
|
34
|
+
const fullSlotPath = parentTreePath ? slotChainTreePath(slotMatch.chain, parentTreePath) : void 0;
|
|
32
35
|
if (fullSlotPath && Object.keys(coerced).length > 0) setSlotParams(fullSlotPath, coerced);
|
|
33
36
|
const scope = (fn) => runWithSlotSegmentParams(fullSlotPath, coerced, fn);
|
|
34
|
-
const
|
|
37
|
+
const ownerIndex = findSlotOwnerIndex(slotNode, match.segments);
|
|
38
|
+
const documents = parentTreePath && !intercepting ? new SlotDocumentOutlets({
|
|
39
|
+
render,
|
|
40
|
+
chain: slotMatch.chain,
|
|
41
|
+
parentTreePath,
|
|
42
|
+
ownerParams: pathParamNames(match.segments, ownerIndex),
|
|
43
|
+
ownerChain: match.segments.slice(0, ownerIndex + 1),
|
|
44
|
+
params: () => ({
|
|
45
|
+
...getSegmentParams(),
|
|
46
|
+
...coerced
|
|
47
|
+
})
|
|
48
|
+
}) : void 0;
|
|
49
|
+
const pageModule = await loadModule(slotMatch.page);
|
|
50
|
+
const LoadedSlotPage = pageModule.default;
|
|
51
|
+
const leafNode = slotMatch.chain[slotMatch.chain.length - 1];
|
|
52
|
+
const pageLifetime = documents && documents.lifetimeOf(leafNode, pageModule, "page");
|
|
53
|
+
const SlotPage = pageLifetime && LoadedSlotPage && !isClientReference(LoadedSlotPage) ? documents.scoped(leafNode, "page", pageLifetime, LoadedSlotPage) : LoadedSlotPage;
|
|
35
54
|
if (SlotPage) {
|
|
36
55
|
const denyFallback = await renderDefaultFallback(slotNode, h);
|
|
37
56
|
let element;
|
|
@@ -52,8 +71,9 @@ async function resolveSlotElement(slotNode, match, h, req, interception, parentT
|
|
|
52
71
|
};
|
|
53
72
|
element = h(SafeSlotPage, {});
|
|
54
73
|
}
|
|
55
|
-
element = await
|
|
56
|
-
element = await
|
|
74
|
+
if (pageLifetime) element = await documents.page(leafNode, pageLifetime, element);
|
|
75
|
+
element = await wrapWithIntermediateSegments(slotMatch.chain, slotNode, element, h, req, scope, denyFallback, documents);
|
|
76
|
+
element = await wrapWithLayout(slotNode, slotNode, element, h, scope, denyFallback, documents);
|
|
57
77
|
element = await wrapWithAccessGate(slotNode, element, h, scope);
|
|
58
78
|
element = await wrapSegmentWithErrorBoundaries(slotNode, element, {
|
|
59
79
|
loadModule: (file) => loadFallbackModule(file, req, match.segments),
|
|
@@ -66,17 +86,18 @@ async function resolveSlotElement(slotNode, match, h, req, interception, parentT
|
|
|
66
86
|
isSlotBoundary: true,
|
|
67
87
|
children: element
|
|
68
88
|
});
|
|
69
|
-
return
|
|
89
|
+
return {
|
|
90
|
+
element,
|
|
91
|
+
outlets: documents?.outermost() ?? []
|
|
92
|
+
};
|
|
70
93
|
}
|
|
71
94
|
}
|
|
72
|
-
return
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const slotSuffix = chain.map((s) => s.segmentName).filter(Boolean).join("/");
|
|
77
|
-
return `${parentTreePath === "/" ? "" : parentTreePath}/${slotSuffix}`;
|
|
95
|
+
return {
|
|
96
|
+
element: await renderDefaultFallback(slotNode, h),
|
|
97
|
+
outlets: []
|
|
98
|
+
};
|
|
78
99
|
}
|
|
79
|
-
async function wrapWithIntermediateSegments(chain, slotNode, element, h, req, scope, denyFallback) {
|
|
100
|
+
async function wrapWithIntermediateSegments(chain, slotNode, element, h, req, scope, denyFallback, documents) {
|
|
80
101
|
for (let i = chain.length - 1; i > 0; i--) {
|
|
81
102
|
const seg = chain[i];
|
|
82
103
|
element = await wrapSegmentWithErrorBoundaries(seg, element, {
|
|
@@ -85,7 +106,7 @@ async function wrapWithIntermediateSegments(chain, slotNode, element, h, req, sc
|
|
|
85
106
|
errorBoundaryComponent: clientComponents().TimberErrorBoundary,
|
|
86
107
|
isSlotBoundary: true
|
|
87
108
|
});
|
|
88
|
-
element = await wrapWithLayout(seg, slotNode, element, h, scope, denyFallback);
|
|
109
|
+
element = await wrapWithLayout(seg, slotNode, element, h, scope, denyFallback, documents);
|
|
89
110
|
element = await wrapWithAccessGate(seg, element, h, scope);
|
|
90
111
|
}
|
|
91
112
|
return element;
|
|
@@ -106,18 +127,21 @@ function slotSpanAttributes(routeKey, node, slotNode) {
|
|
|
106
127
|
"timber.slot": slotNode.segmentName
|
|
107
128
|
};
|
|
108
129
|
}
|
|
109
|
-
async function wrapWithLayout(node, slotNode, element, h, scope, denyFallback = null) {
|
|
130
|
+
async function wrapWithLayout(node, slotNode, element, h, scope, denyFallback = null, documents) {
|
|
110
131
|
if (!node.layout) return element;
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
if (!
|
|
114
|
-
|
|
132
|
+
const mod = await loadModule(node.layout);
|
|
133
|
+
const Loaded = mod.default;
|
|
134
|
+
if (!Loaded) return element;
|
|
135
|
+
const lifetime = documents && documents.lifetimeOf(node, mod, "layout");
|
|
136
|
+
const Layout = lifetime && !isClientReference(Loaded) ? documents.scoped(node, "layout", lifetime, Loaded) : Loaded;
|
|
137
|
+
const build = (children) => !scope || isClientReference(Layout) ? h(Layout, { children }) : h(ScopedSlotLayout, {
|
|
115
138
|
layout: Layout,
|
|
116
139
|
scope,
|
|
117
140
|
denyFallback,
|
|
118
141
|
spanAttributes: slotSpanAttributes("timber.segment", node, slotNode),
|
|
119
|
-
children
|
|
142
|
+
children
|
|
120
143
|
});
|
|
144
|
+
return lifetime ? documents.layout(node, lifetime, element, build) : build(element);
|
|
121
145
|
}
|
|
122
146
|
async function wrapWithAccessGate(slotNode, element, h, scope) {
|
|
123
147
|
if (!slotNode.access) return element;
|
|
@@ -160,14 +184,14 @@ async function resolveSlotProps({ segment, segmentId, match, h, interception, pa
|
|
|
160
184
|
const props = {};
|
|
161
185
|
const outlets = [];
|
|
162
186
|
for (const [slotName, slotNode] of Object.entries(segment.slots ?? {})) {
|
|
163
|
-
const content = await resolveSlotElement(slotNode, match, h, req, interception, parentTreePath);
|
|
187
|
+
const { element: content, outlets: nested } = await resolveSlotElement(slotNode, match, h, req, interception, parentTreePath, render);
|
|
164
188
|
const spec = {
|
|
165
189
|
segmentPath: computeSlotKey(segmentId, `@${slotName}`),
|
|
166
190
|
content,
|
|
167
|
-
nested
|
|
191
|
+
nested
|
|
168
192
|
};
|
|
169
193
|
outlets.push(spec);
|
|
170
|
-
props[slotName] = outletGate(spec
|
|
194
|
+
props[slotName] = outletGate(spec);
|
|
171
195
|
}
|
|
172
196
|
return {
|
|
173
197
|
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":";;;;;;;;;;;;;;;;;;;AAuDA,eAAe,cAAc,QAG8B;CAEzD,QAAO,MADW,WAAW,MAAM,EAC5B,CAAI;AACb;AAMA,eAAe,sBACb,UACA,GACoC;CACpC,IAAI,CAAC,SAAS,SAAS,OAAO;CAC9B,MAAM,cAAc,MAAM,cAAc,SAAS,OAAO;CACxD,IAAI,CAAC,aAAa,OAAO;CACzB,OAAO,EAAE,aAAa,CAAC,CAAC;AAC1B;AAiBA,eAAsB,mBACpB,UACA,OACA,GACA,KACA,cACA,gBACA,SAAwB,kBACM;CAK9B,MAAM,eAAe,eACjB,sBAAsB,UAAU,aAAa,cAAc,IAC3D;CACJ,MAAM,YAAY,gBAAgB,cAAc,UAAU,KAAK;CAE/D,IAAI,WAAW;EAeb,MAAM,UAAU,iBAAiB,UAAU,OAAO,UAAU,UAAU;EACtE,MAAM,eAAe,iBACjB,kBAAkB,UAAU,OAAO,cAAc,IACjD;EAEJ,IAAI,gBAAgB,OAAO,KAAK,OAAO,CAAC,CAAC,SAAS,GAChD,cAAc,cAAc,OAAO;EAErC,MAAM,SAAY,OAAmB,yBAAyB,cAAc,SAAS,EAAE;EAEvF,MAAM,aAAa,mBAAmB,UAAU,MAAM,QAAQ;EAI9D,MAAM,YACJ,kBAAkB,CAAC,eACf,IAAI,oBAAoB;GACtB;GACA,OAAO,UAAU;GACjB;GACA,aAAa,eAAe,MAAM,UAAU,UAAU;GACtD,YAAY,MAAM,SAAS,MAAM,GAAG,aAAa,CAAC;GAClD,eAAe;IAAE,GAAG,iBAAiB;IAAG,GAAG;GAAQ;EACrD,CAAC,IACD;EAEN,MAAM,aAAa,MAAM,WAAW,UAAU,IAAI;EAClD,MAAM,iBAAiB,WAAW;EAClC,MAAM,WAAW,UAAU,MAAM,UAAU,MAAM,SAAS;EAC1D,MAAM,eAAe,aAAa,UAAU,WAAW,UAAU,YAAY,MAAM;EAEnF,MAAM,WACJ,gBAAgB,kBAAkB,CAAC,kBAAkB,cAAc,IAC/D,UAAU,OAAO,UAAU,QAAQ,cAAc,cAAiC,IAClF;EACN,IAAI,UAAU;GAMZ,MAAM,eAAe,MAAM,sBAAsB,UAAU,CAAC;GAkB5D,IAAI;GACJ,IAAI,kBAAkB,QAAQ,GAC5B,UAAU,EAAE,UAAU,CAAC,CAAC;QACnB;IAIL,MAAM,OAAO,UAAU,MAAM,UAAU,MAAM,SAAS;IACtD,MAAM,iBAAiB,mBAAmB,gBAAgB,MAAM,QAAQ;IACxE,MAAM,eAAe,OAAO,UAAmC;KAC7D,IAAI;MACF,MAAM,WAAW,MAAM,SAAS,eAAe,sBAC7C,YAAa,SAAyD,KAAK,CAAC,CAC9E;MACA,OAAO,mBAAmB,UAA6B,YAAY;KACrE,SAAS,OAAO;MAId,IAAI,iBAAiB,KAAK,GACxB,MAAM;MAER,IAAI,aAAa,KAAK,GACpB,OAAO;MAKT,kBAAkB,OAAO,KAAK,EAAE,UAAU,MAAM,SAAS,CAAC;MAC1D,OAAO;KACT;IACF;IACA,UAAU,EAAE,cAAc,CAAC,CAAC;GAC9B;GAIA,IAAI,cAAc,UAAU,MAAM,UAAU,KAAK,UAAU,cAAc,OAAO;GAMhF,UAAU,MAAM,6BACd,UAAU,OACV,UACA,SACA,GACA,KACA,OACA,cACA,SACF;GAIA,UAAU,MAAM,eACd,UACA,UACA,SACA,GACA,OACA,cACA,SACF;GASA,UAAU,MAAM,mBAAmB,UAAU,SAAS,GAAG,KAAK;GAM9D,UAAU,MAAM,+BAA+B,UAAU,SAAS;IAChE,aAAa,SAAyB,mBAAmB,MAAM,KAAK,MAAM,QAAQ;IAClF,eAAe;IACf,wBAAwB,iBAAiB,CAAC,CAAC;IAC3C,gBAAgB;GAClB,CAAC;GASD,UAAU,EAAE,iBAAiB,CAAC,CAAC,qBAAqB;IAClD,mBAAmB,iBAAiB,CAAC,CAAC;IACtC,gBAAgB;IAChB,UAAU;GACZ,CAAC;GAED,OAAO;IAAE;IAAS,SAAS,WAAW,UAAU,KAAK,CAAC;GAAE;EAC1D;CACF;CAMA,OAAO;EAAE,SAAS,MAAM,sBAAsB,UAAU,CAAC;EAAG,SAAS,CAAC;CAAE;AAC1E;AA0BA,eAAe,6BACb,OACA,UACA,SACA,GACA,KACA,OACA,cACA,WAC6B;CAC7B,KAAK,IAAI,IAAI,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK;EACzC,MAAM,MAAM,MAAM;EAClB,UAAU,MAAM,+BAA+B,KAAK,SAAS;GAC3D,aAAa,SAAyB,mBAAmB,MAAM,GAAG;GAClE,eAAe;GACf,wBAAwB,iBAAiB,CAAC,CAAC;GAC3C,gBAAgB;EAClB,CAAC;EACD,UAAU,MAAM,eAAe,KAAK,UAAU,SAAS,GAAG,OAAO,cAAc,SAAS;EACxF,UAAU,MAAM,mBAAmB,KAAK,SAAS,GAAG,KAAK;CAC3D;CACA,OAAO;AACT;AAiCA,SAAS,iBAAiB,OAMd;CAMV,IAAI;CACJ,IAAI;EACF,WAAW,UAAU,iBAAiB,MAAM,sBAC1C,MAAM,YAAY,MAAM,OAAO,EAAE,UAAU,MAAM,SAAS,CAAC,CAAC,CAC9D;CACF,SAAS,OAAO;EACd,IAAI,aAAa,KAAK,GAAG,OAAO,MAAM;EACtC,MAAM;CACR;CACA,OAAO,mBAAmB,UAA6B,MAAM,cAAc,MAAM,QAAQ;AAC3F;AAUA,SAAS,mBACP,UACA,MACA,UACwB;CACxB,OAAO;GAAG,WAAW,KAAK,WAAW;EAAK,eAAe,SAAS;CAAY;AAChF;AAYA,eAAe,eACb,MACA,UACA,SACA,GACA,OACA,eAAgC,MAChC,WAC6B;CAC7B,IAAI,CAAC,KAAK,QAAQ,OAAO;CACzB,MAAM,MAAM,MAAM,WAAW,KAAK,MAAM;CACxC,MAAM,SAAS,IAAI;CACnB,IAAI,CAAC,QAAQ,OAAO;CACpB,MAAM,WAAW,aAAa,UAAU,WAAW,MAAM,KAAK,QAAQ;CAEtE,MAAM,SACJ,YAAY,CAAC,kBAAkB,MAAM,IACjC,UAAU,OAAO,MAAM,UAAU,UAAU,MAAyB,IACpE;CACN,MAAM,SAAS,aACb,CAAC,SAAS,kBAAkB,MAAM,IAC9B,EAAE,QAAQ,EAAE,SAAS,CAAC,IACtB,EAAE,kBAAkB;EAClB,QAAQ;EACR;EACA;EACA,gBAAgB,mBAAmB,kBAAkB,MAAM,QAAQ;EACnE;CACF,CAAC;CAIP,OAAO,WAAW,UAAU,OAAO,MAAM,UAAU,SAAS,KAAK,IAAI,MAAM,OAAO;AACpF;AAMA,eAAe,mBACb,UACA,SACA,GACA,OAC6B;CAC7B,IAAI,CAAC,SAAS,QAAQ,OAAO;CAE7B,MAAM,SAAS,MAAM,cAAc,SAAS,MAAM;CAClD,IAAI,CAAC,QAAQ,OAAO;CAIpB,MAAM,WAAW,cAAc,YAAY,OAAO,CAAC,IAAI;CAEvD,IAAI,kBAA4D;CAChE,IAAI,SAAS,QACX,kBAAmB,MAAM,cAAc,SAAS,MAAM,KAAM;CAG9D,MAAM,WAAW,SAAS,aAAa,QAAQ,MAAM,EAAE,KAAK;CAE5D,MAAM,kBAAkB,MAAM,sBAAsB,UAAU,CAAC;CAE/D,OAAO,EAAE,gBAAgB;EACvB;EACA;EACA;EACA,eAAe;EACf;EACA,UAAU;CACZ,CAAC;AACH;AA2CA,SAAgB,mBACd,UACA,UACQ;CACR,KAAK,IAAI,IAAI,SAAS,SAAS,GAAG,KAAK,GAAG,KACxC,KAAK,MAAM,aAAa,OAAO,OAAO,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,GAC3D,IAAI,cAAc,UAAU,OAAO;CAIvC,OAAO;AACT;AAEA,SAAS,cAAc,UAA+B,OAA2C;CAC/F,MAAM,WAAW,MAAM;CAEvB,MAAM,cAAc,mBAAmB,UAAU,QAAQ;CAIzD,MAAM,oBAAoB,eAAe,IAAI,SAAS,MAAM,cAAc,CAAC,IAAI,CAAC;CAIhF,MAAM,WAAW,gBAAgB,mBAAmB,MAAM,gBAAgB;CAK1E,MAAM,SAAS,cAAc,UAAU,QAAQ;CAC/C,IAAI,CAAC,QAAQ,OAAO;CAEpB,MAAM,OAAO,OAAO,MAAM,OAAO,MAAM,SAAS;CAChD,IAAI,CAAC,KAAK,MAAM,OAAO;CAEvB,OAAO;EAAE,MAAM,KAAK;EAAM,OAAO,OAAO;EAAO,YAAY,OAAO;CAAO;AAC3E;AA6BA,eAAsB,iBAAiB,EACrC,SACA,WACA,OACA,GACA,cACA,gBACA,KACA,UAC+C;CAC/C,MAAM,QAAiC,CAAC;CACxC,MAAM,UAAwB,CAAC;CAE/B,KAAK,MAAM,CAAC,UAAU,aAAa,OAAO,QAAQ,QAAQ,SAAS,CAAC,CAAC,GAAG;EACtE,MAAM,EAAE,SAAS,SAAS,SAAS,WAAW,MAAM,mBAClD,UACA,OACA,GACA,KACA,cACA,gBACA,MACF;EACA,MAAM,OAAmB;GACvB,aAAa,eAAe,WAAW,IAAI,UAAU;GACrD;GACA;EACF;EACA,QAAQ,KAAK,IAAI;EACjB,MAAM,YAAY,WAAW,IAAI;CACnC;CAEA,OAAO;EAAE;EAAO;CAAQ;AAC1B"}
|
|
@@ -1,111 +1,39 @@
|
|
|
1
1
|
import { isDenySignal } from "./signal-identity.js";
|
|
2
|
-
import {
|
|
2
|
+
import { isThenable, rewriteSubtree } from "./subtree-walk.js";
|
|
3
3
|
import { createElement } from "../_react/react.js";
|
|
4
4
|
// src/server/slot-subtree-contain.ts
|
|
5
|
-
var ELEMENT_TAGS = new Set([Symbol.for("react.transitional.element"), Symbol.for("react.element")]);
|
|
6
|
-
function isThenable(value) {
|
|
7
|
-
return typeof value === "object" && value !== null && typeof value.then === "function";
|
|
8
|
-
}
|
|
9
|
-
function isElement(value) {
|
|
10
|
-
return typeof value === "object" && value !== null && ELEMENT_TAGS.has(value.$$typeof);
|
|
11
|
-
}
|
|
12
|
-
function isServerComponent(type) {
|
|
13
|
-
return typeof type === "function" && !isClientReference(type) && !type.prototype?.isReactComponent;
|
|
14
|
-
}
|
|
15
|
-
var MEMO_TAG = Symbol.for("react.memo");
|
|
16
|
-
var FORWARD_REF_TAG = Symbol.for("react.forward_ref");
|
|
17
|
-
var LAZY_TAG = Symbol.for("react.lazy");
|
|
18
|
-
function serverComponentOf(type) {
|
|
19
|
-
if (isServerComponent(type)) return type;
|
|
20
|
-
if (typeof type !== "object" || type === null) return void 0;
|
|
21
|
-
const tag = type.$$typeof;
|
|
22
|
-
if (tag === MEMO_TAG) return serverComponentOf(type.type);
|
|
23
|
-
if (tag === FORWARD_REF_TAG) return serverComponentOf(type.render);
|
|
24
|
-
if (tag === LAZY_TAG) {
|
|
25
|
-
const lazy = type;
|
|
26
|
-
return (props) => createElement(lazy._init(lazy._payload), props);
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
function isPlainObject(value) {
|
|
30
|
-
if (typeof value !== "object" || value === null) return false;
|
|
31
|
-
const proto = Object.getPrototypeOf(value);
|
|
32
|
-
return proto === Object.prototype || proto === null;
|
|
33
|
-
}
|
|
34
5
|
function denyToFallback(fallback) {
|
|
35
6
|
return (error) => {
|
|
36
7
|
if (isDenySignal(error)) return fallback;
|
|
37
8
|
throw error;
|
|
38
9
|
};
|
|
39
10
|
}
|
|
11
|
+
function containment(fallback, opaque) {
|
|
12
|
+
return {
|
|
13
|
+
wrap: (component, componentProps, key) => component === ContainedSlotComponent ? void 0 : createElement(ContainedSlotComponent, {
|
|
14
|
+
component,
|
|
15
|
+
componentProps,
|
|
16
|
+
fallback,
|
|
17
|
+
...key !== null ? { key } : void 0
|
|
18
|
+
}),
|
|
19
|
+
isOpaque: (node) => opaque !== void 0 && node === opaque,
|
|
20
|
+
onRejected: denyToFallback(fallback)
|
|
21
|
+
};
|
|
22
|
+
}
|
|
40
23
|
function ContainedSlotComponent(props) {
|
|
41
24
|
const { component: Component, componentProps, fallback } = props;
|
|
42
|
-
const
|
|
43
|
-
fallback,
|
|
44
|
-
opaque: void 0
|
|
45
|
-
};
|
|
25
|
+
const rule = containment(fallback, void 0);
|
|
46
26
|
let result;
|
|
47
27
|
try {
|
|
48
28
|
result = Component(componentProps);
|
|
49
29
|
} catch (error) {
|
|
50
30
|
return denyToFallback(fallback)(error);
|
|
51
31
|
}
|
|
52
|
-
if (isThenable(result)) return Promise.resolve(result).then((value) =>
|
|
53
|
-
return
|
|
54
|
-
}
|
|
55
|
-
function walk(node, c, seen) {
|
|
56
|
-
if (typeof node !== "object" || node === null) return node;
|
|
57
|
-
if (node === c.opaque || seen.has(node)) return node;
|
|
58
|
-
seen.add(node);
|
|
59
|
-
if (isThenable(node)) return node.then((value) => walk(value, c, seen), denyToFallback(c.fallback));
|
|
60
|
-
if (Array.isArray(node)) {
|
|
61
|
-
let changed = false;
|
|
62
|
-
const next = node.map((child) => {
|
|
63
|
-
const walked = walk(child, c, seen);
|
|
64
|
-
if (walked !== child) changed = true;
|
|
65
|
-
return walked;
|
|
66
|
-
});
|
|
67
|
-
return changed ? next : node;
|
|
68
|
-
}
|
|
69
|
-
if (isElement(node)) {
|
|
70
|
-
const { type, key, props } = node;
|
|
71
|
-
const component = type === ContainedSlotComponent ? void 0 : serverComponentOf(type);
|
|
72
|
-
if (component) {
|
|
73
|
-
const wrapped = {
|
|
74
|
-
component,
|
|
75
|
-
componentProps: props,
|
|
76
|
-
fallback: c.fallback,
|
|
77
|
-
...key !== null ? { key } : void 0
|
|
78
|
-
};
|
|
79
|
-
return createElement(ContainedSlotComponent, wrapped);
|
|
80
|
-
}
|
|
81
|
-
const nextProps = walk(props, c, seen);
|
|
82
|
-
if (nextProps === props) return node;
|
|
83
|
-
const { children, ...rest } = nextProps;
|
|
84
|
-
const propsWithKey = key === null ? rest : {
|
|
85
|
-
...rest,
|
|
86
|
-
key
|
|
87
|
-
};
|
|
88
|
-
if (Array.isArray(children) && children.length > 1) return createElement(type, propsWithKey, ...children);
|
|
89
|
-
if (children !== void 0) return createElement(type, propsWithKey, children);
|
|
90
|
-
return createElement(type, propsWithKey);
|
|
91
|
-
}
|
|
92
|
-
if (isPlainObject(node)) {
|
|
93
|
-
let changed = false;
|
|
94
|
-
const next = {};
|
|
95
|
-
for (const [name, value] of Object.entries(node)) {
|
|
96
|
-
const walked = walk(value, c, seen);
|
|
97
|
-
if (walked !== value) changed = true;
|
|
98
|
-
next[name] = walked;
|
|
99
|
-
}
|
|
100
|
-
return changed ? next : node;
|
|
101
|
-
}
|
|
102
|
-
return node;
|
|
32
|
+
if (isThenable(result)) return Promise.resolve(result).then((value) => rewriteSubtree(value, rule), denyToFallback(fallback));
|
|
33
|
+
return rewriteSubtree(result, rule);
|
|
103
34
|
}
|
|
104
35
|
function containSlotSubtree(tree, fallback, opaque) {
|
|
105
|
-
return
|
|
106
|
-
fallback,
|
|
107
|
-
opaque
|
|
108
|
-
}, new WeakSet());
|
|
36
|
+
return rewriteSubtree(tree, containment(fallback, opaque));
|
|
109
37
|
}
|
|
110
38
|
export { containSlotSubtree };
|
|
111
39
|
|
|
@@ -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":";;;;AA8CA,SAAS,eAAe,UAAoD;CAC1E,QAAQ,UAAU;EAChB,IAAI,aAAa,KAAK,GAAG,OAAO;EAChC,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"}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { isClientReference } from "./utils/element-type.js";
|
|
2
|
+
import { createElement } from "../_react/react.js";
|
|
3
|
+
// src/server/subtree-walk.ts
|
|
4
|
+
var ELEMENT_TAGS = new Set([Symbol.for("react.transitional.element"), Symbol.for("react.element")]);
|
|
5
|
+
function isThenable(value) {
|
|
6
|
+
return typeof value === "object" && value !== null && typeof value.then === "function";
|
|
7
|
+
}
|
|
8
|
+
function isElement(value) {
|
|
9
|
+
return typeof value === "object" && value !== null && ELEMENT_TAGS.has(value.$$typeof);
|
|
10
|
+
}
|
|
11
|
+
function isServerComponent(type) {
|
|
12
|
+
return typeof type === "function" && !isClientReference(type) && !type.prototype?.isReactComponent;
|
|
13
|
+
}
|
|
14
|
+
var MEMO_TAG = Symbol.for("react.memo");
|
|
15
|
+
var FORWARD_REF_TAG = Symbol.for("react.forward_ref");
|
|
16
|
+
var LAZY_TAG = Symbol.for("react.lazy");
|
|
17
|
+
function serverComponentOf(type) {
|
|
18
|
+
if (isServerComponent(type)) return type;
|
|
19
|
+
if (typeof type !== "object" || type === null) return void 0;
|
|
20
|
+
const tag = type.$$typeof;
|
|
21
|
+
if (tag === MEMO_TAG) return serverComponentOf(type.type);
|
|
22
|
+
if (tag === FORWARD_REF_TAG) return serverComponentOf(type.render);
|
|
23
|
+
if (tag === LAZY_TAG) {
|
|
24
|
+
const lazy = type;
|
|
25
|
+
return (props) => createElement(lazy._init(lazy._payload), props);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function isPlainObject(value) {
|
|
29
|
+
if (typeof value !== "object" || value === null) return false;
|
|
30
|
+
const proto = Object.getPrototypeOf(value);
|
|
31
|
+
return proto === Object.prototype || proto === null;
|
|
32
|
+
}
|
|
33
|
+
function isRewritableIterable(value) {
|
|
34
|
+
return typeof value[Symbol.iterator] === "function" && !ArrayBuffer.isView(value) && !(value instanceof ArrayBuffer) && !(typeof FormData !== "undefined" && value instanceof FormData) && !isElement(value);
|
|
35
|
+
}
|
|
36
|
+
function isAsyncIterable(value) {
|
|
37
|
+
return typeof value[Symbol.asyncIterator] === "function" && !(typeof ReadableStream !== "undefined" && value instanceof ReadableStream);
|
|
38
|
+
}
|
|
39
|
+
function walk(node, rule, seen) {
|
|
40
|
+
if (typeof node !== "object" || node === null) return node;
|
|
41
|
+
if (seen.has(node)) return seen.get(node);
|
|
42
|
+
if (rule.isOpaque(node)) return node;
|
|
43
|
+
seen.set(node, node);
|
|
44
|
+
const rewritten = rewriteNode(node, rule, seen);
|
|
45
|
+
seen.set(node, rewritten);
|
|
46
|
+
return rewritten;
|
|
47
|
+
}
|
|
48
|
+
function rewriteNode(node, rule, seen) {
|
|
49
|
+
if (isThenable(node)) return node.then((value) => walk(value, rule, seen), rule.onRejected);
|
|
50
|
+
if (Array.isArray(node)) {
|
|
51
|
+
let changed = false;
|
|
52
|
+
const next = node.map((child) => {
|
|
53
|
+
const walked = walk(child, rule, seen);
|
|
54
|
+
if (walked !== child) changed = true;
|
|
55
|
+
return walked;
|
|
56
|
+
});
|
|
57
|
+
return changed ? next : node;
|
|
58
|
+
}
|
|
59
|
+
if (node instanceof Set) {
|
|
60
|
+
let changed = false;
|
|
61
|
+
const next = new Set();
|
|
62
|
+
for (const child of node) {
|
|
63
|
+
const walked = walk(child, rule, seen);
|
|
64
|
+
if (walked !== child) changed = true;
|
|
65
|
+
next.add(walked);
|
|
66
|
+
}
|
|
67
|
+
return changed ? next : node;
|
|
68
|
+
}
|
|
69
|
+
if (node instanceof Map) {
|
|
70
|
+
let changed = false;
|
|
71
|
+
const next = new Map();
|
|
72
|
+
for (const [key, value] of node) {
|
|
73
|
+
const walkedKey = walk(key, rule, seen);
|
|
74
|
+
const walkedValue = walk(value, rule, seen);
|
|
75
|
+
if (walkedKey !== key || walkedValue !== value) changed = true;
|
|
76
|
+
next.set(walkedKey, walkedValue);
|
|
77
|
+
}
|
|
78
|
+
return changed ? next : node;
|
|
79
|
+
}
|
|
80
|
+
if (isRewritableIterable(node)) {
|
|
81
|
+
let changed = false;
|
|
82
|
+
const next = Array.from(node, (child) => {
|
|
83
|
+
const walked = walk(child, rule, seen);
|
|
84
|
+
if (walked !== child) changed = true;
|
|
85
|
+
return walked;
|
|
86
|
+
});
|
|
87
|
+
const oneShot = typeof node.next === "function";
|
|
88
|
+
return changed || oneShot ? next[Symbol.iterator]() : node;
|
|
89
|
+
}
|
|
90
|
+
if (isAsyncIterable(node)) {
|
|
91
|
+
const source = node;
|
|
92
|
+
const runIn = rule.runIn ?? ((fn) => fn());
|
|
93
|
+
return { async *[Symbol.asyncIterator]() {
|
|
94
|
+
const iterator = runIn(() => source[Symbol.asyncIterator]());
|
|
95
|
+
for (;;) {
|
|
96
|
+
const step = await runIn(() => iterator.next());
|
|
97
|
+
if (step.done) return runIn(() => walk(step.value, rule, seen));
|
|
98
|
+
yield runIn(() => walk(step.value, rule, seen));
|
|
99
|
+
}
|
|
100
|
+
} };
|
|
101
|
+
}
|
|
102
|
+
if (isElement(node)) {
|
|
103
|
+
const { type, key, props } = node;
|
|
104
|
+
const component = serverComponentOf(type);
|
|
105
|
+
const replaced = component && rule.wrap(component, props, key);
|
|
106
|
+
if (replaced) return replaced;
|
|
107
|
+
const nextProps = walk(props, rule, seen);
|
|
108
|
+
if (nextProps === props) return node;
|
|
109
|
+
const { children, ...rest } = nextProps;
|
|
110
|
+
const propsWithKey = key === null ? rest : {
|
|
111
|
+
...rest,
|
|
112
|
+
key
|
|
113
|
+
};
|
|
114
|
+
if (Array.isArray(children) && children.length > 1) return createElement(type, propsWithKey, ...children);
|
|
115
|
+
if (children !== void 0) return createElement(type, propsWithKey, children);
|
|
116
|
+
return createElement(type, propsWithKey);
|
|
117
|
+
}
|
|
118
|
+
if (isPlainObject(node)) {
|
|
119
|
+
let changed = false;
|
|
120
|
+
const next = {};
|
|
121
|
+
for (const [name, value] of Object.entries(node)) {
|
|
122
|
+
const walked = walk(value, rule, seen);
|
|
123
|
+
if (walked !== value) changed = true;
|
|
124
|
+
next[name] = walked;
|
|
125
|
+
}
|
|
126
|
+
return changed ? next : node;
|
|
127
|
+
}
|
|
128
|
+
return node;
|
|
129
|
+
}
|
|
130
|
+
function rewriteSubtree(tree, rule) {
|
|
131
|
+
return walk(tree, rule, new WeakMap());
|
|
132
|
+
}
|
|
133
|
+
function callAndRewrite(component, props, rule) {
|
|
134
|
+
const result = component(props);
|
|
135
|
+
if (isThenable(result)) return Promise.resolve(result).then((value) => rewriteSubtree(value, rule));
|
|
136
|
+
return rewriteSubtree(result, rule);
|
|
137
|
+
}
|
|
138
|
+
export { callAndRewrite, isThenable, rewriteSubtree };
|
|
139
|
+
|
|
140
|
+
//# sourceMappingURL=subtree-walk.js.map
|