@effect/platform 0.57.7 → 0.58.0

package/src/{Http/ServerResponse.ts → HttpServerResponse.ts}

@@ -6,21 +6,21 @@ import type * as Schema from "@effect/schema/Schema"
 import type * as Effect from "effect/Effect"
 import type { Inspectable } from "effect/Inspectable"
 import type * as Stream from "effect/Stream"
-import type * as PlatformError from "../Error.js"
-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 PlatformError from "./Error.js"
+import type * as FileSystem from "./FileSystem.js"
 import type * as Headers from "./Headers.js"
-import type * as Platform from "./Platform.js"
+import type * as Body from "./HttpBody.js"
+import type * as Platform from "./HttpPlatform.js"
+import * as internal from "./internal/httpServerResponse.js"
+import type * as Template from "./Template.js"
 import type * as UrlParams from "./UrlParams.js"
 
 /**
  * @since 1.0.0
  * @category type ids
  */
-export const TypeId: unique symbol = Symbol.for("@effect/platform/Http/ServerResponse")
+export const TypeId: unique symbol = Symbol.for("@effect/platform/HttpServerResponse")
 
 /**
  * @since 1.0.0
@@ -32,13 +32,13 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category models
  */
-export interface ServerResponse extends Effect.Effect<ServerResponse>, Inspectable {
+export interface HttpServerResponse extends Effect.Effect<HttpServerResponse>, Inspectable {
   readonly [TypeId]: TypeId
   readonly status: number
   readonly statusText?: string | undefined
   readonly headers: Headers.Headers
   readonly cookies: Cookies
-  readonly body: Body.Body
+  readonly body: Body.HttpBody
 }
 
 /**
@@ -74,26 +74,26 @@ export declare namespace Options {
 /**
  * @since 1.0.0
  */
-export const isServerResponse: (u: unknown) => u is ServerResponse = internal.isServerResponse
+export const isServerResponse: (u: unknown) => u is HttpServerResponse = internal.isServerResponse
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const empty: (options?: Options.WithContent | undefined) => ServerResponse = internal.empty
+export const empty: (options?: Options.WithContent | undefined) => HttpServerResponse = internal.empty
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const uint8Array: (body: Uint8Array, options?: Options.WithContentType | undefined) => ServerResponse =
+export const uint8Array: (body: Uint8Array, options?: Options.WithContentType | undefined) => HttpServerResponse =
   internal.uint8Array
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const text: (body: string, options?: Options.WithContentType | undefined) => ServerResponse = internal.text
+export const text: (body: string, options?: Options.WithContentType | undefined) => HttpServerResponse = internal.text
 
 /**
  * @since 1.0.0
@@ -103,8 +103,8 @@ export const html: {
   <A extends ReadonlyArray<Template.Interpolated>>(
     strings: TemplateStringsArray,
     ...args: A
-  ): Effect.Effect<ServerResponse, Template.Interpolated.Error<A[number]>, Template.Interpolated.Context<A[number]>>
-  (html: string): ServerResponse
+  ): Effect.Effect<HttpServerResponse, Template.Interpolated.Error<A[number]>, Template.Interpolated.Context<A[number]>>
+  (html: string): HttpServerResponse
 } = internal.html
 
 /**
@@ -114,7 +114,7 @@ export const html: {
 export const htmlStream: <A extends ReadonlyArray<Template.InterpolatedWithStream>>(
   strings: TemplateStringsArray,
   ...args: A
-) => Effect.Effect<ServerResponse, never, Template.Interpolated.Context<A[number]>> = internal.htmlStream
+) => Effect.Effect<HttpServerResponse, never, Template.Interpolated.Context<A[number]>> = internal.htmlStream
 
 /**
  * @since 1.0.0
@@ -123,7 +123,7 @@ export const htmlStream: <A extends ReadonlyArray<Template.InterpolatedWithStrea
 export const json: (
   body: unknown,
   options?: Options.WithContent | undefined
-) => Effect.Effect<ServerResponse, Body.BodyError> = internal.json
+) => Effect.Effect<HttpServerResponse, Body.HttpBodyError> = internal.json
 
 /**
  * @since 1.0.0
@@ -132,41 +132,44 @@ export const json: (
 export const schemaJson: <A, I, R>(
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
-) => (body: A, options?: Options.WithContent | undefined) => Effect.Effect<ServerResponse, Body.BodyError, R> =
+) => (body: A, options?: Options.WithContent | undefined) => Effect.Effect<HttpServerResponse, Body.HttpBodyError, R> =
   internal.schemaJson
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const unsafeJson: (body: unknown, options?: Options.WithContent | undefined) => ServerResponse =
+export const unsafeJson: (body: unknown, options?: Options.WithContent | undefined) => HttpServerResponse =
   internal.unsafeJson
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const urlParams: (body: UrlParams.Input, options?: Options.WithContent | undefined) => ServerResponse =
+export const urlParams: (body: UrlParams.Input, options?: Options.WithContent | undefined) => HttpServerResponse =
   internal.urlParams
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const raw: (body: unknown, options?: Options | undefined) => ServerResponse = internal.raw
+export const raw: (body: unknown, options?: Options | undefined) => HttpServerResponse = internal.raw
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const formData: (body: FormData, options?: Options.WithContent | undefined) => ServerResponse = internal.formData
+export const formData: (body: FormData, options?: Options.WithContent | undefined) => HttpServerResponse =
+  internal.formData
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const stream: <E>(body: Stream.Stream<Uint8Array, E, never>, options?: Options | undefined) => ServerResponse =
-  internal.stream
+export const stream: <E>(
+  body: Stream.Stream<Uint8Array, E, never>,
+  options?: Options | undefined
+) => HttpServerResponse = internal.stream
 
 /**
  * @since 1.0.0
@@ -175,24 +178,24 @@ export const stream: <E>(body: Stream.Stream<Uint8Array, E, never>, options?: Op
 export const file: (
   path: string,
   options?: (Options & FileSystem.StreamOptions) | undefined
-) => Effect.Effect<ServerResponse, PlatformError.PlatformError, Platform.Platform> = internal.file
+) => Effect.Effect<HttpServerResponse, PlatformError.PlatformError, Platform.HttpPlatform> = internal.file
 
 /**
  * @since 1.0.0
  * @category constructors
  */
 export const fileWeb: (
-  file: Body.Body.FileLike,
+  file: Body.HttpBody.FileLike,
   options?: (Options.WithContent & FileSystem.StreamOptions) | undefined
-) => Effect.Effect<ServerResponse, never, Platform.Platform> = internal.fileWeb
+) => Effect.Effect<HttpServerResponse, never, Platform.HttpPlatform> = internal.fileWeb
 
 /**
  * @since 1.0.0
  * @category combinators
  */
 export const setHeader: {
-  (key: string, value: string): (self: ServerResponse) => ServerResponse
-  (self: ServerResponse, key: string, value: string): ServerResponse
+  (key: string, value: string): (self: HttpServerResponse) => HttpServerResponse
+  (self: HttpServerResponse, key: string, value: string): HttpServerResponse
 } = internal.setHeader
 
 /**
@@ -200,8 +203,8 @@ export const setHeader: {
  * @category combinators
  */
 export const setHeaders: {
-  (input: Headers.Input): (self: ServerResponse) => ServerResponse
-  (self: ServerResponse, input: Headers.Input): ServerResponse
+  (input: Headers.Input): (self: HttpServerResponse) => HttpServerResponse
+  (self: HttpServerResponse, input: Headers.Input): HttpServerResponse
 } = internal.setHeaders
 
 /**
@@ -209,8 +212,8 @@ export const setHeaders: {
  * @category combinators
  */
 export const removeCookie: {
-  (name: string): (self: ServerResponse) => ServerResponse
-  (self: ServerResponse, name: string): ServerResponse
+  (name: string): (self: HttpServerResponse) => HttpServerResponse
+  (self: HttpServerResponse, name: string): HttpServerResponse
 } = internal.removeCookie
 
 /**
@@ -218,8 +221,8 @@ export const removeCookie: {
  * @category combinators
  */
 export const replaceCookies: {
-  (cookies: Cookies): (self: ServerResponse) => ServerResponse
-  (self: ServerResponse, cookies: Cookies): ServerResponse
+  (cookies: Cookies): (self: HttpServerResponse) => HttpServerResponse
+  (self: HttpServerResponse, cookies: Cookies): HttpServerResponse
 } = internal.replaceCookies
 
 /**
@@ -232,18 +235,18 @@ export const setCookie: {
     value: string,
     options?: Cookie["options"]
   ): (
-    self: ServerResponse
+    self: HttpServerResponse
   ) => Effect.Effect<
-    ServerResponse,
+    HttpServerResponse,
     CookiesError
   >
   (
-    self: ServerResponse,
+    self: HttpServerResponse,
     name: string,
     value: string,
     options?: Cookie["options"]
   ): Effect.Effect<
-    ServerResponse,
+    HttpServerResponse,
     CookiesError
   >
 } = internal.setCookie
@@ -257,13 +260,13 @@ export const unsafeSetCookie: {
     name: string,
     value: string,
     options?: Cookie["options"]
-  ): (self: ServerResponse) => ServerResponse
+  ): (self: HttpServerResponse) => HttpServerResponse
   (
-    self: ServerResponse,
+    self: HttpServerResponse,
     name: string,
     value: string,
     options?: Cookie["options"]
-  ): ServerResponse
+  ): HttpServerResponse
 } = internal.unsafeSetCookie
 
 /**
@@ -271,8 +274,8 @@ export const unsafeSetCookie: {
  * @category combinators
  */
 export const updateCookies: {
-  (f: (cookies: Cookies) => Cookies): (self: ServerResponse) => ServerResponse
-  (self: ServerResponse, f: (cookies: Cookies) => Cookies): ServerResponse
+  (f: (cookies: Cookies) => Cookies): (self: HttpServerResponse) => HttpServerResponse
+  (self: HttpServerResponse, f: (cookies: Cookies) => Cookies): HttpServerResponse
 } = internal.updateCookies
 
 /**
@@ -288,9 +291,9 @@ export const setCookies: {
         options?: Cookie["options"]
       ]
     >
-  ): (self: ServerResponse) => Effect.Effect<ServerResponse, CookiesError, never>
+  ): (self: HttpServerResponse) => Effect.Effect<HttpServerResponse, CookiesError, never>
   (
-    self: ServerResponse,
+    self: HttpServerResponse,
     cookies: Iterable<
       readonly [
         name: string,
@@ -298,7 +301,7 @@ export const setCookies: {
         options?: Cookie["options"]
       ]
     >
-  ): Effect.Effect<ServerResponse, CookiesError, never>
+  ): Effect.Effect<HttpServerResponse, CookiesError, never>
 } = internal.setCookies
 
 /**
@@ -314,9 +317,9 @@ export const unsafeSetCookies: {
         options?: Cookie["options"]
       ]
     >
-  ): (self: ServerResponse) => ServerResponse
+  ): (self: HttpServerResponse) => HttpServerResponse
   (
-    self: ServerResponse,
+    self: HttpServerResponse,
     cookies: Iterable<
       readonly [
         name: string,
@@ -324,7 +327,7 @@ export const unsafeSetCookies: {
         options?: Cookie["options"]
       ]
     >
-  ): ServerResponse
+  ): HttpServerResponse
 } = internal.unsafeSetCookies
 
 /**
@@ -332,8 +335,8 @@ export const unsafeSetCookies: {
  * @category combinators
  */
 export const setBody: {
-  (body: Body.Body): (self: ServerResponse) => ServerResponse
-  (self: ServerResponse, body: Body.Body): ServerResponse
+  (body: Body.HttpBody): (self: HttpServerResponse) => HttpServerResponse
+  (self: HttpServerResponse, body: Body.HttpBody): HttpServerResponse
 } = internal.setBody
 
 /**
@@ -341,12 +344,12 @@ export const setBody: {
  * @category combinators
  */
 export const setStatus: {
-  (status: number, statusText?: string | undefined): (self: ServerResponse) => ServerResponse
-  (self: ServerResponse, status: number, statusText?: string | undefined): ServerResponse
+  (status: number, statusText?: string | undefined): (self: HttpServerResponse) => HttpServerResponse
+  (self: HttpServerResponse, status: number, statusText?: string | undefined): HttpServerResponse
 } = internal.setStatus
 
 /**
  * @since 1.0.0
  * @category conversions
  */
