@shivaedev/effect-test 0.8.1 → 0.9.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.9.0 - 2026-10-25
+
+### Added
+
+- `@shivaedev/effect-test` readiness retries accept `timeout` and `wait` options. A timeout preserves the final typed failure; a custom wait lets adapters settle observable work through the same retry engine.
+
+### Breaking
+
+- `@shivaedev/effect-react/client/testing.ts` now returns an Effect from `eventually(assert)`. Replace `yield* Effect.promise(() => eventually(assert))` with `yield* eventually(assert)` in stories and Effect tests, or replace `await eventually(assert)` with `await Effect.runPromise(eventually(assert))` in async tests. Assertions wait inside React `act` in live time, including under TestClock. Timeout errors include elapsed milliseconds and the last assertion message, with the assertion error as their `cause`.
+
 ## 0.8.1 - 2026-10-25
 
 ### Fixed

package/README.md

@@ -163,7 +163,7 @@ Both test and live clock fixtures install a fresh native TestConsole for each te
 
 ### Waiting for a typed readiness condition
 
-`eventually(effect, options)` retries the Effect's typed failures until it succeeds or uses its retry budget. It uses the active Clock: under TestClock it advances time with `TestClock.adjust`; under live time it retries with `Schedule.spaced`.
+`eventually(effect, options)` retries the Effect's typed failures until it succeeds or uses its retry budget. It uses the active Clock: under TestClock it advances time with `TestClock.adjust`; under live time it waits with `Effect.sleep`.
 
 ```ts
 import { eventually } from "@shivaedev/effect-test/eventually.ts";
@@ -181,7 +181,7 @@ effectApp("reaches the selected time", function* () {
 });
 ```
 
-The attempts see 0, 7, 14 and subsequent multiples of 7 through 56 milliseconds. `times` counts retries after the initial attempt, so `times: 0` tries once. When the budget runs out, the final typed failure remains the failure.
+The attempts see 0, 7, 14 and subsequent multiples of 7 through 56 milliseconds. `times` counts retries after the initial attempt, so `times: 0` tries once. When the budget runs out, the final typed failure remains the failure. `timeout` sets an elapsed-time budget on the active clock, checked after a failed attempt. `wait` replaces the interval delay with a settlement Effect, so adapters such as React testing can own how pending work settles.
 
 A thrown assertion is a defect, so it escapes on the first attempt. Interruption also escapes immediately. Capture an assertion with `Effect.try` only when its failure means the state is not ready yet:
 

package/dist/eventually.d.ts

@@ -1,7 +1,9 @@
-import { type Duration, Effect } from "effect";
+import { Duration, Effect } from "effect";
 export interface EventuallyOptions {
     readonly interval?: Duration.Input;
+    readonly timeout?: Duration.Input;
     readonly times?: number;
+    readonly wait?: Effect.Effect<void>;
 }
 export declare const eventually: <A, E, R>(effect: Effect.Effect<A, E, R>, options?: EventuallyOptions | undefined) => Effect.Effect<A, E, R>;
 //# sourceMappingURL=eventually.d.ts.map

