@shivaedev/test-story 0.29.0 → 0.31.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.
Files changed (107) hide show
  1. package/CHANGELOG.md +30 -0
  2. package/README.md +135 -34
  3. package/dist/server/adapters/outcomeMatchers.d.ts +12 -0
  4. package/dist/server/adapters/outcomeMatchers.d.ts.map +1 -0
  5. package/dist/server/adapters/outcomeMatchers.js +22 -0
  6. package/dist/server/adapters/outcomeMatchers.js.map +1 -0
  7. package/dist/server/{internal → adapters}/screenElements.d.ts +5 -2
  8. package/dist/server/adapters/screenElements.d.ts.map +1 -0
  9. package/dist/server/{internal → adapters}/screenElements.js +22 -5
  10. package/dist/server/adapters/screenElements.js.map +1 -0
  11. package/dist/server/adapters/screenMutations.d.ts +3 -0
  12. package/dist/server/adapters/screenMutations.d.ts.map +1 -0
  13. package/dist/server/adapters/screenMutations.js +11 -0
  14. package/dist/server/adapters/screenMutations.js.map +1 -0
  15. package/dist/server/adapters/screenNavigation.d.ts +3 -0
  16. package/dist/server/adapters/screenNavigation.d.ts.map +1 -0
  17. package/dist/server/adapters/screenNavigation.js +34 -0
  18. package/dist/server/adapters/screenNavigation.js.map +1 -0
  19. package/dist/server/adapters/screenQueries.d.ts +8 -0
  20. package/dist/server/adapters/screenQueries.d.ts.map +1 -0
  21. package/dist/server/adapters/screenQueries.js +62 -0
  22. package/dist/server/adapters/screenQueries.js.map +1 -0
  23. package/dist/server/fakeHttpService.d.ts +2 -0
  24. package/dist/server/fakeHttpService.d.ts.map +1 -1
  25. package/dist/server/fakeHttpService.js +6 -1
  26. package/dist/server/fakeHttpService.js.map +1 -1
  27. package/dist/server/internal/fakeHttpReceive.d.ts +1 -1
  28. package/dist/server/internal/fakeHttpReceive.d.ts.map +1 -1
  29. package/dist/server/internal/fakeHttpReceive.js +6 -1
  30. package/dist/server/internal/fakeHttpReceive.js.map +1 -1
  31. package/dist/server/internal/nextClientHint.d.ts +4 -0
  32. package/dist/server/internal/nextClientHint.d.ts.map +1 -0
  33. package/dist/server/internal/{screenActivity.js → nextClientHint.js} +1 -5
  34. package/dist/server/internal/nextClientHint.js.map +1 -0
  35. package/dist/server/internal/recordedSignals.d.ts +8 -0
  36. package/dist/server/internal/recordedSignals.d.ts.map +1 -0
  37. package/dist/server/internal/recordedSignals.js +44 -0
  38. package/dist/server/internal/recordedSignals.js.map +1 -0
  39. package/dist/server/internal/screenAccessibility.d.ts +0 -1
  40. package/dist/server/internal/screenAccessibility.d.ts.map +1 -1
  41. package/dist/server/internal/screenAccessibility.js +1 -22
  42. package/dist/server/internal/screenAccessibility.js.map +1 -1
  43. package/dist/server/internal/screenReadouts.d.ts +1 -1
  44. package/dist/server/internal/screenReadouts.d.ts.map +1 -1
  45. package/dist/server/internal/screenReadouts.js +3 -3
  46. package/dist/server/internal/screenReadouts.js.map +1 -1
  47. package/dist/server/internal/screenWaits.d.ts +28 -0
  48. package/dist/server/internal/screenWaits.d.ts.map +1 -0
  49. package/dist/server/internal/screenWaits.js +47 -0
  50. package/dist/server/internal/screenWaits.js.map +1 -0
  51. package/dist/server/internal/storyIt.d.ts.map +1 -1
  52. package/dist/server/internal/storyIt.js +2 -1
  53. package/dist/server/internal/storyIt.js.map +1 -1
  54. package/dist/server/internal/waitForScreen.d.ts +9 -0
  55. package/dist/server/internal/waitForScreen.d.ts.map +1 -0
  56. package/dist/server/internal/waitForScreen.js +36 -0
  57. package/dist/server/internal/waitForScreen.js.map +1 -0
  58. package/dist/server/internal/withWatchedClock.d.ts +3 -0
  59. package/dist/server/internal/withWatchedClock.d.ts.map +1 -0
  60. package/dist/server/internal/withWatchedClock.js +6 -0
  61. package/dist/server/internal/withWatchedClock.js.map +1 -0
  62. package/dist/server/lineSignals.d.ts +8 -0
  63. package/dist/server/lineSignals.d.ts.map +1 -0
  64. package/dist/server/lineSignals.js +21 -0
  65. package/dist/server/lineSignals.js.map +1 -0
  66. package/dist/server/otlpReceiver.d.ts +39 -1
  67. package/dist/server/otlpReceiver.d.ts.map +1 -1
  68. package/dist/server/otlpReceiver.js +17 -8
  69. package/dist/server/otlpReceiver.js.map +1 -1
  70. package/dist/server/outcomes.d.ts +8 -1
  71. package/dist/server/outcomes.d.ts.map +1 -1
  72. package/dist/server/outcomes.js +6 -6
  73. package/dist/server/outcomes.js.map +1 -1
  74. package/dist/server/screenDriver.d.ts +19 -9
  75. package/dist/server/screenDriver.d.ts.map +1 -1
  76. package/dist/server/screenDriver.js +18 -58
  77. package/dist/server/screenDriver.js.map +1 -1
  78. package/dist/server/watchedClock.d.ts +10 -0
  79. package/dist/server/watchedClock.d.ts.map +1 -0
  80. package/dist/server/watchedClock.js +35 -0
  81. package/dist/server/watchedClock.js.map +1 -0
  82. package/package.json +4 -4
  83. package/src/server/adapters/outcomeMatchers.ts +33 -0
  84. package/src/server/{internal → adapters}/screenElements.ts +22 -5
  85. package/src/server/adapters/screenMutations.ts +14 -0
  86. package/src/server/adapters/screenNavigation.ts +37 -0
  87. package/src/server/adapters/screenQueries.ts +75 -0
  88. package/src/server/fakeHttpService.ts +7 -1
  89. package/src/server/internal/fakeHttpReceive.ts +6 -0
  90. package/src/server/internal/{screenActivity.ts → nextClientHint.ts} +1 -5
  91. package/src/server/internal/recordedSignals.ts +44 -0
  92. package/src/server/internal/screenAccessibility.ts +1 -25
  93. package/src/server/internal/screenReadouts.ts +3 -3
  94. package/src/server/internal/screenWaits.ts +105 -0
  95. package/src/server/internal/storyIt.ts +2 -1
  96. package/src/server/internal/waitForScreen.ts +48 -0
  97. package/src/server/internal/withWatchedClock.ts +8 -0
  98. package/src/server/lineSignals.ts +25 -0
  99. package/src/server/otlpReceiver.ts +23 -8
  100. package/src/server/outcomes.ts +19 -10
  101. package/src/server/screenDriver.ts +25 -73
  102. package/src/server/watchedClock.ts +49 -0
  103. package/dist/server/internal/screenActivity.d.ts +0 -5
  104. package/dist/server/internal/screenActivity.d.ts.map +0 -1
  105. package/dist/server/internal/screenActivity.js.map +0 -1
  106. package/dist/server/internal/screenElements.d.ts.map +0 -1
  107. package/dist/server/internal/screenElements.js.map +0 -1
