@effect/platform-bun 0.36.17 → 0.38.0

package/dist/esm/BunHttpServer.js

@@ -1,37 +1,22 @@
+import * as internal from "./internal/httpServer.js";
 /**
  * @since 1.0.0
+ * @category constructors
  */
-import * as etag from "@effect/platform-node-shared/Http/Etag";
-import * as multipart from "@effect/platform-node-shared/Http/Multipart";
-import * as server from "./Http/Server.js";
-import * as request from "./Http/ServerRequest.js";
-export {
+export const make = internal.make;
 /**
  * @since 1.0.0
- *
- * - Docs: [Http/Etag](https://effect-ts.github.io/platform/platform-node-shared/Http/Etag.ts.html)
- * - Module: `@effect/platform-node-shared/Http/Etag`
+ * @category layers
  */
-etag,
+export const layerServer = internal.layerServer;
 /**
  * @since 1.0.0
- *
- * - Docs: [Http/Multipart](https://effect-ts.github.io/platform/platform-node-shared/Http/Multipart.ts.html)
- * - Module: `@effect/platform-node-shared/Http/Multipart`
+ * @category layers
  */
-multipart,
+export const layer = internal.layer;
 /**
  * @since 1.0.0
- *
- * - Docs: [Http/ServerRequest](https://effect-ts.github.io/platform/platform-bun/Http/ServerRequest.ts.html)
- * - Module: `@effect/platform-bun/Http/ServerRequest`
+ * @category layers
  */
-request,
-/**
- * @since 1.0.0
- *
- * - Docs: [Http/Server](https://effect-ts.github.io/platform/platform-bun/Http/Server.ts.html)
- * - Module: `@effect/platform-bun/Http/Server`
- */
-server };
+export const layerConfig = internal.layerConfig;
 //# sourceMappingURL=BunHttpServer.js.map

package/dist/esm/BunHttpServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"BunHttpServer.js","names":["etag","multipart","server","request"],"sources":["../../src/BunHttpServer.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,IAAI,MAAM,wCAAwC;AAC9D,OAAO,KAAKC,SAAS,MAAM,6CAA6C;AACxE,OAAO,KAAKC,MAAM,MAAM,kBAAkB;AAC1C,OAAO,KAAKC,OAAO,MAAM,yBAAyB;AAElD;AACE;;;;;;AAMAH,IAAI;AACJ;;;;;;AAMAC,SAAS;AACT;;;;;;AAMAE,OAAO;AACP;;;;;;AAMAD,MAAM","ignoreList":[]}
+{"version":3,"file":"BunHttpServer.js","names":["internal","make","layerServer","layer","layerConfig"],"sources":["../../src/BunHttpServer.ts"],"sourcesContent":[null],"mappings":"AAaA,OAAO,KAAKA,QAAQ,MAAM,0BAA0B;AAEpD;;;;AAIA,OAAO,MAAMC,IAAI,GAE2CD,QAAQ,CAACC,IAAI;AAEzE;;;;AAIA,OAAO,MAAMC,WAAW,GACtBF,QAAQ,CAACE,WAAW;AAEtB;;;;AAIA,OAAO,MAAMC,KAAK,GAEqFH,QAAQ,CAACG,KAAK;AAErH;;;;AAIA,OAAO,MAAMC,WAAW,GAKpBJ,QAAQ,CAACI,WAAW","ignoreList":[]}

package/dist/esm/BunHttpServerRequest.js

@@ -0,0 +1,7 @@
+import * as internal from "./internal/httpServer.js";
+/**
+ * @category conversions
+ * @since 1.0.0
+ */
+export const toRequest = internal.requestSource;
+//# sourceMappingURL=BunHttpServerRequest.js.map

