effect 2.3.7 → 2.4.0

package/src/Reloadable.ts

@@ -62,11 +62,11 @@ export declare namespace Reloadable {
  * @since 2.0.0
  * @category constructors
  */
-export const auto: <Out extends Context.Tag<any, any>, In, E, R>(
+export const auto: <Out extends Context.Tag<any, any>, E, In, R>(
   tag: Out,
   options: {
     readonly layer: Layer.Layer<Context.Tag.Identifier<Out>, E, In>
-    readonly schedule: Schedule.Schedule<R, unknown, unknown>
+    readonly schedule: Schedule.Schedule<unknown, unknown, R>
   }
 ) => Layer.Layer<Reloadable<Context.Tag.Identifier<Out>>, E, In | R> = internal.auto
 
@@ -78,11 +78,11 @@ export const auto: <Out extends Context.Tag<any, any>, In, E, R>(
  * @since 2.0.0
  * @category constructors
  */
-export const autoFromConfig: <Out extends Context.Tag<any, any>, In, E, R>(
+export const autoFromConfig: <Out extends Context.Tag<any, any>, E, In, R>(
   tag: Out,
   options: {
     readonly layer: Layer.Layer<Context.Tag.Identifier<Out>, E, In>
-    readonly scheduleFromConfig: (context: Context.Context<In>) => Schedule.Schedule<R, unknown, unknown>
+    readonly scheduleFromConfig: (context: Context.Context<In>) => Schedule.Schedule<unknown, unknown, R>
   }
 ) => Layer.Layer<Reloadable<Context.Tag.Identifier<Out>>, E, In | R> = internal.autoFromConfig
 

package/src/RequestResolver.ts

@@ -115,7 +115,7 @@ export const isRequestResolver: (u: unknown) => u is RequestResolver<unknown, un
  * @since 2.0.0
  * @category constructors
  */
-export const make: <R, A>(
+export const make: <A, R>(
   runAll: (requests: Array<Array<A>>) => Effect.Effect<void, never, R>
 ) => RequestResolver<A, R> = internal.make
 
@@ -126,7 +126,7 @@ export const make: <R, A>(
  * @since 2.0.0
  * @category constructors
  */
-export const makeWithEntry: <R, A>(
+export const makeWithEntry: <A, R>(
   runAll: (requests: Array<Array<Request.Entry<A>>>) => Effect.Effect<void, never, R>
 ) => RequestResolver<A, R> = internal.makeWithEntry
 
@@ -137,7 +137,7 @@ export const makeWithEntry: <R, A>(
  * @since 2.0.0
  * @category constructors
  */
-export const makeBatched: <R, A extends Request.Request<any, any>>(
+export const makeBatched: <A extends Request.Request<any, any>, R>(
   run: (requests: Array<A>) => Effect.Effect<void, never, R>
 ) => RequestResolver<A, R> = internal.makeBatched
 
@@ -149,14 +149,14 @@ export const makeBatched: <R, A extends Request.Request<any, any>>(
  * @category combinators
  */
 export const around: {
-  <R2, A2, R3, _>(
+  <A2, R2, X, R3>(
     before: Effect.Effect<A2, never, R2>,
-    after: (a: A2) => Effect.Effect<_, never, R3>
-  ): <R, A>(self: RequestResolver<A, R>) => RequestResolver<A, R2 | R3 | R>
-  <R, A, R2, A2, R3, _>(
+    after: (a: A2) => Effect.Effect<X, never, R3>
+  ): <A, R>(self: RequestResolver<A, R>) => RequestResolver<A, R2 | R3 | R>
+  <A, R, A2, R2, X, R3>(
     self: RequestResolver<A, R>,
     before: Effect.Effect<A2, never, R2>,
-    after: (a: A2) => Effect.Effect<_, never, R3>
+    after: (a: A2) => Effect.Effect<X, never, R3>
   ): RequestResolver<A, R | R2 | R3>
 } = internal.around
 
@@ -186,14 +186,14 @@ export const around: {
  * )
  */
 export const aroundRequests: {
-  <A, R2, A2, R3, _>(
+  <A, A2, R2, X, R3>(
     before: (requests: ReadonlyArray<Types.NoInfer<A>>) => Effect.Effect<A2, never, R2>,
-    after: (requests: ReadonlyArray<Types.NoInfer<A>>, _: A2) => Effect.Effect<_, never, R3>
+    after: (requests: ReadonlyArray<Types.NoInfer<A>>, _: A2) => Effect.Effect<X, never, R3>
   ): <R>(self: RequestResolver<A, R>) => RequestResolver<A, R2 | R3 | R>
-  <R, A, R2, A2, R3, _>(
+  <A, R, A2, R2, X, R3>(
     self: RequestResolver<A, R>,
     before: (requests: ReadonlyArray<Types.NoInfer<A>>) => Effect.Effect<A2, never, R2>,
-    after: (requests: ReadonlyArray<Types.NoInfer<A>>, _: A2) => Effect.Effect<_, never, R3>
+    after: (requests: ReadonlyArray<Types.NoInfer<A>>, _: A2) => Effect.Effect<X, never, R3>
   ): RequestResolver<A, R | R2 | R3>
 } = internal.aroundRequests
 
@@ -204,8 +204,8 @@ export const aroundRequests: {
  * @category combinators
  */
 export const batchN: {
-  (n: number): <R, A>(self: RequestResolver<A, R>) => RequestResolver<A, R>
-  <R, A>(self: RequestResolver<A, R>, n: number): RequestResolver<A, R>
+  (n: number): <A, R>(self: RequestResolver<A, R>) => RequestResolver<A, R>
+  <A, R>(self: RequestResolver<A, R>, n: number): RequestResolver<A, R>
 } = internal.batchN
 
 /**
@@ -235,7 +235,7 @@ export const mapInputContext: {
 export const eitherWith: {
   <A extends Request.Request<any, any>, R2, B extends Request.Request<any, any>, C extends Request.Request<any, any>>(
     that: RequestResolver<B, R2>,
-    f: (_: Request.Entry<C>) => Either.Either<Request.Entry<A>, Request.Entry<B>>
+    f: (_: Request.Entry<C>) => Either.Either<Request.Entry<B>, Request.Entry<A>>
   ): <R>(self: RequestResolver<A, R>) => RequestResolver<C, R2 | R>
   <
     R,
@@ -246,7 +246,7 @@ export const eitherWith: {
   >(
     self: RequestResolver<A, R>,
     that: RequestResolver<B, R2>,
-    f: (_: Request.Entry<C>) => Either.Either<Request.Entry<A>, Request.Entry<B>>
+    f: (_: Request.Entry<C>) => Either.Either<Request.Entry<B>, Request.Entry<A>>
   ): RequestResolver<C, R | R2>
 } = internal.eitherWith
 
@@ -337,10 +337,10 @@ export const provideContext: {
  * @category combinators
  */
 export const race: {
-  <R2, A2 extends Request.Request<any, any>>(
+  <A2 extends Request.Request<any, any>, R2>(
     that: RequestResolver<A2, R2>
-  ): <R, A extends Request.Request<any, any>>(self: RequestResolver<A, R>) => RequestResolver<A2 | A, R2 | R>
-  <R, A extends Request.Request<any, any>, R2, A2 extends Request.Request<any, any>>(
+  ): <A extends Request.Request<any, any>, R>(self: RequestResolver<A, R>) => RequestResolver<A2 | A, R2 | R>
+  <A extends Request.Request<any, any>, R, A2 extends Request.Request<any, any>, R2>(
     self: RequestResolver<A, R>,
     that: RequestResolver<A2, R2>
   ): RequestResolver<A | A2, R | R2>

package/src/Resource.ts

@@ -61,10 +61,10 @@ export declare namespace Resource {
  * @since 2.0.0
  * @category constructors
  */
-export const auto: <A, E, R, R2, Out>(
+export const auto: <A, E, R, Out, R2>(
   acquire: Effect.Effect<A, E, R>,
-  policy: Schedule.Schedule<R2, unknown, Out>
-) => Effect.Effect<Resource<A, E>, never, Scope.Scope | R | R2> = internal.auto
+  policy: Schedule.Schedule<Out, unknown, R2>
+) => Effect.Effect<Resource<A, E>, never, R | R2 | Scope.Scope> = internal.auto
 
 /**
  * Retrieves the current value stored in the cache.