@@ -1,6 +1,7 @@
1
1
  import { type IncomingHttpHeaders } from "node:http";
2
2
  import { Effect } from "effect";
3
3
  import { otlpReadout } from "#internal/otlpReadout.ts";
4
+ import { type UntilOptions } from "#until.ts";
4
5
  export type OtlpSpan = ReturnType<typeof otlpReadout>[number];
5
6
  export interface OtlpExport {
6
7
  readonly body: Buffer;
@@ -16,6 +17,43 @@ export interface OtlpReceiverOptions {
16
17
  export declare const otlpReceiver: (options?: OtlpReceiverOptions | undefined) => Effect.Effect<{
17
18
  readonly requests: readonly OtlpExport[];
18
19
  readonly spans: readonly OtlpSpan[];
19
- readonly url: string;
20
+ untilSpan: (matches: (span: OtlpSpan) => boolean, wait: UntilOptions) => Effect.Effect<{
21
+ endTimeUnixNano?: string;
22
+ name: string;
23
+ parentSpanId?: string;
24
+ spanId: string;
25
+ startTimeUnixNano?: string;
26
+ traceId: string;
27
+ attributes: readonly {
28
+ readonly key: string;
29
+ readonly value: import("./internal/otlpValue.ts").OtlpValue;
30
+ }[];
31
+ events: {
32
+ name: string;
33
+ timeUnixNano?: string;
34
+ attributes: readonly {
35
+ readonly key: string;
36
+ readonly value: import("./internal/otlpValue.ts").OtlpValue;
37
+ }[];
38
+ }[];
39
+ kind: number;
40
+ links: {
41
+ spanId: string;
42
+ traceId: string;
43
+ attributes: readonly {
44
+ readonly key: string;
45
+ readonly value: import("./internal/otlpValue.ts").OtlpValue;
46
+ }[];
47
+ }[];
48
+ resourceAttributes: readonly {
49
+ readonly key: string;
50
+ readonly value: import("./internal/otlpValue.ts").OtlpValue;
51
+ }[];
52
+ status: {
53
+ message?: string;
54
+ code: number;
55
+ };
56
+ }, import("#until.ts").SignalNotReceived, never>;
57
+ url: string;
20
58
  }, import("effect/Cause").UnknownError, import("effect/Scope").Scope>;
21
59
  //# sourceMappingURL=otlpReceiver.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"otlpReceiver.d.ts","sourceRoot":"","sources":["../../src/server/otlpReceiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,mBAAmB,EAA6C,MAAM,WAAW,CAAC;AAC9G,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAC9D,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AACD,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;CACrE;AAmCD,eAAO,MAAM,YAAY;uBAKa,SAAS,UAAU,EAAE;oBAAkB,SAAS,QAAQ,EAAE;kBAAgB,MAAM;qEAMpH,CAAC"}
1
+ {"version":3,"file":"otlpReceiver.d.ts","sourceRoot":"","sources":["../../src/server/otlpReceiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,mBAAmB,EAA6C,MAAM,WAAW,CAAC;AAC9G,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,WAAW,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAC9D,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AACD,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;CACrE;AA2CD,eAAO,MAAM,YAAY;uBAOP,SAAS,UAAU,EAAE;oBAGxB,SAAS,QAAQ,EAAE;yBAGX,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,QAAQ,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qEAGpE,CAAC"}
@@ -3,7 +3,9 @@ import { Effect } from "effect";
3
3
  import * as HttpStatus from "effect/http/HttpStatus";
4
4
  import { loopbackServer } from "#internal/loopback.ts";
5
5
  import { otlpReadout } from "#internal/otlpReadout.ts";
6
- async function receive(request, response, requests, spans, options) {
6
+ import { recordedSignals } from "#internal/recordedSignals.ts";
7
+ import { until } from "#until.ts";
8
+ async function receive(request, response, requests, record, options) {
7
9
  try {
8
10
  const chunks = [];
9
11
  for await (const chunk of request) {
@@ -20,7 +22,9 @@ async function receive(request, response, requests, spans, options) {
20
22
  response.writeHead(HttpStatus.fromLiteral("UnsupportedMediaType")).end();
21
23
  return;
22
24
  }
23
- spans.push(...otlpReadout(body, contentType));
25
+ for (const span of otlpReadout(body, contentType)) {
26
+ record(span);
27
+ }
24
28
  const status = typeof options.status === "function" ? options.status(requests.length) : (options.status ?? HttpStatus.fromLiteral("OK"));
25
29
  if (status === undefined) {
26
30
  return;
@@ -39,14 +43,19 @@ async function receive(request, response, requests, spans, options) {
39
43
  }
40
44
  export const otlpReceiver = Effect.fnUntraced(function* (options = {}) {
41
45
  const requests = [];
42
- const spans = [];
43
- const server = createServer((request, response) => receive(request, response, requests, spans, options));
46
+ const signals = recordedSignals();
47
+ const server = createServer((request, response) => receive(request, response, requests, signals.push, options));
44
48
  const url = yield* loopbackServer(server);
45
- const receiver = {
46
- requests,
47
- spans,
49
+ yield* Effect.addFinalizer(() => Effect.sync(() => signals.end()));
50
+ return {
51
+ get requests() {
52
+ return requests;
53
+ },
54
+ get spans() {
55
+ return signals.values;
56
+ },
57
+ untilSpan: (matches, wait) => until(signals.stream, matches, wait),
48
58
  url,
49
59
  };
50
- return receiver;
51
60
  });
52
61
  //# sourceMappingURL=otlpReceiver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"otlpReceiver.js","sourceRoot":"","sources":["../../src/server/otlpReceiver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"otlpReceiver.js","sourceRoot":"","sources":["../../src/server/otlpReceiver.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,13 @@
1
1
  import { Effect } from "effect";
2
2
  import { type DeeplyAllowMatchers } from "vitest";
3
+ import type { NumericBound } from "#adapters/outcomeMatchers.ts";
3
4
  type AnyReadout = Effect.Effect<unknown, unknown, unknown>;
4
- export declare const outcomes: <TReadouts extends Record<string, AnyReadout>>(rows: { readonly [TKey in keyof TReadouts]: readonly [TReadouts[TKey], DeeplyAllowMatchers<Effect.Success<NoInfer<TReadouts[TKey]>>>]; }) => Effect.Effect<void, Effect.Error<TReadouts[keyof TReadouts]>, Effect.Services<TReadouts[keyof TReadouts]>>;
5
+ type NativeMatcher = Exclude<DeeplyAllowMatchers<number>, number>;
6
+ type Expected<T> = NativeMatcher | (T extends readonly unknown[] ? {
7
+ readonly [TKey in keyof T]: Expected<T[TKey]>;
8
+ } : T extends object ? {
9
+ readonly [TKey in keyof T]?: Expected<T[TKey]>;
10
+ } : T | (T extends number ? NumericBound : never));
11
+ export declare const outcomes: <TReadouts extends readonly AnyReadout[]>(rows: { readonly [TKey in keyof TReadouts]: readonly [string, () => TReadouts[TKey], Expected<Effect.Success<NoInfer<TReadouts[TKey]>>>]; }) => Effect.Effect<void, Effect.Error<TReadouts[number]>, Effect.Services<TReadouts[number]>>;
5
12
  export {};
6
13
  //# sourceMappingURL=outcomes.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"outcomes.d.ts","sourceRoot":"","sources":["../../src/server/outcomes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,KAAK,mBAAmB,EAAU,MAAM,QAAQ,CAAC;AAE1D,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAE3D,eAAO,MAAM,QAAQ,GAEN,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,oBAE/C,IAAI,iOAJ0C,CAAC"}
1
+ {"version":3,"file":"outcomes.d.ts","sourceRoot":"","sources":["../../src/server/outcomes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,KAAK,mBAAmB,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3D,KAAK,aAAa,GAAG,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;AAClE,KAAK,QAAQ,CAAC,CAAC,IACZ,aAAa,GACb,CAAC,CAAC,SAAS,SAAS,OAAO,EAAE,GAC3B;IAAE,QAAQ,EAAE,IAAI,IAAI,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;CAAE,GACjD,CAAC,SAAS,MAAM,GACf;IAAE,QAAQ,EAAE,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;CAAE,GAClD,CAAC,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC;AAErD,eAAO,MAAM,QAAQ,GAEN,SAAS,SAAS,SAAS,UAAU,EAAE,oBAE1C,IAAI,8CAA8C,SAAS,CAAC,IAAI,CAAC,qJAJnB,CAAC"}
@@ -2,12 +2,12 @@ import { Effect } from "effect";
2
2
  import { expect } from "vitest";
3
3
  export const outcomes = Effect.fn("Story.outcomes")(check);
4
4
  function* check(rows) {
5
- const actual = {};
6
- const expected = {};
7
- for (const [label, [readout, value]] of Object.entries(rows)) {
8
- actual[label] = yield* readout;
9
- expected[label] = value;
5
+ const actual = [];
6
+ const expected = [];
7
+ for (const [label, readout, value] of rows) {
8
+ actual.push({ [label]: yield* Effect.suspend(readout) });
9
+ expected.push({ [label]: value });
10
10
  }
11
- expect(actual).toEqual(expected);
11
+ expect(actual).toMatchObject(expected);
12
12
  }
13
13
  //# sourceMappingURL=outcomes.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"outcomes.js","sourceRoot":"","sources":["../../src/server/outcomes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAA4B,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI1D,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC;AAO3D,QAAQ,CAAC,CAAC,KAAK,CAAC,IAA8D;IAC7E,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAA4B,EAAE,CAAC;IAC7C,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;QAC/B,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;IACzB,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"outcomes.js","sourceRoot":"","sources":["../../src/server/outcomes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAA4B,MAAM,EAAE,MAAM,QAAQ,CAAC;AAa1D,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC;AAO3D,QAAQ,CAAC,CAAC,KAAK,CAAC,IAA+D;IAC9E,MAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,MAAM,QAAQ,GAA8B,EAAE,CAAC;IAC/C,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC"}
@@ -1,12 +1,12 @@
1
- import { Effect } from "effect";
2
- import { type ClientActivity } from "@shivaedev/contract/clientActivity.ts";
1
+ import { Effect, type Stream } from "effect";
2
+ import type { ClientActivity } from "@shivaedev/contract/clientActivity.ts";
3
3
  export type ScreenTarget = string | {
4
4
  readonly role: string;
5
5
  readonly name: string | RegExp;
6
6
  };
7
7
  export interface ScreenDriverOptions {
8
8
  readonly act?: (action: () => Promise<void>) => PromiseLike<void>;
9
- readonly pending?: (() => boolean) | ClientActivity;
9
+ readonly pending?: (() => boolean) | Stream.Stream<boolean> | ClientActivity;
10
10
  readonly root: HTMLElement | (() => HTMLElement);
11
11
  readonly tell: (line: string) => void;
12
12
  readonly timeoutMs?: number;
@@ -34,23 +34,33 @@ export declare function screenDriver(options: ScreenDriverOptions & {
34
34
  readonly pending: ClientActivity;
35
35
  }): ScreenDriver<never, never>;
36
36
  export declare function screenDriver(options: ScreenDriverOptions & {
37
- readonly pending: () => boolean;
37
+ readonly pending: (() => boolean) | Stream.Stream<boolean>;
38
38
  }): ScreenDriver;
39
39
  export declare function screenDriver(options: ScreenDriverOptions): ScreenDriver<MissingScreenPending>;
40
- declare function makeScreenActions({ root, pending, tell, act, timeoutMs }: ScreenDriverOptions): {
40
+ declare function makeScreenActions({ root, pending, tell, act, timeoutMs }: ScreenDriverOptions, dialogs: boolean): {
41
41
  accessible: (selector: string | Element) => {
42
42
  name: string;
43
43
  role: string | null;
44
44
  };
45
45
  text: (selector?: ScreenTarget) => string;
46
46
  value: (selector: ScreenTarget) => string;
47
+ find: (target: ScreenTarget, settings?: {
48
+ readonly timeout?: number;
49
+ }) => Effect.Effect<HTMLElement, never, never>;
50
+ findText: (text: string | RegExp, settings?: {
51
+ readonly timeout?: number;
52
+ }) => Effect.Effect<HTMLElement, never, never>;
53
+ gone: (target: ScreenTarget, settings?: {
54
+ readonly timeout?: number;
55
+ }) => Effect.Effect<void, never, never>;
56
+ navigatedAway: (prefix: string, settings?: {
57
+ readonly timeout?: number;
58
+ }) => Effect.Effect<void, never, never>;
47
59
  click: (selector: ScreenTarget) => Effect.Effect<void, never, never>;
48
60
  enter: (selector: ScreenTarget, value: string) => Effect.Effect<void, never, never>;
49
- find: (target: ScreenTarget, options?: {
50
- readonly timeout?: number;
51
- }) => Effect.Effect<HTMLElement, import("effect/Cause").UnknownError, never>;
52
61
  nextLiveHint: () => Effect.Effect<void, never, never> | Effect.Effect<never, MissingClientActivity, never>;
53
- settle: (options?: {
62
+ select: (selector: ScreenTarget, value: string) => Effect.Effect<void, never, never>;
63
+ settle: (settings?: {
54
64
  readonly timeoutMs?: number;
55
65
  }) => Effect.Effect<void, never, never> | Effect.Effect<never, MissingScreenPending, never>;
56
66
  submit: (selector?: ScreenTarget) => Effect.Effect<void, never, never>;
@@ -1 +1 @@
1
- {"version":3,"file":"screenDriver.d.ts","sourceRoot":"","sources":["../../src/server/screenDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAY,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,KAAK,cAAc,EAAgB,MAAM,uCAAuC,CAAC;AAO1F,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE9F,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,IAAI,CAAC,CAAC;IAClE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,GAAG,cAAc,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC5B;;;;AAED,qBAAa,oBAAqB,SAAQ,yBAAwC;IACjF,SAAkB,OAAO,4MACiL;CAC1M;;;;AAED,qBAAa,qBAAsB,SAAQ,0BAAyC;IACnF,SAAkB,OAAO,oJACyH;CAClJ;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,KAAK,EAAE,UAAU,GAAG,qBAAqB,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC,GAAG;IACjJ,YAAY,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9E,MAAM,EAAE,CAAC,SAAS,EAAE,YAAY,GAAG,WAAW,KAAK,YAAY,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;CAC/E,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC9H,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;CAAE,GAAG,YAAY,CAAC;AAC/G,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC;AAiB/F,iBAAS,iBAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAA0B,EAAE,SAAgB,EAAE,EAAE,mBAAmB;;;;;;;sBAqEjG,YAAY;sBAOZ,YAAY,SAAS,MAAM;mBApCxB,YAAY,YAAW;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;;uBA/BjD;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;wBAgFpC,YAAY;EAEhC"}
1
+ {"version":3,"file":"screenDriver.d.ts","sourceRoot":"","sources":["../../src/server/screenDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQ5E,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE9F,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,IAAI,CAAC,CAAC;IAClE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC;IAC7E,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC5B;;;;AAED,qBAAa,oBAAqB,SAAQ,yBAAwC;IACjF,SAAkB,OAAO,4MACiL;CAC1M;;;;AAED,qBAAa,qBAAsB,SAAQ,0BAAyC;IACnF,SAAkB,OAAO,oJACyH;CAClJ;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,KAAK,EAAE,UAAU,GAAG,qBAAqB,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAAE,QAAQ,GAAG,cAAc,CAAC,GAAG;IACjJ,YAAY,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9E,MAAM,EAAE,CAAC,SAAS,EAAE,YAAY,GAAG,WAAW,KAAK,YAAY,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;CAC/E,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC9H,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;CAAE,GAAG,YAAY,CAAC;AAC1I,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC;AAqB/F,iBAAS,iBAAiB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAA0B,EAAE,SAAgB,EAAE,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;;;sBAcnH,YAAY;sBAOZ,YAAY,SAAS,MAAM;;uBAW1B,YAAY,SAAS,MAAM;wBAE1B;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;wBAEhC,YAAY;EAEhC"}
@@ -1,10 +1,10 @@
1
- import { Data, Effect, Schedule } from "effect";
2
- import { isClientIdle } from "@shivaedev/contract/clientActivity.ts";
1
+ import { Data, Effect } from "effect";
3
2
  import { withLive } from "@shivaedev/test/withLive.ts";
3
+ import { screenElements } from "#adapters/screenElements.ts";
4
+ import { nextClientHint } from "#internal/nextClientHint.ts";
4
5
  import { targetName } from "#internal/screenAccessibility.ts";
5
- import { nextClientHint, waitForClient } from "#internal/screenActivity.ts";
6
- import { screenElements } from "#internal/screenElements.ts";
7
6
  import { screenReadouts } from "#internal/screenReadouts.ts";
7
+ import { screenWaits } from "#internal/screenWaits.ts";
8
8
  export class MissingScreenPending extends Data.TaggedError("MissingScreenPending") {
9
9
  message = "Cannot settle the screen without the pending option.\nhelp: Supply pending: () => boolean that reads the application's pending work and stays true until its resulting screen work is ready to render.";
10
10
  }
@@ -12,76 +12,36 @@ export class MissingClientActivity extends Data.TaggedError("MissingClientActivi
12
12
  message = "Cannot wait for a live hint without client activity.\nhelp: Supply pending: clientActivity(client) from @shivaedev/contract/clientActivity.ts.";
13
13
  }
14
14
  export function screenDriver(options) {
15
+ return makeDriver(options, true);
16
+ }
17
+ function makeDriver(options, dialogs) {
15
18
  const suppliedRoot = options.root;
16
19
  const root = typeof suppliedRoot === "function" ? suppliedRoot : () => suppliedRoot;
17
- const elements = screenElements(root);
20
+ const elements = screenElements(root, dialogs);
18
21
  return {
19
- ...makeScreenActions(options),
22
+ ...makeScreenActions(options, dialogs),
20
23
  within: (container) => {
21
24
  function scopedRoot() {
22
25
  return container instanceof HTMLElement ? elements.rendered(container, container.tagName.toLowerCase()) : elements.element(container);
23
26
  }
24
27
  scopedRoot();
25
- return screenDriver({ ...options, root: scopedRoot });
28
+ return makeDriver({ ...options, root: scopedRoot }, false);
26
29
  },
27
30
  };
28
31
  }
29
- function makeScreenActions({ root, pending, tell, act = (action) => action(), timeoutMs = 3000 }) {
32
+ function makeScreenActions({ root, pending, tell, act = (action) => action(), timeoutMs = 3000 }, dialogs) {
30
33
  const currentRoot = typeof root === "function" ? root : () => root;
31
- const elements = screenElements(currentRoot);
34
+ const elements = screenElements(currentRoot, dialogs);
35
+ const waits = screenWaits({ act, pending, root: currentRoot, tell, timeoutMs }, elements);
32
36
  function perform(line, action) {
33
37
  return Effect.promise(async () => {
34
38
  tell(line);
35
39
  await act(async () => action());
36
40
  });
37
41
  }
38
- function settle(options = {}) {
39
- if (pending === undefined) {
40
- return Effect.fail(new MissingScreenPending());
41
- }
42
- return settleWork(pending, options);
43
- }
44
- function settleWork(work, options) {
45
- const limit = options.timeoutMs ?? timeoutMs;
46
- const isIdle = typeof work === "function" ? Effect.sync(() => !work()) : Effect.map(work.current, isClientIdle);
47
- const wait = Effect.gen(function* () {
48
- tell("wait for the screen's pending work");
49
- do {
50
- yield* Effect.promise(() => act(async () => undefined));
51
- if (yield* isIdle) {
52
- tell("the screen has no pending work");
53
- return;
54
- }
55
- yield* typeof work === "function"
56
- ? Effect.promise(() => act(() => new Promise((resolve) => setTimeout(resolve, 10))))
57
- : Effect.promise((signal) => act(() => Effect.runPromise(waitForClient(work), { signal })));
58
- } while (true);
59
- });
60
- function timedOut() {
61
- return Effect.die(new Error(`The screen did not settle within ${limit}ms.\nhelp: Release held requests and check the app's pending signal and renderer act adapter.\nScreen: ${currentRoot().textContent}`));
62
- }
63
- return withLive(wait.pipe(Effect.timeoutOrElse({ duration: limit, orElse: timedOut })));
64
- }
65
- function find(target, options = {}) {
66
- if (pending !== undefined && typeof pending !== "function") {
67
- return settleWork(pending, { timeoutMs: options.timeout ?? timeoutMs }).pipe(Effect.andThen(Effect.sync(() => {
68
- tell(`find ${targetName(target)}`);
69
- return elements.element(target);
70
- })));
71
- }
72
- return withLive(Effect.gen(function* () {
73
- tell(`find ${targetName(target)}`);
74
- return yield* Effect.tryPromise(async () => {
75
- await act(async () => undefined);
76
- return elements.element(target);
77
- }).pipe(Effect.retry(Schedule.spaced(10)), Effect.timeoutOrElse({
78
- duration: options.timeout ?? timeoutMs,
79
- orElse: () => Effect.sync(() => elements.element(target)),
80
- }));
81
- }));
82
- }
83
42
  return {
84
- ...screenReadouts(currentRoot, tell),
43
+ ...screenReadouts(currentRoot, tell, dialogs),
44
+ ...waits,
85
45
  click: (selector) => perform(`click ${targetName(selector)}`, () => {
86
46
  const element = elements.element(selector);
87
47
  elements.enabled(element, selector);
@@ -89,14 +49,14 @@ function makeScreenActions({ root, pending, tell, act = (action) => action(), ti
89
49
  element.click();
90
50
  }),
91
51
  enter: (selector, value) => perform(`enter a value in ${targetName(selector)}`, () => elements.enter(selector, value)),
92
- find,
93
52
  nextLiveHint: () => {
94
- if (pending === undefined || typeof pending === "function") {
53
+ if (pending === undefined || typeof pending === "function" || !("current" in pending)) {
95
54
  return Effect.fail(new MissingClientActivity());
96
55
  }
97
56
  return withLive(Effect.sync(() => tell("wait for the next live hint")).pipe(Effect.andThen(Effect.promise((signal) => act(() => Effect.runPromise(nextClientHint(pending), { signal }))))));
98
57
  },
99
- settle,
58
+ select: (selector, value) => perform(`select ${JSON.stringify(value)} in ${targetName(selector)}`, () => elements.select(selector, value)),
59
+ settle: (settings) => pending === undefined ? Effect.fail(new MissingScreenPending()) : waits.settle(settings),
100
60
  submit: (selector = "form") => perform(`submit ${targetName(selector)}`, () => elements.form(selector).requestSubmit()),
101
61
  };
102
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"screenDriver.js","sourceRoot":"","sources":["../../src/server/screenDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"screenDriver.js","sourceRoot":"","sources":["../../src/server/screenDriver.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,10 @@
1
+ import { Duration, Effect, Stream } from "effect";
2
+ import * as TestClock from "effect/testing/TestClock";
3
+ import { type UntilOptions } from "#until.ts";
4
+ export interface WatchedClock extends TestClock.TestClock {
5
+ readonly sleeps: Stream.Stream<Duration.Duration>;
6
+ }
7
+ export declare const watchedClock: Effect.Effect<WatchedClock, never, import("effect/Scope").Scope>;
8
+ export declare function untilTimer(interval: Duration.Input, options?: Omit<UntilOptions, "name">): Effect.Effect<Duration.Duration, import("#until.ts").SignalNotReceived, never>;
9
+ export declare function passes<A, E, R>(interval: Duration.Input, then: Effect.Effect<A, E, R>): Effect.Effect<A, E, R>;
10
+ //# sourceMappingURL=watchedClock.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"watchedClock.d.ts","sourceRoot":"","sources":["../../src/server/watchedClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,WAAW,CAAC;AAErD,MAAM,WAAW,YAAa,SAAQ,SAAS,CAAC,SAAS;IACxD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;CAClD;AAED,eAAO,MAAM,YAAY,kEAuBxB,CAAC;AAMF,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,kFAOxF;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAE9G"}
@@ -0,0 +1,35 @@
1
+ import { Clock, Duration, Effect, Queue, Stream } from "effect";
2
+ import * as TestClock from "effect/testing/TestClock";
3
+ import { until } from "#until.ts";
4
+ export const watchedClock = TestClock.testClockWith((clock) => Effect.gen(function* () {
5
+ const starts = yield* Effect.acquireRelease(Queue.unbounded(), Queue.shutdown);
6
+ const sleep = clock.sleep;
7
+ const previous = Object.getOwnPropertyDescriptor(clock, "sleeps");
8
+ const watching = {
9
+ sleep: (duration) => Queue.offer(starts, duration).pipe(Effect.andThen(sleep(duration))),
10
+ sleeps: Stream.fromEffectRepeat(Queue.take(starts)),
11
+ };
12
+ // Native TestClock tracks its live clock by instance identity.
13
+ return yield* Effect.acquireRelease(Effect.sync(() => Object.assign(clock, watching)), () => Effect.sync(() => {
14
+ Object.assign(clock, { sleep });
15
+ if (previous === undefined) {
16
+ Reflect.deleteProperty(clock, "sleeps");
17
+ }
18
+ else {
19
+ Object.defineProperty(clock, "sleeps", previous);
20
+ }
21
+ }));
22
+ }));
23
+ function isWatchedClock(clock) {
24
+ return "sleeps" in clock;
25
+ }
26
+ export function untilTimer(interval, options) {
27
+ const duration = Duration.fromInputUnsafe(interval);
28
+ return Clock.clockWith((clock) => isWatchedClock(clock)
29
+ ? until(clock.sleeps, Duration.equals(duration), { ...options, name: `sleep for ${Duration.toMillis(duration)}ms` })
30
+ : Effect.die(new Error('untilTimer requires a watched TestClock.\nhelp: Use clock: "test" on storyKit or provide watchedClock as Clock.')));
31
+ }
32
+ export function passes(interval, then) {
33
+ return TestClock.adjust(interval).pipe(Effect.andThen(then));
34
+ }
35
+ //# sourceMappingURL=watchedClock.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"watchedClock.js","sourceRoot":"","sources":["../../src/server/watchedClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAqB,KAAK,EAAE,MAAM,WAAW,CAAC;AAMrD,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAC7D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAqB,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClG,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG;QAChB,KAAK,EAAE,CAAC,QAA2B,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3G,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACnD,CAAC;IACF,+DAA+D;IAC/D,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAClC,MAAM,CAAC,IAAI,CAAC,GAAiB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,EAC/D,GAAG,EAAE,CACJ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAChC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC;IACF,CAAC,CAAC,CACH,CAAC;AACH,CAAC,CAAC,CACF,CAAC;AAEF,SAAS,cAAc,CAAC,KAAkB;IACzC,OAAO,QAAQ,IAAI,KAAK,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,QAAwB,EAAE,OAAoC;IACxF,MAAM,QAAQ,GAAG,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACpD,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAChC,cAAc,CAAC,KAAK,CAAC;QACpB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,aAAa,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACpH,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC,CAC3I,CAAC;AACH,CAAC;AAED,MAAM,UAAU,MAAM,CAAU,QAAwB,EAAE,IAA4B;IACrF,OAAO,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9D,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/test-story",
3
- "version": "0.29.0",
3
+ "version": "0.31.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,16 +42,16 @@
42
42
  "README.md"
43
43
  ],
44
44
  "dependencies": {
45
- "@shivaedev/contract": "0.28.0",
45
+ "@shivaedev/contract": "0.29.0",
46
46
  "@shivaedev/test": "0.12.0",
47
- "@shivaedev/test-sql": "0.15.0",
47
+ "@shivaedev/test-sql": "0.15.1",
48
48
  "dom-accessibility-api": "0.7.1"
49
49
  },
50
50
  "devDependencies": {
51
51
  "@effect/atom-react": "4.0.6",
52
52
  "@effect/platform-node": "4.0.6",
53
53
  "@effect/vitest": "4.0.6",
54
- "@shivaedev/quality": "0.49.0",
54
+ "@shivaedev/quality": "0.51.0",
55
55
  "@types/node": "24.19.2",
56
56
  "@types/react": "19.3.0",
57
57
  "@types/react-dom": "19.3.0",
@@ -0,0 +1,33 @@
1
+ export interface NumericBound {
2
+ readonly $$typeof: symbol;
3
+ readonly asymmetricMatch: (actual: unknown) => boolean;
4
+ readonly getExpectedType: () => string;
5
+ readonly toAsymmetricMatcher: () => string;
6
+ readonly toString: () => string;
7
+ }
8
+
9
+ function bound(name: string, limit: number, compare: (actual: number, limit: number) => boolean): NumericBound {
10
+ return {
11
+ $$typeof: Symbol.for("jest.asymmetricMatcher"),
12
+ asymmetricMatch: (actual) => typeof actual === "number" && compare(actual, limit),
13
+ getExpectedType: () => "number",
14
+ toAsymmetricMatcher: () => `${name}(${limit})`,
15
+ toString: () => name,
16
+ };
17
+ }
18
+
19
+ export function lessThan(limit: number) {
20
+ return bound("lessThan", limit, (actual, value) => actual < value);
21
+ }
22
+
23
+ export function atMost(limit: number) {
24
+ return bound("atMost", limit, (actual, value) => actual <= value);
25
+ }
26
+
27
+ export function greaterThan(limit: number) {
28
+ return bound("greaterThan", limit, (actual, value) => actual > value);
29
+ }
30
+
31
+ export function atLeast(limit: number) {
32
+ return bound("atLeast", limit, (actual, value) => actual >= value);
33
+ }
@@ -1,8 +1,10 @@
1
- import { isRendered, roleElement, targetName } from "#internal/screenAccessibility.ts";
1
+ import { isRendered, targetName } from "#internal/screenAccessibility.ts";
2
+ import { screenText } from "#internal/screenText.ts";
2
3
  import type { ScreenTarget } from "#screenDriver.ts";
3
- import { screenText } from "./screenText.ts";
4
+ import { screenQueries } from "./screenQueries.ts";
4
5
 
5
- export function screenElements(root: () => HTMLElement) {
6
+ export function screenElements(root: () => HTMLElement, dialogs = true) {
7
+ const queries = screenQueries(root, dialogs);
6
8
  function rendered(found: HTMLElement, selector: string) {
7
9
  if (!isRendered(found)) {
8
10
  throw new Error(`The screen's ${selector} is not rendered.\nhelp: Reveal the target and its ancestors before acting on or reading it.`);
@@ -11,9 +13,9 @@ export function screenElements(root: () => HTMLElement) {
11
13
  }
12
14
  function element(selector: ScreenTarget) {
13
15
  if (typeof selector !== "string") {
14
- return roleElement(root(), selector);
16
+ return queries.roleElement(selector);
15
17
  }
16
- const matches = root().querySelectorAll<HTMLElement>(selector);
18
+ const matches = queries.query(selector);
17
19
  const found = matches[0];
18
20
  if (matches.length !== 1 || found === undefined) {
19
21
  throw new Error(
@@ -60,7 +62,22 @@ export function screenElements(root: () => HTMLElement) {
60
62
  return found;
61
63
  },
62
64
  input,
65
+ matches: queries.matches,
63
66
  rendered,
67
+ select: (selector: ScreenTarget, value: string) => {
68
+ const field = element(selector);
69
+ if (!(field instanceof HTMLSelectElement)) {
70
+ throw new Error(`The screen's ${targetName(selector)} is not a select.\nhelp: Select a rendered select control.`);
71
+ }
72
+ enabled(field, selector);
73
+ if (!Array.from(field.options).some((option) => option.value === value)) {
74
+ throw new Error(`The screen's ${targetName(selector)} has no option ${JSON.stringify(value)}.\nhelp: Choose an available option value.`);
75
+ }
76
+ field.focus();
77
+ field.value = value;
78
+ field.dispatchEvent(new Event("change", { bubbles: true }));
79
+ },
64
80
  text: screenText,
81
+ textElement: queries.textElement,
65
82
  };
66
83
  }
@@ -0,0 +1,14 @@
1
+ import { Effect } from "effect";
2
+
3
+ export function screenMutations(root: HTMLElement, changed: () => void) {
4
+ return Effect.acquireRelease(
5
+ Effect.sync(() => {
6
+ const observer = new MutationObserver(changed);
7
+ // Root getters can follow navigation, and visibility can change on an ancestor.
8
+ observer.observe(root.ownerDocument, { attributes: true, characterData: true, childList: true, subtree: true });
9
+ observer.observe(root, { attributes: true, characterData: true, childList: true, subtree: true });
10
+ return observer;
11
+ }),
12
+ (observer) => Effect.sync(() => observer.disconnect()),
13
+ );
14
+ }
@@ -0,0 +1,37 @@
1
+ import { Effect } from "effect";
2
+
3
+ export function screenNavigation(root: () => HTMLElement, prefix: string) {
4
+ return Effect.suspend(() => {
5
+ const location = root().ownerDocument.location;
6
+ const original = Object.getOwnPropertyDescriptor(location, "href");
7
+ const descriptor = original ?? Object.getOwnPropertyDescriptor(Object.getPrototypeOf(location), "href");
8
+ const wait = Effect.callback<void>((resume) => {
9
+ function changed() {
10
+ if (location.href.startsWith(prefix)) {
11
+ resume(Effect.void);
12
+ }
13
+ }
14
+ // happy-dom's detached window changes location without emitting a navigation event.
15
+ Object.defineProperty(location, "href", {
16
+ configurable: true,
17
+ get: () => descriptor?.get?.call(location),
18
+ set: (value: string) => {
19
+ descriptor?.set?.call(location, value);
20
+ changed();
21
+ },
22
+ });
23
+ changed();
24
+ });
25
+ return wait.pipe(
26
+ Effect.ensuring(
27
+ Effect.sync(() => {
28
+ if (original) {
29
+ Object.defineProperty(location, "href", original);
30
+ } else {
31
+ Reflect.deleteProperty(location, "href");
32
+ }
33
+ }),
34
+ ),
35
+ );
36
+ });
37
+ }