@shivaedev/test-story 0.31.4 → 0.32.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 +15 -0
- package/README.md +13 -3
- package/dist/server/domPage.d.ts +5 -0
- package/dist/server/domPage.d.ts.map +1 -0
- package/dist/server/domPage.js +8 -0
- package/dist/server/domPage.js.map +1 -0
- package/dist/server/internal/adapters/pageFetch.d.ts +3 -0
- package/dist/server/internal/adapters/pageFetch.d.ts.map +1 -0
- package/dist/server/internal/adapters/pageFetch.js +23 -0
- package/dist/server/internal/adapters/pageFetch.js.map +1 -0
- package/dist/server/internal/loadingDeadline.d.ts +3 -0
- package/dist/server/internal/loadingDeadline.d.ts.map +1 -0
- package/dist/server/internal/loadingDeadline.js +12 -0
- package/dist/server/internal/loadingDeadline.js.map +1 -0
- package/dist/server/internal/screenLoading.d.ts +2 -0
- package/dist/server/internal/screenLoading.d.ts.map +1 -0
- package/dist/server/internal/screenLoading.js +19 -0
- package/dist/server/internal/screenLoading.js.map +1 -0
- package/dist/server/internal/screenWaits.d.ts +1 -1
- package/dist/server/internal/screenWaits.d.ts.map +1 -1
- package/dist/server/internal/screenWaits.js +8 -4
- package/dist/server/internal/screenWaits.js.map +1 -1
- package/dist/server/internal/storyIt.js +1 -1
- package/dist/server/internal/storyIt.js.map +1 -1
- package/dist/server/screenDriver.d.ts +2 -1
- package/dist/server/screenDriver.d.ts.map +1 -1
- package/dist/server/screenDriver.js +2 -2
- package/dist/server/screenDriver.js.map +1 -1
- package/package.json +4 -3
- package/src/server/domPage.ts +11 -0
- package/src/server/internal/adapters/pageFetch.ts +22 -0
- package/src/server/internal/loadingDeadline.ts +21 -0
- package/src/server/internal/screenLoading.ts +21 -0
- package/src/server/internal/screenWaits.ts +14 -6
- package/src/server/internal/storyIt.ts +1 -1
- package/src/server/screenDriver.ts +6 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.32.0 - 2026-11-01
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- `domPage(url)` scopes global fetch URL resolution to an open DOM page and restores fetch and location when its scope closes. Pass its `pending` stream to `screenDriver` to wait for page fetches to resolve or reject.
|
|
8
|
+
- DOM `find` and `findText` keep waiting while the screen shows a visible loading status, `aria-busy="true"`, `Loading…` text or an open dialog. The normal 3-second budget extends to at most 10 seconds, configurable with `loadingTimeoutMs`. Explicit per-call timeouts remain hard deadlines; an idle screen keeps the usual timeout and target diagnostics.
|
|
9
|
+
|
|
10
|
+
### Fixed
|
|
11
|
+
|
|
12
|
+
- Report production imports of the `@effect/platform-node` barrel with module subpaths that avoid loading optional integrations such as redis.
|
|
13
|
+
- Recognize native Effect `catchTags` record keys regardless of the handler body while retaining diagnostics for actual nested component and hook factories.
|
|
14
|
+
- Keep a constant's matching filename valid when the constant becomes private.
|
|
15
|
+
- Name each conflicting fix and format pass's file and line/column range when `quality fix` cannot settle.
|
|
16
|
+
- Use Node platform module subpaths in package runtimes and commands instead of loading the barrel.
|
|
17
|
+
|
|
3
18
|
## 0.31.4 - 2026-11-01
|
|
4
19
|
|
|
5
20
|
### Changed
|
package/README.md
CHANGED
|
@@ -571,7 +571,7 @@ app.it(
|
|
|
571
571
|
|
|
572
572
|
Acquire hosts, workers and screens in per-story Scope so they inherit the story's Clock. An independent runtime or native HTTP handler must capture the Effect Context at acquisition, as with `HttpEffect.toWebHandlerWith(context)` or `Effect.runPromiseWith(context)`. Worker-scoped kit `layer` acquisition stays outside the per-story clock; shared services acquired there do not acquire a new clock for each story. Direct JavaScript wall-time reads are not replaced. Formatting stays with the application, including its locale and time zone.
|
|
573
573
|
|
|
574
|
-
Long jumps also expire signed-in sessions. With Better Auth, use `signInAgain(auth, userId)` from `@shivaedev/identity/server/better-auth/testing.ts` to mint a fresh session on the caller’s Clock for the same user. Replace the visitor’s headers, or pass its returned cookies to `seedCookies` for a browser. The starter’s app kit exposes `signsInAgain(name)`
|
|
574
|
+
Long jumps also expire signed-in sessions. With Better Auth, use `signInAgain(auth, userId)` from `@shivaedev/identity/server/better-auth/testing.ts` to mint a fresh session on the caller’s Clock for the same user. Replace the visitor’s headers, or pass its returned cookies to `seedCookies` for a browser. The starter’s app kit exposes `signsInAgain(name)` for this step. Its TestClock starts at the present by default so Better Auth’s wall-clock endpoints accept minted sessions; an explicit story `clock` still takes precedence.
|
|
575
575
|
|
|
576
576
|
A live-clock kit still runs on real time when a story omits the override.
|
|
577
577
|
|
|
@@ -832,6 +832,15 @@ pnpm add --save-dev react react-dom @effect/atom-react @types/react @types/react
|
|
|
832
832
|
|
|
833
833
|
### Driving a screen
|
|
834
834
|
|
|
835
|
+
Acquire `domPage(url)` from `@shivaedev/test-story/server/domPage.ts` in the DOM kit's `create` hook before mounting a page that calls global `fetch`. While its Scope is open, string URLs resolve against the window's current address, including after navigation. Native `URL` and `Request` inputs and fetch options pass through to the existing Node transport. Closing the Scope restores global fetch and the previous page address; outside it, relative global fetch URLs keep Node's behavior. This helper uses the single shared window, so acquire and close pages serially.
|
|
836
|
+
|
|
837
|
+
```ts
|
|
838
|
+
const page = yield* domPage(`${host.url}/notes`);
|
|
839
|
+
const driver = screenDriver({ act, pending: page.pending, root: view.container, tell: story.tell });
|
|
840
|
+
```
|
|
841
|
+
|
|
842
|
+
Pass the page's native `pending` stream to the screen driver to wait for global fetches to resolve or reject, including requests sent by `useBrowserErrors`. After a page action, `yield* driver.settle()` waits for every outstanding fetch without sleeping. This counts fetch completion at response headers, not consumption of a streaming response body, and does not supply the document cookie jar; keep using `domFetch` for clients that need that document transport.
|
|
843
|
+
|
|
835
844
|
`screenDriver(options)` supplies DOM verbs and readouts for a kit's `verbs` hook. Give it the mounted `root` (or a getter for a root that navigation replaces) and the story's `tell`. The `pending` option is required for `settle()`; `nextLiveHint()` requires client activity in that option. DOM actions, lookups and synchronous readouts work without it. Without `pending`, `settle()` fails immediately in its error channel with `MissingScreenPending`, exported from `server/screenDriver.ts`, even when the screen is idle.
|
|
836
845
|
|
|
837
846
|
To use `settle()`, supply a native `Stream<boolean>` as `pending`, emitting the current pending state on subscription and every subsequent change. For example, a package that tracks work in a native `SubscriptionRef<boolean>` supplies `pending: SubscriptionRef.changes(requests.pending)`. For a native boolean atom, use `AtomRegistry.toStream(view.registry, pendingAtom)` from `effect/reactivity/AtomRegistry`. Keep pending true until the resulting screen work is ready to render. Settlement keeps its `Effect<void>` type with no typed errors and waits until the stream emits false; DOM mutations also wake the driver, and repeated identical renders never count as completion. `find()` waits for pending work to finish and its target to appear, reacting to both signals and mutations.
|
|
@@ -872,9 +881,9 @@ This form of `settle()` observes client activity changes and flushes the rendere
|
|
|
872
881
|
|
|
873
882
|
`click`, `enter`, `select`, `submit`, `text` and `value` also accept a `ScreenTarget` object such as `{ role: "button", name: "Save" }` or `{ role: "textbox", name: /email/i }`. The role and computed accessible name must match exactly when strings are used; regular expressions match the name. An alert without an accessible name can instead match its visible text. Like Testing Library's role queries, these targets exclude hidden elements, including `aria-hidden` ancestors. Missing or ambiguous targets fail with the requested role, name and the visible candidates on screen. Narration names the role and name instead of a selector.
|
|
874
883
|
|
|
875
|
-
`find(target, { timeout }?)` returns an Effect that waits for exactly one matching rendered element and returns that `HTMLElement`. It accepts the same selectors and role/name targets as the actions
|
|
884
|
+
`find(target, { timeout }?)` returns an Effect that waits for exactly one matching rendered element and returns that `HTMLElement`. It accepts the same selectors and role/name targets as the actions and narrates the lookup. Its normal live-time budget is 3 seconds, configurable with the driver's `timeoutMs`. While the screen shows a rendered, accessible loading indicator (`role="status"`, `aria-busy="true"`, `Loading…` or `Loading...` text) or an open dialog, the default wait extends to a total of 10 seconds, configurable with `loadingTimeoutMs`. This lets screen transitions take longer on loaded runners. The root and portalled dialogs count; `within` keeps loading detection inside its scope. Once the normal budget has passed, an idle screen without the target fails immediately with the usual target diagnostics, including visible candidates for role/name targets. A per-call `timeout` sets a hard deadline in milliseconds, including while loading.
|
|
876
885
|
|
|
877
|
-
`findText(text, { timeout }?)` waits for one visible element with matching text, returning the deepest matching `HTMLElement`. Strings match exactly after whitespace normalization; regular expressions also work. Inline markup stays joined and hidden text is excluded. Separate visible matches are ambiguous, and a timeout names the text being awaited.
|
|
886
|
+
`findText(text, { timeout }?)` waits for one visible element with matching text, returning the deepest matching `HTMLElement`. It shares `find`'s loading-aware budget and explicit timeout behavior. Strings match exactly after whitespace normalization; regular expressions also work. Inline markup stays joined and hidden text is excluded. Separate visible matches are ambiguous, and a timeout names the text being awaited.
|
|
878
887
|
|
|
879
888
|
`gone(target, { timeout }?)` waits until no rendered element matches the selector or role/name target. It accepts an already absent target and observes removal and hiding through DOM mutations, without polling. Like `find`, both waits also observe a supplied pending signal and wait until it is idle.
|
|
880
889
|
|
|
@@ -917,6 +926,7 @@ Import each module with the prefix `@shivaedev/test-story/`; there is no root en
|
|
|
917
926
|
| `server/watchedClock.ts` | `watchedClock`, `WatchedClock`, `untilTimer(interval, options?)`, `passes(interval, then)` |
|
|
918
927
|
| `server/browserReads.ts` | `browserReads(options)`, `BrowserReadsOptions`, `BrowserRead`, `BrowserSubscription` |
|
|
919
928
|
| `server/domFetch.ts` | `domFetch(baseUrl, target?)` |
|
|
929
|
+
| `server/domPage.ts` | `domPage(url)` with a scoped global fetch and a `pending` stream |
|
|
920
930
|
| `server/seedCookies.ts` | `seedCookies(cookies, target?)`, `DomCookie` |
|
|
921
931
|
| `server/routeOutbound.ts` | `routeOutbound(routes)` |
|
|
922
932
|
| `server/screenDriver.ts` | `screenDriver(options)`, `ScreenDriverOptions`, `ScreenDriver`, `ScreenTarget`, `MissingScreenPending` |
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"domPage.d.ts","sourceRoot":"","sources":["../../src/server/domPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,QAAQ,CAAC;AAGjD,eAAO,MAAM,OAAO;;uCAOlB,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Effect, SubscriptionRef } from "effect";
|
|
2
|
+
import { pageFetch } from "#internal/adapters/pageFetch.ts";
|
|
3
|
+
export const domPage = Effect.fn("BrowserStory.domPage")(function* (url) {
|
|
4
|
+
const pending = yield* SubscriptionRef.make(false);
|
|
5
|
+
yield* Effect.acquireRelease(Effect.sync(() => pageFetch(url, (busy) => SubscriptionRef.set(pending, busy))), (restore) => Effect.sync(restore));
|
|
6
|
+
return { pending: SubscriptionRef.changes(pending) };
|
|
7
|
+
});
|
|
8
|
+
//# sourceMappingURL=domPage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"domPage.js","sourceRoot":"","sources":["../../src/server/domPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAW;IAC9E,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAC/E,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CACjC,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;AACtD,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pageFetch.d.ts","sourceRoot":"","sources":["../../../../src/server/internal/adapters/pageFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAmBrF"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
export function pageFetch(url, pending) {
|
|
3
|
+
const fetch = globalThis.fetch;
|
|
4
|
+
const previousUrl = window.location.href;
|
|
5
|
+
window.location.href = url;
|
|
6
|
+
let active = 0;
|
|
7
|
+
globalThis.fetch = async (input, init) => {
|
|
8
|
+
active += 1;
|
|
9
|
+
Effect.runSync(pending(true));
|
|
10
|
+
try {
|
|
11
|
+
return await fetch(typeof input === "string" ? new URL(input, window.location.href) : input, init);
|
|
12
|
+
}
|
|
13
|
+
finally {
|
|
14
|
+
active -= 1;
|
|
15
|
+
Effect.runSync(pending(active > 0));
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
return () => {
|
|
19
|
+
globalThis.fetch = fetch;
|
|
20
|
+
window.location.href = previousUrl;
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=pageFetch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pageFetch.js","sourceRoot":"","sources":["../../../../src/server/internal/adapters/pageFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,UAAU,SAAS,CAAC,GAAW,EAAE,OAA+C;IACrF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;IAC/B,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;IACzC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;IAC3B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,UAAU,CAAC,KAAK,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACxC,MAAM,IAAI,CAAC,CAAC;QACZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC;YACJ,OAAO,MAAM,KAAK,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpG,CAAC;gBAAS,CAAC;YACV,MAAM,IAAI,CAAC,CAAC;YACZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;IACF,CAAC,CAAC;IACF,OAAO,GAAG,EAAE;QACX,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;QACzB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC;IACpC,CAAC,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
export declare const loadingDeadline: <A>(root: () => HTMLElement, loading: () => boolean, timeout: number, loadingTimeout: number, expired: () => Effect.Effect<A>) => Effect.Effect<A, never, never>;
|
|
3
|
+
//# sourceMappingURL=loadingDeadline.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadingDeadline.d.ts","sourceRoot":"","sources":["../../../src/server/internal/loadingDeadline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvC,eAAO,MAAM,eAAe,GAAgC,CAAC,cAChD,WAAW,iBACR,OAAO,0DAGP,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,mCAY9B,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Clock, Effect } from "effect";
|
|
2
|
+
import { waitForScreen } from "./waitForScreen.js";
|
|
3
|
+
export const loadingDeadline = Effect.fnUntraced(function* (root, loading, timeout, loadingTimeout, expired) {
|
|
4
|
+
const started = yield* Clock.currentTimeMillis;
|
|
5
|
+
yield* Effect.sleep(timeout);
|
|
6
|
+
const remaining = loadingTimeout - ((yield* Clock.currentTimeMillis) - started);
|
|
7
|
+
if (!loading() || remaining <= 0) {
|
|
8
|
+
return yield* expired();
|
|
9
|
+
}
|
|
10
|
+
return yield* waitForScreen({ act: (action) => action(), pending: undefined, root }, Effect.suspend(() => (loading() ? Effect.fail(undefined) : Effect.void))).pipe(Effect.andThen(expired), Effect.timeoutOrElse({ duration: remaining, orElse: expired }));
|
|
11
|
+
});
|
|
12
|
+
//# sourceMappingURL=loadingDeadline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadingDeadline.js","sourceRoot":"","sources":["../../../src/server/internal/loadingDeadline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACzD,IAAuB,EACvB,OAAsB,EACtB,OAAe,EACf,cAAsB,EACtB,OAA+B;IAE/B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;IAC/C,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,SAAS,GAAG,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,CAAC;IAChF,IAAI,CAAC,OAAO,EAAE,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IACD,OAAO,KAAK,CAAC,CAAC,aAAa,CAC1B,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,EACvD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CACxE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;AACjG,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"screenLoading.d.ts","sourceRoot":"","sources":["../../../src/server/internal/screenLoading.ts"],"names":[],"mappings":"AAKA,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,WAAW,EAAE,OAAO,EAAE,OAAO,iBAetE"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isInaccessible } from "dom-accessibility-api";
|
|
2
|
+
import { screenQueries } from "#adapters/screenQueries.ts";
|
|
3
|
+
import { isRendered } from "./screenAccessibility.js";
|
|
4
|
+
import { screenText } from "./screenText.js";
|
|
5
|
+
export function screenLoading(root, dialogs) {
|
|
6
|
+
const queries = screenQueries(root, dialogs);
|
|
7
|
+
const indicators = '[role~="status"],[aria-busy="true"],dialog[open],[role~="dialog"],[role~="alertdialog"]';
|
|
8
|
+
function visible(element) {
|
|
9
|
+
return element.isConnected && element.closest("dialog:not([open])") === null && isRendered(element) && !isInaccessible(element);
|
|
10
|
+
}
|
|
11
|
+
return () => {
|
|
12
|
+
const current = root();
|
|
13
|
+
if ([current, ...queries.query(indicators)].some((element) => element.matches(indicators) && visible(element))) {
|
|
14
|
+
return true;
|
|
15
|
+
}
|
|
16
|
+
return [current, ...queries.query("*")].some((element) => visible(element) && /^Loading(?:…|\.{3})$/iu.test(screenText(element).replace(/\s+/gu, " ").trim()));
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=screenLoading.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"screenLoading.js","sourceRoot":"","sources":["../../../src/server/internal/screenLoading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,UAAU,aAAa,CAAC,IAAuB,EAAE,OAAgB;IACtE,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,yFAAyF,CAAC;IAC7G,SAAS,OAAO,CAAC,OAAoB;QACpC,OAAO,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,IAAI,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjI,CAAC;IACD,OAAO,GAAG,EAAE;QACX,MAAM,OAAO,GAAG,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YAChH,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAC3C,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,wBAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAChH,CAAC;IACH,CAAC,CAAC;AACH,CAAC"}
|
|
@@ -7,7 +7,7 @@ type Options = Omit<ScreenDriverOptions, "act" | "root" | "timeoutMs" | "pending
|
|
|
7
7
|
readonly root: () => HTMLElement;
|
|
8
8
|
readonly timeoutMs: number;
|
|
9
9
|
};
|
|
10
|
-
export declare function screenWaits(options: Options, elements: ReturnType<typeof screenElements
|
|
10
|
+
export declare function screenWaits(options: Options, elements: ReturnType<typeof screenElements>, dialogs: boolean): {
|
|
11
11
|
find: (target: ScreenTarget, settings?: {
|
|
12
12
|
readonly timeout?: number;
|
|
13
13
|
}) => Effect.Effect<HTMLElement, never, never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenWaits.d.ts","sourceRoot":"","sources":["../../../src/server/internal/screenWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"screenWaits.d.ts","sourceRoot":"","sources":["../../../src/server/internal/screenWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAM1E,KAAK,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,KAAK,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC,GAAG;IACpF,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,MAAM,WAAW,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO;IAsBzG,IAAI,WAAW,YAAY,aAAY;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAYpE,QAAQ,SAAS,MAAM,GAAG,MAAM,aAAY;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAezE,IAAI,WAAW,YAAY,aAAY;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAmBpE,aAAa,WAAW,MAAM,aAAY;QAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAgBvE,MAAM,cAAa;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;EAWnD"}
|
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { withLive } from "@shivaedev/test/withLive.ts";
|
|
3
3
|
import { screenNavigation } from "#adapters/screenNavigation.ts";
|
|
4
|
+
import { loadingDeadline } from "./loadingDeadline.js";
|
|
4
5
|
import { targetName } from "./screenAccessibility.js";
|
|
6
|
+
import { screenLoading } from "./screenLoading.js";
|
|
5
7
|
import { waitForScreen } from "./waitForScreen.js";
|
|
6
|
-
export function screenWaits(options, elements) {
|
|
8
|
+
export function screenWaits(options, elements, dialogs) {
|
|
7
9
|
const { act, pending, root, tell, timeoutMs } = options;
|
|
10
|
+
const loading = screenLoading(root, dialogs);
|
|
8
11
|
function unsettled(limit) {
|
|
9
12
|
return 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: ${root().textContent}`);
|
|
10
13
|
}
|
|
11
14
|
function wait(line, read, timeout, expired) {
|
|
12
|
-
|
|
15
|
+
const limit = timeout ?? timeoutMs;
|
|
16
|
+
return withLive(Effect.sync(() => tell(line)).pipe(Effect.andThen(Effect.raceFirst(waitForScreen({ act, pending, root }, Effect.try(read)), loadingDeadline(root, loading, limit, timeout === undefined ? (options.loadingTimeoutMs ?? 10_000) : limit, expired)))));
|
|
13
17
|
}
|
|
14
18
|
return {
|
|
15
19
|
find: (target, settings = {}) => {
|
|
16
20
|
const limit = settings.timeout ?? timeoutMs;
|
|
17
|
-
return wait(`find ${targetName(target)}`, () => elements.element(target),
|
|
21
|
+
return wait(`find ${targetName(target)}`, () => elements.element(target), settings.timeout, () => {
|
|
18
22
|
const lookup = Effect.sync(() => elements.element(target));
|
|
19
23
|
return pending === undefined ? lookup : lookup.pipe(Effect.andThen(Effect.die(unsettled(limit))));
|
|
20
24
|
});
|
|
@@ -22,7 +26,7 @@ export function screenWaits(options, elements) {
|
|
|
22
26
|
findText: (text, settings = {}) => {
|
|
23
27
|
const name = typeof text === "string" ? JSON.stringify(text) : String(text);
|
|
24
28
|
const limit = settings.timeout ?? timeoutMs;
|
|
25
|
-
return wait(`find text ${name}`, () => elements.textElement(text),
|
|
29
|
+
return wait(`find text ${name}`, () => elements.textElement(text), settings.timeout, () => Effect.sync(() => elements.textElement(text)).pipe(Effect.andThen(Effect.die(new Error(`The screen did not finish waiting for text ${name} within ${limit}ms.\nhelp: Check the app's pending signal.`)))));
|
|
26
30
|
},
|
|
27
31
|
gone: (target, settings = {}) => {
|
|
28
32
|
const limit = settings.timeout ?? timeoutMs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenWaits.js","sourceRoot":"","sources":["../../../src/server/internal/screenWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AASnD,MAAM,UAAU,WAAW,CAAC,OAAgB,EAAE,QAA2C;
|
|
1
|
+
{"version":3,"file":"screenWaits.js","sourceRoot":"","sources":["../../../src/server/internal/screenWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AASnD,MAAM,UAAU,WAAW,CAAC,OAAgB,EAAE,QAA2C,EAAE,OAAgB;IAC1G,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACxD,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,SAAS,SAAS,CAAC,KAAa;QAC/B,OAAO,IAAI,KAAK,CACf,oCAAoC,KAAK,0GAA0G,IAAI,EAAE,CAAC,WAAW,EAAE,CACvK,CAAC;IACH,CAAC;IACD,SAAS,IAAI,CAAI,IAAY,EAAE,IAAa,EAAE,OAA2B,EAAE,OAA+B;QACzG,MAAM,KAAK,GAAG,OAAO,IAAI,SAAS,CAAC;QACnC,OAAO,QAAQ,CACd,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACjC,MAAM,CAAC,OAAO,CACb,MAAM,CAAC,SAAS,CACf,aAAa,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EACvD,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CACpH,CACD,CACD,CACD,CAAC;IACH,CAAC;IACD,OAAO;QACN,IAAI,EAAE,CAAC,MAAoB,EAAE,QAAQ,GAAkC,EAAE,EAAE,EAAE;YAC5E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC;YAC5C,OAAO,IAAI,CACV,QAAQ,UAAU,CAAC,MAAM,CAAC,EAAE,EAC5B,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAC9B,QAAQ,CAAC,OAAO,EAChB,GAAG,EAAE;gBACJ,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC3D,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnG,CAAC,CACD,CAAC;QACH,CAAC;QACD,QAAQ,EAAE,CAAC,IAAqB,EAAE,QAAQ,GAAkC,EAAE,EAAE,EAAE;YACjF,MAAM,IAAI,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC;YAC5C,OAAO,IAAI,CACV,aAAa,IAAI,EAAE,EACnB,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAChC,QAAQ,CAAC,OAAO,EAChB,GAAG,EAAE,CACJ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACjD,MAAM,CAAC,OAAO,CACb,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,8CAA8C,IAAI,WAAW,KAAK,4CAA4C,CAAC,CAAC,CACrI,CACD,CACF,CAAC;QACH,CAAC;QACD,IAAI,EAAE,CAAC,MAAoB,EAAE,QAAQ,GAAkC,EAAE,EAAE,EAAE;YAC5E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC;YAC5C,SAAS,SAAS;gBACjB,OAAO,IAAI,KAAK,CACf,2BAA2B,UAAU,CAAC,MAAM,CAAC,WAAW,KAAK,4EAA4E,CACzI,CAAC;YACH,CAAC;YACD,OAAO,QAAQ,CACd,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAC1E,MAAM,CAAC,OAAO,CACb,aAAa,CACZ,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,EACtB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CACtG,CACD,EACD,MAAM,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAChF,CACD,CAAC;QACH,CAAC;QACD,aAAa,EAAE,CAAC,MAAc,EAAE,QAAQ,GAAkC,EAAE,EAAE,EAAE;YAC/E,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC;YAC5C,SAAS,QAAQ;gBAChB,OAAO,MAAM,CAAC,GAAG,CAChB,IAAI,KAAK,CACR,kCAAkC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,KAAK,yEAAyE,IAAI,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,EAAE,CACrL,CACD,CAAC;YACH,CAAC;YACD,OAAO,QAAQ,CACd,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAC/E,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAC9C,MAAM,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAC3D,CACD,CAAC;QACH,CAAC;QACD,MAAM,EAAE,CAAC,QAAQ,GAAoC,EAAE,EAAE,EAAE;YAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,IAAI,SAAS,CAAC;YAC9C,OAAO,QAAQ,CACd,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,CAAC,IAAI,CACjE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAClE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC,EAC3E,MAAM,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CACrF,CACD,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
|
|
2
2
|
import { Effect, Layer } from "effect";
|
|
3
3
|
import * as TestCrypto from "effect/testing/TestCrypto";
|
|
4
4
|
import { makeEffectIt } from "@shivaedev/test/makeEffectIt.ts";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storyIt.js","sourceRoot":"","sources":["../../../src/server/internal/storyIt.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"storyIt.js","sourceRoot":"","sources":["../../../src/server/internal/storyIt.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export type ScreenTarget = string | {
|
|
|
6
6
|
};
|
|
7
7
|
export interface ScreenDriverOptions {
|
|
8
8
|
readonly act?: (action: () => Promise<void>) => PromiseLike<void>;
|
|
9
|
+
readonly loadingTimeoutMs?: number;
|
|
9
10
|
readonly pending?: (() => boolean) | Stream.Stream<boolean> | ClientActivity;
|
|
10
11
|
readonly root: HTMLElement | (() => HTMLElement);
|
|
11
12
|
readonly tell: (line: string) => void;
|
|
@@ -37,7 +38,7 @@ export declare function screenDriver(options: ScreenDriverOptions & {
|
|
|
37
38
|
readonly pending: (() => boolean) | Stream.Stream<boolean>;
|
|
38
39
|
}): ScreenDriver;
|
|
39
40
|
export declare function screenDriver(options: ScreenDriverOptions): ScreenDriver<MissingScreenPending>;
|
|
40
|
-
declare function makeScreenActions({ root, pending, tell, act, timeoutMs }: ScreenDriverOptions, dialogs: boolean): {
|
|
41
|
+
declare function makeScreenActions({ root, pending, tell, act, timeoutMs, loadingTimeoutMs }: ScreenDriverOptions, dialogs: boolean): {
|
|
41
42
|
accessible: (selector: string | Element) => {
|
|
42
43
|
name: string;
|
|
43
44
|
role: string | null;
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,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,CACzB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAA0B,EAAE,SAAgB,EAAE,gBAAyB,EAAE,EAAE,mBAAmB,EACrH,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;;;sBAeG,YAAY;sBAOZ,YAAY,SAAS,MAAM;;uBAW1B,YAAY,SAAS,MAAM;wBAE1B;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;wBAEhC,YAAY;EAEhC"}
|
|
@@ -29,10 +29,10 @@ function makeDriver(options, dialogs) {
|
|
|
29
29
|
},
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
|
-
function makeScreenActions({ root, pending, tell, act = (action) => action(), timeoutMs = 3000 }, dialogs) {
|
|
32
|
+
function makeScreenActions({ root, pending, tell, act = (action) => action(), timeoutMs = 3000, loadingTimeoutMs = 10_000 }, dialogs) {
|
|
33
33
|
const currentRoot = typeof root === "function" ? root : () => root;
|
|
34
34
|
const elements = screenElements(currentRoot, dialogs);
|
|
35
|
-
const waits = screenWaits({ act, pending, root: currentRoot, tell, timeoutMs }, elements);
|
|
35
|
+
const waits = screenWaits({ act, loadingTimeoutMs, pending, root: currentRoot, tell, timeoutMs }, elements, dialogs);
|
|
36
36
|
function perform(line, action) {
|
|
37
37
|
return Effect.promise(async () => {
|
|
38
38
|
tell(line);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenDriver.js","sourceRoot":"","sources":["../../src/server/screenDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"screenDriver.js","sourceRoot":"","sources":["../../src/server/screenDriver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/test-story",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.32.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": {
|
|
@@ -44,14 +44,15 @@
|
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@shivaedev/contract": "0.30.1",
|
|
46
46
|
"@shivaedev/test": "0.12.0",
|
|
47
|
-
"@shivaedev/test-sql": "0.
|
|
47
|
+
"@shivaedev/test-sql": "0.16.0",
|
|
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.
|
|
54
|
+
"@shivaedev/quality": "0.54.0",
|
|
55
|
+
"@shivaedev/react": "0.32.0",
|
|
55
56
|
"@types/node": "24.19.2",
|
|
56
57
|
"@types/react": "19.3.0",
|
|
57
58
|
"@types/react-dom": "19.3.0",
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Effect, SubscriptionRef } from "effect";
|
|
2
|
+
import { pageFetch } from "#internal/adapters/pageFetch.ts";
|
|
3
|
+
|
|
4
|
+
export const domPage = Effect.fn("BrowserStory.domPage")(function* (url: string) {
|
|
5
|
+
const pending = yield* SubscriptionRef.make(false);
|
|
6
|
+
yield* Effect.acquireRelease(
|
|
7
|
+
Effect.sync(() => pageFetch(url, (busy) => SubscriptionRef.set(pending, busy))),
|
|
8
|
+
(restore) => Effect.sync(restore),
|
|
9
|
+
);
|
|
10
|
+
return { pending: SubscriptionRef.changes(pending) };
|
|
11
|
+
});
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
|
|
3
|
+
export function pageFetch(url: string, pending: (busy: boolean) => Effect.Effect<void>) {
|
|
4
|
+
const fetch = globalThis.fetch;
|
|
5
|
+
const previousUrl = window.location.href;
|
|
6
|
+
window.location.href = url;
|
|
7
|
+
let active = 0;
|
|
8
|
+
globalThis.fetch = async (input, init) => {
|
|
9
|
+
active += 1;
|
|
10
|
+
Effect.runSync(pending(true));
|
|
11
|
+
try {
|
|
12
|
+
return await fetch(typeof input === "string" ? new URL(input, window.location.href) : input, init);
|
|
13
|
+
} finally {
|
|
14
|
+
active -= 1;
|
|
15
|
+
Effect.runSync(pending(active > 0));
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
return () => {
|
|
19
|
+
globalThis.fetch = fetch;
|
|
20
|
+
window.location.href = previousUrl;
|
|
21
|
+
};
|
|
22
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Clock, Effect } from "effect";
|
|
2
|
+
import { waitForScreen } from "./waitForScreen.ts";
|
|
3
|
+
|
|
4
|
+
export const loadingDeadline = Effect.fnUntraced(function* <A>(
|
|
5
|
+
root: () => HTMLElement,
|
|
6
|
+
loading: () => boolean,
|
|
7
|
+
timeout: number,
|
|
8
|
+
loadingTimeout: number,
|
|
9
|
+
expired: () => Effect.Effect<A>,
|
|
10
|
+
) {
|
|
11
|
+
const started = yield* Clock.currentTimeMillis;
|
|
12
|
+
yield* Effect.sleep(timeout);
|
|
13
|
+
const remaining = loadingTimeout - ((yield* Clock.currentTimeMillis) - started);
|
|
14
|
+
if (!loading() || remaining <= 0) {
|
|
15
|
+
return yield* expired();
|
|
16
|
+
}
|
|
17
|
+
return yield* waitForScreen(
|
|
18
|
+
{ act: (action) => action(), pending: undefined, root },
|
|
19
|
+
Effect.suspend(() => (loading() ? Effect.fail(undefined) : Effect.void)),
|
|
20
|
+
).pipe(Effect.andThen(expired), Effect.timeoutOrElse({ duration: remaining, orElse: expired }));
|
|
21
|
+
});
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { isInaccessible } from "dom-accessibility-api";
|
|
2
|
+
import { screenQueries } from "#adapters/screenQueries.ts";
|
|
3
|
+
import { isRendered } from "./screenAccessibility.ts";
|
|
4
|
+
import { screenText } from "./screenText.ts";
|
|
5
|
+
|
|
6
|
+
export function screenLoading(root: () => HTMLElement, dialogs: boolean) {
|
|
7
|
+
const queries = screenQueries(root, dialogs);
|
|
8
|
+
const indicators = '[role~="status"],[aria-busy="true"],dialog[open],[role~="dialog"],[role~="alertdialog"]';
|
|
9
|
+
function visible(element: HTMLElement) {
|
|
10
|
+
return element.isConnected && element.closest("dialog:not([open])") === null && isRendered(element) && !isInaccessible(element);
|
|
11
|
+
}
|
|
12
|
+
return () => {
|
|
13
|
+
const current = root();
|
|
14
|
+
if ([current, ...queries.query(indicators)].some((element) => element.matches(indicators) && visible(element))) {
|
|
15
|
+
return true;
|
|
16
|
+
}
|
|
17
|
+
return [current, ...queries.query("*")].some(
|
|
18
|
+
(element) => visible(element) && /^Loading(?:…|\.{3})$/iu.test(screenText(element).replace(/\s+/gu, " ").trim()),
|
|
19
|
+
);
|
|
20
|
+
};
|
|
21
|
+
}
|
|
@@ -3,7 +3,9 @@ import { withLive } from "@shivaedev/test/withLive.ts";
|
|
|
3
3
|
import type { screenElements } from "#adapters/screenElements.ts";
|
|
4
4
|
import { screenNavigation } from "#adapters/screenNavigation.ts";
|
|
5
5
|
import type { ScreenDriverOptions, ScreenTarget } from "#screenDriver.ts";
|
|
6
|
+
import { loadingDeadline } from "./loadingDeadline.ts";
|
|
6
7
|
import { targetName } from "./screenAccessibility.ts";
|
|
8
|
+
import { screenLoading } from "./screenLoading.ts";
|
|
7
9
|
import { waitForScreen } from "./waitForScreen.ts";
|
|
8
10
|
|
|
9
11
|
type Options = Omit<ScreenDriverOptions, "act" | "root" | "timeoutMs" | "pending"> & {
|
|
@@ -13,18 +15,24 @@ type Options = Omit<ScreenDriverOptions, "act" | "root" | "timeoutMs" | "pending
|
|
|
13
15
|
readonly timeoutMs: number;
|
|
14
16
|
};
|
|
15
17
|
|
|
16
|
-
export function screenWaits(options: Options, elements: ReturnType<typeof screenElements
|
|
18
|
+
export function screenWaits(options: Options, elements: ReturnType<typeof screenElements>, dialogs: boolean) {
|
|
17
19
|
const { act, pending, root, tell, timeoutMs } = options;
|
|
20
|
+
const loading = screenLoading(root, dialogs);
|
|
18
21
|
function unsettled(limit: number) {
|
|
19
22
|
return new Error(
|
|
20
23
|
`The screen did not settle within ${limit}ms.\nhelp: Release held requests and check the app's pending signal and renderer act adapter.\nScreen: ${root().textContent}`,
|
|
21
24
|
);
|
|
22
25
|
}
|
|
23
|
-
function wait<A>(line: string, read: () => A, timeout: number, expired: () => Effect.Effect<A>) {
|
|
26
|
+
function wait<A>(line: string, read: () => A, timeout: number | undefined, expired: () => Effect.Effect<A>) {
|
|
27
|
+
const limit = timeout ?? timeoutMs;
|
|
24
28
|
return withLive(
|
|
25
29
|
Effect.sync(() => tell(line)).pipe(
|
|
26
|
-
Effect.andThen(
|
|
27
|
-
|
|
30
|
+
Effect.andThen(
|
|
31
|
+
Effect.raceFirst(
|
|
32
|
+
waitForScreen({ act, pending, root }, Effect.try(read)),
|
|
33
|
+
loadingDeadline(root, loading, limit, timeout === undefined ? (options.loadingTimeoutMs ?? 10_000) : limit, expired),
|
|
34
|
+
),
|
|
35
|
+
),
|
|
28
36
|
),
|
|
29
37
|
);
|
|
30
38
|
}
|
|
@@ -34,7 +42,7 @@ export function screenWaits(options: Options, elements: ReturnType<typeof screen
|
|
|
34
42
|
return wait(
|
|
35
43
|
`find ${targetName(target)}`,
|
|
36
44
|
() => elements.element(target),
|
|
37
|
-
|
|
45
|
+
settings.timeout,
|
|
38
46
|
() => {
|
|
39
47
|
const lookup = Effect.sync(() => elements.element(target));
|
|
40
48
|
return pending === undefined ? lookup : lookup.pipe(Effect.andThen(Effect.die(unsettled(limit))));
|
|
@@ -47,7 +55,7 @@ export function screenWaits(options: Options, elements: ReturnType<typeof screen
|
|
|
47
55
|
return wait(
|
|
48
56
|
`find text ${name}`,
|
|
49
57
|
() => elements.textElement(text),
|
|
50
|
-
|
|
58
|
+
settings.timeout,
|
|
51
59
|
() =>
|
|
52
60
|
Effect.sync(() => elements.textElement(text)).pipe(
|
|
53
61
|
Effect.andThen(
|
|
@@ -11,6 +11,7 @@ export type ScreenTarget = string | { readonly role: string; readonly name: stri
|
|
|
11
11
|
|
|
12
12
|
export interface ScreenDriverOptions {
|
|
13
13
|
readonly act?: (action: () => Promise<void>) => PromiseLike<void>;
|
|
14
|
+
readonly loadingTimeoutMs?: number;
|
|
14
15
|
readonly pending?: (() => boolean) | Stream.Stream<boolean> | ClientActivity;
|
|
15
16
|
readonly root: HTMLElement | (() => HTMLElement);
|
|
16
17
|
readonly tell: (line: string) => void;
|
|
@@ -56,10 +57,13 @@ function makeDriver(options: ScreenDriverOptions, dialogs: boolean): ScreenDrive
|
|
|
56
57
|
};
|
|
57
58
|
}
|
|
58
59
|
|
|
59
|
-
function makeScreenActions(
|
|
60
|
+
function makeScreenActions(
|
|
61
|
+
{ root, pending, tell, act = (action) => action(), timeoutMs = 3000, loadingTimeoutMs = 10_000 }: ScreenDriverOptions,
|
|
62
|
+
dialogs: boolean,
|
|
63
|
+
) {
|
|
60
64
|
const currentRoot = typeof root === "function" ? root : () => root;
|
|
61
65
|
const elements = screenElements(currentRoot, dialogs);
|
|
62
|
-
const waits = screenWaits({ act, pending, root: currentRoot, tell, timeoutMs }, elements);
|
|
66
|
+
const waits = screenWaits({ act, loadingTimeoutMs, pending, root: currentRoot, tell, timeoutMs }, elements, dialogs);
|
|
63
67
|
function perform(line: string, action: () => void) {
|
|
64
68
|
return Effect.promise(async () => {
|
|
65
69
|
tell(line);
|