effect 2.2.5 → 2.3.0

package/src/TestServices.ts

@@ -55,7 +55,7 @@ export const currentServices: FiberRef.FiberRef<Context.Context<TestServices>> =
  *
  * @since 2.0.0
  */
-export const annotations = (): Effect.Effect<never, never, Annotations.TestAnnotations> => annotationsWith(core.succeed)
+export const annotations = (): Effect.Effect<Annotations.TestAnnotations> => annotationsWith(core.succeed)
 
 /**
  * Retrieves the `Annotations` service for this test and uses it to run the
@@ -63,9 +63,9 @@ export const annotations = (): Effect.Effect<never, never, Annotations.TestAnnot
  *
  * @since 2.0.0
  */
-export const annotationsWith = <R, E, A>(
-  f: (annotations: Annotations.TestAnnotations) => Effect.Effect<R, E, A>
-): Effect.Effect<R, E, A> =>
+export const annotationsWith = <A, E, R>(
+  f: (annotations: Annotations.TestAnnotations) => Effect.Effect<A, E, R>
+): Effect.Effect<A, E, R> =>
   core.fiberRefGetWith(
     currentServices,
     (services) => f(Context.get(services, Annotations.TestAnnotations))
@@ -78,8 +78,8 @@ export const annotationsWith = <R, E, A>(
  * @since 2.0.0
  */
 export const withAnnotations = dual<
-  (annotations: Annotations.TestAnnotations) => <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>,
-  <R, E, A>(effect: Effect.Effect<R, E, A>, annotations: Annotations.TestAnnotations) => Effect.Effect<R, E, A>
+  (annotations: Annotations.TestAnnotations) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>,
+  <A, E, R>(effect: Effect.Effect<A, E, R>, annotations: Annotations.TestAnnotations) => Effect.Effect<A, E, R>
 >(2, (effect, annotations) =>
   core.fiberRefLocallyWith(
     currentServices,
@@ -94,7 +94,7 @@ export const withAnnotations = dual<
  */
 export const withAnnotationsScoped = (
   annotations: Annotations.TestAnnotations
-): Effect.Effect<Scope.Scope, never, void> =>
+): Effect.Effect<void, never, Scope.Scope> =>
   fiberRuntime.fiberRefLocallyScopedWith(
     currentServices,
     Context.add(Annotations.TestAnnotations, annotations)
@@ -105,7 +105,7 @@ export const withAnnotationsScoped = (
  *
  * @since 2.0.0
  */
-export const annotationsLayer = (): Layer.Layer<never, never, Annotations.TestAnnotations> =>
+export const annotationsLayer = (): Layer.Layer<Annotations.TestAnnotations> =>
   layer.scoped(
     Annotations.TestAnnotations,
     pipe(
@@ -121,7 +121,7 @@ export const annotationsLayer = (): Layer.Layer<never, never, Annotations.TestAn
  *
  * @since 2.0.0
  */
-export const get = <A>(key: TestAnnotation.TestAnnotation<A>): Effect.Effect<never, never, A> =>
+export const get = <A>(key: TestAnnotation.TestAnnotation<A>): Effect.Effect<A> =>
   annotationsWith((annotations) => annotations.get(key))
 
 /**
@@ -130,7 +130,7 @@ export const get = <A>(key: TestAnnotation.TestAnnotation<A>): Effect.Effect<nev
  *
  * @since 2.0.0
  */
-export const annotate = <A>(key: TestAnnotation.TestAnnotation<A>, value: A): Effect.Effect<never, never, void> =>
+export const annotate = <A>(key: TestAnnotation.TestAnnotation<A>, value: A): Effect.Effect<void> =>
   annotationsWith((annotations) => annotations.annotate(key, value))
 
 /**
@@ -139,8 +139,6 @@ export const annotate = <A>(key: TestAnnotation.TestAnnotation<A>, value: A): Ef
  * @since 2.0.0
  */
 export const supervisedFibers = (): Effect.Effect<
-  never,
-  never,
   SortedSet.SortedSet<Fiber.RuntimeFiber<unknown, unknown>>
 > => annotationsWith((annotations) => annotations.supervisedFibers)
 
@@ -150,7 +148,7 @@ export const supervisedFibers = (): Effect.Effect<
  *
  * @since 2.0.0
  */
-export const liveWith = <R, E, A>(f: (live: Live.TestLive) => Effect.Effect<R, E, A>): Effect.Effect<R, E, A> =>
+export const liveWith = <A, E, R>(f: (live: Live.TestLive) => Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
   core.fiberRefGetWith(currentServices, (services) => f(Context.get(services, Live.TestLive)))
 
 /**
@@ -158,7 +156,7 @@ export const liveWith = <R, E, A>(f: (live: Live.TestLive) => Effect.Effect<R, E
  *
  * @since 2.0.0
  */
-export const live: Effect.Effect<never, never, Live.TestLive> = liveWith(core.succeed)
+export const live: Effect.Effect<Live.TestLive> = liveWith(core.succeed)
 
 /**
  * Executes the specified workflow with the specified implementation of the
@@ -167,8 +165,8 @@ export const live: Effect.Effect<never, never, Live.TestLive> = liveWith(core.su
  * @since 2.0.0
  */
 export const withLive = dual<
-  (live: Live.TestLive) => <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>,
-  <R, E, A>(effect: Effect.Effect<R, E, A>, live: Live.TestLive) => Effect.Effect<R, E, A>
+  (live: Live.TestLive) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>,
+  <A, E, R>(effect: Effect.Effect<A, E, R>, live: Live.TestLive) => Effect.Effect<A, E, R>
 >(2, (effect, live) =>
   core.fiberRefLocallyWith(
     currentServices,
@@ -181,7 +179,7 @@ export const withLive = dual<
  *
  * @since 2.0.0
  */
-export const withLiveScoped = (live: Live.TestLive): Effect.Effect<Scope.Scope, never, void> =>
+export const withLiveScoped = (live: Live.TestLive): Effect.Effect<void, never, Scope.Scope> =>
   fiberRuntime.fiberRefLocallyScopedWith(currentServices, Context.add(Live.TestLive, live))
 
 /**
@@ -189,7 +187,7 @@ export const withLiveScoped = (live: Live.TestLive): Effect.Effect<Scope.Scope,
  *
  * @since 2.0.0
  */
-export const liveLayer = (): Layer.Layer<DefaultServices.DefaultServices, never, Live.TestLive> =>
+export const liveLayer = (): Layer.Layer<Live.TestLive, never, DefaultServices.DefaultServices> =>
   layer.scoped(
     Live.TestLive,
     pipe(
@@ -204,7 +202,7 @@ export const liveLayer = (): Layer.Layer<DefaultServices.DefaultServices, never,
  *
  * @since 2.0.0
  */
-export const provideLive = <R, E, A>(effect: Effect.Effect<R, E, A>): Effect.Effect<R, E, A> =>
+export const provideLive = <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
   liveWith((live) => live.provide(effect))
 
 /**
@@ -214,13 +212,13 @@ export const provideLive = <R, E, A>(effect: Effect.Effect<R, E, A>): Effect.Eff
  * @since 2.0.0
  */
 export const provideWithLive = dual<
-  <R, E, A, R2, E2, A2>(
-    f: (effect: Effect.Effect<R, E, A>) => Effect.Effect<R2, E2, A2>
-  ) => (self: Effect.Effect<R, E, A>) => Effect.Effect<R | R2, E | E2, A2>,
-  <R, E, A, R2, E2, A2>(
-    self: Effect.Effect<R, E, A>,
-    f: (effect: Effect.Effect<R, E, A>) => Effect.Effect<R2, E2, A2>
-  ) => Effect.Effect<R | R2, E | E2, A2>
+  <A, E, R, A2, E2, R2>(
+    f: (effect: Effect.Effect<A, E, R>) => Effect.Effect<A2, E2, R2>
+  ) => (self: Effect.Effect<A, E, R>) => Effect.Effect<A2, E | E2, R | R2>,
+  <A, E, R, A2, E2, R2>(
+    self: Effect.Effect<A, E, R>,
+    f: (effect: Effect.Effect<A, E, R>) => Effect.Effect<A2, E2, R2>
+  ) => Effect.Effect<A2, E | E2, R | R2>
 >(2, (self, f) =>
   core.fiberRefGetWith(
     defaultServices.currentServices,
@@ -233,7 +231,7 @@ export const provideWithLive = dual<
  *
  * @since 2.0.0
  */
-export const sizedWith = <R, E, A>(f: (sized: Sized.TestSized) => Effect.Effect<R, E, A>): Effect.Effect<R, E, A> =>
+export const sizedWith = <A, E, R>(f: (sized: Sized.TestSized) => Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
   core.fiberRefGetWith(
     currentServices,
     (services) => f(Context.get(services, Sized.TestSized))
@@ -244,7 +242,7 @@ export const sizedWith = <R, E, A>(f: (sized: Sized.TestSized) => Effect.Effect<
  *
  * @since 2.0.0
  */
-export const sized: Effect.Effect<never, never, Sized.TestSized> = sizedWith(core.succeed)
+export const sized: Effect.Effect<Sized.TestSized> = sizedWith(core.succeed)
 
 /**
  * Executes the specified workflow with the specified implementation of the
@@ -253,8 +251,8 @@ export const sized: Effect.Effect<never, never, Sized.TestSized> = sizedWith(cor
  * @since 2.0.0
  */
 export const withSized = dual<
-  (sized: Sized.TestSized) => <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>,
-  <R, E, A>(effect: Effect.Effect<R, E, A>, sized: Sized.TestSized) => Effect.Effect<R, E, A>
+  (sized: Sized.TestSized) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>,
+  <A, E, R>(effect: Effect.Effect<A, E, R>, sized: Sized.TestSized) => Effect.Effect<A, E, R>
 >(2, (effect, sized) =>
   core.fiberRefLocallyWith(
     currentServices,
@@ -267,13 +265,13 @@ export const withSized = dual<
  *
  * @since 2.0.0
  */
-export const withSizedScoped = (sized: Sized.TestSized): Effect.Effect<Scope.Scope, never, void> =>
+export const withSizedScoped = (sized: Sized.TestSized): Effect.Effect<void, never, Scope.Scope> =>
   fiberRuntime.fiberRefLocallyScopedWith(currentServices, Context.add(Sized.TestSized, sized))
 
 /**
  * @since 2.0.0
  */
-export const sizedLayer = (size: number): Layer.Layer<never, never, Sized.TestSized> =>
+export const sizedLayer = (size: number): Layer.Layer<Sized.TestSized> =>
   layer.scoped(
     Sized.TestSized,
     pipe(
@@ -286,14 +284,14 @@ export const sizedLayer = (size: number): Layer.Layer<never, never, Sized.TestSi
 /**
  * @since 2.0.0
  */
-export const size: Effect.Effect<never, never, number> = sizedWith((sized) => sized.size)
+export const size: Effect.Effect<number> = sizedWith((sized) => sized.size)
 
 /**
  * @since 2.0.0
  */
 export const withSize = dual<
-  (size: number) => <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>,
-  <R, E, A>(effect: Effect.Effect<R, E, A>, size: number) => Effect.Effect<R, E, A>
+  (size: number) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>,
+  <A, E, R>(effect: Effect.Effect<A, E, R>, size: number) => Effect.Effect<A, E, R>
 >(2, (effect, size) => sizedWith((sized) => sized.withSize(size)(effect)))
 
 /**
@@ -302,9 +300,9 @@ export const withSize = dual<
  *
  * @since 2.0.0
  */
-export const testConfigWith = <R, E, A>(
-  f: (config: TestConfig.TestConfig) => Effect.Effect<R, E, A>
-): Effect.Effect<R, E, A> =>
+export const testConfigWith = <A, E, R>(
+  f: (config: TestConfig.TestConfig) => Effect.Effect<A, E, R>
+): Effect.Effect<A, E, R> =>
   core.fiberRefGetWith(
     currentServices,
     (services) => f(Context.get(services, TestConfig.TestConfig))
@@ -315,7 +313,7 @@ export const testConfigWith = <R, E, A>(
  *
  * @since 2.0.0
  */
-export const testConfig: Effect.Effect<never, never, TestConfig.TestConfig> = testConfigWith(core.succeed)
+export const testConfig: Effect.Effect<TestConfig.TestConfig> = testConfigWith(core.succeed)
 
 /**
  * Executes the specified workflow with the specified implementation of the
@@ -324,8 +322,8 @@ export const testConfig: Effect.Effect<never, never, TestConfig.TestConfig> = te
  * @since 2.0.0
  */
 export const withTestConfig = dual<
-  (config: TestConfig.TestConfig) => <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>,
-  <R, E, A>(effect: Effect.Effect<R, E, A>, config: TestConfig.TestConfig) => Effect.Effect<R, E, A>
+  (config: TestConfig.TestConfig) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>,
+  <A, E, R>(effect: Effect.Effect<A, E, R>, config: TestConfig.TestConfig) => Effect.Effect<A, E, R>
 >(2, (effect, config) =>
   core.fiberRefLocallyWith(
     currentServices,
@@ -338,7 +336,7 @@ export const withTestConfig = dual<
  *
  * @since 2.0.0
  */
-export const withTestConfigScoped = (config: TestConfig.TestConfig): Effect.Effect<Scope.Scope, never, void> =>
+export const withTestConfigScoped = (config: TestConfig.TestConfig): Effect.Effect<void, never, Scope.Scope> =>
   fiberRuntime.fiberRefLocallyScopedWith(currentServices, Context.add(TestConfig.TestConfig, config))
 
 /**
@@ -351,7 +349,7 @@ export const testConfigLayer = (params: {
   readonly retries: number
   readonly samples: number
   readonly shrinks: number
-}): Layer.Layer<never, never, TestConfig.TestConfig> =>
+}): Layer.Layer<TestConfig.TestConfig> =>
   layer.scoped(
     TestConfig.TestConfig,
     Effect.suspend(() => {
@@ -368,25 +366,25 @@ export const testConfigLayer = (params: {
  *
  * @since 2.0.0
  */
-export const repeats: Effect.Effect<never, never, number> = testConfigWith((config) => core.succeed(config.repeats))
+export const repeats: Effect.Effect<number> = testConfigWith((config) => core.succeed(config.repeats))
 
 /**
  * The number of times to retry flaky tests.
  *
  * @since 2.0.0
  */
-export const retries: Effect.Effect<never, never, number> = testConfigWith((config) => core.succeed(config.retries))
+export const retries: Effect.Effect<number> = testConfigWith((config) => core.succeed(config.retries))
 
 /**
  * The number of sufficient samples to check for a random variable.
  *
  * @since 2.0.0
  */
-export const samples: Effect.Effect<never, never, number> = testConfigWith((config) => core.succeed(config.samples))
+export const samples: Effect.Effect<number> = testConfigWith((config) => core.succeed(config.samples))
 
 /**
  * The maximum number of shrinkings to minimize large failures.
  *
  * @since 2.0.0
  */
-export const shrinks: Effect.Effect<never, never, number> = testConfigWith((config) => core.succeed(config.shrinks))
+export const shrinks: Effect.Effect<number> = testConfigWith((config) => core.succeed(config.shrinks))

package/src/TestSized.ts

@@ -22,24 +22,24 @@ export type TestSizedTypeId = typeof TestSizedTypeId
 export interface TestSized {
   readonly [TestSizedTypeId]: TestSizedTypeId
   readonly fiberRef: FiberRef.FiberRef<number>
-  readonly size: Effect.Effect<never, never, number>
-  withSize(size: number): <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>
+  readonly size: Effect.Effect<number>
+  withSize(size: number): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
 }
 
 /**
  * @since 2.0.0
  */
-export const TestSized: Context.Tag<TestSized, TestSized> = Context.Tag(TestSizedTypeId)
+export const TestSized: Context.Tag<TestSized, TestSized> = Context.GenericTag("effect/TestSized")
 
 /** @internal */
 class SizedImpl implements TestSized {
   readonly [TestSizedTypeId]: TestSizedTypeId = TestSizedTypeId
   constructor(readonly fiberRef: FiberRef.FiberRef<number>) {}
-  get size(): Effect.Effect<never, never, number> {
+  get size(): Effect.Effect<number> {
     return core.fiberRefGet(this.fiberRef)
   }
   withSize(size: number) {
-    return <R, E, A>(effect: Effect.Effect<R, E, A>): Effect.Effect<R, E, A> =>
+    return <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
       core.fiberRefLocally(this.fiberRef, size)(effect)
   }
 }

package/src/Tracer.ts

@@ -131,5 +131,5 @@ export const externalSpan: (
  * @since 2.0.0
  * @category constructors
  */
-export const tracerWith: <R, E, A>(f: (tracer: Tracer) => Effect.Effect<R, E, A>) => Effect.Effect<R, E, A> =
+export const tracerWith: <A, E, R>(f: (tracer: Tracer) => Effect.Effect<A, E, R>) => Effect.Effect<A, E, R> =
   defaultServices.tracerWith

package/src/Utils.ts

@@ -3,6 +3,7 @@
  */
 import { identity } from "./Function.js"
 import type { Kind, TypeLambda } from "./HKT.js"
+import { isNullable } from "./Predicate.js"
 import type * as Types from "./Types.js"
 
 /*
@@ -18,8 +19,6 @@ import type * as Types from "./Types.js"
  * @since 2.0.0
  */
 
-import { isNullable } from "./Predicate.js"
-
 /**
  * @category symbols
  * @since 2.0.0
@@ -458,15 +457,14 @@ export interface Adapter<Z extends TypeLambda> {
  * @category adapters
  * @since 2.0.0
  */
-export const adapter: <F extends TypeLambda>() => Adapter<F> = () =>
-  // @ts-expect-error
-  function() {
-    let x = arguments[0]
-    for (let i = 1; i < arguments.length; i++) {
-      x = arguments[i](x)
-    }
-    return new GenKindImpl(x)
+export const adapter: <F extends TypeLambda>() => Adapter<F> = () => // @ts-expect-error
+(function() {
+  let x = arguments[0]
+  for (let i = 1; i < arguments.length; i++) {
+    x = arguments[i](x)
   }
+  return new GenKindImpl(x)
+})
 
 const defaultIncHi = 0x14057b7e
 const defaultIncLo = 0xf767814f

package/src/index.ts

@@ -90,7 +90,7 @@ export * as Brand from "./Brand.js"
 export * as Cache from "./Cache.js"
 
 /**
- * The `Effect<R, E, A>` type is polymorphic in values of type `E` and we can
+ * The `Effect<A, E, R>` type is polymorphic in values of type `E` and we can
  * work with any error type that we want. However, there is a lot of information
  * that is not inside an arbitrary `E` value. So as a result, an `Effect` needs
  * somewhere to store things like unexpected errors or defects, stack and
@@ -336,7 +336,7 @@ export * as Inspectable from "./Inspectable.js"
 export * as KeyedPool from "./KeyedPool.js"
 
 /**
- * A `Layer<RIn, E, ROut>` describes how to build one or more services in your
+ * A `Layer<ROut, E, RIn>` describes how to build one or more services in your
  * application. Services can be injected into effects via
  * `Effect.provideService`. Effects can require services via `Effect.service`.
  *
@@ -544,6 +544,17 @@ export * as Queue from "./Queue.js"
  */
 export * as Random from "./Random.js"
 
+/**
+ * Limits the number of calls to a resource to a maximum amount in some interval using the token bucket algorithm.
+ *
+ * Note that only the moment of starting the effect is rate limited: the number of concurrent executions is not bounded.
+ *
+ * Calls are queued up in an unbounded queue until capacity becomes available.
+ *
+ * @since 2.0.0
+ */
+export * as RateLimiter from "./RateLimiter.js"
+
 /**
  * This module provides utility functions for working with arrays in TypeScript.
  *

package/src/internal/blockedRequests.ts

@@ -317,7 +317,7 @@ class EntryImpl<A extends Request.Request<any, any>> implements Request.Entry<A>
   readonly [EntryTypeId] = blockedRequestVariance
   constructor(
     readonly request: A,
-    readonly result: Deferred.Deferred<Request.Request.Error<A>, Request.Request.Success<A>>,
+    readonly result: Deferred.Deferred<Request.Request.Success<A>, Request.Request.Error<A>>,
     readonly listeners: Request.Listeners,
     readonly ownerId: FiberId,
     readonly state: {
@@ -338,7 +338,7 @@ export const isEntry = (u: unknown): u is Request.Entry<unknown> => hasProperty(
 export const makeEntry = <A extends Request.Request<any, any>>(
   options: {
     readonly request: A
-    readonly result: Deferred.Deferred<Request.Request.Error<A>, Request.Request.Success<A>>
+    readonly result: Deferred.Deferred<Request.Request.Success<A>, Request.Request.Error<A>>
     readonly listeners: Request.Listeners
     readonly ownerId: FiberId
     readonly state: { completed: boolean }