effect 2.4.12 → 2.4.14

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

@@ -1 +1 @@
-{"version":3,"file":"query.js","names":["seconds","dual","globalValue","BlockedRequests","unsafeMakeWith","isInterruptedOnly","core","ensuring","Listeners","currentCache","Symbol","for","fiberRefUnsafeMake","map","deferredMake","handle","listeners","currentCacheEnabled","fromRequest","request","dataSource","flatMap","isEffect","succeed","ds","fiberIdWith","id","proxy","Proxy","fiberRefGetWith","cacheEnabled","cache","getEither","orNew","_tag","left","increment","blocked","empty","exit","deferredAwait","cause","decrement","invalidateWhen","entry","sync","right","single","makeEntry","result","ownerId","state","completed","uninterruptibleMask","restore","ref","cacheRequest","unit","deferredComplete","withRequestCaching","self","strategy","fiberRefLocally","withRequestCache"],"sources":["../../../src/internal/query.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"query.js","names":["seconds","dual","globalValue","BlockedRequests","unsafeMakeWith","core","ensuring","Listeners","currentCache","Symbol","for","fiberRefUnsafeMake","map","deferredMake","handle","listeners","currentCacheEnabled","fromRequest","request","dataSource","flatMap","isEffect","succeed","ds","fiberIdWith","id","proxy","Proxy","fiberRefGetWith","cacheEnabled","cached","cache","getEither","orNew","_tag","left","interrupted","invalidateWhen","entry","increment","uninterruptibleMask","restore","exit","blocked","empty","deferredAwait","decrement","right","single","makeEntry","result","ownerId","state","completed","ref","sync","cacheRequest","unit","deferredComplete","withRequestCaching","self","strategy","fiberRefLocally","withRequestCache"],"sources":["../../../src/internal/query.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/internal/request.js

@@ -68,6 +68,7 @@ export const succeed = /*#__PURE__*/dual(2, (self, value) => complete(self, core
 export class Listeners {
   count = 0;
   observers = new Set();
+  interrupted = false;
   addObserver(f) {
     this.observers.add(f);
   }

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":"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","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.12";
+let moduleVersion = "2.4.14";
 export const getCurrentVersion = () => moduleVersion;
 export const setCurrentVersion = version => {
   moduleVersion = version;

package/package.json

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

package/src/BigInt.ts

@@ -547,10 +547,24 @@ export const multiplyAll = (collection: Iterable<bigint>): bigint => {
 }
 
 /**
- * Convers a bigint into a number
+ * Takes a `bigint` and returns an `Option` of `number`.
+ *
+ * If the `bigint` is outside the safe integer range for JavaScript (`Number.MAX_SAFE_INTEGER`
+ * and `Number.MIN_SAFE_INTEGER`), it returns `Option.none()`. Otherwise, it converts the `bigint`
+ * to a number and returns `Option.some(number)`.
+ *
+ * @param b - The `bigint` to be converted to a `number`.
+ *
+ * @example
+ * import { toNumber } from "effect/BigInt"
+ * import { Option } from "effect"
+ *
+ * assert.deepStrictEqual(toNumber(BigInt(42)), Option.some(42))
+ * assert.deepStrictEqual(toNumber(BigInt(Number.MAX_SAFE_INTEGER) + BigInt(1)), Option.none())
+ * assert.deepStrictEqual(toNumber(BigInt(Number.MIN_SAFE_INTEGER) - BigInt(1)), Option.none())
  *
- * @since 2.0.0
  * @category conversions
+ * @since 2.0.0
  */
 export const toNumber = (b: bigint): Option.Option<number> => {
   if (b > BigInt(Number.MAX_SAFE_INTEGER) || b < BigInt(Number.MIN_SAFE_INTEGER)) {
@@ -558,3 +572,64 @@ export const toNumber = (b: bigint): Option.Option<number> => {
   }
   return Option.some(Number(b))
 }
+
+/**
+ * Takes a string and returns an `Option` of `bigint`.
+ *
+ * If the string is empty or contains characters that cannot be converted into a `bigint`,
+ * it returns `Option.none()`, otherwise, it returns `Option.some(bigint)`.
+ *
+ * @param s - The string to be converted to a `bigint`.
+ *
+ * @example
+ * import { fromString } from "effect/BigInt"
+ * import { Option } from "effect"
+ *
+ * assert.deepStrictEqual(fromString("42"), Option.some(BigInt(42)))
+ * assert.deepStrictEqual(fromString(" "), Option.none())
+ * assert.deepStrictEqual(fromString("a"), Option.none())
+ *
+ * @category conversions
+ * @since 2.4.12
+ */
+export const fromString = (s: string): Option.Option<bigint> => {
+  try {
+    return s.trim() === ""
+      ? Option.none()
+      : Option.some(BigInt(s))
+  } catch (_) {
+    return Option.none()
+  }
+}
+
+/**
+ * Takes a number and returns an `Option` of `bigint`.
+ *
+ * If the number is outside the safe integer range for JavaScript (`Number.MAX_SAFE_INTEGER`
+ * and `Number.MIN_SAFE_INTEGER`), it returns `Option.none()`. Otherwise, it attempts to
+ * convert the number to a `bigint` and returns `Option.some(bigint)`.
+ *
+ * @param n - The number to be converted to a `bigint`.
+ *
+ * @example
+ * import { fromNumber } from "effect/BigInt"
+ * import { Option } from "effect"
+ *
+ * assert.deepStrictEqual(fromNumber(42), Option.some(BigInt(42)))
+ * assert.deepStrictEqual(fromNumber(Number.MAX_SAFE_INTEGER + 1), Option.none())
+ * assert.deepStrictEqual(fromNumber(Number.MIN_SAFE_INTEGER - 1), Option.none())
+ *
+ * @category conversions
+ * @since 2.4.12
+ */
+export const fromNumber = (n: number): Option.Option<bigint> => {
+  if (n > Number.MAX_SAFE_INTEGER || n < Number.MIN_SAFE_INTEGER) {
+    return Option.none()
+  }
+
+  try {
+    return Option.some(BigInt(n))
+  } catch (_) {
+    return Option.none()
+  }
+}

package/src/Duration.ts

@@ -15,7 +15,11 @@ import { hasProperty, isBigInt, isNumber } from "./Predicate.js"
 
 const TypeId: unique symbol = Symbol.for("effect/Duration")
 
+const bigint0 = BigInt(0)
+const bigint24 = BigInt(24)
+const bigint60 = BigInt(60)
 const bigint1e3 = BigInt(1_000)
+const bigint1e6 = BigInt(1_000_000)
 const bigint1e9 = BigInt(1_000_000_000)
 
 /**
@@ -162,7 +166,7 @@ const DurationProto: Omit<Duration, "value"> = {
 const make = (input: number | bigint): Duration => {
   const duration = Object.create(DurationProto)
   if (isNumber(input)) {
-    if (isNaN(input) || input < 0) {
+    if (isNaN(input) || input <= 0) {
       duration.value = zeroValue
     } else if (!Number.isFinite(input)) {
       duration.value = infinityValue
@@ -171,7 +175,7 @@ const make = (input: number | bigint): Duration => {
     } else {
       duration.value = { _tag: "Millis", millis: input }
     }
-  } else if (input < BigInt(0)) {
+  } else if (input <= bigint0) {
     duration.value = zeroValue
   } else {
     duration.value = { _tag: "Nanos", nanos: input }
@@ -522,6 +526,22 @@ export const times: {
     })
 )
 
+/**
+ * @since 2.0.0
+ * @category math
+ */
+export const subtract: {
+  (that: DurationInput): (self: DurationInput) => Duration
+  (self: DurationInput, that: DurationInput): Duration
+} = dual(
+  2,
+  (self: DurationInput, that: DurationInput): Duration =>
+    matchWith(self, that, {
+      onMillis: (self, that) => make(self - that),
+      onNanos: (self, that) => make(self - that)
+    })
+)
+
 /**
  * @since 2.0.0
  * @category math
@@ -631,32 +651,32 @@ export const format = (self: DurationInput): string => {
 
   const nanos = unsafeToNanos(duration)
 
-  if (nanos % 1000000n) {
-    parts.push(`${nanos % 1000000n}ns`)
+  if (nanos % bigint1e6) {
+    parts.push(`${nanos % bigint1e6}ns`)
   }
 
-  const ms = nanos / 1000000n
-  if (ms % 1000n !== 0n) {
-    parts.push(`${ms % 1000n}ms`)
+  const ms = nanos / bigint1e6
+  if (ms % bigint1e3 !== bigint0) {
+    parts.push(`${ms % bigint1e3}ms`)
   }
 
-  const sec = ms / 1000n
-  if (sec % 60n !== 0n) {
-    parts.push(`${sec % 60n}s`)
+  const sec = ms / bigint1e3
+  if (sec % bigint60 !== bigint0) {
+    parts.push(`${sec % bigint60}s`)
   }
 
-  const min = sec / 60n
-  if (min % 60n !== 0n) {
-    parts.push(`${min % 60n}m`)
+  const min = sec / bigint60
+  if (min % bigint60 !== bigint0) {
+    parts.push(`${min % bigint60}m`)
   }
 
-  const hr = min / 60n
-  if (hr % 24n !== 0n) {
-    parts.push(`${hr % 24n}h`)
+  const hr = min / bigint60
+  if (hr % bigint24 !== bigint0) {
+    parts.push(`${hr % bigint24}h`)
   }
 
-  const days = hr / 24n
-  if (days !== 0n) {
+  const days = hr / bigint24
+  if (days !== bigint0) {
     parts.push(`${days}d`)
   }
 

package/src/Number.ts

@@ -400,7 +400,7 @@ export const sumAll = (collection: Iterable<number>): number => {
  * @param collection - The collection of `number`s to multiply.
  *
  * @example
- * import { multiplyAll } from 'effect/Number'
+ * import { multiplyAll } from "effect/Number"
  *
  * assert.deepStrictEqual(multiplyAll([2, 3, 4]), 24)
  *

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/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
           )
@@ -2143,7 +2147,17 @@ export const forEachConcurrentDiscard = <A, X, E, R>(
             restore(internalFiber.join(processingFiber)),
             () => {
               onInterruptSignal()
-              return internalFiber._await(processingFiber)
+              const all = [processingFiber] as Array<FiberRuntime<any, any>>
+              residual.map((blocked) => {
+                const fiber = runFiber(blocked)
+                parent._scheduler.scheduleTask(() => {
+                  fiber.unsafeInterruptAsFork(parent.id())
+                }, 0)
+                return fiber
+              }).forEach((additional) => {
+                all.push(additional as unknown as FiberRuntime<any, any>)
+              })
+              return core.exit(fiberJoinAll(all))
             }
           )),
           () => core.forEachSequential(joinOrder, (f) => f.inheritAll)
@@ -3421,8 +3435,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 +3452,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.12"
+let moduleVersion = "2.4.14"
 
 export const getCurrentVersion = () => moduleVersion