@effect/platform 0.58.27 → 0.59.1

package/src/internal/httpServerRequest.ts

@@ -151,11 +151,11 @@ export const schemaBodyFormJson = <A, I, R>(schema: Schema.Schema<A, I, R>, opti
       > => {
         if (isMultipart(request)) {
           return Effect.flatMap(
-            Effect.mapError(request.multipart, (error) =>
+            Effect.mapError(request.multipart, (cause) =>
               new Error.RequestError({
                 request,
                 reason: "Decode",
-                error
+                cause
               })),
             parseMultipart(field)
           )
@@ -227,17 +227,17 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
 
   get stream(): Stream.Stream<Uint8Array, Error.RequestError> {
     return this.source.body
-      ? Stream.fromReadableStream(() => this.source.body as any, (_) =>
+      ? Stream.fromReadableStream(() => this.source.body as any, (cause) =>
         new Error.RequestError({
           request: this,
           reason: "Decode",
-          error: _
+          cause
         }))
       : Stream.fail(
         new Error.RequestError({
           request: this,
           reason: "Decode",
-          error: "can not create stream from empty body"
+          description: "can not create stream from empty body"
         })
       )
   }
@@ -250,11 +250,11 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
     this.textEffect = Effect.runSync(Effect.cached(
       Effect.tryPromise({
         try: () => this.source.text(),
-        catch: (error) =>
+        catch: (cause) =>
           new Error.RequestError({
             request: this,
             reason: "Decode",
-            error
+            cause
           })
       })
     ))
@@ -264,11 +264,11 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
   get json(): Effect.Effect<unknown, Error.RequestError> {
     return Effect.tryMap(this.text, {
       try: (_) => JSON.parse(_) as unknown,
-      catch: (error) =>
+      catch: (cause) =>
         new Error.RequestError({
           request: this,
           reason: "Decode",
-          error
+          cause
         })
     })
   }
@@ -277,11 +277,11 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
     return Effect.flatMap(this.text, (_) =>
       Effect.try({
         try: () => UrlParams.fromInput(new URLSearchParams(_)),
-        catch: (error) =>
+        catch: (cause) =>
           new Error.RequestError({
             request: this,
             reason: "Decode",
-            error
+            cause
           })
       }))
   }
@@ -309,7 +309,7 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
 
   get multipartStream(): Stream.Stream<Multipart.Part, Multipart.MultipartError> {
     return Stream.pipeThroughChannel(
-      Stream.mapError(this.stream, (error) => new Multipart.MultipartError({ reason: "InternalError", error })),
+      Stream.mapError(this.stream, (cause) => new Multipart.MultipartError({ reason: "InternalError", cause })),
       Multipart.makeChannel(this.headers)
     )
   }
@@ -322,11 +322,11 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
     this.arrayBufferEffect = Effect.runSync(Effect.cached(
       Effect.tryPromise({
         try: () => this.source.arrayBuffer(),
-        catch: (error) =>
+        catch: (cause) =>
           new Error.RequestError({
             request: this,
             reason: "Decode",
-            error
+            cause
           })
       })
     ))
@@ -338,7 +338,7 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
       new Error.RequestError({
         request: this,
         reason: "Decode",
-        error: "Not an upgradeable ServerRequest"
+        description: "Not an upgradeable ServerRequest"
       })
     )
   }

package/src/internal/httpServerResponse.ts

@@ -4,6 +4,7 @@ import * as Effect from "effect/Effect"
 import * as Effectable from "effect/Effectable"
 import { dual } from "effect/Function"
 import * as Inspectable from "effect/Inspectable"
+import * as Runtime from "effect/Runtime"
 import * as Stream from "effect/Stream"
 import * as Cookies from "../Cookies.js"
 import type * as PlatformError from "../Error.js"
@@ -504,7 +505,10 @@ export const setBody = dual<
 })
 
 /** @internal */
