effect 2.4.13 → 2.4.15

package/dist/esm/internal/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","names":["dual","hasProperty","completedRequestMap","core","StructuralPrototype","RequestSymbolKey","RequestTypeId","Symbol","for","requestVariance","_E","_","_A","RequestPrototype","isRequest","u","of","args","Object","assign","create","tagged","tag","request","_tag","Class","prototype","TaggedClass","complete","self","result","fiberRefGetWith","currentRequestMap","map","sync","has","entry","get","state","completed","deferredUnsafeDone","completeEffect","effect","matchEffect","onFailure","error","exitFail","onSuccess","value","exitSucceed","fail","failCause","cause","exitFailCause","succeed","Listeners","count","observers","Set","addObserver","f","add","removeObserver","delete","increment","forEach","decrement","filterOutCompleted","requests","filter"],"sources":["../../../src/internal/request.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,IAAI,QAAQ,gBAAgB;AACrC,SAASC,WAAW,QAAQ,iBAAiB;AAG7C,OAAO,KAAKC,mBAAmB,MAAM,0BAA0B;AAC/D,OAAO,KAAKC,IAAI,MAAM,WAAW;AACjC,SAASC,mBAAmB,QAAQ,iBAAiB;AAErD;AACA,MAAMC,gBAAgB,GAAG,gBAAgB;AAEzC;AACA,OAAO,MAAMC,aAAa,gBAA0BC,MAAM,CAACC,GAAG,CAC5DH,gBAAgB,CACQ;AAE1B,MAAMI,eAAe,GAAG;EACtB;EACAC,EAAE,EAAGC,CAAQ,IAAKA,CAAC;EACnB;EACAC,EAAE,EAAGD,CAAQ,IAAKA;CACnB;AAED,MAAME,gBAAgB,GAAG;EACvB,GAAGT,mBAAmB;EACtB,CAACE,aAAa,GAAGG;CAClB;AAED;AACA,OAAO,MAAMK,SAAS,GAAIC,CAAU,IAA6Cd,WAAW,CAACc,CAAC,EAAET,aAAa,CAAC;AAE9G;AACA,OAAO,MAAMU,EAAE,GAAGA,CAAA,KAA4EC,IAAI,IAChGC,MAAM,CAACC,MAAM,CAACD,MAAM,CAACE,MAAM,CAACP,gBAAgB,CAAC,EAAEI,IAAI,CAAC;AAEtD;AACA,OAAO,MAAMI,MAAM,GACjBC,GAAc,IAEfL,IAAI,IAAI;EACP,MAAMM,OAAO,GAAGL,MAAM,CAACC,MAAM,CAACD,MAAM,CAACE,MAAM,CAACP,gBAAgB,CAAC,EAAEI,IAAI,CAAC;EACpEM,OAAO,CAACC,IAAI,GAAGF,GAAG;EAClB,OAAOC,OAAO;AAChB,CAAC;AAED;AACA,OAAO,MAAME,KAAK,gBAGoC;EACpD,SAASA,KAAKA,CAAYR,IAAS;IACjC,IAAIA,IAAI,EAAE;MACRC,MAAM,CAACC,MAAM,CAAC,IAAI,EAAEF,IAAI,CAAC;IAC3B;EACF;EACAQ,KAAK,CAACC,SAAS,GAAGb,gBAAgB;EAClC,OAAOY,KAAY;AACrB,CAAC,CAAC,CAAE;AAEJ;AACA,OAAO,MAAME,WAAW,GACtBL,GAAQ,IAIoE;EAC5E,OAAO,MAAMK,WAAY,SAAQF,KAAoB;IAC1CD,IAAI,GAAGF,GAAG;GACb;AACV,CAAC;AAED;AACA,OAAO,MAAMM,QAAQ,gBAAG5B,IAAI,CAQ1B,CAAC,EAAE,CAAC6B,IAAI,EAAEC,MAAM,KAChB3B,IAAI,CAAC4B,eAAe,CAClB7B,mBAAmB,CAAC8B,iBAAiB,EACpCC,GAAG,IACF9B,IAAI,CAAC+B,IAAI,CAAC,MAAK;EACb,IAAID,GAAG,CAACE,GAAG,CAACN,IAAI,CAAC,EAAE;IACjB,MAAMO,KAAK,GAAGH,GAAG,CAACI,GAAG,CAACR,IAAI,CAAE;IAC5B,IAAI,CAACO,KAAK,CAACE,KAAK,CAACC,SAAS,EAAE;MAC1BH,KAAK,CAACE,KAAK,CAACC,SAAS,GAAG,IAAI;MAC5BpC,IAAI,CAACqC,kBAAkB,CAACJ,KAAK,CAACN,MAAM,EAAEA,MAAM,CAAC;IAC/C;EACF;AACF,CAAC,CAAC,CACL,CAAC;AAEJ;AACA,OAAO,MAAMW,cAAc,gBAAGzC,IAAI,CAQhC,CAAC,EAAE,CAAC6B,IAAI,EAAEa,MAAM,KAChBvC,IAAI,CAACwC,WAAW,CAACD,MAAM,EAAE;EACvBE,SAAS,EAAGC,KAAK,IAAKjB,QAAQ,CAACC,IAAI,EAAE1B,IAAI,CAAC2C,QAAQ,CAACD,KAAK,CAAQ,CAAC;EACjEE,SAAS,EAAGC,KAAK,IAAKpB,QAAQ,CAACC,IAAI,EAAE1B,IAAI,CAAC8C,WAAW,CAACD,KAAK,CAAQ;CACpE,CAAC,CAAC;AAEL;AACA,OAAO,MAAME,IAAI,gBAAGlD,IAAI,CAQtB,CAAC,EAAE,CAAC6B,IAAI,EAAEgB,KAAK,KAAKjB,QAAQ,CAACC,IAAI,EAAE1B,IAAI,CAAC2C,QAAQ,CAACD,KAAK,CAAQ,CAAC,CAAC;AAElE;AACA,OAAO,MAAMM,SAAS,gBAAGnD,IAAI,CAQ3B,CAAC,EAAE,CAAC6B,IAAI,EAAEuB,KAAK,KAAKxB,QAAQ,CAACC,IAAI,EAAE1B,IAAI,CAACkD,aAAa,CAACD,KAAK,CAAQ,CAAC,CAAC;AAEvE;AACA,OAAO,MAAME,OAAO,gBAAGtD,IAAI,CAQzB,CAAC,EAAE,CAAC6B,IAAI,EAAEmB,KAAK,KAAKpB,QAAQ,CAACC,IAAI,EAAE1B,IAAI,CAAC8C,WAAW,CAACD,KAAK,CAAQ,CAAC,CAAC;AAErE;AACA,OAAM,MAAOO,SAAS;EACpBC,KAAK,GAAG,CAAC;EACTC,SAAS,GAAiC,IAAIC,GAAG,EAAE;EACnDC,WAAWA,CAACC,CAA0B;IACpC,IAAI,CAACH,SAAS,CAACI,GAAG,CAACD,CAAC,CAAC;EACvB;EACAE,cAAcA,CAACF,CAA0B;IACvC,IAAI,CAACH,SAAS,CAACM,MAAM,CAACH,CAAC,CAAC;EAC1B;EACAI,SAASA,CAAA;IACP,IAAI,CAACR,KAAK,EAAE;IACZ,IAAI,CAACC,SAAS,CAACQ,OAAO,CAAEL,CAAC,IAAKA,CAAC,CAAC,IAAI,CAACJ,KAAK,CAAC,CAAC;EAC9C;EACAU,SAASA,CAAA;IACP,IAAI,CAACV,KAAK,EAAE;IACZ,IAAI,CAACC,SAAS,CAACQ,OAAO,CAAEL,CAAC,IAAKA,CAAC,CAAC,IAAI,CAACJ,KAAK,CAAC,CAAC;EAC9C;;AAGF;;;AAGA,OAAO,MAAMW,kBAAkB,GAAyCC,QAAkB,IACxFjE,IAAI,CAAC4B,eAAe,CAClB7B,mBAAmB,CAAC8B,iBAAiB,EACpCC,GAAG,IACF9B,IAAI,CAACmD,OAAO,CACVc,QAAQ,CAACC,MAAM,CAAE9C,OAAO,IAAK,EAAEU,GAAG,CAACI,GAAG,CAACd,OAAO,CAAC,EAAEe,KAAK,CAACC,SAAS,KAAK,IAAI,CAAC,CAAC,CAC5E,CACJ","ignoreList":[]}
+{"version":3,"file":"request.js","names":["dual","hasProperty","completedRequestMap","core","StructuralPrototype","RequestSymbolKey","RequestTypeId","Symbol","for","requestVariance","_E","_","_A","RequestPrototype","isRequest","u","of","args","Object","assign","create","tagged","tag","request","_tag","Class","prototype","TaggedClass","complete","self","result","fiberRefGetWith","currentRequestMap","map","sync","has","entry","get","state","completed","deferredUnsafeDone","completeEffect","effect","matchEffect","onFailure","error","exitFail","onSuccess","value","exitSucceed","fail","failCause","cause","exitFailCause","succeed","Listeners","count","observers","Set","interrupted","addObserver","f","add","removeObserver","delete","increment","forEach","decrement","filterOutCompleted","requests","filter"],"sources":["../../../src/internal/request.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/internal/version.js

@@ -1,4 +1,4 @@
-let moduleVersion = "2.4.13";
+let moduleVersion = "2.4.15";
 export const getCurrentVersion = () => moduleVersion;
 export const setCurrentVersion = version => {
   moduleVersion = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect",
-  "version": "2.4.13",
+  "version": "2.4.15",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "license": "MIT",
   "repository": {

package/src/Config.ts

@@ -3,6 +3,7 @@
  */
 import type * as Chunk from "./Chunk.js"
 import type * as ConfigError from "./ConfigError.js"
+import type * as Duration from "./Duration.js"
 import type * as Effect from "./Effect.js"
 import type * as Either from "./Either.js"
 import type { LazyArg } from "./Function.js"
@@ -180,6 +181,14 @@ export const literal: <Literals extends ReadonlyArray<LiteralValue>>(...literals
  */
 export const logLevel: (name?: string) => Config<LogLevel.LogLevel> = internal.logLevel
 
+/**
+ * Constructs a config for a duration value.
+ *
+ * @since 2.5.0
+ * @category constructors
+ */
+export const duration: (name?: string) => Config<Duration.Duration> = internal.duration
+
 /**
  * This function returns `true` if the specified value is an `Config` value,
  * `false` otherwise.

package/src/Duration.ts

@@ -11,7 +11,7 @@ import * as Option from "./Option.js"
 import * as order from "./Order.js"
 import type { Pipeable } from "./Pipeable.js"
 import { pipeArguments } from "./Pipeable.js"
-import { hasProperty, isBigInt, isNumber } from "./Predicate.js"
+import { hasProperty, isBigInt, isNumber, isString } from "./Predicate.js"
 
 const TypeId: unique symbol = Symbol.for("effect/Duration")
 
@@ -94,7 +94,7 @@ export const decode = (input: DurationInput): Duration => {
     if (input.length === 2 && isNumber(input[0]) && isNumber(input[1])) {
       return nanos(BigInt(input[0]) * bigint1e9 + BigInt(input[1]))
     }
-  } else {
+  } else if (isString(input)) {
     DURATION_REGEX.lastIndex = 0 // Reset the lastIndex before each use
     const match = DURATION_REGEX.exec(input)
     if (match) {
@@ -131,6 +131,11 @@ export const decode = (input: DurationInput): Duration => {
   throw new Error("Invalid duration input")
 }
 
+/**
+ * @since 2.5.0
+ */
+export const decodeUnknown: (u: unknown) => Option.Option<Duration> = Option.liftThrowable(decode) as any
+
 const zeroValue: DurationValue = { _tag: "Millis", millis: 0 }
 const infinityValue: DurationValue = { _tag: "Infinity" }
 

package/src/Request.ts

@@ -245,6 +245,7 @@ export const succeed: {
 export interface Listeners {
   readonly count: number
   readonly observers: Set<(count: number) => void>
+  interrupted: boolean
   addObserver(f: (count: number) => void): void
   removeObserver(f: (count: number) => void): void
   increment(): void
@@ -309,7 +310,7 @@ export interface Entry<out R> extends Entry.Variance<R> {
   readonly listeners: Listeners
   readonly ownerId: FiberId
   readonly state: {
-    completed: boolean // TODO: mutable by design?
+    completed: boolean
   }
 }
 

package/src/internal/config.ts

@@ -1,6 +1,7 @@
 import * as Chunk from "../Chunk.js"
 import type * as Config from "../Config.js"
 import * as ConfigError from "../ConfigError.js"
+import * as Duration from "../Duration.js"
 import * as Either from "../Either.js"
 import type { LazyArg } from "../Function.js"
 import { constTrue, dual, pipe } from "../Function.js"
@@ -288,6 +289,15 @@ export const logLevel = (name?: string): Config.Config<LogLevel.LogLevel> => {
   return name === undefined ? config : nested(config, name)
 }
 
+/** @internal */
+export const duration = (name?: string): Config.Config<Duration.Duration> => {
+  const config = mapOrFail(string(), (value) => {
+    const duration = Duration.decodeUnknown(value)
+    return Either.fromOption(duration, () => configError.InvalidData([], `Expected a duration but received ${value}`))
+  })
+  return name === undefined ? config : nested(config, name)
+}
+
 /** @internal */
 export const map = dual<
   <A, B>(f: (a: A) => B) => (self: Config.Config<A>) => Config.Config<B>,

package/src/internal/fiberRuntime.ts

@@ -241,8 +241,12 @@ const runBlockedRequests = (self: RequestBlock.RequestBlock) =>
               map.set(entry.request as Request<any, any>, entry)
             }
           }
+          const flat = arr.flat()
           return core.fiberRefLocally(
-            invokeWithInterrupt(dataSource.runAll(arr), arr.flat()),
+            invokeWithInterrupt(dataSource.runAll(arr), flat, () =>
+              flat.forEach((entry) => {
+                entry.listeners.interrupted = true
+              })),
             currentRequestMap,
             map
           )
@@ -2024,7 +2028,7 @@ export const forEachConcurrentDiscard = <A, X, E, R>(
           }
           return exits
         }
-        const runFiber = <A, E, R>(eff: Effect.Effect<A, E, R>) => {
+        const runFiber = <A, E, R>(eff: Effect.Effect<A, E, R>, interruptImmediately = false) => {
           const runnable = core.uninterruptible(graft(eff))
           const fiber = unsafeForkUnstarted(
             runnable,
@@ -2033,6 +2037,9 @@ export const forEachConcurrentDiscard = <A, X, E, R>(
             fiberScope.globalScope
           )
           parent._scheduler.scheduleTask(() => {
+            if (interruptImmediately) {
+              fiber.unsafeInterruptAsFork(parent.id())
+            }
             fiber.resume(runnable)
           }, 0)
           return fiber
@@ -2138,16 +2145,44 @@ export const forEachConcurrentDiscard = <A, X, E, R>(
             }
           })
         )
-        return core.asUnit(core.tap(
-          core.flatten(core.onInterrupt(
-            restore(internalFiber.join(processingFiber)),
-            () => {
-              onInterruptSignal()
-              return internalFiber._await(processingFiber)
-            }
-          )),
-          () => core.forEachSequential(joinOrder, (f) => f.inheritAll)
-        ))
+        return core.asUnit(
+          core.onExit(
+            core.flatten(restore(internalFiber.join(processingFiber))),
+            core.exitMatch({
+              onFailure: () => {
+                onInterruptSignal()
+                const target = residual.length + 1
+                const concurrency = Math.min(typeof n === "number" ? n : residual.length, residual.length)
+                const toPop = Array.from(residual)
+                return core.async<any, any>((cb) => {
+                  const exits: Array<Exit.Exit<any, any>> = []
+                  let count = 0
+                  let index = 0
+                  const check = (index: number, hitNext: boolean) => (exit: Exit.Exit<any, any>) => {
+                    exits[index] = exit
+                    count++
+                    if (count === target) {
+                      cb(Option.getOrThrow(core.exitCollectAll(exits, { parallel: true })))
+                    }
+                    if (toPop.length > 0 && hitNext) {
+                      next()
+                    }
+                  }
+                  const next = () => {
+                    runFiber(toPop.pop()!, true).addObserver(check(index, true))
+                    index++
+                  }
+                  processingFiber.addObserver(check(index, false))
+                  index++
+                  for (let i = 0; i < concurrency; i++) {
+                    next()
+                  }
+                }) as any
+              },
+              onSuccess: () => core.forEachSequential(joinOrder, (f) => f.inheritAll)
+            })
+          )
+        )
       })
     )
   )
