@effect/platform 0.48.14 → 0.48.16

package/src/Http/Headers.ts

@@ -50,18 +50,21 @@ export const schemaFromSelf: Schema.Schema<Headers> = Schema.declare(isHeaders,
  * @since 1.0.0
  * @category schemas
  */
-export const schema: Schema.Schema<Headers, ReadonlyRecord.ReadonlyRecord<string, string>> = Schema.transform(
-  Schema.record(Schema.string, Schema.string),
-  schemaFromSelf,
-  (record) => fromInput(record),
-  identity
-)
+export const schema: Schema.Schema<Headers, ReadonlyRecord.ReadonlyRecord<string, string | ReadonlyArray<string>>> =
+  Schema.transform(
+    Schema.record(Schema.string, Schema.union(Schema.string, Schema.array(Schema.string))),
+    schemaFromSelf,
+    (record) => fromInput(record),
+    identity
+  )
 
 /**
  * @since 1.0.0
  * @category models
  */
-export type Input = ReadonlyRecord.ReadonlyRecord<string, string> | Iterable<readonly [string, string]>
+export type Input =
+  | ReadonlyRecord.ReadonlyRecord<string, string | ReadonlyArray<string>>
+  | Iterable<readonly [string, string]>
 
 /**
  * @since 1.0.0
@@ -83,7 +86,12 @@ export const fromInput: (input?: Input) => Headers = (input) => {
     )) as Headers
   }
   return ReadonlyRecord.fromEntries(
-    Object.entries(input).map(([k, v]) => [k.toLowerCase(), v])
+    Object.entries(input).map(([k, v]) =>
+      [
+        k.toLowerCase(),
+        Array.isArray(v) ? v.join(", ") : v
+      ] as const
+    )
   ) as Headers
 }
 

package/src/Http/ServerRequest.ts

@@ -7,6 +7,7 @@ import type { Channel } from "effect/Channel"
 import type { Chunk } from "effect/Chunk"
 import type * as Context from "effect/Context"
 import type * as Effect from "effect/Effect"
+import type { ReadonlyRecord } from "effect/ReadonlyRecord"
 import type * as Scope from "effect/Scope"
 import type * as Stream from "effect/Stream"
 import type * as FileSystem from "../FileSystem.js"
@@ -49,6 +50,7 @@ export interface ServerRequest extends IncomingMessage.IncomingMessage<Error.Req
   readonly url: string
   readonly originalUrl: string
   readonly method: Method
+  readonly cookies: ReadonlyRecord<string, string>
 
   readonly multipart: Effect.Effect<
     Multipart.Persisted,

package/src/Http/ServerResponse.ts

@@ -10,6 +10,7 @@ import type * as FileSystem from "../FileSystem.js"
 import * as internal from "../internal/http/serverResponse.js"
 import type * as Template from "../Template.js"
 import type * as Body from "./Body.js"
+import type { Cookie, Cookies, CookiesError } from "./Cookies.js"
 import type * as Headers from "./Headers.js"
 import type * as Platform from "./Platform.js"
 import type * as UrlParams from "./UrlParams.js"
@@ -35,6 +36,7 @@ export interface ServerResponse extends Effect.Effect<ServerResponse>, Inspectab
   readonly status: number
   readonly statusText?: string | undefined
   readonly headers: Headers.Headers
+  readonly cookies: Cookies
   readonly body: Body.Body
 }
 
@@ -46,6 +48,7 @@ export interface Options {
   readonly status?: number | undefined
   readonly statusText?: string | undefined
   readonly headers?: Headers.Headers | undefined
+  readonly cookies?: Cookies | undefined
   readonly contentType?: string | undefined
   readonly contentLength?: number | undefined
 }
@@ -195,6 +198,129 @@ export const setHeaders: {
   (self: ServerResponse, input: Headers.Input): ServerResponse
 } = internal.setHeaders
 
+/**
+ * @since 1.0.0
+ * @category combinators
+ */
+export const removeCookie: {
+  (name: string): (self: ServerResponse) => ServerResponse
+  (self: ServerResponse, name: string): ServerResponse
+} = internal.removeCookie
+
+/**
+ * @since 1.0.0
+ * @category combinators
+ */
+export const replaceCookies: {
+  (cookies: Cookies): (self: ServerResponse) => ServerResponse
+  (self: ServerResponse, cookies: Cookies): ServerResponse
+} = internal.replaceCookies
+
+/**
+ * @since 1.0.0
+ * @category combinators
+ */
+export const setCookie: {
+  (
+    name: string,
+    value: string,
+    options?: Cookie["options"]
+  ): (
+    self: ServerResponse
+  ) => Effect.Effect<
+    ServerResponse,
+    CookiesError
+  >
+  (
+    self: ServerResponse,
+    name: string,
+    value: string,
+    options?: Cookie["options"]
+  ): Effect.Effect<
+    ServerResponse,
+    CookiesError
+  >
+} = internal.setCookie
+
+/**
+ * @since 1.0.0
+ * @category combinators
+ */
+export const unsafeSetCookie: {
+  (
+    name: string,
+    value: string,
+    options?: Cookie["options"]
+  ): (self: ServerResponse) => ServerResponse
+  (
+    self: ServerResponse,
+    name: string,
+    value: string,
+    options?: Cookie["options"]
+  ): ServerResponse
+} = internal.unsafeSetCookie
+
+/**
+ * @since 1.0.0
+ * @category combinators
+ */
+export const updateCookies: {
+  (f: (cookies: Cookies) => Cookies): (self: ServerResponse) => ServerResponse
+  (self: ServerResponse, f: (cookies: Cookies) => Cookies): ServerResponse
+} = internal.updateCookies
+
+/**
+ * @since 1.0.0
+ * @category combinators
+ */
+export const setCookies: {
+  (
+    cookies: Iterable<
+      readonly [
+        name: string,
+        value: string,
+        options?: Cookie["options"]
+      ]
+    >
+  ): (self: ServerResponse) => Effect.Effect<ServerResponse, CookiesError, never>
+  (
+    self: ServerResponse,
+    cookies: Iterable<
+      readonly [
+        name: string,
+        value: string,
+        options?: Cookie["options"]
+      ]
+    >
+  ): Effect.Effect<ServerResponse, CookiesError, never>
+} = internal.setCookies
+
+/**
+ * @since 1.0.0
+ * @category combinators
+ */
+export const unsafeSetCookies: {
+  (
+    cookies: Iterable<
+      readonly [
+        name: string,
+        value: string,
+        options?: Cookie["options"]
+      ]
+    >
+  ): (self: ServerResponse) => ServerResponse
+  (
+    self: ServerResponse,
+    cookies: Iterable<
+      readonly [
+        name: string,
+        value: string,
+        options?: Cookie["options"]
+      ]
+    >
+  ): ServerResponse
+} = internal.unsafeSetCookies
+
 /**
  * @since 1.0.0
  * @category combinators

package/src/HttpClient.ts

@@ -6,6 +6,7 @@ import * as client from "./Http/Client.js"
 import * as error from "./Http/ClientError.js"
 import * as request from "./Http/ClientRequest.js"
 import * as response from "./Http/ClientResponse.js"
+import * as cookies from "./Http/Cookies.js"
 import * as headers from "./Http/Headers.js"
 import * as urlParams from "./Http/UrlParams.js"
 
@@ -24,6 +25,13 @@ export {
    * - Module: `@effect/platform/Http/Client`
    */
   client,
+  /**
+   * @since 1.0.0
+   *
+   * - Docs: [Http/Cookies](https://effect-ts.github.io/effect/platform/Http/Cookies.ts.html)
+   * - Module: `@effect/platform/Http/Cookies`
+   */
+  cookies,
   /**
    * @since 1.0.0
    *

package/src/HttpServer.ts

@@ -3,6 +3,7 @@
  */
 import * as app from "./Http/App.js"
 import * as body from "./Http/Body.js"
+import * as cookies from "./Http/Cookies.js"
 import * as etag from "./Http/Etag.js"
 import * as headers from "./Http/Headers.js"
 import * as middleware from "./Http/Middleware.js"
@@ -31,6 +32,13 @@ export {
    * - Module: `@effect/platform/Http/Body`
    */
   body,
+  /**
+   * @since 1.0.0
+   *
+   * - Docs: [Http/Cookies](https://effect-ts.github.io/effect/platform/Http/Cookies.ts.html)
+   * - Module: `@effect/platform/Http/Cookies`
+   */
+  cookies,
   /**
    * @since 1.0.0
    *

package/src/internal/http/client.ts

@@ -6,6 +6,7 @@ import { dual, pipe } from "effect/Function"
 import * as Layer from "effect/Layer"
 import { pipeArguments } from "effect/Pipeable"
 import type * as Predicate from "effect/Predicate"
+import * as Ref from "effect/Ref"
 import type * as Schedule from "effect/Schedule"
 import type * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
@@ -14,6 +15,7 @@ import type * as Client from "../../Http/Client.js"
 import * as Error from "../../Http/ClientError.js"
 import type * as ClientRequest from "../../Http/ClientRequest.js"
 import type * as ClientResponse from "../../Http/ClientResponse.js"
+import * as Cookies from "../../Http/Cookies.js"
 import * as Method from "../../Http/Method.js"
 import * as UrlParams from "../../Http/UrlParams.js"
 import * as internalBody from "./body.js"
@@ -609,3 +611,36 @@ export const tapRequest = dual<
     f: (a: ClientRequest.ClientRequest) => Effect.Effect<_, E2, R2>
   ) => Client.Client<R | R2, E | E2, A>
 >(2, (self, f) => make(self.execute as any, (request) => Effect.tap(self.preprocess(request), f)))
+
+/** @internal */
+export const withCookiesRef = dual<
+  (
+    ref: Ref.Ref<Cookies.Cookies>
+  ) => <R, E>(self: Client.Client.WithResponse<R, E>) => Client.Client.WithResponse<R, E>,
+  <R, E>(
+    self: Client.Client.WithResponse<R, E>,
+    ref: Ref.Ref<Cookies.Cookies>
+  ) => Client.Client.WithResponse<R, E>
+>(
+  2,
+  <R, E>(
+    self: Client.Client.WithResponse<R, E>,
+    ref: Ref.Ref<Cookies.Cookies>
+  ): Client.Client.WithResponse<R, E> =>
+    make(
+      (request: Effect.Effect<ClientRequest.ClientRequest, E, R>) =>
+        Effect.tap(
+          self.execute(request),
+          (response) => Ref.update(ref, (cookies) => Cookies.merge(cookies, response.cookies))
+        ),
+      (request) =>
+        Effect.flatMap(self.preprocess(request), (request) =>
+          Effect.map(
+            Ref.get(ref),
+            (cookies) =>
+              Cookies.isEmpty(cookies)
+                ? request
+                : internalRequest.setHeader(request, "cookie", Cookies.toCookieHeader(cookies))
+          ))
+    )
+)

package/src/internal/http/clientResponse.ts

@@ -7,6 +7,7 @@ import * as Stream from "effect/Stream"
 import * as Error from "../../Http/ClientError.js"
 import type * as ClientRequest from "../../Http/ClientRequest.js"
 import type * as ClientResponse from "../../Http/ClientResponse.js"
+import * as Cookies from "../../Http/Cookies.js"
 import * as Headers from "../../Http/Headers.js"
 import * as IncomingMessage from "../../Http/IncomingMessage.js"
 import * as UrlParams from "../../Http/UrlParams.js"
@@ -49,6 +50,14 @@ class ClientResponseImpl extends Inspectable.Class implements ClientResponse.Cli
     return Headers.fromInput(this.source.headers)
   }
 
+  cachedCookies?: Cookies.Cookies
+  get cookies(): Cookies.Cookies {
+    if (this.cachedCookies) {
+      return this.cachedCookies
+    }
+    return this.cachedCookies = Cookies.fromSetCookie(this.source.headers.getSetCookie())
+  }
+
   get remoteAddress(): Option.Option<string> {
     return Option.none()
   }

package/src/internal/http/serverRequest.ts

@@ -5,9 +5,11 @@ import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Inspectable from "effect/Inspectable"
 import * as Option from "effect/Option"
+import type { ReadonlyRecord } from "effect/ReadonlyRecord"
 import type * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
 import type * as FileSystem from "../../FileSystem.js"
+import * as Cookies from "../../Http/Cookies.js"
 import * as Headers from "../../Http/Headers.js"
 import * as IncomingMessage from "../../Http/IncomingMessage.js"
 import type { Method } from "../../Http/Method.js"
@@ -164,6 +166,14 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.Serve
     return this.headersOverride
   }
 
