@shivaedev/test-story 0.42.1 → 0.44.0
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/CHANGELOG.md +16 -0
- package/README.md +3 -1
- package/dist/server/adapters/callSite.d.ts +1 -1
- package/dist/server/adapters/callSite.d.ts.map +1 -1
- package/dist/server/adapters/callSite.js +2 -2
- package/dist/server/adapters/callSite.js.map +1 -1
- package/dist/server/adapters/failureReport.js +2 -2
- package/dist/server/adapters/failureReport.js.map +1 -1
- package/dist/server/narration.d.ts +4 -4
- package/dist/server/narration.d.ts.map +1 -1
- package/dist/server/narration.js.map +1 -1
- package/dist/server/otlpTracing.d.ts.map +1 -1
- package/dist/server/otlpTracing.js +22 -22
- package/dist/server/otlpTracing.js.map +1 -1
- package/dist/server/traits.d.ts +1 -1
- package/dist/server/traits.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/server/adapters/callSite.ts +3 -3
- package/src/server/adapters/failureReport.ts +2 -2
- package/src/server/narration.ts +4 -4
- package/src/server/otlpTracing.ts +29 -30
- package/src/server/traits.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.44.0 - 2026-11-06
|
|
4
|
+
|
|
5
|
+
### Fixed
|
|
6
|
+
|
|
7
|
+
- Capture call-site stack text immediately so told story lines do not retain released values through V8 stack frames. Failing stories still report the spec's file and line.
|
|
8
|
+
|
|
9
|
+
### Breaking
|
|
10
|
+
|
|
11
|
+
- Call-site metadata is now `string | undefined` instead of `Error`: `callSite()`, `TraitPart.site`, `Narration.at`, `Narration.sites` and `Narration.tellAt` use stack text directly. Consumers of these low-level exports must replace `.stack` reads with the stored value and pass stack text instead of an `Error` to `tellAt`. Story kits using `story.tell`, `kit.trait` and `story.runUntil` need no changes.
|
|
12
|
+
|
|
13
|
+
## 0.43.0 - 2026-11-06
|
|
14
|
+
|
|
15
|
+
### Breaking
|
|
16
|
+
|
|
17
|
+
- Screen drivers using the default contract activity signal wait for commands and first query results. Use `activityScreenSignal(activity, isClientIdle)` for stories that need full finite-work settling, and start `nextLiveHint()` before the outside write when waiting for a live change.
|
|
18
|
+
|
|
3
19
|
## 0.42.1 - 2026-11-05
|
|
4
20
|
|
|
5
21
|
### Changed
|
package/README.md
CHANGED
|
@@ -1029,7 +1029,9 @@ yield* screen.settle();
|
|
|
1029
1029
|
expect(screen.text("output")).toBe("Saved title");
|
|
1030
1030
|
```
|
|
1031
1031
|
|
|
1032
|
-
`settle()` waits until every supplied source is
|
|
1032
|
+
`settle()` waits until every supplied source is settled together, then flushes the renderer before returning. A source that becomes busy while another finishes keeps the wait open. `pending` and `transport` each accept the same sampler, boolean stream or `ScreenSignal` shape; `activity` accepts a `ScreenSignal`; contract owns the projection from native `ClientActivity`. It observes changes from all three without sleeps, quiet windows or polling. With `activityScreenSignal(clientActivity(client))`, the default is commands in flight and each mounted query's first result. A live query that has already delivered, including one awaiting a later refresh, is normal screen state and keeps no wait open. Contract uses its query/command declarations, so kits list no queries as settling exceptions. `find()` waits for settled activity and a matching target, including a target rendered by a later DOM mutation. To wait for a particular changed value, use `findText()` or an explicit live-change wait.
|
|
1033
|
+
|
|
1034
|
+
Keep live coalescing enabled. `nextLiveHint()` waits for the next subscription update received after the verb starts, including initial or resync updates; it does not wait for a refresh. Start the wait before another viewer writes, then use a driver with `activityScreenSignal(activity, isClientIdle)` to settle through the resulting finite calls, coalesced invalidations and refreshing query atoms before reading the screen. Both functions come from `@shivaedev/contract/clientActivity.ts`. If the client activity stream ends without a new hint, the wait fails with `SignalNotReceived` from `server/until.ts`. It needs `activity` or a `ScreenSignal` in `pending`; a callback-only driver fails with `MissingClientActivity`. Existing `pending: activityScreenSignal(clientActivity(client))` wiring remains supported.
|
|
1033
1035
|
|
|
1034
1036
|
For screens with runtime timers, acquire `const clock = yield* watchedClock` from `server/watchedClock.ts` during kit creation and pass `clock` to `screenDriver({ act, clock, pending, root, tell })`. Supply that same Clock to the application's atom runtime. While the supplied completion sources are busy, screen waits advance to the next registered sleep inside the supplied renderer `act`, then check completion again. Canceled sleeps are removed. A debounced search can therefore use `enter` followed by `settle` without a real wait or its debounce duration in a kit verb. Clock advancement is opt-in; the driver leaves time alone without `clock`. It advances the shared clock, including other scheduled work, so use explicit `clock.adjust(duration)` inside `act` when a story needs to observe a time boundary, such as holding a diary row for a long press.
|
|
1035
1037
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callSite.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/callSite.ts"],"names":[],"mappings":"AAMA,wBAAgB,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"callSite.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/callSite.ts"],"names":[],"mappings":"AAMA,wBAAgB,QAAQ,IAAI,MAAM,GAAG,SAAS,CAM7C;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAItF"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { relative } from "node:path";
|
|
2
2
|
import process from "node:process";
|
|
3
3
|
const FRAMES = 50;
|
|
4
|
-
//
|
|
4
|
+
// Retaining the Error also retains V8's stack frames and their closed-over values.
|
|
5
5
|
export function callSite() {
|
|
6
6
|
const limit = Error.stackTraceLimit;
|
|
7
7
|
Error.stackTraceLimit = FRAMES;
|
|
8
8
|
const site = new Error("call site");
|
|
9
9
|
Error.stackTraceLimit = limit;
|
|
10
|
-
return site;
|
|
10
|
+
return site.stack;
|
|
11
11
|
}
|
|
12
12
|
export function locate(stack, testFile) {
|
|
13
13
|
const frame = stack?.split("\n").find((line) => line.includes(testFile));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callSite.js","sourceRoot":"","sources":["../../../src/server/adapters/callSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,MAAM,MAAM,GAAG,EAAE,CAAC;AAElB,
|
|
1
|
+
{"version":3,"file":"callSite.js","sourceRoot":"","sources":["../../../src/server/adapters/callSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,MAAM,MAAM,GAAG,EAAE,CAAC;AAElB,mFAAmF;AACnF,MAAM,UAAU,QAAQ;IACvB,MAAM,KAAK,GAAG,KAAK,CAAC,eAAe,CAAC;IACpC,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;IACpC,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;IAC9B,OAAO,IAAI,CAAC,KAAK,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAyB,EAAE,QAAgB;IACjE,MAAM,KAAK,GAAG,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzE,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,gCAAgC,CAAC,EAAE,MAAM,CAAC;IACzH,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;AACxH,CAAC"}
|
|
@@ -25,11 +25,11 @@ function guide(name) {
|
|
|
25
25
|
function storyRows(narration, test) {
|
|
26
26
|
const rows = narration.lines.map((line, index) => `${narration.refused?.index === index ? "✗" : " "} ${index < narration.given ? "given" : " "} ${line}`);
|
|
27
27
|
if (narration.refused !== undefined) {
|
|
28
|
-
const where = locate(narration.sites[narration.refused.index]
|
|
28
|
+
const where = locate(narration.sites[narration.refused.index], test.file);
|
|
29
29
|
rows.splice(narration.refused.index + 1, 0, ...(where === undefined ? [] : [` refused at ${where}`]));
|
|
30
30
|
return rows;
|
|
31
31
|
}
|
|
32
|
-
const where = locate(test.stack, test.file) ?? locate(narration.at
|
|
32
|
+
const where = locate(test.stack, test.file) ?? locate(narration.at, test.file);
|
|
33
33
|
return [
|
|
34
34
|
...rows,
|
|
35
35
|
`✗ the test failed ${rows.length === 0 ? "before the story told a line" : "after the line above"}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failureReport.js","sourceRoot":"","sources":["../../../src/server/adapters/failureReport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAQzD,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAgB;IAC5D,OAAO,GAAG,SAAS,CAClB,OAAO,IAAI,iCAAiC,EAC5C,wFAAwF,IAAI,uCAAuC,CACnI,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,aAAa,CAAU,SAAoB,EAAE,OAAyB,EAAE,IAAgB;IACvG,IAAI,CAAC;QACJ,OAAO,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtI,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,gDAAgD,OAAO,CAAC,IAAI,KAAK,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;IAChG,CAAC;AACF,CAAC;AAED,SAAS,KAAK,CAAC,IAAY;IAC1B,OAAO;QACN,4CAA4C;QAC5C,GAAG,IAAI,CACN,qLAAqL,IAAI,oCAAoC,EAC7N,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAC3B;QACD,IAAI;KACJ,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,SAAoB,EAAE,IAAgB;IACxD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAC/B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,EAAE,CAC5H,CAAC;IACF,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"failureReport.js","sourceRoot":"","sources":["../../../src/server/adapters/failureReport.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ export interface Refusal {
|
|
|
5
5
|
readonly index: number;
|
|
6
6
|
}
|
|
7
7
|
export interface Narration {
|
|
8
|
-
at:
|
|
8
|
+
at: string | undefined;
|
|
9
9
|
given: number;
|
|
10
10
|
readonly lines: string[];
|
|
11
11
|
refused: Refusal | undefined;
|
|
12
|
-
readonly sites:
|
|
12
|
+
readonly sites: (string | undefined)[];
|
|
13
13
|
readonly tell: (line: string) => void;
|
|
14
|
-
readonly tellAt: (line: string, site:
|
|
14
|
+
readonly tellAt: (line: string, site: string | undefined) => void;
|
|
15
15
|
}
|
|
16
16
|
export interface Subject<TEngine> {
|
|
17
17
|
readonly engine: TEngine;
|
|
@@ -30,6 +30,6 @@ export declare const narrate: <TEngine>(subject: Subject<TEngine>, context: Fail
|
|
|
30
30
|
}, never, unknown>;
|
|
31
31
|
export declare function tellGiven(narration: Narration, given: readonly {
|
|
32
32
|
readonly line: string;
|
|
33
|
-
readonly site:
|
|
33
|
+
readonly site: string | undefined;
|
|
34
34
|
}[]): void;
|
|
35
35
|
//# sourceMappingURL=narration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"narration.d.ts","sourceRoot":"","sources":["../../src/server/narration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,KAAK,cAAc,EAAmB,MAAM,kCAAkC,CAAC;AAGxF,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACzB,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"narration.d.ts","sourceRoot":"","sources":["../../src/server/narration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,KAAK,cAAc,EAAmB,MAAM,kCAAkC,CAAC;AAGxF,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACzB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,OAAO,CAAC,OAAO;IAC/B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;IAC7D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;KAAE,GAAG;QAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;CAC9E;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,uCAEpE;AAED,eAAO,MAAM,OAAO,GAAgC,OAAO;4BAiB3B,MAAM,GAAG,SAAS;;kBAmBhD,CAAC;AAEH,wBAAgB,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,GAAG,IAAI,CAKpI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"narration.js","sourceRoot":"","sources":["../../src/server/narration.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"narration.js","sourceRoot":"","sources":["../../src/server/narration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlpTracing.d.ts","sourceRoot":"","sources":["../../src/server/otlpTracing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAc,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"otlpTracing.d.ts","sourceRoot":"","sources":["../../src/server/otlpTracing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAc,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE3E,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;IAIxE,KAAK;IAYL,WAAW,aAAY,iBAAiB;EAEzC"}
|
|
@@ -4,22 +4,6 @@ import * as Logger from "effect/Logger";
|
|
|
4
4
|
import { OtlpExporter, OtlpTracer } from "effect/observability";
|
|
5
5
|
import * as Stream from "effect/Stream";
|
|
6
6
|
import * as Tracer from "effect/Tracer";
|
|
7
|
-
function recordEnds(tracer, ended) {
|
|
8
|
-
return Tracer.make({
|
|
9
|
-
context: tracer.context,
|
|
10
|
-
span: (options) => {
|
|
11
|
-
const span = tracer.span(options);
|
|
12
|
-
const end = span.end.bind(span);
|
|
13
|
-
span.end = (time, exit) => {
|
|
14
|
-
end(time, exit);
|
|
15
|
-
if (span.sampled) {
|
|
16
|
-
ended.add(span.spanId);
|
|
17
|
-
}
|
|
18
|
-
};
|
|
19
|
-
return span;
|
|
20
|
-
},
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
7
|
export function otlpTracing(url, received) {
|
|
24
8
|
const ended = new Set();
|
|
25
9
|
const flushers = new Set();
|
|
@@ -34,12 +18,28 @@ export function otlpTracing(url, received) {
|
|
|
34
18
|
}));
|
|
35
19
|
}
|
|
36
20
|
}),
|
|
37
|
-
tracerLayer: (options = {}) =>
|
|
38
|
-
const flusher = yield* OtlpExporter.Flusher;
|
|
39
|
-
yield* Effect.acquireRelease(Effect.sync(() => flushers.add(flusher)), () => Effect.sync(() => flushers.delete(flusher)));
|
|
40
|
-
const tracer = yield* OtlpTracer.make({ ...options, url });
|
|
41
|
-
return recordEnds(tracer, ended);
|
|
42
|
-
})).pipe(Layer.provideMerge(OtlpExporter.layerFlusher), Layer.merge(Logger.layer([Logger.tracerLogger], { mergeWithExisting: true }))),
|
|
21
|
+
tracerLayer: (options = {}) => makeTracerLayer(url, ended, flushers, options),
|
|
43
22
|
};
|
|
44
23
|
}
|
|
24
|
+
function makeTracerLayer(url, ended, flushers, options) {
|
|
25
|
+
return Layer.effect(Tracer.Tracer, Effect.gen(function* () {
|
|
26
|
+
const flusher = yield* OtlpExporter.Flusher;
|
|
27
|
+
yield* Effect.acquireRelease(Effect.sync(() => flushers.add(flusher)), () => Effect.sync(() => flushers.delete(flusher)));
|
|
28
|
+
const tracer = yield* OtlpTracer.make({ ...options, url });
|
|
29
|
+
return Tracer.make({
|
|
30
|
+
context: tracer.context,
|
|
31
|
+
span: (spanOptions) => {
|
|
32
|
+
const span = tracer.span(spanOptions);
|
|
33
|
+
const end = span.end.bind(span);
|
|
34
|
+
span.end = (time, exit) => {
|
|
35
|
+
end(time, exit);
|
|
36
|
+
if (span.sampled) {
|
|
37
|
+
ended.add(span.spanId);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
return span;
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
})).pipe(Layer.provideMerge(OtlpExporter.layerFlusher), Layer.merge(Logger.layer([Logger.tracerLogger], { mergeWithExisting: true })));
|
|
44
|
+
}
|
|
45
45
|
//# sourceMappingURL=otlpTracing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlpTracing.js","sourceRoot":"","sources":["../../src/server/otlpTracing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,
|
|
1
|
+
{"version":3,"file":"otlpTracing.js","sourceRoot":"","sources":["../../src/server/otlpTracing.ts"],"names":[],"mappings":"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"}
|
package/dist/server/traits.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traits.d.ts","sourceRoot":"","sources":["../../src/server/traits.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,SAAS,CAAC,MAAM,SAAS,MAAM,EAAE,MAAM;IACvD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"traits.d.ts","sourceRoot":"","sources":["../../src/server/traits.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,SAAS,CAAC,MAAM,SAAS,MAAM,EAAE,MAAM;IACvD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,MAAM;IACnD,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;CACrD;AAED,wBAAgB,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAEtH;AAED,wBAAgB,MAAM,CAAC,MAAM,SAAS,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,SAAS,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAEvH"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/test-story",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.44.0",
|
|
4
4
|
"description": "Tests that read like stories over the real engine: a story kit per engine with its own it, traits per feature, and a failure that prints the story, where it stopped and the engine's state",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/test-story#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
"README.md"
|
|
43
43
|
],
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@shivaedev/contract": "0.
|
|
45
|
+
"@shivaedev/contract": "0.41.0",
|
|
46
46
|
"@shivaedev/test": "0.17.0",
|
|
47
|
-
"@shivaedev/test-sql": "0.24.
|
|
47
|
+
"@shivaedev/test-sql": "0.24.2",
|
|
48
48
|
"dom-accessibility-api": "0.7.1"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
@@ -52,8 +52,8 @@
|
|
|
52
52
|
"@effect/platform-node": "4.1.0",
|
|
53
53
|
"@effect/sql-pg": "4.1.0",
|
|
54
54
|
"@effect/vitest": "4.1.0",
|
|
55
|
-
"@shivaedev/quality": "0.
|
|
56
|
-
"@shivaedev/react": "0.44.
|
|
55
|
+
"@shivaedev/quality": "0.67.2",
|
|
56
|
+
"@shivaedev/react": "0.44.2",
|
|
57
57
|
"@types/node": "24.19.2",
|
|
58
58
|
"@types/react": "19.3.0",
|
|
59
59
|
"@types/react-dom": "19.3.0",
|
|
@@ -3,13 +3,13 @@ import process from "node:process";
|
|
|
3
3
|
|
|
4
4
|
const FRAMES = 50;
|
|
5
5
|
|
|
6
|
-
//
|
|
7
|
-
export function callSite():
|
|
6
|
+
// Retaining the Error also retains V8's stack frames and their closed-over values.
|
|
7
|
+
export function callSite(): string | undefined {
|
|
8
8
|
const limit = Error.stackTraceLimit;
|
|
9
9
|
Error.stackTraceLimit = FRAMES;
|
|
10
10
|
const site = new Error("call site");
|
|
11
11
|
Error.stackTraceLimit = limit;
|
|
12
|
-
return site;
|
|
12
|
+
return site.stack;
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export function locate(stack: string | undefined, testFile: string): string | undefined {
|
|
@@ -43,11 +43,11 @@ function storyRows(narration: Narration, test: FailedTest): string[] {
|
|
|
43
43
|
(line, index) => `${narration.refused?.index === index ? "✗" : " "} ${index < narration.given ? "given" : " "} ${line}`,
|
|
44
44
|
);
|
|
45
45
|
if (narration.refused !== undefined) {
|
|
46
|
-
const where = locate(narration.sites[narration.refused.index]
|
|
46
|
+
const where = locate(narration.sites[narration.refused.index], test.file);
|
|
47
47
|
rows.splice(narration.refused.index + 1, 0, ...(where === undefined ? [] : [` refused at ${where}`]));
|
|
48
48
|
return rows;
|
|
49
49
|
}
|
|
50
|
-
const where = locate(test.stack, test.file) ?? locate(narration.at
|
|
50
|
+
const where = locate(test.stack, test.file) ?? locate(narration.at, test.file);
|
|
51
51
|
return [
|
|
52
52
|
...rows,
|
|
53
53
|
`✗ the test failed ${rows.length === 0 ? "before the story told a line" : "after the line above"}`,
|
package/src/server/narration.ts
CHANGED
|
@@ -12,13 +12,13 @@ export interface Refusal {
|
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
export interface Narration {
|
|
15
|
-
at:
|
|
15
|
+
at: string | undefined;
|
|
16
16
|
given: number;
|
|
17
17
|
readonly lines: string[];
|
|
18
18
|
refused: Refusal | undefined;
|
|
19
|
-
readonly sites:
|
|
19
|
+
readonly sites: (string | undefined)[];
|
|
20
20
|
readonly tell: (line: string) => void;
|
|
21
|
-
readonly tellAt: (line: string, site:
|
|
21
|
+
readonly tellAt: (line: string, site: string | undefined) => void;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
export interface Subject<TEngine> {
|
|
@@ -70,7 +70,7 @@ export const narrate = Effect.fnUntraced(function* <TEngine>(subject: Subject<TE
|
|
|
70
70
|
return { captureFailure, narration };
|
|
71
71
|
});
|
|
72
72
|
|
|
73
|
-
export function tellGiven(narration: Narration, given: readonly { readonly line: string; readonly site:
|
|
73
|
+
export function tellGiven(narration: Narration, given: readonly { readonly line: string; readonly site: string | undefined }[]): void {
|
|
74
74
|
for (const part of given) {
|
|
75
75
|
narration.tellAt(part.line, part.site);
|
|
76
76
|
}
|
|
@@ -6,23 +6,6 @@ import * as Stream from "effect/Stream";
|
|
|
6
6
|
import * as Tracer from "effect/Tracer";
|
|
7
7
|
import type { OtlpSpan, OtlpTracerOptions } from "#server/otlpReceiver.ts";
|
|
8
8
|
|
|
9
|
-
function recordEnds(tracer: Tracer.Tracer, ended: Set<string>) {
|
|
10
|
-
return Tracer.make({
|
|
11
|
-
context: tracer.context,
|
|
12
|
-
span: (options) => {
|
|
13
|
-
const span = tracer.span(options);
|
|
14
|
-
const end = span.end.bind(span);
|
|
15
|
-
span.end = (time, exit) => {
|
|
16
|
-
end(time, exit);
|
|
17
|
-
if (span.sampled) {
|
|
18
|
-
ended.add(span.spanId);
|
|
19
|
-
}
|
|
20
|
-
};
|
|
21
|
-
return span;
|
|
22
|
-
},
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
|
|
26
9
|
export function otlpTracing(url: string, received: Stream.Stream<OtlpSpan>) {
|
|
27
10
|
const ended = new Set<string>();
|
|
28
11
|
const flushers = new Set<OtlpExporter.Flusher["Service"]>();
|
|
@@ -39,18 +22,34 @@ export function otlpTracing(url: string, received: Stream.Stream<OtlpSpan>) {
|
|
|
39
22
|
);
|
|
40
23
|
}
|
|
41
24
|
}),
|
|
42
|
-
tracerLayer: (options: OtlpTracerOptions = {}) =>
|
|
43
|
-
Layer.effect(
|
|
44
|
-
Tracer.Tracer,
|
|
45
|
-
Effect.gen(function* () {
|
|
46
|
-
const flusher = yield* OtlpExporter.Flusher;
|
|
47
|
-
yield* Effect.acquireRelease(
|
|
48
|
-
Effect.sync(() => flushers.add(flusher)),
|
|
49
|
-
() => Effect.sync(() => flushers.delete(flusher)),
|
|
50
|
-
);
|
|
51
|
-
const tracer = yield* OtlpTracer.make({ ...options, url });
|
|
52
|
-
return recordEnds(tracer, ended);
|
|
53
|
-
}),
|
|
54
|
-
).pipe(Layer.provideMerge(OtlpExporter.layerFlusher), Layer.merge(Logger.layer([Logger.tracerLogger], { mergeWithExisting: true }))),
|
|
25
|
+
tracerLayer: (options: OtlpTracerOptions = {}) => makeTracerLayer(url, ended, flushers, options),
|
|
55
26
|
};
|
|
56
27
|
}
|
|
28
|
+
|
|
29
|
+
function makeTracerLayer(url: string, ended: Set<string>, flushers: Set<OtlpExporter.Flusher["Service"]>, options: OtlpTracerOptions) {
|
|
30
|
+
return Layer.effect(
|
|
31
|
+
Tracer.Tracer,
|
|
32
|
+
Effect.gen(function* () {
|
|
33
|
+
const flusher = yield* OtlpExporter.Flusher;
|
|
34
|
+
yield* Effect.acquireRelease(
|
|
35
|
+
Effect.sync(() => flushers.add(flusher)),
|
|
36
|
+
() => Effect.sync(() => flushers.delete(flusher)),
|
|
37
|
+
);
|
|
38
|
+
const tracer = yield* OtlpTracer.make({ ...options, url });
|
|
39
|
+
return Tracer.make({
|
|
40
|
+
context: tracer.context,
|
|
41
|
+
span: (spanOptions) => {
|
|
42
|
+
const span = tracer.span(spanOptions);
|
|
43
|
+
const end = span.end.bind(span);
|
|
44
|
+
span.end = (time, exit) => {
|
|
45
|
+
end(time, exit);
|
|
46
|
+
if (span.sampled) {
|
|
47
|
+
ended.add(span.spanId);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
return span;
|
|
51
|
+
},
|
|
52
|
+
});
|
|
53
|
+
}),
|
|
54
|
+
).pipe(Layer.provideMerge(OtlpExporter.layerFlusher), Layer.merge(Logger.layer([Logger.tracerLogger], { mergeWithExisting: true })));
|
|
55
|
+
}
|
package/src/server/traits.ts
CHANGED