@effect/platform 0.18.7 → 0.20.0

package/dist/effect-platform.cjs.prod.js

@@ -2,74 +2,55 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var Command_dist_effectPlatformCommand = require('./Command-25ef5e94.cjs.prod.js');
-var CommandExecutor_dist_effectPlatformCommandExecutor = require('./CommandExecutor-7fcae408.cjs.prod.js');
-var Effectify_dist_effectPlatformEffectify = require('./Effectify-38757ba5.cjs.prod.js');
-var Error_dist_effectPlatformError = require('./Error-2c4e6ce2.cjs.prod.js');
-var FileSystem_dist_effectPlatformFileSystem = require('./FileSystem-3d439a05.cjs.prod.js');
-var HttpClient_dist_effectPlatformHttpClient = require('./HttpClient-44d9df26.cjs.prod.js');
-var HttpServer_dist_effectPlatformHttpServer = require('./HttpServer-93c0fbb3.cjs.prod.js');
-var KeyValueStore_dist_effectPlatformKeyValueStore = require('./KeyValueStore-f6c5b981.cjs.prod.js');
-var Path_dist_effectPlatformPath = require('./Path-3574641f.cjs.prod.js');
-var Runtime_dist_effectPlatformRuntime = require('./Runtime-515efccf.cjs.prod.js');
-require('effect/Chunk');
-require('effect/Effect');
-require('effect/Function');
-require('effect/HashMap');
-require('effect/Option');
-require('effect/Pipeable');
-require('effect/Stream');
-require('./commandExecutor-17a55a1c.cjs.prod.js');
-require('effect/Brand');
-require('effect/Context');
-require('effect/Sink');
-require('effect/Data');
-require('./Body-b77eac75.cjs.prod.js');
-require('./body-33521da5.cjs.prod.js');
-require('@effect/schema/Schema');
-require('./Client-537f76ae.cjs.prod.js');
-require('effect/Layer');
-require('../Http/IncomingMessage/dist/effect-platform-Http-IncomingMessage.cjs.prod.js');
-require('@effect/schema/ParseResult');
-require('effect/FiberRef');
-require('effect/GlobalValue');
-require('../Http/Method/dist/effect-platform-Http-Method.cjs.prod.js');
-require('./UrlParams-1228a686.cjs.prod.js');
-require('./clientError-de103d6a.cjs.prod.js');
-require('./clientRequest-3e72ec54.cjs.prod.js');
-require('./Headers-122cb877.cjs.prod.js');
-require('effect/ReadonlyArray');
-require('effect/ReadonlyRecord');
-require('./clientResponse-4d53f425.cjs.prod.js');
-require('./ClientError-22781879.cjs.prod.js');
-require('./ClientRequest-750d8d59.cjs.prod.js');
-require('./ClientResponse-f9f19afb.cjs.prod.js');
-require('./App-0916639a.cjs.prod.js');
-require('./FormData-902afd18.cjs.prod.js');
-require('effect/Predicate');
-require('./Middleware-f9a073d7.cjs.prod.js');
-require('./ServerRequest-938f3ed0.cjs.prod.js');
-require('./ServerError-605b2fa2.cjs.prod.js');
-require('./ServerResponse-eae85b08.cjs.prod.js');
-require('effect/Effectable');
-require('../Http/Platform/dist/effect-platform-Http-Platform.cjs.prod.js');
-require('../Http/Etag/dist/effect-platform-Http-Etag.cjs.prod.js');
-require('./Router-6c80a4c9.cjs.prod.js');
-require('effect/Inspectable');
-require('find-my-way');
-require('path-browserify');
-require('effect/Cause');
-require('effect/Exit');
+var Command = require('@effect/platform/Command');
+var CommandExecutor = require('@effect/platform/CommandExecutor');
+var Effectify = require('@effect/platform/Effectify');
+var Error = require('@effect/platform/Error');
+var FileSystem = require('@effect/platform/FileSystem');
+var HttpClient = require('@effect/platform/HttpClient');
+var HttpServer = require('@effect/platform/HttpServer');
+var KeyValueStore = require('@effect/platform/KeyValueStore');
+var Path = require('@effect/platform/Path');
+var Runtime = require('@effect/platform/Runtime');
 
