@shivaedev/effect-test 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## Unreleased
+## 0.1.2 - 2026-09-26
+
+### Fixed
+
+- Make `eventually` retry only typed failures under TestClock, matching the live
+  clock. Defects and interruption propagate without retrying.
+
+### Changed
+
+- Document the live worker-Layer clock and the scope of per-test clock overrides.
 
 ## 0.1.1 - 2026-09-04
 

package/README.md

@@ -58,10 +58,20 @@ effectApp("talks to a real timer", function* () {
 }, { clock: "live" })
 ```
 
+The worker Layer is acquired and released outside the per-test environment,
+using the live clock unless the Layer supplies its own. Fibers started during
+Layer acquisition keep that environment; advancing a test's TestClock does not
+advance their timers. The selected per-test clock applies to `around`,
+`makeHarness`, and the test body.
+
 ## `eventually`
 
-Retries until the effect succeeds. Under TestClock it advances time with
-`TestClock.adjust`. Under `clock: "live"` it uses `Schedule.spaced`.
+Retries typed failures until the effect succeeds. Under TestClock it advances
+time with `TestClock.adjust`. Under `clock: "live"` it uses `Schedule.spaced`.
+`times` counts retries after the initial attempt; omitting it retries without a
+limit. Defects (including thrown assertions) and interruption propagate without
+retrying under either clock. Use `Effect.try(() => expect(...))` when an
+assertion failure is intentionally a retryable condition.
 
 ```ts
 import { eventually } from "@shivaedev/effect-test"

package/dist/any-test-layer.d.ts

@@ -0,0 +1,3 @@
+import type { Layer } from "effect";
+export type AnyTestLayer = Layer.Layer<any, any, never>;
+//# sourceMappingURL=any-test-layer.d.ts.map

package/dist/any-test-layer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"any-test-layer.d.ts","sourceRoot":"","sources":["../src/any-test-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC"}

package/dist/any-test-layer.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=any-test-layer.js.map

package/dist/any-test-layer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"any-test-layer.js","sourceRoot":"","sources":["../src/any-test-layer.ts"],"names":[],"mappings":""}

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,EAAkB,MAAM,QAAQ,CAAC;AAGtE,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACxB;AAOD,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EACjC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,UAAU,iBAAiB,KACzB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CA4BrB,CAAC"}
+{"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;AAgCD,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,iBAAiB,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAMpH,CAAC"}

package/dist/eventually.js

@@ -1,26 +1,22 @@
-import { Clock, Effect, Exit, Schedule } from "effect";
+import { Clock, Effect, Result, Schedule } from "effect";
 import * as TestClock from "effect/testing/TestClock";
 const defaultInterval = "10 millis";
 const isTestClock = (clock) => "adjust" in clock;