package/dist/eventually.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventually.d.ts","sourceRoot":"","sources":["../src/eventually.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,QAAQ,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAGxE,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACxB;AAsCD,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,EAAE,CAAC,oGAQ5D,CAAC"}
+{"version":3,"file":"eventually.d.ts","sourceRoot":"","sources":["../src/eventually.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAGzD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,EAAE,CAAC,oGAwB5D,CAAC"}

package/dist/eventually.js

@@ -1,37 +1,25 @@
-import { Clock, Effect, Result, Schedule } from "effect";
+import { Clock, Duration, Effect, Result } from "effect";
 import * as TestClock from "effect/testing/TestClock";
-const DEFAULT_INTERVAL = "10 millis";
-function isTestClock(clock) {
-    return "adjust" in clock;
-}
-function retryOnLiveClock(effect, interval, times) {
-    return times === undefined
-        ? Effect.retry(effect, Schedule.spaced(interval))
-        : Effect.retry(effect, {
-            schedule: Schedule.spaced(interval),
-            times,
-        });
-}
-const retryOnTestClock = Effect.fnUntraced(function* (effect, interval, times) {
-    let retriesLeft = times;
+export const eventually = Effect.fnUntraced(function* (effect, options) {
+    const clock = yield* Clock.Clock;
+    const started = yield* Clock.currentTimeMillis;
+    const timeout = options?.timeout === undefined ? undefined : Duration.toMillis(Duration.fromInputUnsafe(options.timeout));
+    const interval = options?.interval ?? "10 millis";
+    const wait = options?.wait ?? ("adjust" in clock ? TestClock.adjust(interval) : Effect.sleep(interval));
+    let retriesLeft = options?.times;
     for (;;) {
         const result = yield* Effect.result(effect);
         if (Result.isSuccess(result)) {
             return result.success;
         }
-        if (retriesLeft === 0) {
+        const elapsed = (yield* Clock.currentTimeMillis) - started;
+        if (retriesLeft === 0 || (timeout !== undefined && elapsed >= timeout)) {
             return yield* Effect.fail(result.failure);
         }
         if (retriesLeft !== undefined) {
             retriesLeft -= 1;
         }
-        yield* TestClock.adjust(interval);
+        yield* wait;
     }
 });
-export const eventually = Effect.fnUntraced(function* (effect, options) {
-    const interval = options?.interval ?? DEFAULT_INTERVAL;
-    const clock = yield* Clock.Clock;
-    const retry = isTestClock(clock) ? retryOnTestClock : retryOnLiveClock;
-    return yield* retry(effect, interval, options?.times);
-});
 //# sourceMappingURL=eventually.js.map

package/dist/eventually.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventually.js","sourceRoot":"","sources":["../src/eventually.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACxE,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AAOtD,MAAM,gBAAgB,GAAG,WAAW,CAAC;AAErC,SAAS,WAAW,CAAC,KAAkB;IACtC,OAAO,QAAQ,IAAI,KAAK,CAAC;AAC1B,CAAC;AAED,SAAS,gBAAgB,CAAU,MAA8B,EAAE,QAAwB,EAAE,KAAyB;IACrH,OAAO,KAAK,KAAK,SAAS;QACzB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;YACnC,KAAK;SACL,CAAC,CAAC;AACN,CAAC;AAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACnD,MAA8B,EAC9B,QAAwB,EACxB,KAAyB;IAEzB,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,SAAS,CAAC;QACT,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC,OAAO,CAAC;QACvB,CAAC;QACD,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/B,WAAW,IAAI,CAAC,CAAC;QAClB,CAAC;QACD,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACpD,MAA8B,EAC9B,OAA2B;IAE3B,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,gBAAgB,CAAC;IACvD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IACjC,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACvE,OAAO,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"eventually.js","sourceRoot":"","sources":["../src/eventually.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AAStD,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACpD,MAA8B,EAC9B,OAA2B;IAE3B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IACjC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;IAC/C,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1H,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,WAAW,CAAC;IAClD,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxG,IAAI,WAAW,GAAG,OAAO,EAAE,KAAK,CAAC;IACjC,SAAS,CAAC;QACT,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC,OAAO,CAAC;QACvB,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC;QAC3D,IAAI,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;YACxE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/B,WAAW,IAAI,CAAC,CAAC;QAClB,CAAC;QACD,KAAK,CAAC,CAAC,IAAI,CAAC;IACb,CAAC;AACF,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/effect-test",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Generic Effect Vitest runner with file-scoped Layers and TestClock",
   "homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/effect-test#readme",
   "bugs": {
@@ -42,7 +42,7 @@
   ],
   "devDependencies": {
     "@effect/vitest": "4.0.5",
-    "@shivaedev/quality": "0.38.0",
+    "@shivaedev/quality": "0.39.1",
     "@types/node": "24.19.2",
     "effect": "4.0.5",
     "typescript": "7.0.2",

package/src/eventually.ts

@@ -1,53 +1,35 @@
-import { Clock, type Duration, Effect, Result, Schedule } from "effect";
+import { Clock, Duration, Effect, Result } from "effect";
 import * as TestClock from "effect/testing/TestClock";
 
 export interface EventuallyOptions {
 	readonly interval?: Duration.Input;
+	readonly timeout?: Duration.Input;
 	readonly times?: number;
+	readonly wait?: Effect.Effect<void>;
 }
 
-const DEFAULT_INTERVAL = "10 millis";
-
-function isTestClock(clock: Clock.Clock): clock is TestClock.TestClock {
-	return "adjust" in clock;
-}
-
-function retryOnLiveClock<A, E, R>(effect: Effect.Effect<A, E, R>, interval: Duration.Input, times: number | undefined): Effect.Effect<A, E, R> {
-	return times === undefined
-		? Effect.retry(effect, Schedule.spaced(interval))
-		: Effect.retry(effect, {
-				schedule: Schedule.spaced(interval),
-				times,
-			});
-}
-
-const retryOnTestClock = Effect.fnUntraced(function* <A, E, R>(
+export const eventually = Effect.fnUntraced(function* <A, E, R>(
 	effect: Effect.Effect<A, E, R>,
-	interval: Duration.Input,
-	times: number | undefined,
+	options?: EventuallyOptions,
 ): Effect.fn.Return<A, E, R> {
-	let retriesLeft = times;
+	const clock = yield* Clock.Clock;
+	const started = yield* Clock.currentTimeMillis;
+	const timeout = options?.timeout === undefined ? undefined : Duration.toMillis(Duration.fromInputUnsafe(options.timeout));
+	const interval = options?.interval ?? "10 millis";
+	const wait = options?.wait ?? ("adjust" in clock ? TestClock.adjust(interval) : Effect.sleep(interval));
+	let retriesLeft = options?.times;
 	for (;;) {
 		const result = yield* Effect.result(effect);
 		if (Result.isSuccess(result)) {
 			return result.success;
 		}
-		if (retriesLeft === 0) {
+		const elapsed = (yield* Clock.currentTimeMillis) - started;
+		if (retriesLeft === 0 || (timeout !== undefined && elapsed >= timeout)) {
 			return yield* Effect.fail(result.failure);
 		}
 		if (retriesLeft !== undefined) {
 			retriesLeft -= 1;
 		}
-		yield* TestClock.adjust(interval);
+		yield* wait;
 	}
 });
-
-export const eventually = Effect.fnUntraced(function* <A, E, R>(
-	effect: Effect.Effect<A, E, R>,
-	options?: EventuallyOptions,
-): Effect.fn.Return<A, E, R> {
-	const interval = options?.interval ?? DEFAULT_INTERVAL;
-	const clock = yield* Clock.Clock;
-	const retry = isTestClock(clock) ? retryOnTestClock : retryOnLiveClock;
-	return yield* retry(effect, interval, options?.times);
-});