-export const toWeb = (response: ServerResponse.HttpServerResponse, withoutBody = false): Response => {
+export const toWeb = (response: ServerResponse.HttpServerResponse, options?: {
+  readonly withoutBody?: boolean | undefined
+  readonly runtime?: Runtime.Runtime<never> | undefined
+}): Response => {
   const headers = new globalThis.Headers(response.headers)
   if (!Cookies.isEmpty(response.cookies)) {
     const toAdd = Cookies.toSetCookieHeaders(response.cookies)
@@ -512,7 +516,7 @@ export const toWeb = (response: ServerResponse.HttpServerResponse, withoutBody =
       headers.append("set-cookie", header)
     }
   }
-  if (withoutBody) {
+  if (options?.withoutBody) {
     return new Response(undefined, {
       status: response.status,
       statusText: response.statusText as string,
@@ -544,7 +548,7 @@ export const toWeb = (response: ServerResponse.HttpServerResponse, withoutBody =
       })
     }
     case "Stream": {
-      return new Response(Stream.toReadableStream(body.stream), {
+      return new Response(Stream.toReadableStreamRuntime(body.stream, options?.runtime ?? Runtime.defaultRuntime), {
         status: response.status,
         statusText: response.statusText,
         headers

package/src/internal/multipart.ts

@@ -16,7 +16,7 @@ import type * as Scope from "effect/Scope"
 import type * as AsyncInput from "effect/SingleProducerAsyncInput"
 import * as Stream from "effect/Stream"
 import * as MP from "multipasta"
-import { RefailError } from "../Error.js"
+import { TypeIdError } from "../Error.js"
 import * as FileSystem from "../FileSystem.js"
 import * as IncomingMessage from "../HttpIncomingMessage.js"
 import type * as Multipart from "../Multipart.js"
@@ -44,11 +44,12 @@ export const ErrorTypeId: Multipart.ErrorTypeId = Symbol.for(
 ) as Multipart.ErrorTypeId
 
 /** @internal */
-export class MultipartError extends RefailError(ErrorTypeId, "MultipartError")<{
+export class MultipartError extends TypeIdError(ErrorTypeId, "MultipartError")<{
   readonly reason: "FileTooLarge" | "FieldTooLarge" | "BodyTooLarge" | "TooManyParts" | "InternalError" | "Parse"
+  readonly cause: unknown
 }> {
-  get message() {
-    return `${this.reason}: ${super.message}`
+  get message(): string {
+    return this.reason
   }
 }
 
@@ -320,26 +321,26 @@ const makeFromQueue = <IE>(
     return Channel.embedInput(partsChannel, input)
   })
 
-function convertError(error: MP.MultipartError): Multipart.MultipartError {
-  switch (error._tag) {
+function convertError(cause: MP.MultipartError): Multipart.MultipartError {
+  switch (cause._tag) {
     case "ReachedLimit": {
-      switch (error.limit) {
+      switch (cause.limit) {
         case "MaxParts": {
-          return new MultipartError({ reason: "TooManyParts", error })
+          return new MultipartError({ reason: "TooManyParts", cause })
         }
         case "MaxFieldSize": {
-          return new MultipartError({ reason: "FieldTooLarge", error })
+          return new MultipartError({ reason: "FieldTooLarge", cause })
         }
         case "MaxPartSize": {
-          return new MultipartError({ reason: "FileTooLarge", error })
+          return new MultipartError({ reason: "FileTooLarge", cause })
         }
         case "MaxTotalSize": {
-          return new MultipartError({ reason: "BodyTooLarge", error })
+          return new MultipartError({ reason: "BodyTooLarge", cause })
         }
       }
     }
     default: {
-      return new MultipartError({ reason: "Parse", error })
+      return new MultipartError({ reason: "Parse", cause })
     }
   }
 }
@@ -409,7 +410,7 @@ const defaultWriteFile = (path: string, file: Multipart.File) =>
     (fs) =>
       Effect.mapError(
         Stream.run(file.content, fs.sink(path)),
-        (error) => new MultipartError({ reason: "InternalError", error })
+        (cause) => new MultipartError({ reason: "InternalError", cause })
       )
   )
 
@@ -450,8 +451,8 @@ export const toPersisted = (
       )
     ),
     Effect.catchTags({
-      SystemError: (error) => Effect.fail(new MultipartError({ reason: "InternalError", error })),
-      BadArgument: (error) => Effect.fail(new MultipartError({ reason: "InternalError", error }))
+      SystemError: (cause) => Effect.fail(new MultipartError({ reason: "InternalError", cause })),
+      BadArgument: (cause) => Effect.fail(new MultipartError({ reason: "InternalError", cause }))
     })
   )