@effect/platform 0.48.16 → 0.48.18

package/src/internal/http/serverResponse.ts

@@ -1,3 +1,4 @@
+import type { ParseOptions } from "@effect/schema/AST"
 import type * as Schema from "@effect/schema/Schema"
 import * as Effect from "effect/Effect"
 import * as Effectable from "effect/Effectable"
@@ -64,6 +65,7 @@ class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.Serve
       status: this.status,
       statusText: this.statusText,
       headers: this.headers,
+      cookies: this.cookies.toJSON(),
       body: this.body.toJSON()
     }
   }
@@ -74,7 +76,7 @@ export const isServerResponse = (u: unknown): u is ServerResponse.ServerResponse
   typeof u === "object" && u !== null && TypeId in u
 
 /** @internal */
-export const empty = (options?: ServerResponse.Options.WithContent): ServerResponse.ServerResponse =>
+export const empty = (options?: ServerResponse.Options.WithContent | undefined): ServerResponse.ServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 204,
     options?.statusText,
@@ -155,7 +157,7 @@ export const htmlStream = <A extends ReadonlyArray<Template.InterpolatedWithStre
 /** @internal */
 export const json = (
   body: unknown,
-  options?: ServerResponse.Options.WithContent
+  options?: ServerResponse.Options.WithContent | undefined
 ): Effect.Effect<ServerResponse.ServerResponse, Body.BodyError> =>
   Effect.map(internalBody.json(body), (body) =>
     new ServerResponseImpl(
@@ -169,7 +171,7 @@ export const json = (
 /** @internal */
 export const unsafeJson = (
   body: unknown,
-  options?: ServerResponse.Options.WithContent
+  options?: ServerResponse.Options.WithContent | undefined
 ): ServerResponse.ServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
@@ -181,12 +183,13 @@ export const unsafeJson = (
 
 /** @internal */
 export const schemaJson = <A, I, R>(
-  schema: Schema.Schema<A, I, R>
+  schema: Schema.Schema<A, I, R>,
+  options?: ParseOptions | undefined
 ) => {
-  const encode = internalBody.jsonSchema(schema)
+  const encode = internalBody.jsonSchema(schema, options)
   return (
     body: A,
-    options?: ServerResponse.Options.WithContent
+    options?: ServerResponse.Options.WithContent | undefined
   ): Effect.Effect<ServerResponse.ServerResponse, Body.BodyError, R> =>
     Effect.map(encode(body), (body) =>
       new ServerResponseImpl(
@@ -201,7 +204,7 @@ export const schemaJson = <A, I, R>(
 /** @internal */
 export const file = (
   path: string,
-  options?: ServerResponse.Options & FileSystem.StreamOptions
+  options?: (ServerResponse.Options & FileSystem.StreamOptions) | undefined
 ): Effect.Effect<ServerResponse.ServerResponse, PlatformError.PlatformError, Platform.Platform> =>
   Effect.flatMap(
     Platform.Platform,
@@ -211,7 +214,7 @@ export const file = (
 /** @internal */
 export const fileWeb = (
   file: Body.Body.FileLike,
-  options?: ServerResponse.Options.WithContent & FileSystem.StreamOptions
+  options?: (ServerResponse.Options.WithContent & FileSystem.StreamOptions) | undefined
 ): Effect.Effect<ServerResponse.ServerResponse, never, Platform.Platform> =>
   Effect.flatMap(
     Platform.Platform,
@@ -221,7 +224,7 @@ export const fileWeb = (
 /** @internal */
 export const urlParams = (
   body: UrlParams.Input,
-  options?: ServerResponse.Options.WithContent
+  options?: ServerResponse.Options.WithContent | undefined
 ): ServerResponse.ServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
@@ -232,7 +235,7 @@ export const urlParams = (
   )
 
 /** @internal */
-export const raw = (body: unknown, options?: ServerResponse.Options): ServerResponse.ServerResponse =>
+export const raw = (body: unknown, options?: ServerResponse.Options | undefined): ServerResponse.ServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -244,7 +247,7 @@ export const raw = (body: unknown, options?: ServerResponse.Options): ServerResp
 /** @internal */
 export const formData = (
   body: FormData,
-  options?: ServerResponse.Options.WithContent
+  options?: ServerResponse.Options.WithContent | undefined
 ): ServerResponse.ServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
@@ -257,7 +260,7 @@ export const formData = (
 /** @internal */
 export const stream = (
   body: Stream.Stream<Uint8Array, unknown>,
-  options?: ServerResponse.Options
+  options?: ServerResponse.Options | undefined
 ): ServerResponse.ServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
@@ -268,7 +271,7 @@ export const stream = (
   )
 
 /** @internal */
-export const getContentType = (options?: ServerResponse.Options): string | undefined => {
+export const getContentType = (options?: ServerResponse.Options | undefined): string | undefined => {
   if (options?.contentType) {
     return options.contentType
   } else if (options?.headers) {
@@ -320,7 +323,7 @@ export const setCookie = dual<
 >(
   (args) => Cookies.isCookies(args[0]),
   (self, name, value, options) =>
-    Effect.map(Cookies.add(self.cookies, name, value, options), (cookies) =>
+    Effect.map(Cookies.set(self.cookies, name, value, options), (cookies) =>
       new ServerResponseImpl(
         self.status,
         self.statusText,
@@ -350,7 +353,7 @@ export const unsafeSetCookie = dual<
       self.status,
       self.statusText,
       self.headers,
-      Cookies.unsafeAdd(self.cookies, name, value, options),
+      Cookies.unsafeSet(self.cookies, name, value, options),
       self.body
     )
 )
@@ -385,7 +388,7 @@ export const setCookies = dual<
 >(
   2,
   (self, cookies) =>
-    Effect.map(Cookies.addAll(self.cookies, cookies), (cookies) =>
+    Effect.map(Cookies.setAll(self.cookies, cookies), (cookies) =>
       new ServerResponseImpl(
         self.status,
         self.statusText,
@@ -411,7 +414,7 @@ export const unsafeSetCookies = dual<
       self.status,
       self.statusText,
       self.headers,
-      Cookies.unsafeAddAll(self.cookies, cookies),
+      Cookies.unsafeSetAll(self.cookies, cookies),
       self.body
     )
 )
@@ -483,11 +486,18 @@ export const setBody = dual<
 
 /** @internal */
 export const toWeb = (response: ServerResponse.ServerResponse, withoutBody = false): Response => {
+  const headers = new globalThis.Headers(response.headers)
+  if (!Cookies.isEmpty(response.cookies)) {
+    const toAdd = Cookies.toSetCookieHeaders(response.cookies)
+    for (const header of toAdd) {
+      headers.append("set-cookie", header)
+    }
+  }
   if (withoutBody) {
     return new Response(undefined, {
       status: response.status,
       statusText: response.statusText as string,
-      headers: response.headers
+      headers
     })
   }
   const body = response.body
@@ -496,7 +506,7 @@ export const toWeb = (response: ServerResponse.ServerResponse, withoutBody = fal
       return new Response(undefined, {
         status: response.status,
         statusText: response.statusText as string,
-        headers: response.headers
+        headers
       })
     }
     case "Uint8Array":
@@ -504,21 +514,21 @@ export const toWeb = (response: ServerResponse.ServerResponse, withoutBody = fal
       return new Response(body.body as any, {
         status: response.status,
         statusText: response.statusText,
-        headers: response.headers
+        headers
       })
     }
     case "FormData": {
       return new Response(body.formData as any, {
         status: response.status,
         statusText: response.statusText,
-        headers: response.headers
+        headers
       })
     }
     case "Stream": {
       return new Response(Stream.toReadableStream(body.stream), {
         status: response.status,
         statusText: response.statusText,
-        headers: response.headers
+        headers
       })
     }
   }