@timber-js/app 0.2.0-alpha.242 → 0.2.0-alpha.244
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-BkwgRwCl.js → actions-D_LiN5xG.js} +57 -39
- package/dist/_chunks/actions-D_LiN5xG.js.map +1 -0
- package/dist/_chunks/als-registry-C-iwbtvI.js.map +1 -1
- package/dist/_chunks/{cache-api-BGA7c5qJ.js → cache-api-D3HmgsFh.js} +4 -4
- package/dist/_chunks/{cache-api-BGA7c5qJ.js.map → cache-api-D3HmgsFh.js.map} +1 -1
- package/dist/_chunks/{chains-Cuwwjv6T.js → chains-BpvDwp08.js} +2 -2
- package/dist/_chunks/{chains-Cuwwjv6T.js.map → chains-BpvDwp08.js.map} +1 -1
- package/dist/_chunks/chains-CjlZZ5ad.js +1 -0
- package/dist/_chunks/{classify-Y8S9C0Na.js → classify-Bbb_lKjH.js} +2 -2
- package/dist/_chunks/{classify-Y8S9C0Na.js.map → classify-Bbb_lKjH.js.map} +1 -1
- package/dist/_chunks/{cli-check-KeE1QaIx.js → cli-check-BE9BnXwi.js} +6 -6
- package/dist/_chunks/cli-check-BE9BnXwi.js.map +1 -0
- package/dist/_chunks/{cli-schema-sync-DZEF31wd.js → cli-schema-sync-CWkGFlYu.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-DZEF31wd.js.map → cli-schema-sync-CWkGFlYu.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-_y5O6MIg.js → cli-schema-sync-Dyvdkv_I.js} +1 -1
- package/dist/_chunks/{client-dep-entries-DpiwvoDi.js → client-dep-entries-Dka67elj.js} +2 -2
- package/dist/_chunks/{client-dep-entries-DpiwvoDi.js.map → client-dep-entries-Dka67elj.js.map} +1 -1
- package/dist/_chunks/{convention-lint-0AEsPK2T.js → convention-lint-DkSDlsPH.js} +38 -10
- package/dist/_chunks/convention-lint-DkSDlsPH.js.map +1 -0
- package/dist/_chunks/{dev-server-DYDr8KIc.js → dev-server-BZxFJNih.js} +68 -11
- package/dist/_chunks/{dev-server-DYDr8KIc.js.map → dev-server-BZxFJNih.js.map} +1 -1
- package/dist/_chunks/dev-server-C72bB9Kg.js +1 -0
- package/dist/_chunks/error-boundary-wuNvAJ4n.js.map +1 -1
- package/dist/_chunks/{flight-source-node-KQsX_OhS.js → flight-source-node-BeF00Wo_.js} +2 -2
- package/dist/_chunks/{flight-source-node-KQsX_OhS.js.map → flight-source-node-BeF00Wo_.js.map} +1 -1
- package/dist/_chunks/{interception-CtNt9jPt.js → interception-D1dCGNmQ.js} +6 -6
- package/dist/_chunks/{interception-CtNt9jPt.js.map → interception-D1dCGNmQ.js.map} +1 -1
- package/dist/_chunks/{json-lossy-check-BVDALqMf.js → json-lossy-check-DpXneTBm.js} +2 -2
- package/dist/_chunks/{json-lossy-check-BVDALqMf.js.map → json-lossy-check-DpXneTBm.js.map} +1 -1
- package/dist/_chunks/{key-headers-uIig1_mU.js → key-headers-CVpa6fpW.js} +6 -2
- package/dist/_chunks/key-headers-CVpa6fpW.js.map +1 -0
- package/dist/_chunks/{live-graph-VhzO7Ol9.js → live-graph-DXhz6A_X.js} +4 -4
- package/dist/_chunks/{live-graph-VhzO7Ol9.js.map → live-graph-DXhz6A_X.js.map} +1 -1
- package/dist/_chunks/{logger-C4m8rfMy.js → logger-D1sWX2I0.js} +17 -2
- package/dist/_chunks/logger-D1sWX2I0.js.map +1 -0
- package/dist/_chunks/{node-response-8Vz29cGS.js → node-response-Cp62CtH1.js} +2 -2
- package/dist/_chunks/{node-response-8Vz29cGS.js.map → node-response-Cp62CtH1.js.map} +1 -1
- package/dist/_chunks/{poison-scan-Dpl3ibG-.js → poison-scan-DdkJoHvP.js} +2 -2
- package/dist/_chunks/{poison-scan-Dpl3ibG-.js.map → poison-scan-DdkJoHvP.js.map} +1 -1
- package/dist/_chunks/{scanner-CCEHN9Jg.js → scanner-B6V2RqqF.js} +20 -3
- package/dist/_chunks/scanner-B6V2RqqF.js.map +1 -0
- package/dist/_chunks/{sizeof-CIF7fwSJ.js → sizeof-BKA6qOZq.js} +2 -2
- package/dist/_chunks/{sizeof-CIF7fwSJ.js.map → sizeof-BKA6qOZq.js.map} +1 -1
- package/dist/_chunks/{walkers-BbotBhNG.js → walkers-BAZoAlfI.js} +3 -3
- package/dist/_chunks/{walkers-BbotBhNG.js.map → walkers-BAZoAlfI.js.map} +1 -1
- package/dist/adapters/cloudflare-kv-cache.js +1 -1
- package/dist/analyze/crawl-entry.js +3 -3
- package/dist/analyze/graph-command.js +2 -2
- package/dist/cache/index.js +2 -2
- package/dist/cache/stores/memory.js +1 -1
- package/dist/cli-check.d.ts +3 -3
- package/dist/cli-check.d.ts.map +1 -1
- package/dist/cli.js +3 -3
- package/dist/client/document-withdrawal.d.ts +2 -0
- package/dist/client/document-withdrawal.d.ts.map +1 -0
- package/dist/client/outlet-content-cache.d.ts +13 -1
- package/dist/client/outlet-content-cache.d.ts.map +1 -1
- package/dist/client/outlet-scope-context.d.ts +5 -0
- package/dist/client/outlet-scope-context.d.ts.map +1 -1
- package/dist/client/segment-outlet.d.ts.map +1 -1
- package/dist/config-types.d.ts +43 -21
- package/dist/config-types.d.ts.map +1 -1
- package/dist/config-validation.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -9
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/manifest.json +2 -0
- package/dist/native/rsc/server/als-registry.js.map +1 -1
- package/dist/native/rsc/server/cookie-context.js +7 -7
- package/dist/native/rsc/server/cookie-context.js.map +1 -1
- package/dist/native/rsc/server/deny-boundary.js +2 -1
- package/dist/native/rsc/server/deny-boundary.js.map +1 -1
- package/dist/native/rsc/server/dev-overlay-report.js +13 -0
- package/dist/native/rsc/server/dev-overlay-report.js.map +1 -0
- package/dist/native/rsc/server/logger.js +6 -1
- package/dist/native/rsc/server/logger.js.map +1 -1
- package/dist/native/rsc/server/pipeline-interception.js +4 -1
- package/dist/native/rsc/server/pipeline-interception.js.map +1 -1
- package/dist/native/rsc/server/pipeline.js.map +1 -1
- package/dist/native/rsc/server/request-context.js +4 -4
- package/dist/native/rsc/server/request-context.js.map +1 -1
- package/dist/native/rsc/server/route-element-builder.js +1 -1
- package/dist/native/rsc/server/route-element-builder.js.map +1 -1
- package/dist/native/rsc/server/route-module-loader.js +5 -4
- package/dist/native/rsc/server/route-module-loader.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js +2 -1
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-rule.js +31 -20
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-scope.js +48 -7
- package/dist/native/rsc/server/segment-lifetime/read-scope.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/segment-key.js +13 -8
- package/dist/native/rsc/server/segment-lifetime/segment-key.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js +5 -4
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js.map +1 -1
- package/dist/native/rsc/server/slot-resolver.js +5 -4
- package/dist/native/rsc/server/slot-resolver.js.map +1 -1
- package/dist/native/rsc/server/slot-subtree-contain.js +2 -1
- package/dist/native/rsc/server/slot-subtree-contain.js.map +1 -1
- package/dist/native/rsc/server/subtree-walk.js +14 -5
- package/dist/native/rsc/server/subtree-walk.js.map +1 -1
- package/dist/native/rsc/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/rsc/shared/key-headers.js +4 -1
- package/dist/native/rsc/shared/key-headers.js.map +1 -1
- package/dist/native/rsc/shared/layout-defaults.js +19 -0
- package/dist/native/rsc/shared/layout-defaults.js.map +1 -0
- package/dist/native/ssr/client/document-withdrawal.js +17 -0
- package/dist/native/ssr/client/document-withdrawal.js.map +1 -0
- package/dist/native/ssr/client/outlet-content-cache.js +6 -1
- 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 +11 -2
- package/dist/native/ssr/client/segment-outlet.js.map +1 -1
- package/dist/native/ssr/manifest.json +6 -0
- package/dist/native/ssr/server/als-registry.js.map +1 -1
- package/dist/native/ssr/server/cookie-context.js +7 -7
- package/dist/native/ssr/server/cookie-context.js.map +1 -1
- package/dist/native/ssr/server/deny-boundary.js +2 -1
- package/dist/native/ssr/server/deny-boundary.js.map +1 -1
- package/dist/native/ssr/server/dev-overlay-report.js +6 -0
- package/dist/native/ssr/server/dev-overlay-report.js.map +1 -0
- package/dist/native/ssr/server/logger.js +6 -1
- package/dist/native/ssr/server/logger.js.map +1 -1
- package/dist/native/ssr/server/pipeline-interception.js +4 -1
- package/dist/native/ssr/server/pipeline-interception.js.map +1 -1
- package/dist/native/ssr/server/pipeline.js.map +1 -1
- package/dist/native/ssr/server/request-context.js +4 -4
- package/dist/native/ssr/server/request-context.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js +12 -0
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js.map +1 -0
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +31 -20
- package/dist/native/ssr/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/read-scope.js +16 -0
- package/dist/native/ssr/server/segment-lifetime/read-scope.js.map +1 -0
- package/dist/native/ssr/server/subtree-walk.js +149 -0
- package/dist/native/ssr/server/subtree-walk.js.map +1 -0
- package/dist/native/ssr/server/utils/element-type.js +21 -9
- package/dist/native/ssr/server/utils/element-type.js.map +1 -1
- package/dist/native/ssr/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/ssr/shared/key-headers.js +4 -1
- package/dist/native/ssr/shared/key-headers.js.map +1 -1
- package/dist/native/ssr/shared/layout-defaults.js +9 -0
- package/dist/native/ssr/shared/layout-defaults.js.map +1 -0
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/routing/convention-lint.d.ts +2 -2
- package/dist/routing/convention-lint.d.ts.map +1 -1
- package/dist/routing/index.js +3 -3
- package/dist/routing/route-options-lint.d.ts +2 -2
- package/dist/routing/route-options-lint.d.ts.map +1 -1
- package/dist/routing/slot-placement.d.ts +23 -4
- package/dist/routing/slot-placement.d.ts.map +1 -1
- package/dist/server/als-registry.d.ts +18 -0
- package/dist/server/als-registry.d.ts.map +1 -1
- package/dist/server/deny-boundary.d.ts.map +1 -1
- package/dist/server/dev-overlay-report.d.ts +13 -0
- package/dist/server/dev-overlay-report.d.ts.map +1 -0
- package/dist/server/index.js +2 -2
- package/dist/server/internal.js +97 -8
- package/dist/server/internal.js.map +1 -1
- package/dist/server/logger.d.ts +10 -0
- package/dist/server/logger.d.ts.map +1 -1
- package/dist/server/pipeline-interception.d.ts.map +1 -1
- package/dist/server/pipeline.d.ts +13 -1
- package/dist/server/pipeline.d.ts.map +1 -1
- package/dist/server/route-module-loader.d.ts +4 -3
- package/dist/server/route-module-loader.d.ts.map +1 -1
- package/dist/server/rsc-entry/index.d.ts.map +1 -1
- package/dist/server/rsc-entry/render-route.d.ts +3 -3
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- package/dist/server/rsc-entry/revalidate-renderer.d.ts +3 -3
- package/dist/server/rsc-entry/revalidate-renderer.d.ts.map +1 -1
- package/dist/server/segment-lifetime/outlet-gate.d.ts +5 -5
- package/dist/server/segment-lifetime/outlet-gate.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-rule.d.ts +14 -18
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-scope.d.ts +47 -6
- package/dist/server/segment-lifetime/read-scope.d.ts.map +1 -1
- package/dist/server/segment-lifetime/segment-key.d.ts +21 -18
- package/dist/server/segment-lifetime/segment-key.d.ts.map +1 -1
- package/dist/server/segment-lifetime/slot-outlets.d.ts +3 -4
- package/dist/server/segment-lifetime/slot-outlets.d.ts.map +1 -1
- package/dist/server/slot-resolver.d.ts.map +1 -1
- package/dist/server/slot-subtree-contain.d.ts.map +1 -1
- package/dist/server/subtree-walk.d.ts +17 -3
- package/dist/server/subtree-walk.d.ts.map +1 -1
- package/dist/server/types.d.ts +4 -3
- package/dist/server/types.d.ts.map +1 -1
- package/dist/server/vite-handoff-rsc.d.ts +2 -0
- package/dist/server/vite-handoff-rsc.d.ts.map +1 -1
- package/dist/shared/key-headers.d.ts +2 -0
- package/dist/shared/key-headers.d.ts.map +1 -1
- package/dist/shared/layout-defaults.d.ts +30 -0
- package/dist/shared/layout-defaults.d.ts.map +1 -0
- package/docs/api/30-api-server.mdx +1 -1
- package/docs/api/34-api-config.mdx +20 -3
- package/package.json +1 -1
- package/src/cli-check.ts +6 -6
- package/src/client/document-withdrawal.tsx +41 -0
- package/src/client/outlet-content-cache.ts +18 -2
- package/src/client/outlet-scope-context.ts +5 -0
- package/src/client/segment-outlet.tsx +9 -3
- package/src/config-types.ts +44 -21
- package/src/config-validation.ts +96 -20
- package/src/index.ts +1 -1
- package/src/plugins/entries.ts +6 -3
- package/src/plugins/routing.ts +1 -1
- package/src/routing/convention-lint.ts +5 -3
- package/src/routing/interception.ts +5 -5
- package/src/routing/route-options-lint.ts +6 -6
- package/src/routing/slot-placement.ts +41 -4
- package/src/server/als-registry.ts +14 -0
- package/src/server/cookie-context.ts +7 -7
- package/src/server/deny-boundary.ts +4 -1
- package/src/server/dev-overlay-report.ts +22 -0
- package/src/server/logger.ts +13 -0
- package/src/server/pipeline-interception.ts +11 -2
- package/src/server/pipeline.ts +13 -1
- package/src/server/request-context.ts +6 -6
- package/src/server/route-element-builder.ts +3 -3
- package/src/server/route-module-loader.ts +7 -6
- package/src/server/rsc-entry/index.ts +14 -8
- package/src/server/rsc-entry/render-route.ts +4 -4
- package/src/server/rsc-entry/revalidate-renderer.ts +4 -4
- package/src/server/segment-lifetime/outlet-gate.ts +6 -6
- package/src/server/segment-lifetime/read-rule.ts +67 -33
- package/src/server/segment-lifetime/read-scope.ts +128 -14
- package/src/server/segment-lifetime/segment-key.ts +32 -24
- package/src/server/segment-lifetime/slot-outlets.ts +8 -12
- package/src/server/slot-resolver.ts +22 -10
- package/src/server/slot-subtree-contain.ts +2 -1
- package/src/server/subtree-walk.ts +34 -9
- package/src/server/types.ts +4 -3
- package/src/server/vite-handoff-rsc.ts +2 -0
- package/src/shared/key-headers.ts +5 -0
- package/src/shared/layout-defaults.ts +43 -0
- package/dist/_chunks/actions-BkwgRwCl.js.map +0 -1
- package/dist/_chunks/chains-LGjBHfSN.js +0 -1
- package/dist/_chunks/cli-check-KeE1QaIx.js.map +0 -1
- package/dist/_chunks/convention-lint-0AEsPK2T.js.map +0 -1
- package/dist/_chunks/dev-server-CboXr8zX.js +0 -1
- package/dist/_chunks/key-headers-uIig1_mU.js.map +0 -1
- package/dist/_chunks/logger-C4m8rfMy.js.map +0 -1
- package/dist/_chunks/scanner-CCEHN9Jg.js.map +0 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { documentReadScopeAls } from "../als-registry.js";
|
|
2
2
|
import { isOutletGateElement } from "./outlet-gate.js";
|
|
3
|
-
import { callAndRewrite } from "../subtree-walk.js";
|
|
4
|
-
import {
|
|
3
|
+
import { callAndRewrite, isThenable } from "../subtree-walk.js";
|
|
4
|
+
import { clientComponents } from "../vite-handoff-rsc.js";
|
|
5
|
+
import { Fragment, createElement } from "../../_react/react.js";
|
|
5
6
|
// src/server/segment-lifetime/read-scope.ts
|
|
6
7
|
function readScopeFor(segmentPath, lifetime, pathParams) {
|
|
7
8
|
const { key } = lifetime;
|
|
@@ -13,16 +14,44 @@ function readScopeFor(segmentPath, lifetime, pathParams) {
|
|
|
13
14
|
urlKey: key.searchParams?.urlKeys[field] ?? field
|
|
14
15
|
}])),
|
|
15
16
|
cookies: new Map((key.cookies ?? []).map((cookie) => [cookie.name, cookie.codec])),
|
|
16
|
-
headers: new Set((key.headers ?? []).map((name) => name.toLowerCase()))
|
|
17
|
+
headers: new Set((key.headers ?? []).map((name) => name.toLowerCase())),
|
|
18
|
+
reported: { done: false },
|
|
19
|
+
call: { read: false }
|
|
17
20
|
};
|
|
18
21
|
}
|
|
19
22
|
function inReadScope(component, scope) {
|
|
20
23
|
const rule = scopeRule(scope);
|
|
21
|
-
return (props) =>
|
|
24
|
+
return (props) => runCall(scope, () => callAndRewrite(component, props, rule));
|
|
22
25
|
}
|
|
23
26
|
function ScopedServerComponent(props) {
|
|
24
27
|
const { component, componentProps, scope } = props;
|
|
25
|
-
return
|
|
28
|
+
return runCall(scope, () => callAndRewrite(component, componentProps, scopeRule(scope)));
|
|
29
|
+
}
|
|
30
|
+
function runCall(scope, call) {
|
|
31
|
+
const frame = {
|
|
32
|
+
...scope,
|
|
33
|
+
call: { read: false }
|
|
34
|
+
};
|
|
35
|
+
const thrown = (error) => {
|
|
36
|
+
if (frame.call.read && typeof error === "object" && error !== null) THROWN_AFTER_READ.add(error);
|
|
37
|
+
throw error;
|
|
38
|
+
};
|
|
39
|
+
let output;
|
|
40
|
+
try {
|
|
41
|
+
output = documentReadScopeAls.run(frame, call);
|
|
42
|
+
} catch (error) {
|
|
43
|
+
return thrown(error);
|
|
44
|
+
}
|
|
45
|
+
if (isThenable(output)) return Promise.resolve(output).then((node) => frame.call.read ? withMarker(node) : node, thrown);
|
|
46
|
+
return frame.call.read ? withMarker(output) : output;
|
|
47
|
+
}
|
|
48
|
+
var THROWN_AFTER_READ = new WeakSet();
|
|
49
|
+
function fallbackAfter(error, fallback) {
|
|
50
|
+
return typeof error === "object" && error !== null && THROWN_AFTER_READ.has(error) ? withMarker(fallback) : fallback;
|
|
51
|
+
}
|
|
52
|
+
function withMarker(node) {
|
|
53
|
+
const { DocumentWithdrawal } = clientComponents();
|
|
54
|
+
return createElement(Fragment, null, node, createElement(DocumentWithdrawal));
|
|
26
55
|
}
|
|
27
56
|
function scopeRule(scope) {
|
|
28
57
|
return {
|
|
@@ -33,9 +62,21 @@ function scopeRule(scope) {
|
|
|
33
62
|
...key !== null ? { key } : void 0
|
|
34
63
|
}),
|
|
35
64
|
isOpaque: isOutletGateElement,
|
|
36
|
-
|
|
65
|
+
iterate: () => {
|
|
66
|
+
const frame = {
|
|
67
|
+
...scope,
|
|
68
|
+
call: { read: false }
|
|
69
|
+
};
|
|
70
|
+
let marked = false;
|
|
71
|
+
const due = () => frame.call.read && !marked && (marked = true);
|
|
72
|
+
return {
|
|
73
|
+
run: (fn) => documentReadScopeAls.run(frame, fn),
|
|
74
|
+
yielded: (value) => due() ? withMarker(value) : value,
|
|
75
|
+
beforeClose: () => due() ? withMarker(null) : void 0
|
|
76
|
+
};
|
|
77
|
+
}
|
|
37
78
|
};
|
|
38
79
|
}
|
|
39
|
-
export { inReadScope, readScopeFor };
|
|
80
|
+
export { fallbackAfter, inReadScope, readScopeFor };
|
|
40
81
|
|
|
41
82
|
//# sourceMappingURL=read-scope.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-scope.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-scope.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-scope.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-scope.ts"],"mappings":";;;;;;AA6EA,SAAgB,aACd,aACA,UACA,YACmB;CACnB,MAAM,EAAE,QAAQ;CAChB,OAAO;EACL;EACA,QAAQ,IAAI,IAAI,IAAI,iBAAiB,UAAU;EAC/C,cAAc,IAAI,IAChB,OAAO,QAAQ,IAAI,cAAc,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CACrE,OACA;GAAE;GAAO,QAAQ,IAAI,cAAc,QAAQ,UAAU;EAAM,CAC7D,CAAC,CACH;EACA,SAAS,IAAI,KAAK,IAAI,WAAW,CAAC,EAAA,CAAG,KAAK,WAAW,CAAC,OAAO,MAAM,OAAO,KAAK,CAAC,CAAC;EACjF,SAAS,IAAI,KAAK,IAAI,WAAW,CAAC,EAAA,CAAG,KAAK,SAAS,KAAK,YAAY,CAAC,CAAC;EACtE,UAAU,EAAE,MAAM,MAAM;EACxB,MAAM,EAAE,MAAM,MAAM;CACtB;AACF;AAMA,SAAgB,YAAY,WAA4B,OAA2C;CACjG,MAAM,OAAO,UAAU,KAAK;CAC5B,QAAQ,UAAU,QAAQ,aAAa,eAAe,WAAW,OAAO,IAAI,CAAC;AAC/E;AAQA,SAAS,sBAAsB,OAII;CACjC,MAAM,EAAE,WAAW,gBAAgB,UAAU;CAC7C,OAAO,QAAQ,aAAa,eAAe,WAAW,gBAAgB,UAAU,KAAK,CAAC,CAAC;AACzF;AAQA,SAAS,QACP,OACA,MACgC;CAChC,MAAM,QAA2B;EAAE,GAAG;EAAO,MAAM,EAAE,MAAM,MAAM;CAAE;CACnE,MAAM,UAAU,UAA0B;EACxC,IAAI,MAAM,KAAK,QAAQ,OAAO,UAAU,YAAY,UAAU,MAC5D,kBAAkB,IAAI,KAAK;EAE7B,MAAM;CACR;CACA,IAAI;CACJ,IAAI;EACF,SAAS,qBAAqB,IAAI,OAAO,IAAI;CAC/C,SAAS,OAAO;EACd,OAAO,OAAO,KAAK;CACrB;CACA,IAAI,WAAW,MAAM,GACnB,OAAO,QAAQ,QAAQ,MAAM,CAAC,CAAC,MAC5B,SAAU,MAAM,KAAK,OAAO,WAAW,IAAI,IAAI,MAChD,MACF;CAEF,OAAO,MAAM,KAAK,OAAO,WAAW,MAAM,IAAI;AAChD;AAMA,IAAM,oBAAoB,IAAI,QAAgB;AAQ9C,SAAgB,cAAmC,OAAgB,UAA+B;CAEhG,OADe,OAAO,UAAU,YAAY,UAAU,QAAQ,kBAAkB,IAAI,KAAK,IACzE,WAAW,QAAQ,IAAI;AACzC;AAOA,SAAS,WAAW,MAA+B;CACjD,MAAM,EAAE,uBAAuB,iBAAiB;CAChD,OAAO,cAAc,UAAU,MAAM,MAAM,cAAc,kBAAkB,CAAC;AAC9E;AAEA,SAAS,UAAU,OAAuC;CACxD,OAAO;EACL,OAAO,WAAW,gBAAgB,QAChC,cAAe,wBACX,SACA,cAAc,uBAAuB;GACnC;GACA;GACA;GACA,GAAI,QAAQ,OAAO,EAAE,IAAI,IAAI;EAC/B,CAAC;EAEP,UAAU;EAQV,eAAe;GACb,MAAM,QAA2B;IAAE,GAAG;IAAO,MAAM,EAAE,MAAM,MAAM;GAAE;GACnE,IAAI,SAAS;GACb,MAAM,YAAY,MAAM,KAAK,QAAQ,CAAC,WAAW,SAAS;GAC1D,OAAO;IACL,MAAM,OAAO,qBAAqB,IAAI,OAAO,EAAE;IAE/C,UAAU,UAAW,IAAI,IAAI,WAAW,KAAkB,IAAI;IAC9D,mBAAoB,IAAI,IAAI,WAAW,IAAI,IAAI;GACjD;EACF;CACF;AACF"}
|
|
@@ -1,23 +1,28 @@
|
|
|
1
1
|
import { ROUTE_OPTIONS_EXPORT } from "../../shared/route-options-export.js";
|
|
2
2
|
import { getCookieJar } from "../cookie-context.js";
|
|
3
3
|
import { getHeaders, getSearchParams } from "../request-context.js";
|
|
4
|
-
import { headerKeyProblem } from "../../shared/key-headers.js";
|
|
4
|
+
import { headerKeyProblem, isHeaderList } from "../../shared/key-headers.js";
|
|
5
|
+
import { NO_LAYOUT_DEFAULTS } from "../../shared/layout-defaults.js";
|
|
5
6
|
// src/server/segment-lifetime/segment-key.ts
|
|
6
|
-
function
|
|
7
|
-
return chain.some((segment) => segment.segmentType === "intercepting") ?
|
|
7
|
+
function layoutDefaultsAt(chain, appDefaults) {
|
|
8
|
+
return chain.some((segment) => segment.segmentType === "intercepting") ? NO_LAYOUT_DEFAULTS : appDefaults;
|
|
8
9
|
}
|
|
9
|
-
function readDocumentLifetime(mod, kind,
|
|
10
|
+
function readDocumentLifetime(mod, kind, defaults) {
|
|
10
11
|
const exported = mod[ROUTE_OPTIONS_EXPORT[kind]];
|
|
11
12
|
const options = typeof exported === "object" && exported !== null ? exported : {};
|
|
12
|
-
if ((("lifetime" in options ? options.lifetime : void 0) ??
|
|
13
|
+
if ((("lifetime" in options ? options.lifetime : void 0) ?? defaults.lifetime) !== "document") return void 0;
|
|
13
14
|
const key = "key" in options ? options.key : void 0;
|
|
14
|
-
const
|
|
15
|
+
const declared = typeof key === "object" && key !== null ? key : {};
|
|
16
|
+
const segmentKey = declared.headers === void 0 && defaults.headers !== void 0 ? {
|
|
17
|
+
...declared,
|
|
18
|
+
headers: defaults.headers
|
|
19
|
+
} : declared;
|
|
15
20
|
assertKeyableHeaders(segmentKey.headers);
|
|
16
21
|
return { key: segmentKey };
|
|
17
22
|
}
|
|
18
23
|
function assertKeyableHeaders(headers) {
|
|
19
24
|
if (headers === void 0) return;
|
|
20
|
-
if (!
|
|
25
|
+
if (!isHeaderList(headers)) throw new Error("[timber] key.headers must be an array of header names.");
|
|
21
26
|
for (const name of headers) {
|
|
22
27
|
const problem = headerKeyProblem(name);
|
|
23
28
|
if (problem) throw new Error(`[timber] ${problem}`);
|
|
@@ -59,6 +64,6 @@ function tagged(value) {
|
|
|
59
64
|
if (value instanceof Set) return ["t", [...value].map(tagged)];
|
|
60
65
|
return ["o", Object.entries(value).map(([k, v]) => [k, tagged(v)])];
|
|
61
66
|
}
|
|
62
|
-
export {
|
|
67
|
+
export { layoutDefaultsAt, readDocumentLifetime, readKeyValues };
|
|
63
68
|
|
|
64
69
|
//# sourceMappingURL=segment-key.js.map
|
|
@@ -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,7 +1,8 @@
|
|
|
1
1
|
import { childrenOutletKey, layoutOutletKey, pageOutletKey, slotChainTreePath } from "../../routing/segment-keys.js";
|
|
2
2
|
import { outletGate } from "./outlet-gate.js";
|
|
3
3
|
import { documentOutletFor } from "./document-outlet.js";
|
|
4
|
-
import {
|
|
4
|
+
import { layoutDefaultsAt, readDocumentLifetime } from "./segment-key.js";
|
|
5
|
+
import { NO_LAYOUT_DEFAULTS } from "../../shared/layout-defaults.js";
|
|
5
6
|
import { inReadScope, readScopeFor } from "./read-scope.js";
|
|
6
7
|
// src/server/segment-lifetime/slot-outlets.ts
|
|
7
8
|
var SlotDocumentOutlets = class {
|
|
@@ -14,10 +15,10 @@ var SlotDocumentOutlets = class {
|
|
|
14
15
|
return this.unclaimed;
|
|
15
16
|
}
|
|
16
17
|
lifetimeOf(node, mod, kind) {
|
|
17
|
-
if (kind === "page") return readDocumentLifetime(mod, kind,
|
|
18
|
+
if (kind === "page") return readDocumentLifetime(mod, kind, NO_LAYOUT_DEFAULTS);
|
|
18
19
|
const chain = [...this.ctx.ownerChain, ...this.ctx.chain.slice(0, this.depth(node) + 1)];
|
|
19
|
-
const
|
|
20
|
-
return readDocumentLifetime(mod, kind,
|
|
20
|
+
const defaults = layoutDefaultsAt(chain, this.ctx.render.layoutDefaults);
|
|
21
|
+
return readDocumentLifetime(mod, kind, defaults);
|
|
21
22
|
}
|
|
22
23
|
async page(node, lifetime, element) {
|
|
23
24
|
const segmentPath = pageOutletKey(this.treePath(node));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slot-outlets.js","names":[],"sources":["../../../../../src/server/segment-lifetime/slot-outlets.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"slot-outlets.js","names":[],"sources":["../../../../../src/server/segment-lifetime/slot-outlets.ts"],"mappings":";;;;;;;AA6DA,IAAa,sBAAb,MAAiC;CAGF;CAF7B,YAAkC,CAAC;CAEnC,YAAY,KAA2C;EAA1B,KAAA,MAAA;CAA2B;CAGxD,YAA0B;EACxB,OAAO,KAAK;CACd;CAMA,WACE,MACA,KACA,MAC8B;EAC9B,IAAI,SAAS,QAAQ,OAAO,qBAAqB,KAAK,MAAM,kBAAkB;EAC9E,MAAM,QAAQ,CAAC,GAAG,KAAK,IAAI,YAAY,GAAG,KAAK,IAAI,MAAM,MAAM,GAAG,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC;EACvF,MAAM,WAAW,iBAAiB,OAAO,KAAK,IAAI,OAAO,cAAc;EACvE,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"}
|
|
@@ -15,6 +15,7 @@ import { computeSlotKey, slotChainTreePath } from "../routing/segment-keys.js";
|
|
|
15
15
|
import { LIVE_ONLY_RENDER, outletGate } from "./segment-lifetime/outlet-gate.js";
|
|
16
16
|
import { pathParamNames } from "./segment-lifetime/document-outlet.js";
|
|
17
17
|
import { SlotDocumentOutlets } from "./segment-lifetime/slot-outlets.js";
|
|
18
|
+
import { fallbackAfter } from "./segment-lifetime/read-scope.js";
|
|
18
19
|
import { clientComponents } from "./vite-handoff-rsc.js";
|
|
19
20
|
// src/server/slot-resolver.ts
|
|
20
21
|
async function loadComponent(loader) {
|
|
@@ -27,7 +28,7 @@ async function renderDefaultFallback(slotNode, h) {
|
|
|
27
28
|
return h(DefaultComp, {});
|
|
28
29
|
}
|
|
29
30
|
async function resolveSlotElement(slotNode, match, h, req, interception, parentTreePath, render = LIVE_ONLY_RENDER) {
|
|
30
|
-
const intercepting = interception ? findInterceptingMatch(slotNode, interception.targetPathname) : null;
|
|
31
|
+
const intercepting = interception && interception.interceptingScope === parentTreePath ? findInterceptingMatch(slotNode, interception.targetPathname) : null;
|
|
31
32
|
const slotMatch = intercepting ?? findSlotMatch(slotNode, match);
|
|
32
33
|
if (slotMatch) {
|
|
33
34
|
const coerced = coerceSlotParams(slotMatch.chain, slotMatch.slotParams);
|
|
@@ -64,9 +65,9 @@ async function resolveSlotElement(slotNode, match, h, req, interception, parentT
|
|
|
64
65
|
return containSlotSubtree(rendered, denyFallback);
|
|
65
66
|
} catch (error) {
|
|
66
67
|
if (isRedirectSignal(error)) throw error;
|
|
67
|
-
if (isDenySignal(error)) return denyFallback;
|
|
68
|
+
if (isDenySignal(error)) return fallbackAfter(error, denyFallback);
|
|
68
69
|
reportRenderError(error, req, { segments: match.segments });
|
|
69
|
-
return denyFallback;
|
|
70
|
+
return fallbackAfter(error, denyFallback);
|
|
70
71
|
}
|
|
71
72
|
};
|
|
72
73
|
element = h(SafeSlotPage, {});
|
|
@@ -116,7 +117,7 @@ function ScopedSlotLayout(props) {
|
|
|
116
117
|
try {
|
|
117
118
|
rendered = traceCall("timber.layout", props.spanAttributes, () => props.scope(() => props.layout({ children: props.children })));
|
|
118
119
|
} catch (error) {
|
|
119
|
-
if (isDenySignal(error)) return props.denyFallback;
|
|
120
|
+
if (isDenySignal(error)) return fallbackAfter(error, props.denyFallback);
|
|
120
121
|
throw error;
|
|
121
122
|
}
|
|
122
123
|
return containSlotSubtree(rendered, props.denyFallback, props.children);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slot-resolver.js","names":[],"sources":["../../../../src/server/slot-resolver.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"slot-resolver.js","names":[],"sources":["../../../../src/server/slot-resolver.ts"],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { isDenySignal } from "./signal-identity.js";
|
|
2
2
|
import { isThenable, rewriteSubtree } from "./subtree-walk.js";
|
|
3
|
+
import { fallbackAfter } from "./segment-lifetime/read-scope.js";
|
|
3
4
|
import { createElement } from "../_react/react.js";
|
|
4
5
|
// src/server/slot-subtree-contain.ts
|
|
5
6
|
function denyToFallback(fallback) {
|
|
6
7
|
return (error) => {
|
|
7
|
-
if (isDenySignal(error)) return fallback;
|
|
8
|
+
if (isDenySignal(error)) return fallbackAfter(error, fallback);
|
|
8
9
|
throw error;
|
|
9
10
|
};
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slot-subtree-contain.js","names":[],"sources":["../../../../src/server/slot-subtree-contain.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"slot-subtree-contain.js","names":[],"sources":["../../../../src/server/slot-subtree-contain.ts"],"mappings":";;;;;AA+CA,SAAS,eAAe,UAAoD;CAC1E,QAAQ,UAAU;EAChB,IAAI,aAAa,KAAK,GAAG,OAAO,cAAc,OAAO,QAAQ;EAC7D,MAAM;CACR;AACF;AAQA,SAAS,YAAY,UAAqB,QAA8B;CACtE,OAAO;EACL,OAAO,WAAW,gBAAgB,QAChC,cAAe,yBACX,SACA,cAAc,wBAAwB;GACpC;GACA;GACA;GACA,GAAI,QAAQ,OAAO,EAAE,IAAI,IAAI;EAC/B,CAAC;EACP,WAAW,SAAS,WAAW,UAAa,SAAS;EACrD,YAAY,eAAe,QAAQ;CACrC;AACF;AAUA,SAAS,uBAAuB,OAIG;CACjC,MAAM,EAAE,WAAW,WAAW,gBAAgB,aAAa;CAC3D,MAAM,OAAO,YAAY,UAAU,MAAS;CAC5C,IAAI;CACJ,IAAI;EACF,SAAS,UAAU,cAAc;CACnC,SAAS,OAAO;EACd,OAAO,eAAe,QAAQ,CAAC,CAAC,KAAK;CACvC;CAGA,IAAI,WAAW,MAAM,GACnB,OAAO,QAAQ,QAAQ,MAAM,CAAC,CAAC,MAC5B,UAAU,eAAe,OAAO,IAAI,GACrC,eAAe,QAAQ,CACzB;CAEF,OAAO,eAAe,QAAQ,IAAI;AACpC;AAcA,SAAgB,mBACd,MACA,UACA,QACW;CACX,OAAO,eAAe,MAAM,YAAY,UAAU,MAAM,CAAC;AAC3D"}
|
|
@@ -36,6 +36,11 @@ function isRewritableIterable(value) {
|
|
|
36
36
|
function isAsyncIterable(value) {
|
|
37
37
|
return typeof value[Symbol.asyncIterator] === "function" && !(typeof ReadableStream !== "undefined" && value instanceof ReadableStream);
|
|
38
38
|
}
|
|
39
|
+
var AS_IS = {
|
|
40
|
+
run: (fn) => fn(),
|
|
41
|
+
yielded: (value) => value,
|
|
42
|
+
beforeClose: () => void 0
|
|
43
|
+
};
|
|
39
44
|
function walk(node, rule, seen) {
|
|
40
45
|
if (typeof node !== "object" || node === null) return node;
|
|
41
46
|
if (seen.has(node)) return seen.get(node);
|
|
@@ -89,13 +94,17 @@ function rewriteNode(node, rule, seen) {
|
|
|
89
94
|
}
|
|
90
95
|
if (isAsyncIterable(node)) {
|
|
91
96
|
const source = node;
|
|
92
|
-
const runIn = rule.runIn ?? ((fn) => fn());
|
|
93
97
|
return { async *[Symbol.asyncIterator]() {
|
|
94
|
-
const
|
|
98
|
+
const { run, yielded, beforeClose } = rule.iterate?.() ?? AS_IS;
|
|
99
|
+
const iterator = run(() => source[Symbol.asyncIterator]());
|
|
95
100
|
for (;;) {
|
|
96
|
-
const step = await
|
|
97
|
-
if (step.done)
|
|
98
|
-
|
|
101
|
+
const step = await run(() => iterator.next());
|
|
102
|
+
if (step.done) {
|
|
103
|
+
const last = beforeClose();
|
|
104
|
+
if (last !== void 0) yield last;
|
|
105
|
+
return run(() => walk(step.value, rule, seen));
|
|
106
|
+
}
|
|
107
|
+
yield yielded(run(() => walk(step.value, rule, seen)));
|
|
99
108
|
}
|
|
100
109
|
} };
|
|
101
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subtree-walk.js","names":[],"sources":["../../../../src/server/subtree-walk.ts"],"mappings":";;;AA0BA,IAAM,eAAe,IAAI,IAAY,CACnC,OAAO,IAAI,4BAA4B,GACvC,OAAO,IAAI,eAAe,CAC5B,CAAC;AASD,SAAgB,WAAW,OAA4C;CACrE,OACE,OAAO,UAAU,YACjB,UAAU,QACV,OAAQ,MAA6B,SAAS;AAElD;AAEA,SAAS,UAAU,OAAuC;CACxD,OACE,OAAO,UAAU,YACjB,UAAU,QACV,aAAa,IAAK,MAAgC,QAAkB;AAExE;AAGA,SAAS,kBAAkB,MAAwC;CACjE,OACE,OAAO,SAAS,cAChB,CAAC,kBAAkB,IAAI,KACvB,CAAE,KAAwD,WAAW;AAEzE;AAGA,IAAM,WAAW,OAAO,IAAI,YAAY;AACxC,IAAM,kBAAkB,OAAO,IAAI,mBAAmB;AACtD,IAAM,WAAW,OAAO,IAAI,YAAY;AAexC,SAAS,kBAAkB,MAA4C;CACrE,IAAI,kBAAkB,IAAI,GAAG,OAAO;CACpC,IAAI,OAAO,SAAS,YAAY,SAAS,MAAM,OAAO;CACtD,MAAM,MAAO,KAA+B;CAC5C,IAAI,QAAQ,UAAU,OAAO,kBAAmB,KAA2B,IAAI;CAC/E,IAAI,QAAQ,iBAAiB,OAAO,kBAAmB,KAA6B,MAAM;CAC1F,IAAI,QAAQ,UAAU;EACpB,MAAM,OAAO;EAMb,QAAQ,UAAU,cAAc,KAAK,MAAM,KAAK,QAAQ,GAAG,KAAK;CAClE;AAEF;AAEA,SAAS,cAAc,OAAkD;CACvE,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM,OAAO;CACxD,MAAM,QAAQ,OAAO,eAAe,KAAK;CACzC,OAAO,UAAU,OAAO,aAAa,UAAU;AACjD;AAIA,SAAS,qBAAqB,OAA2C;CACvE,OACE,OAAQ,MAA0C,OAAO,cAAc,cACvE,CAAC,YAAY,OAAO,KAAK,KACzB,EAAE,iBAAiB,gBACnB,EAAE,OAAO,aAAa,eAAe,iBAAiB,aACtD,CAAC,UAAU,KAAK;AAEpB;AAGA,SAAS,gBAAgB,OAAgD;CACvE,OACE,OAAQ,MAA+C,OAAO,mBAAmB,cACjF,EAAE,OAAO,mBAAmB,eAAe,iBAAiB;AAEhE;
|
|
1
|
+
{"version":3,"file":"subtree-walk.js","names":[],"sources":["../../../../src/server/subtree-walk.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":";AA2EA,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"}
|
|
@@ -7,6 +7,9 @@ var UNKEYABLE_HEADERS = new Map([
|
|
|
7
7
|
["proxy-authorization", CREDENTIAL],
|
|
8
8
|
["x-api-key", CREDENTIAL]
|
|
9
9
|
]);
|
|
10
|
+
function isHeaderList(value) {
|
|
11
|
+
return Array.isArray(value) && value.every((h) => typeof h === "string");
|
|
12
|
+
}
|
|
10
13
|
function headerKeyProblem(name) {
|
|
11
14
|
if (!HEADER_NAME.test(name)) return `key.headers names "${name}", which is not a valid header name.`;
|
|
12
15
|
const refused = UNKEYABLE_HEADERS.get(name.toLowerCase());
|
|
@@ -15,6 +18,6 @@ function headerKeyProblem(name) {
|
|
|
15
18
|
function isUnkeyableHeader(name) {
|
|
16
19
|
return UNKEYABLE_HEADERS.has(name.toLowerCase());
|
|
17
20
|
}
|
|
18
|
-
export { headerKeyProblem, isUnkeyableHeader };
|
|
21
|
+
export { headerKeyProblem, isHeaderList, isUnkeyableHeader };
|
|
19
22
|
|
|
20
23
|
//# sourceMappingURL=key-headers.js.map
|
|
@@ -1 +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
|
+
{"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,aAAa,OAA4C;CACvE,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,OAAO,MAAM,OAAO,MAAM,QAAQ;AACzE;AAGA,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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isHeaderList } from "./key-headers.js";
|
|
2
|
+
// src/shared/layout-defaults.ts
|
|
3
|
+
var NO_LAYOUT_DEFAULTS = {
|
|
4
|
+
lifetime: "request",
|
|
5
|
+
headers: void 0
|
|
6
|
+
};
|
|
7
|
+
function resolveLayoutDefaults(value) {
|
|
8
|
+
if (typeof value !== "object" || value === null) return NO_LAYOUT_DEFAULTS;
|
|
9
|
+
const lifetime = "lifetime" in value && value.lifetime === "document" ? "document" : "request";
|
|
10
|
+
const key = "key" in value && typeof value.key === "object" ? value.key : null;
|
|
11
|
+
const headers = key !== null && "headers" in key ? key.headers : void 0;
|
|
12
|
+
return {
|
|
13
|
+
lifetime,
|
|
14
|
+
headers: isHeaderList(headers) ? headers : void 0
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
export { NO_LAYOUT_DEFAULTS, resolveLayoutDefaults };
|
|
18
|
+
|
|
19
|
+
//# sourceMappingURL=layout-defaults.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"layout-defaults.js","names":[],"sources":["../../../../src/shared/layout-defaults.ts"],"mappings":";;AAuBA,IAAa,qBAA6C;CACxD,UAAU;CACV,SAAS;AACX;AAUA,SAAgB,sBAAsB,OAAwC;CAC5E,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM,OAAO;CACxD,MAAM,WAAW,cAAc,SAAS,MAAM,aAAa,aAAa,aAAa;CACrF,MAAM,MAAM,SAAS,SAAS,OAAO,MAAM,QAAQ,WAAW,MAAM,MAAM;CAC1E,MAAM,UAAU,QAAQ,QAAQ,aAAa,MAAM,IAAI,UAAU;CACjE,OAAO;EAAE;EAAU,SAAS,aAAa,OAAO,IAAI,UAAU;CAAU;AAC1E"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use client";
|
|
2
|
+
import "../_virtual/_rolldown/runtime.js";
|
|
3
|
+
import { OutletContentCacheContext } from "./outlet-content-cache.js";
|
|
4
|
+
import { OutletScopeContext } from "./outlet-scope-context.js";
|
|
5
|
+
import { useContext, useLayoutEffect } from "react";
|
|
6
|
+
// src/client/document-withdrawal.tsx
|
|
7
|
+
function DocumentWithdrawal() {
|
|
8
|
+
const cache = useContext(OutletContentCacheContext);
|
|
9
|
+
const { segmentPath } = useContext(OutletScopeContext);
|
|
10
|
+
useLayoutEffect(() => {
|
|
11
|
+
if (segmentPath !== void 0) cache?.withdraw(segmentPath);
|
|
12
|
+
}, [cache, segmentPath]);
|
|
13
|
+
return null;
|
|
14
|
+
}
|
|
15
|
+
export { DocumentWithdrawal };
|
|
16
|
+
|
|
17
|
+
//# sourceMappingURL=document-withdrawal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"document-withdrawal.js","names":[],"sources":["../../../../src/client/document-withdrawal.tsx"],"mappings":";;;;;;AAiCA,SAAgB,qBAA2B;CACzC,MAAM,QAAQ,WAAW,yBAAyB;CAClD,MAAM,EAAE,gBAAgB,WAAW,kBAAkB;CACrD,sBAAsB;EACpB,IAAI,gBAAgB,QAAW,OAAO,SAAS,WAAW;CAC5D,GAAG,CAAC,OAAO,WAAW,CAAC;CACvB,OAAO;AACT"}
|
|
@@ -6,8 +6,9 @@ var ENTRIES_PER_PATH = 3;
|
|
|
6
6
|
var MAX_PATHS = 64;
|
|
7
7
|
var OutletContentCache = class {
|
|
8
8
|
byPath = new Map();
|
|
9
|
+
withdrawn = new Set();
|
|
9
10
|
record(segmentPath, content, digest) {
|
|
10
|
-
if (digest === void 0) return;
|
|
11
|
+
if (digest === void 0 || this.withdrawn.has(segmentPath)) return;
|
|
11
12
|
const entries = this.byPath.get(segmentPath) ?? [];
|
|
12
13
|
entries.unshift({
|
|
13
14
|
content,
|
|
@@ -21,6 +22,10 @@ var OutletContentCache = class {
|
|
|
21
22
|
this.byPath.delete(path);
|
|
22
23
|
}
|
|
23
24
|
}
|
|
25
|
+
withdraw(segmentPath) {
|
|
26
|
+
this.withdrawn.add(segmentPath);
|
|
27
|
+
this.byPath.delete(segmentPath);
|
|
28
|
+
}
|
|
24
29
|
lookup(segmentPath, digest) {
|
|
25
30
|
return this.byPath.get(segmentPath)?.find((e) => e.digest === digest);
|
|
26
31
|
}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,YAA6B,IAAI,IAAY;CAO7C,OAAO,aAAqB,SAAoB,QAAkC;EAChF,IAAI,WAAW,UAAa,KAAK,UAAU,IAAI,WAAW,GAAG;EAC7D,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;CAMA,SAAS,aAA2B;EAClC,KAAK,UAAU,IAAI,WAAW;EAC9B,KAAK,OAAO,OAAO,WAAW;CAChC;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":";;;;
|
|
1
|
+
{"version":3,"file":"outlet-scope-context.js","names":[],"sources":["../../../../src/client/outlet-scope-context.ts"],"mappings":";;;;AAsCA,IAAa,oBAAiC,OAAO,OAAO;CAC1D,SAAS;CACT,WAAW,IAAI,IAA4B;AAC7C,CAAC;AAED,IAAa,qBAAqB,oBAChC,OAAO,IAAI,2BAA2B,GACtC,iBACF"}
|
|
@@ -13,10 +13,19 @@ function SegmentOutlet({ segmentPath, decision }) {
|
|
|
13
13
|
const cached = resolved.skip ? cache?.lookup(segmentPath, resolved.digest) : void 0;
|
|
14
14
|
if (resolved.skip && !cached) throw staleSegmentError(segmentPath);
|
|
15
15
|
const content = resolved.skip ? cached.content : resolved.children;
|
|
16
|
+
const liveScope = useMemo(() => ({
|
|
17
|
+
...LIVE_OUTLET_SCOPE,
|
|
18
|
+
segmentPath
|
|
19
|
+
}), [segmentPath]);
|
|
16
20
|
const childScope = useMemo(() => resolved.skip ? {
|
|
17
21
|
skipped: true,
|
|
18
|
-
decisions: new Map(Object.entries(resolved.outlets))
|
|
19
|
-
|
|
22
|
+
decisions: new Map(Object.entries(resolved.outlets)),
|
|
23
|
+
segmentPath
|
|
24
|
+
} : liveScope, [
|
|
25
|
+
resolved,
|
|
26
|
+
liveScope,
|
|
27
|
+
segmentPath
|
|
28
|
+
]);
|
|
20
29
|
useLayoutEffect(() => {
|
|
21
30
|
if (cache === null) return;
|
|
22
31
|
if (resolved.skip) cache.touch(segmentPath, content);
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;CAGtE,MAAM,YAAY,eACT;EAAE,GAAG;EAAmB;CAAY,IAC3C,CAAC,WAAW,CACd;CACA,MAAM,aAAa,cAEf,SAAS,OACL;EAAE,SAAS;EAAM,WAAW,IAAI,IAAI,OAAO,QAAQ,SAAS,OAAO,CAAC;EAAG;CAAY,IACnF,WACN;EAAC;EAAU;EAAW;CAAW,CACnC;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"}
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"cdn/index.ts": "cdn/index.js",
|
|
12
12
|
"cdn/workers-cache-purge.ts": "cdn/workers-cache-purge.js",
|
|
13
13
|
"client/deny-last-resort.tsx": "client/deny-last-resort.js",
|
|
14
|
+
"client/document-withdrawal.tsx": "client/document-withdrawal.js",
|
|
14
15
|
"client/error-boundary.tsx": "client/error-boundary.js",
|
|
15
16
|
"client/error-reconstituter.tsx": "client/error-reconstituter.js",
|
|
16
17
|
"client/index.ts": "client/index.js",
|
|
@@ -125,6 +126,7 @@
|
|
|
125
126
|
"server/debug.ts": "server/debug.js",
|
|
126
127
|
"server/default-logger.ts": "server/default-logger.js",
|
|
127
128
|
"server/deny-boundary.ts": "server/deny-boundary.js",
|
|
129
|
+
"server/dev-overlay-report.ts": "server/dev-overlay-report.js",
|
|
128
130
|
"server/early-hints-sender.ts": "server/early-hints-sender.js",
|
|
129
131
|
"server/early-hints.ts": "server/early-hints.js",
|
|
130
132
|
"server/error-formatter.ts": "server/error-formatter.js",
|
|
@@ -186,7 +188,9 @@
|
|
|
186
188
|
"server/safe-load.ts": "server/safe-load.js",
|
|
187
189
|
"server/schema-introspection.ts": "server/schema-introspection.js",
|
|
188
190
|
"server/segment-lifetime/key-digest.ts": "server/segment-lifetime/key-digest.js",
|
|
191
|
+
"server/segment-lifetime/outlet-gate.ts": "server/segment-lifetime/outlet-gate.js",
|
|
189
192
|
"server/segment-lifetime/read-rule.ts": "server/segment-lifetime/read-rule.js",
|
|
193
|
+
"server/segment-lifetime/read-scope.ts": "server/segment-lifetime/read-scope.js",
|
|
190
194
|
"server/sensitive-fields.ts": "server/sensitive-fields.js",
|
|
191
195
|
"server/server-only-guard-noop.js": "server/server-only-guard-noop.js",
|
|
192
196
|
"server/server-timing.ts": "server/server-timing.js",
|
|
@@ -196,6 +200,7 @@
|
|
|
196
200
|
"server/ssr-wrappers.tsx": "server/ssr-wrappers.js",
|
|
197
201
|
"server/status-code-resolver.ts": "server/status-code-resolver.js",
|
|
198
202
|
"server/stream-utils.ts": "server/stream-utils.js",
|
|
203
|
+
"server/subtree-walk.ts": "server/subtree-walk.js",
|
|
199
204
|
"server/traced-access.ts": "server/traced-access.js",
|
|
200
205
|
"server/tracing.ts": "server/tracing.js",
|
|
201
206
|
"server/tree-match.ts": "server/tree-match.js",
|
|
@@ -215,6 +220,7 @@
|
|
|
215
220
|
"shared/href-validation.ts": "shared/href-validation.js",
|
|
216
221
|
"shared/href.ts": "shared/href.js",
|
|
217
222
|
"shared/key-headers.ts": "shared/key-headers.js",
|
|
223
|
+
"shared/layout-defaults.ts": "shared/layout-defaults.js",
|
|
218
224
|
"shared/merge-search-params.ts": "shared/merge-search-params.js",
|
|
219
225
|
"shared/param-value.ts": "shared/param-value.js",
|
|
220
226
|
"shared/payload-root.ts": "shared/payload-root.js",
|
|
@@ -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;AA2CA,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { checkCookieRead, checkUnscopedRead } from "./segment-lifetime/read-rule.js";
|
|
2
2
|
import { COOKIE_READ_THROUGH } from "../shared/cookie-read-through.js";
|
|
3
3
|
import { requestContextAls } from "./als-registry.js";
|
|
4
4
|
import { isDebug } from "./debug.js";
|
|
@@ -13,22 +13,22 @@ function getCookieJar() {
|
|
|
13
13
|
const map = store.parsedCookies;
|
|
14
14
|
return {
|
|
15
15
|
get(name) {
|
|
16
|
-
|
|
16
|
+
checkCookieRead(name);
|
|
17
17
|
noteCookieReadForReactCache(name);
|
|
18
18
|
return map.get(name);
|
|
19
19
|
},
|
|
20
20
|
[COOKIE_READ_THROUGH](name, codec) {
|
|
21
|
-
|
|
21
|
+
checkCookieRead(name, codec);
|
|
22
22
|
noteCookieReadForReactCache(name);
|
|
23
23
|
return map.get(name);
|
|
24
24
|
},
|
|
25
25
|
has(name) {
|
|
26
|
-
|
|
26
|
+
checkCookieRead(name);
|
|
27
27
|
noteCookieReadForReactCache(name);
|
|
28
28
|
return map.has(name);
|
|
29
29
|
},
|
|
30
30
|
getAll() {
|
|
31
|
-
|
|
31
|
+
checkUnscopedRead("every cookie");
|
|
32
32
|
noteCookieReadForReactCache("*");
|
|
33
33
|
return Array.from(map.entries()).map(([name, value]) => ({
|
|
34
34
|
name,
|
|
@@ -36,7 +36,7 @@ function getCookieJar() {
|
|
|
36
36
|
}));
|
|
37
37
|
},
|
|
38
38
|
get size() {
|
|
39
|
-
|
|
39
|
+
checkUnscopedRead("the number of cookies");
|
|
40
40
|
noteCookieReadForReactCache("*");
|
|
41
41
|
return map.size;
|
|
42
42
|
},
|
|
@@ -114,7 +114,7 @@ function getCookieJar() {
|
|
|
114
114
|
warnIfCachedCookieIsWritten("*");
|
|
115
115
|
},
|
|
116
116
|
toString() {
|
|
117
|
-
|
|
117
|
+
checkUnscopedRead("every cookie");
|
|
118
118
|
noteCookieReadForReactCache("*");
|
|
119
119
|
return Array.from(map.entries()).map(([name, value]) => `${name}=${encodeURIComponent(value)}`).join("; ");
|
|
120
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie-context.js","names":[],"sources":["../../../../src/server/cookie-context.ts"],"mappings":";;;;;;;;AA8DA,SAAgB,eAA+B;CAC7C,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,uJAEF;CAIF,IAAI,CAAC,MAAM,eACT,MAAM,gBAAgB,kBAAkB,MAAM,YAAY;CAG5D,MAAM,MAAM,MAAM;CAClB,OAAO;EAIL,IAAI,MAAkC;GACpC,
|
|
1
|
+
{"version":3,"file":"cookie-context.js","names":[],"sources":["../../../../src/server/cookie-context.ts"],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { requestContextAls } from "./als-registry.js";
|
|
|
3
3
|
import "./signal-identity.js";
|
|
4
4
|
import "./pipeline-helpers.js";
|
|
5
5
|
import "./tracing.js";
|
|
6
|
+
import { fallbackAfter } from "./segment-lifetime/read-scope.js";
|
|
6
7
|
import "./utils/element-type.js";
|
|
7
8
|
import { createElement } from "react";
|
|
8
9
|
function matchDenyEntry(chain, status) {
|
|
@@ -72,7 +73,7 @@ function handleCaughtDeny(chain, error, selfKey) {
|
|
|
72
73
|
const placement = chain ? placeDenyPage(chain, error.status, error.data, selfKey) : null;
|
|
73
74
|
if (placement?.kind === "render") {
|
|
74
75
|
setDenyStatus(error.status);
|
|
75
|
-
return placement.element;
|
|
76
|
+
return fallbackAfter(error, placement.element);
|
|
76
77
|
}
|
|
77
78
|
if (placement?.kind === "hoist") {
|
|
78
79
|
setDenyStatus(error.status);
|