+function _interopNamespace(e) {
+	if (e && e.__esModule) return e;
+	var n = Object.create(null);
+	if (e) {
+		Object.keys(e).forEach(function (k) {
+			if (k !== 'default') {
+				var d = Object.getOwnPropertyDescriptor(e, k);
+				Object.defineProperty(n, k, d.get ? d : {
+					enumerable: true,
+					get: function () { return e[k]; }
+				});
+			}
+		});
+	}
+	n["default"] = e;
+	return Object.freeze(n);
+}
 
+var Command__namespace = /*#__PURE__*/_interopNamespace(Command);
+var CommandExecutor__namespace = /*#__PURE__*/_interopNamespace(CommandExecutor);
+var Effectify__namespace = /*#__PURE__*/_interopNamespace(Effectify);
+var Error__namespace = /*#__PURE__*/_interopNamespace(Error);
+var FileSystem__namespace = /*#__PURE__*/_interopNamespace(FileSystem);
+var HttpClient__namespace = /*#__PURE__*/_interopNamespace(HttpClient);
+var HttpServer__namespace = /*#__PURE__*/_interopNamespace(HttpServer);
+var KeyValueStore__namespace = /*#__PURE__*/_interopNamespace(KeyValueStore);
+var Path__namespace = /*#__PURE__*/_interopNamespace(Path);
+var Runtime__namespace = /*#__PURE__*/_interopNamespace(Runtime);
 
-exports.Command = Command_dist_effectPlatformCommand.Command;
-exports.CommandExecutor = CommandExecutor_dist_effectPlatformCommandExecutor.CommandExecutor;
-exports.Effectify = Effectify_dist_effectPlatformEffectify.Effectify;
-exports.Error = Error_dist_effectPlatformError.Error;
-exports.FileSystem = FileSystem_dist_effectPlatformFileSystem.FileSystem;
-exports.HttpClient = HttpClient_dist_effectPlatformHttpClient.HttpClient;
-exports.HttpServer = HttpServer_dist_effectPlatformHttpServer.HttpServer;
-exports.KeyValueStore = KeyValueStore_dist_effectPlatformKeyValueStore.KeyValueStore;
-exports.Path = Path_dist_effectPlatformPath.Path;
-exports.Runtime = Runtime_dist_effectPlatformRuntime.Runtime;
+
+
+exports.Command = Command__namespace;
+exports.CommandExecutor = CommandExecutor__namespace;
+exports.Effectify = Effectify__namespace;
+exports.Error = Error__namespace;
+exports.FileSystem = FileSystem__namespace;
+exports.HttpClient = HttpClient__namespace;
+exports.HttpServer = HttpServer__namespace;
+exports.KeyValueStore = KeyValueStore__namespace;
+exports.Path = Path__namespace;
+exports.Runtime = Runtime__namespace;

package/dist/effect-platform.esm.js

