@effect/platform 0.57.8 → 0.58.0

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

@@ -10,13 +10,13 @@ import { type Pipeable, pipeArguments } from "effect/Pipeable"
 import * as Predicate from "effect/Predicate"
 import * as Record from "effect/Record"
 import type * as Types from "effect/Types"
-import { TypeIdError } from "../Error.js"
+import { TypeIdError } from "./Error.js"
 
 /**
  * @since 1.0.0
  * @category type ids
  */
-export const TypeId: unique symbol = Symbol.for("@effect/platform/Http/Cookies")
+export const TypeId: unique symbol = Symbol.for("@effect/platform/Cookies")
 
 /**
  * @since 1.0.0
@@ -43,7 +43,7 @@ export interface Cookies extends Pipeable, Inspectable.Inspectable {
  * @since 1.0.0
  * @category type ids
  */
-export const CookieTypeId: unique symbol = Symbol.for("@effect/platform/Http/Cookies/Cookie")
+export const CookieTypeId: unique symbol = Symbol.for("@effect/platform/Cookies/Cookie")
 
 /**
  * @since 1.0.0
@@ -77,7 +77,7 @@ export interface Cookie extends Inspectable.Inspectable {
  * @since 1.0.0
  * @category type ids
  */
-export const ErrorTypeId: unique symbol = Symbol.for("@effect/platform/Http/Cookies/CookieError")
+export const ErrorTypeId: unique symbol = Symbol.for("@effect/platform/Cookies/CookieError")
 
 /**
  * @since 1.0.0
@@ -102,7 +102,7 @@ const Proto: Omit<Cookies, "cookies"> = {
   ...Inspectable.BaseProto,
   toJSON(this: Cookies) {
     return {
-      _id: "@effect/platform/Http/Cookies",
+      _id: "@effect/platform/Cookies",
       cookies: Record.map(this.cookies, (cookie) => cookie.toJSON())
     }
   },
@@ -309,7 +309,7 @@ const CookieProto = {
   ...Inspectable.BaseProto,
   toJSON(this: Cookie) {
     return {
-      _id: "@effect/platform/Http/Cookies/Cookie",
+      _id: "@effect/platform/Cookies/Cookie",
       name: this.name,
       value: this.value,
       options: this.options

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

@@ -3,9 +3,9 @@
  */
 import type * as Context from "effect/Context"
 import type * as Effect from "effect/Effect"
-import type * as FileSystem from "../FileSystem.js"
-import * as internal from "../internal/http/etag.js"
-import type * as Body from "./Body.js"
+import type * as FileSystem from "./FileSystem.js"
+import type * as Body from "./HttpBody.js"
+import * as internal from "./internal/etag.js"
 
 /**
  * @since 1.0.0
@@ -56,7 +56,7 @@ export type GeneratorTypeId = typeof GeneratorTypeId
 export interface Generator {
   readonly [GeneratorTypeId]: GeneratorTypeId
   readonly fromFileInfo: (info: FileSystem.File.Info) => Effect.Effect<Etag>
-  readonly fromFileWeb: (file: Body.Body.FileLike) => Effect.Effect<Etag>
+  readonly fromFileWeb: (file: Body.HttpBody.FileLike) => Effect.Effect<Etag>
 }
 
 /**

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

@@ -16,7 +16,7 @@ import type { Mutable } from "effect/Types"
  * @since 1.0.0
  * @category type ids
  */
