effect 4.0.0-beta.30 → 4.0.0-beta.32

package/src/unstable/cluster/Sharding.ts

@@ -199,6 +199,7 @@ interface EntityManagerState {
 
 const make = Effect.gen(function*() {
   const config = yield* ShardingConfig
+  const getRunnerAddress = () => Option.getOrUndefined(config.runnerAddress)
   const clock = yield* Clock
 
   const runnersService = yield* Runners
@@ -228,7 +229,10 @@ const make = Effect.gen(function*() {
   const events = yield* PubSub.unbounded<ShardingRegistrationEvent>()
   const getRegistrationEvents: Stream.Stream<ShardingRegistrationEvent> = Stream.fromPubSub(events)
 
-  const isLocalRunner = (address: RunnerAddress) => Equal.equals(address, config.runnerAddress)
+  const isLocalRunner = (address: RunnerAddress) => {
+    const runnerAddress = getRunnerAddress()
+    return runnerAddress !== undefined && Equal.equals(address, runnerAddress)
+  }
 
   function getShardId(entityId: EntityId, group: string): ShardId {
     const id = Math.abs(hashString(entityId) % config.shardsPerGroup) + 1
@@ -254,8 +258,9 @@ const make = Effect.gen(function*() {
   // allow them to move to another runner.
 
   const releasingShards = MutableHashSet.empty<ShardId>()
-  if (config.runnerAddress) {
-    const selfAddress = config.runnerAddress
+  const initialRunnerAddress = getRunnerAddress()
+  if (initialRunnerAddress) {
+    const selfAddress = initialRunnerAddress
     yield* Scope.addFinalizerExit(shardingScope, () => {
       // the locks expire over time, so if this fails we ignore it
       return Effect.ignore(runnerStorage.releaseAll(selfAddress))
@@ -437,8 +442,8 @@ const make = Effect.gen(function*() {
   const storageReadLock = Semaphore.makeUnsafe(1)
   const withStorageReadLock = storageReadLock.withPermits(1)
 
-  if (storageEnabled && config.runnerAddress) {
-    const selfAddress = config.runnerAddress
+  if (storageEnabled && initialRunnerAddress) {
+    const selfAddress = initialRunnerAddress
     const entityRegistrationTimeoutMillis = Duration.toMillis(
       Duration.fromInputUnsafe(config.entityRegistrationTimeout)
     )
@@ -824,7 +829,7 @@ const make = Effect.gen(function*() {
         if (isPersisted) {
           return runnerIsLocal
             ? notifyLocal(message, discard)
-            : runnersService.notify({ address: Option.getOrUndefined(maybeRunner), message, discard })
+            : runnersService.notify({ address: maybeRunner, message, discard })
         } else if (Option.isNone(maybeRunner)) {
           return Effect.fail(new EntityNotAssignedToRunner({ address }))
         }
@@ -860,9 +865,9 @@ const make = Effect.gen(function*() {
   // shard assignments for outgoing messages (they could still be in use by
   // entities that are shutting down).
 
-  const selfRunner = config.runnerAddress ?
+  const selfRunner = initialRunnerAddress ?
     new Runner({
-      address: config.runnerAddress,
+      address: initialRunnerAddress,
       groups: config.shardGroups,
       weight: config.runnerShardWeight
     }) :
@@ -985,7 +990,7 @@ const make = Effect.gen(function*() {
     Effect.annotateLogs({
       module: "effect/cluster/Sharding",
       fiber: "RunnerStorage sync",
-      runner: config.runnerAddress
+      runner: initialRunnerAddress
     }),
     Effect.forkIn(shardingScope)
   )
@@ -1046,7 +1051,7 @@ const make = Effect.gen(function*() {
                   spanId: options.message.spanId,
                   sampled: options.message.sampled
                 }),
-                lastReceivedReply: undefined,
+                lastReceivedReply: Option.none(),
                 rpc,
                 services: fiber.services as ServiceMap.ServiceMap<any>,
                 respond
@@ -1259,7 +1264,8 @@ const make = Effect.gen(function*() {
 
   const registerEntity: Sharding["Service"]["registerEntity"] = Effect.fnUntraced(
     function*(entity, build, options) {
-      if (!config.runnerAddress || entityManagers.has(entity.type)) return
+      const runnerAddress = getRunnerAddress()
+      if (!runnerAddress || entityManagers.has(entity.type)) return
       const scope = yield* Effect.scope
       yield* Scope.addFinalizer(
         scope,
@@ -1270,14 +1276,15 @@ const make = Effect.gen(function*() {
       const manager = yield* EntityManager.make(entity, build, {
         ...options,
         storage,
-        runnerAddress: config.runnerAddress,
+        runnerAddress,
         sharding
       }).pipe(
-        Effect.provideServices(services.pipe(
-          ServiceMap.add(EntityReaper, reaper),
-          ServiceMap.add(Scope.Scope, scope),
-          ServiceMap.add(Snowflake.Generator, snowflakeGen)
-        ))
+        Effect.provideServices(ServiceMap.mutate(services, (services) =>
+          services.pipe(
+            ServiceMap.add(EntityReaper, reaper),
+            ServiceMap.add(Scope.Scope, scope),
+            ServiceMap.add(Snowflake.Generator, snowflakeGen)
+          )))
       ) as Effect.Effect<EntityManager.EntityManager>
       const state: EntityManagerState = {
         entity,

package/src/unstable/cluster/ShardingConfig.ts

@@ -25,13 +25,13 @@ export class ShardingConfig extends ServiceMap.Service<ShardingConfig, {
    * If `None`, the runner is not part of the cluster and will be in a client-only
    * mode.
    */
-  readonly runnerAddress: RunnerAddress | undefined
+  readonly runnerAddress: Option.Option<RunnerAddress>
   /**
    * The listen address for the current runner.
    *
    * Defaults to the `runnerAddress`.
    */
-  readonly runnerListenAddress: RunnerAddress | undefined
+  readonly runnerListenAddress: Option.Option<RunnerAddress>
   /**
    * A number that determines how many shards this runner will be assigned
    * relative to other runners.
@@ -129,8 +129,8 @@ const defaultRunnerAddress = RunnerAddress.makeUnsafe({ host: "localhost", port:
  * @category defaults
  */
 export const defaults: ShardingConfig["Service"] = {
-  runnerAddress: defaultRunnerAddress,
-  runnerListenAddress: undefined,
+  runnerAddress: Option.some(defaultRunnerAddress),
+  runnerListenAddress: Option.none(),
   runnerShardWeight: 1,
   shardsPerGroup: 300,
   shardGroups: ["default"],
@@ -177,7 +177,7 @@ export const config: Config.Config<ShardingConfig["Service"]> = Config.all({
       Config.withDefault(defaultRunnerAddress.port)
       // Config.withDescription("The port used for inter-runner communication.")
     )
-  }).pipe(Config.map((options) => RunnerAddress.makeUnsafe(options)), Config.option, Config.map(Option.getOrUndefined)),
+  }).pipe(Config.map((options) => RunnerAddress.makeUnsafe(options)), Config.option),
   runnerListenAddress: Config.all({
     host: Config.string("listenHost"),
     // Config.withDescription("The host to listen on.")
@@ -185,7 +185,7 @@ export const config: Config.Config<ShardingConfig["Service"]> = Config.all({
       Config.withDefault(defaultRunnerAddress.port)
       // Config.withDescription("The port to listen on.")
     )
-  }).pipe(Config.map((options) => RunnerAddress.makeUnsafe(options)), Config.option, Config.map(Option.getOrUndefined)),
+  }).pipe(Config.map((options) => RunnerAddress.makeUnsafe(options)), Config.option),
   runnerShardWeight: Config.int("runnerShardWeight").pipe(
     Config.withDefault(defaults.runnerShardWeight)
     // Config.withDescription("A number that determines how many shards this runner will be assigned relative to other runners.")

package/src/unstable/cluster/SqlMessageStorage.ts

@@ -4,8 +4,8 @@
 import * as Arr from "../../Array.ts"
 import * as Effect from "../../Effect.ts"
 import * as Layer from "../../Layer.ts"
+import * as Option from "../../Option.ts"
 import * as Schedule from "../../Schedule.ts"
-import * as UndefinedOr from "../../UndefinedOr.ts"
 import * as Migrator from "../sql/Migrator.ts"
 import * as SqlClient from "../sql/SqlClient.ts"
 import type { Row } from "../sql/SqlConnection.ts"
@@ -138,7 +138,7 @@ export const make: (options?: {
 
   const messageFromRow = (row: MessageRow & ReplyJoinRow): {
     readonly envelope: Envelope.Encoded
-    readonly lastSentReply: Reply.Encoded | undefined
+    readonly lastSentReply: Option.Option<Reply.Encoded>
   } => {
     switch (Number(row.kind) as 0 | 1 | 2) {
       case 0:
@@ -163,14 +163,14 @@ export const make: (options?: {
               undefined)
           },
           lastSentReply: row.reply_reply_id ?
-            {
+            Option.some({
               _tag: "Chunk",
               id: String(row.reply_reply_id),
               requestId: String(row.request_id),
               sequence: Number(row.reply_sequence!),
               values: JSON.parse(row.reply_payload!)
-            } :
-            undefined
+            }) :
+            Option.none()
         }
       case 1:
         return {
@@ -185,7 +185,7 @@ export const make: (options?: {
               entityId: row.entity_id
             }
           },
-          lastSentReply: undefined
+          lastSentReply: Option.none()
         }
       case 2:
         return {
@@ -199,7 +199,7 @@ export const make: (options?: {
               entityId: row.entity_id
             }
           },
-          lastSentReply: undefined
+          lastSentReply: Option.none()
         }
     }
   }
@@ -395,24 +395,27 @@ export const make: (options?: {
             }
             const row = rows[0]
             const replyKindNum = typeof row.reply_kind === "bigint" ? Number(row.reply_kind) : row.reply_kind
-            return SaveResultEncoded.Duplicate({
-              originalId: Snowflake.Snowflake(row.id as any),
-              lastReceivedReply: row.reply_id ?
-                replyKindNum === replyKind.WithExit ?
-                  {
+            const lastReceivedReply: Option.Option<Reply.Encoded> = row.reply_id
+              ? Option.some(
+                replyKindNum === replyKind.WithExit
+                  ? {
                     id: String(row.reply_id),
                     requestId: String(row.id),
                     _tag: "WithExit",
                     exit: JSON.parse(row.reply_payload as string)
-                  } :
-                  {
+                  }
+                  : {
                     id: String(row.reply_id),
                     requestId: String(row.id),
                     _tag: "Chunk",
                     sequence: Number(row.reply_sequence),
                     values: JSON.parse(row.reply_payload as string)
-                  } :
-                undefined
+                  }
+              )
+              : Option.none()
+            return SaveResultEncoded.Duplicate({
+              originalId: Snowflake.Snowflake(row.id as any),
+              lastReceivedReply
             })
           })
         )
@@ -455,7 +458,7 @@ export const make: (options?: {
 
     requestIdForPrimaryKey: (primaryKey) =>
       sql<{ id: string | bigint }>`SELECT id FROM ${messagesTableSql} WHERE message_id = ${primaryKey}`.pipe(
-        Effect.map((rows) => UndefinedOr.map(rows[0]?.id, Snowflake.Snowflake)),
+        Effect.map((rows) => Option.map(Option.fromNullishOr(rows[0]?.id), Snowflake.Snowflake)),
         Effect.provideService(SqlClient.SafeIntegers, true),
         PersistenceError.refail,
         withTracerDisabled
@@ -506,7 +509,7 @@ export const make: (options?: {
         }
         const messages: Array<{
           readonly envelope: Envelope.Encoded
-          readonly lastSentReply: Reply.Encoded | undefined
+          readonly lastSentReply: Option.Option<Reply.Encoded>
         }> = new Array(rows.length)
         const ids = new Array<string>(rows.length)
         for (let i = 0; i < rows.length; i++) {

package/src/unstable/cluster/internal/entityManager.ts

@@ -17,7 +17,6 @@ import * as Schema from "../../../Schema.ts"
 import * as Issue from "../../../SchemaIssue.ts"
 import * as Scope from "../../../Scope.ts"
 import * as ServiceMap from "../../../ServiceMap.ts"
-import * as UndefinedOr from "../../../UndefinedOr.ts"
 import type * as Rpc from "../../rpc/Rpc.ts"
 import { RequestId } from "../../rpc/RpcMessage.ts"
 import * as RpcServer from "../../rpc/RpcServer.ts"
@@ -71,7 +70,7 @@ export type EntityState = {
     readonly rpc: Rpc.AnyWithProps
     readonly message: Message.IncomingRequestLocal<any>
     sentReply: boolean
-    lastSentChunk: Reply.Chunk<Rpc.Any> | undefined
+    lastSentChunk: Option.Option<Reply.Chunk<Rpc.Any>>
     sequence: number
   }>
   lastActiveCheck: number
@@ -156,12 +155,13 @@ export const make = Effect.fnUntraced(function*<
         // Initiate the behavior for the entity
         const handlers = yield* (entity.protocol.toHandlers(buildHandlers as any).pipe(
           Effect.provideService(CurrentLogAnnotations, {}),
-          Effect.provideServices(services.pipe(
-            ServiceMap.add(CurrentAddress, address),
-            ServiceMap.add(CurrentRunnerAddress, options.runnerAddress),
-            ServiceMap.add(KeepAliveLatch, keepAliveLatch),
-            ServiceMap.add(Scope.Scope, scope)
-          ))
+          Effect.provideServices(ServiceMap.mutate(services, (services) =>
+            services.pipe(
+              ServiceMap.add(CurrentAddress, address),
+              ServiceMap.add(CurrentRunnerAddress, options.runnerAddress),
+              ServiceMap.add(KeepAliveLatch, keepAliveLatch),
+              ServiceMap.add(Scope.Scope, scope)
+            )))
         ) as Effect.Effect<ServiceMap.ServiceMap<Rpc.ToHandler<Rpcs>>>)
 
         const server = yield* RpcServer.makeNoSerialization(entity.protocol, {
@@ -251,7 +251,7 @@ export const make = Effect.fnUntraced(function*<
                       sequence,
                       values: response.values
                     })
-                    request.lastSentChunk = reply
+                    request.lastSentChunk = Option.some(reply)
                     return request.message.respond(reply)
                   })
                 ))
@@ -438,10 +438,13 @@ export const make = Effect.fnUntraced(function*<
                 rpc,
                 message,
                 sentReply: false,
-                lastSentChunk: message.lastSentReply as Reply.Chunk<Rpc.Any> | undefined,
-                sequence: UndefinedOr.match(message.lastSentReply, {
-                  onUndefined: () => 0,
-                  onDefined: (reply) => reply._tag === "Chunk" ? reply.sequence + 1 : 0
+                lastSentChunk: Option.filter(
+                  message.lastSentReply,
+                  (reply): reply is Reply.Chunk<Rpc.Any> => reply._tag === "Chunk"
+                ),
+                sequence: Option.match(message.lastSentReply, {
+                  onNone: () => 0,
+                  onSome: (reply) => reply._tag === "Chunk" ? reply.sequence + 1 : 0
                 })
               }
               server.activeRequests.set(message.envelope.requestId, entry)
@@ -450,7 +453,10 @@ export const make = Effect.fnUntraced(function*<
                 id: RequestId(message.envelope.requestId),
                 payload: new Request({
                   ...message.envelope,
-                  lastSentChunk: message.lastSentReply as Reply.Chunk<R> | undefined
+                  lastSentChunk: Option.filter(
+                    message.lastSentReply,
+                    (reply): reply is Reply.Chunk<R> => reply._tag === "Chunk"
+                  )
                 })
               })
             }
@@ -460,8 +466,8 @@ export const make = Effect.fnUntraced(function*<
                 return Effect.void
               } else if (
                 message.envelope._tag === "AckChunk" &&
-                entry.lastSentChunk !== undefined &&
-                message.envelope.replyId !== entry.lastSentChunk.id
+                Option.isSome(entry.lastSentChunk) &&
+                message.envelope.replyId !== entry.lastSentChunk.value.id
               ) {
                 return Effect.void
               }
@@ -585,9 +591,9 @@ const makeMessageDecode = <Type extends string, Rpcs extends Rpc.Any>(
     rpc: Rpc.AnyWithProps
   ) {
     const payload = yield* Schema.decodeEffect(Schema.toCodecJson(rpc.payloadSchema))(message.envelope.payload)
-    const lastSentReply = message.lastSentReply !== undefined
-      ? yield* Schema.decodeEffect(Reply.Reply(rpc))(message.lastSentReply)
-      : undefined
+    const lastSentReply = Option.isNone(message.lastSentReply) ?
+      message.lastSentReply :
+      Option.some(yield* Schema.decodeEffect(Reply.Reply(rpc))(message.lastSentReply.value))
     return {
       _tag: "IncomingRequest",
       envelope: {
@@ -602,7 +608,7 @@ const makeMessageDecode = <Type extends string, Rpcs extends Rpc.Any>(
     {
       readonly _tag: "IncomingRequest"
       readonly envelope: Envelope.Request.Any
-      readonly lastSentReply: Reply.Reply<Rpcs> | undefined
+      readonly lastSentReply: Option.Option<Reply.Reply<Rpcs>>
     } | {
       readonly _tag: "IncomingEnvelope"
       readonly envelope: Envelope.AckChunk | Envelope.Interrupt
@@ -627,7 +633,7 @@ const makeMessageDecode = <Type extends string, Rpcs extends Rpc.Any>(
       {
         readonly _tag: "IncomingRequest"
         readonly envelope: Envelope.Request.Any
-        readonly lastSentReply: Reply.Reply<Rpcs> | undefined
+        readonly lastSentReply: Option.Option<Reply.Reply<Rpcs>>
       },
       Schema.SchemaError,
       Rpc.ServicesServer<Rpcs>

package/src/unstable/devtools/DevToolsSchema.ts

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import type * as Option from "../../Option.ts"
 import * as Schema from "../../Schema.ts"
 
 /**
@@ -80,7 +81,7 @@ export interface Span {
   readonly sampled: boolean
   readonly attributes: ReadonlyMap<string, unknown>
   readonly status: SpanStatus
-  readonly parent: ParentSpan | undefined
+  readonly parent: Option.Option<ParentSpan>
 }
 
 /**
@@ -95,7 +96,7 @@ export const Span: Schema.Codec<Span> = Schema.Struct({
   sampled: Schema.Boolean,
   attributes: Schema.ReadonlyMap(Schema.String, Schema.Any),
   status: SpanStatus,
-  parent: Schema.UndefinedOr(Schema.suspend(() => ParentSpan))
+  parent: Schema.Option(Schema.suspend(() => ParentSpan))
 })
 
 /**

package/src/unstable/encoding/Ndjson.ts

@@ -61,13 +61,13 @@ export const encodeString = <IE = never, Done = unknown>(): Channel.Channel<
  * @category constructors
  */
 export const encode = <IE = never, Done = unknown>(): Channel.Channel<
-  Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+  Arr.NonEmptyReadonlyArray<Uint8Array>,
   IE | NdjsonError,
   Done,
   Arr.NonEmptyReadonlyArray<unknown>,
   IE,
   Done
-> => Channel.map(encodeString(), Arr.map((_) => encoder.encode(_) as Uint8Array<ArrayBuffer>))
+> => Channel.map(encodeString(), Arr.map((_) => encoder.encode(_)))
 
 /**
  * @since 4.0.0
@@ -77,7 +77,7 @@ export const encodeSchema = <S extends Schema.Top>(
   schema: S
 ) =>
 <IE = never, Done = unknown>(): Channel.Channel<
-  Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+  Arr.NonEmptyReadonlyArray<Uint8Array>,
   NdjsonError | Schema.SchemaError | IE,
   Done,
   Arr.NonEmptyReadonlyArray<S["Type"]>,
@@ -141,7 +141,7 @@ export const decode = <IE = never, Done = unknown>(options?: {
   Arr.NonEmptyReadonlyArray<unknown>,
   IE | NdjsonError,
   Done,
-  Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+  Arr.NonEmptyReadonlyArray<Uint8Array>,
   IE,
   Done
 > => {
@@ -161,7 +161,7 @@ export const decodeSchema = <S extends Schema.Top>(
   Arr.NonEmptyReadonlyArray<S["Type"]>,
   Schema.SchemaError | NdjsonError | IE,
   Done,
-  Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+  Arr.NonEmptyReadonlyArray<Uint8Array>,
   IE,
   Done,
   S["DecodingServices"]
@@ -201,10 +201,10 @@ export const duplex: {
     }
   ): <R, IE, OE, OutDone, InDone>(
     self: Channel.Channel<
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       OE,
       OutDone,
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       IE | NdjsonError,
       InDone,
       R
@@ -224,10 +224,10 @@ export const duplex: {
    */
   <R, IE, OE, OutDone, InDone>(
     self: Channel.Channel<
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       OE,
       OutDone,
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       IE | NdjsonError,
       InDone,
       R
@@ -246,10 +246,10 @@ export const duplex: {
   >
 } = dual((args) => Channel.isChannel(args[0]), <R, IE, OE, OutDone, InDone>(
   self: Channel.Channel<
-    Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+    Arr.NonEmptyReadonlyArray<Uint8Array>,
     OE,
     OutDone,
-    Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+    Arr.NonEmptyReadonlyArray<Uint8Array>,
     IE | NdjsonError,
     InDone,
     R
@@ -373,10 +373,10 @@ export const duplexSchema: {
     }
   ): <OutErr, OutDone, InErr, InDone, R>(
     self: Channel.Channel<
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       OutErr,
       OutDone,
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       NdjsonError | Schema.SchemaError | InErr,
       InDone,
       R
@@ -396,10 +396,10 @@ export const duplexSchema: {
    */
   <Out extends Schema.Top, In extends Schema.Top, OutErr, OutDone, InErr, InDone, R>(
     self: Channel.Channel<
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       OutErr,
       OutDone,
-      Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+      Arr.NonEmptyReadonlyArray<Uint8Array>,
       NdjsonError | Schema.SchemaError | InErr,
       InDone,
       R
@@ -420,10 +420,10 @@ export const duplexSchema: {
   >
 } = dual(2, <Out extends Schema.Top, In extends Schema.Top, OutErr, OutDone, InErr, InDone, R>(
   self: Channel.Channel<
-    Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+    Arr.NonEmptyReadonlyArray<Uint8Array>,
     OutErr,
     OutDone,
-    Arr.NonEmptyReadonlyArray<Uint8Array<ArrayBuffer>>,
+    Arr.NonEmptyReadonlyArray<Uint8Array>,
     NdjsonError | Schema.SchemaError | InErr,
     InDone,
     R

package/src/unstable/http/Cookies.ts

@@ -5,6 +5,7 @@ import * as Data from "../../Data.ts"
 import * as Duration from "../../Duration.ts"
 import { dual } from "../../Function.ts"
 import * as Inspectable from "../../Inspectable.ts"
+import * as Option from "../../Option.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
@@ -566,17 +567,17 @@ export const get: {
    * @since 4.0.0
    * @category combinators
    */
-  (name: string): (self: Cookies) => Cookie | undefined
+  (name: string): (self: Cookies) => Option.Option<Cookie>
   /**
    * Get a cookie from a Cookies object
    *
    * @since 4.0.0
    * @category combinators
    */
-  (self: Cookies, name: string): Cookie | undefined
+  (self: Cookies, name: string): Option.Option<Cookie>
 } = dual(
   (args) => isCookies(args[0]),
-  (self: Cookies, name: string): Cookie | undefined => self.cookies[name]
+  (self: Cookies, name: string): Option.Option<Cookie> => Option.fromUndefinedOr(self.cookies[name])
 )
 
 /**
@@ -592,19 +593,17 @@ export const getValue: {
    * @since 4.0.0
    * @category combinators
    */
-  (name: string): (self: Cookies) => string | undefined
+  (name: string): (self: Cookies) => Option.Option<string>
   /**
    * Get a cookie from a Cookies object
    *
    * @since 4.0.0
    * @category combinators
    */
-  (self: Cookies, name: string): string | undefined
+  (self: Cookies, name: string): Option.Option<string>
 } = dual(
   (args) => isCookies(args[0]),
-  (self: Cookies, name: string): string | undefined => {
-    return self.cookies[name]?.value
-  }
+  (self: Cookies, name: string): Option.Option<string> => Option.map(get(self, name), (cookie) => cookie.value)
 )
 
 /**

package/src/unstable/http/Etag.ts

@@ -4,6 +4,7 @@
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
 import * as Layer from "../../Layer.ts"
+import * as Option from "../../Option.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Body from "./HttpBody.ts"
 
@@ -54,9 +55,10 @@ export class Generator extends ServiceMap.Service<Generator, {
 }>()("effect/http/Etag/Generator") {}
 
 const fromFileInfo = (info: FileSystem.File.Info) => {
-  const mtime = info.mtime
-    ? info.mtime.getTime().toString(16)
-    : "0"
+  const mtime = Option.match(info.mtime, {
+    onNone: () => "0",
+    onSome: (mtime) => mtime.getTime().toString(16)
+  })
   return `${info.size.toString(16)}-${mtime}`
 }
 

package/src/unstable/http/Headers.ts

@@ -6,6 +6,7 @@ import * as Equ from "../../Equivalence.ts"
 import { dual } from "../../Function.ts"
 import * as Hash from "../../Hash.ts"
 import * as Inspectable from "../../Inspectable.ts"
+import * as Option from "../../Option.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
 import * as Redactable from "../../Redactable.ts"
@@ -205,24 +206,24 @@ export const get: {
    * @since 4.0.0
    * @category combinators
    */
-  (key: string): (self: Headers) => string | undefined
+  (key: string): (self: Headers) => Option.Option<string>
   /**
    * @since 4.0.0
    * @category combinators
    */
-  (self: Headers, key: string): string | undefined
+  (self: Headers, key: string): Option.Option<string>
 } = dual<
   /**
    * @since 4.0.0
    * @category combinators
    */
-  (key: string) => (self: Headers) => string | undefined,
+  (key: string) => (self: Headers) => Option.Option<string>,
   /**
    * @since 4.0.0
    * @category combinators
    */
-  (self: Headers, key: string) => string | undefined
->(2, (self, key) => self[key.toLowerCase()])
+  (self: Headers, key: string) => Option.Option<string>
+>(2, (self, key) => Option.fromUndefinedOr(self[key.toLowerCase()]))
 
 /**
  * @since 4.0.0

package/src/unstable/http/HttpClient.ts

@@ -10,6 +10,7 @@ import * as Fiber from "../../Fiber.ts"
 import { constant, constFalse, constTrue, dual, flow, identity } from "../../Function.ts"
 import * as Inspectable from "../../Inspectable.ts"
 import * as Layer from "../../Layer.ts"
+import * as Option from "../../Option.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Ref from "../../Ref.ts"
@@ -640,7 +641,7 @@ export const make = (
       Effect.withFiber((fiber) => {
         const scopedController = scopedRequests.get(request)
         const controller = scopedController ?? new AbortController()
-        const urlResult = UrlParams.makeUrl(request.url, request.urlParams, request.hash)
+        const urlResult = UrlParams.makeUrl(request.url, request.urlParams, Option.getOrUndefined(request.hash))
         if (Result.isFailure(urlResult)) {
           return Effect.fail(
             new Error.HttpClientError({