@effect/platform 0.17.1 → 0.18.0

package/src/internal/http/platform.ts

@@ -1,11 +1,11 @@
-import * as Context from "@effect/data/Context"
-import { pipe } from "@effect/data/Function"
-import * as Effect from "@effect/io/Effect"
 import * as FileSystem from "@effect/platform/FileSystem"
 import type * as Body from "@effect/platform/Http/Body"
 import * as Etag from "@effect/platform/Http/Etag"
 import type * as Platform from "@effect/platform/Http/Platform"
 import type * as ServerResponse from "@effect/platform/Http/ServerResponse"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import { pipe } from "effect/Function"
 
 /** @internal */
 export const TypeId: Platform.TypeId = Symbol.for("@effect/platform/Http/Platform") as Platform.TypeId

package/src/internal/http/router.ts

@@ -1,13 +1,3 @@
-import * as Chunk from "@effect/data/Chunk"
-import * as Context from "@effect/data/Context"
-import * as Equal from "@effect/data/Equal"
-import { dual } from "@effect/data/Function"
-import * as Hash from "@effect/data/Hash"
-import * as Inspectable from "@effect/data/Inspectable"
-import * as Option from "@effect/data/Option"
-import { pipeArguments } from "@effect/data/Pipeable"
-import type * as Cause from "@effect/io/Cause"
-import * as Effect from "@effect/io/Effect"
 import type * as App from "@effect/platform/Http/App"
 import type * as Method from "@effect/platform/Http/Method"
 import type * as Router from "@effect/platform/Http/Router"
@@ -15,9 +5,14 @@ import * as Error from "@effect/platform/Http/ServerError"
 import * as ServerRequest from "@effect/platform/Http/ServerRequest"
 import type * as ServerResponse from "@effect/platform/Http/ServerResponse"
 import * as Schema from "@effect/schema/Schema"
-import * as Channel from "@effect/stream/Channel"
-import * as Sink from "@effect/stream/Sink"
-import * as Stream from "@effect/stream/Stream"
+import type * as Cause from "effect/Cause"
+import * as Chunk from "effect/Chunk"
+import * as Context from "effect/Context"
+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 Option from "effect/Option"
 import type { HTTPMethod } from "find-my-way"
 import FindMyWay from "find-my-way"
 
@@ -54,43 +49,27 @@ export const schemaParams = <I extends Readonly<Record<string, string>>, A>(sche
   )
 }
 