-export const HeadersTypeId: unique symbol = Symbol.for("@effect/platform/Http/Headers")
+export const HeadersTypeId: unique symbol = Symbol.for("@effect/platform/Headers")
 
 /**
  * @since 1.0.0
@@ -249,7 +249,7 @@ export const redact: {
  * @category fiber refs
  */
 export const currentRedactedNames = globalValue(
-  "@effect/platform/Http/Headers/currentRedactedNames",
+  "@effect/platform/Headers/currentRedactedNames",
   () =>
     FiberRef.unsafeMake<ReadonlyArray<string | RegExp>>([
       "authorization",

package/src/{Http/App.ts → HttpApp.ts}

@@ -12,25 +12,25 @@ import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Runtime from "effect/Runtime"
 import * as Scope from "effect/Scope"
-import * as internalMiddleware from "../internal/http/middleware.js"
-import type { Middleware } from "./Middleware.js"
-import * as ServerError from "./ServerError.js"
-import * as ServerRequest from "./ServerRequest.js"
-import * as ServerResponse from "./ServerResponse.js"
+import type { HttpMiddleware } from "./HttpMiddleware.js"
+import * as ServerError from "./HttpServerError.js"
+import * as ServerRequest from "./HttpServerRequest.js"
+import * as ServerResponse from "./HttpServerResponse.js"
+import * as internalMiddleware from "./internal/httpMiddleware.js"
 
 /**
  * @since 1.0.0
  * @category models
  */
-export interface HttpApp<A = ServerResponse.ServerResponse, E = never, R = never>
-  extends Effect.Effect<A, E, R | ServerRequest.ServerRequest>
+export interface HttpApp<A = ServerResponse.HttpServerResponse, E = never, R = never>
+  extends Effect.Effect<A, E, R | ServerRequest.HttpServerRequest>
 {}
 
 /**
  * @since 1.0.0
  * @category models
  */
-export type Default<E = never, R = never> = HttpApp<ServerResponse.ServerResponse, E, R>
+export type Default<E = never, R = never> = HttpApp<ServerResponse.HttpServerResponse, E, R>
 
 /**
  * @since 1.0.0
@@ -39,17 +39,17 @@ export type Default<E = never, R = never> = HttpApp<ServerResponse.ServerRespons
 export const toHandled = <E, R, _, RH>(
   self: Default<E, R>,
   handleResponse: (
-    request: ServerRequest.ServerRequest,
-    exit: Exit.Exit<ServerResponse.ServerResponse, E | ServerError.ResponseError>
+    request: ServerRequest.HttpServerRequest,
+    exit: Exit.Exit<ServerResponse.HttpServerResponse, E | ServerError.ResponseError>
   ) => Effect.Effect<_, never, RH>,
-  middleware?: Middleware | undefined
+  middleware?: HttpMiddleware | undefined
 ): Default<E | ServerError.ResponseError, Exclude<R | RH, Scope.Scope>> => {
   const responded = Effect.withFiberRuntime<
-    ServerResponse.ServerResponse,
+    ServerResponse.HttpServerResponse,
     E | ServerError.ResponseError,
-    R | RH | ServerRequest.ServerRequest
+    R | RH | ServerRequest.HttpServerRequest
   >((fiber) => {
-    const request = Context.unsafeGet(fiber.getFiberRef(FiberRef.currentContext), ServerRequest.ServerRequest)
+    const request = Context.unsafeGet(fiber.getFiberRef(FiberRef.currentContext), ServerRequest.HttpServerRequest)
     const preHandled = Effect.flatMap(self, (response) => {
       const handler = fiber.getFiberRef(currentPreResponseHandlers)
       return handler._tag === "Some" ? handler.value(request, response) : Effect.succeed(response)
@@ -76,16 +76,16 @@ export const toHandled = <E, R, _, RH>(
  * @category models
  */
 export type PreResponseHandler = (
-  request: ServerRequest.ServerRequest,
-  response: ServerResponse.ServerResponse
-) => Effect.Effect<ServerResponse.ServerResponse, ServerError.ResponseError>
+  request: ServerRequest.HttpServerRequest,
+  response: ServerResponse.HttpServerResponse
+) => Effect.Effect<ServerResponse.HttpServerResponse, ServerError.ResponseError>
 
 /**
  * @since 1.0.0
  * @category fiber refs
  */
 export const currentPreResponseHandlers: FiberRef.FiberRef<Option.Option<PreResponseHandler>> = globalValue(
-  Symbol.for("@effect/platform/Http/App/preResponseHandlers"),
+  Symbol.for("@effect/platform/HttpApp/preResponseHandlers"),
   () => FiberRef.unsafeMake<Option.Option<PreResponseHandler>>(Option.none())
 )
 
@@ -152,7 +152,7 @@ export const toWebHandlerRuntime = <R>(runtime: Runtime.Runtime<R>) => {
         const req = ServerRequest.fromWeb(request)
         ;(req as any)[resolveSymbol] = resolve
         ;(req as any)[rejectSymbol] = reject
-        const fiber = run(Effect.provideService(handled, ServerRequest.ServerRequest, req))
+        const fiber = run(Effect.provideService(handled, ServerRequest.HttpServerRequest, req))
         request.signal.addEventListener("abort", () => {
           fiber.unsafeInterruptAsFork(ServerError.clientAbortFiberId)
         }, { once: true })

package/src/{Http/Body.ts → HttpBody.ts}

@@ -7,10 +7,10 @@ import type * as Effect from "effect/Effect"
 import type { Inspectable } from "effect/Inspectable"
 import * as Predicate from "effect/Predicate"
 import type * as Stream_ from "effect/Stream"
-import type * as PlatformError from "../Error.js"
-import type * as FileSystem from "../FileSystem.js"
-import type * as UrlParams from "../Http/UrlParams.js"
-import * as internal from "../internal/http/body.js"
+import type * as PlatformError from "./Error.js"
+import type * as FileSystem from "./FileSystem.js"
+import * as internal from "./internal/httpBody.js"
+import type * as UrlParams from "./UrlParams.js"
 
 /**
  * @since 1.0.0
@@ -28,18 +28,18 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category refinements
  */
-export const isBody = (u: unknown): u is Body => Predicate.hasProperty(u, TypeId)
+export const isHttpBody = (u: unknown): u is HttpBody => Predicate.hasProperty(u, TypeId)
 
 /**
  * @since 1.0.0
  * @category models
  */
-export type Body = Empty | Raw | Uint8Array | FormData | Stream
+export type HttpBody = Empty | Raw | Uint8Array | FormData | Stream
 
 /**
  * @since 1.0.0
  */
-export declare namespace Body {
+export declare namespace HttpBody {
   /**
    * @since 1.0.0
    * @category models
@@ -80,23 +80,23 @@ export type ErrorTypeId = typeof ErrorTypeId
  * @since 1.0.0
  * @category errors
  */
-export interface BodyError {
+export interface HttpBodyError {
   readonly [ErrorTypeId]: ErrorTypeId
-  readonly _tag: "BodyError"
-  readonly reason: BodyErrorReason
+  readonly _tag: "HttpBodyError"
+  readonly reason: ErrorReason
 }
 
 /**
  * @since 1.0.0
  * @category errors
  */
-export const BodyError: (reason: BodyErrorReason) => BodyError = internal.BodyError
+export const HttpBodyError: (reason: ErrorReason) => HttpBodyError = internal.HttpBodyError
 
 /**
  * @since 1.0.0
  * @category errors
  */
-export type BodyErrorReason = {
+export type ErrorReason = {
   readonly _tag: "JsonError"
   readonly error: unknown
 } | {
@@ -107,7 +107,7 @@ export type BodyErrorReason = {
  * @since 1.0.0
  * @category models
  */
-export interface Empty extends Body.Proto {
+export interface Empty extends HttpBody.Proto {
   readonly _tag: "Empty"
 }
 
@@ -121,7 +121,7 @@ export const empty: Empty = internal.empty
  * @since 1.0.0
  * @category models
  */
-export interface Raw extends Body.Proto {
+export interface Raw extends HttpBody.Proto {
   readonly _tag: "Raw"
   readonly body: unknown
 }
@@ -142,7 +142,7 @@ export const raw: (
  * @since 1.0.0
  * @category models
  */
-export interface Uint8Array extends Body.Proto {
+export interface Uint8Array extends HttpBody.Proto {
   readonly _tag: "Uint8Array"
   readonly body: globalThis.Uint8Array
   readonly contentType: string
@@ -171,7 +171,7 @@ export const unsafeJson: (body: unknown) => Uint8Array = internal.unsafeJson
  * @since 1.0.0
  * @category constructors
  */
-export const json: (body: unknown) => Effect.Effect<Uint8Array, BodyError> = internal.json
+export const json: (body: unknown) => Effect.Effect<Uint8Array, HttpBodyError> = internal.json
 
 /**
  * @since 1.0.0
@@ -179,7 +179,7 @@ export const json: (body: unknown) => Effect.Effect<Uint8Array, BodyError> = int
  */
 export const jsonSchema: <A, I, R>(
   schema: Schema.Schema<A, I, R>
-) => (body: A) => Effect.Effect<Uint8Array, BodyError, R> = internal.jsonSchema
+) => (body: A) => Effect.Effect<Uint8Array, HttpBodyError, R> = internal.jsonSchema
 
 /**
  * @since 1.0.0
@@ -191,7 +191,7 @@ export const urlParams: (urlParams: UrlParams.UrlParams) => Uint8Array = interna
  * @since 1.0.0
  * @category models
  */
-export interface FormData extends Body.Proto {
+export interface FormData extends HttpBody.Proto {
   readonly _tag: "FormData"
   readonly formData: globalThis.FormData
 }
@@ -206,7 +206,7 @@ export const formData: (body: globalThis.FormData) => FormData = internal.formDa
  * @since 1.0.0
  * @category models
  */
-export interface Stream extends Body.Proto {
+export interface Stream extends HttpBody.Proto {
   readonly _tag: "Stream"
   readonly stream: Stream_.Stream<globalThis.Uint8Array, unknown>
   readonly contentType: string
@@ -247,4 +247,4 @@ export const fileInfo: (
  * @since 1.0.0
  * @category constructors
  */
-export const fileWeb: (file: Body.FileLike) => Stream = internal.fileWeb
+export const fileWeb: (file: HttpBody.FileLike) => Stream = internal.fileWeb