@timber-js/app 0.2.0-alpha.237 → 0.2.0-alpha.239
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/chains-CmzbpG-6.js +1 -0
- package/dist/_chunks/{chains-BsGKkMTK.js → chains-DMoHX4yH.js} +2 -2
- package/dist/_chunks/{chains-BsGKkMTK.js.map → chains-DMoHX4yH.js.map} +1 -1
- package/dist/_chunks/{classify-cmE0Gins.js → classify-BwyAd-dZ.js} +3 -3
- package/dist/_chunks/{classify-cmE0Gins.js.map → classify-BwyAd-dZ.js.map} +1 -1
- package/dist/_chunks/{cli-check-BwiahbTC.js → cli-check-DQAD9MLo.js} +3 -3
- package/dist/_chunks/{cli-check-BwiahbTC.js.map → cli-check-DQAD9MLo.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-Brw7kTmm.js → cli-schema-sync-C_xNLqBj.js} +1 -1
- package/dist/_chunks/{cli-schema-sync-B2ldclRO.js → cli-schema-sync-CmGls3dc.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-B2ldclRO.js.map → cli-schema-sync-CmGls3dc.js.map} +1 -1
- package/dist/_chunks/{client-dep-entries-C1nMlLKV.js → client-dep-entries-C5BTQtFS.js} +2 -2
- package/dist/_chunks/{client-dep-entries-C1nMlLKV.js.map → client-dep-entries-C5BTQtFS.js.map} +1 -1
- package/dist/_chunks/{convention-lint-CLpuzY5h.js → convention-lint-GQA6WTRo.js} +2 -2
- package/dist/_chunks/{convention-lint-CLpuzY5h.js.map → convention-lint-GQA6WTRo.js.map} +1 -1
- package/dist/_chunks/dev-server--4_Ogy_6.js +1 -0
- package/dist/_chunks/{dev-server-lrdpD7Ws.js → dev-server-Cr3_Fu5A.js} +244 -26
- package/dist/_chunks/dev-server-Cr3_Fu5A.js.map +1 -0
- package/dist/_chunks/dev-span-RsVeYYc_.js.map +1 -1
- package/dist/_chunks/{scanner-CrB_h6FA.js → interception-CtNt9jPt.js} +169 -1043
- package/dist/_chunks/interception-CtNt9jPt.js.map +1 -0
- package/dist/_chunks/{live-graph-ChuFfmLi.js → live-graph-HcLScfiV.js} +4 -4
- package/dist/_chunks/{live-graph-ChuFfmLi.js.map → live-graph-HcLScfiV.js.map} +1 -1
- package/dist/_chunks/{metadata-routes-BL26HCDd.js → metadata-routes-MXNjWOt5.js} +60 -2
- package/dist/_chunks/metadata-routes-MXNjWOt5.js.map +1 -0
- package/dist/_chunks/{poison-scan-CJ9QfJWb.js → poison-scan-DONdiCGX.js} +2 -2
- package/dist/_chunks/{poison-scan-CJ9QfJWb.js.map → poison-scan-DONdiCGX.js.map} +1 -1
- package/dist/_chunks/scanner-DSAJjH0x.js +1043 -0
- package/dist/_chunks/scanner-DSAJjH0x.js.map +1 -0
- package/dist/_chunks/{walkers-BUvpsb2Q.js → walkers-96YopJds.js} +3 -3
- package/dist/_chunks/{walkers-BUvpsb2Q.js.map → walkers-96YopJds.js.map} +1 -1
- package/dist/analyze/crawl-entry.js +3 -3
- package/dist/analyze/graph-command.js +2 -2
- package/dist/cli.js +3 -3
- package/dist/config-types.d.ts +11 -0
- package/dist/config-types.d.ts.map +1 -1
- package/dist/config-validation.d.ts.map +1 -1
- package/dist/dev-tools/instrumentation.d.ts.map +1 -1
- package/dist/dev-tools/log-columns.d.ts +50 -0
- package/dist/dev-tools/log-columns.d.ts.map +1 -0
- package/dist/dev-tools/logger.d.ts +5 -0
- package/dist/dev-tools/logger.d.ts.map +1 -1
- package/dist/index.js +6 -155
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/dev-tools/instrumentation.js +5 -1
- package/dist/native/rsc/dev-tools/instrumentation.js.map +1 -1
- package/dist/native/rsc/dev-tools/log-columns.js +69 -0
- package/dist/native/rsc/dev-tools/log-columns.js.map +1 -0
- package/dist/native/rsc/dev-tools/logger.js +60 -33
- package/dist/native/rsc/dev-tools/logger.js.map +1 -1
- package/dist/native/rsc/manifest.json +1 -0
- package/dist/native/rsc/shared/dev-span.js +5 -2
- package/dist/native/rsc/shared/dev-span.js.map +1 -1
- package/dist/native/rsc/shared/span-waterfall.js +13 -2
- package/dist/native/rsc/shared/span-waterfall.js.map +1 -1
- package/dist/native/ssr/dev-tools/instrumentation.js +5 -1
- package/dist/native/ssr/dev-tools/instrumentation.js.map +1 -1
- package/dist/native/ssr/dev-tools/log-columns.js +69 -0
- package/dist/native/ssr/dev-tools/log-columns.js.map +1 -0
- package/dist/native/ssr/dev-tools/logger.js +60 -33
- package/dist/native/ssr/dev-tools/logger.js.map +1 -1
- package/dist/native/ssr/manifest.json +1 -0
- package/dist/native/ssr/shared/dev-span.js +5 -2
- package/dist/native/ssr/shared/dev-span.js.map +1 -1
- package/dist/native/ssr/shared/span-waterfall.js +13 -2
- package/dist/native/ssr/shared/span-waterfall.js.map +1 -1
- package/dist/plugins/dev-precompile.d.ts +42 -14
- package/dist/plugins/dev-precompile.d.ts.map +1 -1
- package/dist/plugins/dev-server.d.ts.map +1 -1
- package/dist/routing/index.js +3 -2
- package/dist/routing/manifest-codegen.d.ts +2 -0
- package/dist/routing/manifest-codegen.d.ts.map +1 -1
- package/dist/server/internal.js +1 -2
- package/dist/server/internal.js.map +1 -1
- package/dist/shared/dev-span.d.ts +6 -0
- package/dist/shared/dev-span.d.ts.map +1 -1
- package/dist/shared/span-waterfall.d.ts.map +1 -1
- package/docs/api/34-api-config.mdx +18 -0
- package/package.json +1 -1
- package/src/config-types.ts +11 -0
- package/src/config-validation.ts +15 -8
- package/src/dev-tools/instrumentation.ts +4 -1
- package/src/dev-tools/log-columns.ts +156 -0
- package/src/dev-tools/logger.ts +107 -63
- package/src/plugins/dev-precompile.ts +108 -20
- package/src/plugins/dev-server.ts +12 -11
- package/src/routing/manifest-codegen.ts +2 -2
- package/src/shared/dev-span.ts +13 -1
- package/src/shared/span-waterfall.ts +36 -4
- package/dist/_chunks/chains-DHmoKxkO.js +0 -1
- package/dist/_chunks/dev-server-BGGGhHXx.js +0 -1
- package/dist/_chunks/dev-server-lrdpD7Ws.js.map +0 -1
- package/dist/_chunks/metadata-routes-BL26HCDd.js.map +0 -1
- package/dist/_chunks/scanner-CrB_h6FA.js.map +0 -1
- package/dist/_chunks/segment-keys-Y60KNc8C.js +0 -61
- package/dist/_chunks/segment-keys-Y60KNc8C.js.map +0 -1
- package/dist/_chunks/tree-match-Bqdr9szG.js +0 -168
- package/dist/_chunks/tree-match-Bqdr9szG.js.map +0 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { FETCH_BODY_SPAN_NAME, ROOT_SPAN_NAME, devSpanLabel } from "../shared/dev-span.js";
|
|
1
|
+
import { FETCH_BODY_SPAN_NAME, ROOT_SPAN_NAME, devSpanLabel, fetchDisplayUrl } from "../shared/dev-span.js";
|
|
2
2
|
import { buildWaterfall } from "../shared/span-waterfall.js";
|
|
3
|
+
import { fitParts, renderColumns } from "./log-columns.js";
|
|
3
4
|
import { STATUS_CODES } from "node:http";
|
|
4
5
|
import { styleText } from "node:util";
|
|
5
6
|
// src/dev-tools/logger.ts
|
|
@@ -107,13 +108,15 @@ function formatSpanTree(spans, config) {
|
|
|
107
108
|
const path = String(root.attributes["url.path"] ?? "/");
|
|
108
109
|
const traceId = root.spanContext().traceId;
|
|
109
110
|
const actionName = root.attributes["timber.action_name"];
|
|
110
|
-
const dimTrace = style("dim", `trace_id: ${traceId}`)
|
|
111
|
+
const dimTrace = ` ${style("dim", `trace_id: ${traceId}`)}`;
|
|
111
112
|
if (actionName) {
|
|
112
113
|
const actionFile = root.attributes["timber.action_file"];
|
|
113
|
-
|
|
114
|
-
|
|
114
|
+
const action = `ACTION ${actionName}${actionFile ? ` (${actionFile})` : ""}`;
|
|
115
|
+
lines.push(fitParts(style("bold", action), dimTrace, config?.columns));
|
|
116
|
+
} else lines.push(fitParts(`${colorMethod(method)} ${style("bold", path)}`, dimTrace, config?.columns));
|
|
115
117
|
const body = rows.filter((r) => r.span.span !== root);
|
|
116
|
-
|
|
118
|
+
const tree = [];
|
|
119
|
+
for (const { item, prefix, connector } of treeConnectors(body, (r) => r.depth - 1)) formatRow(item, tree, prefix, connector, bodies, slowPhaseMs, rootStart);
|
|
117
120
|
const status = root.attributes["http.response.status_code"] ?? (root.status.code === 2 ? 500 : 200);
|
|
118
121
|
const totalMs = Math.round(hrTimeToMs(root.duration));
|
|
119
122
|
const statusFmt = status < 400 ? "green" : status < 500 ? "yellow" : "red";
|
|
@@ -123,26 +126,38 @@ function formatSpanTree(spans, config) {
|
|
|
123
126
|
const folded = body.reduce((n, r) => n + r.folded.length, 0);
|
|
124
127
|
const omitted = [hiddenWaits > 0 ? `${hiddenWaits} wait${hiddenWaits === 1 ? "" : "s"} hidden` : "", folded > 0 ? `${folded} await${folded === 1 ? "" : "s"} folded` : ""].filter(Boolean);
|
|
125
128
|
const omittedNote = omitted.length > 0 ? style("dim", ` · ${omitted.join(", ")} (TIMBER_DEV_LOG=verbose)`) : "";
|
|
126
|
-
|
|
129
|
+
tree.push({
|
|
130
|
+
durationMs: totalMs,
|
|
131
|
+
text: style(statusFmt, `✓ ${statusText}`),
|
|
132
|
+
tail: `${denyNote}${omittedNote}`
|
|
133
|
+
});
|
|
134
|
+
lines.push(...renderColumns(tree, config?.columns, {
|
|
135
|
+
dim: (text) => style("dim", text),
|
|
136
|
+
slow: (text) => style("yellow", text)
|
|
137
|
+
}));
|
|
127
138
|
return lines.join("\n") + "\n";
|
|
128
139
|
}
|
|
129
|
-
function
|
|
140
|
+
function formatFetchParts(span, timing) {
|
|
130
141
|
const method = String(span.attributes["http.request.method"] ?? "GET");
|
|
131
|
-
const url = String(span.attributes["http.url"] ?? "");
|
|
142
|
+
const url = fetchDisplayUrl(String(span.attributes["http.url"] ?? ""));
|
|
132
143
|
const statusCode = span.attributes["http.response.status_code"];
|
|
133
144
|
const cacheStatus = span.attributes["timber.cache_status"];
|
|
134
145
|
const fetchError = span.attributes["timber.fetch_error"];
|
|
135
146
|
const isError = span.status.code === 2;
|
|
136
|
-
const {
|
|
137
|
-
const
|
|
138
|
-
let
|
|
139
|
-
|
|
140
|
-
if (
|
|
147
|
+
const { headersMs, bodyMs, rowMs } = timing;
|
|
148
|
+
const head = `${style("dim", `fetch ${method}`)} ${url}`;
|
|
149
|
+
let text = "";
|
|
150
|
+
if (bodyMs > 0) text += ` ${style("dim", `(${headersMs}ms + ${bodyMs}ms body)`)}`;
|
|
151
|
+
else if (headersMs !== rowMs) text += ` ${style("dim", `(${headersMs}ms)`)}`;
|
|
152
|
+
if (cacheStatus) text += ` ${style("dim", `[cdn: ${cacheStatus}]`)}`;
|
|
141
153
|
if (isError) {
|
|
142
154
|
const errMsg = fetchError ? `: ${fetchError}` : "";
|
|
143
|
-
|
|
144
|
-
} else if (statusCode && statusCode >= 400)
|
|
145
|
-
return
|
|
155
|
+
text += ` ${style("red", `ERROR${errMsg}`)}`;
|
|
156
|
+
} else if (statusCode && statusCode >= 400) text += ` ${style("yellow", String(statusCode))}`;
|
|
157
|
+
return {
|
|
158
|
+
head,
|
|
159
|
+
tail: text
|
|
160
|
+
};
|
|
146
161
|
}
|
|
147
162
|
function accessOutcome(span) {
|
|
148
163
|
const result = span.attributes["timber.result"];
|
|
@@ -158,31 +173,43 @@ function formatRow(row, lines, prefix, connector, bodies, slowPhaseMs, rootStart
|
|
|
158
173
|
const leaf = row.folded.at(-1);
|
|
159
174
|
const startMs = Math.round(relativeMs(outer.startTime, rootStart));
|
|
160
175
|
const endMs = Math.round(relativeMs(outer.endTime, rootStart));
|
|
161
|
-
const durationMs = endMs - startMs;
|
|
162
|
-
const slow = (text) => durationMs > slowPhaseMs ? style("yellow", text) : text;
|
|
163
176
|
const envTag = (span) => `${style("cyan", `[${devSpanLabel(span.name, span.attributes).env}]`)} `;
|
|
164
|
-
const
|
|
165
|
-
const lead = `${prefix}${connector} ${frame}`;
|
|
177
|
+
const named = (span) => `${span.name === "timber.await" ? "" : envTag(span)}${devSpanLabel(span.name, span.attributes).label}`;
|
|
166
178
|
const outcome = accessOutcome(outer);
|
|
179
|
+
const lead = `${prefix}${connector} `;
|
|
167
180
|
if (leaf?.name === "timber.fetch" || outer.name === "timber.fetch") {
|
|
168
181
|
const fetch = leaf?.name === "timber.fetch" ? leaf : row.span;
|
|
169
182
|
const reads = bodies.get(fetch.spanId) ?? [];
|
|
170
183
|
const bodyMs = Math.round(reads.reduce((ms, r) => ms + (r.endMs - r.startMs), 0));
|
|
171
|
-
const
|
|
172
|
-
const end =
|
|
173
|
-
const
|
|
184
|
+
const lastReadEnd = reads.reduce((end, r) => Math.max(end, r.endMs), -Infinity);
|
|
185
|
+
const end = lastReadEnd > -Infinity ? Math.max(endMs, Math.round(lastReadEnd - hrTimeToMs(rootStart))) : endMs;
|
|
186
|
+
const fetchStart = Math.round(relativeMs(fetch.span.startTime, rootStart));
|
|
187
|
+
const fetchEnd = Math.round(relativeMs(fetch.span.endTime, rootStart));
|
|
188
|
+
const fetchParts = formatFetchParts(fetch.span, {
|
|
189
|
+
headersMs: fetchEnd - fetchStart,
|
|
190
|
+
bodyMs,
|
|
191
|
+
rowMs: end - startMs
|
|
192
|
+
});
|
|
193
|
+
const askerName = named(outer);
|
|
194
|
+
const asker = row.folded.length > 0 && !askerName.startsWith("await fetch(") ? `${askerName} → ` : "";
|
|
195
|
+
lines.push({
|
|
174
196
|
startMs,
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
197
|
+
durationMs: end - startMs,
|
|
198
|
+
slow: end - startMs > slowPhaseMs,
|
|
199
|
+
text: `${lead}${asker}${fetchParts.head}`,
|
|
200
|
+
tail: `${fetchParts.tail}${outcome ? style("dim", outcome) : ""}`
|
|
178
201
|
});
|
|
179
|
-
lines.push(outcome ? `${fetchLine}${style("dim", outcome)}` : fetchLine);
|
|
180
202
|
} else {
|
|
181
|
-
const
|
|
182
|
-
const
|
|
183
|
-
const
|
|
184
|
-
|
|
185
|
-
|
|
203
|
+
const first = row.folded[0]?.span;
|
|
204
|
+
const frame = outer.name !== "timber.await" && first ? `${named(outer)} → ` : "";
|
|
205
|
+
const label = frame && first ? named(first) : named(outer);
|
|
206
|
+
lines.push({
|
|
207
|
+
startMs,
|
|
208
|
+
durationMs: endMs - startMs,
|
|
209
|
+
slow: endMs - startMs > slowPhaseMs,
|
|
210
|
+
text: `${lead}${frame}${label}`,
|
|
211
|
+
tail: outcome ? style("dim", outcome) : ""
|
|
212
|
+
});
|
|
186
213
|
}
|
|
187
214
|
for (const { span } of chain) for (const event of span.events) {
|
|
188
215
|
if (event.name !== "timber.cache.hit" && event.name !== "timber.cache.miss") continue;
|
|
@@ -191,7 +218,7 @@ function formatRow(row, lines, prefix, connector, bodies, slowPhaseMs, rootStart
|
|
|
191
218
|
const durMs = event.attributes?.["duration_ms"];
|
|
192
219
|
const durStr = durMs !== void 0 ? ` ${durMs < 1 ? "<1" : Math.round(durMs)}ms` : "";
|
|
193
220
|
const stale = event.attributes?.["stale"] ? " (stale)" : "";
|
|
194
|
-
lines.push(`${childPrefix}${style("dim", `└── ${key} timber.cache ${hitMiss}${durStr}${stale}`)}`);
|
|
221
|
+
lines.push({ text: `${childPrefix}${style("dim", `└── ${key} timber.cache ${hitMiss}${durStr}${stale}`)}` });
|
|
195
222
|
}
|
|
196
223
|
}
|
|
197
224
|
function formatSpanSummary(spans, _config) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","names":[],"sources":["../../../../src/dev-tools/logger.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","names":[],"sources":["../../../../src/dev-tools/logger.ts"],"mappings":"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"}
|
|
@@ -91,6 +91,7 @@
|
|
|
91
91
|
"cookies/validation.ts": "cookies/validation.js",
|
|
92
92
|
"dev-tools/await-span.ts": "dev-tools/await-span.js",
|
|
93
93
|
"dev-tools/instrumentation.ts": "dev-tools/instrumentation.js",
|
|
94
|
+
"dev-tools/log-columns.ts": "dev-tools/log-columns.js",
|
|
94
95
|
"dev-tools/logger.ts": "dev-tools/logger.js",
|
|
95
96
|
"dev-tools/span-sink.ts": "dev-tools/span-sink.js",
|
|
96
97
|
"params/codec-registry.ts": "params/codec-registry.js",
|
|
@@ -31,6 +31,9 @@ function slotPrefix(attrs) {
|
|
|
31
31
|
const slot = attrs["timber.slot"];
|
|
32
32
|
return slot ? `${String(slot)} ` : "";
|
|
33
33
|
}
|
|
34
|
+
function fetchDisplayUrl(url) {
|
|
35
|
+
return url.replace(/^[a-z][a-z0-9+.-]*:\/\//i, "");
|
|
36
|
+
}
|
|
34
37
|
function devSpanLabel(name, attrs) {
|
|
35
38
|
switch (name) {
|
|
36
39
|
case ROOT_SPAN_NAME: {
|
|
@@ -101,7 +104,7 @@ function devSpanLabel(name, attrs) {
|
|
|
101
104
|
const fetchMethod = attrs["http.request.method"] ?? "GET";
|
|
102
105
|
const fetchUrl = attrs["http.url"] ?? "";
|
|
103
106
|
return {
|
|
104
|
-
label: `fetch ${String(fetchMethod)} ${String(fetchUrl)}`,
|
|
107
|
+
label: `fetch ${String(fetchMethod)} ${fetchDisplayUrl(String(fetchUrl))}`,
|
|
105
108
|
env: "fetch"
|
|
106
109
|
};
|
|
107
110
|
}
|
|
@@ -111,6 +114,6 @@ function devSpanLabel(name, attrs) {
|
|
|
111
114
|
};
|
|
112
115
|
}
|
|
113
116
|
}
|
|
114
|
-
export { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, FETCH_BODY_SPAN_NAME, FETCH_SPAN_NAME, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, traceTimingEntry };
|
|
117
|
+
export { AWAIT_SPAN_NAME, AWAIT_WAIT_ATTRIBUTE, DEV_AWAIT_KEY, DEV_SPAN_ATTRIBUTES, DEV_SPAN_EVENT, DEV_SPAN_REPLAY_EVENT, DEV_SPAN_SINK_KEY, DEV_SPAN_URL_ATTRIBUTES, FETCH_BODY_SPAN_NAME, FETCH_SPAN_NAME, ROOT_SPAN_NAME, TRACE_TIMING_NAME, devSpanLabel, fetchDisplayUrl, traceTimingEntry };
|
|
115
118
|
|
|
116
119
|
//# sourceMappingURL=dev-span.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAWA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;AAQ/B,IAAa,uBAAuB;AAUpC,IAAa,kBAAkB;AAO/B,IAAa,uBAAuB;AAGpC,IAAa,iBAAiB;AAU9B,IAAa,sBAAsB;CACjC;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CAEA;AACF;AAKA,IAAa,0BAAyD,IAAI,IAAI,CAC5E,YACA,UACF,CAAC;AAyCD,SAAgB,iBAAiB,SAAyB;CACxD,OAAO,GAAG,kBAAkB,SAAS,QAAQ;AAC/C;AAQA,SAAS,WAAW,OAA+B;CACjD,MAAM,OAAO,MAAM;CACnB,OAAO,OAAO,GAAG,OAAO,IAAI,EAAE,KAAK;AACrC;AAOA,SAAgB,aAAa,MAAc,OAAuD;CAChG,QAAQ,MAAR;EACE,KAAK,gBAAgB;GACnB,MAAM,SAAS,MAAM,0BAA0B;GAC/C,MAAM,OAAO,MAAM,eAAe;GAClC,OAAO;IAAE,OAAO,GAAG,OAAO,MAAM,EAAE,GAAG,OAAO,IAAI;IAAK,KAAK;GAAM;EAClE;EACA,KAAK,gBACH,OAAO;GAAE,OAAO;GAAY,KAAK;EAAQ;EAC3C,KAAK,qBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAM;EAC9C,KAAK,iBACH,OAAO;GAAE,OAAO;GAAU,KAAK;EAAM;EACvC,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,eAAe,OAAO,GAAG,EAAE;IAAI,KAAK;GAAM;EAC5D;EACA,KAAK,cACH,OAAO;GAAE,OAAO;GAAoB,KAAK;EAAM;EACjD,KAAK,iBAAiB;GACpB,MAAM,aAAa,MAAM,yBAAyB;GAClD,OAAO;IAAE,OAAO,OAAO,UAAU;IAAG,KAAK;GAAM;EACjD;EACA,KAAK,mBACH,OAAO;GAAE,OAAO;GAAc,KAAK;EAAM;EAC3C,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,UAAU,WAAW,KAAK,IAAI,OAAO,GAAG;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,eAAe;GAClB,MAAM,QAAQ,MAAM,mBAAmB;GACvC,OAAO;IAAE,OAAO,QAAQ,WAAW,KAAK,IAAI,OAAO,KAAK;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,iBAEH,OAAO;GACL,OAAO,SAAS,OAAO,MAAM,yBAAyB,EAAE,IAAI,MAAA,yBAAgC,OAAO,YAAY;GAC/G,KAAK;EACP;EACF,KAAK,sBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAQ;EAChD,KAAK,iBAAiB;GACpB,MAAM,cAAc,MAAM,0BAA0B;GACpD,MAAM,WAAW,MAAM,eAAe;GACtC,OAAO;
|
|
1
|
+
{"version":3,"file":"dev-span.js","names":[],"sources":["../../../../src/shared/dev-span.ts"],"mappings":";AAWA,IAAa,iBAAiB;AAG9B,IAAa,wBAAwB;AAOrC,IAAa,oBAAoB,OAAO,IAAI,sBAAsB;AAGlE,IAAa,oBAAoB;AASjC,IAAa,gBAAgB,OAAO,IAAI,kBAAkB;AAG1D,IAAa,kBAAkB;AAQ/B,IAAa,uBAAuB;AAUpC,IAAa,kBAAkB;AAO/B,IAAa,uBAAuB;AAGpC,IAAa,iBAAiB;AAU9B,IAAa,sBAAsB;CACjC;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CAEA;AACF;AAKA,IAAa,0BAAyD,IAAI,IAAI,CAC5E,YACA,UACF,CAAC;AAyCD,SAAgB,iBAAiB,SAAyB;CACxD,OAAO,GAAG,kBAAkB,SAAS,QAAQ;AAC/C;AAQA,SAAS,WAAW,OAA+B;CACjD,MAAM,OAAO,MAAM;CACnB,OAAO,OAAO,GAAG,OAAO,IAAI,EAAE,KAAK;AACrC;AAOA,SAAgB,gBAAgB,KAAqB;CACnD,OAAO,IAAI,QAAQ,4BAA4B,EAAE;AACnD;AAOA,SAAgB,aAAa,MAAc,OAAuD;CAChG,QAAQ,MAAR;EACE,KAAK,gBAAgB;GACnB,MAAM,SAAS,MAAM,0BAA0B;GAC/C,MAAM,OAAO,MAAM,eAAe;GAClC,OAAO;IAAE,OAAO,GAAG,OAAO,MAAM,EAAE,GAAG,OAAO,IAAI;IAAK,KAAK;GAAM;EAClE;EACA,KAAK,gBACH,OAAO;GAAE,OAAO;GAAY,KAAK;EAAQ;EAC3C,KAAK,qBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAM;EAC9C,KAAK,iBACH,OAAO;GAAE,OAAO;GAAU,KAAK;EAAM;EACvC,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,eAAe,OAAO,GAAG,EAAE;IAAI,KAAK;GAAM;EAC5D;EACA,KAAK,cACH,OAAO;GAAE,OAAO;GAAoB,KAAK;EAAM;EACjD,KAAK,iBAAiB;GACpB,MAAM,aAAa,MAAM,yBAAyB;GAClD,OAAO;IAAE,OAAO,OAAO,UAAU;IAAG,KAAK;GAAM;EACjD;EACA,KAAK,mBACH,OAAO;GAAE,OAAO;GAAc,KAAK;EAAM;EAC3C,KAAK,iBAAiB;GACpB,MAAM,MAAM,MAAM,qBAAqB;GACvC,OAAO;IAAE,OAAO,UAAU,WAAW,KAAK,IAAI,OAAO,GAAG;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,eAAe;GAClB,MAAM,QAAQ,MAAM,mBAAmB;GACvC,OAAO;IAAE,OAAO,QAAQ,WAAW,KAAK,IAAI,OAAO,KAAK;IAAK,KAAK;GAAM;EAC1E;EACA,KAAK,iBAEH,OAAO;GACL,OAAO,SAAS,OAAO,MAAM,yBAAyB,EAAE,IAAI,MAAA,yBAAgC,OAAO,YAAY;GAC/G,KAAK;EACP;EACF,KAAK,sBACH,OAAO;GAAE,OAAO;GAAiB,KAAK;EAAQ;EAChD,KAAK,iBAAiB;GACpB,MAAM,cAAc,MAAM,0BAA0B;GACpD,MAAM,WAAW,MAAM,eAAe;GACtC,OAAO;IACL,OAAO,SAAS,OAAO,WAAW,EAAE,GAAG,gBAAgB,OAAO,QAAQ,CAAC;IACvE,KAAK;GACP;EACF;EACA,SACE,OAAO;GAAE,OAAO;GAAM,KAAK;EAAM;CACrC;AACF"}
|
|
@@ -56,14 +56,25 @@ function buildWaterfall(spans, { ioOnly = false, skip, hideWaits = false, fold =
|
|
|
56
56
|
const waits = explainedWaits(spans);
|
|
57
57
|
const kept = (s) => (!ioOnly || IO_SPANS.has(s.name)) && !skip?.(s);
|
|
58
58
|
const hidden = (s) => hideWaits && waits.has(s.spanId);
|
|
59
|
-
const
|
|
59
|
+
const shownUnder = (parent) => (children.get(parent) ?? []).flatMap((s) => hidden(s) ? [] : kept(s) ? [s] : shownUnder(s.spanId));
|
|
60
|
+
const visibleChildren = (parent) => shownUnder(parent).sort((a, b) => a.startMs - b.startMs);
|
|
61
|
+
const ioEnds = new Map();
|
|
62
|
+
const ioEnd = (span) => {
|
|
63
|
+
let end = ioEnds.get(span.spanId);
|
|
64
|
+
if (end === void 0) {
|
|
65
|
+
const io = (children.get(span.spanId) ?? []).filter((kid) => IO_SPANS.has(kid.name) && kid.attributes["timber.await_wait"] !== true);
|
|
66
|
+
end = Math.max(span.endMs, ...io.map(ioEnd));
|
|
67
|
+
ioEnds.set(span.spanId, end);
|
|
68
|
+
}
|
|
69
|
+
return end;
|
|
70
|
+
};
|
|
60
71
|
const origin = Math.min(...spans.map((s) => s.startMs));
|
|
61
72
|
const rows = [];
|
|
62
73
|
const emit = (span, depth) => {
|
|
63
74
|
const folded = [];
|
|
64
75
|
let tail = span;
|
|
65
76
|
let kids = visibleChildren(tail.spanId);
|
|
66
|
-
const foldable = (kid) => kid !== void 0 && !waits.has(kid.spanId) && (tail.name === "timber.await" || kid.name === "timber.await" && !IO_SPANS.has(tail.name)) && kid.startMs >= tail.startMs && kid.endMs <= tail.endMs &&
|
|
77
|
+
const foldable = (kid) => kid !== void 0 && !waits.has(kid.spanId) && (tail.name === "timber.await" || kid.name === "timber.await" && !IO_SPANS.has(tail.name)) && kid.startMs >= tail.startMs && kid.endMs <= tail.endMs && Math.min(ioEnd(kid), tail.endMs) - kid.startMs >= FOLD_COVERAGE * duration(tail);
|
|
67
78
|
if (fold && !expanded.has(span.spanId)) for (let only = kids.length === 1 ? kids[0] : void 0; foldable(only); only = kids.length === 1 ? kids[0] : void 0) {
|
|
68
79
|
tail = only;
|
|
69
80
|
folded.push(tail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"span-waterfall.js","names":[],"sources":["../../../../src/shared/span-waterfall.ts"],"mappings":";;AAqBA,IAAM,WAAW,IAAI,IAAI;CAAC;CAAiB;CAAiB;AAAoB,CAAC;AAMjF,IAAM,gBAAgB;AAMtB,IAAM,gBAAgB;AAgDtB,IAAM,YAAY,MAAqB,EAAE,QAAQ,EAAE;AAGnD,SAAS,YAAY,WAA4C;CAC/D,IAAI,QAAQ;CACZ,IAAI,QAAQ;CACZ,KAAK,MAAM,CAAC,OAAO,QAAQ,UAAU,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG;EAChE,IAAI,OAAO,OAAO;EAClB,SAAS,MAAM,KAAK,IAAI,OAAO,KAAK;EACpC,QAAQ;CACV;CACA,OAAO;AACT;AAeA,SAAgB,eAAe,OAA8C;CAC3E,MAAM,OAAO,IAAI,IAAI,MAAM,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;CACpD,MAAM,UAAU,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,YAAY,CAAC;CACxD,MAAM,eAAe,MACnB,EAAE,WAAA,yBAAqC,QAAQ,CAAC,QAAQ,IAAI,EAAE,MAAM;CACtE,MAAM,OAAO,MAAM,QAAQ,MAAM,SAAS,IAAI,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;CACxE,MAAM,YAAY,IAAI,IAAY;CAClC,KAAK,MAAM,QAAQ,OAAO;EACxB,IAAI,CAAC,YAAY,IAAI,KAAK,SAAS,IAAI,KAAK,GAAG;EAC/C,MAAM,YAAY,IAAI,IAAY;EAClC,KAAK,IAAI,IAAI,KAAK,cAAc,KAAK,CAAC,UAAU,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,EAAE,cACvE,UAAU,IAAI,CAAC;EAEjB,MAAM,WAAoC,CAAC;EAC3C,KAAK,MAAM,KAAK,MAAM;GACpB,IAAI,UAAU,IAAI,EAAE,MAAM,GAAG;GAC7B,MAAM,QAAQ,KAAK,IAAI,EAAE,SAAS,KAAK,OAAO;GAC9C,MAAM,MAAM,KAAK,IAAI,EAAE,OAAO,KAAK,KAAK;GACxC,IAAI,MAAM,OAAO,SAAS,KAAK,CAAC,OAAO,GAAG,CAAC;EAC7C;EACA,IAAI,YAAY,QAAQ,KAAK,gBAAgB,SAAS,IAAI,GAAG,UAAU,IAAI,KAAK,MAAM;CACxF;CACA,OAAO;AACT;AAoBA,SAAgB,eACd,OACA,EACE,SAAS,OACT,MACA,YAAY,OACZ,OAAO,OACP,WAAW,IAAI,IAAY,MACJ,CAAC,GACZ;CACd,IAAI,MAAM,WAAW,GAAG,OAAO;EAAE,MAAM,CAAC;EAAG,aAAa;CAAE;CAC1D,MAAM,MAAM,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,MAAM,CAAC;CAC9C,MAAM,WAAW,IAAI,IAA6B;CAClD,KAAK,MAAM,QAAQ,OAAO;EAGxB,MAAM,SAAS,KAAK,gBAAgB,IAAI,IAAI,KAAK,YAAY,IAAI,KAAK,eAAe;EACrF,MAAM,WAAW,SAAS,IAAI,MAAM,KAAK,CAAC;EAC1C,SAAS,KAAK,IAAI;EAClB,SAAS,IAAI,QAAQ,QAAQ;CAC/B;CACA,KAAK,MAAM,YAAY,SAAS,OAAO,GAAG,SAAS,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,OAAO;CAEvF,MAAM,QAAQ,eAAe,KAAK;CAClC,MAAM,QAAQ,OAAU,CAAC,UAAU,SAAS,IAAI,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC;CACrE,MAAM,UAAU,MAAS,aAAa,MAAM,IAAI,EAAE,MAAM;CAGxD,MAAM,
|
|
1
|
+
{"version":3,"file":"span-waterfall.js","names":[],"sources":["../../../../src/shared/span-waterfall.ts"],"mappings":";;AAqBA,IAAM,WAAW,IAAI,IAAI;CAAC;CAAiB;CAAiB;AAAoB,CAAC;AAMjF,IAAM,gBAAgB;AAMtB,IAAM,gBAAgB;AAgDtB,IAAM,YAAY,MAAqB,EAAE,QAAQ,EAAE;AAGnD,SAAS,YAAY,WAA4C;CAC/D,IAAI,QAAQ;CACZ,IAAI,QAAQ;CACZ,KAAK,MAAM,CAAC,OAAO,QAAQ,UAAU,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG;EAChE,IAAI,OAAO,OAAO;EAClB,SAAS,MAAM,KAAK,IAAI,OAAO,KAAK;EACpC,QAAQ;CACV;CACA,OAAO;AACT;AAeA,SAAgB,eAAe,OAA8C;CAC3E,MAAM,OAAO,IAAI,IAAI,MAAM,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;CACpD,MAAM,UAAU,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,YAAY,CAAC;CACxD,MAAM,eAAe,MACnB,EAAE,WAAA,yBAAqC,QAAQ,CAAC,QAAQ,IAAI,EAAE,MAAM;CACtE,MAAM,OAAO,MAAM,QAAQ,MAAM,SAAS,IAAI,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;CACxE,MAAM,YAAY,IAAI,IAAY;CAClC,KAAK,MAAM,QAAQ,OAAO;EACxB,IAAI,CAAC,YAAY,IAAI,KAAK,SAAS,IAAI,KAAK,GAAG;EAC/C,MAAM,YAAY,IAAI,IAAY;EAClC,KAAK,IAAI,IAAI,KAAK,cAAc,KAAK,CAAC,UAAU,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,EAAE,cACvE,UAAU,IAAI,CAAC;EAEjB,MAAM,WAAoC,CAAC;EAC3C,KAAK,MAAM,KAAK,MAAM;GACpB,IAAI,UAAU,IAAI,EAAE,MAAM,GAAG;GAC7B,MAAM,QAAQ,KAAK,IAAI,EAAE,SAAS,KAAK,OAAO;GAC9C,MAAM,MAAM,KAAK,IAAI,EAAE,OAAO,KAAK,KAAK;GACxC,IAAI,MAAM,OAAO,SAAS,KAAK,CAAC,OAAO,GAAG,CAAC;EAC7C;EACA,IAAI,YAAY,QAAQ,KAAK,gBAAgB,SAAS,IAAI,GAAG,UAAU,IAAI,KAAK,MAAM;CACxF;CACA,OAAO;AACT;AAoBA,SAAgB,eACd,OACA,EACE,SAAS,OACT,MACA,YAAY,OACZ,OAAO,OACP,WAAW,IAAI,IAAY,MACJ,CAAC,GACZ;CACd,IAAI,MAAM,WAAW,GAAG,OAAO;EAAE,MAAM,CAAC;EAAG,aAAa;CAAE;CAC1D,MAAM,MAAM,IAAI,IAAI,MAAM,KAAK,MAAM,EAAE,MAAM,CAAC;CAC9C,MAAM,WAAW,IAAI,IAA6B;CAClD,KAAK,MAAM,QAAQ,OAAO;EAGxB,MAAM,SAAS,KAAK,gBAAgB,IAAI,IAAI,KAAK,YAAY,IAAI,KAAK,eAAe;EACrF,MAAM,WAAW,SAAS,IAAI,MAAM,KAAK,CAAC;EAC1C,SAAS,KAAK,IAAI;EAClB,SAAS,IAAI,QAAQ,QAAQ;CAC/B;CACA,KAAK,MAAM,YAAY,SAAS,OAAO,GAAG,SAAS,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,OAAO;CAEvF,MAAM,QAAQ,eAAe,KAAK;CAClC,MAAM,QAAQ,OAAU,CAAC,UAAU,SAAS,IAAI,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC;CACrE,MAAM,UAAU,MAAS,aAAa,MAAM,IAAI,EAAE,MAAM;CAGxD,MAAM,cAAc,YACjB,SAAS,IAAI,MAAM,KAAK,CAAC,EAAA,CAAG,SAAS,MACpC,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,WAAW,EAAE,MAAM,CACtD;CAOF,MAAM,mBAAmB,WACvB,WAAW,MAAM,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,OAAO;CASzD,MAAM,SAAS,IAAI,IAAoB;CACvC,MAAM,SAAS,SAAoB;EACjC,IAAI,MAAM,OAAO,IAAI,KAAK,MAAM;EAChC,IAAI,QAAQ,QAAW;GACrB,MAAM,MAAM,SAAS,IAAI,KAAK,MAAM,KAAK,CAAC,EAAA,CAAG,QAC1C,QAAQ,SAAS,IAAI,IAAI,IAAI,KAAK,IAAI,WAAA,yBAAqC,IAC9E;GACA,MAAM,KAAK,IAAI,KAAK,OAAO,GAAG,GAAG,IAAI,KAAK,CAAC;GAC3C,OAAO,IAAI,KAAK,QAAQ,GAAG;EAC7B;EACA,OAAO;CACT;CAEA,MAAM,SAAS,KAAK,IAAI,GAAG,MAAM,KAAK,MAAM,EAAE,OAAO,CAAC;CACtD,MAAM,OAA0B,CAAC;CACjC,MAAM,QAAQ,MAAS,UAAkB;EACvC,MAAM,SAAc,CAAC;EACrB,IAAI,OAAO;EACX,IAAI,OAAO,gBAAgB,KAAK,MAAM;EAUtC,MAAM,YAAY,QAChB,QAAQ,UACR,CAAC,MAAM,IAAI,IAAI,MAAM,MACpB,KAAK,SAAA,kBACH,IAAI,SAAA,kBAA4B,CAAC,SAAS,IAAI,KAAK,IAAI,MAC1D,IAAI,WAAW,KAAK,WACpB,IAAI,SAAS,KAAK,SAClB,KAAK,IAAI,MAAM,GAAG,GAAG,KAAK,KAAK,IAAI,IAAI,WAAW,gBAAgB,SAAS,IAAI;EACjF,IAAI,QAAQ,CAAC,SAAS,IAAI,KAAK,MAAM,GACnC,KACE,IAAI,OAAO,KAAK,WAAW,IAAI,KAAK,KAAK,QACzC,SAAS,IAAI,GACb,OAAO,KAAK,WAAW,IAAI,KAAK,KAAK,QACrC;GACA,OAAO;GACP,OAAO,KAAK,IAAI;GAChB,OAAO,gBAAgB,KAAK,MAAM;EACpC;EAEF,KAAK,KAAK;GACR;GACA;GACA,MAAM,MAAM,IAAI,KAAK,MAAM;GAC3B;GACA,UAAU,KAAK,UAAU;GACzB,YAAY,SAAS,IAAI;EAC3B,CAAC;EACD,KAAK,MAAM,OAAO,MAAM,KAAK,KAAK,QAAQ,CAAC;CAC7C;CACA,KAAK,MAAM,QAAQ,gBAAgB,MAAS,GAAG,KAAK,MAAM,CAAC;CAC3D,OAAO;EAAE;EAAM,aAAa,YAAY,MAAM,OAAO;CAAE;AACzD"}
|
|
@@ -13,9 +13,15 @@
|
|
|
13
13
|
* - `env.transformRequest()` only: nothing executes, so the app's
|
|
14
14
|
* instrumentation `register()` and cache handler setup still run at the
|
|
15
15
|
* first request, as before.
|
|
16
|
-
* - Static imports only (`result.deps`), from the entries and
|
|
17
|
-
*
|
|
18
|
-
*
|
|
16
|
+
* - Static imports only (`result.deps`), from the entries and every module
|
|
17
|
+
* file in the route tree ({@link routeTreeSeeds}). Route files are dynamic
|
|
18
|
+
* imports of the route manifest, which the crawl does not follow, so they
|
|
19
|
+
* are seeded directly. Crawling only the root layout left most of an app
|
|
20
|
+
* whose UI sits in route groups and slots to the first request: on
|
|
21
|
+
* relisten-web it covered 53 of the 499 SSR modules `GET /` needed, and the
|
|
22
|
+
* whole route tree (~960 modules) takes ~1.6s (TIM-1630).
|
|
23
|
+
* - In waves: what `GET /` can load first, RSC then SSR, so the
|
|
24
|
+
* most common first request is ready soonest; then the rest.
|
|
19
25
|
* - Errors are swallowed. The request that loads the module hits the same
|
|
20
26
|
* error and reports it as it always has; Vite's `warmupRequest` was
|
|
21
27
|
* rejected because it logs each error a second time.
|
|
@@ -28,24 +34,43 @@
|
|
|
28
34
|
*
|
|
29
35
|
* `analyze/crawl.ts` also walks `transformRequest`, for a different job:
|
|
30
36
|
* classifying every module the app can reach, dynamic imports included, in
|
|
31
|
-
* a throwaway middleware-mode server.
|
|
32
|
-
*
|
|
37
|
+
* a throwaway middleware-mode server.
|
|
38
|
+
*
|
|
39
|
+
* `dev.precompile: false` in timber.config, or `TIMBER_DEV_PRECOMPILE=0`,
|
|
40
|
+
* turns it off.
|
|
33
41
|
*
|
|
34
42
|
* See design/21-dev-server.md §"Server Pre-compile".
|
|
35
43
|
*/
|
|
36
44
|
import { type DevEnvironment, type ViteDevServer } from 'vite';
|
|
45
|
+
import type { RouteTree } from '../routing/types.ts';
|
|
37
46
|
/** `TIMBER_DEV_PRECOMPILE=0` turns the crawl off (A/B measurement, escape hatch). */
|
|
38
47
|
export declare const PRECOMPILE_ENV = "TIMBER_DEV_PRECOMPILE";
|
|
39
48
|
/**
|
|
40
|
-
* Past this, the crawl starts no new transform. Generous:
|
|
41
|
-
*
|
|
49
|
+
* Past this, the crawl starts no new transform. Generous: the whole route
|
|
50
|
+
* tree takes ~1.6s on relisten-web. It bounds a crawl stuck behind a slow
|
|
51
|
+
* transform plugin, or an app too large to finish.
|
|
42
52
|
*/
|
|
43
53
|
export declare const PRECOMPILE_DEADLINE_MS = 60000;
|
|
44
|
-
/**
|
|
54
|
+
/**
|
|
55
|
+
* The roots of each server environment's crawl. `rsc` is crawled in waves,
|
|
56
|
+
* in order; after each wave the SSR environment crawls `ssr` and every
|
|
57
|
+
* client reference recorded so far.
|
|
58
|
+
*/
|
|
45
59
|
export interface PrecompileRoots {
|
|
46
|
-
rsc: string[];
|
|
60
|
+
rsc: string[][];
|
|
47
61
|
ssr: string[];
|
|
48
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* Every module file in the route tree, in two waves. `home` is what `GET /`
|
|
65
|
+
* can load: `proxy.ts`, `global-error`, the root segment, and under it the
|
|
66
|
+
* pathless segments (groups, optional catch-alls) with a page or handler at
|
|
67
|
+
* `/`, and the slots of those. A group that only organises other sections
|
|
68
|
+
* (`(admin)/admin/…`) is not in it. `rest` is every other segment's.
|
|
69
|
+
*/
|
|
70
|
+
export declare function routeTreeSeeds(tree: RouteTree): {
|
|
71
|
+
home: string[];
|
|
72
|
+
rest: string[];
|
|
73
|
+
};
|
|
49
74
|
/**
|
|
50
75
|
* The id `transformRequest` takes for an entry of `result.deps`, or null for
|
|
51
76
|
* one it must not follow: a bare specifier, which in a server environment is
|
|
@@ -66,13 +91,16 @@ export declare function fileUrl(file: string, root: string): string;
|
|
|
66
91
|
/**
|
|
67
92
|
* Transform `roots` and every module they statically import in `env`.
|
|
68
93
|
* Starts no transform once `shouldStop()` is true. Resolves with the
|
|
69
|
-
* number of
|
|
94
|
+
* number of ids in `seen` (every module visited in `env` so far, across
|
|
95
|
+
* crawls that share it) once the graph is done; never rejects. `seen`
|
|
96
|
+
* carries visited ids across crawls of one environment, so a later wave
|
|
97
|
+
* skips what an earlier one transformed.
|
|
70
98
|
*/
|
|
71
|
-
export declare function crawlServerGraph(env: DevEnvironment, roots: string[], shouldStop?: () => boolean): Promise<number>;
|
|
99
|
+
export declare function crawlServerGraph(env: DevEnvironment, roots: string[], shouldStop?: () => boolean, seen?: Set<string>): Promise<number>;
|
|
72
100
|
/**
|
|
73
|
-
*
|
|
74
|
-
*
|
|
75
|
-
* already in flight for the URLs it asks for.
|
|
101
|
+
* For each RSC wave, crawl the RSC graph, then the SSR graph with the client
|
|
102
|
+
* references found so far. A request that arrives mid-crawl shares the
|
|
103
|
+
* transforms already in flight for the URLs it asks for.
|
|
76
104
|
*/
|
|
77
105
|
export declare function precompileServerGraphs(server: ViteDevServer, roots: PrecompileRoots, shouldStop: () => boolean): Promise<void>;
|
|
78
106
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-precompile.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-precompile.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"dev-precompile.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-precompile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEH,OAAO,EAAiB,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAa,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAI7E,qFAAqF;AACrF,eAAO,MAAM,cAAc,0BAA0B,CAAC;AAEtD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC;IAChB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAqCD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAelF;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKtD;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAM1D;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,GAAE,MAAM,OAAqB,EACvC,IAAI,GAAE,GAAG,CAAC,MAAM,CAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAsBD;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EACtB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,eAAe,GAAG,IAAI,CAU5F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAGL,KAAK,MAAM,EAGZ,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,WAAW,CAAC;AAKjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAiC1D;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,KAAK,CAAC;AA2BpC;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAGL,KAAK,MAAM,EAGZ,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,WAAW,CAAC;AAKjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAiC1D;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,KAAK,CAAC;AA2BpC;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA0P1D;AAgOD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,GAAG,IAAI,CA6CrE"}
|
package/dist/routing/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { n as scanRoutes } from "../_chunks/scanner-DSAJjH0x.js";
|
|
2
2
|
import { t as generateRouteMap } from "../_chunks/codegen-vaCyFyVN.js";
|
|
3
3
|
import { a as INTERCEPTION_MARKERS, i as DEFAULT_PAGE_EXTENSIONS, n as classifyUrlSegment, t as classifySegment } from "../_chunks/segment-classify-Ho8jXWeC.js";
|
|
4
|
-
import {
|
|
4
|
+
import { t as collectInterceptionRewrites } from "../_chunks/interception-CtNt9jPt.js";
|
|
5
|
+
import { n as collectDynamicSegmentsFromTree, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "../_chunks/walkers-96YopJds.js";
|
|
5
6
|
export { DEFAULT_PAGE_EXTENSIONS, INTERCEPTION_MARKERS, classifySegment, classifyUrlSegment, collectDynamicSegmentsFromTree, collectInterceptionRewrites, collectLeafRoutes, generateRouteMap, scanRoutes, validateSchemaAgainstRoutes };
|
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
* Task: TIM-1071 item 8
|
|
9
9
|
*/
|
|
10
10
|
import type { RouteTree } from './types.ts';
|
|
11
|
+
export declare const SINGLE_FILE_KEYS: readonly ['page', 'layout', 'middleware', 'access', 'route', 'error', 'default', 'denied'];
|
|
12
|
+
export declare const RECORD_FILE_KEYS: readonly ['statusFiles', 'jsonStatusFiles', 'metadataRoutes'];
|
|
11
13
|
/**
|
|
12
14
|
* Generate the virtual module source for the route manifest.
|
|
13
15
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest-codegen.d.ts","sourceRoot":"","sources":["../../src/routing/manifest-codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,SAAS,EAA0B,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"manifest-codegen.d.ts","sourceRoot":"","sources":["../../src/routing/manifest-codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,SAAS,EAA0B,MAAM,YAAY,CAAC;AAKpE,eAAO,MAAM,gBAAgB,YAC3B,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,QAAQ,CACA,CAAC;AAIX,eAAO,MAAM,gBAAgB,YAAI,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,CAAU,CAAC;AAM9F;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmJhF;AAID;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA8B3D"}
|
package/dist/server/internal.js
CHANGED
|
@@ -4,7 +4,7 @@ import { c as collectRouteModulepreloads, i as traceTimingEntry, o as collectRou
|
|
|
4
4
|
import { c as drainWithDeadline, d as isAbortError, f as releaseReason, i as withResponseInit, m as onAbortUntil, n as discardResponseBody, o as concatBytes, p as endScope, r as nodeBodyOps, u as wrapResponseWithStreamTiming } from "../_chunks/node-response-omewa8e6.js";
|
|
5
5
|
import { A as runWithTraceId, E as getOtelTraceId, F as isControlFlowSignal, I as isDenySignal, L as isRedirectSignal, M as withSpan, O as getTraceId, T as generateTraceId, _ as logWaitUntilRejected, b as swallow, c as logMiddlewareShortCircuit, d as logRequestCompleted, f as logRequestReceived, g as logSwrRefetchFailed, h as logSlowRequest, i as logCsrfRejected, j as setSpanAttribute, k as replaceTraceId, l as logProxyError, m as logRouteSetupError, n as logCacheMiss, p as logRouteError, s as logMiddlewareError, t as getLogger, u as logRenderError, v as logWaitUntilUnsupported, x as isDebug, y as setLogger } from "../_chunks/logger-DDLtp5e-.js";
|
|
6
6
|
import { _ as getWaitUntil, a as storeOverlayEntry, c as lookupArtifactSeed, d as checkVersionSkew, g as observeKeyDiscipline, i as overlayKey, l as setPrebuiltPayloadSource, n as lookupOverlay, o as hasPrebuiltPayloadSource, r as mayStoreRerender, s as isParamIndependent, u as applyReloadHeaders } from "../_chunks/cache-api-Bo8c7XVF.js";
|
|
7
|
-
import { i as getMetadataRouteServePath, n as classifyMetadataRoute, r as getMetadataRouteAutoLink, t as METADATA_ROUTE_CONVENTIONS } from "../_chunks/metadata-routes-
|
|
7
|
+
import { c as computeSegmentTreePaths, i as getMetadataRouteServePath, n as classifyMetadataRoute, r as getMetadataRouteAutoLink, t as METADATA_ROUTE_CONVENTIONS } from "../_chunks/metadata-routes-MXNjWOt5.js";
|
|
8
8
|
import { i as canonicalize, r as canonicalRequestPath } from "../_chunks/canonicalize-CqK135BN.js";
|
|
9
9
|
import { n as isRscContentType, r as isRscRequest } from "../_chunks/rsc-media-type-m8jz9u6_.js";
|
|
10
10
|
import { i as isRscCacheKeyShape, n as RSC_KEY_PARAM, r as appVisibleSearch, s as rscCacheKey, t as RSC_KEY_HEADERS } from "../_chunks/rsc-cache-key-D0cb0Gmc.js";
|
|
@@ -15,7 +15,6 @@ import { n as hasSchemaCodecs, t as getSchemaCodec } from "../_chunks/codec-regi
|
|
|
15
15
|
import { t as normalizeParamValue } from "../_chunks/param-value-DqlGfF57.js";
|
|
16
16
|
import { n as isHttpMethod, t as HTTP_METHODS } from "../_chunks/route-methods-Dk2kZc0n.js";
|
|
17
17
|
import { i as resolveRenderTimeoutMs, r as RenderTimeoutError, t as DEFAULT_RENDER_TIMEOUT_MS } from "../_chunks/render-timeout-MrrqD1wd.js";
|
|
18
|
-
import { t as computeSegmentTreePaths } from "../_chunks/segment-keys-Y60KNc8C.js";
|
|
19
18
|
import { _ as wasInvalidatedSince, a as devEntryKey, c as getDevSeed, d as isDevPrebuiltStoreActive, f as isHardReload, h as lastInvalidationEpochFor, m as currentInvalidationEpoch, n as clearDevPrebuiltStore, p as setDevSeed, r as devComponentTag, s as discardDevEntry, u as isDevPrebuiltCacheBypassed } from "../_chunks/dev-store-BvdqtHvK.js";
|
|
20
19
|
import { n as createSingleflight } from "../_chunks/singleflight-CzoOVB9Y.js";
|
|
21
20
|
import { createHash } from "node:crypto";
|