-class RouterImpl<R, E> implements Router.Router<R, E> {
+class RouterImpl<R, E> extends Effectable.Effectable<
+  Exclude<R, Router.RouteContext>,
+  E | Error.RouteNotFound,
+  ServerResponse.ServerResponse
+> implements Router.Router<R, E> {
   readonly [TypeId]: Router.TypeId
   constructor(
     readonly routes: Chunk.Chunk<Router.Route<R, E>>,
     readonly mounts: Chunk.Chunk<readonly [string, App.Default<R, E>]>
   ) {
+    super()
     this[TypeId] = TypeId
-    this[Effect.EffectTypeId] = undefined
-    this[Stream.StreamTypeId] = undefined
-    this[Sink.SinkTypeId] = undefined
-    this[Channel.ChannelTypeId] = undefined
   }
-  pipe() {
-    return pipeArguments(this, arguments)
-  }
-  private httpApp: App.Default<Router.Router.ExcludeProvided<R>, E | Error.RouteNotFound> | undefined
+  private httpApp:
+    | Effect.Effect<Exclude<R, Router.RouteContext>, E | Error.RouteNotFound, ServerResponse.ServerResponse>
+    | undefined
   commit() {
     if (this.httpApp === undefined) {
-      this.httpApp = toHttpApp(this)
+      this.httpApp = toHttpApp(this) as any
     }
-    return this.httpApp
-  }
-
-  // implements HttpApp/Effect
-  public _tag = "Commit" // OP_COMMIT
-  readonly [Effect.EffectTypeId]: any
-  readonly [Stream.StreamTypeId]: any
-  readonly [Sink.SinkTypeId]: any
-  readonly [Channel.ChannelTypeId]: any;
-  [Equal.symbol](
-    this: RouterImpl<R, E>,
-    that: RouterImpl<R, E>
-  ): boolean {
-    return this === that
-  }
-  [Hash.symbol](this: RouterImpl<R, E>): number {
-    return Hash.random(this)
+    return this.httpApp!
   }
   toJSON() {
     return {

package/src/internal/http/server.ts

@@ -1,12 +1,12 @@
-import * as Context from "@effect/data/Context"
-import { dual } from "@effect/data/Function"
-import * as Effect from "@effect/io/Effect"
-import type * as Scope from "@effect/io/Scope"
 import type * as App from "@effect/platform/Http/App"
 import type * as Middleware from "@effect/platform/Http/Middleware"
 import type * as Server from "@effect/platform/Http/Server"
 import type * as Error from "@effect/platform/Http/ServerError"
 import type * as ServerRequest from "@effect/platform/Http/ServerRequest"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import { dual } from "effect/Function"
+import type * as Scope from "effect/Scope"
 
 /** @internal */
 export const TypeId: Server.TypeId = Symbol.for("@effect/platform/Http/Server") as Server.TypeId

package/src/internal/http/serverError.ts

@@ -1,5 +1,5 @@
-import * as Data from "@effect/data/Data"
 import type * as Error from "@effect/platform/Http/ServerError"
+import * as Data from "effect/Data"
 
 /** @internal */
 export const TypeId: Error.TypeId = Symbol.for(

package/src/internal/http/serverRequest.ts

@@ -1,10 +1,10 @@
-import * as Context from "@effect/data/Context"
-import * as Effect from "@effect/io/Effect"
 import * as FormData from "@effect/platform/Http/FormData"
 import * as IncomingMessage from "@effect/platform/Http/IncomingMessage"
 import * as Error from "@effect/platform/Http/ServerError"
 import type * as ServerRequest from "@effect/platform/Http/ServerRequest"
 import type * as Schema from "@effect/schema/Schema"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
 
 /** @internal */
 export const TypeId: ServerRequest.TypeId = Symbol.for("@effect/platform/Http/ServerRequest") as ServerRequest.TypeId

package/src/internal/http/serverResponse.ts

@@ -1,6 +1,3 @@
-import { dual } from "@effect/data/Function"
-import { pipeArguments } from "@effect/data/Pipeable"
-import * as Effect from "@effect/io/Effect"
 import type * as PlatformError from "@effect/platform/Error"
 import type * as FileSystem from "@effect/platform/FileSystem"
 import type * as Body from "@effect/platform/Http/Body"
@@ -10,7 +7,10 @@ import type * as ServerResponse from "@effect/platform/Http/ServerResponse"
 import * as UrlParams from "@effect/platform/Http/UrlParams"
 import * as internalBody from "@effect/platform/internal/http/body"
 import type * as Schema from "@effect/schema/Schema"
-import type * as Stream from "@effect/stream/Stream"
+import * as Effect from "effect/Effect"
+import { dual } from "effect/Function"
+import { pipeArguments } from "effect/Pipeable"
+import type * as Stream from "effect/Stream"
 
 /** @internal */
 export const TypeId: ServerResponse.TypeId = Symbol.for("@effect/platform/Http/ServerResponse") as ServerResponse.TypeId

package/src/internal/keyValueStore.ts

@@ -1,12 +1,12 @@
-import * as Context from "@effect/data/Context"
-import { dual, pipe } from "@effect/data/Function"
-import * as Option from "@effect/data/Option"
-import * as Effect from "@effect/io/Effect"
-import * as Layer from "@effect/io/Layer"
 import * as FileSystem from "@effect/platform/FileSystem"
 import type * as KeyValueStore from "@effect/platform/KeyValueStore"
 import * as Path from "@effect/platform/Path"
 import * as Schema from "@effect/schema/Schema"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import { dual, pipe } from "effect/Function"
+import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
 
 /** @internal */
 export const TypeId: KeyValueStore.TypeId = Symbol.for(

package/src/internal/path.ts

@@ -1,9 +1,9 @@
-import { Tag } from "@effect/data/Context"
-import { identity } from "@effect/data/Function"
-import * as Effect from "@effect/io/Effect"
-import * as Layer from "@effect/io/Layer"
 import { BadArgument } from "@effect/platform/Error"
 import type { Path as _Path } from "@effect/platform/Path"
+import { Tag } from "effect/Context"
+import * as Effect from "effect/Effect"
+import { identity } from "effect/Function"
+import * as Layer from "effect/Layer"
 import * as PathB from "path-browserify"
 
 /** @internal */