@@ -1,58 +1,20 @@
-export { C as Command } from './Command-d8ab0c8d.esm.js';
-export { C as CommandExecutor } from './CommandExecutor-5807b66b.esm.js';
-export { E as Effectify } from './Effectify-e5a9d266.esm.js';
-export { E as Error } from './Error-3099667c.esm.js';
-export { F as FileSystem } from './FileSystem-7e31dccd.esm.js';
-export { H as HttpClient } from './HttpClient-5179b5b7.esm.js';
-export { H as HttpServer } from './HttpServer-50f8df76.esm.js';
-export { K as KeyValueStore } from './KeyValueStore-2f9a70bf.esm.js';
-export { P as Path } from './Path-46f84ba7.esm.js';
-export { R as Runtime } from './Runtime-7265fb98.esm.js';
-import 'effect/Chunk';
-import 'effect/Effect';
-import 'effect/Function';
-import 'effect/HashMap';
-import 'effect/Option';
-import 'effect/Pipeable';
-import 'effect/Stream';
-import './commandExecutor-d6457489.esm.js';
-import 'effect/Brand';
-import 'effect/Context';
-import 'effect/Sink';
-import 'effect/Data';
-import './Body-ec1353f9.esm.js';
-import './body-20d78ec1.esm.js';
-import '@effect/schema/Schema';
-import './Client-cdbd4ff7.esm.js';
-import 'effect/Layer';
-import '../Http/IncomingMessage/dist/effect-platform-Http-IncomingMessage.esm.js';
-import '@effect/schema/ParseResult';
-import 'effect/FiberRef';
-import 'effect/GlobalValue';
-import '../Http/Method/dist/effect-platform-Http-Method.esm.js';
-import './UrlParams-1286c728.esm.js';
-import './clientError-c4e1466c.esm.js';
-import './clientRequest-1e9e0b0d.esm.js';
-import './Headers-58b56a08.esm.js';
-import 'effect/ReadonlyArray';
-import 'effect/ReadonlyRecord';
-import './clientResponse-47df36b8.esm.js';
-import './ClientError-98b5da8c.esm.js';
-import './ClientRequest-fc429335.esm.js';
-import './ClientResponse-7e4fe7b5.esm.js';
-import './App-687366d8.esm.js';
-import './FormData-f54de878.esm.js';
-import 'effect/Predicate';
-import './Middleware-240f91f6.esm.js';
-import './ServerRequest-03161edc.esm.js';
-import './ServerError-04ad5b57.esm.js';
-import './ServerResponse-93038062.esm.js';
-import 'effect/Effectable';
-import '../Http/Platform/dist/effect-platform-Http-Platform.esm.js';
-import '../Http/Etag/dist/effect-platform-Http-Etag.esm.js';
-import './Router-bf32317a.esm.js';
-import 'effect/Inspectable';
-import 'find-my-way';
-import 'path-browserify';
-import 'effect/Cause';
-import 'effect/Exit';
+import * as Command from '@effect/platform/Command';
+export { Command };
+import * as CommandExecutor from '@effect/platform/CommandExecutor';
+export { CommandExecutor };
+import * as Effectify from '@effect/platform/Effectify';
+export { Effectify };
+import * as Error from '@effect/platform/Error';
+export { Error };
+import * as FileSystem from '@effect/platform/FileSystem';
+export { FileSystem };
+import * as HttpClient from '@effect/platform/HttpClient';
+export { HttpClient };
+import * as HttpServer from '@effect/platform/HttpServer';
+export { HttpServer };
+import * as KeyValueStore from '@effect/platform/KeyValueStore';
+export { KeyValueStore };
+import * as Path from '@effect/platform/Path';
+export { Path };
+import * as Runtime from '@effect/platform/Runtime';
+export { Runtime };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/platform",
-  "version": "0.18.7",
+  "version": "0.20.0",
   "description": "Unified interfaces for common platform-specific services",
   "main": "dist/effect-platform.cjs.js",
   "module": "dist/effect-platform.esm.js",
@@ -14,6 +14,9 @@
       "importConditionDefaultExport": "default"
     }
   },
