chore: fix type parameters order

Effect-TS · May 20, 2024 · 0ecd81f · 0ecd81f
1 parent 95d9239
commit 0ecd81f
Show file tree

Hide file tree

Showing 17 changed files with 240 additions and 240 deletions.
diff --git a/packages/platform/src/Http/App.ts b/packages/platform/src/Http/App.ts
@@ -112,8 +112,8 @@ export const appendPreResponseHandler: (handler: PreResponseHandler) => Effect.E
  * @category fiber refs
  */
 export const withPreResponseHandler = dual<
-  (handler: PreResponseHandler) => <R, E, A>(self: HttpApp<A, E, R>) => HttpApp<A, E, R>,
-  <R, E, A>(self: HttpApp<A, E, R>, handler: PreResponseHandler) => HttpApp<A, E, R>
+  (handler: PreResponseHandler) => <A, E, R>(self: HttpApp<A, E, R>) => HttpApp<A, E, R>,
+  <A, E, R>(self: HttpApp<A, E, R>, handler: PreResponseHandler) => HttpApp<A, E, R>
 >(2, (self, handler) =>
   Effect.locallyWith(
     self,
@@ -171,7 +171,7 @@ export const toWebHandler: <E>(self: Default<E, Scope.Scope>) => (request: Reque
  * @since 1.0.0
  * @category conversions
  */
-export const toWebHandlerLayer = <R, E, RE>(
+export const toWebHandlerLayer = <E, R, RE>(
   self: Default<E, R | Scope.Scope>,
   layer: Layer.Layer<R, RE>
 ): {

diff --git a/packages/platform/src/Http/Client.ts b/packages/platform/src/Http/Client.ts
@@ -120,20 +120,20 @@ export const fetchOk: Client.Default = internal.fetchOk
  * @category error handling
  */
 export const catchAll: {
-  <E, R2, E2, A2>(f: (e: E) => Effect.Effect<A2, E2, R2>): <A, R>(self: Client<A, E, R>) => Client<A2 | A, E2, R2 | R>
-  <A, E, R, R2, E2, A2>(self: Client<A, E, R>, f: (e: E) => Effect.Effect<A2, E2, R2>): Client<A | A2, E2, R | R2>
+  <E, E2, R2, A2>(f: (e: E) => Effect.Effect<A2, E2, R2>): <A, R>(self: Client<A, E, R>) => Client<A2 | A, E2, R2 | R>
+  <A, E, R, A2, E2, R2>(self: Client<A, E, R>, f: (e: E) => Effect.Effect<A2, E2, R2>): Client<A | A2, E2, R | R2>
 } = internal.catchAll
 
 /**
  * @since 1.0.0
  * @category error handling
  */
 export const catchTag: {
-  <E extends { _tag: string }, K extends E["_tag"] & string, R1, E1, A1>(
+  <E extends { _tag: string }, K extends E["_tag"] & string, A1, E1, R1>(
     tag: K,
     f: (e: Extract<E, { _tag: K }>) => Effect.Effect<A1, E1, R1>
   ): <A, R>(self: Client<A, E, R>) => Client<A1 | A, E1 | Exclude<E, { _tag: K }>, R1 | R>
-  <R, E extends { _tag: string }, A, K extends E["_tag"] & string, E1, R1, A1>(
+  <R, E extends { _tag: string }, A, K extends E["_tag"] & string, A1, E1, R1>(
     self: Client<A, E, R>,
     tag: K,
     f: (e: Extract<E, { _tag: K }>) => Effect.Effect<A1, E1, R1>
@@ -195,11 +195,11 @@ export const catchTags: {
  * @category filters
  */
 export const filterOrElse: {
-  <A, R2, E2, B>(
+  <A, B, E2, R2>(
     f: Predicate.Predicate<A>,
     orElse: (a: A) => Effect.Effect<B, E2, R2>
   ): <E, R>(self: Client<A, E, R>) => Client<A | B, E2 | E, R2 | R>
-  <A, E, R, R2, E2, B>(
+  <A, E, R, B, E2, R2>(
     self: Client<A, E, R>,
     f: Predicate.Predicate<A>,
     orElse: (a: A) => Effect.Effect<B, E2, R2>
@@ -241,7 +241,7 @@ export const filterStatusOk: <E, R>(
  * @since 1.0.0
  * @category constructors
  */
-export const make: <A, E, R, R2, E2>(
+export const make: <A, E, R, E2, R2>(
   execute: (request: Effect.Effect<ClientRequest.ClientRequest, E2, R2>) => Effect.Effect<A, E, R>,
   preprocess: Client.Preprocess<E2, R2>
 ) => Client<A, E, R> = internal.make
@@ -264,10 +264,10 @@ export const makeDefault: (
  * @category mapping & sequencing
  */
 export const transform: {
-  <A, E, R, R1, E1, A1>(
+  <A, E, R, A1, E1, R1>(
     f: (effect: Effect.Effect<A, E, R>, request: ClientRequest.ClientRequest) => Effect.Effect<A1, E1, R1>
   ): (self: Client<A, E, R>) => Client<A1, E | E1, R | R1>
-  <A, E, R, R1, E1, A1>(
+  <A, E, R, A1, E1, R1>(
     self: Client<A, E, R>,
     f: (effect: Effect.Effect<A, E, R>, request: ClientRequest.ClientRequest) => Effect.Effect<A1, E1, R1>
   ): Client<A1, E | E1, R | R1>
@@ -278,10 +278,10 @@ export const transform: {
  * @category mapping & sequencing
  */
 export const transformResponse: {
-  <A, E, R, R1, E1, A1>(
+  <A, E, R, A1, E1, R1>(
     f: (effect: Effect.Effect<A, E, R>) => Effect.Effect<A1, E1, R1>
   ): (self: Client<A, E, R>) => Client<A1, E1, R1>
-  <A, E, R, R1, E1, A1>(
+  <A, E, R, A1, E1, R1>(
     self: Client<A, E, R>,
     f: (effect: Effect.Effect<A, E, R>) => Effect.Effect<A1, E1, R1>
   ): Client<A1, E1, R1>
@@ -301,19 +301,19 @@ export const map: {
  * @category mapping & sequencing
  */
 export const mapEffect: {
-  <A, R2, E2, B>(f: (a: A) => Effect.Effect<B, E2, R2>): <E, R>(self: Client<A, E, R>) => Client<B, E2 | E, R2 | R>
-  <A, E, R, R2, E2, B>(self: Client<A, E, R>, f: (a: A) => Effect.Effect<B, E2, R2>): Client<B, E | E2, R2 | R>
+  <A, B, E2, R2>(f: (a: A) => Effect.Effect<B, E2, R2>): <E, R>(self: Client<A, E, R>) => Client<B, E2 | E, R2 | R>
+  <A, E, R, B, E2, R2>(self: Client<A, E, R>, f: (a: A) => Effect.Effect<B, E2, R2>): Client<B, E | E2, R2 | R>
 } = internal.mapEffect
 
 /**
  * @since 1.0.0
  * @category mapping & sequencing
  */
 export const mapEffectScoped: {
-  <A, R2, E2, B>(
+  <A, B, E2, R2>(
     f: (a: A) => Effect.Effect<B, E2, R2>
   ): <E, R>(self: Client<A, E, R>) => Client<B, E2 | E, Exclude<R2, Scope.Scope> | Exclude<R, Scope.Scope>>
-  <A, E, R, R2, E2, B>(
+  <A, E, R, B, E2, R2>(
     self: Client<A, E, R>,
     f: (a: A) => Effect.Effect<B, E2, R2>
   ): Client<B, E | E2, Exclude<R2, Scope.Scope> | Exclude<R, Scope.Scope>>
@@ -335,10 +335,10 @@ export const mapRequest: {
  * @category mapping & sequencing
  */
 export const mapRequestEffect: {
-  <R2, E2>(
+  <E2, R2>(
     f: (a: ClientRequest.ClientRequest) => Effect.Effect<ClientRequest.ClientRequest, E2, R2>
   ): <A, E, R>(self: Client<A, E, R>) => Client<A, E2 | E, R2 | R>
-  <A, E, R, R2, E2>(
+  <A, E, R, E2, R2>(
     self: Client<A, E, R>,
     f: (a: ClientRequest.ClientRequest) => Effect.Effect<ClientRequest.ClientRequest, E2, R2>
   ): Client<A, E | E2, R | R2>
@@ -360,10 +360,10 @@ export const mapInputRequest: {
  * @category mapping & sequencing
  */
 export const mapInputRequestEffect: {
-  <R2, E2>(
+  <E2, R2>(
     f: (a: ClientRequest.ClientRequest) => Effect.Effect<ClientRequest.ClientRequest, E2, R2>
   ): <A, E, R>(self: Client<A, E, R>) => Client<A, E2 | E, R2 | R>
-  <A, E, R, R2, E2>(
+  <A, E, R, E2, R2>(
     self: Client<A, E, R>,
     f: (a: ClientRequest.ClientRequest) => Effect.Effect<ClientRequest.ClientRequest, E2, R2>
   ): Client<A, E | E2, R2 | R>
@@ -411,19 +411,19 @@ export const schemaFunction: {
  * @category mapping & sequencing
  */
 export const tap: {
-  <A, R2, E2, _>(f: (a: A) => Effect.Effect<_, E2, R2>): <E, R>(self: Client<A, E, R>) => Client<A, E2 | E, R2 | R>
-  <A, E, R, R2, E2, _>(self: Client<A, E, R>, f: (a: A) => Effect.Effect<_, E2, R2>): Client<A, E | E2, R2 | R>
+  <A, _, E2, R2>(f: (a: A) => Effect.Effect<_, E2, R2>): <E, R>(self: Client<A, E, R>) => Client<A, E2 | E, R2 | R>
+  <A, E, R, _, E2, R2>(self: Client<A, E, R>, f: (a: A) => Effect.Effect<_, E2, R2>): Client<A, E | E2, R2 | R>
 } = internal.tap
 
 /**
  * @since 1.0.0
  * @category mapping & sequencing
  */
 export const tapRequest: {
-  <R2, E2, _>(
+  <_, E2, R2>(
     f: (a: ClientRequest.ClientRequest) => Effect.Effect<_, E2, R2>
   ): <A, E, R>(self: Client<A, E, R>) => Client<A, E2 | E, R2 | R>
-  <A, E, R, R2, E2, _>(
+  <A, E, R, _, E2, R2>(
     self: Client<A, E, R>,
     f: (a: ClientRequest.ClientRequest) => Effect.Effect<_, E2, R2>
   ): Client<A, E | E2, R | R2>
@@ -452,8 +452,8 @@ export const currentTracerDisabledWhen: FiberRef.FiberRef<Predicate.Predicate<Cl
 export const withTracerDisabledWhen: {
   (
     predicate: Predicate.Predicate<ClientRequest.ClientRequest>
-  ): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(
+  ): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(
     effect: Effect.Effect<A, E, R>,
     predicate: Predicate.Predicate<ClientRequest.ClientRequest>
   ): Effect.Effect<A, E, R>
@@ -470,8 +470,8 @@ export const currentTracerPropagation: FiberRef.FiberRef<boolean> = internal.cur
  * @category fiber refs
  */
 export const withTracerPropagation: {
-  (enabled: boolean): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(effect: Effect.Effect<A, E, R>, enabled: boolean): Effect.Effect<A, E, R>
+  (enabled: boolean): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(effect: Effect.Effect<A, E, R>, enabled: boolean): Effect.Effect<A, E, R>
 } = internal.withTracerPropagation
 
 /**
@@ -485,6 +485,6 @@ export const currentFetchOptions: FiberRef.FiberRef<RequestInit> = internal.curr
  * @category fiber refs
  */
 export const withFetchOptions: {
-  (options: RequestInit): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(effect: Effect.Effect<A, E, R>, options: RequestInit): Effect.Effect<A, E, R>
+  (options: RequestInit): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(effect: Effect.Effect<A, E, R>, options: RequestInit): Effect.Effect<A, E, R>
 } = internal.withFetchOptions
diff --git a/packages/platform/src/Http/IncomingMessage.ts b/packages/platform/src/Http/IncomingMessage.ts
@@ -134,8 +134,8 @@ export const maxBodySize: FiberRef.FiberRef<Option.Option<FileSystem.Size>> = Gl
  * @category fiber refs
  */
 export const withMaxBodySize = dual<
-  (size: Option.Option<FileSystem.SizeInput>) => <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>,
-  <R, E, A>(effect: Effect.Effect<A, E, R>, size: Option.Option<FileSystem.SizeInput>) => Effect.Effect<A, E, R>
+  (size: Option.Option<FileSystem.SizeInput>) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>,
+  <A, E, R>(effect: Effect.Effect<A, E, R>, size: Option.Option<FileSystem.SizeInput>) => Effect.Effect<A, E, R>
 >(2, (effect, size) => Effect.locally(effect, maxBodySize, Option.map(size, FileSystem.Size)))
 
 /**

diff --git a/packages/platform/src/Http/Middleware.ts b/packages/platform/src/Http/Middleware.ts
@@ -14,7 +14,7 @@ import type * as ServerRequest from "./ServerRequest.js"
  * @category models
  */
 export interface Middleware {
-  <R, E>(self: App.Default<E, R>): App.Default<any, any>
+  <E, R>(self: App.Default<E, R>): App.Default<any, any>
 }
 
 /**
@@ -39,7 +39,7 @@ export const make: <M extends Middleware>(middleware: M) => M = internal.make
  * @since 1.0.0
  * @category constructors
  */
-export const logger: <R, E>(httpApp: App.Default<E, R>) => App.Default<E, R> = internal.logger
+export const logger: <E, R>(httpApp: App.Default<E, R>) => App.Default<E, R> = internal.logger
 
 /**
  * @since 1.0.0
@@ -51,7 +51,7 @@ export const loggerDisabled: FiberRef.FiberRef<boolean> = internal.loggerDisable
  * @since 1.0.0
  * @category fiber refs
  */
-export const withLoggerDisabled: <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R> =
+export const withLoggerDisabled: <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R> =
   internal.withLoggerDisabled
 
 /**
@@ -68,8 +68,8 @@ export const currentTracerDisabledWhen: FiberRef.FiberRef<Predicate.Predicate<Se
 export const withTracerDisabledWhen: {
   (
     predicate: Predicate.Predicate<ServerRequest.ServerRequest>
-  ): <R, E, A>(layer: Layer.Layer<A, E, R>) => Layer.Layer<A, E, R>
-  <R, E, A>(
+  ): <A, E, R>(layer: Layer.Layer<A, E, R>) => Layer.Layer<A, E, R>
+  <A, E, R>(
     layer: Layer.Layer<A, E, R>,
     predicate: Predicate.Predicate<ServerRequest.ServerRequest>
   ): Layer.Layer<A, E, R>
@@ -82,8 +82,8 @@ export const withTracerDisabledWhen: {
 export const withTracerDisabledWhenEffect: {
   (
     predicate: Predicate.Predicate<ServerRequest.ServerRequest>
-  ): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(
+  ): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(
     effect: Effect.Effect<A, E, R>,
     predicate: Predicate.Predicate<ServerRequest.ServerRequest>
   ): Effect.Effect<A, E, R>
@@ -94,15 +94,15 @@ export const withTracerDisabledWhenEffect: {
  * @category fiber refs
  */
 export const withTracerDisabledForUrls: {
-  (urls: ReadonlyArray<string>): <R, E, A>(layer: Layer.Layer<A, E, R>) => Layer.Layer<A, E, R>
-  <R, E, A>(layer: Layer.Layer<A, E, R>, urls: ReadonlyArray<string>): Layer.Layer<A, E, R>
+  (urls: ReadonlyArray<string>): <A, E, R>(layer: Layer.Layer<A, E, R>) => Layer.Layer<A, E, R>
+  <A, E, R>(layer: Layer.Layer<A, E, R>, urls: ReadonlyArray<string>): Layer.Layer<A, E, R>
 } = internal.withTracerDisabledForUrls
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const xForwardedHeaders: <R, E>(httpApp: App.Default<E, R>) => App.Default<E, R> = internal.xForwardedHeaders
+export const xForwardedHeaders: <E, R>(httpApp: App.Default<E, R>) => App.Default<E, R> = internal.xForwardedHeaders
 
 /**
  * @since 1.0.0

diff --git a/packages/platform/src/Http/Multipart.ts b/packages/platform/src/Http/Multipart.ts
@@ -162,8 +162,8 @@ export const maxParts: FiberRef.FiberRef<Option.Option<number>> = internal.maxPa
  * @category fiber refs
  */
 export const withMaxParts: {
-  (count: Option.Option<number>): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(effect: Effect.Effect<A, E, R>, count: Option.Option<number>): Effect.Effect<A, E, R>
+  (count: Option.Option<number>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(effect: Effect.Effect<A, E, R>, count: Option.Option<number>): Effect.Effect<A, E, R>
 } = internal.withMaxParts
 
 /**
@@ -177,8 +177,8 @@ export const maxFieldSize: FiberRef.FiberRef<FileSystem.Size> = internal.maxFiel
  * @category fiber refs
  */
 export const withMaxFieldSize: {
-  (size: FileSystem.SizeInput): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(effect: Effect.Effect<A, E, R>, size: FileSystem.SizeInput): Effect.Effect<A, E, R>
+  (size: FileSystem.SizeInput): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(effect: Effect.Effect<A, E, R>, size: FileSystem.SizeInput): Effect.Effect<A, E, R>
 } = internal.withMaxFieldSize
 
 /**
@@ -192,8 +192,8 @@ export const maxFileSize: FiberRef.FiberRef<Option.Option<FileSystem.Size>> = in
  * @category fiber refs
  */
 export const withMaxFileSize: {
-  (size: Option.Option<FileSystem.SizeInput>): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(effect: Effect.Effect<A, E, R>, size: Option.Option<FileSystem.SizeInput>): Effect.Effect<A, E, R>
+  (size: Option.Option<FileSystem.SizeInput>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(effect: Effect.Effect<A, E, R>, size: Option.Option<FileSystem.SizeInput>): Effect.Effect<A, E, R>
 } = internal.withMaxFileSize
 
 /**
@@ -207,8 +207,8 @@ export const fieldMimeTypes: FiberRef.FiberRef<Chunk.Chunk<string>> = internal.f
  * @category fiber refs
  */
 export const withFieldMimeTypes: {
-  (mimeTypes: ReadonlyArray<string>): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-  <R, E, A>(effect: Effect.Effect<A, E, R>, mimeTypes: ReadonlyArray<string>): Effect.Effect<A, E, R>
+  (mimeTypes: ReadonlyArray<string>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+  <A, E, R>(effect: Effect.Effect<A, E, R>, mimeTypes: ReadonlyArray<string>): Effect.Effect<A, E, R>
 } = internal.withFieldMimeTypes
 
 /**