-export const toWeb: (response: ServerResponse, withoutBody?: boolean | undefined) => Response = internal.toWeb
+export const toWeb: (response: HttpServerResponse, withoutBody?: boolean | undefined) => Response = internal.toWeb

package/src/{Http/Multipart.ts → Multipart.ts}

@@ -14,9 +14,9 @@ import type * as Option from "effect/Option"
 import type * as Scope from "effect/Scope"
 import type * as Stream from "effect/Stream"
 import type * as Multipasta from "multipasta"
-import type * as FileSystem from "../FileSystem.js"
-import * as internal from "../internal/http/multipart.js"
-import type * as Path from "../Path.js"
+import type * as FileSystem from "./FileSystem.js"
+import * as internal from "./internal/multipart.js"
+import type * as Path from "./Path.js"
 
 /**
  * @since 1.0.0

package/src/index.ts

@@ -8,6 +8,11 @@ export * as Command from "./Command.js"
  */
 export * as CommandExecutor from "./CommandExecutor.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as Cookies from "./Cookies.js"
+
 /**
  * @since 1.0.0
  */
@@ -18,26 +23,117 @@ export * as Effectify from "./Effectify.js"
  */
 export * as Error from "./Error.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as Etag from "./Etag.js"
+
 /**
  * @since 1.0.0
  */
 export * as FileSystem from "./FileSystem.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as Headers from "./Headers.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpApp from "./HttpApp.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpBody from "./HttpBody.js"
