@timber-js/app 0.2.0-alpha.235 → 0.2.0-alpha.237
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-CYjRMpZI.js → actions-Top9GftB.js} +3 -3
- package/dist/_chunks/{actions-CYjRMpZI.js.map → actions-Top9GftB.js.map} +1 -1
- package/dist/_chunks/{cache-api-BZJNt01a.js → cache-api-Bo8c7XVF.js} +6 -6
- package/dist/_chunks/{cache-api-BZJNt01a.js.map → cache-api-Bo8c7XVF.js.map} +1 -1
- package/dist/_chunks/{chains-D-RRc7CM.js → chains-BsGKkMTK.js} +2 -2
- package/dist/_chunks/{chains-D-RRc7CM.js.map → chains-BsGKkMTK.js.map} +1 -1
- package/dist/_chunks/chains-DHmoKxkO.js +1 -0
- package/dist/_chunks/{classify-_W0RWa5w.js → classify-cmE0Gins.js} +2 -2
- package/dist/_chunks/{classify-_W0RWa5w.js.map → classify-cmE0Gins.js.map} +1 -1
- package/dist/_chunks/{cli-check-Dl3yo3Zv.js → cli-check-BwiahbTC.js} +3 -3
- package/dist/_chunks/{cli-check-Dl3yo3Zv.js.map → cli-check-BwiahbTC.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-CyrOHbAo.js → cli-schema-sync-B2ldclRO.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-CyrOHbAo.js.map → cli-schema-sync-B2ldclRO.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-CTWiBMZZ.js → cli-schema-sync-Brw7kTmm.js} +1 -1
- package/dist/_chunks/{client-dep-entries-C9hv-3k9.js → client-dep-entries-C1nMlLKV.js} +2 -2
- package/dist/_chunks/{client-dep-entries-C9hv-3k9.js.map → client-dep-entries-C1nMlLKV.js.map} +1 -1
- package/dist/_chunks/{cloudflare-_2fhxQE8.js → cloudflare-Dk5Hqo-O.js} +3 -3
- package/dist/_chunks/{cloudflare-_2fhxQE8.js.map → cloudflare-Dk5Hqo-O.js.map} +1 -1
- package/dist/_chunks/{convention-lint-D54k6uUM.js → convention-lint-CLpuzY5h.js} +3 -3
- package/dist/_chunks/{convention-lint-D54k6uUM.js.map → convention-lint-CLpuzY5h.js.map} +1 -1
- package/dist/_chunks/dev-server-BGGGhHXx.js +1 -0
- package/dist/_chunks/{dev-server-cmWVDgTf.js → dev-server-lrdpD7Ws.js} +121 -5
- package/dist/_chunks/dev-server-lrdpD7Ws.js.map +1 -0
- package/dist/_chunks/{dev-span-_NzMX-au.js → dev-span-RsVeYYc_.js} +5 -2
- package/dist/_chunks/dev-span-RsVeYYc_.js.map +1 -0
- package/dist/_chunks/{error-boundary-Cf1m-Ywk.js → error-boundary-Bh-egWUI.js} +6 -6
- package/dist/_chunks/{error-boundary-Cf1m-Ywk.js.map → error-boundary-Bh-egWUI.js.map} +1 -1
- package/dist/_chunks/{flight-source-node-BGanuoSS.js → flight-source-node-BsrlUjMO.js} +7 -3
- package/dist/_chunks/flight-source-node-BsrlUjMO.js.map +1 -0
- package/dist/_chunks/{href-BtspoNc9.js → href-8l5VD23D.js} +2 -2
- package/dist/_chunks/{href-BtspoNc9.js.map → href-8l5VD23D.js.map} +1 -1
- package/dist/_chunks/{json-lossy-check-BXM45k8p.js → json-lossy-check-D47R9Fp5.js} +2 -2
- package/dist/_chunks/{json-lossy-check-BXM45k8p.js.map → json-lossy-check-D47R9Fp5.js.map} +1 -1
- package/dist/_chunks/{live-graph-C7-yA8W9.js → live-graph-ChuFfmLi.js} +4 -4
- package/dist/_chunks/{live-graph-C7-yA8W9.js.map → live-graph-ChuFfmLi.js.map} +1 -1
- package/dist/_chunks/{logger-YtMSKfft.js → logger-DDLtp5e-.js} +16 -1
- package/dist/_chunks/logger-DDLtp5e-.js.map +1 -0
- package/dist/_chunks/navigation-root-Cvb7P1ud.js.map +1 -1
- package/dist/_chunks/{node-response-D3hXWb8y.js → node-response-omewa8e6.js} +21 -4
- package/dist/_chunks/node-response-omewa8e6.js.map +1 -0
- package/dist/_chunks/{poison-scan-CRSP06Es.js → poison-scan-CJ9QfJWb.js} +2 -2
- package/dist/_chunks/{poison-scan-CRSP06Es.js.map → poison-scan-CJ9QfJWb.js.map} +1 -1
- package/dist/_chunks/render-timeout-MrrqD1wd.js.map +1 -1
- package/dist/_chunks/{scanner-BNQ4qnLX.js → scanner-CrB_h6FA.js} +5 -5
- package/dist/_chunks/{scanner-BNQ4qnLX.js.map → scanner-CrB_h6FA.js.map} +1 -1
- package/dist/_chunks/{sizeof-Cmx6Fs-Y.js → sizeof-DVhEVN_y.js} +2 -2
- package/dist/_chunks/{sizeof-Cmx6Fs-Y.js.map → sizeof-DVhEVN_y.js.map} +1 -1
- package/dist/_chunks/{walkers-DFC9KsBL.js → walkers-BUvpsb2Q.js} +3 -3
- package/dist/_chunks/{walkers-DFC9KsBL.js.map → walkers-BUvpsb2Q.js.map} +1 -1
- package/dist/adapters/cloudflare-dev.js +1 -1
- package/dist/adapters/cloudflare-kv-cache.js +2 -2
- package/dist/adapters/cloudflare.js +1 -1
- package/dist/adapters/nitro.js +1 -1
- package/dist/analyze/crawl-entry.js +3 -3
- package/dist/analyze/graph-command.js +3 -3
- package/dist/cache/index.js +2 -2
- package/dist/cache/stores/memory.js +1 -1
- package/dist/cli.js +3 -3
- package/dist/client/dev-pill/index.d.ts +2 -1
- package/dist/client/dev-pill/index.d.ts.map +1 -1
- package/dist/client/dev-pill/view.d.ts.map +1 -1
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/index.js +4 -4
- package/dist/client/internal.js +3 -3
- package/dist/cookies/index.js +1 -1
- package/dist/dev-tools/await-span.d.ts +7 -0
- package/dist/dev-tools/await-span.d.ts.map +1 -1
- package/dist/dev-tools/instrumentation.d.ts.map +1 -1
- package/dist/dev-tools/logger.d.ts +8 -2
- package/dist/dev-tools/logger.d.ts.map +1 -1
- package/dist/dev-tools/span-sink.d.ts +9 -1
- package/dist/dev-tools/span-sink.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +73 -31
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/_react/chunks/{react-server-dom-webpack-server.node.development-hQ_odxIB.js → react-server-dom-webpack-server.node.development-CAttMzVD.js} +2 -2
- package/dist/native/rsc/_react/flight-client.js +2 -2
- package/dist/native/rsc/_react/flight-server.js +1 -1
- package/dist/native/rsc/_react/flight-static.js +1 -1
- package/dist/native/rsc/adapters/cloudflare-kv-cache.js +1 -1
- package/dist/native/rsc/adapters/cloudflare.js +2 -2
- package/dist/native/rsc/cache/cache-api.js +3 -3
- package/dist/native/rsc/cache/index.js +3 -3
- package/dist/native/rsc/cache/timber-cache.js +2 -2
- package/dist/native/rsc/cdn/index.js +1 -1
- package/dist/native/rsc/client/use-cookie.js +1 -1
- package/dist/native/rsc/dev-tools/404-page.js +1 -1
- package/dist/native/rsc/dev-tools/await-span.js +5 -2
- package/dist/native/rsc/dev-tools/await-span.js.map +1 -1
- package/dist/native/rsc/dev-tools/error-page.js +2 -2
- package/dist/native/rsc/dev-tools/instrumentation.js +38 -3
- package/dist/native/rsc/dev-tools/instrumentation.js.map +1 -1
- package/dist/native/rsc/dev-tools/logger.js +123 -80
- package/dist/native/rsc/dev-tools/logger.js.map +1 -1
- package/dist/native/rsc/dev-tools/span-sink.js +1 -0
- package/dist/native/rsc/dev-tools/span-sink.js.map +1 -1
- package/dist/native/rsc/dev-tools/terminal.js +1 -1
- package/dist/native/rsc/manifest.json +1 -0
- package/dist/native/rsc/params/index.js +1 -1
- package/dist/native/rsc/routing/collision-probe.js +1 -1
- package/dist/native/rsc/routing/interception.js +1 -1
- package/dist/native/rsc/search-params/define.js +2 -2
- package/dist/native/rsc/server/abort-scope.js +6 -2
- package/dist/native/rsc/server/abort-scope.js.map +1 -1
- package/dist/native/rsc/server/access-gate.js +1 -1
- package/dist/native/rsc/server/action-client.js +2 -2
- package/dist/native/rsc/server/action-handler.js +8 -8
- package/dist/native/rsc/server/actions.js +3 -3
- package/dist/native/rsc/server/children-interception.js +1 -1
- package/dist/native/rsc/server/deny-boundary.js +1 -1
- package/dist/native/rsc/server/deny-renderer.js +10 -10
- package/dist/native/rsc/server/fallback-error.js +1 -1
- package/dist/native/rsc/server/flight-injector-core.js +2 -2
- package/dist/native/rsc/server/flight-source-node.js +8 -4
- package/dist/native/rsc/server/flight-source-node.js.map +1 -1
- package/dist/native/rsc/server/index.js +4 -4
- package/dist/native/rsc/server/interception-gates.js +2 -2
- package/dist/native/rsc/server/internal.js +15 -15
- package/dist/native/rsc/server/logger.js +2 -2
- package/dist/native/rsc/server/metadata-route-links.js +1 -1
- package/dist/native/rsc/server/node-body-response.js +1 -1
- package/dist/native/rsc/server/param-coercion.js +1 -1
- package/dist/native/rsc/server/pipeline-helpers.js +11 -11
- package/dist/native/rsc/server/pipeline-helpers.js.map +1 -1
- package/dist/native/rsc/server/pipeline-interception.js +4 -4
- package/dist/native/rsc/server/pipeline-metadata-route.js +11 -11
- package/dist/native/rsc/server/pipeline-metadata-route.js.map +1 -1
- package/dist/native/rsc/server/pipeline-outcome.js +4 -4
- package/dist/native/rsc/server/pipeline-phases.js +11 -11
- package/dist/native/rsc/server/pipeline.js +10 -10
- package/dist/native/rsc/server/prebuilt/capture-render.js +1 -1
- package/dist/native/rsc/server/prebuilt/dev-store.js +1 -1
- package/dist/native/rsc/server/prebuilt/overlay.js +3 -3
- package/dist/native/rsc/server/prebuilt-builder.js +8 -8
- package/dist/native/rsc/server/prebuilt-runtime.js +15 -15
- package/dist/native/rsc/server/primitives.js +2 -2
- package/dist/native/rsc/server/publish-params.js +1 -1
- package/dist/native/rsc/server/render-timeout.js.map +1 -1
- package/dist/native/rsc/server/request-context.js +1 -1
- package/dist/native/rsc/server/route-element-builder.js +7 -7
- package/dist/native/rsc/server/route-element-helpers.js +1 -1
- package/dist/native/rsc/server/route-handler.js +1 -1
- package/dist/native/rsc/server/rsc-entry/action-dispatcher.js +1 -1
- package/dist/native/rsc/server/rsc-entry/action-middleware-runner.js +1 -1
- package/dist/native/rsc/server/rsc-entry/api-handler.js +1 -1
- package/dist/native/rsc/server/rsc-entry/deny-fallback.js +6 -6
- package/dist/native/rsc/server/rsc-entry/error-renderer.js +7 -7
- package/dist/native/rsc/server/rsc-entry/helpers.js +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +4 -4
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +7 -7
- package/dist/native/rsc/server/rsc-entry/rsc-payload.js +3 -3
- package/dist/native/rsc/server/rsc-entry/rsc-stream.js +6 -6
- package/dist/native/rsc/server/rsc-entry/ssr-renderer.js +10 -10
- package/dist/native/rsc/server/rsc-error-envelope.js +1 -1
- package/dist/native/rsc/server/safe-load.js +14 -2
- package/dist/native/rsc/server/safe-load.js.map +1 -1
- package/dist/native/rsc/server/sitemap-handler.js +1 -1
- package/dist/native/rsc/server/skippable-prefix.js +2 -2
- package/dist/native/rsc/server/slot-interception.js +1 -1
- package/dist/native/rsc/server/slot-resolver.js +11 -11
- package/dist/native/rsc/server/static-generator.js +2 -2
- package/dist/native/rsc/server/traced-access.js +1 -1
- package/dist/native/rsc/server/tracing.js +10 -0
- package/dist/native/rsc/server/tracing.js.map +1 -1
- package/dist/native/rsc/shared/dev-span.js +8 -2
- package/dist/native/rsc/shared/dev-span.js.map +1 -1
- package/dist/native/rsc/shared/href.js +1 -1
- package/dist/native/rsc/shared/span-waterfall.js +90 -0
- package/dist/native/rsc/shared/span-waterfall.js.map +1 -0
- package/dist/native/ssr/adapters/cloudflare-kv-cache.js +1 -1
- package/dist/native/ssr/adapters/cloudflare.js +2 -2
- package/dist/native/ssr/cache/cache-api.js +3 -3
- package/dist/native/ssr/cache/guarded-read.js +1 -1
- package/dist/native/ssr/cache/index.js +3 -3
- package/dist/native/ssr/cache/timber-cache.js +3 -3
- package/dist/native/ssr/cdn/index.js +1 -1
- package/dist/native/ssr/client/error-boundary.js +1 -1
- package/dist/native/ssr/client/index.js +5 -5
- package/dist/native/ssr/client/link.js +5 -5
- package/dist/native/ssr/client/navigation-commit.js +2 -2
- package/dist/native/ssr/client/nuqs-adapter.js +2 -2
- package/dist/native/ssr/client/params-context.js +1 -1
- package/dist/native/ssr/client/router-skew.js +1 -1
- package/dist/native/ssr/client/rsc-fetch.js +2 -2
- package/dist/native/ssr/client/use-pending-navigation.js +1 -1
- package/dist/native/ssr/client/use-search-params.js +2 -2
- package/dist/native/ssr/client/use-segment-params.js +1 -1
- package/dist/native/ssr/client/use-selected-layout-segment.js +1 -1
- package/dist/native/ssr/dev-tools/await-span.js +5 -2
- package/dist/native/ssr/dev-tools/await-span.js.map +1 -1
- package/dist/native/ssr/dev-tools/instrumentation.js +38 -3
- package/dist/native/ssr/dev-tools/instrumentation.js.map +1 -1
- package/dist/native/ssr/dev-tools/logger.js +123 -80
- package/dist/native/ssr/dev-tools/logger.js.map +1 -1
- package/dist/native/ssr/dev-tools/span-sink.js +1 -0
- package/dist/native/ssr/dev-tools/span-sink.js.map +1 -1
- package/dist/native/ssr/manifest.json +1 -0
- package/dist/native/ssr/params/index.js +1 -1
- package/dist/native/ssr/search-params/define.js +2 -2
- package/dist/native/ssr/server/abort-scope.js +6 -2
- package/dist/native/ssr/server/abort-scope.js.map +1 -1
- package/dist/native/ssr/server/access-gate.js +1 -1
- package/dist/native/ssr/server/action-client.js +2 -2
- package/dist/native/ssr/server/actions.js +3 -3
- package/dist/native/ssr/server/deny-boundary.js +2 -2
- package/dist/native/ssr/server/flight-injector-core.js +1 -1
- package/dist/native/ssr/server/flight-source-node.js +8 -4
- package/dist/native/ssr/server/flight-source-node.js.map +1 -1
- package/dist/native/ssr/server/index.js +4 -4
- package/dist/native/ssr/server/internal.js +12 -12
- package/dist/native/ssr/server/logger.js +2 -2
- package/dist/native/ssr/server/node-body-response.js +1 -1
- package/dist/native/ssr/server/node-stream-transforms.js +2 -2
- package/dist/native/ssr/server/param-coercion.js +3 -3
- package/dist/native/ssr/server/pipeline-helpers.js +8 -8
- package/dist/native/ssr/server/pipeline-helpers.js.map +1 -1
- package/dist/native/ssr/server/pipeline-interception.js +4 -4
- package/dist/native/ssr/server/pipeline-metadata-route.js +11 -11
- package/dist/native/ssr/server/pipeline-metadata-route.js.map +1 -1
- package/dist/native/ssr/server/pipeline-outcome.js +4 -4
- package/dist/native/ssr/server/pipeline-phases.js +10 -10
- package/dist/native/ssr/server/pipeline.js +10 -10
- package/dist/native/ssr/server/prebuilt/capture-render.js +2 -2
- package/dist/native/ssr/server/prebuilt/dev-store.js +1 -1
- package/dist/native/ssr/server/prebuilt/overlay.js +4 -4
- package/dist/native/ssr/server/prebuilt-runtime.js +14 -14
- package/dist/native/ssr/server/primitives.js +2 -2
- package/dist/native/ssr/server/render-timeout.js +3 -4
- package/dist/native/ssr/server/render-timeout.js.map +1 -1
- package/dist/native/ssr/server/request-context.js +2 -2
- package/dist/native/ssr/server/route-handler.js +1 -1
- package/dist/native/ssr/server/rsc-error-envelope.js +1 -1
- package/dist/native/ssr/server/safe-load.js +10 -1
- package/dist/native/ssr/server/safe-load.js.map +1 -1
- package/dist/native/ssr/server/ssr-form-state.js +2 -2
- package/dist/native/ssr/server/ssr-wrappers.js +1 -1
- package/dist/native/ssr/server/traced-access.js +1 -1
- package/dist/native/ssr/server/tracing.js +10 -0
- package/dist/native/ssr/server/tracing.js.map +1 -1
- package/dist/native/ssr/shared/dev-span.js +8 -2
- package/dist/native/ssr/shared/dev-span.js.map +1 -1
- package/dist/native/ssr/shared/href.js +1 -1
- package/dist/native/ssr/shared/span-waterfall.js +90 -0
- package/dist/native/ssr/shared/span-waterfall.js.map +1 -0
- package/dist/plugins/dev-precompile.d.ts +84 -0
- package/dist/plugins/dev-precompile.d.ts.map +1 -0
- package/dist/plugins/dev-server.d.ts.map +1 -1
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/plugins/virtual-ids.d.ts +16 -0
- package/dist/plugins/virtual-ids.d.ts.map +1 -0
- package/dist/routes/index.js +1 -1
- package/dist/routing/index.js +3 -3
- package/dist/search-params/index.js +2 -2
- package/dist/server/abort-scope.d.ts +7 -0
- package/dist/server/abort-scope.d.ts.map +1 -1
- package/dist/server/flight-source-node.d.ts.map +1 -1
- package/dist/server/index.js +2 -2
- package/dist/server/internal.js +57 -17
- package/dist/server/internal.js.map +1 -1
- package/dist/server/render-timeout.d.ts.map +1 -1
- package/dist/server/rsc-entry/index.d.ts.map +1 -1
- package/dist/server/safe-load.d.ts +22 -0
- package/dist/server/safe-load.d.ts.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/shared/dev-span.d.ts +12 -1
- package/dist/shared/dev-span.d.ts.map +1 -1
- package/dist/shared/span-waterfall.d.ts +88 -0
- package/dist/shared/span-waterfall.d.ts.map +1 -0
- package/package.json +2 -2
- package/src/client/dev-pill/index.ts +5 -2
- package/src/client/dev-pill/store.ts +1 -1
- package/src/client/dev-pill/view.ts +15 -5
- package/src/dev-tools/await-span.ts +10 -0
- package/src/dev-tools/instrumentation.ts +44 -6
- package/src/dev-tools/logger.ts +230 -155
- package/src/dev-tools/span-sink.ts +34 -3
- package/src/index.ts +21 -11
- package/src/plugins/dev-precompile.ts +168 -0
- package/src/plugins/dev-server.ts +16 -3
- package/src/plugins/entries.ts +1 -11
- package/src/plugins/virtual-ids.ts +15 -0
- package/src/server/abort-scope.ts +20 -1
- package/src/server/flight-source-node.ts +11 -2
- package/src/server/pipeline-helpers.ts +2 -2
- package/src/server/pipeline-metadata-route.ts +2 -2
- package/src/server/render-timeout.ts +8 -5
- package/src/server/rsc-entry/index.ts +5 -0
- package/src/server/safe-load.ts +53 -1
- package/src/server/tracing.ts +29 -0
- package/src/shared/dev-span.ts +17 -2
- package/src/{client/dev-pill/waterfall.ts → shared/span-waterfall.ts} +84 -51
- package/dist/_chunks/chains-KblEfYzm.js +0 -1
- package/dist/_chunks/dev-server-DrYBIg66.js +0 -1
- package/dist/_chunks/dev-server-cmWVDgTf.js.map +0 -1
- package/dist/_chunks/dev-span-_NzMX-au.js.map +0 -1
- package/dist/_chunks/flight-source-node-BGanuoSS.js.map +0 -1
- package/dist/_chunks/logger-YtMSKfft.js.map +0 -1
- package/dist/_chunks/node-response-D3hXWb8y.js.map +0 -1
- package/dist/client/dev-pill/waterfall.d.ts +0 -64
- package/dist/client/dev-pill/waterfall.d.ts.map +0 -1
|
@@ -1,23 +1,25 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* A trace's spans as rows to read: the dev request pill's waterfall and the
|
|
3
|
+
* terminal tree.
|
|
3
4
|
*
|
|
4
|
-
* Pure: spans in, rows out.
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
5
|
+
* Pure: spans in, rows out. Built to be read, not to mirror the span tree.
|
|
6
|
+
* Waits whose work other rows already show can be hidden, and pass-through
|
|
7
|
+
* wrappers can fold into the row they wrap. One implementation for both
|
|
8
|
+
* surfaces, so the pill and the terminal never disagree about which awaits
|
|
9
|
+
* are noise. See design/50-dev-request-pill.md §"Reading the awaits view".
|
|
10
|
+
*
|
|
11
|
+
* Isomorphic: no server, client, or build-time imports.
|
|
8
12
|
*/
|
|
9
13
|
|
|
10
14
|
import {
|
|
11
15
|
AWAIT_SPAN_NAME,
|
|
12
16
|
AWAIT_WAIT_ATTRIBUTE,
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
/** Every span, or only the I/O: awaits and fetches. */
|
|
17
|
-
export type WaterfallView = 'all' | 'awaits';
|
|
17
|
+
FETCH_BODY_SPAN_NAME,
|
|
18
|
+
FETCH_SPAN_NAME,
|
|
19
|
+
} from './dev-span.ts';
|
|
18
20
|
|
|
19
|
-
|
|
20
|
-
const IO_SPANS = new Set([AWAIT_SPAN_NAME, FETCH_SPAN_NAME]);
|
|
21
|
+
/** The I/O: awaits, fetches, and fetched bodies being read. */
|
|
22
|
+
const IO_SPANS = new Set([AWAIT_SPAN_NAME, FETCH_SPAN_NAME, FETCH_BODY_SPAN_NAME]);
|
|
21
23
|
|
|
22
24
|
/**
|
|
23
25
|
* A wait is explained when spans outside its own ancestry cover this much
|
|
@@ -31,19 +33,38 @@ const WAIT_COVERAGE = 0.8;
|
|
|
31
33
|
*/
|
|
32
34
|
const FOLD_COVERAGE = 0.9;
|
|
33
35
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
/**
|
|
37
|
+
* What the rules read from a span. The pill's `DevSpanPayload` and the
|
|
38
|
+
* terminal's projection of an OTEL `ReadableSpan` both satisfy it.
|
|
39
|
+
*/
|
|
40
|
+
export interface WaterfallSpan {
|
|
41
|
+
spanId: string;
|
|
42
|
+
/** Absent, or not among the spans, for a top-level span. */
|
|
43
|
+
parentSpanId?: string;
|
|
44
|
+
name: string;
|
|
45
|
+
startMs: number;
|
|
46
|
+
endMs: number;
|
|
47
|
+
attributes: Readonly<Record<string, unknown>>;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
export interface WaterfallOptions<T extends WaterfallSpan = WaterfallSpan> {
|
|
51
|
+
/** Keep only the I/O, awaits and fetches (the pill's awaits view). */
|
|
52
|
+
ioOnly?: boolean;
|
|
53
|
+
/** Spans to leave out, with their shown children in their place. */
|
|
54
|
+
skip?: (span: T) => boolean;
|
|
55
|
+
/** Leave out waits other spans explain. */
|
|
56
|
+
hideWaits?: boolean;
|
|
57
|
+
/** Fold pass-through awaits into the row they wrap. */
|
|
58
|
+
fold?: boolean;
|
|
38
59
|
/** Rows the user unfolded, by the outer span's ID. */
|
|
39
60
|
expanded?: ReadonlySet<string>;
|
|
40
61
|
}
|
|
41
62
|
|
|
42
|
-
export interface WaterfallRow {
|
|
63
|
+
export interface WaterfallRow<T extends WaterfallSpan> {
|
|
43
64
|
/** The row's outermost span: its position, depth and location. */
|
|
44
|
-
span:
|
|
65
|
+
span: T;
|
|
45
66
|
/** Spans folded into this row, outermost first. Empty when nothing folded. */
|
|
46
|
-
folded:
|
|
67
|
+
folded: T[];
|
|
47
68
|
/** An explained wait: shown only on request, and dimmed. */
|
|
48
69
|
wait: boolean;
|
|
49
70
|
depth: number;
|
|
@@ -52,13 +73,13 @@ export interface WaterfallRow {
|
|
|
52
73
|
durationMs: number;
|
|
53
74
|
}
|
|
54
75
|
|
|
55
|
-
export interface Waterfall {
|
|
56
|
-
rows: WaterfallRow[];
|
|
76
|
+
export interface Waterfall<T extends WaterfallSpan> {
|
|
77
|
+
rows: WaterfallRow<T>[];
|
|
57
78
|
/** Explained waits left out of `rows`. */
|
|
58
79
|
hiddenWaits: number;
|
|
59
80
|
}
|
|
60
81
|
|
|
61
|
-
const duration = (s:
|
|
82
|
+
const duration = (s: WaterfallSpan) => s.endMs - s.startMs;
|
|
62
83
|
|
|
63
84
|
/** Total length of the union of [start, end) intervals. */
|
|
64
85
|
function unionLength(intervals: Array<[number, number]>): number {
|
|
@@ -85,10 +106,10 @@ function unionLength(intervals: Array<[number, number]>): number {
|
|
|
85
106
|
* A wait with children started work after all (a getter that returns a new
|
|
86
107
|
* promise), so it counts as work too.
|
|
87
108
|
*/
|
|
88
|
-
export function explainedWaits(spans: readonly
|
|
109
|
+
export function explainedWaits(spans: readonly WaterfallSpan[]): Set<string> {
|
|
89
110
|
const byId = new Map(spans.map((s) => [s.spanId, s]));
|
|
90
111
|
const parents = new Set(spans.map((s) => s.parentSpanId));
|
|
91
|
-
const isCandidate = (s:
|
|
112
|
+
const isCandidate = (s: WaterfallSpan) =>
|
|
92
113
|
s.attributes[AWAIT_WAIT_ATTRIBUTE] === true && !parents.has(s.spanId);
|
|
93
114
|
const work = spans.filter((s) => IO_SPANS.has(s.name) && !isCandidate(s));
|
|
94
115
|
const explained = new Set<string>();
|
|
@@ -112,24 +133,35 @@ export function explainedWaits(spans: readonly DevSpanPayload[]): Set<string> {
|
|
|
112
133
|
|
|
113
134
|
/**
|
|
114
135
|
* Spans in tree order (parent before children, siblings by start). The time
|
|
115
|
-
* axis starts at the trace's first span
|
|
116
|
-
*
|
|
117
|
-
* `view: 'awaits'` keeps only awaits and fetches, each nested under its
|
|
118
|
-
* nearest kept ancestor, so hiding framework phases leaves no gaps in the
|
|
119
|
-
* indentation. On top of that:
|
|
136
|
+
* axis starts at the trace's first span.
|
|
120
137
|
*
|
|
121
|
-
* -
|
|
122
|
-
*
|
|
123
|
-
*
|
|
124
|
-
*
|
|
138
|
+
* - `ioOnly` keeps only awaits and fetches, each nested under its nearest
|
|
139
|
+
* kept ancestor, so hiding framework phases leaves no gaps in the
|
|
140
|
+
* indentation.
|
|
141
|
+
* - `hideWaits` leaves out explained waits, with their children (they have
|
|
142
|
+
* none: a wait with children isn't explained).
|
|
143
|
+
* - `skip` leaves out the spans it matches, like `ioOnly` does.
|
|
144
|
+
* - `fold`: an await whose only shown child takes nearly all its time folds
|
|
145
|
+
* into one row with that child (unless the child is a wait), repeatedly,
|
|
146
|
+
* so `loadShow → def.load → fetch` is one row. So does a framework span
|
|
147
|
+
* into an only child that is an await (`proxy.ts → await next()`), which
|
|
148
|
+
* only arises when framework spans are shown. A fetch folds nothing. A
|
|
149
|
+
* row in `expanded`
|
|
150
|
+
* doesn't fold.
|
|
125
151
|
*/
|
|
126
|
-
export function buildWaterfall(
|
|
127
|
-
spans: readonly
|
|
128
|
-
{
|
|
129
|
-
|
|
152
|
+
export function buildWaterfall<T extends WaterfallSpan>(
|
|
153
|
+
spans: readonly T[],
|
|
154
|
+
{
|
|
155
|
+
ioOnly = false,
|
|
156
|
+
skip,
|
|
157
|
+
hideWaits = false,
|
|
158
|
+
fold = false,
|
|
159
|
+
expanded = new Set<string>(),
|
|
160
|
+
}: WaterfallOptions<T> = {}
|
|
161
|
+
): Waterfall<T> {
|
|
130
162
|
if (spans.length === 0) return { rows: [], hiddenWaits: 0 };
|
|
131
163
|
const ids = new Set(spans.map((s) => s.spanId));
|
|
132
|
-
const children = new Map<string | undefined,
|
|
164
|
+
const children = new Map<string | undefined, T[]>();
|
|
133
165
|
for (const span of spans) {
|
|
134
166
|
// A span whose parent isn't here (the root still open, or a parent
|
|
135
167
|
// outside this trace's spans) sits at the top level.
|
|
@@ -141,19 +173,19 @@ export function buildWaterfall(
|
|
|
141
173
|
for (const siblings of children.values()) siblings.sort((a, b) => a.startMs - b.startMs);
|
|
142
174
|
|
|
143
175
|
const waits = explainedWaits(spans);
|
|
144
|
-
const
|
|
145
|
-
const
|
|
146
|
-
const shown = (s: DevSpanPayload) =>
|
|
147
|
-
!awaitsView || (IO_SPANS.has(s.name) && !(hideWaits && waits.has(s.spanId)));
|
|
176
|
+
const kept = (s: T) => (!ioOnly || IO_SPANS.has(s.name)) && !skip?.(s);
|
|
177
|
+
const hidden = (s: T) => hideWaits && waits.has(s.spanId);
|
|
148
178
|
|
|
149
|
-
/** Shown children, with
|
|
150
|
-
const visibleChildren = (parent: string | undefined):
|
|
151
|
-
(children.get(parent) ?? []).flatMap((s) =>
|
|
179
|
+
/** Shown children, with an unkept child's shown descendants in its place. */
|
|
180
|
+
const visibleChildren = (parent: string | undefined): T[] =>
|
|
181
|
+
(children.get(parent) ?? []).flatMap((s) =>
|
|
182
|
+
hidden(s) ? [] : kept(s) ? [s] : visibleChildren(s.spanId)
|
|
183
|
+
);
|
|
152
184
|
|
|
153
185
|
const origin = Math.min(...spans.map((s) => s.startMs));
|
|
154
|
-
const rows: WaterfallRow[] = [];
|
|
155
|
-
const emit = (span:
|
|
156
|
-
const folded:
|
|
186
|
+
const rows: WaterfallRow<T>[] = [];
|
|
187
|
+
const emit = (span: T, depth: number) => {
|
|
188
|
+
const folded: T[] = [];
|
|
157
189
|
let tail = span;
|
|
158
190
|
let kids = visibleChildren(tail.spanId);
|
|
159
191
|
// A wait never folds: shown on request, it must appear as its own,
|
|
@@ -161,14 +193,15 @@ export function buildWaterfall(
|
|
|
161
193
|
// parent (a fetch raced against a timeout) never folds either: the row
|
|
162
194
|
// draws the parent's interval, which would drop the rest of the child's
|
|
163
195
|
// time. Codex review on #1288.
|
|
164
|
-
const foldable = (kid:
|
|
196
|
+
const foldable = (kid: T | undefined): kid is T =>
|
|
165
197
|
kid !== undefined &&
|
|
166
198
|
!waits.has(kid.spanId) &&
|
|
167
|
-
tail.name === AWAIT_SPAN_NAME
|
|
199
|
+
(tail.name === AWAIT_SPAN_NAME ||
|
|
200
|
+
(kid.name === AWAIT_SPAN_NAME && !IO_SPANS.has(tail.name))) &&
|
|
168
201
|
kid.startMs >= tail.startMs &&
|
|
169
202
|
kid.endMs <= tail.endMs &&
|
|
170
203
|
duration(kid) >= FOLD_COVERAGE * duration(tail);
|
|
171
|
-
if (
|
|
204
|
+
if (fold && !expanded.has(span.spanId)) {
|
|
172
205
|
for (
|
|
173
206
|
let only = kids.length === 1 ? kids[0] : undefined;
|
|
174
207
|
foldable(only);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export { t as formatChains } from "./chains-D-RRc7CM.js";
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export { t as RESTART_EXIT_CODE } from "./dev-server-cmWVDgTf.js";
|