+  private cachedCookies: ReadonlyRecord<string, string> | undefined
+  get cookies() {
+    if (this.cachedCookies) {
+      return this.cachedCookies
+    }
+    return this.cachedCookies = Cookies.parseHeader(this.headers.cookie ?? "")
+  }
+
   get stream(): Stream.Stream<Uint8Array, Error.RequestError> {
     return this.source.body
       ? Stream.fromReadableStream(() => this.source.body as any, (_) =>

package/src/internal/http/serverResponse.ts

@@ -7,6 +7,7 @@ import * as Stream from "effect/Stream"
 import type * as PlatformError from "../../Error.js"
 import type * as FileSystem from "../../FileSystem.js"
 import type * as Body from "../../Http/Body.js"
+import * as Cookies from "../../Http/Cookies.js"
 import * as Headers from "../../Http/Headers.js"
 import * as Platform from "../../Http/Platform.js"
 import type * as ServerResponse from "../../Http/ServerResponse.js"
@@ -26,6 +27,7 @@ class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.Serve
     readonly status: number,
     readonly statusText: string | undefined,
     headers: Headers.Headers,
+    readonly cookies: Cookies.Cookies,
     readonly body: Body.Body
   ) {
     super()
@@ -77,6 +79,7 @@ export const empty = (options?: ServerResponse.Options.WithContent): ServerRespo
     options?.status ?? 204,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.empty
   )
 
@@ -89,6 +92,7 @@ export const uint8Array = (
     options?.status ?? 200,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.uint8Array(body, getContentType(options))
   )
 
@@ -98,6 +102,7 @@ export const text = (body: string, options?: ServerResponse.Options.WithContentT
     options?.status ?? 200,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.text(body, getContentType(options))
   )
 
@@ -157,6 +162,7 @@ export const json = (
       options?.status ?? 200,
       options?.statusText,
       options?.headers ?? Headers.empty,
+      options?.cookies ?? Cookies.empty,
       body
     ))
 