@@ -3421,8 +3456,13 @@ export const ensuring: {
 /** @internal */
 export const invokeWithInterrupt: <A, E, R>(
   self: Effect.Effect<A, E, R>,
-  entries: ReadonlyArray<Entry<unknown>>
-) => Effect.Effect<void, E, R> = <A, E, R>(self: Effect.Effect<A, E, R>, entries: ReadonlyArray<Entry<unknown>>) =>
+  entries: ReadonlyArray<Entry<unknown>>,
+  onInterrupt?: () => void
+) => Effect.Effect<void, E, R> = <A, E, R>(
+  self: Effect.Effect<A, E, R>,
+  entries: ReadonlyArray<Entry<unknown>>,
+  onInterrupt?: () => void
+) =>
   core.fiberIdWith((id) =>
     core.flatMap(
       core.flatMap(
@@ -3433,6 +3473,7 @@ export const invokeWithInterrupt: <A, E, R>(
             const checkDone = () => {
               if (counts.every((count) => count === 0)) {
                 cleanup.forEach((f) => f())
+                onInterrupt?.()
                 cb(core.interruptFiber(processing))
               }
             }

package/src/internal/query.ts

@@ -8,7 +8,6 @@ import type * as Request from "../Request.js"
 import type * as RequestResolver from "../RequestResolver.js"
 import * as BlockedRequests from "./blockedRequests.js"
 import { unsafeMakeWith } from "./cache.js"
-import { isInterruptedOnly } from "./cause.js"
 import * as core from "./core.js"
 import { ensuring } from "./fiberRuntime.js"
 import { Listeners } from "./request.js"
@@ -61,77 +60,81 @@ export const fromRequest = <
         const proxy = new Proxy(request, {})
         return core.fiberRefGetWith(currentCacheEnabled, (cacheEnabled) => {
           if (cacheEnabled) {
-            return core.fiberRefGetWith(currentCache, (cache) =>
+            const cached: Effect.Effect<any, any> = core.fiberRefGetWith(currentCache, (cache) =>
               core.flatMap(cache.getEither(proxy), (orNew) => {
                 switch (orNew._tag) {
                   case "Left": {
+                    if (orNew.left.listeners.interrupted) {
+                      return core.flatMap(
+                        cache.invalidateWhen(proxy, (entry) => entry.handle === orNew.left.handle),
+                        () => cached
+                      )
+                    }
                     orNew.left.listeners.increment()
-                    return core.blocked(
-                      BlockedRequests.empty,
-                      core.flatMap(core.exit(core.deferredAwait(orNew.left.handle)), (exit) => {
-                        if (exit._tag === "Failure" && isInterruptedOnly(exit.cause)) {
+                    return core.uninterruptibleMask((restore) =>
+                      core.flatMap(
+                        core.exit(core.blocked(
+                          BlockedRequests.empty,
+                          restore(core.deferredAwait(orNew.left.handle))
+                        )),
+                        (exit) => {
                           orNew.left.listeners.decrement()
-                          return core.flatMap(
-                            cache.invalidateWhen(
-                              proxy,
-                              (entry) => entry.handle === orNew.left.handle
-                            ),
-                            () => fromRequest(proxy, ds)
-                          )
+                          return exit
                         }
-                        return ensuring(
-                          core.deferredAwait(orNew.left.handle),
-                          core.sync(() => orNew.left.listeners.decrement())
-                        )
-                      })
+                      )
                     )
                   }
                   case "Right": {
                     orNew.right.listeners.increment()
-                    return core.blocked(
-                      BlockedRequests.single(
-                        ds as RequestResolver.RequestResolver<A>,
-                        BlockedRequests.makeEntry({
-                          request: proxy,
-                          result: orNew.right.handle,
-                          listeners: orNew.right.listeners,
-                          ownerId: id,
-                          state: { completed: false }
-                        })
-                      ),
-                      core.uninterruptibleMask((restore) =>
-                        core.flatMap(
-                          core.exit(restore(core.deferredAwait(orNew.right.handle))),
-                          (exit) => {
-                            orNew.right.listeners.decrement()
-                            return exit
-                          }
-                        )
+                    return core.uninterruptibleMask((restore) =>
+                      core.flatMap(
+                        core.exit(
+                          core.blocked(
+                            BlockedRequests.single(
+                              ds as RequestResolver.RequestResolver<A>,
+                              BlockedRequests.makeEntry({
+                                request: proxy,
+                                result: orNew.right.handle,
+                                listeners: orNew.right.listeners,
+                                ownerId: id,
+                                state: { completed: false }
+                              })
+                            ),
+                            restore(core.deferredAwait(orNew.right.handle))
+                          )
+                        ),
+                        () => {
+                          orNew.right.listeners.decrement()
+                          return core.deferredAwait(orNew.right.handle)
+                        }
                       )
                     )
                   }
                 }
               }))
+            return cached
           }
           const listeners = new Listeners()
           listeners.increment()
           return core.flatMap(
             core.deferredMake<Request.Request.Success<A>, Request.Request.Error<A>>(),
             (ref) =>
-              core.blocked(
-                BlockedRequests.single(
-                  ds as RequestResolver.RequestResolver<A>,
-                  BlockedRequests.makeEntry({
-                    request: proxy,
-                    result: ref,
-                    listeners,
-                    ownerId: id,
-                    state: { completed: false }
-                  })
+              ensuring(
+                core.blocked(
+                  BlockedRequests.single(
+                    ds as RequestResolver.RequestResolver<A>,
+                    BlockedRequests.makeEntry({
+                      request: proxy,
+                      result: ref,
+                      listeners,
+                      ownerId: id,
+                      state: { completed: false }
+                    })
+                  ),
+                  core.deferredAwait(ref)
                 ),
-                ensuring(
-                  core.deferredAwait(ref),
-                  core.sync(() => listeners.decrement())
+                core.sync(() =>
+                  listeners.decrement()
                 )
               )
           )

package/src/internal/request.ts

@@ -147,6 +147,7 @@ export const succeed = dual<
 export class Listeners {
   count = 0
   observers: Set<(count: number) => void> = new Set()
+  interrupted = false
   addObserver(f: (count: number) => void): void {
     this.observers.add(f)
   }

package/src/internal/version.ts

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