@timber-js/app 0.2.0-alpha.243 → 0.2.0-alpha.245
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-DoTj0Jd3.js → actions-C7_xl9iA.js} +12 -8
- package/dist/_chunks/actions-C7_xl9iA.js.map +1 -0
- package/dist/_chunks/als-registry-C-iwbtvI.js.map +1 -1
- package/dist/_chunks/{cli-check-DlQBSKIN.js → cli-check-CetL-6Us.js} +5 -5
- package/dist/_chunks/cli-check-CetL-6Us.js.map +1 -0
- package/dist/_chunks/{codegen-vaCyFyVN.js → codegen-BxJGInWa.js} +76 -20
- package/dist/_chunks/codegen-BxJGInWa.js.map +1 -0
- package/dist/_chunks/{convention-lint-CGGcseNn.js → convention-lint-BWbKAV4x.js} +51 -15
- package/dist/_chunks/convention-lint-BWbKAV4x.js.map +1 -0
- package/dist/_chunks/{dev-server-LO4McfQi.js → dev-server-BZxFJNih.js} +66 -9
- package/dist/_chunks/{dev-server-LO4McfQi.js.map → dev-server-BZxFJNih.js.map} +1 -1
- package/dist/_chunks/dev-server-C72bB9Kg.js +1 -0
- 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/cli-check.d.ts +3 -3
- package/dist/cli-check.d.ts.map +1 -1
- package/dist/cli.js +2 -2
- package/dist/config-types.d.ts +43 -22
- 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 +4 -4
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/manifest.json +2 -0
- package/dist/native/rsc/routing/descendant-params.js +28 -0
- package/dist/native/rsc/routing/descendant-params.js.map +1 -0
- package/dist/native/rsc/server/als-registry.js.map +1 -1
- package/dist/native/rsc/server/request-context.js +1 -1
- package/dist/native/rsc/server/request-context.js.map +1 -1
- package/dist/native/rsc/server/route-element-builder.js +4 -3
- 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 +9 -5
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-scope.js +3 -1
- package/dist/native/rsc/server/segment-lifetime/read-scope.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/segment-key.js +15 -9
- package/dist/native/rsc/server/segment-lifetime/segment-key.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js +6 -5
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.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/manifest.json +1 -0
- package/dist/native/ssr/server/als-registry.js.map +1 -1
- package/dist/native/ssr/server/request-context.js +1 -1
- package/dist/native/ssr/server/request-context.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js +1 -0
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +9 -5
- package/dist/native/ssr/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/read-scope.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/codegen-types.d.ts +9 -0
- package/dist/routing/codegen-types.d.ts.map +1 -1
- package/dist/routing/codegen.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/descendant-params.d.ts +46 -0
- package/dist/routing/descendant-params.d.ts.map +1 -0
- package/dist/routing/index.js +1 -1
- package/dist/routing/route-options-lint.d.ts +2 -2
- package/dist/routing/route-options-lint.d.ts.map +1 -1
- package/dist/routing/route-options.d.ts +1 -1
- package/dist/routing/route-options.d.ts.map +1 -1
- package/dist/server/als-registry.d.ts +13 -0
- package/dist/server/als-registry.d.ts.map +1 -1
- package/dist/server/index.js +1 -1
- package/dist/server/internal.js +1 -1
- package/dist/server/internal.js.map +1 -1
- package/dist/server/route-element-builder.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 +8 -1
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-scope.d.ts +8 -2
- package/dist/server/segment-lifetime/read-scope.d.ts.map +1 -1
- package/dist/server/segment-lifetime/segment-key.d.ts +28 -20
- package/dist/server/segment-lifetime/segment-key.d.ts.map +1 -1
- package/dist/server/segment-lifetime/slot-outlets.d.ts +2 -3
- package/dist/server/segment-lifetime/slot-outlets.d.ts.map +1 -1
- package/dist/server/types.d.ts +7 -5
- package/dist/server/types.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 +2 -2
- package/docs/api/34-api-config.mdx +20 -3
- package/package.json +1 -1
- package/src/cli-check.ts +6 -6
- package/src/config-types.ts +44 -22
- 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/codegen-types.ts +9 -0
- package/src/routing/codegen.ts +34 -20
- package/src/routing/convention-lint.ts +5 -3
- package/src/routing/descendant-params.ts +76 -0
- package/src/routing/route-options-lint.ts +34 -15
- package/src/routing/route-options.ts +3 -2
- package/src/server/als-registry.ts +13 -0
- package/src/server/request-context.ts +1 -1
- package/src/server/route-element-builder.ts +10 -3
- package/src/server/route-module-loader.ts +7 -6
- package/src/server/rsc-entry/index.ts +7 -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 +37 -5
- package/src/server/segment-lifetime/read-scope.ts +11 -2
- package/src/server/segment-lifetime/segment-key.ts +50 -27
- package/src/server/segment-lifetime/slot-outlets.ts +10 -12
- package/src/server/types.ts +7 -5
- package/src/shared/key-headers.ts +5 -0
- package/src/shared/layout-defaults.ts +43 -0
- package/dist/_chunks/actions-DoTj0Jd3.js.map +0 -1
- package/dist/_chunks/cli-check-DlQBSKIN.js.map +0 -1
- package/dist/_chunks/codegen-vaCyFyVN.js.map +0 -1
- package/dist/_chunks/convention-lint-CGGcseNn.js.map +0 -1
- package/dist/_chunks/dev-server-DrjLscqT.js +0 -1
- package/dist/_chunks/key-headers-uIig1_mU.js.map +0 -1
|
@@ -61,6 +61,7 @@
|
|
|
61
61
|
"params/resolve-schema.ts": "params/resolve-schema.js",
|
|
62
62
|
"routes/href.ts": "routes/href.js",
|
|
63
63
|
"routing/collision-probe.ts": "routing/collision-probe.js",
|
|
64
|
+
"routing/descendant-params.ts": "routing/descendant-params.js",
|
|
64
65
|
"routing/interception-overlap.ts": "routing/interception-overlap.js",
|
|
65
66
|
"routing/interception.ts": "routing/interception.js",
|
|
66
67
|
"routing/segment-classify.ts": "routing/segment-classify.js",
|
|
@@ -224,6 +225,7 @@
|
|
|
224
225
|
"shared/href-validation.ts": "shared/href-validation.js",
|
|
225
226
|
"shared/href.ts": "shared/href.js",
|
|
226
227
|
"shared/key-headers.ts": "shared/key-headers.js",
|
|
228
|
+
"shared/layout-defaults.ts": "shared/layout-defaults.js",
|
|
227
229
|
"shared/merge-search-params.ts": "shared/merge-search-params.js",
|
|
228
230
|
"shared/outlet-decision.ts": "shared/outlet-decision.js",
|
|
229
231
|
"shared/param-value.ts": "shared/param-value.js",
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { effectiveUrlSegment } from "./segment-classify.js";
|
|
2
|
+
// src/routing/descendant-params.ts
|
|
3
|
+
var MEMO = new WeakMap();
|
|
4
|
+
var RENDERS_PAGE = new WeakMap();
|
|
5
|
+
function rendersPage(node) {
|
|
6
|
+
let found = RENDERS_PAGE.get(node);
|
|
7
|
+
if (found === void 0) {
|
|
8
|
+
found = !!node.page || node.children.some(rendersPage);
|
|
9
|
+
RENDERS_PAGE.set(node, found);
|
|
10
|
+
}
|
|
11
|
+
return found;
|
|
12
|
+
}
|
|
13
|
+
function childrenChainParams(node) {
|
|
14
|
+
const memo = MEMO.get(node);
|
|
15
|
+
if (memo) return memo;
|
|
16
|
+
const params = new Map();
|
|
17
|
+
for (const child of node.children) {
|
|
18
|
+
if (!rendersPage(child)) continue;
|
|
19
|
+
const identity = effectiveUrlSegment(child);
|
|
20
|
+
if (identity.paramName && !params.has(identity.paramName)) params.set(identity.paramName, identity);
|
|
21
|
+
for (const [name, deeper] of childrenChainParams(child)) if (!params.has(name)) params.set(name, deeper);
|
|
22
|
+
}
|
|
23
|
+
MEMO.set(node, params);
|
|
24
|
+
return params;
|
|
25
|
+
}
|
|
26
|
+
export { childrenChainParams };
|
|
27
|
+
|
|
28
|
+
//# sourceMappingURL=descendant-params.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"descendant-params.js","names":[],"sources":["../../../../src/routing/descendant-params.ts"],"mappings":";;AAuCA,IAAM,OAAO,IAAI,QAAiE;AAClF,IAAM,eAAe,IAAI,QAAiC;AAG1D,SAAS,YAAY,MAA+B;CAClD,IAAI,QAAQ,aAAa,IAAI,IAAI;CACjC,IAAI,UAAU,QAAW;EACvB,QAAQ,CAAC,CAAC,KAAK,QAAQ,KAAK,SAAS,KAAK,WAAW;EACrD,aAAa,IAAI,MAAM,KAAK;CAC9B;CACA,OAAO;AACT;AASA,SAAgB,oBAAoB,MAA+D;CACjG,MAAM,OAAO,KAAK,IAAI,IAAI;CAC1B,IAAI,MAAM,OAAO;CACjB,MAAM,SAAS,IAAI,IAAgC;CACnD,KAAK,MAAM,SAAS,KAAK,UAAU;EACjC,IAAI,CAAC,YAAY,KAAK,GAAG;EACzB,MAAM,WAAW,oBAAoB,KAAK;EAC1C,IAAI,SAAS,aAAa,CAAC,OAAO,IAAI,SAAS,SAAS,GACtD,OAAO,IAAI,SAAS,WAAW,QAAQ;EAEzC,KAAK,MAAM,CAAC,MAAM,WAAW,oBAAoB,KAAK,GACpD,IAAI,CAAC,OAAO,IAAI,IAAI,GAAG,OAAO,IAAI,MAAM,MAAM;CAElD;CACA,KAAK,IAAI,MAAM,MAAM;CACrB,OAAO;AACT"}
|
|
@@ -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;AAwDA,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C"}
|
|
@@ -29,7 +29,7 @@ function getSegmentParams(segmentPath) {
|
|
|
29
29
|
if (!store) throw new Error("[timber] getSegmentParams() called outside of a request context. It can only be used in middleware, access checks, server components, and server actions.");
|
|
30
30
|
if (!store.segmentParams) throw new Error("[timber] getSegmentParams() called before route matching completed. Segment params are not available until after the route is matched.");
|
|
31
31
|
const slotResolved = resolveSegmentParams(store.segmentParams, store.slotParams, segmentPath);
|
|
32
|
-
if (slotResolved !== store.segmentParams) return scopedParams(slotResolved);
|
|
32
|
+
if (slotResolved !== store.segmentParams) return scopedParams(slotResolved, "slot");
|
|
33
33
|
if (segmentPath && isDebug() && store.matchedSegmentPath) {
|
|
34
34
|
const expected = extractDynamicSegments(segmentPath);
|
|
35
35
|
const actual = extractDynamicSegments(store.matchedSegmentPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":";;;;;;;;AAuDA,SAAgB,aAA8B;CAC5C,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,qJAEF;CAIF,MAAM,QAAQ,iBAAiB;CAC/B,OAAO,QAAQ,aAAa,MAAM,SAAS,KAAK,IAAI,MAAM;AAC5D;AAUA,SAAgB,UAAU,MAAkC;CAE1D,OADgB,WACT,CAAA,CAAQ,IAAI,IAAI,KAAK;AAC9B;AAWA,SAAgB,gBAAgB,QAA8C;CAC5E,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,0JAEF;CAIF,IAAI,QAAQ,sBAAsB,MAAM;MACnC,kBAAkB,uBAAuB;CAE9C,OAAO,MAAM;AACf;AAMA,sBAAsB,eAAe;AAKrC,uBAAuB,gBAAgB;AAcvC,SAAgB,iBAAiB,aAAqC;CACpE,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,2JAEF;CAEF,IAAI,CAAC,MAAM,eACT,MAAM,IAAI,MACR,wIAEF;CAQF,MAAM,eAAe,qBAAqB,MAAM,eAAe,MAAM,YAAY,WAAW;CAE5F,IAAI,iBAAiB,MAAM,eAAe,OAAO,aAAa,
|
|
1
|
+
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { withPublishedParams } from "./publish-params.js";
|
|
|
12
12
|
import { wrapSegmentWithErrorBoundaries } from "./error-boundary-wrapper.js";
|
|
13
13
|
import { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths, layoutOutletKey, pageOutletKey } from "../routing/segment-keys.js";
|
|
14
14
|
import { documentOutletFor, pathParamNames } from "./segment-lifetime/document-outlet.js";
|
|
15
|
+
import { childrenChainParams } from "../routing/descendant-params.js";
|
|
15
16
|
import { getActionErrorForRender, getSegmentParams } from "./request-context.js";
|
|
16
17
|
import { inReadScope, readScopeFor } from "./segment-lifetime/read-scope.js";
|
|
17
18
|
import { outletGate } from "./segment-lifetime/outlet-gate.js";
|
|
@@ -53,13 +54,13 @@ function wrapAccessGate(element, opts, h) {
|
|
|
53
54
|
async function buildRouteElement(req, match, interception, render, metadataRouteHashes) {
|
|
54
55
|
const segments = match.segments;
|
|
55
56
|
const loadBoundaryModule = (file) => loadFallbackModule(file, req, segments);
|
|
56
|
-
const { metadataSources, layoutComponents, PageComponent: LoadedPage, deferSuspenseFor, accessFns, documentLifetimes } = await loadRouteModules(segments, req.url, render.
|
|
57
|
+
const { metadataSources, layoutComponents, PageComponent: LoadedPage, deferSuspenseFor, accessFns, documentLifetimes } = await loadRouteModules(segments, req.url, render.layoutDefaults);
|
|
57
58
|
const mainParams = documentLifetimes.page !== void 0 || documentLifetimes.layouts.some(Boolean) ? getSegmentParams() : {};
|
|
58
59
|
const interceptionGates = await loadInterceptionGates(match);
|
|
59
60
|
const gateFor = (i) => i < (interceptionGates?.sharedCount ?? 0) ? void 0 : accessFns[i];
|
|
60
61
|
const segmentKeys = computeSegmentKeys(segments);
|
|
61
62
|
const segmentTreePaths = computeSegmentTreePaths(segments);
|
|
62
|
-
const PageComponent = documentLifetimes.page && !isClientReference(LoadedPage) ? inReadScope(LoadedPage, readScopeFor(pageOutletKey(segmentTreePaths[segments.length - 1]), documentLifetimes.page, pathParamNames(segments, segments.length - 1))) : LoadedPage;
|
|
63
|
+
const PageComponent = documentLifetimes.page && !isClientReference(LoadedPage) ? inReadScope(LoadedPage, readScopeFor(pageOutletKey(segmentTreePaths[segments.length - 1]), documentLifetimes.page, pathParamNames(segments, segments.length - 1), [])) : LoadedPage;
|
|
63
64
|
const denyPageChains = new Map();
|
|
64
65
|
for (let i = 0; i < segments.length; i++) {
|
|
65
66
|
const chain = await buildDenyPageChain(segments, i, segmentKeys, req);
|
|
@@ -151,7 +152,7 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
151
152
|
let layoutElement;
|
|
152
153
|
if (isClientReference(layoutComponent)) layoutElement = h(layoutComponent, layoutProps);
|
|
153
154
|
else {
|
|
154
|
-
const layoutComponentRef = layoutLifetime ? inReadScope(layoutComponent, readScopeFor(layoutOutletPath, layoutLifetime, pathParamNames(segments, i))) : layoutComponent;
|
|
155
|
+
const layoutComponentRef = layoutLifetime ? inReadScope(layoutComponent, readScopeFor(layoutOutletPath, layoutLifetime, pathParamNames(segments, i), childrenChainParams(segment).keys())) : layoutComponent;
|
|
155
156
|
const layoutDenyPages = denyPageChains.get(i);
|
|
156
157
|
const TracedLayout = async (props) => {
|
|
157
158
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAsEA,SAAgB,yBACd,UACA,OACA,OACU;CACV,MAAM,QAAQ,iBAAiB,UAAU,OAAO,KAAK;CACrD,OAAO,MAAM,WAAW,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,GAAG,KAAK;AAClD;AAMA,IAAa,uBAAb,cAA0C,MAAM;CAC9C,YAAY,SAAiB;EAC3B,MAAM,OAAO;EACb,KAAK,OAAO;CACd;AACF;AA0CA,SAAS,uBACP,SACA,SACA,GACoB;CACpB,KAAK,MAAM,QAAQ,SACjB,UAAU,EAAE,mBAAmB;EAC7B,gBAAgB,KAAK;EACrB,aAAa,KAAK;EAClB,QAAQ,KAAK;EACb,cAAc,KAAK;EACnB,UAAU;CACZ,CAAC;CAEH,OAAO;AACT;AAGA,SAAS,eACP,SACA,MAOA,GACoB;CACpB,OAAO,EAAE,YAAY;EACnB,UAAU,KAAK;EACf,aAAa,KAAK,QAAQ;EAC1B,YAAY,KAAK;EACjB,cAAc,KAAK;EACnB,GAAI,KAAK,YAAY,EAAE,WAAW,KAAK,UAAU,IAAI,CAAC;EACtD,UAAU;CACZ,CAAC;AACH;AAmBA,eAAsB,kBACpB,KACA,OACA,cACA,QACA,qBAC6B;CAC7B,MAAM,WAAW,MAAM;CAGvB,MAAM,sBAAsB,SAAyB,mBAAmB,MAAM,KAAK,QAAQ;CAQ3F,MAAM,EACJ,iBACA,kBACA,eAAe,YACf,kBACA,WACA,sBACE,MAAM,iBAAiB,UAAU,IAAI,KAAK,OAAO,cAAc;CAKnE,MAAM,aADJ,kBAAkB,SAAS,UAAa,kBAAkB,QAAQ,KAAK,OAAO,IACxC,iBAAiB,IAAI,CAAC;CAK9D,MAAM,oBAAoB,MAAM,sBAAsB,KAAK;CAC3D,MAAM,WAAW,MACf,KAAK,mBAAmB,eAAe,KAAK,SAAY,UAAU;CAWpE,MAAM,cAAc,mBAAmB,QAAQ;CAI/C,MAAM,mBAAmB,wBAAwB,QAAQ;CAIzD,MAAM,gBACJ,kBAAkB,QAAQ,CAAC,kBAAkB,UAAU,IACnD,YACE,YACA,aACE,cAAc,iBAAiB,SAAS,SAAS,EAAE,GACnD,kBAAkB,MAClB,eAAe,UAAU,SAAS,SAAS,CAAC,GAC5C,CAAC,CACH,CACF,IACA;CASN,MAAM,iBAAiB,IAAI,IAA6B;CACxD,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EACxC,MAAM,QAAQ,MAAM,mBAAmB,UAAU,GAAG,aAAa,GAAG;EACpE,IAAI,MAAM,SAAS,GACjB,eAAe,IAAI,GAAG,KAAK;CAE/B;CAIA,MAAM,IAAqB;CAU3B,MAAM,YAAY,SAAS,SAAS;CACpC,MAAM,gBAAgB,eAAe,IAAI,SAAS;CAKlD,MAAM,cAAc,wBAAwB;CAC5C,IAAI;CACJ,IAAI,aAAa;EACf,MAAM,oBAA2B;GAC/B,MAAM,YAAY;EACpB;EACA,UAAU,EAAE,aAAa,CAAC,CAAC;CAC7B,OAAO,IAAI,kBAAkB,aAAa,GACxC,UAAU,EAAE,eAAe,CAAC,CAAC;MACxB,IAAI,iBAAiB,cAAc,SAAS,GACjD,UAAU,EAAE,kBAAkB;EAC5B,MAAM;EACN,OAAO,MAAM,SAAS,UAAU,EAAE,WAAW;EAC7C,WAAW;EACX,YAAY,YAAY;CAC1B,CAAC;MACI;EAEL,MAAM,aAAa,OAAO,UAAmC;GAC3D,OAAO,SACL,eACA,EAAE,gBAAgB,MAAM,SAAS,UAAU,EAAE,WAAW,IAAI,SACrD,cAA8D,KAAK,CAC5E;EACF;EACA,UAAU,EAAE,YAAY,CAAC,CAAC;CAC5B;CAMA,IAAI;CACJ,IAAI,kBAAkB,MAAM;EAC1B,MAAM,cAAc,cAAc,iBAAiB,UAAU;EAC7D,aAAa;GACX;GACA,SAAS;GACT,QAAQ,CAAC;GACT,UAAU,MAAM,kBACd,QACA,aACA,kBAAkB,MAClB,eAAe,UAAU,SAAS,GAClC,UACF;EACF;EACA,UAAU,WAAW,UAAU;CACjC;CASA,MAAM,iBAA6B;EACjC,aAAa;EACb,SAAS,EAAE,cAAc;GACvB;GACA,kBAAkB,MAAM;GACxB,YAAY,IAAI;GAChB;EACF,CAAC;EACD,QAAQ,CAAC;CACX;CACA,UAAU,EAAE,UAAU,MAAM,WAAW,cAAc,GAAG,OAAO;CAG/D,MAAM,kBAAkB,IAAI,IAC1B,iBAAiB,KAAK,EAAE,WAAW,cAAc,CAAC,SAAS,SAAS,CAAC,CACvE;CAMA,IAAI,mBAAiC,aAAa,CAAC,gBAAgB,UAAU,IAAI,CAAC,cAAc;CAEhG,KAAK,IAAI,IAAI,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK;EAC7C,MAAM,UAAU,SAAS;EACzB,MAAM,kBAAkB,gBAAgB,IAAI,OAAO;EAWnD,MAAM,kBAAkB,gBAAgB,QAAQ,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,QAAQ;EACpF,UAAU,uBAAuB,SAAS,iBAAiB,CAAC;EAW5D,UAAU,MAAM,+BAA+B,SAAS,SAAS;GAC/D,YAAY;GACZ,eAAe;GACf,wBAAwB,iBAAiB,CAAC,CAAC;GAC3C,YAAY,YAAY;EAC1B,CAAC;EAOD,IAAI,iBAAiB;GACnB,MAAM,YAAY,YAAY;GAI9B,MAAM,iBAAiB,kBAAkB,QAAQ;GACjD,MAAM,mBAAmB,iBAAiB,gBAAgB,iBAAiB,EAAE,IAAI;GAKjF,MAAM,iBAA6B;IACjC,aAAa,kBAAkB,SAAS;IACxC,SAAS;IACT,QAAQ;GACV;GAKA,MAAM,QAAQ,MAAM,iBAAiB;IACnC;IACA;IACA;IACA;IACA;IACA,gBAAgB,iBAAiB;IACjC;IACA;GACF,CAAC;GAED,MAAM,cAAc,yBAAyB,UAAU,GAAG,KAAK;GAC/D,MAAM,oBAAoB,OAAO,KAAK,QAAQ,SAAS,CAAC,CAAC;GACzD,MAAM,cAAc;IAAE,GAAG,MAAM;IAAO,UAAU,WAAW,cAAc;GAAE;GAU3E,IAAI;GACJ,IAAI,kBAAkB,eAAe,GACnC,gBAAgB,EAAE,iBAAiB,WAAW;QACzC;IAQL,MAAM,qBAAqB,iBACvB,YACE,iBACA,aACE,kBACA,gBACA,eAAe,UAAU,CAAC,GAC1B,oBAAoB,OAAO,CAAC,CAAC,KAAK,CACpC,CACF,IACA;IACJ,MAAM,kBAAkB,eAAe,IAAI,CAAC;IAC5C,MAAM,eAAe,OAAO,UAAmC;KAC7D,IAAI;MACF,OAAO,MAAM,SAAS,iBAAiB,EAAE,kBAAkB,UAAU,SAClE,mBAAmE,KAAK,CAC3E;KACF,SAAS,OAAgB;MAKvB,IAAI,aAAa,KAAK,GAAG;OACvB,2BAA2B,CAAC;OAC5B,IAAI,iBACF,OAAO,iBAAiB,iBAAiB,OAAO,SAAS;MAE7D;MACA,MAAM;KACR;IACF;IACA,gBAAgB,EAAE,cAAc,WAAW;IAc3C,gBAAgB,MAAM,+BAA+B,SAAS,eAAe;KAC3E,YAAY;KACZ,eAAe;KACf,wBAAwB,iBAAiB,CAAC,CAAC;KAC3C,YAAY;KACZ,UAAU;IACZ,CAAC;GACH;GAEA,MAAM,eAA2B;IAC/B,aAAa;IACb,SAAS,EAAE,iBAAiB,CAAC,CAAC,iBAAiB;KAC7C,UAAU;KACV;KACA;KACA,UAAU;IACZ,CAAC;IACD,QAAQ,CAAC,gBAAgB,GAAG,MAAM,OAAO;IAIzC,UAAU,MAAM,kBACd,QACA,kBACA,gBACA,eAAe,UAAU,CAAC,GAC1B,YACA,YAAY,MACd;GACF;GACA,UAAU,WAAW,YAAY;GACjC,mBAAmB,CAAC,YAAY;EAClC;EAWA,MAAM,WAAW,QAAQ,CAAC;EAC1B,IAAI,UACF,UAAU,eACR,SACA;GACE;GACA;GACA,YAAY,YAAY;GACxB,cAAc;GACd,WAAW,eAAe,IAAI,CAAC;EACjC,GACA,CACF;CAEJ;CAKA,IAAI,mBAAmB,UAAU,kBAAkB,KAAK,SAAS,CAAC;CAYlE,UAAU,EAAE,iBAAiB,CAAC,CAAC,qBAAqB;EAClD,YAAY;EACZ,mBAAmB,iBAAiB,CAAC,CAAC;EACtC,UAAU;CACZ,CAAC;CAMD,OAAO;EACL,SAHc,oBAAoB,OAGlC;EACA;EACA;EACA;EACA,eAAe;CACjB;AACF"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { NO_LAYOUT_DEFAULTS } from "../shared/layout-defaults.js";
|
|
1
2
|
import { loadModule } from "./safe-load.js";
|
|
2
3
|
import { ROUTE_OPTIONS_EXPORT } from "../shared/route-options-export.js";
|
|
3
4
|
import { NoPageComponentError } from "./route-element-builder.js";
|
|
4
|
-
import {
|
|
5
|
+
import { layoutDefaultsAt, readDocumentLifetime } from "./segment-lifetime/segment-key.js";
|
|
5
6
|
// src/server/route-module-loader.ts
|
|
6
7
|
function rejectLegacyGenerateMetadata(mod, filePath) {
|
|
7
8
|
if ("generateMetadata" in mod) throw new Error(`${filePath}: "generateMetadata" is not a valid export. Export an async function named "metadata" instead.\n\n // Before\n export async function generateMetadata({ params }) { ... }\n\n // After\n export async function metadata() { ... }`);
|
|
@@ -22,7 +23,7 @@ function collectModuleExports(mod, segment, segmentIndex, isPage, metadataSource
|
|
|
22
23
|
});
|
|
23
24
|
return extractDeferSuspenseFor(mod, isPage, currentDefer);
|
|
24
25
|
}
|
|
25
|
-
async function loadRouteModules(segments, requestUrl,
|
|
26
|
+
async function loadRouteModules(segments, requestUrl, layoutDefaults) {
|
|
26
27
|
const metadataSources = [];
|
|
27
28
|
const layoutComponents = [];
|
|
28
29
|
const accessFns = [];
|
|
@@ -34,7 +35,7 @@ async function loadRouteModules(segments, requestUrl, defaultLayoutLifetime) {
|
|
|
34
35
|
const isLeaf = i === segments.length - 1;
|
|
35
36
|
if (segment.layout) {
|
|
36
37
|
const mod = await loadModule(segment.layout);
|
|
37
|
-
documentLifetimes.layouts[i] = readDocumentLifetime(mod, "layout",
|
|
38
|
+
documentLifetimes.layouts[i] = readDocumentLifetime(mod, "layout", layoutDefaultsAt(segments.slice(0, i + 1), layoutDefaults));
|
|
38
39
|
if (mod.default) layoutComponents.push({
|
|
39
40
|
component: mod.default,
|
|
40
41
|
segment
|
|
@@ -44,7 +45,7 @@ async function loadRouteModules(segments, requestUrl, defaultLayoutLifetime) {
|
|
|
44
45
|
if (isLeaf && segment.page) {
|
|
45
46
|
const mod = await loadModule(segment.page);
|
|
46
47
|
if (mod.default) PageComponent = mod.default;
|
|
47
|
-
documentLifetimes.page = readDocumentLifetime(mod, "page",
|
|
48
|
+
documentLifetimes.page = readDocumentLifetime(mod, "page", NO_LAYOUT_DEFAULTS);
|
|
48
49
|
deferSuspenseFor = collectModuleExports(mod, segment, i, true, metadataSources, deferSuspenseFor);
|
|
49
50
|
}
|
|
50
51
|
if (segment.access) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-module-loader.js","names":[],"sources":["../../../../src/server/route-module-loader.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-module-loader.js","names":[],"sources":["../../../../src/server/route-module-loader.ts"],"mappings":";;;;;;AAgDA,SAAS,6BAA6B,KAA8B,UAAwB;CAC1F,IAAI,sBAAsB,KACxB,MAAM,IAAI,MACR,GAAG,SAAS,sOAMd;AAEJ;AASA,SAAS,wBACP,KACA,QACA,SACQ;CACR,MAAM,UAAU,IAAI,qBAAqB,SAAS,SAAS;CAC3D,IAAI,OAAO,YAAY,YAAY,YAAY,QAAQ,EAAE,sBAAsB,UAC7E,OAAO;CAET,MAAM,QAAQ,QAAQ;CACtB,OAAO,OAAO,UAAU,YAAY,QAAQ,UAAU,QAAQ;AAChE;AAMA,SAAS,qBACP,KACA,SACA,cACA,QACA,iBACA,cACQ;CAER,6BAA6B,MADX,SAAS,QAAQ,MAAM,WAAW,QAAQ,QAAQ,aAAa,QAAQ,OAC/C;CAC1C,IAAI,IAAI,UACN,gBAAgB,KAAK;EACnB,gBAAgB,IAAI;EACpB,aAAa,QAAQ,eAAe,QAAQ;EAC5C;EACA;CACF,CAAC;CAEH,OAAO,wBAAwB,KAAK,QAAQ,YAAY;AAC1D;AAQA,eAAsB,iBACpB,UACA,YAEA,gBAC6B;CAC7B,MAAM,kBAAoC,CAAC;CAC3C,MAAM,mBAA2C,CAAC;CAClD,MAAM,YAA6B,CAAC;CACpC,IAAI,gBAA0D;CAC9D,IAAI,mBAAmB;CACvB,MAAM,oBAA6D,EAAE,SAAS,CAAC,EAAE;CAEjF,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EACxC,MAAM,UAAU,SAAS;EACzB,MAAM,SAAS,MAAM,SAAS,SAAS;EAEvC,IAAI,QAAQ,QAAQ;GAClB,MAAM,MAAM,MAAM,WAAW,QAAQ,MAAM;GAC3C,kBAAkB,QAAQ,KAAK,qBAC7B,KACA,UACA,iBAAiB,SAAS,MAAM,GAAG,IAAI,CAAC,GAAG,cAAc,CAC3D;GACA,IAAI,IAAI,SACN,iBAAiB,KAAK;IACpB,WAAW,IAAI;IACf;GACF,CAAC;GAEH,mBAAmB,qBACjB,KACA,SACA,GACA,OACA,iBACA,gBACF;EACF;EAEA,IAAI,UAAU,QAAQ,MAAM;GAC1B,MAAM,MAAM,MAAM,WAAW,QAAQ,IAAI;GACzC,IAAI,IAAI,SACN,gBAAgB,IAAI;GAEtB,kBAAkB,OAAO,qBAAqB,KAAK,QAAQ,kBAAkB;GAC7E,mBAAmB,qBACjB,KACA,SACA,GACA,MACA,iBACA,gBACF;EACF;EAEA,IAAI,QAAQ,QAAQ;GAClB,MAAM,YAAY,MAAM,WAAW,QAAQ,MAAM;GACjD,UAAU,KAAK,UAAU;EAC3B;CACF;CAEA,IAAI,CAAC,eAAe;EAClB,MAAM,cAAc,SACjB,KACE,GAAG,MACF,MAAM,EAAE,IAAI,EAAE,YAAY,UAAU,EAAE,OAAO,QAAQ,KAAK,YAAY,EAAE,SAAS,QAAQ,KAAK,cAAc,EAAE,UAAU,UAAU,EAAE,GAAG,MAAM,SAAS,SAAS,IAAI,YAAY,IACnL,CAAC,CACA,KAAK,IAAI;EACZ,MAAM,IAAI,qBACR,sCAAsC,IAAI,IAAI,UAAU,CAAC,CAAC,SAAS,uBAAuB,aAC5F;CACF;CAEA,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;CACF;AACF"}
|
|
@@ -23,7 +23,7 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
23
23
|
client: clientState?.documents ?? null,
|
|
24
24
|
signer
|
|
25
25
|
} : null,
|
|
26
|
-
|
|
26
|
+
layoutDefaults: deps.layoutDefaults
|
|
27
27
|
};
|
|
28
28
|
let routeResult;
|
|
29
29
|
const _buildStart = performance.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":";;;;;;;;;;;;;AAmFA,eAAsB,YACpB,KACA,OACA,iBACA,MACA,cACmB;CACnB,MAAM,EAAE,iBAAiB,kBAAkB,eAAe,gBAAgB;CAC1E,MAAM,WAAW,MAAM;CACvB,MAAM,OAAO,SAAS,SAAS,SAAS;CAKxC,IAAI,KAAK,SAAS,CAAC,KAAK,MACtB,OAAO,eAAe,KAAK,UAAU,eAAe;CAOtD,MAAM,cAAc,aAAa,GAAG,IAAI,qBAAqB,GAAG,IAAI;CACpE,MAAM,SAAS,mBAAmB,OAAO,KAAK;CAC9C,MAAM,gBAA+B;EACnC,WAAW,SAAS;GAAE,QAAQ,aAAa,aAAa;GAAM;EAAO,IAAI;EACzE,
|
|
1
|
+
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":";;;;;;;;;;;;;AAmFA,eAAsB,YACpB,KACA,OACA,iBACA,MACA,cACmB;CACnB,MAAM,EAAE,iBAAiB,kBAAkB,eAAe,gBAAgB;CAC1E,MAAM,WAAW,MAAM;CACvB,MAAM,OAAO,SAAS,SAAS,SAAS;CAKxC,IAAI,KAAK,SAAS,CAAC,KAAK,MACtB,OAAO,eAAe,KAAK,UAAU,eAAe;CAOtD,MAAM,cAAc,aAAa,GAAG,IAAI,qBAAqB,GAAG,IAAI;CACpE,MAAM,SAAS,mBAAmB,OAAO,KAAK;CAC9C,MAAM,gBAA+B;EACnC,WAAW,SAAS;GAAE,QAAQ,aAAa,aAAa;GAAM;EAAO,IAAI;EACzE,gBAAgB,KAAK;CACvB;CAOA,IAAI;CACJ,MAAM,cAAc,YAAY,IAAI;CACpC,IAAI;EACF,cAAc,MAAM,kBAClB,KACA,OACA,cACA,eACA,cAAc,mBAChB;CACF,SAAS,OAAO;EAMd,IAAI,iBAAiB,sBAAsB;GACzC,IAAA,QAAA,IAAA,aAA6B,cAC3B,QAAQ,KAAK,YAAY,MAAM,SAAS;GAE1C,OAAO,KAAK,mBAAmB,IAAI,WAAW,GAAG,GAAG,KAAK,eAAe;EAC1E;EACA,MAAM;CACR;CAEA,MAAM,YAAY,YAAY,IAAI;CAClC,aAAa;EACX,MAAM;EACN,KAAK,KAAK,MAAM,YAAY,WAAW;EACvC,MAAM;CACR,CAAC;CAED,MAAM,EAAE,SAAS,kBAAkB,kBAAkB,kBAAkB;CASvE,IAAI,WAAW;CAcf,MAAM,cAAc,kBAAkB,UAAU,aAAa;CAC7D,IAAI,YAAY,SAAS,GACvB,YAAY,qBAAqB,WAAW;CAQ9C,MAAM,UAAU,gBAAgB,UAAU,aAAa;CACvD,IAAI,QAAQ,SAAS,GACnB,YAAY,iBAAiB,OAAO;CAItC,IAAI,CAAC,kBAAkB;EACrB,MAAM,cAAc,2BAA2B,UAAU,aAAa;EACtE,IAAI,YAAY,SAAS,GACvB,YAAY,uBAAuB,WAAW;CAElD;CAQA,MAAM,YAAY,YAAY,IAAI;CAClC,MAAM,EAAE,WAAW,YAAY,gBAAgB,SAAS,KAAK,KAAK,iBAAiB,aAAa;CAEhG,aAAa;EACX,MAAM;EACN,KAAK,KAAK,MAAM,YAAY,IAAI,IAAI,SAAS;EAC7C,MAAM;CACR,CAAC;CAKD,IAAI,aAAa,GAAG,GAClB,OAAO,wBAAwB,WAAW,SAAS,UAAU,kBAAkB,eAAe;CAShG,MAAM,mBAAmB,mBAAmB;CAC5C,MAAM,YAAY,mBACd,MAAM,gBAAgB,kBAAkB,KAAK,iBAAiB,IAAI,MAAM,IACxE;CAGJ,OAAO,kBAAkB;EACvB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF,CAAC;AACH"}
|
|
@@ -122,7 +122,7 @@ function createRevalidateRendererFactory(deps) {
|
|
|
122
122
|
client: null,
|
|
123
123
|
signer: deps.keyDigestSigner
|
|
124
124
|
} : null,
|
|
125
|
-
|
|
125
|
+
layoutDefaults: deps.layoutDefaults
|
|
126
126
|
}, deps.buildManifest.metadataRouteHashes)).payload,
|
|
127
127
|
reactCacheScope
|
|
128
128
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { clientComponents } from "../vite-handoff-rsc.js";
|
|
2
|
+
import { NO_LAYOUT_DEFAULTS } from "../../shared/layout-defaults.js";
|
|
2
3
|
import { createElement } from "../../_react/react.js";
|
|
3
4
|
// src/server/segment-lifetime/outlet-gate.ts
|
|
4
5
|
var LIVE_ONLY_RENDER = {
|
|
5
6
|
documents: null,
|
|
6
|
-
|
|
7
|
+
layoutDefaults: NO_LAYOUT_DEFAULTS
|
|
7
8
|
};
|
|
8
9
|
function outletGate(spec) {
|
|
9
10
|
function OutletGate() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet-gate.js","names":[],"sources":["../../../../../src/server/segment-lifetime/outlet-gate.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"outlet-gate.js","names":[],"sources":["../../../../../src/server/segment-lifetime/outlet-gate.ts"],"mappings":";;;;AA8CA,IAAa,mBAAkC;CAC7C,WAAW;CACX,gBAAgB;AAClB;AAUA,SAAgB,WAAW,MAAgC;CACzD,SAAS,aAA2B;EAClC,MAAM,EAAE,kBAAkB,iBAAiB;EAC3C,OAAO,cAAc,eAAe;GAAE,aAAa,KAAK;GAAa,UAAU,OAAO,IAAI;EAAE,CAAC;CAC/F;CACA,aAAa,IAAI,UAAU;CAC3B,OAAO,cAAc,UAAU;AACjC;AAGA,IAAM,eAAe,IAAI,QAAgB;AAQzC,SAAgB,oBAAoB,MAAwB;CAC1D,IAAI,OAAO,SAAS,YAAY,SAAS,QAAQ,EAAE,UAAU,OAAO,OAAO;CAC3E,MAAM,OAAQ,KAA2B;CACzC,OAAO,OAAO,SAAS,cAAc,aAAa,IAAI,IAAI;AAC5D;AAEA,SAAS,OAAO,MAAkC;CAChD,IAAI,CAAC,KAAK,UAAU,OAAO,EAAE,UAAU,KAAK,QAAQ;CACpD,IAAI,YAAY,KAAK,UAAU,OAAO;EAAE,UAAU,KAAK;EAAS,QAAQ,KAAK,SAAS;CAAO;CAC7F,OAAO,aAAa,MAAM,KAAK,SAAS,IAAI;AAC9C;AAUA,SAAS,aAAa,MAAkB,QAAgC;CACtE,MAAM,UAA0C,CAAC;CACjD,KAAK,MAAM,UAAU,KAAK,QAAQ,QAAQ,OAAO,eAAe,OAAO,MAAM;CAC7E,OAAO;EAAE,MAAM;EAAM;EAAQ;CAAQ;AACvC"}
|
|
@@ -14,8 +14,8 @@ function refuseRead(scope, what, part, fixOverride) {
|
|
|
14
14
|
logDocumentReadOutsideKey(readOutsideKey(scope, what, part, fixOverride), { segment: scope.segmentPath });
|
|
15
15
|
}
|
|
16
16
|
function readOutsideKey(scope, what, part, fixOverride) {
|
|
17
|
-
const fix = fixOverride ?? (part ? `Add it to key.${part}, or declare lifetime: 'request'.` : "A 'document' segment cannot depend on it; declare lifetime: 'request'.");
|
|
18
|
-
return new Error(`[timber] ${scope.segmentPath} is lifetime: 'document' (declared, or from
|
|
17
|
+
const fix = fixOverride ?? (part ? `Add it to key.${part}, or declare lifetime: 'request'.` + (part === "headers" ? " A declared key.headers replaces layoutDefaults.key.headers, so list those too." : "") : "A 'document' segment cannot depend on it; declare lifetime: 'request'.");
|
|
18
|
+
return new Error(`[timber] ${scope.segmentPath} is lifetime: 'document' (declared, or from layoutDefaults) and read ${what}, which is not in its key. ${fix} The segment is skipped without rendering while its key is unchanged, so the read would freeze at its first value; until it is fixed, it renders as lifetime: 'request' for this client instead. See design/53-segment-lifetime.md §"What a 'document' segment may read".`);
|
|
19
19
|
}
|
|
20
20
|
function keyedHeaders(headers, scope) {
|
|
21
21
|
const keyed = (name) => {
|
|
@@ -68,15 +68,19 @@ var OBJECT_PROBES = new Set([
|
|
|
68
68
|
"toString",
|
|
69
69
|
"__proto__"
|
|
70
70
|
]);
|
|
71
|
-
function scopedParams(params) {
|
|
71
|
+
function scopedParams(params, record = "route") {
|
|
72
72
|
const scope = currentReadScope();
|
|
73
73
|
if (!scope) return params;
|
|
74
|
-
const
|
|
74
|
+
const throughSlot = (name) => record === "slot" && !scope.pathParams.has(name);
|
|
75
|
+
const refused = (name) => typeof name === "string" && (!scope.params.has(name) || throughSlot(name)) && !OBJECT_PROBES.has(name);
|
|
75
76
|
const allowed = (name) => !refused(name);
|
|
76
77
|
const target = Object.assign(Object.create(Object.getPrototypeOf(params)), params);
|
|
77
78
|
return new Proxy(target, {
|
|
78
79
|
get(target, name, receiver) {
|
|
79
|
-
if (refused(name))
|
|
80
|
+
if (refused(name)) {
|
|
81
|
+
const key = name;
|
|
82
|
+
refuseRead(scope, `the segment param "${key}"`, "segmentParams", scope.params.has(key) ? "It is keyed from the route's params, and was read through a slot's, which may hold another value: read it with getSegmentParams() and no slot path." : !scope.keyableParams.has(key) ? "No key on this segment can name it: it is not on the segment's path, and it is not a param a page below a main-chain layout binds (a page or a slot segment keys only its path). Render what reads it in a segment whose path has it, or declare lifetime: 'request'." : void 0);
|
|
83
|
+
}
|
|
80
84
|
return Reflect.get(target, name, receiver);
|
|
81
85
|
},
|
|
82
86
|
has: (target, name) => allowed(name) && Reflect.has(target, name),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-rule.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-rule.ts"],"mappings":";;;;AAqBA,SAAgB,mBAAkD;CAChE,OAAO,qBAAqB,SAAS;AACvC;AAWA,SAAS,WACP,OACA,MACA,MAEA,aACM;CAKN,MAAM,KAAK,OAAO;CAClB,MAAM,SAAS,iBAAiB;CAChC,IAAI,QAAQ,OAAO,KAAK,OAAO;CAC/B,IAAI,MAAM,SAAS,MAAM;CACzB,MAAM,SAAS,OAAO;CACtB,0BAA0B,eAAe,OAAO,MAAM,MAAM,WAAW,GAAG,EACxE,SAAS,MAAM,YACjB,CAAC;AACH;AAEA,SAAS,eACP,OACA,MACA,MACA,aACO;CACP,MAAM,MACJ,gBACC,OACG,iBAAiB,KAAK,
|
|
1
|
+
{"version":3,"file":"read-rule.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-rule.ts"],"mappings":"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"}
|
|
@@ -4,11 +4,13 @@ import { callAndRewrite, isThenable } from "../subtree-walk.js";
|
|
|
4
4
|
import { clientComponents } from "../vite-handoff-rsc.js";
|
|
5
5
|
import { Fragment, createElement } from "../../_react/react.js";
|
|
6
6
|
// src/server/segment-lifetime/read-scope.ts
|
|
7
|
-
function readScopeFor(segmentPath, lifetime, pathParams) {
|
|
7
|
+
function readScopeFor(segmentPath, lifetime, pathParams, descendants) {
|
|
8
8
|
const { key } = lifetime;
|
|
9
9
|
return {
|
|
10
10
|
segmentPath,
|
|
11
11
|
params: new Set(key.segmentParams ?? pathParams),
|
|
12
|
+
keyableParams: new Set([...pathParams, ...descendants]),
|
|
13
|
+
pathParams: new Set(pathParams),
|
|
12
14
|
searchParams: new Map(Object.entries(key.searchParams?.codecs ?? {}).map(([field, codec]) => [field, {
|
|
13
15
|
codec,
|
|
14
16
|
urlKey: key.searchParams?.urlKeys[field] ?? field
|
|
@@ -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":";;;;;;AAmFA,SAAgB,aACd,aACA,UACA,YACA,aACmB;CACnB,MAAM,EAAE,QAAQ;CAChB,OAAO;EACL;EACA,QAAQ,IAAI,IAAI,IAAI,iBAAiB,UAAU;EAC/C,eAAe,IAAI,IAAI,CAAC,GAAG,YAAY,GAAG,WAAW,CAAC;EACtD,YAAY,IAAI,IAAI,UAAU;EAC9B,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}`);
|
|
@@ -25,7 +30,7 @@ function assertKeyableHeaders(headers) {
|
|
|
25
30
|
}
|
|
26
31
|
function readKeyValues(lifetime, pathParams, params) {
|
|
27
32
|
const { key } = lifetime;
|
|
28
|
-
const segmentParams = (key.segmentParams ?? pathParams).map((name) => [name, canonicalParam(params[name])]);
|
|
33
|
+
const segmentParams = (key.segmentParams ?? pathParams).map((name) => [name, Object.hasOwn(params, name) ? canonicalParam(params[name]) : ABSENT]);
|
|
29
34
|
const definition = key.searchParams;
|
|
30
35
|
const searchParams = definition ? definition.buildSearchParams(definition.parse(getSearchParams())) : null;
|
|
31
36
|
const jar = key.cookies && key.cookies.length > 0 ? getCookieJar() : null;
|
|
@@ -39,6 +44,7 @@ function readKeyValues(lifetime, pathParams, params) {
|
|
|
39
44
|
headers
|
|
40
45
|
]);
|
|
41
46
|
}
|
|
47
|
+
var ABSENT = "[\"absent\"]";
|
|
42
48
|
function canonicalParam(value) {
|
|
43
49
|
return JSON.stringify(tagged(value));
|
|
44
50
|
}
|
|
@@ -59,6 +65,6 @@ function tagged(value) {
|
|
|
59
65
|
if (value instanceof Set) return ["t", [...value].map(tagged)];
|
|
60
66
|
return ["o", Object.entries(value).map(([k, v]) => [k, tagged(v)])];
|
|
61
67
|
}
|
|
62
|
-
export {
|
|
68
|
+
export { layoutDefaultsAt, readDocumentLifetime, readKeyValues };
|
|
63
69
|
|
|
64
70
|
//# 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));
|
|
@@ -49,7 +50,7 @@ var SlotDocumentOutlets = class {
|
|
|
49
50
|
scoped(node, kind, lifetime, component) {
|
|
50
51
|
const treePath = this.treePath(node);
|
|
51
52
|
const segmentPath = kind === "page" ? pageOutletKey(treePath) : layoutOutletKey(treePath);
|
|
52
|
-
return inReadScope(component, readScopeFor(segmentPath, lifetime, this.pathParams(node)));
|
|
53
|
+
return inReadScope(component, readScopeFor(segmentPath, lifetime, this.pathParams(node), []));
|
|
53
54
|
}
|
|
54
55
|
decision(node, segmentPath, lifetime) {
|
|
55
56
|
return documentOutletFor(this.ctx.render, segmentPath, lifetime, this.pathParams(node), this.ctx.params());
|
|
@@ -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;EAGxF,OAAO,YAAY,WAAW,aAAa,aAAa,UAAU,KAAK,WAAW,IAAI,GAAG,CAAC,CAAC,CAAC;CAC9F;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"}
|
|
@@ -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"}
|
|
@@ -220,6 +220,7 @@
|
|
|
220
220
|
"shared/href-validation.ts": "shared/href-validation.js",
|
|
221
221
|
"shared/href.ts": "shared/href.js",
|
|
222
222
|
"shared/key-headers.ts": "shared/key-headers.js",
|
|
223
|
+
"shared/layout-defaults.ts": "shared/layout-defaults.js",
|
|
223
224
|
"shared/merge-search-params.ts": "shared/merge-search-params.js",
|
|
224
225
|
"shared/param-value.ts": "shared/param-value.js",
|
|
225
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;AAwDA,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C"}
|
|
@@ -29,7 +29,7 @@ function getSegmentParams(segmentPath) {
|
|
|
29
29
|
if (!store) throw new Error("[timber] getSegmentParams() called outside of a request context. It can only be used in middleware, access checks, server components, and server actions.");
|
|
30
30
|
if (!store.segmentParams) throw new Error("[timber] getSegmentParams() called before route matching completed. Segment params are not available until after the route is matched.");
|
|
31
31
|
const slotResolved = resolveSegmentParams(store.segmentParams, store.slotParams, segmentPath);
|
|
32
|
-
if (slotResolved !== store.segmentParams) return scopedParams(slotResolved);
|
|
32
|
+
if (slotResolved !== store.segmentParams) return scopedParams(slotResolved, "slot");
|
|
33
33
|
if (segmentPath && isDebug() && store.matchedSegmentPath) {
|
|
34
34
|
const expected = extractDynamicSegments(segmentPath);
|
|
35
35
|
const actual = extractDynamicSegments(store.matchedSegmentPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":";;;;;;;;AAuDA,SAAgB,aAA8B;CAC5C,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,qJAEF;CAIF,MAAM,QAAQ,iBAAiB;CAC/B,OAAO,QAAQ,aAAa,MAAM,SAAS,KAAK,IAAI,MAAM;AAC5D;AAUA,SAAgB,UAAU,MAAkC;CAE1D,OADgB,WACT,CAAA,CAAQ,IAAI,IAAI,KAAK;AAC9B;AAWA,SAAgB,gBAAgB,QAA8C;CAC5E,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,0JAEF;CAIF,IAAI,QAAQ,sBAAsB,MAAM;MACnC,kBAAkB,uBAAuB;CAE9C,OAAO,MAAM;AACf;AAMA,sBAAsB,eAAe;AAKrC,uBAAuB,gBAAgB;AAcvC,SAAgB,iBAAiB,aAAqC;CACpE,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,2JAEF;CAEF,IAAI,CAAC,MAAM,eACT,MAAM,IAAI,MACR,wIAEF;CAQF,MAAM,eAAe,qBAAqB,MAAM,eAAe,MAAM,YAAY,WAAW;CAE5F,IAAI,iBAAiB,MAAM,eAAe,OAAO,aAAa,
|
|
1
|
+
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":";;;;;;;;AAuDA,SAAgB,aAA8B;CAC5C,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,qJAEF;CAIF,MAAM,QAAQ,iBAAiB;CAC/B,OAAO,QAAQ,aAAa,MAAM,SAAS,KAAK,IAAI,MAAM;AAC5D;AAUA,SAAgB,UAAU,MAAkC;CAE1D,OADgB,WACT,CAAA,CAAQ,IAAI,IAAI,KAAK;AAC9B;AAWA,SAAgB,gBAAgB,QAA8C;CAC5E,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,0JAEF;CAIF,IAAI,QAAQ,sBAAsB,MAAM;MACnC,kBAAkB,uBAAuB;CAE9C,OAAO,MAAM;AACf;AAMA,sBAAsB,eAAe;AAKrC,uBAAuB,gBAAgB;AAcvC,SAAgB,iBAAiB,aAAqC;CACpE,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,2JAEF;CAEF,IAAI,CAAC,MAAM,eACT,MAAM,IAAI,MACR,wIAEF;CAQF,MAAM,eAAe,qBAAqB,MAAM,eAAe,MAAM,YAAY,WAAW;CAE5F,IAAI,iBAAiB,MAAM,eAAe,OAAO,aAAa,cAAc,MAAM;CAOlF,IAAI,eAAe,QAAQ,KAAK,MAAM,oBAAoB;EACxD,MAAM,WAAW,uBAAuB,WAAW;EACnD,MAAM,SAAS,uBAAuB,MAAM,kBAAkB;EAC9D,MAAM,UAAU,SAAS,QAAQ,MAAM,CAAC,OAAO,SAAS,CAAC,CAAC;EAE1D,IAAI,QAAQ,SAAS,GACnB,QAAQ,KACN,8BAA8B,YAAY,oCAAoC,MAAM,mBAAmB,uBAChF,QAAQ,KAAK,IAAI,EAAE,oEAE5C;CAEJ;CAEA,OAAO,aAAa,MAAM,aAAa;AACzC;AAQA,SAAgB,iBAAiB,QAA6B;CAC5D,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MAAM,kEAAkE;CAEpF,MAAM,gBAAgB;AACxB;AAmEA,SAAgB,qBACd,oBACA,eACA,IACG;CACH,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OAAO,OAAO,GAAG;CACtB,MAAM,SAAS,IAAI,MAAM,OAAO,EAC9B,IAAI,QAAQ,MAAM,UAAU;EAC1B,IAAI,SAAS,iBAAiB,OAAO;EACrC,IAAI,SAAS,sBAAsB,OAAO;EAC1C,OAAO,QAAQ,IAAI,QAAQ,MAAM,QAAQ;CAC3C,EACF,CAAC;CACD,OAAO,kBAAkB,IAAI,QAAQ,EAAE;AACzC;AAuCA,SAAgB,sBAAsB,aAA2B;CAC/D,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OAAO;CACZ,MAAM,qBAAqB;AAC7B;AAOA,SAAS,uBAAuB,OAAyB;CACvD,MAAM,WAAqB,CAAC;CAE5B,MAAM,KAAK;CACX,IAAI;CACJ,QAAQ,IAAI,GAAG,KAAK,KAAK,OAAO,MAC9B,SAAS,KAAK,EAAE,EAAE;CAEpB,OAAO;AACT;AAWA,SAAgB,yBAAiC;CAC/C,MAAM,QAAQ,kBAAkB,SAAS;CAGzC,IAAI,OAAO,kBAAkB,uBAAuB;CACpD,OAAO,OAAO,gBAAgB;AAChC;AA2DA,SAAgB,sBACd,KACA,IACA,EAAE,iBAAiB,SAAS,WAAW,gBAAuC,CAAC,GAC5E;CACH,MAAM,eAAe,IAAI,QAAQ,IAAI,OAAO;CAC5C,MAAM,aAAa,iBAAiB,IAAI,IAAI,IAAI,GAAG,CAAC;CAEpD,MAAM,OAAO,UAAU,IAAI,IAAI,OAAO,IAAI;CAC1C,MAAM,QAA6B;EACjC,SAAS;EACT,SAAS,cAAc,IAAI,OAAO;EAClC,iBAAiB;EAIjB,cAAc,OAAO,KAAM,IAAI,QAAQ,IAAI,QAAQ,KAAK;EACxD,eAAe;EAKf,cAAc,WAAW;EACzB,cAAc,WAAW;EACzB,WAAW,IAAI,IAAI;EACnB,SAAS;EACT,gBAAgB;EAChB;EACA;CACF;CACA,OAAO,kBAAkB,IAAI,aAAa,uBAAuB,IAAI,eAAe,CAAC;AACvF;AAQA,SAAgB,wBAAwB,SAAwB;CAC9D,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,OACF,MAAM,iBAAiB;AAE3B;AAQA,SAAgB,sBAA4B;CAC1C,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,OACF,MAAM,UAAU;AAEpB;AAcA,SAAgB,0BAA0B,SAAwB;CAChE,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MAAM,2EAA2E;CAI7F,IAAI,aAAa;CACjB,QAAQ,cAAc;EACpB,aAAa;CACf,CAAC;CACD,IAAI,CAAC,YAAY;CAGjB,MAAM,SAAS,IAAI,QAAQ,MAAM,eAAe;CAChD,QAAQ,SAAS,OAAO,QAAQ;EAC9B,OAAO,IAAI,KAAK,KAAK;CACvB,CAAC;CACD,MAAM,UAAU,cAAc,MAAM;AACtC;AAIA,IAAM,mBAAmB,IAAI,IAAI;CAAC;CAAO;CAAU;AAAQ,CAAC;AAU5D,SAAS,cAAc,QAA0B;CAC/C,MAAM,OAAO,IAAI,QAAQ,MAAM;CAC/B,OAAO,IAAI,MAAM,MAAM,EACrB,IAAI,QAAQ,MAAM;EAChB,IAAI,OAAO,SAAS,YAAY,iBAAiB,IAAI,IAAI,GACvD,aAAa;GACX,MAAM,IAAI,MACR,sEACc,KAAK,qGAErB;EACF;EAEF,MAAM,QAAQ,QAAQ,IAAI,QAAQ,IAAI;EAEtC,IAAI,OAAO,UAAU,YACnB,OAAO,MAAM,KAAK,MAAM;EAE1B,OAAO;CACT,EACF,CAAC;AACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet-gate.js","names":[],"sources":["../../../../../src/server/segment-lifetime/outlet-gate.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"outlet-gate.js","names":[],"sources":["../../../../../src/server/segment-lifetime/outlet-gate.ts"],"mappings":";;;AAqEA,IAAM,eAAe,IAAI,QAAgB;AAQzC,SAAgB,oBAAoB,MAAwB;CAC1D,IAAI,OAAO,SAAS,YAAY,SAAS,QAAQ,EAAE,UAAU,OAAO,OAAO;CAC3E,MAAM,OAAQ,KAA2B;CACzC,OAAO,OAAO,SAAS,cAAc,aAAa,IAAI,IAAI;AAC5D"}
|