@@ -169,6 +175,7 @@ export const unsafeJson = (
     options?.status ?? 200,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.unsafeJson(body)
   )
 
@@ -186,6 +193,7 @@ export const schemaJson = <A, I, R>(
         options?.status ?? 200,
         options?.statusText,
         options?.headers ?? Headers.empty,
+        options?.cookies ?? Cookies.empty,
         body
       ))
 }
@@ -219,6 +227,7 @@ export const urlParams = (
     options?.status ?? 200,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.text(UrlParams.toString(UrlParams.fromInput(body)), "application/x-www-form-urlencoded")
   )
 
@@ -228,6 +237,7 @@ export const raw = (body: unknown, options?: ServerResponse.Options): ServerResp
     options?.status ?? 200,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.raw(body)
   )
 
@@ -240,6 +250,7 @@ export const formData = (
     options?.status ?? 200,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.formData(body)
   )
 
@@ -252,6 +263,7 @@ export const stream = (
     options?.status ?? 200,
     options?.statusText,
     options?.headers ?? Headers.empty,
+    options?.cookies ?? Cookies.empty,
     internalBody.stream(body, getContentType(options), options?.contentLength)
   )
 
@@ -275,9 +287,156 @@ export const setHeader = dual<
     self.status,
     self.statusText,
     Headers.set(self.headers, key, value),
