@timber-js/app 0.2.0-alpha.241 → 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-BCYVyoFl.js → actions-BkwgRwCl.js} +37 -9
- package/dist/_chunks/actions-BkwgRwCl.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-BGA7c5qJ.js} +5 -5
- package/dist/_chunks/{cache-api-n5FL4wFs.js.map → cache-api-BGA7c5qJ.js.map} +1 -1
- package/dist/_chunks/{chains-IswOWMnq.js → chains-Cuwwjv6T.js} +2 -2
- package/dist/_chunks/{chains-IswOWMnq.js.map → chains-Cuwwjv6T.js.map} +1 -1
- package/dist/_chunks/chains-LGjBHfSN.js +1 -0
- package/dist/_chunks/{classify-B08RCF6s.js → classify-Y8S9C0Na.js} +2 -2
- package/dist/_chunks/{classify-B08RCF6s.js.map → classify-Y8S9C0Na.js.map} +1 -1
- package/dist/_chunks/{cli-check-tpFb6pBU.js → cli-check-KeE1QaIx.js} +3 -3
- package/dist/_chunks/{cli-check-tpFb6pBU.js.map → cli-check-KeE1QaIx.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-DRNJutey.js → cli-schema-sync-DZEF31wd.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-DRNJutey.js.map → cli-schema-sync-DZEF31wd.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-C0pXBtzG.js → cli-schema-sync-_y5O6MIg.js} +1 -1
- package/dist/_chunks/{client-dep-entries-Dw5Dvatr.js → client-dep-entries-DpiwvoDi.js} +2 -2
- package/dist/_chunks/{client-dep-entries-Dw5Dvatr.js.map → client-dep-entries-DpiwvoDi.js.map} +1 -1
- package/dist/_chunks/{convention-lint-BfC_dAhZ.js → convention-lint-0AEsPK2T.js} +19 -5
- package/dist/_chunks/convention-lint-0AEsPK2T.js.map +1 -0
- package/dist/_chunks/dev-server-CboXr8zX.js +1 -0
- package/dist/_chunks/{dev-server-3R6Bl9_R.js → dev-server-DYDr8KIc.js} +2 -3
- package/dist/_chunks/dev-server-DYDr8KIc.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-KQsX_OhS.js} +4 -7
- package/dist/_chunks/flight-source-node-KQsX_OhS.js.map +1 -0
- package/dist/_chunks/{json-lossy-check-5KFcC1yt.js → json-lossy-check-BVDALqMf.js} +2 -2
- package/dist/_chunks/{json-lossy-check-5KFcC1yt.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-D1dfVqoT.js → live-graph-VhzO7Ol9.js} +4 -4
- package/dist/_chunks/{live-graph-D1dfVqoT.js.map → live-graph-VhzO7Ol9.js.map} +1 -1
- package/dist/_chunks/{logger-BvGxPd1e.js → logger-C4m8rfMy.js} +2 -2
- package/dist/_chunks/{logger-BvGxPd1e.js.map → logger-C4m8rfMy.js.map} +1 -1
- package/dist/_chunks/metadata-routes-MXNjWOt5.js.map +1 -1
- package/dist/_chunks/{node-response-D5cfiyWP.js → node-response-8Vz29cGS.js} +2 -2
- package/dist/_chunks/{node-response-D5cfiyWP.js.map → node-response-8Vz29cGS.js.map} +1 -1
- package/dist/_chunks/{poison-scan-CX02ilxN.js → poison-scan-Dpl3ibG-.js} +2 -2
- package/dist/_chunks/{poison-scan-CX02ilxN.js.map → poison-scan-Dpl3ibG-.js.map} +1 -1
- package/dist/_chunks/{scanner-DneYxQoY.js → scanner-CCEHN9Jg.js} +2 -2
- package/dist/_chunks/{scanner-DneYxQoY.js.map → scanner-CCEHN9Jg.js.map} +1 -1
- package/dist/_chunks/{sizeof-BtQ3ErLf.js → sizeof-CIF7fwSJ.js} +2 -2
- package/dist/_chunks/{sizeof-BtQ3ErLf.js.map → sizeof-CIF7fwSJ.js.map} +1 -1
- package/dist/_chunks/{walkers-C9R2A4jN.js → walkers-BbotBhNG.js} +3 -3
- package/dist/_chunks/{walkers-C9R2A4jN.js.map → walkers-BbotBhNG.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/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 +16 -42
- 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 -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 +0 -17
- 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 +2 -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/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/request-context.js +3 -3
- 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 +25 -3
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-scope.js +3 -2
- 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 +3 -3
- package/dist/native/rsc/server/slot-resolver.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/outlet-content-cache.js +6 -26
- 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/manifest.json +1 -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/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/request-context.js +3 -3
- package/dist/native/ssr/server/request-context.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +25 -3
- package/dist/native/ssr/server/segment-lifetime/read-rule.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 +2 -2
- 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/server/als-registry.d.ts +2 -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/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 +13 -23
- package/dist/server/internal.js.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 +13 -3
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-scope.d.ts +2 -1
- 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 +2 -2
- 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/types.d.ts +8 -2
- 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/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/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/error-boundary.tsx +1 -1
- package/src/client/navigation-commit.ts +4 -18
- package/src/client/outlet-content-cache.ts +24 -62
- 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 +0 -2
- package/src/client/rsc-fetch.ts +1 -1
- package/src/client/segment-cache.ts +2 -2
- package/src/client/segment-outlet.tsx +19 -51
- package/src/client/stale-segment.ts +2 -2
- package/src/config-types.ts +0 -17
- package/src/config-validation.ts +0 -1
- package/src/plugins/entries.ts +0 -1
- 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/rsc-runtime/vendor-types.d.ts +1 -1
- package/src/server/als-registry.ts +2 -23
- package/src/server/client-state-tree.ts +7 -18
- 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/request-context.ts +6 -5
- package/src/server/route-element-builder.ts +13 -14
- package/src/server/rsc-entry/helpers.ts +1 -1
- package/src/server/rsc-entry/index.ts +0 -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 +63 -6
- package/src/server/segment-lifetime/read-scope.ts +4 -2
- package/src/server/segment-lifetime/segment-key.ts +31 -3
- package/src/server/segment-lifetime/slot-outlets.ts +5 -5
- package/src/server/slot-resolver.ts +8 -8
- package/src/server/types.ts +8 -2
- package/src/server/vite-handoff-rsc.ts +1 -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/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
|
@@ -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":";;;;;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"}
|
|
@@ -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,7 +12,7 @@ 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
18
|
import { clientComponents } from "./vite-handoff-rsc.js";
|
|
@@ -26,7 +26,7 @@ async function renderDefaultFallback(slotNode, h) {
|
|
|
26
26
|
if (!DefaultComp) return null;
|
|
27
27
|
return h(DefaultComp, {});
|
|
28
28
|
}
|
|
29
|
-
async function resolveSlotElement(slotNode, match, h, req, interception, parentTreePath, render =
|
|
29
|
+
async function resolveSlotElement(slotNode, match, h, req, interception, parentTreePath, render = LIVE_ONLY_RENDER) {
|
|
30
30
|
const intercepting = interception ? findInterceptingMatch(slotNode, interception.targetPathname) : null;
|
|
31
31
|
const slotMatch = intercepting ?? findSlotMatch(slotNode, match);
|
|
32
32
|
if (slotMatch) {
|
|
@@ -191,7 +191,7 @@ async function resolveSlotProps({ segment, segmentId, match, h, interception, pa
|
|
|
191
191
|
nested
|
|
192
192
|
};
|
|
193
193
|
outlets.push(spec);
|
|
194
|
-
props[slotName] = outletGate(spec
|
|
194
|
+
props[slotName] = outletGate(spec);
|
|
195
195
|
}
|
|
196
196
|
return {
|
|
197
197
|
props,
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"slot-resolver.js","names":[],"sources":["../../../../src/server/slot-resolver.ts"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-handoff-rsc.js","names":[],"sources":["../../../../src/server/vite-handoff-rsc.ts"],"mappings":";
|
|
1
|
+
{"version":3,"file":"vite-handoff-rsc.js","names":[],"sources":["../../../../src/server/vite-handoff-rsc.ts"],"mappings":";AAyEA,IAAI,WAAoC,CAAC;AAOzC,SAAgB,sBAAsB,QAA6C;CACjF,MAAM,WAAW;CACjB,WAAW;EACT,GAAG;EACH,GAAG;EACH,GAAI,OAAO,SAAS,EAAE,QAAQ;GAAE,GAAG,SAAS;GAAQ,GAAG,OAAO;EAAO,EAAE,IAAI,CAAC;CAC9E;CACA,aAAa;EACX,WAAW;CACb;AACF;AAEA,SAAS,YAAY,MAAqB;CACxC,OAAO,IAAI,MACT,+BAA+B,KAAK,0IAGtC;AACF;AAEA,SAAS,KAAqC,KAA2B;CACvE,MAAM,QAAQ,SAAS;CACvB,IAAI,UAAU,QAAW,MAAM,YAAY,GAAG;CAC9C,OAAO;AACT;AAEA,SAAS,SAA2C,MAA8B;CAChF,MAAM,KAAK,SAAS,SAAS;CAC7B,IAAI,OAAO,QAAW,MAAM,YAAY,UAAU,MAAM;CACxD,OAAO;AACT;AAGA,SAAgB,mBAAwC;CACtD,OAAO,KAAK,kBAAkB;AAChC;AAMA,IAAa,gBAAkD,GAAG,SAChE,SAAS,cAAc,CAAC,CAAC,GAAG,IAAI;AAClC,IAAa,oBAA0D,GAAG,SACxE,SAAS,kBAAkB,CAAC,CAAC,GAAG,IAAI;AACtC,IAAa,eAAgD,GAAG,SAC9D,SAAS,aAAa,CAAC,CAAC,GAAG,IAAI;AACjC,IAAa,gBAAkD,GAAG,SAChE,SAAS,cAAc,CAAC,CAAC,GAAG,IAAI;AAClC,IAAa,mBAAwD,GAAG,SACtE,SAAS,iBAAiB,CAAC,CAAC,GAAG,IAAI;AACrC,IAAa,4BAA0E,GAAG,SACxF,SAAS,0BAA0B,CAAC,CAAC,GAAG,IAAI;AAC9C,IAAa,WAA2B,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,GAAG,IAAI"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// src/shared/key-headers.ts
|
|
2
|
+
var HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
|
|
3
|
+
var CREDENTIAL = "It carries a credential, and a key must not hold secret values.";
|
|
4
|
+
var UNKEYABLE_HEADERS = new Map([
|
|
5
|
+
["cookie", "Key on cookie definitions with key.cookies instead."],
|
|
6
|
+
["authorization", CREDENTIAL],
|
|
7
|
+
["proxy-authorization", CREDENTIAL],
|
|
8
|
+
["x-api-key", CREDENTIAL]
|
|
9
|
+
]);
|
|
10
|
+
function headerKeyProblem(name) {
|
|
11
|
+
if (!HEADER_NAME.test(name)) return `key.headers names "${name}", which is not a valid header name.`;
|
|
12
|
+
const refused = UNKEYABLE_HEADERS.get(name.toLowerCase());
|
|
13
|
+
return refused ? `key.headers may not name "${name}". ${refused}` : void 0;
|
|
14
|
+
}
|
|
15
|
+
function isUnkeyableHeader(name) {
|
|
16
|
+
return UNKEYABLE_HEADERS.has(name.toLowerCase());
|
|
17
|
+
}
|
|
18
|
+
export { headerKeyProblem, isUnkeyableHeader };
|
|
19
|
+
|
|
20
|
+
//# sourceMappingURL=key-headers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"key-headers.js","names":[],"sources":["../../../../src/shared/key-headers.ts"],"mappings":";AAUA,IAAM,cAAc;AAOpB,IAAM,aAAa;AAMnB,IAAM,oBAAiD,IAAI,IAAI;CAC7D,CAAC,UAAU,qDAAqD;CAChE,CAAC,iBAAiB,UAAU;CAC5B,CAAC,uBAAuB,UAAU;CAClC,CAAC,aAAa,UAAU;AAC1B,CAAC;AAGD,SAAgB,iBAAiB,MAAkC;CACjE,IAAI,CAAC,YAAY,KAAK,IAAI,GACxB,OAAO,sBAAsB,KAAK;CACpC,MAAM,UAAU,kBAAkB,IAAI,KAAK,YAAY,CAAC;CACxD,OAAO,UAAU,6BAA6B,KAAK,KAAK,YAAY;AACtE;AAGA,SAAgB,kBAAkB,MAAuB;CACvD,OAAO,kBAAkB,IAAI,KAAK,YAAY,CAAC;AACjD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet-decision.js","names":[],"sources":["../../../../src/shared/outlet-decision.ts"],"mappings":";
|
|
1
|
+
{"version":3,"file":"outlet-decision.js","names":[],"sources":["../../../../src/shared/outlet-decision.ts"],"mappings":";AAuCA,IAAa,uBAAuB"}
|
|
@@ -7,13 +7,12 @@ var MAX_PATHS = 64;
|
|
|
7
7
|
var OutletContentCache = class {
|
|
8
8
|
byPath = new Map();
|
|
9
9
|
record(segmentPath, content, digest) {
|
|
10
|
+
if (digest === void 0) return;
|
|
10
11
|
const entries = this.byPath.get(segmentPath) ?? [];
|
|
11
|
-
|
|
12
|
+
entries.unshift({
|
|
12
13
|
content,
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
};
|
|
16
|
-
entries.unshift(entry);
|
|
14
|
+
digest
|
|
15
|
+
});
|
|
17
16
|
if (entries.length > ENTRIES_PER_PATH) entries.length = ENTRIES_PER_PATH;
|
|
18
17
|
this.byPath.delete(segmentPath);
|
|
19
18
|
this.byPath.set(segmentPath, entries);
|
|
@@ -21,34 +20,15 @@ var OutletContentCache = class {
|
|
|
21
20
|
if (this.byPath.size <= MAX_PATHS) break;
|
|
22
21
|
this.byPath.delete(path);
|
|
23
22
|
}
|
|
24
|
-
return entry;
|
|
25
23
|
}
|
|
26
|
-
|
|
27
|
-
const entries = this.byPath.get(segmentPath);
|
|
28
|
-
if (!entries?.includes(entry)) return;
|
|
29
|
-
const duplicate = entries.findIndex((e) => e !== entry && e.hash === hash);
|
|
30
|
-
if (duplicate !== -1) entries.splice(duplicate, 1);
|
|
31
|
-
entry.hash = hash;
|
|
32
|
-
}
|
|
33
|
-
lookup(segmentPath, hash) {
|
|
34
|
-
return this.byPath.get(segmentPath)?.find((e) => e.hash === hash);
|
|
35
|
-
}
|
|
36
|
-
lookupDocument(segmentPath, digest) {
|
|
24
|
+
lookup(segmentPath, digest) {
|
|
37
25
|
return this.byPath.get(segmentPath)?.find((e) => e.digest === digest);
|
|
38
26
|
}
|
|
39
|
-
hashes() {
|
|
40
|
-
const out = {};
|
|
41
|
-
for (const [path, entries] of this.byPath) {
|
|
42
|
-
const latest = entries[0];
|
|
43
|
-
if (latest?.hash) out[path] = latest.hash;
|
|
44
|
-
}
|
|
45
|
-
return out;
|
|
46
|
-
}
|
|
47
27
|
documents() {
|
|
48
28
|
const out = {};
|
|
49
29
|
for (const [path, entries] of this.byPath) {
|
|
50
30
|
const latest = entries[0];
|
|
51
|
-
if (latest
|
|
31
|
+
if (latest) out[path] = latest.digest;
|
|
52
32
|
}
|
|
53
33
|
return out;
|
|
54
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet-content-cache.js","names":[],"sources":["../../../../src/client/outlet-content-cache.ts"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"outlet-content-cache.js","names":[],"sources":["../../../../src/client/outlet-content-cache.ts"],"mappings":";;;;AA2CA,IAAM,mBAAmB;AAQzB,IAAM,YAAY;AAElB,IAAa,qBAAb,MAAgC;CAC9B,SAA0B,IAAI,IAAqB;CAMnD,OAAO,aAAqB,SAAoB,QAAkC;EAChF,IAAI,WAAW,QAAW;EAC1B,MAAM,UAAU,KAAK,OAAO,IAAI,WAAW,KAAK,CAAC;EACjD,QAAQ,QAAQ;GAAE;GAAS;EAAO,CAAC;EACnC,IAAI,QAAQ,SAAS,kBAAkB,QAAQ,SAAS;EAExD,KAAK,OAAO,OAAO,WAAW;EAC9B,KAAK,OAAO,IAAI,aAAa,OAAO;EACpC,KAAK,MAAM,QAAQ,KAAK,OAAO,KAAK,GAAG;GACrC,IAAI,KAAK,OAAO,QAAQ,WAAW;GACnC,KAAK,OAAO,OAAO,IAAI;EACzB;CACF;CAGA,OAAO,aAAqB,QAAoD;EAC9E,OAAO,KAAK,OAAO,IAAI,WAAW,CAAC,EAAE,MAAM,MAAM,EAAE,WAAW,MAAM;CACtE;CAOA,YAAoC;EAClC,MAAM,MAA8B,CAAC;EACrC,KAAK,MAAM,CAAC,MAAM,YAAY,KAAK,QAAQ;GACzC,MAAM,SAAS,QAAQ;GACvB,IAAI,QAAQ,IAAI,QAAQ,OAAO;EACjC;EACA,OAAO;CACT;CAQA,MAAM,aAAqB,SAA0B;EACnD,MAAM,UAAU,KAAK,OAAO,IAAI,WAAW;EAC3C,IAAI,CAAC,SAAS;EACd,MAAM,OAAO,QAAQ,WAAW,MAAM,EAAE,YAAY,OAAO;EAC3D,IAAI,OAAO,GAAG,QAAQ,QAAQ,GAAG,QAAQ,OAAO,MAAM,CAAC,CAAC;EACxD,KAAK,OAAO,OAAO,WAAW;EAC9B,KAAK,OAAO,IAAI,aAAa,OAAO;CACtC;AACF;AAEA,IAAa,4BAA4B,oBACvC,OAAO,IAAI,mCAAmC,GAC9C,IACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet-scope-context.js","names":[],"sources":["../../../../src/client/outlet-scope-context.ts"],"mappings":";;;;AAiCA,IAAa,oBAAiC,OAAO,OAAO;CAC1D,SAAS;CACT,WAAW,IAAI,
|
|
1
|
+
{"version":3,"file":"outlet-scope-context.js","names":[],"sources":["../../../../src/client/outlet-scope-context.ts"],"mappings":";;;;AAiCA,IAAa,oBAAiC,OAAO,OAAO;CAC1D,SAAS;CACT,WAAW,IAAI,IAA4B;AAC7C,CAAC;AAED,IAAa,qBAAqB,oBAChC,OAAO,IAAI,2BAA2B,GACtC,iBACF"}
|
|
@@ -3,21 +3,14 @@ import "../_virtual/_rolldown/runtime.js";
|
|
|
3
3
|
import { OutletContentCacheContext } from "./outlet-content-cache.js";
|
|
4
4
|
import { LIVE_OUTLET_SCOPE, OutletScopeContext } from "./outlet-scope-context.js";
|
|
5
5
|
import { staleSegmentError } from "./stale-segment.js";
|
|
6
|
-
import { createElement,
|
|
6
|
+
import { createElement, useContext, useLayoutEffect, useMemo } from "react";
|
|
7
7
|
// src/client/segment-outlet.tsx
|
|
8
|
-
function isCaptureHole(value) {
|
|
9
|
-
return "captureHole" in value;
|
|
10
|
-
}
|
|
11
|
-
function isThenable(value) {
|
|
12
|
-
return typeof value.then === "function";
|
|
13
|
-
}
|
|
14
8
|
function SegmentOutlet({ segmentPath, decision }) {
|
|
15
9
|
const scope = useContext(OutletScopeContext);
|
|
16
10
|
const cache = useContext(OutletContentCacheContext);
|
|
17
|
-
const
|
|
18
|
-
if (
|
|
19
|
-
const
|
|
20
|
-
const cached = !resolved.skip ? void 0 : resolved.digest !== void 0 ? cache?.lookupDocument(segmentPath, resolved.digest) : cache?.lookup(segmentPath, resolved.hash);
|
|
11
|
+
const resolved = scope.skipped ? scope.decisions.get(segmentPath) : decision;
|
|
12
|
+
if (resolved === void 0) throw staleSegmentError(segmentPath);
|
|
13
|
+
const cached = resolved.skip ? cache?.lookup(segmentPath, resolved.digest) : void 0;
|
|
21
14
|
if (resolved.skip && !cached) throw staleSegmentError(segmentPath);
|
|
22
15
|
const content = resolved.skip ? cached.content : resolved.children;
|
|
23
16
|
const childScope = useMemo(() => resolved.skip ? {
|
|
@@ -26,14 +19,8 @@ function SegmentOutlet({ segmentPath, decision }) {
|
|
|
26
19
|
} : LIVE_OUTLET_SCOPE, [resolved]);
|
|
27
20
|
useLayoutEffect(() => {
|
|
28
21
|
if (cache === null) return;
|
|
29
|
-
if (resolved.skip)
|
|
30
|
-
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
const entry = cache.record(segmentPath, content, resolved.digest);
|
|
34
|
-
resolved.hash?.then((hash) => {
|
|
35
|
-
if (hash) cache.attachHash(segmentPath, entry, hash);
|
|
36
|
-
}, () => {});
|
|
22
|
+
if (resolved.skip) cache.touch(segmentPath, content);
|
|
23
|
+
else cache.record(segmentPath, content, resolved.digest);
|
|
37
24
|
}, [
|
|
38
25
|
resolved,
|
|
39
26
|
cache,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segment-outlet.js","names":[],"sources":["../../../../src/client/segment-outlet.tsx"],"mappings":";;;;;;;
|
|
1
|
+
{"version":3,"file":"segment-outlet.js","names":[],"sources":["../../../../src/client/segment-outlet.tsx"],"mappings":";;;;;;;AAiDA,SAAgB,cAAc,EAAE,aAAa,YAA2C;CACtF,MAAM,QAAQ,WAAW,kBAAkB;CAC3C,MAAM,QAAQ,WAAW,yBAAyB;CAIlD,MAAM,WAAW,MAAM,UAAU,MAAM,UAAU,IAAI,WAAW,IAAI;CACpE,IAAI,aAAa,QAAW,MAAM,kBAAkB,WAAW;CAE/D,MAAM,SAAS,SAAS,OAAO,OAAO,OAAO,aAAa,SAAS,MAAM,IAAI;CAC7E,IAAI,SAAS,QAAQ,CAAC,QAAQ,MAAM,kBAAkB,WAAW;CACjE,MAAM,UAAqB,SAAS,OAAO,OAAQ,UAAU,SAAS;CACtE,MAAM,aAAa,cAEf,SAAS,OACL;EAAE,SAAS;EAAM,WAAW,IAAI,IAAI,OAAO,QAAQ,SAAS,OAAO,CAAC;CAAE,IACtE,mBACN,CAAC,QAAQ,CACX;CAGA,sBAAsB;EACpB,IAAI,UAAU,MAAM;EACpB,IAAI,SAAS,MAAM,MAAM,MAAM,aAAa,OAAO;OAC9C,MAAM,OAAO,aAAa,SAAS,SAAS,MAAM;CACzD,GAAG;EAAC;EAAU;EAAO;EAAa;CAAO,CAAC;CAE1C,OAAO,cAAc,mBAAmB,UAAU,EAAE,OAAO,WAAW,GAAG,OAAO;AAClF"}
|
|
@@ -185,7 +185,6 @@
|
|
|
185
185
|
"server/rsc-error-envelope.ts": "server/rsc-error-envelope.js",
|
|
186
186
|
"server/safe-load.ts": "server/safe-load.js",
|
|
187
187
|
"server/schema-introspection.ts": "server/schema-introspection.js",
|
|
188
|
-
"server/segment-hash/value-hash.ts": "server/segment-hash/value-hash.js",
|
|
189
188
|
"server/segment-lifetime/key-digest.ts": "server/segment-lifetime/key-digest.js",
|
|
190
189
|
"server/segment-lifetime/read-rule.ts": "server/segment-lifetime/read-rule.js",
|
|
191
190
|
"server/sensitive-fields.ts": "server/sensitive-fields.js",
|
|
@@ -215,6 +214,7 @@
|
|
|
215
214
|
"shared/form-state-flight.ts": "shared/form-state-flight.js",
|
|
216
215
|
"shared/href-validation.ts": "shared/href-validation.js",
|
|
217
216
|
"shared/href.ts": "shared/href.js",
|
|
217
|
+
"shared/key-headers.ts": "shared/key-headers.js",
|
|
218
218
|
"shared/merge-search-params.ts": "shared/merge-search-params.js",
|
|
219
219
|
"shared/param-value.ts": "shared/param-value.js",
|
|
220
220
|
"shared/payload-root.ts": "shared/payload-root.js",
|
|
@@ -18,7 +18,6 @@ var waitUntilAls = getOrCreateAls(Symbol.for("timber:wait-until-als"));
|
|
|
18
18
|
var workersCachePurgeAls = getOrCreateAls(Symbol.for("timber:workers-cache-purge-als"));
|
|
19
19
|
var reactCacheScopeAls = getOrCreateAls(Symbol.for("timber:react-cache-scope-als"));
|
|
20
20
|
var prebuiltCaptureAls = getOrCreateAls(Symbol.for("timber:prebuilt-capture-als"));
|
|
21
|
-
getOrCreateAls(Symbol.for("timber:segment-capture-als"));
|
|
22
21
|
var documentReadScopeAls = getOrCreateAls(Symbol.for("timber:document-read-scope-als"));
|
|
23
22
|
export { documentReadScopeAls, earlyHintsSenderAls, prebuiltCaptureAls, reactCacheScopeAls, requestContextAls, revalidationAls, timingAls, traceAls, waitUntilAls, workersCachePurgeAls };
|
|
24
23
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"als-registry.js","names":[],"sources":["../../../../src/server/als-registry.ts"],"mappings":";;;AAgDA,SAAS,eAAkB,QAAsC;CAC/D,MAAM,IAAI;CACV,MAAM,WAAW,EAAE;CACnB,IAAI,oBAAoB,mBACtB,OAAO;CAET,MAAM,UAAU,IAAI,kBAAqB;CACzC,EAAE,UAAU;CACZ,OAAO;AACT;AAOA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC;AAiKA,IAAa,WAAW,eAA2B,OAAO,IAAI,kBAAkB,CAAC;AAWjF,IAAa,YAAY,eAA4B,OAAO,IAAI,mBAAmB,CAAC;AAqBpF,IAAa,kBAAkB,eAC7B,OAAO,IAAI,yBAAyB,CACtC;AAUA,IAAa,sBAAsB,eACjC,OAAO,IAAI,+BAA+B,CAC5C;AAUA,IAAa,eAAe,eAA4B,OAAO,IAAI,uBAAuB,CAAC;AAY3F,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C;AAeA,IAAa,qBAAqB,eAChC,OAAO,IAAI,8BAA8B,CAC3C;AAwBA,IAAa,qBAAqB,eAChC,OAAO,IAAI,6BAA6B,CAC1C;
|
|
1
|
+
{"version":3,"file":"als-registry.js","names":[],"sources":["../../../../src/server/als-registry.ts"],"mappings":";;;AAgDA,SAAS,eAAkB,QAAsC;CAC/D,MAAM,IAAI;CACV,MAAM,WAAW,EAAE;CACnB,IAAI,oBAAoB,mBACtB,OAAO;CAET,MAAM,UAAU,IAAI,kBAAqB;CACzC,EAAE,UAAU;CACZ,OAAO;AACT;AAOA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC;AAiKA,IAAa,WAAW,eAA2B,OAAO,IAAI,kBAAkB,CAAC;AAWjF,IAAa,YAAY,eAA4B,OAAO,IAAI,mBAAmB,CAAC;AAqBpF,IAAa,kBAAkB,eAC7B,OAAO,IAAI,yBAAyB,CACtC;AAUA,IAAa,sBAAsB,eACjC,OAAO,IAAI,+BAA+B,CAC5C;AAUA,IAAa,eAAe,eAA4B,OAAO,IAAI,uBAAuB,CAAC;AAY3F,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C;AAeA,IAAa,qBAAqB,eAChC,OAAO,IAAI,8BAA8B,CAC3C;AAwBA,IAAa,qBAAqB,eAChC,OAAO,IAAI,6BAA6B,CAC1C;AA6BA,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import "./segment-hash/value-hash.js";
|
|
2
1
|
import { KEY_DIGEST_SHAPE } from "./segment-lifetime/key-digest.js";
|
|
3
2
|
import { swallow } from "./logger.js";
|
|
4
3
|
// src/server/client-state-tree.ts
|
|
5
4
|
var MAX_ENTRIES = 512;
|
|
6
|
-
var HASH_SHAPE = new RegExp(`^[A-Za-z0-9_-]{22}$`);
|
|
7
5
|
function parseClientStateTree(req) {
|
|
8
6
|
const header = req.headers.get("X-Timber-State-Tree");
|
|
9
7
|
if (!header) return null;
|
|
@@ -15,12 +13,10 @@ function parseClientStateTree(req) {
|
|
|
15
13
|
return null;
|
|
16
14
|
}
|
|
17
15
|
if (!parsed || typeof parsed !== "object") return null;
|
|
18
|
-
const hashes = readTokenMap(parsed.hashes, HASH_SHAPE);
|
|
19
16
|
const documents = readTokenMap(parsed.documents, KEY_DIGEST_SHAPE);
|
|
20
17
|
const treePaths = Array.isArray(parsed.treePaths) ? new Set(parsed.treePaths.filter((p) => typeof p === "string")) : new Set();
|
|
21
|
-
if (
|
|
18
|
+
if (documents.size === 0 && treePaths.size === 0) return null;
|
|
22
19
|
return {
|
|
23
|
-
hashes: hashes.size > 0 ? hashes : null,
|
|
24
20
|
documents: documents.size > 0 ? documents : null,
|
|
25
21
|
treePaths: treePaths.size > 0 ? treePaths : null
|
|
26
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-state-tree.js","names":[],"sources":["../../../../src/server/client-state-tree.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"client-state-tree.js","names":[],"sources":["../../../../src/server/client-state-tree.ts"],"mappings":";;;AAmCA,IAAM,cAAc;AAMpB,SAAgB,qBAAqB,KAAsC;CACzE,MAAM,SAAS,IAAI,QAAQ,IAAI,qBAAqB;CACpD,IAAI,CAAC,QAAQ,OAAO;CAEpB,IAAI;CACJ,IAAI;EACF,SAAS,KAAK,MAAM,MAAM;CAC5B,SAAS,KAAK;EACZ,QAAQ,KAAK,sCAAsC;EACnD,OAAO;CACT;CACA,IAAI,CAAC,UAAU,OAAO,WAAW,UAAU,OAAO;CAElD,MAAM,YAAY,aAAa,OAAO,WAAW,gBAAgB;CAEjE,MAAM,YAAY,MAAM,QAAQ,OAAO,SAAS,IAC5C,IAAI,IAAI,OAAO,UAAU,QAAQ,MAAmB,OAAO,MAAM,QAAQ,CAAC,IAC1E,IAAI,IAAY;CAEpB,IAAI,UAAU,SAAS,KAAK,UAAU,SAAS,GAAG,OAAO;CACzD,OAAO;EACL,WAAW,UAAU,OAAO,IAAI,YAAY;EAC5C,WAAW,UAAU,OAAO,IAAI,YAAY;CAC9C;AACF;AAGA,SAAS,aAAa,OAAgB,OAAoC;CACxE,MAAM,MAAM,IAAI,IAAoB;CACpC,IAAI,CAAC,SAAS,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG,OAAO;CACxE,MAAM,UAAU,OAAO,QAAQ,KAAgC;CAC/D,IAAI,QAAQ,SAAS,aAAa,OAAO;CACzC,KAAK,MAAM,CAAC,MAAM,UAAU,SAC1B,IAAI,OAAO,UAAU,YAAY,MAAM,KAAK,KAAK,GAAG,IAAI,IAAI,MAAM,KAAK;CAEzE,OAAO;AACT"}
|
|
@@ -12,18 +12,15 @@ function destroyNodeFlight(stream, reason) {
|
|
|
12
12
|
const error = reason === void 0 || reason === null ? void 0 : reason instanceof Error ? reason : new Error(String(reason));
|
|
13
13
|
stream.destroy(error);
|
|
14
14
|
}
|
|
15
|
-
function pipeFlightToNode(flight, { signal, timeoutMs
|
|
15
|
+
function pipeFlightToNode(flight, { signal, timeoutMs }) {
|
|
16
16
|
const scope = new AbortController();
|
|
17
17
|
const timer = timeoutMs === void 0 ? void 0 : setTimeout(() => flight.abort(new RenderTimeoutError(timeoutMs, "Flight render")), timeoutMs);
|
|
18
18
|
const stream = new Transform({
|
|
19
19
|
objectMode: true,
|
|
20
20
|
transform(chunk, _encoding, callback) {
|
|
21
|
-
|
|
22
|
-
tap?.observe(typeof out === "string" ? Buffer.from(out) : out);
|
|
23
|
-
callback(null, out);
|
|
21
|
+
callback(null, typeof chunk === "string" ? chunk.toWellFormed() : chunk);
|
|
24
22
|
},
|
|
25
23
|
destroy(error, callback) {
|
|
26
|
-
tap?.end();
|
|
27
24
|
endScope(scope);
|
|
28
25
|
clearTimeout(timer);
|
|
29
26
|
if (error == null && stream.writableEnded) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flight-source-node.js","names":[],"sources":["../../../../src/server/flight-source-node.ts"],"mappings":";;;;;;;;AAkDA,SAAS,cAAoB,CAAC;AAQ9B,SAAgB,kBAAkB,QAAkB,QAAuB;CACzE,IAAI,CAAC,OAAO,UAAU,OAAO,CAAC,CAAC,SAAS,WAAW,GAAG,OAAO,GAAG,SAAS,WAAW;CACpF,MAAM,QACJ,WAAW,UAAa,WAAW,OAC/B,SACA,kBAAkB,QAChB,SACA,IAAI,MAAM,OAAO,MAAM,CAAC;CAChC,OAAO,QAAQ,KAAK;AACtB;
|
|
1
|
+
{"version":3,"file":"flight-source-node.js","names":[],"sources":["../../../../src/server/flight-source-node.ts"],"mappings":";;;;;;;;AAkDA,SAAS,cAAoB,CAAC;AAQ9B,SAAgB,kBAAkB,QAAkB,QAAuB;CACzE,IAAI,CAAC,OAAO,UAAU,OAAO,CAAC,CAAC,SAAS,WAAW,GAAG,OAAO,GAAG,SAAS,WAAW;CACpF,MAAM,QACJ,WAAW,UAAa,WAAW,OAC/B,SACA,kBAAkB,QAChB,SACA,IAAI,MAAM,OAAO,MAAM,CAAC;CAChC,OAAO,QAAQ,KAAK;AACtB;AA0BA,SAAgB,iBACd,QACA,EAAE,QAAQ,aACA;CACV,MAAM,QAAQ,IAAI,gBAAgB;CAClC,MAAM,QACJ,cAAc,SACV,SACA,iBACQ,OAAO,MAAM,IAAI,mBAAmB,WAAW,eAAe,CAAC,GACrE,SACF;CACN,MAAM,SAAS,IAAI,UAAU;EAC3B,YAAY;EACZ,UAAU,OAAwB,WAAW,UAAU;GAErD,SAAS,MADG,OAAO,UAAU,WAAW,MAAM,aAAa,IAAI,KAC7C;EACpB;EACA,QAAQ,OAAO,UAAU;GACvB,SAAS,KAAK;GACd,aAAa,KAAK;GAMlB,IAAI,SAAS,QAAQ,OAAO,eAAe;IACzC,SAAS,KAAK;IACd;GACF;GAIA,OAAO,MAAM,cAAc,KAAK,CAAC;GACjC,SAAS,KAAK;EAChB;CACF,CAAC;CACD,OAAO,GAAG,SAAS,WAAW;CAE9B,aAAa,cAAc,OAAO,MAAM,QAAQ,MAAM,GAAG,MAAM,MAAM;CACrE,OAAO,KAAK,MAAM;CAClB,OAAO;AACT;AAGA,SAAS,gBAAgB,OAAgC;CACvD,OAAO,OAAO,UAAU,WAAW,OAAO,WAAW,KAAK,IAAI,MAAM;AACtE;AAkBA,SAAgB,cACd,QACA,iBAAyB,0BACH;CAmBtB,IAAI,WAAW;CACf,MAAM,WAA6B,CAAC,aAAa,GAAG,aAAa,CAAC;CAElE,SAAS,eAAuB;EAC9B,MAAM,SAAiB;GACrB,UAAU,IAAI,SAAS;IACrB,YAAY;IACZ,OAAO;KACL,OAAO,MAAM;KACb,OAAO,UAAU;KACjB,MAAM,MAAM;IACd;IACA,QAAQ,OAAO,UAAU;KAGvB,IAAI,CAAC,OAAO,SAAS,eACnB,SAAS,SAAS,IAAI,MAAM,iCAAiC,GAAG,KAAK;KAEvE,SAAS,KAAK;IAChB;GACF,CAAC;GACD,OAAO,CAAC;GACR,WAAW;GACX,aAAa,CAAC;GACd,SAAS;EACX;EACA,OAAO,SAAS,GAAG,SAAS,WAAW;EACvC,OAAO;CACT;CAGA,SAAS,OAAO,QAAsB;EACpC,OAAO,OAAO,YAAY,SAAS,OAAO,SAAS,gBACjD,OAAO,aAAa,OAAO,YAAY,MAAM,KAAK;CAEtD;CAEA,SAAS,MAAM,QAAsB;EACnC,OAAO,OAAO,SAAS;GACrB,MAAM,QAAQ,OAAO,MAAM,MAAM;GACjC,IAAI,UAAU,QAAW;GACzB,IAAI,UAAU,MAAM;IAClB,OAAO,UAAU;IACjB,OAAO,SAAS,KAAK,IAAI;IACzB;GACF;GACA,OAAO,YAAY,KAAK,gBAAgB,KAAK,CAAC;GAC9C,OAAO,UAAU,OAAO,SAAS,KAAK,KAAK;EAC7C;EACA,IAAI,OAAO,WAAW,OAAO,SAAS,GAAG,OAAO,OAAO;CACzD;CAOA,SAAS,SAAS,aAAoB,cAA8C;EAClF,IAAI,UAAU;EACd,WAAW;EACX,OAAO,IAAI,QAAQ,MAAM;EACzB,KAAK,MAAM,UAAU,UAAU;GAC7B,OAAO,MAAM,SAAS;GACtB,OAAO,YAAY;GACnB,OAAO,YAAY,SAAS;GAC5B,IAAI,CAAC,OAAO,SAAS,WAAW,OAAO,SAAS,QAAQ,WAAW;EACrE;EACA,OAAO,QAAQ,gBAAgB,MAAS;CAC1C;CAEA,SAAS,OAAO,OAA8B;EAC5C,MAAM,QAAQ,gBAAgB,KAAK;EACnC,KAAK,MAAM,UAAU,UAAU;GAC7B,OAAO,MAAM,KAAK,KAAK;GACvB,OAAO,aAAa;GACpB,MAAM,MAAM;EACd;EAEA,KAAK,MAAM,UAAU,UAAU,OAAO,MAAM;EAC5C,MAAM,aAAa,KAAK,IAAI,SAAS,EAAE,CAAC,WAAW,SAAS,EAAE,CAAC,SAAS;EACxE,IAAI,aAAa,gBAAgB;GAC/B,MAAM,QAAQ,kBAAkB,gBAAgB,UAAU;GAC1D,SAAS,OAAO,KAAK;GACrB;EACF;EACA,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,SAAS,OAAO,MAAM;CACjE;CAEA,MAAM,WAAW,cAAc,MAAM;CACrC,IAAI,UAAU;EACZ,IAAI,WAAW,UAAU,SAAS,SAAS,OAAO,SAAS,KAAK;OAC3D,KAAK,MAAM,UAAU,UAAU,OAAO,SAAS,KAAK,IAAI;EAC7D,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,SAAS,EAAE,CAAC,QAAQ;CACpD;CAEA,OAAO,GAAG,QAAQ,MAAM;CACxB,OAAO,GAAG,aAAa;EACrB,KAAK,MAAM,UAAU,UAAU;GAC7B,OAAO,MAAM,KAAK,IAAI;GACtB,MAAM,MAAM;EACd;CACF,CAAC;CACD,OAAO,GAAG,UAAU,UAAiB,SAAS,OAAO,KAAK,CAAC;CAC3D,OAAO,GAAG,eAAe;EACvB,IAAI,CAAC,OAAO,eACV,SAAS,IAAI,MAAM,mCAAmC,GAAG,MAAS;CAEtE,CAAC;CAED,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,SAAS,EAAE,CAAC,QAAQ;AACpD;AAiBA,SAAgB,mBAAmB,QAAkB,MAA8B;CACjF,OAAO,IAAI,iBAAiB,iBAAiB,MAAM,GAAG,IAAI;AAC5D;AAGA,IAAM,kBAAkB;AAExB,SAAS,iBAAiB,QAA4B;CACpD,IAAI,QAA2B,CAAC;CAChC,IAAI,aAAa;CACjB,IAAI,YAAY;CAGhB,IAAI,eAAqB,CAAC;CAI1B,MAAM,aAAmB;EACvB,YAAY;EACZ,IAAI,MAAM,WAAW,KAAK,MAAM,WAAW;EAC3C,MAAM,SAAS,OAAO,YAAY,UAAU;EAC5C,IAAI,SAAS;EACb,KAAK,MAAM,SAAS,OAClB,IAAI,OAAO,UAAU,UACnB,UAAU,OAAO,MAAM,OAAO,MAAM;OAC/B;GACL,OAAO,IAAI,OAAO,MAAM;GACxB,UAAU,MAAM;EAClB;EAEF,QAAQ,CAAC;EACT,aAAa;EAGb,IAAI,CAAC,MAAM,KAAK,MAAM,GAAG,OAAO,MAAM;CACxC;CAEA,MAAM,QAAQ,IAAI,SAAS;EACzB,OAAO;GACL,IAAI,OAAO,SAAS,GAAG,OAAO,OAAO;EACvC;EACA,QAAQ,OAAO,UAAU;GAEvB,QAAQ,CAAC;GACT,aAAa;GACb,OAAO;GAEP,IAAI,CAAC,OAAO,eAAe,kBAAkB,QAAQ,SAAS,MAAS;GACvE,SAAS,KAAK;EAChB;CACF,CAAC;CACD,MAAM,GAAG,SAAS,WAAW;CAE7B,MAAM,WAAW,cAAc,MAAM;CACrC,IAAI,UAAU;EAEZ,IAAI,WAAW,UAAU,MAAM,QAAQ,SAAS,KAAK;OAChD,MAAM,KAAK,IAAI;EACpB,OAAO;CACT;CAEA,MAAM,UAAU,UAAiC;EAC/C,MAAM,KAAK,KAAK;EAChB,cAAc,gBAAgB,KAAK;EAGnC,IAAI,cAAc,iBAChB,KAAK;OACA,IAAI,CAAC,WAAW;GACrB,YAAY;GACZ,eAAe,IAAI;EACrB;CACF;CACA,MAAM,cAAoB;EACxB,KAAK;EACL,MAAM,KAAK,IAAI;CACjB;CACA,MAAM,WAAW,UAAuB;EACtC,MAAM,QAAQ,KAAK;CACrB;CACA,MAAM,gBAAsB;EAC1B,IAAI,CAAC,OAAO,eACV,MAAM,QAAQ,OAAO,WAAW,IAAI,MAAM,mCAAmC,CAAC;CAElF;CACA,eAAqB;EACnB,OAAO,IAAI,QAAQ,MAAM;EACzB,OAAO,IAAI,OAAO,KAAK;EACvB,OAAO,IAAI,SAAS,OAAO;EAC3B,OAAO,IAAI,SAAS,OAAO;CAC7B;CACA,OAAO,GAAG,QAAQ,MAAM;CACxB,OAAO,GAAG,OAAO,KAAK;CACtB,OAAO,GAAG,SAAS,OAAO;CAC1B,OAAO,GAAG,SAAS,OAAO;CAC1B,OAAO;AACT;AAOA,SAAS,cAAc,QAA6D;CAClF,IAAI,OAAO,eAAe,OAAO,EAAE,OAAO,KAAK;CAC/C,IAAI,CAAC,OAAO,WAAW,OAAO;CAC9B,OAAO,EAAE,OAAO,OAAO,WAAW,IAAI,MAAM,mCAAmC,EAAE;AACnF;AAWA,SAAgB,uBAAuB,QAAiC;CACtE,IAAI,OAAO,iBAAiB,GAAG,OAAO,QAAQ,QAAQ;CACtD,MAAM,WAAW,cAAc,MAAM;CACrC,IAAI,UAAU,OAAO,WAAW,WAAW,QAAQ,OAAO,SAAS,KAAK,IAAI,QAAQ,QAAQ;CAC5F,OAAO,IAAI,SAAe,SAAS,WAAW;EAC5C,MAAM,UAAU,UAAwB;GACtC,OAAO,IAAI,YAAY,UAAU;GACjC,OAAO,IAAI,SAAS,MAAM;GAC1B,OAAO,IAAI,SAAS,OAAO;GAC3B,IAAI,OAAO,OAAO,KAAK;QAClB,QAAQ;EACf;EACA,MAAM,mBAAyB,OAAO;EACtC,MAAM,gBAAsB,OAAO,OAAO,WAAW,MAAS;EAC9D,OAAO,GAAG,YAAY,UAAU;EAChC,OAAO,GAAG,SAAS,MAAM;EACzB,OAAO,GAAG,SAAS,OAAO;CAC5B,CAAC;AACH"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import "./framework-stack-frames.js";
|
|
2
2
|
import { nodeStreamsPlatform } from "./node-streams-platform.js";
|
|
3
3
|
import { releaseReason } from "./render-utils.js";
|
|
4
|
-
import "./render-timeout.js";
|
|
5
4
|
import { concatBytes, drainWithDeadline } from "./stream-utils.js";
|
|
6
5
|
// src/server/flight-source.ts
|
|
7
6
|
var nodeFlight = nodeStreamsPlatform ? await import("./flight-source-node.js") : null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flight-source.js","names":[],"sources":["../../../../src/server/flight-source.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"flight-source.js","names":[],"sources":["../../../../src/server/flight-source.ts"],"mappings":";;;;;AA+CA,IAAM,aAAa,sBAAsB,MAAM,OAAO,6BAA6B;AAGnF,SAAS,oBAAoD;CAC3D,IAAI,CAAC,YACH,MAAM,IAAI,MAAM,qEAAqE;CAEvF,OAAO;AACT;AAsHA,SAAgB,iBAAiB,QAAoC;CACnE,IAAI,OAAO,SAAS,OAAO;EACzB,MAAM,SAAS,OAAO,OAAO,UAAU;EACvC,OAAO;GACL,YAAY,OAAO,KAAK;GACxB,oBAAoB,CAAC;GACrB,SAAS,WAAW,KAAK,OAAO,OAAO,cAAc,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;EAC9E;CACF;CACA,MAAM,EAAE,sBAAsB,kBAAkB;CAChD,MAAM,SAAS,OAAO;CACtB,MAAM,WAAuC,OAAO,OAAO,cAAc,CAAC;CAC1E,OAAO;EACL,MAAM,YAAY;GAChB,MAAM,SAAS,MAAM,SAAS,KAAK;GACnC,OAAO,OAAO,OAAO;IAAE,MAAM;IAAM,OAAO;GAAU,IAAI;IAAE,MAAM;IAAO,OAAO,OAAO;GAAM;EAC7F;EAGA,oBAAoB;GAClB,MAAM,SAAwB,CAAC;GAC/B,OAAO,OAAO,iBAAiB,KAAK,CAAC,OAAO,WAAW;IACrD,MAAM,QAA4B,OAAO,KAAK;IAC9C,IAAI,UAAU,MAAM;IACpB,OAAO,KAAK,KAAK;GACnB;GACA,OAAO;EACT;EACA,SAAS,WAAW,kBAAkB,QAAQ,MAAM;CACtD;AACF;AAYA,SAAgB,iBAAiB,OAAgC;CAC/D,OAAO,OAAO,UAAU,WAAW,QAAQ,OAAO,KAAK,IAAI;AAC7D;AAEA,IAAM,UAAU,IAAI,YAAY;AAOhC,eAAsB,mBACpB,QACA,WACA,OACkC;CAClC,MAAM,SAAS,MAAM,kBAAkB,iBAAiB,MAAM,GAAG,WAAW,KAAK;CACjF,OAAO,YAAY,OAAO,IAAI,gBAAgB,CAAC;AACjD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"framework-stack-frames.js","names":[],"sources":["../../../../src/server/framework-stack-frames.ts"],"mappings":";
|
|
1
|
+
{"version":3,"file":"framework-stack-frames.js","names":[],"sources":["../../../../src/server/framework-stack-frames.ts"],"mappings":";AAoBA,SAAS,cAAc,WAA8C;CACnE,IAAI,CAAC,WAAW,OAAO;CACvB,MAAM,OAAO,gBAAgB,SAAS;CACtC,MAAM,KAAK,KAAK,IAAI,KAAK,YAAY,OAAO,GAAG,KAAK,YAAY,QAAQ,CAAC;CACzE,OAAO,KAAK,IAAI,KAAK,MAAM,GAAG,KAAK,CAAC,IAAI;AAC1C;AAEA,SAAS,gBAAgB,KAAqB;CAC5C,OAAO,IAAI,WAAW,SAAS,IAAI,UAAU,IAAI,MAAM,CAAgB,CAAC,IAAI;AAC9E;AAEA,IAAM,iBAAiB,cAAc,YAAY,GAAG;AAMpD,SAAgB,gBAAgB,KAAsB;CACpD,IAAI,QAAQ,MAAM,IAAI,WAAW,OAAO,KAAK,IAAI,SAAS,cAAc,GAAG,OAAO;CAClF,OAAO,mBAAmB,QAAQ,CAAC,gBAAgB,GAAG,CAAC,CAAC,WAAW,cAAc;AACnF"}
|
|
@@ -4,13 +4,13 @@ import { appVisibleSearch } from "../shared/rsc-cache-key.js";
|
|
|
4
4
|
import { resolveSegmentParams } from "../shared/slot-params.js";
|
|
5
5
|
import { isDebug } from "./debug.js";
|
|
6
6
|
import { runWithReactCacheScope } from "./react-cache-scope.js";
|
|
7
|
-
import { assertSearchParamsRead, assertUnscopedRead, scopedParams } from "./segment-lifetime/read-rule.js";
|
|
7
|
+
import { assertSearchParamsRead, assertUnscopedRead, currentReadScope, keyedHeaders, scopedParams } from "./segment-lifetime/read-rule.js";
|
|
8
8
|
// src/server/request-context.ts
|
|
9
9
|
function getHeaders() {
|
|
10
10
|
const store = requestContextAls.getStore();
|
|
11
11
|
if (!store) throw new Error("[timber] getHeaders() called outside of a request context. It can only be used in middleware, access checks, server components, and server actions.");
|
|
12
|
-
|
|
13
|
-
return store.headers;
|
|
12
|
+
const scope = currentReadScope();
|
|
13
|
+
return scope ? keyedHeaders(store.headers, scope) : store.headers;
|
|
14
14
|
}
|
|
15
15
|
function getHeader(name) {
|
|
16
16
|
return getHeaders().get(name) ?? void 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":";;;;;;;;
|
|
1
|
+
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":"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"}
|
|
@@ -1,12 +1,34 @@
|
|
|
1
1
|
import { documentReadScopeAls } from "../als-registry.js";
|
|
2
|
+
import { isUnkeyableHeader } from "../../shared/key-headers.js";
|
|
2
3
|
// src/server/segment-lifetime/read-rule.ts
|
|
3
4
|
function currentReadScope() {
|
|
4
5
|
return documentReadScopeAls.getStore();
|
|
5
6
|
}
|
|
6
|
-
function readOutsideKey(scope, what, part) {
|
|
7
|
-
const fix = part ? `Add it to key.${part}, or declare lifetime: 'request'.` : "A 'document' segment cannot depend on it; declare lifetime: 'request'.";
|
|
7
|
+
function readOutsideKey(scope, what, part, fixOverride) {
|
|
8
|
+
const fix = fixOverride ?? (part ? `Add it to key.${part}, or declare lifetime: 'request'.` : "A 'document' segment cannot depend on it; declare lifetime: 'request'.");
|
|
8
9
|
return new Error(`[timber] ${scope.segmentPath} is lifetime: 'document' (declared, or from defaultLayoutLifetime) and read ${what}, which is not in its key. ${fix} The segment is skipped without rendering while its key is unchanged, so the read would freeze at its first value. See design/53-segment-lifetime.md §"What a 'document' segment may read".`);
|
|
9
10
|
}
|
|
11
|
+
function keyedHeaders(headers, scope) {
|
|
12
|
+
const keyed = (name) => {
|
|
13
|
+
if (scope.headers.has(name.toLowerCase())) return name;
|
|
14
|
+
const what = `the header "${name}"`;
|
|
15
|
+
if (name.toLowerCase() === "cookie") throw readOutsideKey(scope, what, "cookies", "Read cookies through a cookie definition in key.cookies.");
|
|
16
|
+
if (isUnkeyableHeader(name)) throw readOutsideKey(scope, what, void 0, "A key may not name a credential; declare lifetime: 'request'.");
|
|
17
|
+
throw readOutsideKey(scope, what, "headers");
|
|
18
|
+
};
|
|
19
|
+
const all = () => {
|
|
20
|
+
throw readOutsideKey(scope, "every request header", void 0, "Read each header you need with getHeaders().get(name) and add it to key.headers, or declare lifetime: 'request'.");
|
|
21
|
+
};
|
|
22
|
+
return {
|
|
23
|
+
get: (name) => headers.get(keyed(name)),
|
|
24
|
+
has: (name) => headers.has(keyed(name)),
|
|
25
|
+
entries: all,
|
|
26
|
+
keys: all,
|
|
27
|
+
values: all,
|
|
28
|
+
forEach: all,
|
|
29
|
+
[Symbol.iterator]: all
|
|
30
|
+
};
|
|
31
|
+
}
|
|
10
32
|
function assertUnscopedRead(what) {
|
|
11
33
|
const scope = currentReadScope();
|
|
12
34
|
if (scope) throw readOutsideKey(scope, what);
|
|
@@ -51,6 +73,6 @@ function scopedParams(params) {
|
|
|
51
73
|
getOwnPropertyDescriptor: (target, name) => allowed(name) ? Reflect.getOwnPropertyDescriptor(target, name) : void 0
|
|
52
74
|
});
|
|
53
75
|
}
|
|
54
|
-
export { assertCookieRead, assertSearchParamsRead, assertUnscopedRead, currentReadScope, readOutsideKey, scopedParams };
|
|
76
|
+
export { assertCookieRead, assertSearchParamsRead, assertUnscopedRead, currentReadScope, keyedHeaders, readOutsideKey, scopedParams };
|
|
55
77
|
|
|
56
78
|
//# 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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-handoff-rsc.js","names":[],"sources":["../../../../src/server/vite-handoff-rsc.ts"],"mappings":";
|
|
1
|
+
{"version":3,"file":"vite-handoff-rsc.js","names":[],"sources":["../../../../src/server/vite-handoff-rsc.ts"],"mappings":";AAyEA,IAAI,WAAoC,CAAC;AAmBzC,SAAS,YAAY,MAAqB;CACxC,OAAO,IAAI,MACT,+BAA+B,KAAK,0IAGtC;AACF;AAEA,SAAS,KAAqC,KAA2B;CACvE,MAAM,QAAQ,SAAS;CACvB,IAAI,UAAU,QAAW,MAAM,YAAY,GAAG;CAC9C,OAAO;AACT;AAEA,SAAS,SAA2C,MAA8B;CAChF,MAAM,KAAK,SAAS,SAAS;CAC7B,IAAI,OAAO,QAAW,MAAM,YAAY,UAAU,MAAM;CACxD,OAAO;AACT;AAGA,SAAgB,mBAAwC;CACtD,OAAO,KAAK,kBAAkB;AAChC;AAMA,IAAa,gBAAkD,GAAG,SAChE,SAAS,cAAc,CAAC,CAAC,GAAG,IAAI;AASlC,IAAa,4BAA0E,GAAG,SACxF,SAAS,0BAA0B,CAAC,CAAC,GAAG,IAAI"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
var CREDENTIAL = "It carries a credential, and a key must not hold secret values.";
|
|
2
|
+
var UNKEYABLE_HEADERS = new Map([
|
|
3
|
+
["cookie", "Key on cookie definitions with key.cookies instead."],
|
|
4
|
+
["authorization", CREDENTIAL],
|
|
5
|
+
["proxy-authorization", CREDENTIAL],
|
|
6
|
+
["x-api-key", CREDENTIAL]
|
|
7
|
+
]);
|
|
8
|
+
function isUnkeyableHeader(name) {
|
|
9
|
+
return UNKEYABLE_HEADERS.has(name.toLowerCase());
|
|
10
|
+
}
|
|
11
|
+
export { isUnkeyableHeader };
|
|
12
|
+
|
|
13
|
+
//# sourceMappingURL=key-headers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"key-headers.js","names":[],"sources":["../../../../src/shared/key-headers.ts"],"mappings":"AAiBA,IAAM,aAAa;AAMnB,IAAM,oBAAiD,IAAI,IAAI;CAC7D,CAAC,UAAU,qDAAqD;CAChE,CAAC,iBAAiB,UAAU;CAC5B,CAAC,uBAAuB,UAAU;CAClC,CAAC,aAAa,UAAU;AAC1B,CAAC;AAWD,SAAgB,kBAAkB,MAAuB;CACvD,OAAO,kBAAkB,IAAI,KAAK,YAAY,CAAC;AACjD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/plugins/entries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS1D,eAAO,MAAM,OAAO,QAEe,CAAC;AAiBpC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAA2C,CAAC;AAE3E;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/plugins/entries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS1D,eAAO,MAAM,OAAO,QAEe,CAAC;AAiBpC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAA2C,CAAC;AAE3E;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAuC,CAAC;AAuInE;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUlF;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAErE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE3D;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAqBxF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CA+B3E;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAiFxD"}
|
package/dist/routing/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { n as scanRoutes } from "../_chunks/scanner-
|
|
1
|
+
import { n as scanRoutes } from "../_chunks/scanner-CCEHN9Jg.js";
|
|
2
2
|
import { t as generateRouteMap } from "../_chunks/codegen-vaCyFyVN.js";
|
|
3
3
|
import { a as INTERCEPTION_MARKERS, i as DEFAULT_PAGE_EXTENSIONS, n as classifyUrlSegment, t as classifySegment } from "../_chunks/segment-classify-Ho8jXWeC.js";
|
|
4
4
|
import { t as collectInterceptionRewrites } from "../_chunks/interception-CtNt9jPt.js";
|
|
5
|
-
import { n as collectDynamicSegmentsFromTree, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "../_chunks/walkers-
|
|
5
|
+
import { n as collectDynamicSegmentsFromTree, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "../_chunks/walkers-BbotBhNG.js";
|
|
6
6
|
export { DEFAULT_PAGE_EXTENSIONS, INTERCEPTION_MARKERS, classifySegment, classifyUrlSegment, collectDynamicSegmentsFromTree, collectInterceptionRewrites, collectLeafRoutes, generateRouteMap, scanRoutes, validateSchemaAgainstRoutes };
|