package/dist/esm/BunHttpServerRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BunHttpServerRequest.js","names":["internal","toRequest","requestSource"],"sources":["../../src/BunHttpServerRequest.ts"],"sourcesContent":[null],"mappings":"AAIA,OAAO,KAAKA,QAAQ,MAAM,0BAA0B;AAEpD;;;;AAIA,OAAO,MAAMC,SAAS,GAAuDD,QAAQ,CAACE,aAAa","ignoreList":[]}

package/dist/esm/BunMultipart.js

@@ -0,0 +1,8 @@
+/**
+ * @since 1.0.0
+ */
+/**
+ * @since 1.0.0
+ */
+export * from "@effect/platform-node-shared/NodeMultipart";
+//# sourceMappingURL=BunMultipart.js.map

package/dist/esm/BunMultipart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BunMultipart.js","names":[],"sources":["../../src/BunMultipart.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;;;AAGA,cAAc,4CAA4C","ignoreList":[]}

package/dist/esm/index.js

@@ -6,18 +6,34 @@ export * as BunCommandExecutor from "./BunCommandExecutor.js";
  * @since 1.0.0
  */
 export * as BunContext from "./BunContext.js";
+/**
+ * @since 1.0.0
+ */
+export * as BunEtag from "./BunEtag.js";
 /**
  * @since 1.0.0
  */
 export * as BunFileSystem from "./BunFileSystem.js";
+/**
+ * @since 1.0.0
+ */
+export * as BunHttpPlatform from "./BunHttpPlatform.js";
 /**
  * @since 1.0.0
  */
 export * as BunHttpServer from "./BunHttpServer.js";
+/**
+ * @since 1.0.0
+ */
+export * as BunHttpServerRequest from "./BunHttpServerRequest.js";
 /**
  * @since 1.0.0
  */
 export * as BunKeyValueStore from "./BunKeyValueStore.js";