+    self.cookies,
     self.body
   ))
 
+/** @internal */
+export const replaceCookies = dual<
+  (cookies: Cookies.Cookies) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  (self: ServerResponse.ServerResponse, cookies: Cookies.Cookies) => ServerResponse.ServerResponse
+>(2, (self, cookies) =>
+  new ServerResponseImpl(
+    self.status,
+    self.statusText,
+    self.headers,
+    cookies,
+    self.body
+  ))
+
+/** @internal */
+export const setCookie = dual<
+  (
+    name: string,
+    value: string,
+    options?: Cookies.Cookie["options"]
+  ) => (self: ServerResponse.ServerResponse) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>,
+  (
+    self: ServerResponse.ServerResponse,
+    name: string,
+    value: string,
+    options?: Cookies.Cookie["options"]
+  ) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>
+>(
+  (args) => Cookies.isCookies(args[0]),
+  (self, name, value, options) =>
+    Effect.map(Cookies.add(self.cookies, name, value, options), (cookies) =>
+      new ServerResponseImpl(
+        self.status,
+        self.statusText,
+        self.headers,
+        cookies,
+        self.body
+      ))
+)
+
+/** @internal */
+export const unsafeSetCookie = dual<
+  (
+    name: string,
+    value: string,
+    options?: Cookies.Cookie["options"]
+  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  (
+    self: ServerResponse.ServerResponse,
+    name: string,
+    value: string,
+    options?: Cookies.Cookie["options"]
+  ) => ServerResponse.ServerResponse
+>(
+  (args) => Cookies.isCookies(args[0]),
+  (self, name, value, options) =>
+    new ServerResponseImpl(
+      self.status,
+      self.statusText,
+      self.headers,
+      Cookies.unsafeAdd(self.cookies, name, value, options),
+      self.body
+    )
+)
+
+/** @internal */
+export const updateCookies = dual<
+  (
+    f: (cookies: Cookies.Cookies) => Cookies.Cookies
+  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  (
+    self: ServerResponse.ServerResponse,
+    f: (cookies: Cookies.Cookies) => Cookies.Cookies
+  ) => ServerResponse.ServerResponse
+>(2, (self, f) =>
+  new ServerResponseImpl(
+    self.status,
+    self.statusText,
+    self.headers,
+    f(self.cookies),
+    self.body
+  ))
+
+/** @internal */
+export const setCookies = dual<
+  (
+    cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
+  ) => (self: ServerResponse.ServerResponse) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>,
+  (
+    self: ServerResponse.ServerResponse,
+    cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
+  ) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>
+>(
+  2,
+  (self, cookies) =>
+    Effect.map(Cookies.addAll(self.cookies, cookies), (cookies) =>
+      new ServerResponseImpl(
+        self.status,
+        self.statusText,
+        self.headers,
+        cookies,
+        self.body
+      ))
+)
+
+/** @internal */
+export const unsafeSetCookies = dual<
+  (
+    cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
+  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  (
+    self: ServerResponse.ServerResponse,
+    cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
+  ) => ServerResponse.ServerResponse
+>(
+  2,
+  (self, cookies) =>
+    new ServerResponseImpl(
+      self.status,
+      self.statusText,
+      self.headers,
+      Cookies.unsafeAddAll(self.cookies, cookies),
+      self.body
+    )
+)
+
+/** @internal */
+export const removeCookie = dual<
+  (
+    name: string
+  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  (
+    self: ServerResponse.ServerResponse,
+    name: string
+  ) => ServerResponse.ServerResponse
+>(
+  2,
+  (self, name) =>
+    new ServerResponseImpl(
+      self.status,
+      self.statusText,
+      self.headers,
+      Cookies.remove(self.cookies, name),
+      self.body
+    )
+)
+
 /** @internal */
 export const setHeaders = dual<
   (input: Headers.Input) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
@@ -287,6 +446,7 @@ export const setHeaders = dual<
     self.status,
     self.statusText,
     Headers.setAll(self.headers, input),
+    self.cookies,
     self.body
   ))
 
@@ -299,6 +459,7 @@ export const setStatus = dual<
     status,
     statusText,
     self.headers,
+    self.cookies,
     self.body
   ))
 
@@ -315,6 +476,7 @@ export const setBody = dual<
     self.status,
     self.statusText,
     headers,
+    self.cookies,
     body
   )
 })