+
 /**
  * @since 1.0.0
  */
 export * as HttpClient from "./HttpClient.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as HttpClientError from "./HttpClientError.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpClientRequest from "./HttpClientRequest.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpClientResponse from "./HttpClientResponse.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpIncomingMessage from "./HttpIncomingMessage.js"
+
+/**
+ * @since 1.0.0
+ * @category models
+ */
+export * as HttpMethod from "./HttpMethod.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpMiddleware from "./HttpMiddleware.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpMultiplex from "./HttpMultiplex.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpPlatform from "./HttpPlatform.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpRouter from "./HttpRouter.js"
+
 /**
  * @since 1.0.0
  */
 export * as HttpServer from "./HttpServer.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as HttpServerError from "./HttpServerError.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpServerRequest from "./HttpServerRequest.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpServerResponse from "./HttpServerResponse.js"
+
+/**
+ * @since 1.0.0
+ */
+export * as HttpTraceContext from "./HttpTraceContext.js"
+
 /**
  * @since 1.0.0
  */
 export * as KeyValueStore from "./KeyValueStore.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as Multipart from "./Multipart.js"
+
 /**
  * @since 1.0.0
  */
@@ -78,6 +174,11 @@ export * as Terminal from "./Terminal.js"
  */
 export * as Transferable from "./Transferable.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as UrlParams from "./UrlParams.js"
