effect 3.22.2 → 3.22.3

package/src/LayerMap.ts

@@ -3,7 +3,7 @@
  * @experimental
  */
 import * as Context from "./Context.js"
-import type * as Duration from "./Duration.js"
+import * as Duration from "./Duration.js"
 import * as Effect from "./Effect.js"
 import * as FiberRefsPatch from "./FiberRefsPatch.js"
 import { identity } from "./Function.js"
@@ -119,6 +119,11 @@ export const make: <
   lookup: (key: K) => L,
   options?: {
     readonly idleTimeToLive?: Duration.DurationInput | undefined
+    /**
+     * Preloaded entries become idle immediately and follow the idle TTL.
+     * The default idle TTL is zero, so preloading only occurs when a nonzero
+     * `idleTimeToLive` is configured.
+     */
     readonly preloadKeys?: PreloadKeys
   } | undefined
 ) => Effect.Effect<
@@ -177,9 +182,13 @@ export const make: <
     idleTimeToLive: options?.idleTimeToLive
   })
 
-  if (options?.preloadKeys) {
+  if (
+    options?.preloadKeys &&
+    options.idleTimeToLive !== undefined &&
+    !Duration.isZero(Duration.decode(options.idleTimeToLive))
+  ) {
     for (const key of options.preloadKeys) {
-      yield* (RcMap.get(rcMap, key) as Effect.Effect<any, EL, RL | Scope.Scope>)
+      yield* Effect.scoped(RcMap.get(rcMap, key) as Effect.Effect<any, EL, RL | Scope.Scope>)
     }
   }
 
@@ -204,6 +213,11 @@ export const fromRecord = <
   layers: Layers,
   options?: {
     readonly idleTimeToLive?: Duration.DurationInput | undefined
+    /**
+     * Preloaded entries become idle immediately and follow the idle TTL.
+     * The default idle TTL is zero, so preloading only occurs when a nonzero
+     * `idleTimeToLive` is configured.
+     */
     readonly preload?: Preload | undefined
   } | undefined
 ): Effect.Effect<
@@ -327,6 +341,11 @@ export const Service = <Self>() =>
         readonly lookup: (key: any) => Layer.Layer<any, any, any>
         readonly dependencies?: ReadonlyArray<Layer.Layer<any, any, any>>
         readonly idleTimeToLive?: Duration.DurationInput | undefined
+        /**
+         * Preloaded entries become idle immediately and follow the idle TTL.
+         * The default idle TTL is zero, so preloading only occurs when a nonzero
+         * `idleTimeToLive` is configured.
+         */
         readonly preloadKeys?:
           | Iterable<Options extends { readonly lookup: (key: infer K) => any } ? K : never>
           | undefined
@@ -337,6 +356,11 @@ export const Service = <Self>() =>
       readonly layers: Record<string, Layer.Layer<any, any, any>>
       readonly dependencies?: ReadonlyArray<Layer.Layer<any, any, any>>
       readonly idleTimeToLive?: Duration.DurationInput | undefined
+      /**
+       * Preloaded entries become idle immediately and follow the idle TTL.
+       * The default idle TTL is zero, so preloading only occurs when a nonzero
+       * `idleTimeToLive` is configured.
+       */
       readonly preload?: boolean
     }, Options>
 >(

package/src/internal/fiberRuntime.ts

@@ -1719,12 +1719,14 @@ export const addFinalizer = <X, R>(
           core.withFiberRuntime((runtimeFinalizer) => {
             const preRefs = runtimeFinalizer.getFiberRefs()
             const preFlags = runtimeFinalizer.currentRuntimeFlags
+            const interruptedCause = runtimeFinalizer.getFiberRef(core.currentInterruptedCause)
             const patchRefs = FiberRefsPatch.diff(preRefs, acquireRefs)
             const patchFlags = runtimeFlags_.diff(preFlags, acquireFlags)
             const inverseRefs = FiberRefsPatch.diff(acquireRefs, preRefs)
             runtimeFinalizer.setFiberRefs(
               FiberRefsPatch.patch(patchRefs, runtimeFinalizer.id(), acquireRefs)
             )
+            runtimeFinalizer.setFiberRef(core.currentInterruptedCause, interruptedCause)
 
             return ensuring(
               core.withRuntimeFlags(finalizer(exit) as Effect.Effect<X>, patchFlags),

package/src/internal/reloadable.ts

@@ -43,6 +43,7 @@ export const auto = <I, S, E, In, R>(
             reloadable.reload,
             effect.ignoreLogged,
             schedule_.schedule_Effect(options.schedule),
+            core.interruptible,
             fiberRuntime.forkDaemon
           ),
           core.interruptFiber

package/src/internal/version.ts

@@ -1,4 +1,4 @@
-let moduleVersion = "3.22.2"
+let moduleVersion = "3.22.3"
 
 export const getCurrentVersion = () => moduleVersion