effect 4.0.0-beta.4 → 4.0.0-beta.40

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"
@@ -86,7 +87,7 @@ export interface Cookie extends Inspectable.Inspectable {
   readonly options?: {
     readonly domain?: string | undefined
     readonly expires?: Date | undefined
-    readonly maxAge?: Duration.DurationInput | undefined
+    readonly maxAge?: Duration.Input | undefined
     readonly path?: string | undefined
     readonly priority?: "low" | "medium" | "high" | undefined
     readonly httpOnly?: boolean | undefined
@@ -418,7 +419,7 @@ export function makeCookie(
       return Result.fail(CookiesError.fromReason("InvalidCookiePath"))
     }
 
-    if (options.maxAge !== undefined && !Duration.isFinite(Duration.fromDurationInputUnsafe(options.maxAge))) {
+    if (options.maxAge !== undefined && !Duration.isFinite(Duration.fromInputUnsafe(options.maxAge))) {
       return Result.fail(CookiesError.fromReason("CookieInfinityMaxAge"))
     }
   }
@@ -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)
 )
 
 /**
@@ -668,6 +667,90 @@ export const setUnsafe: {
     ))
 )
 
+/**
+ * Add an expired cookie to a Cookies object
+ *
+ * @since 4.0.0
+ * @category combinators
+ */
+export const expireCookie: {
+  /**
+   * Add an expired cookie to a Cookies object
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): (self: Cookies) => Result.Result<Cookies, CookiesError>
+  /**
+   * Add an expired cookie to a Cookies object
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): Result.Result<Cookies, CookiesError>
+} = dual(
+  (args) => isCookies(args[0]),
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ) =>
+    set(self, name, "", {
+      ...options,
+      maxAge: 0,
+      expires: new Date(0)
+    })
+)
+
+/**
+ * Add an expired cookie to a Cookies object, throwing an error if invalid
+ *
+ * @since 4.0.0
+ * @category combinators
+ */
+export const expireCookieUnsafe: {
+  /**
+   * Add an expired cookie to a Cookies object, throwing an error if invalid
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): (self: Cookies) => Cookies
+  /**
+   * Add an expired cookie to a Cookies object, throwing an error if invalid
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): Cookies
+} = dual(
+  (args) => isCookies(args[0]),
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): Cookies =>
+    setUnsafe(self, name, "", {
+      ...options,
+      maxAge: 0,
+      expires: new Date(0)
+    })
+)
+
 /**
  * Add multiple cookies to a Cookies object
  *
@@ -763,7 +846,7 @@ export function serializeCookie(self: Cookie): string {
   const options = self.options
 
   if (options.maxAge !== undefined) {
-    const maxAge = Duration.toSeconds(Duration.fromDurationInputUnsafe(options.maxAge))
+    const maxAge = Duration.toSeconds(Duration.fromInputUnsafe(options.maxAge))
     str += "; Max-Age=" + Math.trunc(maxAge)
   }
 

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"
@@ -44,22 +45,37 @@ export interface Headers extends Redactable.Redactable {
   readonly [key: string]: string
 }
 
-const Proto = Object.assign(Object.create(null), Inspectable.BaseProto, {
-  [TypeId]: TypeId,
-  [Redactable.symbolRedactable](
-    this: Headers,
-    context: ServiceMap.ServiceMap<never>
-  ): Record<string, string | Redacted.Redacted<string>> {
-    return redact(this, ServiceMap.get(context, CurrentRedactedNames))
+const Proto = Object.create(null)
+
+Object.defineProperties(Proto, {
+  [TypeId]: {
+    value: TypeId
   },
-  toJSON() {
-    return Redactable.redact(this)
+  [Redactable.symbolRedactable]: {
+    value(this: Headers, context: ServiceMap.ServiceMap<never>): Record<string, string | Redacted.Redacted<string>> {
+      return redact(this, ServiceMap.get(context, CurrentRedactedNames))
+    }
   },
-  [Equal.symbol](this: Headers, that: Headers): boolean {
-    return Equivalence(this, that)
+  toJSON: {
+    value(this: Headers) {
+      return Redactable.redact(this)
+    }
+  },
+  [Equal.symbol]: {
+    value(this: Headers, that: Headers): boolean {
+      return Equivalence(this, that)
+    }
   },
-  [Hash.symbol](this: Headers): number {
-    return Hash.structure(this)
+  [Hash.symbol]: {
+    value(this: Headers): number {
+      return Hash.structure(this)
+    }
+  },
+  toString: {
+    value: Inspectable.BaseProto.toString
+  },
+  [Inspectable.NodeInspectSymbol]: {
+    value: Inspectable.BaseProto[Inspectable.NodeInspectSymbol]
   }
 })
 
@@ -190,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
@@ -337,6 +353,40 @@ export const remove: {
   return out
 })
 
+/**
+ * @since 4.0.0
+ * @category combinators
+ */
+export const removeMany: {
+  /**
+   * @since 4.0.0
+   * @category combinators
+   */
+  (keys: Iterable<string>): (self: Headers) => Headers
+  /**
+   * @since 4.0.0
+   * @category combinators
+   */
+  (self: Headers, keys: Iterable<string>): Headers
+} = dual<
+  /**
+   * @since 4.0.0
+   * @category combinators
+   */
+  (keys: Iterable<string>) => (self: Headers) => Headers,
+  /**
+   * @since 4.0.0
+   * @category combinators
+   */
+  (self: Headers, keys: Iterable<string>) => Headers
+>(2, (self, keys) => {
+  const out = make(self)
+  for (const key of keys) {
+    delete out[key.toLowerCase()]
+  }
+  return out
+})
+
 /**
  * @since 4.0.0
  * @category combinators