@fncts/test 0.0.39 → 0.0.41

package/_src/vitest.ts

@@ -1,48 +1,58 @@
 import type { AssertionValue } from "@fncts/test/data/AssertionValue";
 import type { TestResult } from "@fncts/test/data/FailureDetails";
 
-import { identity } from "@fncts/base/data/function";
+import { isPromise } from "@fncts/base/util/predicates";
 import { check, checkAllConcurrently, checkAllIOConcurrently, checkIO } from "@fncts/test/api";
+import { Assertion } from "@fncts/test/control/Assertion";
 import { renderFragment } from "@fncts/test/control/DefaultTestReporter";
-import { Gen } from "@fncts/test/control/Gen";
 import { TestAnnotationRenderer } from "@fncts/test/control/TestAnnotationRenderer";
 import { TestEnvironment } from "@fncts/test/control/TestEnvironment";
 import { ConsoleRenderer } from "@fncts/test/control/TestRenderer/ConsoleRenderer";
 import { Failed, Passed, rendered, Test } from "@fncts/test/data/ExecutionResult";
-import { TestConfig } from "@fncts/test/data/TestConfig";
+import { RenderParam } from "@fncts/test/data/RenderParam";
 import * as V from "vitest";
-import { GenerateStackTrace } from "@fncts/io/IO";
 
 export const describe = V.describe;
 
 export const suite = V.suite;
 
 export const it = (() => {
-  function runTest(test: Lazy<TestResult | void>) {
+  function runTest(test: Lazy<TestResult | Promise<void> | void>) {
     const result = test();
     if (!result) {
       return;
     }
+
+    if (isPromise(result)) {
+      return result;
+    }
+
     if (result.isFailure) {
       const lines = (assertionValues: Cons<AssertionValue<any>>) =>
         assertionValues.flatMap((value) => List.from(renderFragment(value, 0).lines));
-      const renderedResult = ConsoleRenderer.renderSingle(
-        result.invert.fold({
-          Value: (details) => rendered(Test, "", Failed, 0, lines(details.failureDetails.assertion)),
-          And: (l, r) => l && r,
-          Or: (l, r) => l || r,
-          Not: (v) => v.invert,
-        }),
-        TestAnnotationRenderer.Default,
-      );
+
+      const renderedResult = result.failures
+        .map((failures) =>
+          ConsoleRenderer.renderSingle(
+            failures.fold({
+              Value: (details) => rendered(Test, "", Failed, 0, lines(details.failureDetails.assertion)),
+              And: (l, r) => l && r,
+              Or: (l, r) => l || r,
+              Not: (v) => v.invert,
+            }),
+            TestAnnotationRenderer.Default,
+          ),
+        )
+        .getOrElse("Unknown Test Failure");
+
       const error = new Error(renderedResult);
       error.stack = undefined;
       throw error;
     }
   }
 
-  function it(name: string, test: Lazy<TestResult | void>, timeout = 5_000) {
-    return V.it.concurrent(name, () => runTest(test), timeout);
+  function it(name: string, test: Lazy<TestResult | Promise<void> | void>, options?: V.TestOptions) {
+    return V.it.concurrent(name, () => runTest(test), options);
   }
 
   function runTestIO<E>(io: Lazy<IO<TestEnvironment, E, TestResult>>) {
@@ -53,7 +63,7 @@ export const it = (() => {
           if (result.isFailure) {
             const lines = (assertionValues: Cons<AssertionValue<any>>) => {
               return assertionValues.flatMap((value) => List.from(renderFragment(value, 0).lines));
-            }
+            };
             const renderedResult = ConsoleRenderer.renderSingle(
               result.fold({
                 Value: (details) => rendered(Test, "", Passed, 0, lines(details.failureDetails.assertion)),
@@ -75,33 +85,40 @@ export const it = (() => {
       .unsafeRunPromise();
   }
 
-  function itIO<E>(name: string, io: Lazy<IO<TestEnvironment, E, TestResult>>, timeout = 5_000) {
-    return V.it.concurrent(name, () => runTestIO(io), timeout);
+  function itIO<E>(name: string, io: Lazy<IO<TestEnvironment, E, TestResult>>, options?: V.TestOptions) {
+    return V.it.concurrent(name, () => runTestIO(io), options);
   }
 
   return Object.assign(it, {
-    skip: (name: string, test: Lazy<TestResult | void>, timeout = 5_000) => {
-      return V.it.skip(name, () => runTest(test), timeout);
+    skip: (name: string, test: Lazy<TestResult | Promise<void> | void>, options?: V.TestOptions) => {
+      return V.it.skip(name, () => runTest(test), options);
     },
-    only: (name: string, test: Lazy<TestResult | void>, timeout = 5_000) => {
-      return V.it.only(name, () => runTest(test), timeout);
+    only: (name: string, test: Lazy<TestResult | Promise<void> | void>, options?: V.TestOptions) => {
+      return V.it.only(name, () => runTest(test), options);
     },
     check: check,
     checkIO: checkIO,
     checkAll: checkAllConcurrently,
     checkAllIO: checkAllIOConcurrently,
     io: Object.assign(itIO, {
-      scoped: <E>(name: string, io: Lazy<IO<TestEnvironment | Scope, E, TestResult>>, timeout = 5_000) => {
-        return itIO(name, io().scoped, timeout)
+      scoped: <E>(name: string, io: Lazy<IO<TestEnvironment | Scope, E, TestResult>>, options?: V.TestOptions) => {
+        return itIO(name, io().scoped, options);
       },
-      skip: <E>(name: string, io: Lazy<IO<TestEnvironment, E, TestResult>>, timeout = 5_000) => {
-        return V.it.skip(name, () => runTestIO(io), timeout);
+      skip: <E>(name: string, io: Lazy<IO<TestEnvironment, E, TestResult>>, options?: V.TestOptions) => {
+        return V.it.skip(name, () => runTestIO(io), options);
       },
-      only: <E, A>(name: string, io: Lazy<IO<TestEnvironment, E, TestResult>>, timeout = 5_000) => {
-        return V.it.only(name, () => runTestIO(io), timeout);
+      only: <E, A>(name: string, io: Lazy<IO<TestEnvironment, E, TestResult>>, options?: V.TestOptions) => {
+        return V.it.only(name, () => runTestIO(io), options);
       },
     }),
   });
 })();
 
 export const test = it;
+
+/**
+ * @tsplus static fncts.test.AssertionOps calledTimes
+ */
+export function calledTimes(times: number): Assertion<V.Mock> {
+  return Assertion.make("calledTimes", [RenderParam(times)], (mock) => mock.mock.calls.length === times);
+}

package/api.d.ts

@@ -20,7 +20,7 @@ export declare function assert<A>(assertion: Assertion<A>): (value: A) => TestRe
  * @tsplus pipeable fncts.io.IO assertIO
  * @tsplus location "@fncts/test/api"
  */
-export declare function assertIO<A>(assertion: AssertionIO<A>): <R, E>(io: import("@fncts/io/IO.js").IO<R, E, A>) => import("@fncts/io/IO.js").IO<R, E, TestResult>;
+export declare function assertIO<A>(assertion: AssertionIO<A>): <R, E>(io: IO<R, E, A>) => IO<R, E, TestResult>;
 export declare function suite<Specs extends ReadonlyArray<Spec<any, any>>>(label: string, ...specs: Specs): Spec<_R<Specs[number]>, _E<Specs[number]>>;
 export declare function testIO<R, E>(label: string, assertion: Lazy<IO<R, E, TestResult>>): Spec<R, E>;
 export declare function test(label: string, assertion: Lazy<TestResult>): Spec<never, never>;
@@ -28,19 +28,19 @@ export declare function test(label: string, assertion: Lazy<TestResult>): Spec<n
  * @tsplus pipeable fncts.test.Gen check
  * @tsplus location "@fncts/test/api"
  */
-export declare function check<A>(test: (a: A) => TestResult): <R>(rv: Gen<R, A>) => import("@fncts/io/IO.js").IO<TestConfig | R, never, TestResult>;
+export declare function check<A>(test: (a: A) => TestResult): <R>(rv: Gen<R, A>) => IO<R | TestConfig, never, TestResult>;
 /**
  * @tsplus pipeable fncts.test.Gen check
  * @tsplus location "@fncts/test/api"
  */
-export declare function checkIO<A, R1, E>(test: (a: A) => IO<R1, E, TestResult>): <R>(rv: Gen<R, A>) => import("@fncts/io/IO.js").IO<TestConfig | R1 | R, E, TestResult>;
+export declare function checkIO<A, R1, E>(test: (a: A) => IO<R1, E, TestResult>): <R>(rv: Gen<R, A>) => IO<R | R1 | TestConfig, E, TestResult>;
 /**
  * @tsplus pipeable fncts.test.Gen checkAllConcurrently
  * @tsplus location "@fncts/test/api"
  */
-export declare function checkAllConcurrently<A>(concurrency: number, test: (a: A) => TestResult): <R>(rv: Gen<R, A>) => import("@fncts/io/IO.js").IO<TestConfig | R, never, TestResult>;
+export declare function checkAllConcurrently<A>(concurrency: number, test: (a: A) => TestResult): <R>(rv: Gen<R, A>) => IO<R | TestConfig, never, TestResult>;
 /**
  * @tsplus pipeable fncts.test.Gen checkAllConcurrently
  * @tsplus location "@fncts/test/api"
  */
-export declare function checkAllIOConcurrently<A, R1, E>(concurrency: number, test: (a: A) => IO<R1, E, TestResult>): <R>(rv: Gen<R, A>) => import("@fncts/io/IO.js").IO<TestConfig | R1 | R, E, TestResult>;
+export declare function checkAllIOConcurrently<A, R1, E>(concurrency: number, test: (a: A) => IO<R1, E, TestResult>): <R>(rv: Gen<R, A>) => IO<R | R1 | TestConfig, E, TestResult>;

package/control/AbstractRunnableSpec.d.ts

@@ -23,4 +23,4 @@ export declare abstract class AbstractRunnableSpec<R, E> {
  * @tsplus pipeable-operator fncts.test.AbstractRunnableSpec +
  * @tsplus location "@fncts/test/control/AbstractRunnableSpec"
  */
-export declare function combine<R1, E1>(that: AbstractRunnableSpec<R1, E1>): <R, E>(self: AbstractRunnableSpec<R, E>) => AbstractRunnableSpec<R1 | R, E1 | E>;
+export declare function combine<R1, E1>(that: AbstractRunnableSpec<R1, E1>): <R, E>(self: AbstractRunnableSpec<R, E>) => AbstractRunnableSpec<R | R1, E | E1>;

package/control/Annotations/definition.d.ts

@@ -21,4 +21,4 @@ export declare abstract class Annotations {
  * @tsplus static fncts.test.AnnotationsOps Tag
  * @tsplus location "@fncts/test/control/Annotations/definition"
  */
-export declare const AnnotationsTag: import("@fncts/base/data/Tag.js").Tag<Annotations>;
+export declare const AnnotationsTag: import("@fncts/base/data/Tag.js").Tag<Annotations, Annotations>;

package/control/Annotations.d.ts

@@ -1,3 +1,3 @@
-export * from "./Annotations/api.js";
-export * from "./Annotations/definition.js";
 export * from "./Annotations/live.js";
+export * from "./Annotations/definition.js";
+export * from "./Annotations/api.js";

package/control/Assertion/api.d.ts

@@ -65,6 +65,7 @@ export declare const isTrue: Assertion<boolean>;
 export declare const isEmpty: Assertion<Iterable<any>>;
 export declare const isUnit: Assertion<void>;
 export declare function isLessThanOrEqualTo(n: number): Assertion<number>;
+export declare function isGreaterThanOrEqualTo(n: number): Assertion<number>;
 /**
  * @tsplus pipeable fncts.test.Assertion label
  * @tsplus location "@fncts/test/control/Assertion/api"
@@ -92,3 +93,4 @@ export declare function succeeds<A>(assertion: Assertion<A>): Assertion<Exit<any
  */
 export declare function test<A>(actual: A): (self: Assertion<A>) => boolean;
 export declare const completes: Assertion<unknown>;
+export declare function hasSize<A>(assertion: Assertion<number>): Assertion<Iterable<A>>;

package/control/Assertion.d.ts

@@ -1,2 +1,2 @@
-export * from "./Assertion/api.js";
 export * from "./Assertion/definition.js";
+export * from "./Assertion/api.js";

package/control/AssertionIO.d.ts

@@ -1,2 +1,2 @@
-export * from "./AssertionIO/api.js";
 export * from "./AssertionIO/definition.js";
+export * from "./AssertionIO/api.js";

package/control/DefaultTestReporter.d.ts

@@ -1,2 +1,2 @@
-export * from "./DefaultTestReporter/definition.js";
 export * from "./DefaultTestReporter/render.js";
+export * from "./DefaultTestReporter/definition.js";

package/control/FreeBooleanAlgebraIO/api.d.ts

@@ -5,13 +5,13 @@ import type { FreeBooleanAlgebraIO } from "./definition.js";
  * @tsplus pipeable-operator fncts.test.FreeBooleanAlgebraIO &&
  * @tsplus location "@fncts/test/control/FreeBooleanAlgebraIO/api"
  */
-export declare function and<R1, E1, A1>(that: FreeBooleanAlgebraIO<R1, E1, A1>): <R, E, A extends A1>(self: FreeBooleanAlgebraIO<R, E, A>) => FreeBooleanAlgebraIO<R1 | R, E1 | E, A1 | A>;
+export declare function and<R1, E1, A1>(that: FreeBooleanAlgebraIO<R1, E1, A1>): <R, E, A extends A1>(self: FreeBooleanAlgebraIO<R, E, A>) => FreeBooleanAlgebraIO<R | R1, E | E1, A | A1>;
 /**
  * @tsplus pipeable fncts.test.FreeBooleanAlgebraIO or
  * @tsplus pipeable-operator fncts.test.FreeBooleanAlgebraIO ||
  * @tsplus location "@fncts/test/control/FreeBooleanAlgebraIO/api"
  */
-export declare function or<R1, E1, A1>(that: FreeBooleanAlgebraIO<R1, E1, A1>): <R, E, A extends A1>(self: FreeBooleanAlgebraIO<R, E, A>) => FreeBooleanAlgebraIO<R1 | R, E1 | E, A1 | A>;
+export declare function or<R1, E1, A1>(that: FreeBooleanAlgebraIO<R1, E1, A1>): <R, E, A extends A1>(self: FreeBooleanAlgebraIO<R, E, A>) => FreeBooleanAlgebraIO<R | R1, E | E1, A | A1>;
 /**
  * @tsplus fluent fncts.test.FreeBooleanAlgebraIO invert
  * @tsplus location "@fncts/test/control/FreeBooleanAlgebraIO/api"

package/control/FreeBooleanAlgebraIO.d.ts

@@ -1,2 +1,2 @@
-export * from "./FreeBooleanAlgebraIO/api.js";
 export * from "./FreeBooleanAlgebraIO/definition.js";
+export * from "./FreeBooleanAlgebraIO/api.js";

package/control/Gen/api.d.ts

@@ -52,12 +52,12 @@ export declare function array<R, A>(self: Gen<R, A>): Gen<R | Sized, ReadonlyArr
  * @tsplus pipeable fncts.test.Gen arrayWith
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function arrayWith(constraints?: LengthConstraints): <R, A>(g: Gen<R, A>) => Gen<Sized | R, readonly A[]>;
+export declare function arrayWith(constraints?: LengthConstraints): <R, A>(g: Gen<R, A>) => Gen<R | Sized, ReadonlyArray<A>>;
 /**
  * @tsplus pipeable fncts.test.Gen arrayN
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function arrayN(n: number): <R, A>(self: Gen<R, A>) => Gen<R, readonly A[]>;
+export declare function arrayN(n: number): <R, A>(self: Gen<R, A>) => Gen<R, ReadonlyArray<A>>;
 /**
  * @tsplus static fncts.test.GenOps arrayInt64
  * @tsplus location "@fncts/test/control/Gen/api"
@@ -122,7 +122,7 @@ export declare const char16: Gen<never, string>;
  * @tsplus pipeable fncts.test.Gen conc
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function concWith(constraints?: LengthConstraints): <R, A>(self: Gen<R, A>) => Gen<Sized | R, import("@fncts/base/collection/immutable/Conc.js").Conc<A>>;
+export declare function concWith(constraints?: LengthConstraints): <R, A>(self: Gen<R, A>) => Gen<R | Sized, Conc<A>>;
 /**
  * @tsplus getter fncts.test.Gen conc
  * @tsplus static fncts.test.GenOps conc
@@ -133,7 +133,7 @@ export declare function conc<R, A>(self: Gen<R, A>): Gen<R | Sized, Conc<A>>;
  * @tsplus pipeable fncts.test.Gen concN
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function concN(n: number): <R, A>(g: Gen<R, A>) => Gen<R, import("@fncts/base/collection/immutable/Conc.js").Conc<A>>;
+export declare function concN(n: number): <R, A>(g: Gen<R, A>) => Gen<R, Conc<A>>;
 /**
  * @tsplus static fncts.test.GenOps constant
  * @tsplus location "@fncts/test/control/Gen/api"
@@ -179,7 +179,7 @@ export declare function filterNot<A>(p: Predicate<A>): <R>(fa: Gen<R, A>) => Gen
  * @tsplus pipeable fncts.test.Gen flatMap
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function flatMap<A, R1, B>(f: (a: A) => Gen<R1, B>): <R>(ma: Gen<R, A>) => Gen<R1 | R, B>;
+export declare function flatMap<A, R1, B>(f: (a: A) => Gen<R1, B>): <R>(ma: Gen<R, A>) => Gen<R | R1, B>;
 /**
  * @tsplus getter fncts.test.Gen flatten
  * @tsplus location "@fncts/test/control/Gen/api"
@@ -244,7 +244,7 @@ export declare function map<A, B>(f: (a: A) => B): <R>(self: Gen<R, A>) => Gen<R
  * @tsplus pipeable fncts.test.Gen mapIO
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function mapIO<A, R1, B>(f: (a: A) => IO<R1, never, B>): <R>(self: Gen<R, A>) => Gen<R1 | R, B>;
+export declare function mapIO<A, R1, B>(f: (a: A) => IO<R1, never, B>): <R>(self: Gen<R, A>) => Gen<R | R1, B>;
 /**
  * @tsplus static fncts.test.GenOps medium
  * @tsplus location "@fncts/test/control/Gen/api"
@@ -281,7 +281,7 @@ export declare const printableChar: Gen<never, string>;
  * @tsplus pipeable fncts.test.Gen reshrink
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function reshrink<A, R1, B>(f: (a: A) => Sample<R1, B>): <R>(gen: Gen<R, A>) => Gen<R1 | R, B>;
+export declare function reshrink<A, R1, B>(f: (a: A) => Sample<R1, B>): <R>(gen: Gen<R, A>) => Gen<R | R1, B>;
 /**
  * @tsplus static fncts.test.GenOps sized
  * @tsplus location "@fncts/test/control/Gen/api"
@@ -301,7 +301,7 @@ export declare function string16(constraints?: LengthConstraints): Gen<Sized, st
  * @tsplus pipeable fncts.test.Gen string
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function string(constraints?: LengthConstraints): <R>(char: Gen<R, string>) => Gen<Sized | R, string>;
+export declare function string(constraints?: LengthConstraints): <R>(char: Gen<R, string>) => Gen<R | Sized, string>;
 /**
  * @tsplus pipeable fncts.test.Gen stringN
  * @tsplus location "@fncts/test/control/Gen/api"
@@ -338,17 +338,17 @@ export declare function unicodeString(constraints?: LengthConstraints): Gen<Size
  * @tsplus pipeable fncts.test.Gen uniqueArray
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function uniqueArray<A>(constraints?: LengthConstraints & EqConstraint<A>): <R>(gen: Gen<R, A>) => Gen<Sized | R, readonly A[]>;
+export declare function uniqueArray<A>(constraints?: LengthConstraints & EqConstraint<A>): <R>(gen: Gen<R, A>) => Gen<Sized | R, ReadonlyArray<A>>;
 /**
  * @tsplus pipeable fncts.test.Gen uniqueConc
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function uniqueConc<A>(constraints?: LengthConstraints & EqConstraint<A>): <R>(self: Gen<R, A>) => Gen<Sized | R, import("@fncts/base/collection/immutable/Conc.js").Conc<A>>;
+export declare function uniqueConc<A>(constraints?: LengthConstraints & EqConstraint<A>): <R>(self: Gen<R, A>) => Gen<Sized | R, Conc<A>>;
 /**
  * @tsplus pipeable fncts.test.Gen uniqueConcN
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function uniqueConcN<A>(n: number, /** @tsplus auto */ E: Eq<A>): <R>(self: Gen<R, A>) => Gen<R, import("@fncts/base/collection/immutable/Conc.js").Conc<A>>;
+export declare function uniqueConcN<A>(n: number, /** @tsplus auto */ E: Eq<A>): <R>(self: Gen<R, A>) => Gen<R, Conc<A>>;
 /**
  * @tsplus static fncts.test.GenOps unwrap
  * @tsplus location "@fncts/test/control/Gen/api"
@@ -363,12 +363,12 @@ export declare function weighted<R, A>(...gens: ReadonlyArray<readonly [Gen<R, A
  * @tsplus pipeable fncts.test.Gen zipWith
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function zipWith<A, R1, B, C>(that: Gen<R1, B>, f: (a: A, b: B) => C): <R>(self: Gen<R, A>) => Gen<R1 | R, C>;
+export declare function zipWith<A, R1, B, C>(that: Gen<R1, B>, f: (a: A, b: B) => C): <R>(self: Gen<R, A>) => Gen<R | R1, C>;
 /**
  * @tsplus pipeable fncts.test.Gen zip
  * @tsplus location "@fncts/test/control/Gen/api"
  */
-export declare function zip<R1, B>(that: Gen<R1, B>): <R, A>(self: Gen<R, A>) => Gen<R1 | R, readonly [A, B]>;
+export declare function zip<R1, B>(that: Gen<R1, B>): <R, A>(self: Gen<R, A>) => Gen<R | R1, readonly [A, B]>;
 /**
  * @tsplus static fncts.test.GenOps tuple
  * @tsplus location "@fncts/test/control/Gen/api"

package/control/Gen.d.ts

@@ -1,3 +1,3 @@
-export * from "./Gen/api.js";
-export * from "./Gen/constraints.js";
 export * from "./Gen/definition.js";
+export * from "./Gen/constraints.js";
+export * from "./Gen/api.js";

package/control/Live/definition.d.ts

@@ -5,7 +5,7 @@ import { IOEnv } from "@fncts/io/IOEnv";
  * @tsplus static fncts.test.LiveOps Tag
  * @tsplus location "@fncts/test/control/Live/definition"
  */
-export declare const LiveTag: import("@fncts/base/data/Tag").Tag<Live>;
+export declare const LiveTag: import("@fncts/base/data/Tag").Tag<Live, Live>;
 /**
  * @tsplus companion fncts.test.LiveOps
  */
@@ -23,4 +23,4 @@ export declare function liveWith<R, E, A>(f: (live: Live) => IO<R, E, A>): IO<R
  * @tsplus static fncts.test.LiveOps withLive
  * @tsplus location "@fncts/test/control/Live/definition"
  */
-export declare function withLive<R extends Live, E, A>(io: IO<R, E, A>): <E1, B>(f: (_: IO<R, E, A>) => import("@fncts/io/IO").IO<R, E1, B>) => import("@fncts/io/IO").IO<Live | R, E1, B>;
+export declare function withLive<R extends Live, E, A>(io: IO<R, E, A>): <E1, B>(f: (_: IO<R, E, A>) => IO<R, E1, B>) => IO<R | Live, E1, B>;

package/control/Sample/api.d.ts

@@ -11,17 +11,17 @@ import { Sample } from "./definition.js";
  * @tsplus pipeable fncts.test.Sample flatMap
  * @tsplus location "@fncts/test/control/Sample/api"
  */
-export declare function flatMap<A, R1, B>(f: (a: A) => Sample<R1, B>): <R>(ma: Sample<R, A>) => Sample<R1 | R, B>;
+export declare function flatMap<A, R1, B>(f: (a: A) => Sample<R1, B>): <R>(ma: Sample<R, A>) => Sample<R | R1, B>;
 /**
  * @tsplus pipeable fncts.test.Sample filter
  * @tsplus location "@fncts/test/control/Sample/api"
  */
-export declare function filter<A>(f: Predicate<A>): <R>(ma: Sample<R, A>) => import("@fncts/io/Stream.js").Stream<R, never, import("@fncts/base/data/Maybe.js").Maybe<Sample<R, A>>>;
+export declare function filter<A>(f: Predicate<A>): <R>(ma: Sample<R, A>) => Stream<R, never, Maybe<Sample<R, A>>>;
 /**
  * @tsplus pipeable fncts.test.Sample foreach
  * @tsplus location "@fncts/test/control/Sample/api"
  */
-export declare function foreach<A, R1, B>(f: (a: A) => IO<R1, never, B>): <R>(ma: Sample<R, A>) => import("@fncts/io/IO.js").IO<R1 | R, never, Sample<R1 | R, B>>;
+export declare function foreach<A, R1, B>(f: (a: A) => IO<R1, never, B>): <R>(ma: Sample<R, A>) => IO<R | R1, never, Sample<R | R1, B>>;
 /**
  * @tsplus pipeable fncts.test.Sample map
  * @tsplus location "@fncts/test/control/Sample/api"
@@ -31,7 +31,7 @@ export declare function map<A, B>(f: (a: A) => B): <R>(ma: Sample<R, A>) => Samp
  * @tsplus pipeable fncts.test.Sample shrinkSearch
  * @tsplus location "@fncts/test/control/Sample/api"
  */
-export declare function shrinkSearch<A>(p: Predicate<A>): <R>(ma: Sample<R, A>) => import("@fncts/io/Stream.js").Stream<R, never, A>;
+export declare function shrinkSearch<A>(p: Predicate<A>): <R>(ma: Sample<R, A>) => Stream<R, never, A>;
 /**
  * @tsplus static fncts.test.SampleOps unfold
  * @tsplus location "@fncts/test/control/Sample/api"
@@ -41,12 +41,12 @@ export declare function unfold<R, A, S>(s: S, f: (s: S) => readonly [A, Stream<R
  * @tsplus pipeable fncts.test.Sample zip
  * @tsplus location "@fncts/test/control/Sample/api"
  */
-export declare function zip<R1, B>(mb: Sample<R1, B>): <R, A>(ma: Sample<R, A>) => Sample<R1 | R, readonly [A, B]>;
+export declare function zip<R1, B>(mb: Sample<R1, B>): <R, A>(ma: Sample<R, A>) => Sample<R | R1, readonly [A, B]>;
 /**
  * @tsplus pipeable fncts.test.Sample zipWith
  * @tsplus location "@fncts/test/control/Sample/api"
  */
-export declare function zipWith<A, R1, B, C>(mb: Sample<R1, B>, f: (a: A, b: B) => C): <R>(ma: Sample<R, A>) => Sample<R1 | R, C>;
+export declare function zipWith<A, R1, B, C>(mb: Sample<R1, B>, f: (a: A, b: B) => C): <R>(ma: Sample<R, A>) => Sample<R | R1, C>;
 /**
  * @tsplus static fncts.test.SampleOps noShrink
  * @tsplus location "@fncts/test/control/Sample/api"

package/control/Sample.d.ts

@@ -1,2 +1,2 @@
-export * from "./Sample/api.js";
 export * from "./Sample/definition.js";
+export * from "./Sample/api.js";

package/control/Sized/api.d.ts

@@ -9,4 +9,4 @@ export declare const size: URIO<Sized, number>;
  * @tsplus static fncts.test.SizedOps withSize
  * @tsplus location "@fncts/test/control/Sized/api"
  */
-export declare function withSize(size: number): <R, E, A>(io: import("@fncts/io/IO.js").IO<R, E, A>) => import("@fncts/io/IO.js").IO<Sized | R, E, A>;
+export declare function withSize(size: number): <R, E, A>(io: IO<R, E, A>) => IO<R | Sized, E, A>;

package/control/Sized/definition.d.ts

@@ -11,4 +11,4 @@ export declare abstract class Sized {
  * @tsplus static fncts.test.SizedOps Tag
  * @tsplus location "@fncts/test/control/Sized/definition"
  */
-export declare const SizedTag: import("@fncts/base/data/Tag").Tag<Sized>;
+export declare const SizedTag: import("@fncts/base/data/Tag").Tag<Sized, Sized>;

package/control/Sized.d.ts

@@ -1,3 +1,3 @@
-export * from "./Sized/api.js";
-export * from "./Sized/definition.js";
 export * from "./Sized/live.js";
+export * from "./Sized/definition.js";
+export * from "./Sized/api.js";

package/control/Spec/api.d.ts

@@ -25,7 +25,7 @@ export declare function annotated<R, E, T>(spec: PSpec<R, E, T>): PSpec<R | Anno
  * @tsplus pipeable fncts.test.PSpec combine
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function combine<R1, E1, T1>(that: PSpec<R1, E1, T1>): <R, E, T>(self: PSpec<R, E, T>) => PSpec<R1 | R, E1 | E, T1 | T>;
+export declare function combine<R1, E1, T1>(that: PSpec<R1, E1, T1>): <R, E, T>(self: PSpec<R, E, T>) => PSpec<R | R1, E | E1, T | T1>;
 /**
  * @tsplus pipeable fncts.test.PSpec contramapEnvironment
  * @tsplus location "@fncts/test/control/Spec/api"
@@ -35,7 +35,7 @@ export declare function contramapEnvironment<R, R0>(f: (r0: Environment<R0>) =>
  * @tsplus pipeable fncts.test.PSpec countTests
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function countTests<T>(f: (t: T) => boolean): <R, E>(spec: PSpec<R, E, T>) => import("@fncts/io/IO.js").IO<import("@fncts/io/Scope.js").Scope | R, E, number>;
+export declare function countTests<T>(f: (t: T) => boolean): <R, E>(spec: PSpec<R, E, T>) => IO<R | Scope, E, number>;
 /**
  * @tsplus static fncts.test.PSpecOps empty
  * @tsplus location "@fncts/test/control/Spec/api"
@@ -51,22 +51,22 @@ export declare function exec<R, E, T>(spec: PSpec<R, E, T>, exec: ExecutionStrat
  * @tsplus pipeable fncts.test.PSpec execute
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function execute(defExec: ExecutionStrategy): <R, E, T>(self: PSpec<R, E, T>) => import("@fncts/io/IO.js").IO<import("@fncts/io/Scope.js").Scope | R, never, PSpec<never, E, T>>;
+export declare function execute(defExec: ExecutionStrategy): <R, E, T>(self: PSpec<R, E, T>) => IO<R | Scope, never, PSpec<never, E, T>>;
 /**
  * @tsplus pipeable fncts.test.PSpec filterAnnotations
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function filterAnnotations<V>(key: TestAnnotation<V>, f: (v: V) => boolean): <R, E, T>(spec: PSpec<R, E, T>) => import("@fncts/base/data/Maybe.js").Maybe<PSpec<R, E, T>>;
+export declare function filterAnnotations<V>(key: TestAnnotation<V>, f: (v: V) => boolean): <R, E, T>(spec: PSpec<R, E, T>) => Maybe<PSpec<R, E, T>>;
 /**
  * @tsplus pipeable fncts.test.PSpec filterLabels
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function filterLabels(f: (label: string) => boolean): <R, E, T>(spec: PSpec<R, E, T>) => import("@fncts/base/data/Maybe.js").Maybe<PSpec<R, E, T>>;
+export declare function filterLabels(f: (label: string) => boolean): <R, E, T>(spec: PSpec<R, E, T>) => Maybe<PSpec<R, E, T>>;
 /**
  * @tsplus pipeable fncts.test.PSpec filterTags
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function filterTags(f: (tag: string) => boolean): <R, E, T>(spec: PSpec<R, E, T>) => import("@fncts/base/data/Maybe.js").Maybe<PSpec<R, E, T>>;
+export declare function filterTags(f: (tag: string) => boolean): <R, E, T>(spec: PSpec<R, E, T>) => Maybe<PSpec<R, E, T>>;
 /**
  * @tsplus pipeable fncts.test.PSpec filterByArgs
  * @tsplus location "@fncts/test/control/Spec/api"
@@ -86,7 +86,7 @@ export declare function foldScoped<R, E, T, R1, E1, Z>(f: (_: SpecCase<R, E, T,
  * @tsplus pipeable fncts.test.PSpec foreachExec
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function foreachExec<E, T, R1, E1, A, R2, E2, B>(failure: (c: Cause<E>) => IO<R1, E1, A>, success: (t: T) => IO<R2, E2, B>, defExec: ExecutionStrategy): <R>(spec: PSpec<R, E, T>) => import("@fncts/io/IO.js").IO<import("@fncts/io/Scope.js").Scope | R1 | R2 | R, never, PSpec<R1 | R2 | R, E1 | E2, A | B>>;
+export declare function foreachExec<E, T, R1, E1, A, R2, E2, B>(failure: (c: Cause<E>) => IO<R1, E1, A>, success: (t: T) => IO<R2, E2, B>, defExec: ExecutionStrategy): <R>(spec: PSpec<R, E, T>) => IO<R | R1 | R2 | Scope, never, PSpec<R | R1 | R2, E1 | E2, A | B>>;
 /**
  * @tsplus fluent fncts.test.PSpec labeled
  * @tsplus static fncts.test.PSpecOps labeled
@@ -146,9 +146,9 @@ export declare function annotate<V>(key: TestAnnotation<V>, value: V): <R, E, T>
  * @tsplus pipeable fncts.test.PSpec whenIO
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function whenIO<R1, E1>(b: IO<R1, E1, boolean>): <R, E>(self: PSpec<R, E, TestSuccess>) => PSpec<Annotations | R1 | R, E1 | E, TestSuccess>;
+export declare function whenIO<R1, E1>(b: IO<R1, E1, boolean>): <R, E>(self: PSpec<R, E, TestSuccess>) => PSpec<R | R1 | Annotations, E | E1, TestSuccess>;
 /**
  * @tsplus pipeable fncts.test.PSpec when
  * @tsplus location "@fncts/test/control/Spec/api"
  */
-export declare function when(b: Lazy<boolean>): <R, E>(self: PSpec<R, E, TestSuccess>) => PSpec<Annotations | R, E, TestSuccess>;
+export declare function when(b: Lazy<boolean>): <R, E>(self: PSpec<R, E, TestSuccess>) => PSpec<R | Annotations, E, TestSuccess>;

package/control/Spec.d.ts

@@ -1,2 +1,2 @@
-export * from "./Spec/api.js";
 export * from "./Spec/definition.js";
+export * from "./Spec/api.js";

package/control/TestAnnotationRenderer.d.ts

@@ -1,2 +1,2 @@
-export * from "./TestAnnotationRenderer/api.js";
 export * from "./TestAnnotationRenderer/definition.js";
+export * from "./TestAnnotationRenderer/api.js";

package/control/TestAspect.d.ts

@@ -1,2 +1,2 @@
-export * from "./TestAspect/api.js";
 export * from "./TestAspect/definition.js";
+export * from "./TestAspect/api.js";

package/control/TestClock/definition.d.ts

@@ -42,7 +42,7 @@ export declare const Done: WarningData;
  * @tsplus static fncts.test.TestClockOps Tag
  * @tsplus location "@fncts/test/control/TestClock/definition"
  */
-export declare const TestClockTag: import("@fncts/base/data/Tag").Tag<TestClock>;
+export declare const TestClockTag: import("@fncts/base/data/Tag").Tag<TestClock, TestClock>;
 /**
  * @tsplus type fncts.test.TestClock
  * @tsplus companion fncts.test.TestClockOps

package/control/TestClock.d.ts

@@ -1,2 +1,2 @@
-export * from "./TestClock/api.js";
 export * from "./TestClock/definition.js";
+export * from "./TestClock/api.js";

package/control/TestConsole/definition.d.ts

@@ -37,4 +37,4 @@ export declare class TestConsole implements Console {
  * @tsplus static fncts.test.TestConsoleOps Tag
  * @tsplus location "@fncts/test/control/TestConsole/definition"
  */
-export declare const TestConsoleTag: import("@fncts/base/data/Tag").Tag<TestConsole>;
+export declare const TestConsoleTag: import("@fncts/base/data/Tag").Tag<TestConsole, TestConsole>;

package/control/TestConsole.d.ts

@@ -1,2 +1,2 @@
-export * from "./TestConsole/api.js";
 export * from "./TestConsole/definition.js";
+export * from "./TestConsole/api.js";

package/control/TestLogger.d.ts

@@ -11,7 +11,7 @@ export declare abstract class TestLogger {
  * @tsplus static fncts.test.TestLoggerOps Tag
  * @tsplus location "@fncts/test/control/TestLogger"
  */
-export declare const TestLoggerTag: import("@fncts/base/data/Tag").Tag<TestLogger>;
+export declare const TestLoggerTag: import("@fncts/base/data/Tag").Tag<TestLogger, TestLogger>;
 /**
  * @tsplus static fncts.test.TestLoggerOps fromConsole
  * @tsplus location "@fncts/test/control/TestLogger"

package/control/TestRandom/api.d.ts

@@ -41,7 +41,7 @@ export declare function make(initialData: Data): Layer<never, never, Random | Te
  * @tsplus static fncts.test.TestRandomOps Deterministic
  * @tsplus location "@fncts/test/control/TestRandom/api"
  */
-export declare const determinictic: import("@fncts/io/Layer").Layer<never, never, import("@fncts/io/Random").Random | TestRandom>;
+export declare const determinictic: import("@fncts/io/Layer").Layer<never, never, TestRandom | import("@fncts/io/Random").Random>;
 /**
  * @tsplus static fncts.test.TestRandomOps Random
  * @tsplus location "@fncts/test/control/TestRandom/api"

package/control/TestRandom/definition.d.ts

@@ -11,7 +11,7 @@ import type { ArrayInt } from "@fncts/base/util/rand";
  * @tsplus static fncts.test.TestRandomOps Tag
  * @tsplus location "@fncts/test/control/TestRandom/definition"
  */
-export declare const TestRandomTag: import("@fncts/base/data/Tag").Tag<TestRandom>;
+export declare const TestRandomTag: import("@fncts/base/data/Tag").Tag<TestRandom, TestRandom>;
 /**
  * @tsplus type fncts.test.TestRandom
  * @tsplus companion fncts.test.TestRandomOps

package/control/TestRandom.d.ts

@@ -1,2 +1,2 @@
-export * from "./TestRandom/api.js";
 export * from "./TestRandom/definition.js";
+export * from "./TestRandom/api.js";