+/**
+ * @since 1.0.0
+ */
+export * as BunMultipart from "./BunMultipart.js";
 /**
  * @since 1.0.0
  */

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["BunCommandExecutor","BunContext","BunFileSystem","BunHttpServer","BunKeyValueStore","BunPath","BunRuntime","BunSink","BunSocket","BunStream","BunTerminal","BunWorker","BunWorkerRunner"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,kBAAkB,MAAM,yBAAyB;AAE7D;;;AAGA,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAE7C;;;AAGA,OAAO,KAAKC,aAAa,MAAM,oBAAoB;AAEnD;;;AAGA,OAAO,KAAKC,aAAa,MAAM,oBAAoB;AAEnD;;;AAGA,OAAO,KAAKC,gBAAgB,MAAM,uBAAuB;AAEzD;;;AAGA,OAAO,KAAKC,OAAO,MAAM,cAAc;AAEvC;;;AAGA,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAE7C;;;AAGA,OAAO,KAAKC,OAAO,MAAM,cAAc;AAEvC;;;AAGA,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAE3C;;;AAGA,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAE3C;;;AAGA,OAAO,KAAKC,WAAW,MAAM,kBAAkB;AAE/C;;;AAGA,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAE3C;;;AAGA,OAAO,KAAKC,eAAe,MAAM,sBAAsB","ignoreList":[]}
+{"version":3,"file":"index.js","names":["BunCommandExecutor","BunContext","BunEtag","BunFileSystem","BunHttpPlatform","BunHttpServer","BunHttpServerRequest","BunKeyValueStore","BunMultipart","BunPath","BunRuntime","BunSink","BunSocket","BunStream","BunTerminal","BunWorker","BunWorkerRunner"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,kBAAkB,MAAM,yBAAyB;AAE7D;;;AAGA,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAE7C;;;AAGA,OAAO,KAAKC,OAAO,MAAM,cAAc;AAEvC;;;AAGA,OAAO,KAAKC,aAAa,MAAM,oBAAoB;AAEnD;;;AAGA,OAAO,KAAKC,eAAe,MAAM,sBAAsB;AAEvD;;;AAGA,OAAO,KAAKC,aAAa,MAAM,oBAAoB;AAEnD;;;AAGA,OAAO,KAAKC,oBAAoB,MAAM,2BAA2B;AAEjE;;;AAGA,OAAO,KAAKC,gBAAgB,MAAM,uBAAuB;AAEzD;;;AAGA,OAAO,KAAKC,YAAY,MAAM,mBAAmB;AAEjD;;;AAGA,OAAO,KAAKC,OAAO,MAAM,cAAc;AAEvC;;;AAGA,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAE7C;;;AAGA,OAAO,KAAKC,OAAO,MAAM,cAAc;AAEvC;;;AAGA,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAE3C;;;AAGA,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAE3C;;;AAGA,OAAO,KAAKC,WAAW,MAAM,kBAAkB;AAE/C;;;AAGA,OAAO,KAAKC,SAAS,MAAM,gBAAgB;AAE3C;;;AAGA,OAAO,KAAKC,eAAe,MAAM,sBAAsB","ignoreList":[]}

package/dist/esm/internal/{http/platform.js → httpPlatform.js}

@@ -1,8 +1,7 @@
-import * as Etag from "@effect/platform-node-shared/Http/Etag";
+import * as Etag from "@effect/platform-node-shared/NodeEtag";
 import * as FileSystem from "@effect/platform-node-shared/NodeFileSystem";
-import * as Platform from "@effect/platform/Http/Platform";
-import * as ServerResponse from "@effect/platform/Http/ServerResponse";
-import { pipe } from "effect/Function";
+import * as Platform from "@effect/platform/HttpPlatform";
+import * as ServerResponse from "@effect/platform/HttpServerResponse";
 import * as Layer from "effect/Layer";
 /** @internal */
 export const make = /*#__PURE__*/Platform.make({
@@ -26,5 +25,5 @@ export const make = /*#__PURE__*/Platform.make({
   }
 });
 /** @internal */
-export const layer = /*#__PURE__*/pipe( /*#__PURE__*/Layer.effect(Platform.Platform, make), /*#__PURE__*/Layer.provide(FileSystem.layer), /*#__PURE__*/Layer.provide(Etag.layer));
-//# sourceMappingURL=platform.js.map
+export const layer = /*#__PURE__*/Layer.effect(Platform.HttpPlatform, make).pipe( /*#__PURE__*/Layer.provide(FileSystem.layer), /*#__PURE__*/Layer.provide(Etag.layer));
+//# sourceMappingURL=httpPlatform.js.map

package/dist/esm/internal/httpPlatform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpPlatform.js","names":["Etag","FileSystem","Platform","ServerResponse","Layer","make","fileResponse","path","status","statusText","headers","start","end","_contentLength","file","Bun","undefined","slice","raw","fileWebResponse","_options","layer","effect","HttpPlatform","pipe","provide"],"sources":["../../../src/internal/httpPlatform.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,IAAI,MAAM,uCAAuC;AAC7D,OAAO,KAAKC,UAAU,MAAM,6CAA6C;AACzE,OAAO,KAAKC,QAAQ,MAAM,+BAA+B;AACzD,OAAO,KAAKC,cAAc,MAAM,qCAAqC;AACrE,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC;AACA,OAAO,MAAMC,IAAI,gBAAGH,QAAQ,CAACG,IAAI,CAAC;EAChCC,YAAYA,CAACC,IAAI,EAAEC,MAAM,EAAEC,UAAU,EAAEC,OAAO,EAAEC,KAAK,EAAEC,GAAG,EAAEC,cAAc;IACxE,IAAIC,IAAI,GAAGC,GAAG,CAACD,IAAI,CAACP,IAAI,CAAC;IACzB,IAAII,KAAK,GAAG,CAAC,IAAIC,GAAG,KAAKI,SAAS,EAAE;MAClCF,IAAI,GAAGA,IAAI,CAACG,KAAK,CAACN,KAAK,EAAEC,GAAG,CAAC;IAC/B;IACA,OAAOT,cAAc,CAACe,GAAG,CAACJ,IAAI,EAAE;MAAEJ,OAAO;MAAEF,MAAM;MAAEC;IAAU,CAAE,CAAC;EAClE,CAAC;EACDU,eAAeA,CAACL,IAAI,EAAEN,MAAM,EAAEC,UAAU,EAAEC,OAAO,EAAEU,QAAQ;IACzD,OAAOjB,cAAc,CAACe,GAAG,CAACJ,IAAI,EAAE;MAAEJ,OAAO;MAAEF,MAAM;MAAEC;IAAU,CAAE,CAAC;EAClE;CACD,CAAC;AAEF;AACA,OAAO,MAAMY,KAAK,gBAAGjB,KAAK,CAACkB,MAAM,CAACpB,QAAQ,CAACqB,YAAY,EAAElB,IAAI,CAAC,CAACmB,IAAI,eACjEpB,KAAK,CAACqB,OAAO,CAACxB,UAAU,CAACoB,KAAK,CAAC,eAC/BjB,KAAK,CAACqB,OAAO,CAACzB,IAAI,CAACqB,KAAK,CAAC,CAC1B","ignoreList":[]}

package/dist/esm/internal/{http/server.js → httpServer.js}

@@ -1,15 +1,15 @@
 /// <reference types="bun-types" />
-import * as Etag from "@effect/platform-node-shared/Http/Etag";
-import * as MultipartNode from "@effect/platform-node-shared/Http/Multipart";
-import * as App from "@effect/platform/Http/App";
-import * as Cookies from "@effect/platform/Http/Cookies";
-import * as Headers from "@effect/platform/Http/Headers";
-import * as IncomingMessage from "@effect/platform/Http/IncomingMessage";
-import * as Server from "@effect/platform/Http/Server";
-import * as Error from "@effect/platform/Http/ServerError";
-import * as ServerRequest from "@effect/platform/Http/ServerRequest";
-import * as UrlParams from "@effect/platform/Http/UrlParams";
+import * as Etag from "@effect/platform-node-shared/NodeEtag";
+import * as MultipartNode from "@effect/platform-node-shared/NodeMultipart";
+import * as Cookies from "@effect/platform/Cookies";
+import * as Headers from "@effect/platform/Headers";
+import * as App from "@effect/platform/HttpApp";
+import * as IncomingMessage from "@effect/platform/HttpIncomingMessage";
+import * as Server from "@effect/platform/HttpServer";
+import * as Error from "@effect/platform/HttpServerError";
+import * as ServerRequest from "@effect/platform/HttpServerRequest";
 import * as Socket from "@effect/platform/Socket";
+import * as UrlParams from "@effect/platform/UrlParams";
 import * as Cause from "effect/Cause";
 import * as Config from "effect/Config";
 import * as Deferred from "effect/Deferred";
@@ -22,8 +22,8 @@ import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Stream from "effect/Stream";
 import { Readable } from "node:stream";
-import * as BunContext from "../../BunContext.js";
-import * as Platform from "../../Http/Platform.js";
+import * as BunContext from "../BunContext.js";
+import * as Platform from "../BunHttpPlatform.js";
 /** @internal */
 export const make = options => Effect.gen(function* (_) {
   const handlerStack = [function (_request, _server) {
@@ -79,7 +79,7 @@ export const make = options => Effect.gen(function* (_) {
       }) => Effect.async(_ => {
         function handler(request, server) {
           return new Promise((resolve, reject) => {
-            const fiber = runFork(Effect.provideService(app, ServerRequest.ServerRequest, new ServerRequestImpl(request, resolve, reject, removeHost(request.url), server)));
+            const fiber = runFork(Effect.provideService(app, ServerRequest.HttpServerRequest, new ServerRequestImpl(request, resolve, reject, removeHost(request.url), server)));
             request.signal.addEventListener("abort", () => {
               runFork(fiber.interruptAsFork(Error.clientAbortFiberId));
             }, {
@@ -139,11 +139,11 @@ const makeResponse = (request, response, runtime) => {
   }
 };
 /** @internal */
-export const layerServer = options => Layer.scoped(Server.Server, make(options));
+export const layerServer = options => Layer.scoped(Server.HttpServer, make(options));
 /** @internal */
-export const layer = options => Layer.mergeAll(Layer.scoped(Server.Server, make(options)), Platform.layer, Etag.layerWeak, BunContext.layer);
+export const layer = options => Layer.mergeAll(Layer.scoped(Server.HttpServer, make(options)), Platform.layer, Etag.layerWeak, BunContext.layer);
 /** @internal */
-export const layerConfig = options => Layer.mergeAll(Layer.scoped(Server.Server, Effect.flatMap(Config.unwrap(options), make)), Platform.layer, Etag.layerWeak, BunContext.layer);
+export const layerConfig = options => Layer.mergeAll(Layer.scoped(Server.HttpServer, Effect.flatMap(Config.unwrap(options), make)), Platform.layer, Etag.layerWeak, BunContext.layer);
 function wsDefaultRun(_) {
   this.buffer.push(_);
 }
@@ -171,7 +171,7 @@ class ServerRequestImpl extends Inspectable.Class {
   }
   toJSON() {
     return IncomingMessage.inspect(this, {
-      _id: "@effect/platform/Http/ServerRequest",
+      _id: "@effect/platform/HttpServerRequest",
       method: this.method,
       url: this.originalUrl
     });
@@ -324,4 +324,4 @@ const removeHost = url => {
 };
 /** @internal */
 export const requestSource = self => self.source;
-//# sourceMappingURL=server.js.map
+//# sourceMappingURL=httpServer.js.map

package/dist/esm/internal/httpServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpServer.js","names":["Etag","MultipartNode","Cookies","Headers","App","IncomingMessage","Server","Error","ServerRequest","Socket","UrlParams","Cause","Config","Deferred","Effect","Exit","FiberSet","pipe","Inspectable","Layer","Option","Stream","Readable","BunContext","Platform","make","options","gen","_","handlerStack","_request","_server","Response","status","server","Bun","serve","fetch","websocket","open","ws","unsafeDone","data","deferred","succeed","message","run","close","code","closeReason","closeDeferred","defaultCloseCodeIsError","fail","SocketCloseError","reason","void","addFinalizer","sync","stop","address","_tag","port","hostname","httpApp","middleware","makeRuntime","bindTo","bind","runtime","let","toHandled","request","exit","impl","resolve","makeResponse","value","isInterruptedOnly","cause","undefined","source","signal","aborted","reject","pretty","flatMap","app","runFork","async","handler","Promise","fiber","provideService","HttpServerRequest","ServerRequestImpl","removeHost","url","addEventListener","interruptAsFork","clientAbortFiberId","once","push","reload","pop","length","interruptible","forkScoped","asVoid","response","fields","headers","globalThis","isEmpty","cookies","header","toSetCookieHeaders","append","statusText","method","body","formData","toReadableStreamRuntime","stream","layerServer","scoped","HttpServer","layer","mergeAll","layerWeak","layerConfig","unwrap","wsDefaultRun","buffer","Class","bunServer","headersOverride","remoteAddressOverride","TypeId","constructor","toJSON","inspect","_id","originalUrl","modify","remoteAddress","toUpperCase","some","none","fromInput","cachedCookies","parseHeader","cookie","fromReadableStream","RequestError","error","textEffect","text","runSync","cached","tryPromise","try","catch","json","tryMap","JSON","parse","urlParamsBody","URLSearchParams","multipartEffect","multipart","persisted","fromWeb","multipartStream","arrayBufferEffect","arrayBuffer","upgrade","all","makeSemaphore","semaphore","resume","success","map","await","write","chunk","sendText","isCloseEvent","sendBinary","writer","runRaw","set","forEach","join","onExit","raceFirst","withPermits","encoder","TextEncoder","encode","of","index","indexOf","slice","requestSource","self"],"sources":["../../../src/internal/httpServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/platform-bun",
-  "version": "0.36.17",
+  "version": "0.38.0",
   "description": "Platform specific implementations for the Bun runtime",
   "license": "MIT",
   "repository": {
@@ -10,11 +10,11 @@
   },
   "sideEffects": [],
   "dependencies": {
-    "@effect/platform-node-shared": "^0.6.17"
+    "@effect/platform-node-shared": "^0.8.0"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.57.8",
-    "effect": "^3.3.5"
+    "@effect/platform": "^0.58.1",
+    "effect": "^3.4.0"
   },
   "publishConfig": {
     "provenance": true
@@ -39,21 +39,41 @@
       "import": "./dist/esm/BunContext.js",
       "default": "./dist/cjs/BunContext.js"
     },
+    "./BunEtag": {
+      "types": "./dist/dts/BunEtag.d.ts",
+      "import": "./dist/esm/BunEtag.js",
+      "default": "./dist/cjs/BunEtag.js"
+    },
     "./BunFileSystem": {
       "types": "./dist/dts/BunFileSystem.d.ts",
       "import": "./dist/esm/BunFileSystem.js",
       "default": "./dist/cjs/BunFileSystem.js"
     },
+    "./BunHttpPlatform": {
+      "types": "./dist/dts/BunHttpPlatform.d.ts",
+      "import": "./dist/esm/BunHttpPlatform.js",
+      "default": "./dist/cjs/BunHttpPlatform.js"
+    },
     "./BunHttpServer": {
       "types": "./dist/dts/BunHttpServer.d.ts",
       "import": "./dist/esm/BunHttpServer.js",
       "default": "./dist/cjs/BunHttpServer.js"
     },
+    "./BunHttpServerRequest": {
+      "types": "./dist/dts/BunHttpServerRequest.d.ts",
+      "import": "./dist/esm/BunHttpServerRequest.js",
+      "default": "./dist/cjs/BunHttpServerRequest.js"
+    },
     "./BunKeyValueStore": {
       "types": "./dist/dts/BunKeyValueStore.d.ts",
       "import": "./dist/esm/BunKeyValueStore.js",
       "default": "./dist/cjs/BunKeyValueStore.js"
     },
+    "./BunMultipart": {
+      "types": "./dist/dts/BunMultipart.d.ts",
+      "import": "./dist/esm/BunMultipart.js",
+      "default": "./dist/cjs/BunMultipart.js"
+    },
     "./BunPath": {
       "types": "./dist/dts/BunPath.d.ts",
       "import": "./dist/esm/BunPath.js",
@@ -93,21 +113,6 @@
       "types": "./dist/dts/BunWorkerRunner.d.ts",
       "import": "./dist/esm/BunWorkerRunner.js",
       "default": "./dist/cjs/BunWorkerRunner.js"
-    },
-    "./Http/Platform": {
-      "types": "./dist/dts/Http/Platform.d.ts",
-      "import": "./dist/esm/Http/Platform.js",
-      "default": "./dist/cjs/Http/Platform.js"
-    },
-    "./Http/Server": {
-      "types": "./dist/dts/Http/Server.d.ts",
-      "import": "./dist/esm/Http/Server.js",
-      "default": "./dist/cjs/Http/Server.js"
-    },
-    "./Http/ServerRequest": {
-      "types": "./dist/dts/Http/ServerRequest.d.ts",
-      "import": "./dist/esm/Http/ServerRequest.js",
-      "default": "./dist/cjs/Http/ServerRequest.js"
     }
   },
   "typesVersions": {
@@ -118,15 +123,27 @@
       "BunContext": [
         "./dist/dts/BunContext.d.ts"
       ],
+      "BunEtag": [
+        "./dist/dts/BunEtag.d.ts"
+      ],
       "BunFileSystem": [
         "./dist/dts/BunFileSystem.d.ts"
       ],
+      "BunHttpPlatform": [
+        "./dist/dts/BunHttpPlatform.d.ts"
+      ],
       "BunHttpServer": [
         "./dist/dts/BunHttpServer.d.ts"
       ],
+      "BunHttpServerRequest": [
+        "./dist/dts/BunHttpServerRequest.d.ts"
+      ],
       "BunKeyValueStore": [
         "./dist/dts/BunKeyValueStore.d.ts"
       ],
+      "BunMultipart": [
+        "./dist/dts/BunMultipart.d.ts"
+      ],
       "BunPath": [
         "./dist/dts/BunPath.d.ts"
       ],
@@ -150,15 +167,6 @@
       ],
       "BunWorkerRunner": [
         "./dist/dts/BunWorkerRunner.d.ts"
-      ],
-      "Http/Platform": [
-        "./dist/dts/Http/Platform.d.ts"
-      ],
-      "Http/Server": [
-        "./dist/dts/Http/Server.d.ts"
-      ],
-      "Http/ServerRequest": [
-        "./dist/dts/Http/ServerRequest.d.ts"
       ]
     }
   }

package/src/BunEtag.ts

@@ -0,0 +1,8 @@
+/**
+ * @since 1.0.0
+ */
+
+/**
+ * @since 1.0.0
+ */
+export * from "@effect/platform-node-shared/NodeEtag"

package/src/BunHttpPlatform.ts

@@ -0,0 +1,21 @@
+/**
+ * @since 1.0.0
+ */
+import type * as Etag from "@effect/platform/Etag"
+import type * as FileSystem from "@effect/platform/FileSystem"
+import type * as Platform from "@effect/platform/HttpPlatform"
+import type * as Effect from "effect/Effect"
+import type * as Layer from "effect/Layer"
+import * as internal from "./internal/httpPlatform.js"
+
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+export const make: Effect.Effect<Platform.HttpPlatform, never, FileSystem.FileSystem | Etag.Generator> = internal.make
+
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+export const layer: Layer.Layer<Platform.HttpPlatform> = internal.layer

package/src/BunHttpServer.ts

@@ -1,38 +1,48 @@
 /**
  * @since 1.0.0
  */
-import * as etag from "@effect/platform-node-shared/Http/Etag"
-import * as multipart from "@effect/platform-node-shared/Http/Multipart"
-import * as server from "./Http/Server.js"
-import * as request from "./Http/ServerRequest.js"
+import type * as Etag from "@effect/platform/Etag"
+import type * as Platform from "@effect/platform/HttpPlatform"
+import type * as Server from "@effect/platform/HttpServer"
+import type { ServeOptions } from "bun"
+import type * as Config from "effect/Config"
+import type * as ConfigError from "effect/ConfigError"
+import type * as Effect from "effect/Effect"
+import type * as Layer from "effect/Layer"
+import type * as Scope from "effect/Scope"
+import type * as BunContext from "./BunContext.js"
+import * as internal from "./internal/httpServer.js"
 
-export {
-  /**
-   * @since 1.0.0
-   *
-   * - Docs: [Http/Etag](https://effect-ts.github.io/platform/platform-node-shared/Http/Etag.ts.html)
-   * - Module: `@effect/platform-node-shared/Http/Etag`
-   */
-  etag,
-  /**
-   * @since 1.0.0
-   *
-   * - Docs: [Http/Multipart](https://effect-ts.github.io/platform/platform-node-shared/Http/Multipart.ts.html)
-   * - Module: `@effect/platform-node-shared/Http/Multipart`
-   */
-  multipart,
-  /**
-   * @since 1.0.0
-   *
-   * - Docs: [Http/ServerRequest](https://effect-ts.github.io/platform/platform-bun/Http/ServerRequest.ts.html)
-   * - Module: `@effect/platform-bun/Http/ServerRequest`
-   */
-  request,
-  /**
-   * @since 1.0.0
-   *
-   * - Docs: [Http/Server](https://effect-ts.github.io/platform/platform-bun/Http/Server.ts.html)
-   * - Module: `@effect/platform-bun/Http/Server`
-   */
-  server
-}
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+export const make: (
+  options: Omit<ServeOptions, "fetch" | "error">
+) => Effect.Effect<Server.HttpServer, never, Scope.Scope> = internal.make
+
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+export const layerServer: (options: Omit<ServeOptions, "fetch" | "error">) => Layer.Layer<Server.HttpServer> =
+  internal.layerServer
+
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+export const layer: (
+  options: Omit<ServeOptions, "fetch" | "error">
+) => Layer.Layer<Server.HttpServer | Platform.HttpPlatform | Etag.Generator | BunContext.BunContext> = internal.layer
+
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+export const layerConfig: (
+  options: Config.Config.Wrap<Omit<ServeOptions, "fetch" | "error">>
+) => Layer.Layer<
+  Server.HttpServer | Platform.HttpPlatform | Etag.Generator | BunContext.BunContext,
+  ConfigError.ConfigError
+> = internal.layerConfig

package/src/BunHttpServerRequest.ts

@@ -0,0 +1,11 @@
+/**
+ * @since 1.0.0
+ */
+import type * as ServerRequest from "@effect/platform/HttpServerRequest"
+import * as internal from "./internal/httpServer.js"
+
+/**
+ * @category conversions
+ * @since 1.0.0
+ */
+export const toRequest: (self: ServerRequest.HttpServerRequest) => Request = internal.requestSource

package/src/BunMultipart.ts

@@ -0,0 +1,8 @@
+/**
+ * @since 1.0.0
+ */
+
+/**
+ * @since 1.0.0
+ */
+export * from "@effect/platform-node-shared/NodeMultipart"

package/src/index.ts

@@ -8,21 +8,41 @@ export * as BunCommandExecutor from "./BunCommandExecutor.js"
  */
 export * as BunContext from "./BunContext.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as BunEtag from "./BunEtag.js"
+
 /**
  * @since 1.0.0
  */
 export * as BunFileSystem from "./BunFileSystem.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as BunHttpPlatform from "./BunHttpPlatform.js"
+
 /**
  * @since 1.0.0
  */
 export * as BunHttpServer from "./BunHttpServer.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as BunHttpServerRequest from "./BunHttpServerRequest.js"
+
 /**
  * @since 1.0.0
  */
 export * as BunKeyValueStore from "./BunKeyValueStore.js"
 
+/**
+ * @since 1.0.0
+ */
+export * as BunMultipart from "./BunMultipart.js"
+
 /**
  * @since 1.0.0
  */

package/src/internal/{http/platform.ts → httpPlatform.ts}

@@ -1,8 +1,7 @@
-import * as Etag from "@effect/platform-node-shared/Http/Etag"
+import * as Etag from "@effect/platform-node-shared/NodeEtag"
 import * as FileSystem from "@effect/platform-node-shared/NodeFileSystem"
-import * as Platform from "@effect/platform/Http/Platform"
-import * as ServerResponse from "@effect/platform/Http/ServerResponse"
-import { pipe } from "effect/Function"
+import * as Platform from "@effect/platform/HttpPlatform"
+import * as ServerResponse from "@effect/platform/HttpServerResponse"
 import * as Layer from "effect/Layer"
 
 /** @internal */
@@ -20,8 +19,7 @@ export const make = Platform.make({
 })
 
 /** @internal */
-export const layer = pipe(
-  Layer.effect(Platform.Platform, make),
+export const layer = Layer.effect(Platform.HttpPlatform, make).pipe(
   Layer.provide(FileSystem.layer),
   Layer.provide(Etag.layer)
 )