effect 3.13.2 → 3.13.3

package/src/Array.ts

@@ -2446,7 +2446,7 @@ export const remove: {
  * @category elements
  * @since 2.0.0
  */
-export const reverse = <S extends Iterable<any> | NonEmptyReadonlyArray<any>>(
+export const reverse = <S extends Iterable<any>>(
   self: S
 ): S extends NonEmptyReadonlyArray<infer A> ? NonEmptyArray<A> : S extends Iterable<infer A> ? Array<A> : never =>
   Array.from(self).reverse() as any
@@ -2466,7 +2466,7 @@ export const sort: {
    * @category sorting
    * @since 2.0.0
    */
-  <B>(O: Order.Order<B>): <A extends B, S extends ReadonlyArray<A> | Iterable<A>>(self: S) => ReadonlyArray.With<S, ReadonlyArray.Infer<S>>
+  <B>(O: Order.Order<B>): <A extends B, S extends Iterable<A>>(self: S) => ReadonlyArray.With<S, ReadonlyArray.Infer<S>>
   /**
    * Create a new array with elements sorted in increasing order based on the specified comparator.
    * If the input is a `NonEmptyReadonlyArray`, the output will also be a `NonEmptyReadonlyArray`.
@@ -2534,7 +2534,7 @@ export const sortWith: {
    * @since 2.0.0
    * @category elements
    */
-  <S extends Iterable<any> | NonEmptyReadonlyArray<any>, B>(f: (a: ReadonlyArray.Infer<S>) => B, order: Order.Order<B>): (self: S) => ReadonlyArray.With<S, ReadonlyArray.Infer<S>>
+  <S extends Iterable<any>, B>(f: (a: ReadonlyArray.Infer<S>) => B, order: Order.Order<B>): (self: S) => ReadonlyArray.With<S, ReadonlyArray.Infer<S>>
   /**
    * Sorts an array based on a provided mapping function and order. The mapping
    * function transforms the elements into a value that can be compared, and the
@@ -2621,7 +2621,7 @@ export const sortWith: {
  * @category sorting
  * @since 2.0.0
  */
-export const sortBy = <S extends Iterable<any> | NonEmptyReadonlyArray<any>>(
+export const sortBy = <S extends Iterable<any>>(
   ...orders: ReadonlyArray<Order.Order<ReadonlyArray.Infer<S>>>
 ) => {
   const sortByAll = sort(Order.combineAll(orders))
@@ -2857,7 +2857,7 @@ export const zipWith: {
  *
  * @since 2.0.0
  */
-export const unzip: <S extends Iterable<readonly [any, any]> | NonEmptyReadonlyArray<readonly [any, any]>>(
+export const unzip: <S extends Iterable<readonly [any, any]>>(
   self: S
 ) => S extends NonEmptyReadonlyArray<readonly [infer A, infer B]> ? [NonEmptyArray<A>, NonEmptyArray<B>]
   : S extends Iterable<readonly [infer A, infer B]> ? [Array<A>, Array<B>]
@@ -5735,7 +5735,7 @@ export const dedupeWith: {
  *
  * @since 2.0.0
  */
-export const dedupe = <S extends Iterable<any> | NonEmptyReadonlyArray<any>>(
+export const dedupe = <S extends Iterable<any>>(
   self: S
 ): S extends NonEmptyReadonlyArray<infer A> ? NonEmptyArray<A> : S extends Iterable<infer A> ? Array<A> : never =>
   dedupeWith(self, Equal.equivalence()) as any

package/src/Context.ts

@@ -112,7 +112,7 @@ export interface ReferenceClass<Self, Id extends string, Type> extends Reference
  * @since 2.0.0
  */
 export interface TagUnify<A extends { [Unify.typeSymbol]?: any }> {
-  Tag?: () => A[Unify.typeSymbol] extends Tag<infer I0, infer S0> | infer _ ? Tag<I0, S0> : never
+  Tag?: () => Extract<A[Unify.typeSymbol], Tag<any, any>>
 }
 
 /**

package/src/FiberHandle.ts

@@ -111,13 +111,17 @@ export const make = <A = unknown, E = unknown>(): Effect.Effect<FiberHandle<A, E
   Effect.acquireRelease(
     Effect.map(Deferred.make<void, E>(), (deferred) => unsafeMake<A, E>(deferred)),
     (handle) =>
-      Effect.zipRight(
-        clear(handle),
-        Effect.suspend(() => {
-          handle.state = { _tag: "Closed" }
-          return Deferred.done(handle.deferred, Exit.void)
-        })
-      )
+      Effect.withFiberRuntime((parent) => {
+        const state = handle.state
+        if (state._tag === "Closed") return Effect.void
+        handle.state = { _tag: "Closed" }
+        return state.fiber ?
+          Effect.intoDeferred(
+            Effect.asVoid(Fiber.interruptAs(state.fiber, FiberId.combine(parent.id(), internalFiberId))),
+            handle.deferred
+          ) :
+          Deferred.done(handle.deferred, Exit.void)
+      })
   )
 
 /**

package/src/FiberMap.ts

@@ -125,13 +125,17 @@ export const make = <K, A = unknown, E = unknown>(): Effect.Effect<FiberMap<K, A
         deferred
       )),
     (map) =>
-      Effect.zipRight(
-        clear(map),
-        Effect.suspend(() => {
-          map.state = { _tag: "Closed" }
-          return Deferred.done(map.deferred, Exit.void)
-        })
-      )
+      Effect.withFiberRuntime((parent) => {
+        const state = map.state
+        if (state._tag === "Closed") return Effect.void
+        map.state = { _tag: "Closed" }
+        return Fiber.interruptAllAs(
+          Iterable.map(state.backing, ([, fiber]) => fiber),
+          FiberId.combine(parent.id(), internalFiberId)
+        ).pipe(
+          Effect.intoDeferred(map.deferred)
+        )
+      })
   )
 
 /**

package/src/FiberSet.ts

@@ -118,13 +118,15 @@ export const make = <A = unknown, E = unknown>(): Effect.Effect<FiberSet<A, E>,
   Effect.acquireRelease(
     Effect.map(Deferred.make<void, unknown>(), (deferred) => unsafeMake(new Set(), deferred)),
     (set) =>
-      Effect.zipRight(
-        clear(set),
-        Effect.suspend(() => {
-          set.state = { _tag: "Closed" }
-          return Deferred.done(set.deferred, Exit.void)
-        })
-      )
+      Effect.withFiberRuntime((parent) => {
+        const state = set.state
+        if (state._tag === "Closed") return Effect.void
+        set.state = { _tag: "Closed" }
+        const fibers = state.backing
+        return Fiber.interruptAllAs(fibers, FiberId.combine(parent.id(), internalFiberId)).pipe(
+          Effect.intoDeferred(set.deferred)
+        )
+      })
   )
 
 /**

package/src/JSONSchema.ts

@@ -635,13 +635,19 @@ const go = (
       if (ast.propertySignatures.length === 0 && ast.indexSignatures.length === 0) {
         return { ...constEmpty, ...getJsonSchemaAnnotations(ast) }
       }
+      const output: JsonSchema7Object = {
+        type: "object",
+        required: [],
+        properties: {},
+        additionalProperties: false
+      }
       let patternProperties: JsonSchema7 | undefined = undefined
       let propertyNames: JsonSchema7 | undefined = undefined
       for (const is of ast.indexSignatures) {
         const parameter = is.parameter
         switch (parameter._tag) {
           case "StringKeyword": {
-            patternProperties = go(is.type, $defs, true, path, options)
+            output.additionalProperties = go(is.type, $defs, true, path, options)
             break
           }
           case "TemplateLiteral": {
@@ -661,12 +667,6 @@ const go = (
             throw new Error(errors_.getJSONSchemaUnsupportedParameterErrorMessage(path, parameter))
         }
       }
-      const output: JsonSchema7Object = {
-        type: "object",
-        required: [],
-        properties: {},
-        additionalProperties: false
-      }
       // ---------------------------------------------
       // handle property signatures
       // ---------------------------------------------

package/src/Option.ts

@@ -2867,21 +2867,9 @@ export const partitionMap: {
   return either.isLeft(e) ? [some(e.left), none()] : [none(), some(e.right)]
 })
 
+// TODO(4.0): remove?
 /**
- * Maps over the value of an `Option` with a function that may return `None`,
- * effectively filtering and transforming the value.
- *
- * **Details**
- *
- * This function allows you to both transform the value of a `Some` and filter
- * it at the same time. The mapping function `f` can either return a new
- * `Option` (to transform the value) or return `None` to filter it out. If the
- * input `Option` is `None`, the function is not applied, and the result remains
- * `None`.
- *
- * This utility is particularly useful when you want to apply a transformation
- * to the value of an `Option` while conditionally removing invalid or unwanted
- * results.
+ * Alias of {@link flatMap}.
  *
  * @example
  * ```ts
@@ -2905,21 +2893,9 @@ export const partitionMap: {
  * @since 2.0.0
  */
 export const filterMap: {
+  // TODO(4.0): remove?
   /**
-   * Maps over the value of an `Option` with a function that may return `None`,
-   * effectively filtering and transforming the value.
-   *
-   * **Details**
-   *
-   * This function allows you to both transform the value of a `Some` and filter
-   * it at the same time. The mapping function `f` can either return a new
-   * `Option` (to transform the value) or return `None` to filter it out. If the
-   * input `Option` is `None`, the function is not applied, and the result remains
-   * `None`.
-   *
-   * This utility is particularly useful when you want to apply a transformation
-   * to the value of an `Option` while conditionally removing invalid or unwanted
-   * results.
+   * Alias of {@link flatMap}.
    *
    * @example
    * ```ts
@@ -2943,21 +2919,9 @@ export const filterMap: {
    * @since 2.0.0
    */
   <A, B>(f: (a: A) => Option<B>): (self: Option<A>) => Option<B>
+  // TODO(4.0): remove?
   /**
-   * Maps over the value of an `Option` with a function that may return `None`,
-   * effectively filtering and transforming the value.
-   *
-   * **Details**
-   *
-   * This function allows you to both transform the value of a `Some` and filter
-   * it at the same time. The mapping function `f` can either return a new
-   * `Option` (to transform the value) or return `None` to filter it out. If the
-   * input `Option` is `None`, the function is not applied, and the result remains
-   * `None`.
-   *
-   * This utility is particularly useful when you want to apply a transformation
-   * to the value of an `Option` while conditionally removing invalid or unwanted
-   * results.
+   * Alias of {@link flatMap}.
    *
    * @example
    * ```ts
@@ -2981,10 +2945,7 @@ export const filterMap: {
    * @since 2.0.0
    */
   <A, B>(self: Option<A>, f: (a: A) => Option<B>): Option<B>
-} = dual(
-  2,
-  <A, B>(self: Option<A>, f: (a: A) => Option<B>): Option<B> => isNone(self) ? none() : f(self.value)
-)
+} = flatMap
 
 /**
  * Filters an `Option` using a predicate. If the predicate is not satisfied or the `Option` is `None` returns `None`.

package/src/ParseResult.ts

@@ -1891,9 +1891,7 @@ const getMessage = (issue: ParseIssue): Effect.Effect<string | undefined> =>
 const getParseIssueTitleAnnotation = (issue: ParseIssue): string | undefined =>
   getAnnotated(issue).pipe(
     Option.flatMap(AST.getParseIssueTitleAnnotation),
-    Option.filterMap(
-      (annotation) => Option.fromNullable(annotation(issue))
-    ),
+    Option.flatMapNullable((annotation) => annotation(issue)),
     Option.getOrUndefined
   )