-export const eventually = (effect, options) => Effect.gen(function* () {
-    const interval = options?.interval ?? defaultInterval;
-    const clock = yield* Clock.Clock;
-    if (!isTestClock(clock)) {
-        return yield* options?.times === undefined
-            ? Effect.retry(effect, Schedule.spaced(interval))
-            : Effect.retry(effect, {
-                schedule: Schedule.spaced(interval),
-                times: options.times,
-            });
-    }
-    let retriesLeft = options?.times;
+const retryOnLiveClock = (effect, interval, times) => times === undefined
+    ? Effect.retry(effect, Schedule.spaced(interval))
+    : Effect.retry(effect, {
+        schedule: Schedule.spaced(interval),
+        times,
+    });
+const retryOnTestClock = (effect, interval, times) => Effect.gen(function* () {
+    let retriesLeft = times;
     for (;;) {
-        const exit = yield* Effect.exit(effect);
-        if (Exit.isSuccess(exit)) {
-            return exit.value;
+        const result = yield* Effect.result(effect);
+        if (Result.isSuccess(result)) {
+            return result.success;
         }
         if (retriesLeft === 0) {
-            return yield* exit;
+            return yield* Effect.fail(result.failure);
         }
         if (retriesLeft !== undefined) {
             retriesLeft -= 1;
@@ -28,4 +24,10 @@ export const eventually = (effect, options) => Effect.gen(function* () {
         yield* TestClock.adjust(interval);
     }
 });
+export const eventually = (effect, options) => Effect.gen(function* () {
+    const interval = options?.interval ?? defaultInterval;
+    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,IAAI,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAC;AAOtD,MAAM,eAAe,GAAG,WAAW,CAAC;AAEpC,MAAM,WAAW,GAAG,CAAC,KAAkB,EAAgC,EAAE,CACxE,QAAQ,IAAI,KAAK,CAAC;AAEnB,MAAM,CAAC,MAAM,UAAU,GAAG,CACzB,MAA8B,EAC9B,OAA2B,EACF,EAAE,CAC3B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnB,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,eAAe,CAAC;IACtD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IAEjC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,CAAC,OAAO,EAAE,KAAK,KAAK,SAAS;YACzC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;gBACrB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACnC,KAAK,EAAE,OAAO,CAAC,KAAK;aACpB,CAAC,CAAC;IACN,CAAC;IAED,IAAI,WAAW,GAAG,OAAO,EAAE,KAAK,CAAC;IACjC,SAAS,CAAC;QACT,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,KAAK,CAAC;QACnB,CAAC;QACD,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC;QACpB,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"}
+{"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,eAAe,GAAG,WAAW,CAAC;AAEpC,MAAM,WAAW,GAAG,CAAC,KAAkB,EAAgC,EAAE,CAAC,QAAQ,IAAI,KAAK,CAAC;AAE5F,MAAM,gBAAgB,GAAG,CAAU,MAA8B,EAAE,QAAwB,EAAE,KAAyB,EAA0B,EAAE,CACjJ,KAAK,KAAK,SAAS;IAClB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;QACrB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;QACnC,KAAK;KACL,CAAC,CAAC;AAEN,MAAM,gBAAgB,GAAG,CAAU,MAA8B,EAAE,QAAwB,EAAE,KAAyB,EAA0B,EAAE,CACjJ,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnB,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;AAEJ,MAAM,CAAC,MAAM,UAAU,GAAG,CAAU,MAA8B,EAAE,OAA2B,EAA0B,EAAE,CAC1H,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnB,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,eAAe,CAAC;IACtD,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"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { type EventuallyOptions, eventually } from "./eventually.js";
-export type { EffectClock, EffectTest, EffectTester, EffectTestOptions, MakeEffectItOptions, MakeEffectItResult, } from "./types.js";
-export { makeEffectIt } from "./vitest.js";
+export { type EventuallyOptions, eventually } from "./eventually.ts";
+export type { EffectClock, EffectTest, EffectTester, EffectTestOptions, MakeEffectItOptions, MakeEffectItResult, } from "./types.ts";
+export { makeEffectIt } from "./vitest.ts";
 //# sourceMappingURL=index.d.ts.map

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 import type { TestContext, TestOptions } from "@effect/vitest";
 import type { Effect, Layer } from "effect";
+import type { AnyTestLayer } from "./any-test-layer.ts";
 export type EffectClock = "test" | "live";
 export type EffectTestOptions = TestOptions & {
     readonly clock?: EffectClock;
@@ -13,11 +14,11 @@ export interface EffectTester<Harness, Provided> extends EffectTest<Harness, Pro
     readonly each: <Item>(cases: ReadonlyArray<Item>) => <A, Eff extends Effect.Effect<unknown, unknown, Provided>>(name: string, body: (item: Item, harness: Harness, context: TestContext) => Generator<Eff, A, never>, options?: number | EffectTestOptions) => void;
     readonly fails: EffectTest<Harness, Provided>;
 }
-export interface MakeEffectItOptions<Harness, TestLayer extends Layer.Layer<any, any, never>> {
+export interface MakeEffectItOptions<Harness, TestLayer extends AnyTestLayer> {
     readonly layer: TestLayer;
-    readonly around?: <A, E>(effect: Effect.Effect<A, E, Layer.Success<TestLayer>>) => Effect.Effect<A, unknown, Layer.Success<TestLayer>>;
+    readonly around?: (<A, E>(effect: Effect.Effect<A, E, Layer.Success<TestLayer>>) => Effect.Effect<A, unknown, Layer.Success<TestLayer>>) | undefined;
     readonly makeHarness: (context: TestContext) => Effect.Effect<Harness, unknown, Layer.Success<TestLayer>>;
-    readonly clock?: EffectClock;
+    readonly clock?: EffectClock | undefined;
 }
 export interface MakeEffectItResult<Harness, Provided> {
     readonly effectApp: EffectTester<Harness, Provided>;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE5C,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;AAE1C,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC7C,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,UAAU,CAAC,OAAO,EAAE,QAAQ,IAAI,CAC3C,CAAC,EACD,GAAG,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAErD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,EAC1E,OAAO,CAAC,EAAE,MAAM,GAAG,iBAAiB,KAChC,IAAI,CAAC;AAEV,MAAM,WAAW,YAAY,CAAC,OAAO,EAAE,QAAQ,CAC9C,SAAQ,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACvE,QAAQ,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EACnB,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,KACtB,CAAC,CAAC,EAAE,GAAG,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC7D,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,CACL,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,WAAW,KAChB,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,EAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,iBAAiB,KAChC,IAAI,CAAC;IACV,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,mBAAmB,CACnC,OAAO,EAEP,SAAS,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC;IAE9C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KACjD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACzD,QAAQ,CAAC,WAAW,EAAE,CACrB,OAAO,EAAE,WAAW,KAChB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB,CAAC,OAAO,EAAE,QAAQ;IACpD,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;CACpD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/vitest.d.ts

@@ -1,4 +1,5 @@
 import { Layer } from "effect";
-import type { MakeEffectItOptions, MakeEffectItResult } from "./types.js";
-export declare const makeEffectIt: <Harness, TestLayer extends Layer.Layer<any, any, never>>(options: MakeEffectItOptions<Harness, TestLayer>) => MakeEffectItResult<Harness, Layer.Success<TestLayer>>;
+import type { AnyTestLayer } from "./any-test-layer.ts";
+import type { MakeEffectItOptions, MakeEffectItResult } from "./types.ts";
+export declare const makeEffectIt: <Harness, TestLayer extends AnyTestLayer>(options: MakeEffectItOptions<Harness, TestLayer>) => MakeEffectItResult<Harness, Layer.Success<TestLayer>>;
 //# sourceMappingURL=vitest.d.ts.map

package/dist/vitest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../src/vitest.ts"],"names":[],"mappings":"AAKA,OAAO,EAAqC,KAAK,EAAS,MAAM,QAAQ,CAAC;AAGzE,OAAO,KAAK,EAKX,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,YAAY,CAAC;AAyGpB,eAAO,MAAM,YAAY,GACxB,OAAO,EAEP,SAAS,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAE9C,SAAS,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,KAC9C,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAuHtD,CAAC"}
+{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../src/vitest.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,KAAK,EAAS,MAAM,QAAQ,CAAC;AAGzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAA4D,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAkEpI,eAAO,MAAM,YAAY,GAAI,OAAO,EAAE,SAAS,SAAS,YAAY,EACnE,SAAS,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,KAC9C,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAyEtD,CAAC"}

package/dist/vitest.js

@@ -1,16 +1,15 @@
-import { it as effectIt, } from "@effect/vitest";
+import { it as effectIt } from "@effect/vitest";
 import { Cause, Effect, Exit, Layer, Scope } from "effect";
 import * as TestClock from "effect/testing/TestClock";
 import * as TestConsole from "effect/testing/TestConsole";
 const fixtureName = "__effectTestContext";
 const TestClockEnvironment = Layer.mergeAll(TestConsole.layer, TestClock.layer());
 const LiveClockEnvironment = TestConsole.layer;
-const environmentFor = (clock) => clock === "live" ? LiveClockEnvironment : TestClockEnvironment;
+const environmentFor = (clock) => (clock === "live" ? LiveClockEnvironment : TestClockEnvironment);
 const restoreContext = (fixture, context) => ({
     ...context,
     [fixtureName]: fixture,
 });
-const contextFrom = (context) => context[fixtureName];
 const runEffectTest = (effect, context, clock) => Effect.runPromise(Effect.gen(function* () {
     const exit = yield* Effect.exit(effect);
     if (Exit.isFailure(exit)) {
@@ -30,9 +29,7 @@ const splitOptions = (options) => {
     const { clock, ...vitest } = options;
     return { clock, vitest };
 };
-const makeFixtureIt = (layer) => effectIt.extend(fixtureName, { scope: "worker" }, 
-// biome-ignore lint/correctness/noEmptyPattern: Vitest fixtures require a destructured context parameter.
-async ({}, { onCleanup }) => {
+const makeFixtureIt = (layer) => effectIt.extend(fixtureName, { scope: "worker" }, async ({}, { onCleanup }) => {
     const scope = Effect.runSync(Scope.make());
     onCleanup(() => Effect.runPromise(Scope.close(scope, Exit.void)));
     try {
@@ -47,20 +44,17 @@ export const makeEffectIt = (options) => {
     const fixtureIt = makeFixtureIt(options.layer);
     const defaultClock = options.clock ?? "test";
     const run = (body, context) => {
-        const program = Effect.gen(function* () {
+        const ready = Effect.gen(function* () {
             const harness = yield* options.makeHarness(context);
             return yield* Effect.gen(() => body(harness, context));
         });
-        // The body constraint proves every yielded service is part of Provided.
-        // TypeScript cannot reduce that generic generator requirement here.
-        const ready = program;
         const wrapped = options.around?.(ready) ?? ready;
-        return wrapped.pipe(Effect.provide(contextFrom(context)));
+        return wrapped.pipe(Effect.provide(context[fixtureName]));
     };
     const register = (current) => (name, body, testOptions) => {
         const split = splitOptions(testOptions);
         const clock = split.clock ?? defaultClock;
-        current(name, split.vitest, ({ __effectTestContext, task, signal, onTestFailed, onTestFinished, skip, annotate, expect, _local, }) => {
+        current(name, split.vitest, ({ __effectTestContext, task, signal, onTestFailed, onTestFinished, skip, annotate, expect, _local }) => {
             const context = restoreContext(__effectTestContext, {
                 annotate,
                 expect,
@@ -82,7 +76,7 @@ export const makeEffectIt = (options) => {
         each: (cases) => (name, body, testOptions) => {
             const split = splitOptions(testOptions);
             const clock = split.clock ?? defaultClock;
-            fixtureIt.for(cases)(name, split.vitest, (item, { __effectTestContext, task, signal, onTestFailed, onTestFinished, skip, annotate, expect, _local, }) => {
+            fixtureIt.for(cases)(name, split.vitest, (item, { __effectTestContext, task, signal, onTestFailed, onTestFinished, skip, annotate, expect, _local }) => {
                 const context = restoreContext(__effectTestContext, {
                     annotate,
                     expect,
@@ -93,7 +87,7 @@ export const makeEffectIt = (options) => {
                     task,
                     _local,
                 });
-                return runEffectTest(run((harness, testContext) => body(item, harness, testContext), context), context, clock);
+                return runEffectTest(Effect.asVoid(run((harness, testContext) => body(item, harness, testContext), context)), context, clock);
             });
         },
         fails: register(fixtureIt.fails),

package/dist/vitest.js.map

@@ -1 +1 @@
-{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../src/vitest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../src/vitest.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/effect-test",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Generic Effect Vitest runner with worker-scoped Layers and TestClock",
   "type": "module",
   "license": "MIT",

package/src/any-test-layer.ts

@@ -0,0 +1,3 @@
+import type { Layer } from "effect";
+
+export type AnyTestLayer = Layer.Layer<any, any, never>;

package/src/eventually.ts

@@ -1,4 +1,4 @@
-import { Clock, type Duration, Effect, Exit, Schedule } from "effect";
+import { Clock, type Duration, Effect, Result, Schedule } from "effect";
 import * as TestClock from "effect/testing/TestClock";
 
 export interface EventuallyOptions {
@@ -8,34 +8,26 @@ export interface EventuallyOptions {
 
 const defaultInterval = "10 millis";
 
-const isTestClock = (clock: Clock.Clock): clock is TestClock.TestClock =>
-	"adjust" in clock;
+const isTestClock = (clock: Clock.Clock): clock is TestClock.TestClock => "adjust" in clock;
 
-export const eventually = <A, E, R>(
-	effect: Effect.Effect<A, E, R>,
-	options?: EventuallyOptions,
-): Effect.Effect<A, E, R> =>
-	Effect.gen(function* () {
-		const interval = options?.interval ?? defaultInterval;
-		const clock = yield* Clock.Clock;
+const retryOnLiveClock = <A, E, R>(effect: Effect.Effect<A, E, R>, interval: Duration.Input, times: number | undefined): Effect.Effect<A, E, R> =>
+	times === undefined
+		? Effect.retry(effect, Schedule.spaced(interval))
+		: Effect.retry(effect, {
+				schedule: Schedule.spaced(interval),
+				times,
+			});
 
-		if (!isTestClock(clock)) {
-			return yield* options?.times === undefined
-				? Effect.retry(effect, Schedule.spaced(interval))
-				: Effect.retry(effect, {
-						schedule: Schedule.spaced(interval),
-						times: options.times,
-					});
-		}
-
-		let retriesLeft = options?.times;
+const retryOnTestClock = <A, E, R>(effect: Effect.Effect<A, E, R>, interval: Duration.Input, times: number | undefined): Effect.Effect<A, E, R> =>
+	Effect.gen(function* () {
+		let retriesLeft = times;
 		for (;;) {
-			const exit = yield* Effect.exit(effect);
-			if (Exit.isSuccess(exit)) {
-				return exit.value;
+			const result = yield* Effect.result(effect);
+			if (Result.isSuccess(result)) {
+				return result.success;
 			}
 			if (retriesLeft === 0) {
-				return yield* exit;
+				return yield* Effect.fail(result.failure);
 			}
 			if (retriesLeft !== undefined) {
 				retriesLeft -= 1;
@@ -43,3 +35,11 @@ export const eventually = <A, E, R>(
 			yield* TestClock.adjust(interval);
 		}
 	});
+
+export const eventually = <A, E, R>(effect: Effect.Effect<A, E, R>, options?: EventuallyOptions): Effect.Effect<A, E, R> =>
+	Effect.gen(function* () {
+		const interval = options?.interval ?? defaultInterval;
+		const clock = yield* Clock.Clock;
+		const retry = isTestClock(clock) ? retryOnTestClock : retryOnLiveClock;
+		return yield* retry(effect, interval, options?.times);
+	});

package/src/index.ts

@@ -1,4 +1,4 @@
-export { type EventuallyOptions, eventually } from "./eventually.js";
+export { type EventuallyOptions, eventually } from "./eventually.ts";
 export type {
 	EffectClock,
 	EffectTest,
@@ -6,5 +6,5 @@ export type {
 	EffectTestOptions,
 	MakeEffectItOptions,
 	MakeEffectItResult,
-} from "./types.js";
-export { makeEffectIt } from "./vitest.js";
+} from "./types.ts";
+export { makeEffectIt } from "./vitest.ts";

package/src/types.ts

@@ -1,5 +1,6 @@
 import type { TestContext, TestOptions } from "@effect/vitest";
 import type { Effect, Layer } from "effect";
+import type { AnyTestLayer } from "./any-test-layer.ts";
 
 export type EffectClock = "test" | "live";
 
@@ -7,17 +8,13 @@ export type EffectTestOptions = TestOptions & {
 	readonly clock?: EffectClock;
 };
 
-export type EffectTest<Harness, Provided> = <
-	A,
-	Eff extends Effect.Effect<unknown, unknown, Provided>,
->(
+export type EffectTest<Harness, Provided> = <A, Eff extends Effect.Effect<unknown, unknown, Provided>>(
 	name: string,
 	body: (harness: Harness, context: TestContext) => Generator<Eff, A, never>,
 	options?: number | EffectTestOptions,
 ) => void;
 
-export interface EffectTester<Harness, Provided>
-	extends EffectTest<Harness, Provided> {
+export interface EffectTester<Harness, Provided> extends EffectTest<Harness, Provided> {
 	readonly skip: EffectTest<Harness, Provided>;
 	readonly skipIf: (condition: unknown) => EffectTest<Harness, Provided>;
 	readonly runIf: (condition: unknown) => EffectTest<Harness, Provided>;
@@ -26,29 +23,19 @@ export interface EffectTester<Harness, Provided>
 		cases: ReadonlyArray<Item>,
 	) => <A, Eff extends Effect.Effect<unknown, unknown, Provided>>(
 		name: string,
-		body: (
-			item: Item,
-			harness: Harness,
-			context: TestContext,
-		) => Generator<Eff, A, never>,
+		body: (item: Item, harness: Harness, context: TestContext) => Generator<Eff, A, never>,
 		options?: number | EffectTestOptions,
 	) => void;
 	readonly fails: EffectTest<Harness, Provided>;
 }
 
-export interface MakeEffectItOptions<
-	Harness,
-	// biome-ignore lint/suspicious/noExplicitAny: Layer output and error are recovered with Layer utility types
-	TestLayer extends Layer.Layer<any, any, never>,
-> {
+export interface MakeEffectItOptions<Harness, TestLayer extends AnyTestLayer> {
 	readonly layer: TestLayer;
-	readonly around?: <A, E>(
-		effect: Effect.Effect<A, E, Layer.Success<TestLayer>>,
-	) => Effect.Effect<A, unknown, Layer.Success<TestLayer>>;
-	readonly makeHarness: (
-		context: TestContext,
-	) => Effect.Effect<Harness, unknown, Layer.Success<TestLayer>>;
-	readonly clock?: EffectClock;
+	readonly around?:
+		| (<A, E>(effect: Effect.Effect<A, E, Layer.Success<TestLayer>>) => Effect.Effect<A, unknown, Layer.Success<TestLayer>>)
+		| undefined;
+	readonly makeHarness: (context: TestContext) => Effect.Effect<Harness, unknown, Layer.Success<TestLayer>>;
+	readonly clock?: EffectClock | undefined;
 }
 
 export interface MakeEffectItResult<Harness, Provided> {

package/src/vitest.ts

@@ -1,19 +1,9 @@
-import {
-	it as effectIt,
-	type TestContext,
-	type TestOptions,
-} from "@effect/vitest";
+import { it as effectIt, type TestContext, type TestOptions } from "@effect/vitest";
 import { Cause, type Context, Effect, Exit, Layer, Scope } from "effect";
 import * as TestClock from "effect/testing/TestClock";
 import * as TestConsole from "effect/testing/TestConsole";
-import type {
-	EffectClock,
-	EffectTest,
-	EffectTester,
-	EffectTestOptions,
-	MakeEffectItOptions,
-	MakeEffectItResult,
-} from "./types.js";
+import type { AnyTestLayer } from "./any-test-layer.ts";
+import type { EffectClock, EffectTest, EffectTester, EffectTestOptions, MakeEffectItOptions, MakeEffectItResult } from "./types.ts";
 
 const fixtureName = "__effectTestContext";
 
@@ -21,54 +11,22 @@ type EffectFixture<Provided> = TestContext & {
 	readonly [fixtureName]: Context.Context<Provided>;
 };
 
-interface FixtureTestApi<Provided> {
-	(
-		name: string,
-		options: TestOptions,
-		body: (context: EffectFixture<Provided>) => Promise<unknown>,
-	): void;
-	readonly skip: FixtureTestApi<Provided>;
-	readonly skipIf: (condition: unknown) => FixtureTestApi<Provided>;
-	readonly runIf: (condition: unknown) => FixtureTestApi<Provided>;
-	readonly only: FixtureTestApi<Provided>;
-	readonly fails: FixtureTestApi<Provided>;
-	readonly for: <Item>(
-		cases: ReadonlyArray<Item>,
-	) => (
-		name: string,
-		options: TestOptions,
-		body: (item: Item, context: EffectFixture<Provided>) => Promise<unknown>,
-	) => void;
-}
+type FixtureTest<Provided> = (name: string, options: TestOptions, body: (context: EffectFixture<Provided>) => Promise<unknown>) => void;
 
-const TestClockEnvironment = Layer.mergeAll(
-	TestConsole.layer,
-	TestClock.layer(),
-);
+const TestClockEnvironment = Layer.mergeAll(TestConsole.layer, TestClock.layer());
 const LiveClockEnvironment = TestConsole.layer;
 
-const environmentFor = (clock: EffectClock) =>
-	clock === "live" ? LiveClockEnvironment : TestClockEnvironment;
+const environmentFor = (clock: EffectClock) => (clock === "live" ? LiveClockEnvironment : TestClockEnvironment);
 
 const restoreContext = <Provided>(
 	fixture: Context.Context<Provided>,
 	context: Omit<EffectFixture<Provided>, typeof fixtureName>,
-): EffectFixture<Provided> =>
-	({
-		...context,
-		[fixtureName]: fixture,
-	}) as EffectFixture<Provided>;
+): EffectFixture<Provided> => ({
+	...context,
+	[fixtureName]: fixture,
+});
 
-const contextFrom = <Provided>(
-	context: TestContext,
-): Context.Context<Provided> =>
-	(context as EffectFixture<Provided>)[fixtureName];
-
-const runEffectTest = <A, E>(
-	effect: Effect.Effect<A, E, Scope.Scope>,
-	context: TestContext,
-	clock: EffectClock,
-): Promise<A> =>
+const runEffectTest = <A, E>(effect: Effect.Effect<A, E, Scope.Scope>, context: TestContext, clock: EffectClock): Promise<A> =>
 	Effect.runPromise(
 		Effect.gen(function* () {
 			const exit = yield* Effect.exit(effect);
@@ -98,149 +56,92 @@ const splitOptions = (
 	return { clock, vitest };
 };
 
-const makeFixtureIt = <Provided, LayerError>(
-	layer: Layer.Layer<Provided, LayerError>,
-): FixtureTestApi<Provided> =>
-	effectIt.extend(
-		fixtureName,
-		{ scope: "worker" },
-		// biome-ignore lint/correctness/noEmptyPattern: Vitest fixtures require a destructured context parameter.
-		async ({}, { onCleanup }) => {
-			const scope = Effect.runSync(Scope.make());
-			onCleanup(() => Effect.runPromise(Scope.close(scope, Exit.void)));
+const makeFixtureIt = <Provided, LayerError>(layer: Layer.Layer<Provided, LayerError>) =>
+	effectIt.extend(fixtureName, { scope: "worker" }, async ({}, { onCleanup }) => {
+		const scope = Effect.runSync(Scope.make());
+		onCleanup(() => Effect.runPromise(Scope.close(scope, Exit.void)));
 
-			try {
-				return await Effect.runPromise(Layer.buildWithScope(layer, scope));
-			} catch (error) {
-				await Effect.runPromise(Scope.close(scope, Exit.void));
-				throw error;
-			}
-		},
-	) as unknown as FixtureTestApi<Provided>;
+		try {
+			return await Effect.runPromise(Layer.buildWithScope(layer, scope));
+		} catch (error) {
+			await Effect.runPromise(Scope.close(scope, Exit.void));
+			throw error;
+		}
+	});
 
-export const makeEffectIt = <
-	Harness,
-	// biome-ignore lint/suspicious/noExplicitAny: Layer output and error are recovered with Layer utility types
-	TestLayer extends Layer.Layer<any, any, never>,
->(
+export const makeEffectIt = <Harness, TestLayer extends AnyTestLayer>(
 	options: MakeEffectItOptions<Harness, TestLayer>,
 ): MakeEffectItResult<Harness, Layer.Success<TestLayer>> => {
 	type Provided = Layer.Success<TestLayer>;
 	const fixtureIt = makeFixtureIt(options.layer);
 	const defaultClock = options.clock ?? "test";
 
-	const run = <A, Eff extends Effect.Effect<unknown, unknown, Provided>>(
-		body: (harness: Harness, context: TestContext) => Generator<Eff, A, never>,
-		context: TestContext,
+	const run = <A>(
+		body: (harness: Harness, context: TestContext) => Generator<Effect.Effect<unknown, unknown, Provided>, A, never>,
+		context: EffectFixture<Provided>,
 	): Effect.Effect<A, unknown, Scope.Scope> => {
-		const program = Effect.gen(function* () {
+		const ready: Effect.Effect<A, unknown, Provided> = Effect.gen(function* () {
 			const harness = yield* options.makeHarness(context);
 			return yield* Effect.gen(() => body(harness, context));
 		});
-		// The body constraint proves every yielded service is part of Provided.
-		// TypeScript cannot reduce that generic generator requirement here.
-		const ready = program as Effect.Effect<A, unknown, Provided>;
 		const wrapped = options.around?.(ready) ?? ready;
-		return wrapped.pipe(
-			Effect.provide(contextFrom<Provided>(context)),
-		) as Effect.Effect<A, unknown, Scope.Scope>;
+		return wrapped.pipe(Effect.provide(context[fixtureName]));
 	};
 
 	const register =
-		(current: FixtureTestApi<Provided>): EffectTest<Harness, Provided> =>
+		(current: FixtureTest<Provided>): EffectTest<Harness, Provided> =>
 		(name, body, testOptions) => {
 			const split = splitOptions(testOptions);
 			const clock = split.clock ?? defaultClock;
-			current(
-				name,
-				split.vitest,
-				({
-					__effectTestContext,
-					task,
-					signal,
+			current(name, split.vitest, ({ __effectTestContext, task, signal, onTestFailed, onTestFinished, skip, annotate, expect, _local }) => {
+				const context = restoreContext(__effectTestContext, {
+					annotate,
+					expect,
 					onTestFailed,
 					onTestFinished,
+					signal,
 					skip,
-					annotate,
-					expect,
+					task,
 					_local,
-				}) => {
-					const context = restoreContext(__effectTestContext, {
-						annotate,
-						expect,
-						onTestFailed,
-						onTestFinished,
-						signal,
-						skip,
-						task,
-						_local,
-					});
-					return runEffectTest(run(body, context), context, clock);
-				},
-			);
+				});
+				return runEffectTest(run(body, context), context, clock);
+			});
 		};
 
-	const effectApp: EffectTester<Harness, Provided> = Object.assign(
-		register(fixtureIt),
-		{
-			skip: register(fixtureIt.skip),
-			skipIf: (condition: unknown) => register(fixtureIt.skipIf(condition)),
-			runIf: (condition: unknown) => register(fixtureIt.runIf(condition)),
-			only: register(fixtureIt.only),
-			each:
-				<Item>(cases: ReadonlyArray<Item>) =>
-				<A, Eff extends Effect.Effect<unknown, unknown, Provided>>(
-					name: string,
-					body: (
-						item: Item,
-						harness: Harness,
-						context: TestContext,
-					) => Generator<Eff, A, never>,
-					testOptions?: number | EffectTestOptions,
-				) => {
-					const split = splitOptions(testOptions);
-					const clock = split.clock ?? defaultClock;
-					fixtureIt.for(cases)(
-						name,
-						split.vitest,
-						(
-							item,
-							{
-								__effectTestContext,
-								task,
-								signal,
-								onTestFailed,
-								onTestFinished,
-								skip,
-								annotate,
-								expect,
-								_local,
-							},
-						) => {
-							const context = restoreContext(__effectTestContext, {
-								annotate,
-								expect,
-								onTestFailed,
-								onTestFinished,
-								signal,
-								skip,
-								task,
-								_local,
-							});
-							return runEffectTest(
-								run(
-									(harness, testContext) => body(item, harness, testContext),
-									context,
-								),
-								context,
-								clock,
-							);
-						},
-					);
-				},
-			fails: register(fixtureIt.fails),
-		},
-	);
+	const effectApp: EffectTester<Harness, Provided> = Object.assign(register(fixtureIt), {
+		skip: register(fixtureIt.skip),
+		skipIf: (condition: unknown) => register(fixtureIt.skipIf(condition)),
+		runIf: (condition: unknown) => register(fixtureIt.runIf(condition)),
+		only: register(fixtureIt.only),
+		each:
+			<Item>(cases: ReadonlyArray<Item>) =>
+			<A, Eff extends Effect.Effect<unknown, unknown, Provided>>(
+				name: string,
+				body: (item: Item, harness: Harness, context: TestContext) => Generator<Eff, A, never>,
+				testOptions?: number | EffectTestOptions,
+			) => {
+				const split = splitOptions(testOptions);
+				const clock = split.clock ?? defaultClock;
+				fixtureIt.for(cases)(
+					name,
+					split.vitest,
+					(item, { __effectTestContext, task, signal, onTestFailed, onTestFinished, skip, annotate, expect, _local }) => {
+						const context = restoreContext(__effectTestContext, {
+							annotate,
+							expect,
+							onTestFailed,
+							onTestFinished,
+							signal,
+							skip,
+							task,
+							_local,
+						});
+						return runEffectTest(Effect.asVoid(run((harness, testContext) => body(item, harness, testContext), context)), context, clock);
+					},
+				);
+			},
+		fails: register(fixtureIt.fails),
+	});
 
 	return { effectApp };
 };