@effect/platform 0.48.27 → 0.48.29

package/dist/esm/internal/http/router.js

@@ -3,6 +3,7 @@ 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 * as FiberRef from "effect/FiberRef";
 import { dual } from "effect/Function";
 import * as Inspectable from "effect/Inspectable";
 import * as Option from "effect/Option";
@@ -97,7 +98,7 @@ class RouterImpl extends Effectable.StructuralClass {
 }
 const toHttpApp = self => {
   const router = FindMyWay.make();
-  const mounts = Chunk.toReadonlyArray(self.mounts).map(([path, app, options]) => [path, new RouteContextImpl(new RouteImpl("*", options?.includePrefix ? `${path}/*` : "/*", app, options?.includePrefix ? Option.none() : Option.some(path)), {}, {}), options]);
+  const mounts = Chunk.toReadonlyArray(self.mounts).map(([path, app, options]) => [path, new RouteContextImpl(new RouteImpl("*", options?.includePrefix ? `${path}/*` : "/*", app, options?.includePrefix ? Option.none() : Option.some(path), false), {}, {}), options]);
   const mountsLen = mounts.length;
   Chunk.forEach(self.routes, route => {
     if (route.method === "*") {
@@ -106,12 +107,18 @@ const toHttpApp = self => {
       router.on(route.method, route.path, route);
     }
   });
-  return Effect.flatMap(ServerRequest.ServerRequest, request => {
+  return Effect.withFiberRuntime(fiber => {
+    let context = fiber.getFiberRef(FiberRef.currentContext);
+    const request = Context.unsafeGet(context, ServerRequest.ServerRequest);
     if (mountsLen > 0) {
       for (let i = 0; i < mountsLen; i++) {
-        const [path, context, options] = mounts[i];
+        const [path, routeContext, options] = mounts[i];
         if (request.url.startsWith(path)) {
-          return Effect.provideService(Effect.provideService(context.route.handler, RouteContext, context), ServerRequest.ServerRequest, options?.includePrefix ? request : sliceRequestUrl(request, path));
+          context = Context.add(context, RouteContext, routeContext);
+          if (options?.includePrefix !== true) {
+            context = Context.add(context, ServerRequest.ServerRequest, sliceRequestUrl(request, path));
+          }
+          return Effect.locally(routeContext.route.handler, FiberRef.currentContext, context);
         }
       }
     }
@@ -126,9 +133,10 @@ const toHttpApp = self => {
     }
     const route = result.handler;
     if (route.prefix._tag === "Some") {
-      request = sliceRequestUrl(request, route.prefix.value);
+      context = Context.add(context, ServerRequest.ServerRequest, sliceRequestUrl(request, route.prefix.value));
     }
-    return Effect.mapInputContext(route.handler, context => Context.add(Context.add(context, ServerRequest.ServerRequest, request), RouteContext, new RouteContextImpl(route, result.params, result.searchParams)));
+    context = Context.add(context, RouteContext, new RouteContextImpl(route, result.params, result.searchParams));
+    return Effect.locally(route.uninterruptible ? route.handler : Effect.interruptible(route.handler), FiberRef.currentContext, context);
   });
 };
 function sliceRequestUrl(request, prefix) {
@@ -142,13 +150,15 @@ class RouteImpl extends Inspectable.Class {
   path;
   handler;
   prefix;
+  uninterruptible;
   [RouteTypeId];
-  constructor(method, path, handler, prefix = Option.none()) {
+  constructor(method, path, handler, prefix = Option.none(), uninterruptible = false) {
     super();
     this.method = method;
     this.path = path;
     this.handler = handler;
     this.prefix = prefix;
+    this.uninterruptible = uninterruptible;
     this[RouteTypeId] = RouteTypeId;
   }
   toJSON() {
@@ -177,21 +187,21 @@ export const empty = /*#__PURE__*/new RouterImpl( /*#__PURE__*/Chunk.empty(), /*
 /** @internal */
 export const fromIterable = routes => new RouterImpl(Chunk.fromIterable(routes), Chunk.empty());
 /** @internal */
-export const makeRoute = (method, path, handler, prefix = Option.none()) => new RouteImpl(method, path, handler, prefix);
+export const makeRoute = (method, path, handler, prefix = Option.none(), uninterruptible = false) => new RouteImpl(method, path, handler, prefix, uninterruptible);
 /** @internal */
 export const concat = /*#__PURE__*/dual(2, (self, that) => new RouterImpl(Chunk.appendAll(self.routes, that.routes), self.mounts));
 const removeTrailingSlash = path => path.endsWith("/") ? path.slice(0, -1) : path;
 /** @internal */
 export const prefixAll = /*#__PURE__*/dual(2, (self, prefix) => {
   prefix = removeTrailingSlash(prefix);
-  return new RouterImpl(Chunk.map(self.routes, route => new RouteImpl(route.method, route.path === "/" ? prefix : prefix + route.path, route.handler, Option.orElse(Option.map(route.prefix, _ => prefix + _), () => Option.some(prefix)))), Chunk.map(self.mounts, ([path, app]) => [path === "/" ? prefix : prefix + path, app]));
+  return new RouterImpl(Chunk.map(self.routes, route => new RouteImpl(route.method, route.path === "/" ? prefix : prefix + route.path, route.handler, Option.orElse(Option.map(route.prefix, _ => prefix + _), () => Option.some(prefix)), route.uninterruptible)), Chunk.map(self.mounts, ([path, app]) => [path === "/" ? prefix : prefix + path, app]));
 });
 /** @internal */
 export const mount = /*#__PURE__*/dual(3, (self, path, that) => concat(self, prefixAll(that, path)));
 /** @internal */
 export const mountApp = /*#__PURE__*/dual(args => Predicate.hasProperty(args[0], TypeId), (self, path, that, options) => new RouterImpl(self.routes, Chunk.append(self.mounts, [removeTrailingSlash(path), that, options])));
 /** @internal */
-export const route = method => dual(3, (self, path, handler) => new RouterImpl(Chunk.append(self.routes, new RouteImpl(method, path, handler)), self.mounts));
+export const route = method => dual(args => Predicate.hasProperty(args[0], TypeId), (self, path, handler, options) => new RouterImpl(Chunk.append(self.routes, new RouteImpl(method, path, handler, Option.none(), options?.uninterruptible ?? false)), self.mounts));
 /** @internal */
 export const all = /*#__PURE__*/route("*");
 /** @internal */
@@ -209,7 +219,7 @@ export const head = /*#__PURE__*/route("HEAD");
 /** @internal */
 export const options = /*#__PURE__*/route("OPTIONS");
 /** @internal */
-export const use = /*#__PURE__*/dual(2, (self, f) => new RouterImpl(Chunk.map(self.routes, route => new RouteImpl(route.method, route.path, f(route.handler), route.prefix)), Chunk.map(self.mounts, ([path, app]) => [path, f(app)])));
+export const use = /*#__PURE__*/dual(2, (self, f) => new RouterImpl(Chunk.map(self.routes, route => new RouteImpl(route.method, route.path, f(route.handler), route.prefix, route.uninterruptible)), Chunk.map(self.mounts, ([path, app]) => [path, f(app)])));
 /** @internal */
 export const catchAll = /*#__PURE__*/dual(2, (self, f) => use(self, Effect.catchAll(f)));
 /** @internal */

package/dist/esm/internal/http/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","names":["Schema","Chunk","Context","Effect","Effectable","dual","Inspectable","Option","Predicate","FindMyWay","Error","ServerRequest","TypeId","Symbol","for","RouteTypeId","RouteContextTypeId","RouteContext","GenericTag","params","map","_","searchParams","schemaJson","schema","options","parse","decodeUnknown","flatMap","request","zip","json","body","context","method","url","headers","cookies","pathParams","schemaNoBody","schemaParams","schemaPathParams","schemaSearchParams","RouterImpl","StructuralClass","routes","mounts","constructor","httpApp","toHttpApp","commit","toJSON","_id","toString","format","NodeInspectSymbol","self","router","make","toReadonlyArray","path","app","RouteContextImpl","RouteImpl","includePrefix","none","some","mountsLen","length","forEach","route","all","on","i","startsWith","provideService","handler","sliceRequestUrl","result","find","undefined","fail","RouteNotFound","prefix","_tag","value","mapInputContext","add","prefexLen","modify","slice","Class","empty","fromIterable","makeRoute","concat","that","appendAll","removeTrailingSlash","endsWith","prefixAll","orElse","mount","mountApp","args","hasProperty","append","get","post","put","patch","del","head","use","f","catchAll","catchAllCause","catchTag","k","catchTags","cases","tag","service","provideServiceEffect","effect"],"sources":["../../../../src/internal/http/router.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"router.js","names":["Schema","Chunk","Context","Effect","Effectable","FiberRef","dual","Inspectable","Option","Predicate","FindMyWay","Error","ServerRequest","TypeId","Symbol","for","RouteTypeId","RouteContextTypeId","RouteContext","GenericTag","params","map","_","searchParams","schemaJson","schema","options","parse","decodeUnknown","flatMap","request","zip","json","body","context","method","url","headers","cookies","pathParams","schemaNoBody","schemaParams","schemaPathParams","schemaSearchParams","RouterImpl","StructuralClass","routes","mounts","constructor","httpApp","toHttpApp","commit","toJSON","_id","toString","format","NodeInspectSymbol","self","router","make","toReadonlyArray","path","app","RouteContextImpl","RouteImpl","includePrefix","none","some","mountsLen","length","forEach","route","all","on","withFiberRuntime","fiber","getFiberRef","currentContext","unsafeGet","i","routeContext","startsWith","add","sliceRequestUrl","locally","handler","result","find","undefined","fail","RouteNotFound","prefix","_tag","value","uninterruptible","interruptible","prefexLen","modify","slice","Class","empty","fromIterable","makeRoute","concat","that","appendAll","removeTrailingSlash","endsWith","prefixAll","orElse","mount","mountApp","args","hasProperty","append","get","post","put","patch","del","head","use","f","catchAll","catchAllCause","catchTag","k","catchTags","cases","provideService","tag","service","provideServiceEffect","effect"],"sources":["../../../../src/internal/http/router.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/platform",
-  "version": "0.48.27",
+  "version": "0.48.29",
   "description": "Unified interfaces for common platform-specific services",
   "license": "MIT",
   "repository": {
@@ -16,8 +16,8 @@
     "path-browserify": "^1.0.1"
   },
   "peerDependencies": {
-    "@effect/schema": "^0.64.20",
-    "effect": "^2.4.18"
+    "@effect/schema": "^0.65.0",
+    "effect": "^2.4.19"
   },
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

package/src/Http/App.ts

@@ -2,16 +2,18 @@
  * @since 1.0.0
  */
 import * as Cause from "effect/Cause"
+import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
 import * as FiberRef from "effect/FiberRef"
 import { dual } from "effect/Function"
 import { globalValue } from "effect/GlobalValue"
 import * as Layer from "effect/Layer"
-import * as ReadonlyArray from "effect/ReadonlyArray"
+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"
@@ -32,9 +34,40 @@ export type Default<R, E> = HttpApp<R, E, ServerResponse.ServerResponse>
  * @since 1.0.0
  * @category combinators
  */
-export const withDefaultMiddleware = <R, E>(
-  self: Default<R, E>
-): Default<R, E> => internalMiddleware.tracer(self)
+export const toHandled = <R, E, _, RH>(
+  self: Default<R, E>,
+  handleResponse: (
+    request: ServerRequest.ServerRequest,
+    exit: Exit.Exit<ServerResponse.ServerResponse, E | ServerError.ResponseError>
+  ) => Effect.Effect<_, never, RH>,
+  middleware?: Middleware | undefined
+): Default<Exclude<R | RH, Scope.Scope>, E | ServerError.ResponseError> => {
+  const withTracer = internalMiddleware.tracer(self)
+  const responded = Effect.withFiberRuntime<
+    ServerResponse.ServerResponse,
+    E | ServerError.ResponseError,
+    R | RH | ServerRequest.ServerRequest
+  >((fiber) => {
+    const request = Context.unsafeGet(fiber.getFiberRef(FiberRef.currentContext), ServerRequest.ServerRequest)
+    const handler = fiber.getFiberRef(currentPreResponseHandlers)
+    const preHandled = handler._tag === "Some"
+      ? Effect.flatMap(withTracer, (response) => handler.value(request, response))
+      : withTracer
+    return Effect.flatMap(
+      Effect.exit(preHandled),
+      (exit) => {
+        if (exit._tag === "Failure") {
+          const dieOption = Cause.dieOption(exit.cause)
+          if (dieOption._tag === "Some" && ServerResponse.isServerResponse(dieOption.value)) {
+            exit = Exit.succeed(dieOption.value)
+          }
+        }
+        return Effect.zipRight(handleResponse(request, exit), exit)
+      }
+    )
+  })
+  return Effect.uninterruptible(Effect.scoped(middleware === undefined ? responded : middleware(responded)))
+}
 
 /**
  * @since 1.0.0
@@ -49,32 +82,9 @@ export type PreResponseHandler = (
  * @since 1.0.0
  * @category fiber refs
  */
-export const currentPreResponseHandlers: FiberRef.FiberRef<ReadonlyArray<PreResponseHandler>> = globalValue(
+export const currentPreResponseHandlers: FiberRef.FiberRef<Option.Option<PreResponseHandler>> = globalValue(
   Symbol.for("@effect/platform/Http/App/preResponseHandlers"),
-  () => FiberRef.unsafeMake<ReadonlyArray<PreResponseHandler>>([])
-)
-
-function noopHandler(_request: ServerRequest.ServerRequest, response: ServerResponse.ServerResponse) {
-  return Effect.succeed(response)
-}
-
-/**
- * @since 1.0.0
- * @category fiber refs
- */
-export const preResponseHandler: Effect.Effect<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)
-          }
-        )
-      }))
+  () => FiberRef.unsafeMake<Option.Option<PreResponseHandler>>(Option.none())
 )
 
 /**
@@ -86,7 +96,13 @@ export const appendPreResponseHandler: (handler: PreResponseHandler) => Effect.E
 ) =>
   FiberRef.update(
     currentPreResponseHandlers,
-    ReadonlyArray.append(handler)
+    Option.match({
+      onNone: () => Option.some(handler),
+      onSome: (prev) =>
+        Option.some((request, response) =>
+          Effect.flatMap(prev(request, response), (response) => handler(request, response))
+        )
+    })
   )
 
 /**
@@ -100,7 +116,13 @@ export const withPreResponseHandler = dual<
   Effect.locallyWith(
     self,
     currentPreResponseHandlers,
-    ReadonlyArray.append(handler)
+    Option.match({
+      onNone: () => Option.some(handler),
+      onSome: (prev) =>
+        Option.some((request, response) =>
+          Effect.flatMap(prev(request, response), (response) => handler(request, response))
+        )
+    })
   ))
 
 /**
@@ -110,25 +132,27 @@ export const withPreResponseHandler = dual<
 export const toWebHandlerRuntime = <R>(runtime: Runtime.Runtime<R>) => {
   const run = Runtime.runFork(runtime)
   return <E>(self: Default<R | Scope.Scope, E>) => {
-    self = withDefaultMiddleware(self)
+    const handled = Effect.scoped(toHandled(self, (request, exit) => {
+      const webRequest = request.source as Request
+      if (Exit.isSuccess(exit)) {
+        ;(request as any)._resolve(ServerResponse.toWeb(exit.value, request.method === "HEAD"))
+      } else if (Cause.isInterruptedOnly(exit.cause)) {
+        ;(request as any)._resolve(new Response(null, { status: webRequest.signal.aborted ? 499 : 503 }))
+      } else {
+        ;(request as any)._reject(Cause.pretty(exit.cause))
+      }
+      return Effect.unit
+    }))
     return (request: Request): Promise<Response> =>
       new Promise((resolve, reject) => {
         const req = ServerRequest.fromWeb(request)
-        const fiber = run(Effect.scoped(Effect.map(
-          Effect.provideService(self, ServerRequest.ServerRequest, req),
-          (res) => ServerResponse.toWeb(res, req.method === "HEAD")
-        )))
+        ;(req as any)._resolve = resolve
+        ;(req as any)._reject = reject
+        const fiber = run(
+          Effect.provideService(handled, ServerRequest.ServerRequest, req)
+        )
         request.signal.addEventListener("abort", () => {
-          Effect.runFork(fiber.interruptAsFork(ServerError.clientAbortFiberId))
-        })
-        fiber.addObserver((exit) => {
-          if (Exit.isSuccess(exit)) {
-            resolve(exit.value)
-          } else if (Cause.isInterruptedOnly(exit.cause)) {
-            resolve(new Response(null, { status: request.signal.aborted ? 499 : 503 }))
-          } else {
-            reject(Cause.pretty(exit.cause))
-          }
+          fiber.unsafeInterruptAsFork(ServerError.clientAbortFiberId)
         })
       })
   }

package/src/Http/Headers.ts

@@ -52,10 +52,9 @@ export const schemaFromSelf: Schema.Schema<Headers> = Schema.declare(isHeaders,
  */
 export const schema: Schema.Schema<Headers, ReadonlyRecord.ReadonlyRecord<string, string | ReadonlyArray<string>>> =
   Schema.transform(
-    Schema.record(Schema.string, Schema.union(Schema.string, Schema.array(Schema.string))),
+    Schema.Record(Schema.String, Schema.Union(Schema.String, Schema.Array(Schema.String))),
     schemaFromSelf,
-    (record) => fromInput(record),
-    identity
+    { decode: (record) => fromInput(record), encode: identity }
   )
 
 /**

package/src/Http/Router.ts

@@ -84,6 +84,7 @@ export interface Route<R, E> extends Inspectable {
   readonly path: PathInput
   readonly handler: Route.Handler<R, E>
   readonly prefix: Option.Option<string>
+  readonly uninterruptible: boolean
 }
 
 /**
@@ -243,7 +244,8 @@ export const makeRoute: <R, E>(
   method: Method.Method,
   path: PathInput,
   handler: Route.Handler<R, E>,
-  prefix?: Option.Option<string>
+  prefix?: Option.Option<string>,
+  uninterruptible?: boolean
 ) => Route<Exclude<R, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E> = internal.makeRoute
 
 /**
@@ -311,19 +313,21 @@ export const mountApp: {
  * @category routing
  */
 export const route: (
-  method: Method.Method | "*"
+  method: "*" | Method.Method
 ) => {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
-  ) => Router<R | Exclude<R1, ServerRequest.ServerRequest | RouteContext | Scope.Scope>, E1 | E>
+  ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
-  ): Router<R | Exclude<R1, ServerRequest.ServerRequest | RouteContext | Scope.Scope>, E | E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
+  ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.route
 
 /**
@@ -333,14 +337,16 @@ export const route: (
 export const all: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.all
 
@@ -351,14 +357,16 @@ export const all: {
 export const get: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.get
 
@@ -369,14 +377,16 @@ export const get: {
 export const post: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.post
 
@@ -387,14 +397,16 @@ export const post: {
 export const patch: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.patch
 
@@ -405,14 +417,16 @@ export const patch: {
 export const put: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.put
 
@@ -423,14 +437,16 @@ export const put: {
 export const del: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.del
 
@@ -441,14 +457,16 @@ export const del: {
 export const head: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.head
 
@@ -459,14 +477,16 @@ export const head: {
 export const options: {
   <R1, E1>(
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): <R, E>(
     self: Router<R, E>
   ) => Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E1 | E>
   <R, E, R1, E1>(
     self: Router<R, E>,
     path: PathInput,
-    handler: Route.Handler<R1, E1>
+    handler: Route.Handler<R1, E1>,
+    options?: { readonly uninterruptible?: boolean | undefined } | undefined
   ): Router<R | Exclude<R1, RouteContext | ServerRequest.ServerRequest | Scope.Scope>, E | E1>
 } = internal.options
 

package/src/Http/UrlParams.ts

@@ -36,8 +36,8 @@ export const fromInput = (input: Input): UrlParams => {
  * @since 1.0.0
  * @category schemas
  */
-export const schema: Schema.Schema<UrlParams, ReadonlyArray<readonly [string, string]>> = Schema.array(
-  Schema.tuple(Schema.string, Schema.string)
+export const schema: Schema.Schema<UrlParams, ReadonlyArray<readonly [string, string]>> = Schema.Array(
+  Schema.Tuple(Schema.String, Schema.String)
 ).pipe(
   Schema.identifier("UrlParams")
 )

package/src/Transferable.ts

@@ -93,8 +93,7 @@ export const schema: {
   Schema.transformOrFail(
     Schema.encodedSchema(self),
     self,
-    ParseResult.succeed,
-    (i) => Effect.as(addAll(f(i)), i)
+    { decode: ParseResult.succeed, encode: (i) => Effect.as(addAll(f(i)), i) }
   ))
 
 /**
@@ -102,7 +101,7 @@ export const schema: {
  * @category schema
  */
 export const ImageData: Schema.Schema<ImageData> = schema(
-  Schema.any,
+  Schema.Any,
   (_) => [(_ as ImageData).data.buffer]
 )
 
@@ -111,7 +110,7 @@ export const ImageData: Schema.Schema<ImageData> = schema(
  * @category schema
  */
 export const MessagePort: Schema.Schema<MessagePort> = schema(
-  Schema.any,
+  Schema.Any,
   (_) => [_ as MessagePort]
 )
 

package/src/WorkerError.ts

@@ -26,14 +26,16 @@ export type WorkerErrorTypeId = typeof WorkerErrorTypeId
 export const isWorkerError = (u: unknown): u is WorkerError => Predicate.hasProperty(u, WorkerErrorTypeId)
 
 const causeDefectPretty: Schema.Schema<unknown> = Schema.transform(
-  Schema.unknown,
-  Schema.unknown,
-  identity,
-  (defect) => {
-    if (Predicate.isObject(defect)) {
-      return Cause.pretty(Cause.die(defect))
+  Schema.Unknown,
+  Schema.Unknown,
+  {
+    decode: identity,
+    encode: (defect) => {
+      if (Predicate.isObject(defect)) {
+        return Cause.pretty(Cause.die(defect))
+      }
+      return String(defect)
     }
-    return String(defect)
   }
 )
 
@@ -42,7 +44,7 @@ const causeDefectPretty: Schema.Schema<unknown> = Schema.transform(
  * @category errors
  */
 export class WorkerError extends Schema.TaggedError<WorkerError>()("WorkerError", {
-  reason: Schema.literal("spawn", "decode", "send", "unknown", "encode"),
+  reason: Schema.Literal("spawn", "decode", "send", "unknown", "encode"),
   error: causeDefectPretty
 }) {
   /**
@@ -56,7 +58,7 @@ export class WorkerError extends Schema.TaggedError<WorkerError>()("WorkerError"
   static readonly Cause: Schema.Schema<
     Cause.Cause<WorkerError>,
     Schema.CauseEncoded<WorkerErrorFrom>
-  > = Schema.cause({ defect: causeDefectPretty, error: this })
+  > = Schema.Cause({ defect: causeDefectPretty, error: this })
 
   /**
    * @since 1.0.0