@effect/platform 0.48.28 → 0.49.0

package/src/Http/IncomingMessage.ts

@@ -10,6 +10,7 @@ import { dual } from "effect/Function"
 import * as Global from "effect/GlobalValue"
 import type { Inspectable } from "effect/Inspectable"
 import * as Option from "effect/Option"
+import type * as Scope from "effect/Scope"
 import type * as Stream from "effect/Stream"
 import * as FileSystem from "../FileSystem.js"
 import type * as Headers from "./Headers.js"
@@ -56,9 +57,12 @@ export const schemaBodyJson = <A, I, R>(schema: Schema.Schema<A, I, R>, options?
  * @since 1.0.0
  * @category schema
  */
-export const schemaBodyJsonEffect = <A, I, R>(schema: Schema.Schema<A, I, R>, options?: ParseOptions | undefined) => {
+export const schemaBodyJsonScoped = <A, I, R>(schema: Schema.Schema<A, I, R>, options?: ParseOptions | undefined) => {
   const decode = schemaBodyJson(schema, options)
-  return <E, E2, R2>(effect: Effect.Effect<IncomingMessage<E>, E2, R2>) => Effect.scoped(Effect.flatMap(effect, decode))
+  return <E, E2, R2>(
+    effect: Effect.Effect<IncomingMessage<E>, E2, R2>
+  ): Effect.Effect<A, ParseResult.ParseError | E | E2, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> =>
+    Effect.scoped(Effect.flatMap(effect, decode))
 }
 
 /**
@@ -78,12 +82,15 @@ export const schemaBodyUrlParams = <R, I extends Readonly<Record<string, string>
  * @since 1.0.0
  * @category schema
  */
-export const schemaBodyUrlParamsEffect = <R, I extends Readonly<Record<string, string>>, A>(
+export const schemaBodyUrlParamsScoped = <R, I extends Readonly<Record<string, string>>, A>(
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
 ) => {
   const decode = schemaBodyUrlParams(schema, options)
-  return <E, E2, R2>(effect: Effect.Effect<IncomingMessage<E>, E2, R2>) => Effect.scoped(Effect.flatMap(effect, decode))
+  return <E, E2, R2>(
+    effect: Effect.Effect<IncomingMessage<E>, E2, R2>
+  ): Effect.Effect<A, ParseResult.ParseError | E | E2, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> =>
+    Effect.scoped(Effect.flatMap(effect, decode))
 }
 
 /**
@@ -102,12 +109,15 @@ export const schemaHeaders = <R, I extends Readonly<Record<string, string | unde
  * @since 1.0.0
  * @category schema
  */
-export const schemaHeadersEffect = <R, I extends Readonly<Record<string, string>>, A>(
+export const schemaHeadersScoped = <R, I extends Readonly<Record<string, string>>, A>(
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
 ) => {
   const decode = schemaHeaders(schema, options)
-  return <E, E2, R2>(effect: Effect.Effect<IncomingMessage<E>, E2, R2>) => Effect.scoped(Effect.flatMap(effect, decode))
+  return <E, E2, R2>(
+    effect: Effect.Effect<IncomingMessage<E>, E2, R2>
+  ): Effect.Effect<A, ParseResult.ParseError | E2, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> =>
+    Effect.scoped(Effect.flatMap(effect, decode))
 }
 
 /**

package/src/Http/Middleware.ts

@@ -3,6 +3,7 @@
  */
 import type * as Effect from "effect/Effect"
 import type * as FiberRef from "effect/FiberRef"
+import type * as Layer from "effect/Layer"
 import type * as Predicate from "effect/Predicate"
 import * as internal from "../internal/http/middleware.js"
 import type * as App from "./App.js"
@@ -13,7 +14,7 @@ import type * as ServerRequest from "./ServerRequest.js"
  * @category models
  */
 export interface Middleware {
-  <R, E>(self: App.Default<R, E>): App.Default<any, any>
+  <R, E>(self: App.Default<E, R>): App.Default<any, any>
 }
 
 /**
@@ -23,8 +24,8 @@ export declare namespace Middleware {
   /**
    * @since 1.0.0
    */
-  export interface Applied<R, E, A extends App.Default<any, any>> {
-    (self: App.Default<R, E>): A
+  export interface Applied<A extends App.Default<any, any>, E, R> {
+    (self: App.Default<E, R>): A
   }
 }
 
@@ -38,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<R, E>) => App.Default<R, E> = internal.logger
+export const logger: <R, E>(httpApp: App.Default<E, R>) => App.Default<E, R> = internal.logger
 
 /**
  * @since 1.0.0
@@ -65,6 +66,20 @@ export const currentTracerDisabledWhen: FiberRef.FiberRef<Predicate.Predicate<Se
  * @category fiber refs
  */
 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>(
+    layer: Layer.Layer<A, E, R>,
+    predicate: Predicate.Predicate<ServerRequest.ServerRequest>
+  ): Layer.Layer<A, E, R>
+} = internal.withTracerDisabledWhen
+
+/**
+ * @since 1.0.0
+ * @category fiber refs
+ */
+export const withTracerDisabledWhenEffect: {
   (
     predicate: Predicate.Predicate<ServerRequest.ServerRequest>
   ): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
@@ -72,10 +87,19 @@ export const withTracerDisabledWhen: {
     effect: Effect.Effect<A, E, R>,
     predicate: Predicate.Predicate<ServerRequest.ServerRequest>
   ): Effect.Effect<A, E, R>
-} = internal.withTracerDisabledWhen
+} = internal.withTracerDisabledWhenEffect
+
+/**
+ * @since 1.0.0
+ * @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>
+} = internal.withTracerDisabledForUrls
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const xForwardedHeaders: <R, E>(httpApp: App.Default<R, E>) => App.Default<R, E> = internal.xForwardedHeaders
+export const xForwardedHeaders: <R, E>(httpApp: App.Default<E, R>) => App.Default<E, R> = internal.xForwardedHeaders

package/src/Http/Multiplex.ts

@@ -24,12 +24,12 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category models
  */
-export interface Multiplex<R, E> extends App.Default<R, E | Error.RouteNotFound>, Inspectable {
+export interface Multiplex<E = never, R = never> extends App.Default<E | Error.RouteNotFound, R>, Inspectable {
   readonly [TypeId]: TypeId
   readonly apps: ReadonlyArray<
     readonly [
       predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<boolean, E, R>,
-      app: App.Default<R, E>
+      app: App.Default<E, R>
     ]
   >
 }
@@ -38,7 +38,7 @@ export interface Multiplex<R, E> extends App.Default<R, E | Error.RouteNotFound>
  * @since 1.0.0
  * @category constructors
  */
-export const empty: Multiplex<never, never> = internal.empty
+export const empty: Multiplex<never> = internal.empty
 
 /**
  * @since 1.0.0
@@ -46,9 +46,9 @@ export const empty: Multiplex<never, never> = internal.empty
  */
 export const make: <R, E>(
   apps: Iterable<
-    readonly [predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<boolean, E, R>, app: App.Default<R, E>]
+    readonly [predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<boolean, E, R>, app: App.Default<E, R>]
   >
-) => Multiplex<R, E> = internal.make
+) => Multiplex<E, R> = internal.make
 
 /**
  * @since 1.0.0
@@ -57,13 +57,13 @@ export const make: <R, E>(
 export const add: {
   <R2, E2, R3, E3>(
     predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<boolean, E2, R2>,
-    app: App.Default<R3, E3>
-  ): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R3 | R, E2 | E3 | E>
+    app: App.Default<E3, R3>
+  ): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E3 | E, R2 | R3 | R>
   <R, E, R2, E2, R3, E3>(
-    self: Multiplex<R, E>,
+    self: Multiplex<E, R>,
     predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<boolean, E2, R2>,
-    app: App.Default<R3, E3>
-  ): Multiplex<R | R2 | R3, E | E2 | E3>
+    app: App.Default<E3, R3>
+  ): Multiplex<E | E2 | E3, R | R2 | R3>
 } = internal.add
 
 /**
@@ -74,14 +74,14 @@ export const headerExact: {
   <R2, E2>(
     header: string,
     value: string,
-    app: App.Default<R2, E2>
-  ): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
+    app: App.Default<E2, R2>
+  ): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
   <R, E, R2, E2>(
-    self: Multiplex<R, E>,
+    self: Multiplex<E, R>,
     header: string,
     value: string,
-    app: App.Default<R2, E2>
-  ): Multiplex<R | R2, E | E2>
+    app: App.Default<E2, R2>
+  ): Multiplex<E | E2, R | R2>
 } = internal.headerExact
 
 /**
@@ -92,14 +92,14 @@ export const headerRegex: {
   <R2, E2>(
     header: string,
     regex: RegExp,
-    app: App.Default<R2, E2>
-  ): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
+    app: App.Default<E2, R2>
+  ): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
   <R, E, R2, E2>(
-    self: Multiplex<R, E>,
+    self: Multiplex<E, R>,
     header: string,
     regex: RegExp,
-    app: App.Default<R2, E2>
-  ): Multiplex<R | R2, E | E2>
+    app: App.Default<E2, R2>
+  ): Multiplex<E | E2, R | R2>
 } = internal.headerRegex
 
 /**
@@ -110,14 +110,14 @@ export const headerStartsWith: {
   <R2, E2>(
     header: string,
     prefix: string,
-    app: App.Default<R2, E2>
-  ): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
+    app: App.Default<E2, R2>
+  ): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
   <R, E, R2, E2>(
-    self: Multiplex<R, E>,
+    self: Multiplex<E, R>,
     header: string,
     prefix: string,
-    app: App.Default<R2, E2>
-  ): Multiplex<R | R2, E | E2>
+    app: App.Default<E2, R2>
+  ): Multiplex<E | E2, R | R2>
 } = internal.headerStartsWith
 
 /**
@@ -128,14 +128,14 @@ export const headerEndsWith: {
   <R2, E2>(
     header: string,
     suffix: string,
-    app: App.Default<R2, E2>
-  ): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
+    app: App.Default<E2, R2>
+  ): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
   <R, E, R2, E2>(
-    self: Multiplex<R, E>,
+    self: Multiplex<E, R>,
     header: string,
     suffix: string,
-    app: App.Default<R2, E2>
-  ): Multiplex<R | R2, E | E2>
+    app: App.Default<E2, R2>
+  ): Multiplex<E | E2, R | R2>
 } = internal.headerEndsWith
 
 /**
@@ -143,8 +143,8 @@ export const headerEndsWith: {
  * @category combinators
  */
 export const hostExact: {
-  <R2, E2>(host: string, app: App.Default<R2, E2>): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
-  <R, E, R2, E2>(self: Multiplex<R, E>, host: string, app: App.Default<R2, E2>): Multiplex<R | R2, E | E2>
+  <R2, E2>(host: string, app: App.Default<E2, R2>): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
+  <R, E, R2, E2>(self: Multiplex<E, R>, host: string, app: App.Default<E2, R2>): Multiplex<E | E2, R | R2>
 } = internal.hostExact
 
 /**
@@ -152,8 +152,8 @@ export const hostExact: {
  * @category combinators
  */
 export const hostRegex: {
-  <R2, E2>(regex: RegExp, app: App.Default<R2, E2>): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
-  <R, E, R2, E2>(self: Multiplex<R, E>, regex: RegExp, app: App.Default<R2, E2>): Multiplex<R | R2, E | E2>
+  <R2, E2>(regex: RegExp, app: App.Default<E2, R2>): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
+  <R, E, R2, E2>(self: Multiplex<E, R>, regex: RegExp, app: App.Default<E2, R2>): Multiplex<E | E2, R | R2>
 } = internal.hostRegex
 
 /**
@@ -161,8 +161,8 @@ export const hostRegex: {
  * @category combinators
  */
 export const hostStartsWith: {
-  <R2, E2>(prefix: string, app: App.Default<R2, E2>): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
-  <R, E, R2, E2>(self: Multiplex<R, E>, prefix: string, app: App.Default<R2, E2>): Multiplex<R | R2, E | E2>
+  <R2, E2>(prefix: string, app: App.Default<E2, R2>): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
+  <R, E, R2, E2>(self: Multiplex<E, R>, prefix: string, app: App.Default<E2, R2>): Multiplex<E | E2, R | R2>
 } = internal.hostStartsWith
 
 /**
@@ -170,6 +170,6 @@ export const hostStartsWith: {
  * @category combinators
  */
 export const hostEndsWith: {
-  <R2, E2>(suffix: string, app: App.Default<R2, E2>): <R, E>(self: Multiplex<R, E>) => Multiplex<R2 | R, E2 | E>
-  <R, E, R2, E2>(self: Multiplex<R, E>, suffix: string, app: App.Default<R2, E2>): Multiplex<R | R2, E | E2>
+  <R2, E2>(suffix: string, app: App.Default<E2, R2>): <R, E>(self: Multiplex<E, R>) => Multiplex<E2 | E, R2 | R>
+  <R, E, R2, E2>(self: Multiplex<E, R>, suffix: string, app: App.Default<E2, R2>): Multiplex<E | E2, R | R2>
 } = internal.hostEndsWith