effect 4.0.0 → 4.0.2

package/src/RcMap.ts

@@ -9,6 +9,7 @@
  * lifecycles such as clients, sessions, and connections, not as a general
  * mutable cache.
  *
+ * @stability stable
  * @since 3.5.0
  */
 import * as Cause from "./Cause.ts"
@@ -67,6 +68,7 @@ const TypeId = "~effect/RcMap"
  * @see {@link make} for creating an `RcMap`
  * @see {@link get} for acquiring or retaining a resource by key
  *
+ * @stability stable
  * @category models
  * @since 3.5.0
  */
@@ -93,6 +95,7 @@ export interface RcMap<in out K, in out A, in out E = never> extends Pipeable {
  * @see {@link State.Open} for the active state with entries
  * @see {@link State.Closed} for the shutdown state
  *
+ * @stability stable
  * @category models
  * @since 4.0.0
  */
@@ -106,6 +109,7 @@ export type State<K, A, E> = State.Open<K, A, E> | State.Closed
  * Use when referring to the concrete open, closed, and entry state shapes used
  * by `RcMap`.
  *
+ * @stability stable
  * @since 4.0.0
  */
 export declare namespace State {
@@ -234,6 +238,7 @@ const makeUnsafe = <K, A, E>(options: {
  * @see {@link get} for acquiring or retaining a resource by key
  * @see {@link invalidate} for removing a resource from the map
  *
+ * @stability stable
  * @category constructors
  * @since 3.5.0
  */
@@ -286,6 +291,7 @@ export const make: {
    * @see {@link get} for acquiring or retaining a resource by key
    * @see {@link invalidate} for removing a resource from the map
    *
+   * @stability stable
    * @category constructors
    * @since 3.5.0
    */
@@ -344,6 +350,7 @@ export const make: {
    * @see {@link get} for acquiring or retaining a resource by key
    * @see {@link invalidate} for removing a resource from the map
    *
+   * @stability stable
    * @category constructors
    * @since 3.5.0
    */
@@ -435,6 +442,7 @@ export const make: {
  * @see {@link make} for creating the reference-counted map
  * @see {@link invalidate} for removing a resource by key
  *
+ * @stability stable
  * @category combinators
  * @since 3.5.0
  */
@@ -481,6 +489,7 @@ export const get: {
    * @see {@link make} for creating the reference-counted map
    * @see {@link invalidate} for removing a resource by key
    *
+   * @stability stable
    * @category combinators
    * @since 3.5.0
    */
@@ -527,6 +536,7 @@ export const get: {
    * @see {@link make} for creating the reference-counted map
    * @see {@link invalidate} for removing a resource by key
    *
+   * @stability stable
    * @category combinators
    * @since 3.5.0
    */
@@ -566,10 +576,16 @@ export const get: {
           context.set(key, value)
         })
         context.set(Scope.Scope.key, entry.scope)
+        const lookupContext: Context.Context<Scope.Scope> = Context.makeUnsafe(context)
         Effect.suspend(() => self.lookup(key)).pipe(
-          Effect.runForkWith(Context.makeUnsafe(context)),
+          Effect.runForkWith(lookupContext),
           Fiber.runIn(entry.scope)
-        ).addObserver((exit) => Deferred.doneUnsafe(entry.deferred, exit))
+        ).addObserver((exit) => {
+          // Interruption is abandonment, so the entry is dropped and the next
+          // get starts a fresh lookup.
+          if (Exit.hasInterrupts(exit)) removeInterrupted(self, key, entry, lookupContext)
+          Deferred.doneUnsafe(entry.deferred, exit)
+        })
       }
       const scope = Context.getUnsafe(parent.context, Scope.Scope)
       return Scope.addFinalizer(scope, entry.finalizer).pipe(
@@ -619,6 +635,7 @@ export const get: {
  * @see {@link get} for acquiring a resource when the key is missing
  * @see {@link has} for checking presence without retaining or awaiting the entry
  *
+ * @stability stable
  * @category combinators
  * @since 4.0.0
  */
@@ -664,6 +681,7 @@ export const getOption: {
    * @see {@link get} for acquiring a resource when the key is missing
    * @see {@link has} for checking presence without retaining or awaiting the entry
    *
+   * @stability stable
    * @category combinators
    * @since 4.0.0
    */
@@ -709,6 +727,7 @@ export const getOption: {
    * @see {@link get} for acquiring a resource when the key is missing
    * @see {@link has} for checking presence without retaining or awaiting the entry
    *
+   * @stability stable
    * @category combinators
    * @since 4.0.0
    */
@@ -733,6 +752,24 @@ export const getOption: {
     })
 )
 
+const removeInterrupted = <K, A, E>(
+  self: RcMap<K, A, E>,
+  key: K,
+  entry: State.Entry<A, E>,
+  context: Context.Context<Scope.Scope>
+) => {
+  if (self.state._tag === "Closed") return
+  const o = MutableHashMap.get(self.state.map, key)
+  if (o._tag === "None" || o.value !== entry) return
+  MutableHashMap.remove(self.state.map, key)
+  // Borrowers close the entry on release; an idle entry has none left.
+  if (entry.refCount > 0) return
+  closeEntry(entry).pipe(
+    Effect.runForkWith(context),
+    Fiber.runIn(self.scope)
+  )
+}
+
 const closeEntry = <A, E>(entry: State.Entry<A, E>) =>
   entry.fiber
     ? Fiber.interrupt(entry.fiber).pipe(Effect.andThen(Scope.close(entry.scope, Exit.void)))
@@ -818,6 +855,7 @@ const release = <K, A, E>(self: RcMap<K, A, E>, key: K, entry: State.Entry<A, E>
  *
  * @see {@link has} for checking one key without enumerating all keys
  *
+ * @stability stable
  * @category combinators
  * @since 3.8.0
  */
@@ -869,6 +907,7 @@ export const keys = <K, A, E>(self: RcMap<K, A, E>): Effect.Effect<Iterable<K>>
  * @see {@link get} for acquiring or retaining the resource for a key
  * @see {@link touch} for extending the idle lifetime without removing the entry
  *
+ * @stability stable
  * @category combinators
  * @since 3.13.0
  */
@@ -915,6 +954,7 @@ export const invalidate: {
    * @see {@link get} for acquiring or retaining the resource for a key
    * @see {@link touch} for extending the idle lifetime without removing the entry
    *
+   * @stability stable
    * @category combinators
    * @since 3.13.0
    */
@@ -961,6 +1001,7 @@ export const invalidate: {
    * @see {@link get} for acquiring or retaining the resource for a key
    * @see {@link touch} for extending the idle lifetime without removing the entry
    *
+   * @stability stable
    * @category combinators
    * @since 3.13.0
    */
@@ -999,6 +1040,7 @@ export const invalidate: {
  * @see {@link get} for acquiring or retaining the resource for a key
  * @see {@link keys} for enumerating all currently stored keys
  *
+ * @stability stable
  * @category combinators
  * @since 3.17.7
  */
@@ -1024,6 +1066,7 @@ export const has: {
    * @see {@link get} for acquiring or retaining the resource for a key
    * @see {@link keys} for enumerating all currently stored keys
    *
+   * @stability stable
    * @category combinators
    * @since 3.17.7
    */
@@ -1049,6 +1092,7 @@ export const has: {
    * @see {@link get} for acquiring or retaining the resource for a key
    * @see {@link keys} for enumerating all currently stored keys
    *
+   * @stability stable
    * @category combinators
    * @since 3.17.7
    */
@@ -1105,6 +1149,7 @@ export const has: {
  *
  * @see {@link invalidate} for removing the resource instead of extending it
  *
+ * @stability stable
  * @category combinators
  * @since 3.13.0
  */
@@ -1152,6 +1197,7 @@ export const touch: {
    *
    * @see {@link invalidate} for removing the resource instead of extending it
    *
+   * @stability stable
    * @category combinators
    * @since 3.13.0
    */
@@ -1199,6 +1245,7 @@ export const touch: {
    *
    * @see {@link invalidate} for removing the resource instead of extending it
    *
+   * @stability stable
    * @category combinators
    * @since 3.13.0
    */

package/src/RcRef.ts

@@ -6,6 +6,7 @@
  * available. The module also provides `invalidate` for forcing the next `get`
  * to acquire a fresh resource.
  *
+ * @stability stable
  * @since 3.5.0
  */
 import type * as Duration from "./Duration.ts"
@@ -61,6 +62,7 @@ const TypeId = "~effect/RcRef"
  * await Effect.runPromise(Effect.scoped(program)) // => [true, ["closed Connected to postgres://localhost"]]
  * ```
  *
+ * @stability stable
  * @category models
  * @since 3.5.0
  */
@@ -82,6 +84,7 @@ export interface RcRef<out A, out E = never> extends Pipeable {
  *
  * ```
  *
+ * @stability stable
  * @since 3.5.0
  */
 export declare namespace RcRef {
@@ -151,6 +154,7 @@ export declare namespace RcRef {
  * events // => ["released foo"]
  * ```
  *
+ * @stability stable
  * @category constructors
  * @since 3.5.0
  */
@@ -214,6 +218,7 @@ export const make: <A, E, R>(
  * await Effect.runPromise(Effect.scoped(program)) // => [true, ["released shared resource"]]
  * ```
  *
+ * @stability stable
  * @category combinators
  * @since 3.5.0
  */
@@ -238,6 +243,7 @@ export const get: <A, E>(self: RcRef<A, E>) => Effect.Effect<A, E, Scope> = inte
  *
  * @see {@link get} for acquiring the current cached resource or the fresh resource after invalidation
  *
+ * @stability stable
  * @category combinators
  * @since 3.19.6
  */