+
 /**
  * @since 1.0.0
  */

package/src/internal/{http/etag.ts → etag.ts}

@@ -1,13 +1,13 @@
 import * as Context from "effect/Context"
-import type * as Etag from "../../Http/Etag.js"
+import type * as Etag from "../Etag.js"
 
 /** @internal */
 export const GeneratorTypeId: Etag.GeneratorTypeId = Symbol.for(
-  "@effect/platform/Http/Etag/Generator"
+  "@effect/platform/Etag/Generator"
 ) as Etag.GeneratorTypeId
 
 /** @internal */
-export const tag = Context.GenericTag<Etag.Generator>("@effect/platform/Http/Etag/Generator")
+export const tag = Context.GenericTag<Etag.Generator>("@effect/platform/Etag/Generator")
 
 /** @internal */
 export const toString = (self: Etag.Etag): string => {

package/src/internal/{http/body.ts → httpBody.ts}

@@ -5,28 +5,28 @@ import * as Effect from "effect/Effect"
 import { identity } from "effect/Function"
 import * as Inspectable from "effect/Inspectable"
 import * as Stream_ from "effect/Stream"
-import type * as PlatformError from "../../Error.js"
-import * as FileSystem from "../../FileSystem.js"
-import type * as Body from "../../Http/Body.js"
-import * as UrlParams from "../../Http/UrlParams.js"
+import type * as PlatformError from "../Error.js"
+import * as FileSystem from "../FileSystem.js"
+import type * as Body from "../HttpBody.js"
+import * as UrlParams from "../UrlParams.js"
 
 /** @internal */
 export const TypeId: Body.TypeId = Symbol.for(
-  "@effect/platform/Http/Body"
+  "@effect/platform/HttpBody"
 ) as Body.TypeId
 
 /** @internal */
 export const ErrorTypeId: Body.ErrorTypeId = Symbol.for(
-  "@effect/platform/Http/Body/BodyError"
+  "@effect/platform/HttpBody/HttpBodyError"
 ) as Body.ErrorTypeId
 
-const bodyError = Data.tagged<Body.BodyError>("BodyError")
+const bodyError = Data.tagged<Body.HttpBodyError>("HttpBodyError")
 
 /** @internal */
-export const BodyError = (reason: Body.BodyErrorReason): Body.BodyError =>
+export const HttpBodyError = (reason: Body.ErrorReason): Body.HttpBodyError =>
   bodyError({ [ErrorTypeId]: ErrorTypeId, reason })
 
-abstract class BodyBase implements Body.Body.Proto {
+abstract class BodyBase implements Body.HttpBody.Proto {
   readonly [TypeId]: Body.TypeId
   abstract readonly _tag: string
   constructor() {
@@ -45,7 +45,7 @@ class EmptyImpl extends BodyBase implements Body.Empty {
   readonly _tag = "Empty"
   toJSON(): unknown {
     return {
-      _id: "@effect/platform/Http/Body",
+      _id: "@effect/platform/HttpBody",
       _tag: "Empty"
     }
   }
@@ -65,7 +65,7 @@ class RawImpl extends BodyBase implements Body.Raw {
   }
   toJSON(): unknown {
     return {
-      _id: "@effect/platform/Http/Body",
+      _id: "@effect/platform/HttpBody",
       _tag: "Raw",
       body: this.body,
       contentType: this.contentType,
@@ -94,7 +94,7 @@ class Uint8ArrayImpl extends BodyBase implements Body.Uint8Array {
   toJSON(): unknown {
     const toString = this.contentType.startsWith("text/") || this.contentType.endsWith("json")
     return {
-      _id: "@effect/platform/Http/Body",
+      _id: "@effect/platform/HttpBody",
       _tag: "Uint8Array",
       body: toString ? new TextDecoder().decode(this.body) : `Uint8Array(${this.body.length})`,
       contentType: this.contentType,
@@ -117,10 +117,10 @@ export const text = (body: string, contentType?: string): Body.Uint8Array =>
 export const unsafeJson = (body: unknown): Body.Uint8Array => text(JSON.stringify(body), "application/json")
 
 /** @internal */
-export const json = (body: unknown): Effect.Effect<Body.Uint8Array, Body.BodyError> =>
+export const json = (body: unknown): Effect.Effect<Body.Uint8Array, Body.HttpBodyError> =>
   Effect.try({
     try: () => unsafeJson(body),
-    catch: (error) => BodyError({ _tag: "JsonError", error })
+    catch: (error) => HttpBodyError({ _tag: "JsonError", error })
   })
 
 /** @internal */
@@ -130,9 +130,9 @@ export const urlParams = (urlParams: UrlParams.UrlParams): Body.Uint8Array =>
 /** @internal */
 export const jsonSchema = <A, I, R>(schema: Schema.Schema<A, I, R>, options?: ParseOptions) => {
   const encode = Schema.encode(schema, options)
-  return (body: A): Effect.Effect<Body.Uint8Array, Body.BodyError, R> =>
+  return (body: A): Effect.Effect<Body.Uint8Array, Body.HttpBodyError, R> =>
     Effect.flatMap(
-      Effect.mapError(encode(body), (error) => BodyError({ _tag: "SchemaError", error })),
+      Effect.mapError(encode(body), (error) => HttpBodyError({ _tag: "SchemaError", error })),
       json
     )
 }
@@ -170,7 +170,7 @@ export const fileInfo = (
   )
 
 /** @internal */
-export const fileWeb = (file: Body.Body.FileLike): Body.Stream =>
+export const fileWeb = (file: Body.HttpBody.FileLike): Body.Stream =>
   stream(Stream_.fromReadableStream(() => file.stream() as ReadableStream<Uint8Array>, identity), file.type, file.size)
 
 class FormDataImpl extends BodyBase implements Body.FormData {
@@ -182,7 +182,7 @@ class FormDataImpl extends BodyBase implements Body.FormData {
   }
   toJSON(): unknown {
     return {
-      _id: "@effect/platform/Http/Body",
+      _id: "@effect/platform/HttpBody",
       _tag: "FormData",
       formData: this.formData
     }
@@ -203,7 +203,7 @@ class StreamImpl extends BodyBase implements Body.Stream {
   }
   toJSON(): unknown {
     return {
-      _id: "@effect/platform/Http/Body",
+      _id: "@effect/platform/HttpBody",
       _tag: "Stream",
       contentType: this.contentType,
       contentLength: this.contentLength