+  "effect": {
+    "generateIndex": true
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -31,13 +34,13 @@
     "path-browserify": "^1.0.1"
   },
   "devDependencies": {
-    "@effect/schema": "^0.39.2",
+    "@effect/schema": "^0.41.0",
     "@types/path-browserify": "^1.0.0",
-    "effect": "2.0.0-next.42"
+    "effect": "2.0.0-next.46"
   },
   "peerDependencies": {
-    "@effect/schema": "^0.39.1",
-    "effect": "^2.0.0-next.42"
+    "@effect/schema": "^0.41.0",
+    "effect": "^2.0.0-next.46"
   },
   "files": [
     "src",

package/src/Http/App.ts

@@ -1,7 +1,12 @@
 /**
  * @since 1.0.0
  */
-import type * as Effect from "effect/Effect"
+import * as Effect from "effect/Effect"
+import * as FiberRef from "effect/FiberRef"
+import { dual } from "effect/Function"
+import { globalValue } from "effect/GlobalValue"
+import * as ReadonlyArray from "effect/ReadonlyArray"
+import type * as ServerError from "./ServerError"
 import type * as ServerRequest from "./ServerRequest"
 import type * as ServerResponse from "./ServerResponse"
 
@@ -9,11 +14,79 @@ import type * as ServerResponse from "./ServerResponse"
  * @since 1.0.0
  * @category models
  */
-export interface HttpApp<R, E, A> extends Effect.Effect<R | ServerRequest.ServerRequest, E, A> {
-}
+export interface HttpApp<R, E, A> extends Effect.Effect<R | ServerRequest.ServerRequest, E, A> {}
 
 /**
  * @since 1.0.0
  * @category models
  */
 export type Default<R, E> = HttpApp<R, E, ServerResponse.ServerResponse>
+
+/**
+ * @since 1.0.0
+ * @category models
+ */
+export type PreResponseHandler = (
+  request: ServerRequest.ServerRequest,
+  response: ServerResponse.ServerResponse
+) => Effect.Effect<never, ServerError.ResponseError, ServerResponse.ServerResponse>
+
+/**
+ * @since 1.0.0
+ * @category fiber refs
+ */
+export const currentPreResponseHandlers: FiberRef.FiberRef<ReadonlyArray<PreResponseHandler>> = globalValue(
+  Symbol.for("@effect/platform/Http/App/preResponseHandlers"),
+  () => FiberRef.unsafeMake([])
+)
+
+function noopHandler(_request: ServerRequest.ServerRequest, response: ServerResponse.ServerResponse) {
+  return Effect.succeed(response)
+}
+
+/**
+ * @since 1.0.0
+ * @category fiber refs
+ */
+export const preResponseHandler: Effect.Effect<never, never, PreResponseHandler> = Effect.map(
+  FiberRef.get(currentPreResponseHandlers),
+  (handlers): PreResponseHandler =>
+    handlers.length === 0 ?
+      noopHandler :
+      handlers.reduce((acc, handler) =>
+        function(request, response) {
+          return Effect.flatMap(
+            acc(request, response),
+            function(response) {
+              return handler(request, response)
+            }
+          )
+        }
+      )
+)
+
+/**
+ * @since 1.0.0
+ * @category fiber refs
+ */
+export const appendPreResponseHandler: (handler: PreResponseHandler) => Effect.Effect<never, never, void> = (
+  handler: PreResponseHandler
+) =>
+  FiberRef.update(
+    currentPreResponseHandlers,
+    ReadonlyArray.append(handler)
+  )
+
+/**
+ * @since 1.0.0
+ * @category fiber refs
+ */
+export const withPreResponseHandler = dual<
+  (handler: PreResponseHandler) => <R, E, A>(self: HttpApp<R, E, A>) => HttpApp<R, E, A>,
+  <R, E, A>(self: HttpApp<R, E, A>, handler: PreResponseHandler) => HttpApp<R, E, A>
+>(2, (self, handler) =>
+  Effect.locallyWith(
+    self,
+    currentPreResponseHandlers,
+    ReadonlyArray.append(handler)
+  ))

package/src/Http/Middleware.ts

@@ -30,12 +30,6 @@ export declare namespace Middleware {
  */
 export const make: <M extends Middleware>(middleware: M) => M = internal.make
 
-/**
- * @since 1.0.0
- * @category constructors
- */
-export const b3Response: <R, E>(httpApp: App.Default<R, E>) => App.Default<R, E> = internal.b3Response
-
 /**
  * @since 1.0.0
  * @category constructors

package/src/index.ts

@@ -1,49 +1,49 @@
 /**
  * @since 1.0.0
  */
-export * as Command from "./Command"
+export * as Command from "@effect/platform/Command"
 
 /**
  * @since 1.0.0
  */
-export * as CommandExecutor from "./CommandExecutor"
+export * as CommandExecutor from "@effect/platform/CommandExecutor"
 
 /**
  * @since 1.0.0
  */
-export * as Effectify from "./Effectify"
+export * as Effectify from "@effect/platform/Effectify"
 
 /**
  * @since 1.0.0
  */
-export * as Error from "./Error"
+export * as Error from "@effect/platform/Error"
 
 /**
  * @since 1.0.0
  */
-export * as FileSystem from "./FileSystem"
+export * as FileSystem from "@effect/platform/FileSystem"
 
 /**
  * @since 1.0.0
  */
-export * as HttpClient from "./HttpClient"
+export * as HttpClient from "@effect/platform/HttpClient"
 
 /**
  * @since 1.0.0
  */
-export * as HttpServer from "./HttpServer"
+export * as HttpServer from "@effect/platform/HttpServer"
 
 /**
  * @since 1.0.0
  */
-export * as KeyValueStore from "./KeyValueStore"
+export * as KeyValueStore from "@effect/platform/KeyValueStore"
 
 /**
  * @since 1.0.0
  */
-export * as Path from "./Path"
+export * as Path from "@effect/platform/Path"
 
 /**
  * @since 1.0.0
  */
-export * as Runtime from "./Runtime"
+export * as Runtime from "@effect/platform/Runtime"

package/src/internal/http/middleware.ts

@@ -1,5 +1,6 @@
 import * as Effect from "effect/Effect"
 import { flow } from "effect/Function"
+import * as App from "../../Http/App"
 import * as Headers from "../../Http/Headers"
 import * as IncomingMessage from "../../Http/IncomingMessage"
 import type * as Middleware from "../../Http/Middleware"
@@ -34,42 +35,43 @@ export const logger = make((httpApp) => {
 })
 
 /** @internal */
-export const tracer = make((httpApp) =>
-  Effect.flatMap(
+export const tracer = make((httpApp) => {
+  const appWithStatus = Effect.tap(
+    Effect.zipRight(
+      App.appendPreResponseHandler(b3Response),
+      httpApp
+    ),
+    (response) => Effect.annotateCurrentSpan("http.status", response.status)
+  )
+  return Effect.flatMap(
     ServerRequest.ServerRequest,
     (request) =>
       Effect.flatMap(
         Effect.orElseSucceed(IncomingMessage.schemaExternalSpan(request), () => undefined),
         (parent) =>
           Effect.withSpan(
-            Effect.tap(
-              httpApp,
-              (response) => Effect.annotateCurrentSpan("http.status", response.status)
-            ),
+            appWithStatus,
             `http ${request.method}`,
             { attributes: { "http.method": request.method, "http.url": request.url }, parent }
           )
       )
   )
-)
+})
 
-/** @internal */
-export const b3Response = make((httpApp) =>
+const b3Response: App.PreResponseHandler = (_request, response) =>
   Effect.flatMap(
     Effect.currentSpan,
     (span) =>
       span._tag === "Some"
-        ? Effect.map(httpApp, (res) =>
-          ServerResponse.setHeader(
-            res,
-            "b3",
-            `${span.value.traceId}-${span.value.spanId}-1${
-              span.value.parent._tag === "Some" ? `-${span.value.parent.value.spanId}` : ""
-            }`
-          ))
-        : httpApp
+        ? ServerResponse.setHeader(
+          response,
+          "b3",
+          `${span.value.traceId}-${span.value.spanId}-1${
+            span.value.parent._tag === "Some" ? `-${span.value.parent.value.spanId}` : ""
+          }`
+        )
+        : response
   )
-)
 
 /** @internal */
 export const xForwardedHeaders = make((httpApp) =>

package/src/internal/http/router.ts

@@ -49,7 +49,7 @@ export const schemaParams = <I extends Readonly<Record<string, string>>, A>(sche
   )
 }
 
-class RouterImpl<R, E> extends Effectable.Effectable<
+class RouterImpl<R, E> extends Effectable.StructuralClass<
   Exclude<R, Router.RouteContext>,
   E | Error.RouteNotFound,
   ServerResponse.ServerResponse

package/src/internal/http/serverResponse.ts

@@ -15,7 +15,7 @@ import * as internalBody from "./body"
 /** @internal */
 export const TypeId: ServerResponse.TypeId = Symbol.for("@effect/platform/Http/ServerResponse") as ServerResponse.TypeId
 
-class ServerResponseImpl extends Effectable.Effectable<never, never, ServerResponse.ServerResponse>
+class ServerResponseImpl extends Effectable.StructuralClass<never, never, ServerResponse.ServerResponse>
   implements ServerResponse.ServerResponse
 {
   readonly [TypeId]: ServerResponse.TypeId

package/dist/App-0916639a.cjs.prod.js

@@ -1,7 +0,0 @@
-'use strict';
-
-var App = /*#__PURE__*/Object.freeze({
-	__proto__: null
-});
-
-exports.App = App;

package/dist/App-44aa3275.cjs.dev.js

@@ -1,7 +0,0 @@
-'use strict';
-
-var App = /*#__PURE__*/Object.freeze({
-	__proto__: null
-});
-
-exports.App = App;

package/dist/App-687366d8.esm.js

@@ -1,5 +0,0 @@
-var App = /*#__PURE__*/Object.freeze({
-	__proto__: null
-});
-
-export { App as A };