effect 4.0.0-beta.67 → 4.0.0-beta.69

package/dist/Stream.js

@@ -60,6 +60,7 @@ import * as MutableHashMap from "./MutableHashMap.js";
 import * as MutableList from "./MutableList.js";
 import * as Option from "./Option.js";
 import { hasProperty, isNotUndefined, isTagged } from "./Predicate.js";
+import * as PubSub from "./PubSub.js";
 import * as Pull from "./Pull.js";
 import * as Queue from "./Queue.js";
 import * as RcMap from "./RcMap.js";
@@ -98,8 +99,8 @@ export const TypeId = "~effect/Stream";
  * Effect.runPromise(program)
  * ```
  *
- * @category Guards
- * @since 2.0.0
+ * @category guards
+ * @since 4.0.0
  */
 export const isStream = u => hasProperty(u, TypeId);
 /**
@@ -140,7 +141,7 @@ export const DefaultChunkSize = Channel.DefaultChunkSize;
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromChannel = internal.fromChannel;
@@ -163,7 +164,7 @@ export const fromChannel = internal.fromChannel;
  * // Output: [ 42 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromEffect = effect => fromChannel(Channel.fromEffect(Effect.map(effect, Arr.of)));
@@ -173,7 +174,7 @@ export const fromEffect = effect => fromChannel(Channel.fromEffect(Effect.map(ef
  * **Example** (Accessing a service as a stream)
  *
  * ```ts
- * import { Effect, Context, Stream } from "effect"
+ * import { Context, Effect, Stream } from "effect"
  *
  * class Greeter extends Context.Service<Greeter, {
  *   readonly greet: (name: string) => string
@@ -207,7 +208,7 @@ export const service = service => fromEffect(Effect.service(service));
  * **Example** (Accessing an optional service as a stream)
  *
  * ```ts
- * import { Effect, Option, Context, Stream } from "effect"
+ * import { Context, Effect, Option, Stream } from "effect"
  *
  * class Greeter extends Context.Service<Greeter, {
  *   readonly greet: (name: string) => string
@@ -257,19 +258,13 @@ export const serviceOption = service => fromEffect(Effect.serviceOption(service)
  * // Output: Draining side effect
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromEffectDrain = effect => fromPull(Effect.succeed(Effect.flatMap(effect, () => Cause.done())));
 /**
  * Creates a stream from an effect producing a value of type `A` which repeats forever.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.repeatEffect`
- *
  * **Example** (Repeating an effect forever)
  *
  * ```ts
@@ -287,7 +282,7 @@ export const fromEffectDrain = effect => fromPull(Effect.succeed(Effect.flatMap(
  * // Output: [ 3891571149, 4239494205, 2352981603, 2339111046, 1488052210 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromEffectRepeat = effect => fromPull(Effect.succeed(Effect.map(effect, Arr.of)));
@@ -295,12 +290,6 @@ export const fromEffectRepeat = effect => fromPull(Effect.succeed(Effect.map(eff
  * Creates a stream from an effect producing a value of type `A`, which is
  * repeated using the specified schedule.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.repeatEffectWithSchedule`
- *
  * **Example** (Repeating an effect with a schedule)
  *
  * ```ts
@@ -319,8 +308,8 @@ export const fromEffectRepeat = effect => fromPull(Effect.succeed(Effect.map(eff
  * // Output: [ "ping", "ping", "ping" ]
  * ```
  *
- * @category Constructors
- * @since 2.0.0
+ * @category constructors
+ * @since 4.0.0
  */
 export const fromEffectSchedule = (effect, schedule) => fromPull(Effect.gen(function* () {
   const step = yield* Schedule.toStepWithMetadata(schedule);
@@ -359,7 +348,7 @@ export const fromEffectSchedule = (effect, schedule) => fromPull(Effect.gen(func
  * // Output: [ undefined, undefined, undefined ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const tick = interval => fromPull(Effect.sync(() => {
@@ -399,7 +388,7 @@ export const tick = interval => fromPull(Effect.sync(() => {
  * // Output: [1, 2, 3]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromPull = pull => fromChannel(Channel.fromPull(pull));
@@ -424,7 +413,7 @@ export const fromPull = pull => fromChannel(Channel.fromPull(pull));
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const transformPull = (self, f) => fromChannel(Channel.fromTransform((_, scope) => Effect.flatMap(Channel.toPullScoped(self.channel, scope), pull => f(pull, scope))));
@@ -460,7 +449,7 @@ export const transformPull = (self, f) => fromChannel(Channel.fromTransform((_,
  * // Releasing scope
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const transformPullBracket = (self, f) => fromChannel(Channel.fromTransformBracket((_, scope, forkedScope) => Effect.flatMap(Channel.toPullScoped(self.channel, scope), pull => f(pull, scope, forkedScope))));
@@ -483,7 +472,7 @@ export const transformPullBracket = (self, f) => fromChannel(Channel.fromTransfo
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const toChannel = stream => stream.channel;
@@ -497,15 +486,6 @@ export const toChannel = stream => stream.channel;
  * You can customize the buffer size and strategy by passing an object as the
  * second argument with the `bufferSize` and `strategy` fields.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.async`
- * - `Stream.asyncEffect`
- * - `Stream.asyncPush`
- * - `Stream.asyncScoped`
- *
  * **Example** (Creating a stream from a callback that can emit values into a queue)
  *
  * ```ts
@@ -531,8 +511,8 @@ export const toChannel = stream => stream.channel;
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
- * @since 2.0.0
+ * @category constructors
+ * @since 4.0.0
  */
 export const callback = (f, options) => fromChannel(Channel.callbackArray(f, options));
 /**
@@ -552,8 +532,8 @@ export const callback = (f, options) => fromChannel(Channel.callbackArray(f, opt
  * // []
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const empty = /*#__PURE__*/fromChannel(Channel.empty);
 /**
@@ -573,7 +553,7 @@ export const empty = /*#__PURE__*/fromChannel(Channel.empty);
  * // [ 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const succeed = value => fromChannel(Channel.succeed(Arr.of(value)));
@@ -595,7 +575,7 @@ export const succeed = value => fromChannel(Channel.succeed(Arr.of(value)));
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const make = (...values) => fromArray(values);
@@ -618,7 +598,7 @@ export const make = (...values) => fromArray(values);
  * // Output: [ 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const sync = evaluate => fromChannel(Channel.sync(() => Arr.of(evaluate())));
@@ -641,7 +621,7 @@ export const sync = evaluate => fromChannel(Channel.sync(() => Arr.of(evaluate()
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const suspend = stream => fromChannel(Channel.suspend(() => stream().channel));
@@ -663,7 +643,7 @@ export const suspend = stream => fromChannel(Channel.suspend(() => stream().chan
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fail = error => fromChannel(Channel.fail(error));
@@ -687,7 +667,7 @@ export const fail = error => fromChannel(Channel.fail(error));
  * // { _id: 'Exit', _tag: 'Failure', cause: { _id: 'Cause', _tag: 'Fail', failure: 'Uh oh!' } }
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const failSync = evaluate => fromChannel(Channel.failSync(evaluate));
@@ -712,7 +692,7 @@ export const failSync = evaluate => fromChannel(Channel.failSync(evaluate));
  * Effect.runPromise(program)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const failCause = cause => fromChannel(Channel.failCause(cause));
@@ -744,7 +724,7 @@ export const failCause = cause => fromChannel(Channel.failCause(cause));
  * // Output: Exit.Failure(Error: Boom)
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const die = defect => fromChannel(Channel.die(defect));
@@ -770,7 +750,7 @@ export const die = defect => fromChannel(Channel.die(defect));
  * // { _id: 'Exit', _tag: 'Failure', cause: { _id: 'Cause', _tag: 'Fail', failure: 'Connection timeout after retries' } }
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const failCauseSync = evaluate => fromChannel(Channel.failCauseSync(evaluate));
@@ -801,7 +781,7 @@ export const failCauseSync = evaluate => fromChannel(Channel.failCauseSync(evalu
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromIteratorSucceed = (iterator, maxChunkSize) => fromChannel(Channel.fromIteratorArray(() => iterator, maxChunkSize));
@@ -829,7 +809,7 @@ export const fromIteratorSucceed = (iterator, maxChunkSize) => fromChannel(Chann
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromIterable = (iterable, options) => Array.isArray(iterable) && options?.chunkSize === undefined ? fromArray(iterable) : fromChannel(Channel.fromIterableArray(iterable, options?.chunkSize));
@@ -839,7 +819,7 @@ export const fromIterable = (iterable, options) => Array.isArray(iterable) && op
  * **Example** (Creating a stream from an iterable effect)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class UserRepo extends Context.Service<UserRepo, {
  *   readonly list: Effect.Effect<ReadonlyArray<string>>
@@ -865,19 +845,13 @@ export const fromIterable = (iterable, options) => Array.isArray(iterable) && op
  * // Output: [ "user1", "user2" ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromIterableEffect = iterable => unwrap(Effect.map(iterable, fromIterable));
 /**
  * Creates a stream by repeatedly running an effect that yields an iterable of values.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.repeatEffectChunk`
- *
  * **Example** (Repeating an iterable effect)
  *
  * ```ts
@@ -895,19 +869,13 @@ export const fromIterableEffect = iterable => unwrap(Effect.map(iterable, fromIt
  * // Output: [ 1, 2, 1, 2, 1 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromIterableEffectRepeat = iterable => flatMap(fromEffectRepeat(iterable), fromIterable);
 /**
  * Creates a stream from an array of values.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.fromChunk`
- *
  * **Example** (Creating a stream from an array of values)
  *
  * ```ts
@@ -923,7 +891,7 @@ export const fromIterableEffectRepeat = iterable => flatMap(fromEffectRepeat(ite
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromArray = array => Arr.isReadonlyArrayNonEmpty(array) ? fromChannel(Channel.succeed(array)) : empty;
@@ -945,19 +913,13 @@ export const fromArray = array => Arr.isReadonlyArrayNonEmpty(array) ? fromChann
  * // Output: [ "Ada", "Grace" ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromArrayEffect = effect => unwrap(Effect.map(effect, fromArray));
 /**
  * Creates a stream from an arbitrary number of arrays.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.fromChunks`
- *
  * **Example** (Creating a stream from an arbitrary number of arrays)
  *
  * ```ts
@@ -973,7 +935,7 @@ export const fromArrayEffect = effect => unwrap(Effect.map(effect, fromArray));
  * // Output: [ 1, 2, 3, 4 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromArrays = (...arrays) => fromChannel(Channel.fromArray(Arr.filter(arrays, Arr.isReadonlyArrayNonEmpty)));
@@ -1004,8 +966,8 @@ export const fromArrays = (...arrays) => fromChannel(Channel.fromArray(Arr.filte
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const fromQueue = queue => fromChannel(Channel.fromQueueArray(queue));
 /**
@@ -1037,8 +999,8 @@ export const fromQueue = queue => fromChannel(Channel.fromQueueArray(queue));
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const fromPubSub = pubsub => fromChannel(Channel.fromPubSubArray(pubsub));
 /**
@@ -1068,7 +1030,7 @@ export const fromPubSub = pubsub => fromChannel(Channel.fromPubSubArray(pubsub))
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromPubSubTake = pubsub => fromChannel(Channel.fromPubSubTake(pubsub));
@@ -1108,7 +1070,7 @@ export const fromPubSubTake = pubsub => fromChannel(Channel.fromPubSubTake(pubsu
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromReadableStream = options => fromChannel(Channel.fromTransform(Effect.fnUntraced(function* (_, scope) {
@@ -1147,7 +1109,7 @@ export const fromReadableStream = options => fromChannel(Channel.fromTransform(E
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromAsyncIterable = (iterable, onError) => fromChannel(Channel.fromAsyncIterableArray(iterable, onError));
@@ -1173,7 +1135,7 @@ export const fromAsyncIterable = (iterable, onError) => fromChannel(Channel.from
  * // Output: [ 0, 1, 2 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const fromSchedule = schedule => fromPull(Effect.map(Schedule.toStepWithSleep(schedule), step => Pull.catchDone(Effect.map(step(void 0), Arr.of), () => Cause.done())));
@@ -1204,7 +1166,7 @@ export const fromSchedule = schedule => fromPull(Effect.map(Schedule.toStepWithS
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 4.0.0
  */
 export const fromSubscription = pubsub => fromChannel(Channel.fromSubscriptionArray(pubsub));
@@ -1238,7 +1200,7 @@ export const fromSubscription = pubsub => fromChannel(Channel.fromSubscriptionAr
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 3.1.0
  */
 export const fromEventListener = (target, type, options) => callback(queue => {
@@ -1271,7 +1233,7 @@ export const fromEventListener = (target, type, options) => callback(queue => {
  * // Output: [ 1, 2, 3, 4, 5 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const unfold = (s, f) => fromPull(Effect.sync(() => {
@@ -1290,8 +1252,7 @@ export const unfold = (s, f) => fromPull(Effect.sync(() => {
  * **Example** (Paginating stream state)
  *
  * ```ts
- * import { Console, Effect, Stream } from "effect"
- * import * as Option from "effect/Option"
+ * import { Console, Effect, Option, Stream } from "effect"
  *
  * const stream = Stream.paginate(0, (n: number) =>
  *   Effect.succeed(
@@ -1305,7 +1266,7 @@ export const unfold = (s, f) => fromPull(Effect.sync(() => {
  * // Output: [ 0, 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const paginate = (s, f) => fromPull(Effect.sync(() => {
@@ -1343,7 +1304,7 @@ export const paginate = (s, f) => fromPull(Effect.sync(() => {
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const iterate = (value, next) => unfold(value, a => Effect.succeed([a, next(a)]));
@@ -1366,8 +1327,8 @@ export const iterate = (value, next) => unfold(value, a => Effect.succeed([a, ne
  * Effect.runPromise(program)
  * // Output: [ 1, 2, 3, 4, 5 ]
  * ```
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const range = (min, max, chunkSize = Channel.DefaultChunkSize) => min > max ? empty : fromPull(Effect.sync(() => {
   let start = min;
@@ -1402,8 +1363,8 @@ export const range = (min, max, chunkSize = Channel.DefaultChunkSize) => min > m
  * // []
  * ```
  *
- * @category Constructors
- * @since 4.0.0
+ * @category constructors
+ * @since 2.0.0
  */
 export const never = /*#__PURE__*/fromChannel(Channel.never);
 /**
@@ -1425,7 +1386,7 @@ export const never = /*#__PURE__*/fromChannel(Channel.never);
  * // [1, 2, 3]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const unwrap = effect => fromChannel(Channel.unwrap(Effect.map(effect, toChannel)));
@@ -1453,7 +1414,7 @@ export const unwrap = effect => fromChannel(Channel.unwrap(Effect.map(effect, to
  * // [ "resource" ]
  * ```
  *
- * @category Constructors
+ * @category constructors
  * @since 2.0.0
  */
 export const scoped = self => fromChannel(Channel.scoped(self.channel));
@@ -1474,7 +1435,7 @@ export const scoped = self => fromChannel(Channel.scoped(self.channel));
  * // [ 1, 3, 5 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const map = /*#__PURE__*/dual(2, (self, f) => suspend(() => {
@@ -1514,19 +1475,13 @@ export const map = /*#__PURE__*/dual(2, (self, f) => suspend(() => {
  * // Output: [ "error: boom" ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapBoth = /*#__PURE__*/dual(2, (self, options) => self.pipe(map(options.onSuccess), mapError(options.onFailure)));
 /**
  * Transforms each emitted chunk using the provided function, which receives the chunk and its index.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.mapChunks`
- *
  * **Example** (Mapping stream chunks)
  *
  * ```ts
@@ -1545,8 +1500,8 @@ export const mapBoth = /*#__PURE__*/dual(2, (self, options) => self.pipe(map(opt
  * // Output: [ 1, 2, 4, 5 ]
  * ```
  *
- * @category Mapping
- * @since 2.0.0
+ * @category mapping
+ * @since 4.0.0
  */
 export const mapArray = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.map(self.channel, f)));
 /**
@@ -1581,7 +1536,7 @@ export const mapArray = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.ma
  * // [2, 4, 6]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, f, options) => self.channel.pipe(Channel.flattenArray, Channel.mapEffect(f, options), Channel.map(Arr.of), fromChannel));
@@ -1604,19 +1559,13 @@ export const mapEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, f,
  * // Output: [1, 2, 3]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const flattenEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, options) => mapEffect(self, identity, options));
 /**
  * Effectfully maps over non-empty array chunks emitted by the stream.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.mapChunksEffect`
- *
  * **Example** (Effectfully mapping stream chunks)
  *
  * ```ts
@@ -1637,7 +1586,7 @@ export const flattenEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self,
  * // Output: [1, 2, 13, 14]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 4.0.0
  */
 export const mapArrayEffect = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.mapEffect(self.channel, f)));
@@ -1646,12 +1595,6 @@ export const mapArrayEffect = /*#__PURE__*/dual(2, (self, f) => fromChannel(Chan
  *
  * The stream ends after the first failure, emitting a `Result.fail` value.
  *
- * **Previously Known As:**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.either`
- *
  * **Example** (Converting failures to results)
  *
  * ```ts
@@ -1674,7 +1617,7 @@ export const mapArrayEffect = /*#__PURE__*/dual(2, (self, f) => fromChannel(Chan
  * // Output: [ "success: 1", "success: 2", "failure: boom" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const result = self => self.pipe(map(Result.succeed), catch_(e => succeed(Result.fail(e))));
@@ -1708,7 +1651,7 @@ export const result = self => self.pipe(map(Result.succeed), catch_(e => succeed
  * // [ 2, 4, 6 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tap = /*#__PURE__*/dual(args => isStream(args[0]), (self, f, options) => mapEffect(self, a => Effect.as(f(a), a), options));
@@ -1741,7 +1684,7 @@ export const tap = /*#__PURE__*/dual(args => isStream(args[0]), (self, f, option
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tapBoth = /*#__PURE__*/dual(2, (self, options) => self.pipe(tapError(options.onError), tap(options.onElement, {
@@ -1775,7 +1718,7 @@ export const tapBoth = /*#__PURE__*/dual(2, (self, options) => self.pipe(tapErro
  * // Output: [1, 2, 3]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const tapSink = /*#__PURE__*/dual(2, (self, sink) => transformPullBracket(self, Effect.fnUntraced(function* (pull, _, scope) {
@@ -1846,7 +1789,7 @@ export const tapSink = /*#__PURE__*/dual(2, (self, sink) => transformPullBracket
  * // Output: [ 1, 2, 2, 4, 3, 6 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const flatMap = /*#__PURE__*/dual(args => isStream(args[0]), (self, f, options) => self.channel.pipe(Channel.flattenArray, Channel.flatMap(a => f(a).channel, options), fromChannel));
@@ -1871,7 +1814,7 @@ export const flatMap = /*#__PURE__*/dual(args => isStream(args[0]), (self, f, op
  * })
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const switchMap = /*#__PURE__*/dual(args => isStream(args[0]), (self, f, options) => self.channel.pipe(Channel.flattenArray, Channel.switchMap(a => f(a).channel, options), fromChannel));
@@ -1903,19 +1846,13 @@ export const switchMap = /*#__PURE__*/dual(args => isStream(args[0]), (self, f,
  * // Output: [ 1, 2, 3, 4, 5, 6 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const flatten = /*#__PURE__*/dual(args => isStream(args[0]), (self, options) => flatMap(self, identity, options));
 /**
  * Flattens a stream of non-empty arrays into a stream of elements.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.flattenChunks`
- *
  * **Example** (Flattening a stream of non-empty arrays into a stream of elements)
  *
  * ```ts
@@ -1932,7 +1869,7 @@ export const flatten = /*#__PURE__*/dual(args => isStream(args[0]), (self, optio
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const flattenArray = self => fromChannel(Channel.flattenArray(self.channel));
@@ -1953,7 +1890,7 @@ export const flattenArray = self => fromChannel(Channel.flattenArray(self.channe
  * // Output: []
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const drain = self => fromChannel(Channel.drain(self.channel));
@@ -1982,7 +1919,7 @@ export const drain = self => fromChannel(Channel.drain(self.channel));
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const drainFork = /*#__PURE__*/dual(2, (self, that) => mergeEffect(self, runDrain(that)));
@@ -2007,7 +1944,7 @@ export const drainFork = /*#__PURE__*/dual(2, (self, that) => mergeEffect(self,
  * // Output: [ 1, 1, 1, 1, 1 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const repeat = /*#__PURE__*/dual(2, (self, schedule) => fromChannel(Channel.repeat(self.channel, schedule)));
@@ -2073,7 +2010,7 @@ export const timeout = /*#__PURE__*/dual(2, (self, duration) => timeoutOrElse(se
  * unchanged.
  *
  * @category Rate Limiting
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const timeoutOrElse = /*#__PURE__*/dual(2, (self, options) => {
   const duration = Duration.fromInputUnsafe(options.duration);
@@ -2117,8 +2054,6 @@ export const timeoutOrElse = /*#__PURE__*/dual(2, (self, options) => {
  * Repeats each element of the stream according to the provided schedule,
  * including the original emission.
  *
- * @category Sequencing
- * @since 2.0.0
  * **Example** (Repeating stream elements)
  *
  * ```ts
@@ -2135,6 +2070,9 @@ export const timeoutOrElse = /*#__PURE__*/dual(2, (self, options) => {
  * Effect.runPromise(program)
  * // Output: [ "A", "A", "B", "B", "C", "C" ]
  * ```
+ *
+ * @category sequencing
+ * @since 2.0.0
  */
 export const repeatElements = /*#__PURE__*/dual(2, (self, schedule) => fromChannel(Channel.fromTransform((upstream, scope) => Effect.map(Channel.toTransform(Channel.flattenArray(self.channel))(upstream, scope), pullElement => {
   let pullRepeat = undefined;
@@ -2172,19 +2110,13 @@ export const repeatElements = /*#__PURE__*/dual(2, (self, schedule) => fromChann
  * // Output: [ "A", "B", "A", "B", "A" ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const forever = self => fromChannel(Channel.forever(self.channel));
 /**
  * Submerges the iterables emitted by this stream into the stream's structure.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.flattenIterables`
- *
  * **Example** (Flattening iterable values)
  *
  * ```ts
@@ -2200,7 +2132,7 @@ export const forever = self => fromChannel(Channel.forever(self.channel));
  * // Output: [ 1, 2, 3, 4 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 4.0.0
  */
 export const flattenIterable = self => flatMap(self, fromIterable);
@@ -2228,8 +2160,8 @@ export const flattenIterable = self => flatMap(self, fromIterable);
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Sequencing
- * @since 4.0.0
+ * @category sequencing
+ * @since 2.0.0
  */
 export const flattenTake = self => self.channel.pipe(Channel.flattenArray, Channel.flattenTake, fromChannel);
 /**
@@ -2250,7 +2182,7 @@ export const flattenTake = self => self.channel.pipe(Channel.flattenArray, Chann
  * // Output: [ 1, 2, 3, 4, 5, 6 ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const concat = /*#__PURE__*/dual(2, (self, that) => flatten(fromArray([self, that])));
@@ -2275,7 +2207,7 @@ export const concat = /*#__PURE__*/dual(2, (self, that) => flatten(fromArray([se
  * Effect.runPromise(program)
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const prepend = /*#__PURE__*/dual(2, (self, values) => concat(fromIterable(values), self));
@@ -2312,8 +2244,6 @@ export const merge = /*#__PURE__*/dual(args => isStream(args[0]) && isStream(arg
  * The effect runs concurrently, fails the stream if it fails, and is interrupted
  * when the stream completes.
  *
- * @category Merging
- * @since 4.0.0
  * **Example** (Merging with a background effect)
  *
  * ```ts
@@ -2332,18 +2262,15 @@ export const merge = /*#__PURE__*/dual(args => isStream(args[0]) && isStream(arg
  * // Output: side task
  * // Output: [ 1, 2, 3 ]
  * ```
+ *
+ * @category Merging
+ * @since 4.0.0
  */
 export const mergeEffect = /*#__PURE__*/dual(2, (self, effect) => self.channel.pipe(Channel.mergeEffect(effect), fromChannel));
 /**
  * Merges this stream and the specified stream together, tagging values from the
  * left stream as `Result.succeed` and values from the right stream as `Result.fail`.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.mergeEither`
- *
  * **Example** (Merging streams into results)
  *
  * ```ts
@@ -2372,7 +2299,7 @@ export const mergeEffect = /*#__PURE__*/dual(2, (self, effect) => self.channel.p
  * ```
  *
  * @category Merging
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const mergeResult = /*#__PURE__*/dual(2, (self, that) => merge(map(self, Result.succeed), map(that, Result.fail)));
 /**
@@ -2484,7 +2411,7 @@ export const mergeAll = /*#__PURE__*/dual(2, (streams, options) => flatten(fromI
  * // Output: [ [ 1, "a" ], [ 1, "b" ], [ 2, "a" ], [ 2, "b" ] ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const cross = /*#__PURE__*/dual(2, (left, right) => crossWith(left, right, (l, r) => [l, r]));
@@ -2512,7 +2439,7 @@ export const cross = /*#__PURE__*/dual(2, (left, right) => crossWith(left, right
  * // Output: [ "1-a", "1-b", "2-a", "2-b" ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const crossWith = /*#__PURE__*/dual(3, (left, right, f) => flatMap(left, l => map(right, r => f(l, r))));
@@ -2538,7 +2465,7 @@ export const crossWith = /*#__PURE__*/dual(3, (left, right, f) => flatMap(left,
  * // Output: [ "1-a", "2-b", "3-c" ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWith = /*#__PURE__*/dual(3, (left, right, f) => zipWithArray(left, right, zipArrays(f)));
@@ -2555,12 +2482,6 @@ const zipArrays = f => (leftArr, rightArr) => {
  *
  * The function returns output plus leftover arrays that carry into the next pull.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.zipWithChunks`
- *
  * **Example** (Zipping stream chunks)
  *
  * ```ts
@@ -2585,8 +2506,8 @@ const zipArrays = f => (leftArr, rightArr) => {
  * // Output: [[1, "a"], [2, "b"], [3, "c"], [4, "d"], [5, "e"]]
  * ```
  *
- * @category Zipping
- * @since 2.0.0
+ * @category zipping
+ * @since 4.0.0
  */
 export const zipWithArray = /*#__PURE__*/dual(3, (left, right, f) => fromChannel(Channel.fromTransformBracket(Effect.fnUntraced(function* (_, scope) {
   const pullLeft = yield* Channel.toPullScoped(left.channel, scope);
@@ -2644,7 +2565,7 @@ export const zipWithArray = /*#__PURE__*/dual(3, (left, right, f) => fromChannel
  * // Output: [[1, "a"], [2, "b"], [3, "c"]]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zip = /*#__PURE__*/dual(2, (self, that) => zipWith(self, that, (a, a2) => [a, a2]));
@@ -2671,7 +2592,7 @@ export const zip = /*#__PURE__*/dual(2, (self, that) => zipWith(self, that, (a,
  * // Output: [1, 2]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipLeft = /*#__PURE__*/dual(2, (left, right) => zipWithArray(left, right, (leftArr, rightArr) => {
@@ -2701,7 +2622,7 @@ export const zipLeft = /*#__PURE__*/dual(2, (left, right) => zipWithArray(left,
  * // Output: ["a", "b"]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipRight = /*#__PURE__*/dual(2, (left, right) => zipWithArray(left, right, (leftArr, rightArr) => {
@@ -2738,7 +2659,7 @@ export const zipRight = /*#__PURE__*/dual(2, (left, right) => zipWithArray(left,
  * // Output: [[1, "a", "x"], [2, "b", "y"], [3, "c", "z"]]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipFlatten = /*#__PURE__*/dual(2, (self, that) => zipWith(self, that, (a, a2) => [...a, a2]));
@@ -2762,7 +2683,7 @@ export const zipFlatten = /*#__PURE__*/dual(2, (self, that) => zipWith(self, tha
  * // Output: [["a", 0], ["b", 1], ["c", 2], ["d", 3]]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithIndex = self => map(self, (a, i) => [a, i]);
@@ -2789,7 +2710,7 @@ export const zipWithIndex = self => map(self, (a, i) => [a, i]);
  * // ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithNext = self => mapAccumArray(self, Option.none, (acc, arr) => {
@@ -2834,7 +2755,7 @@ export const zipWithNext = self => mapAccumArray(self, Option.none, (acc, arr) =
  * // ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithPrevious = self => mapAccumArray(self, Option.none, (acc, arr) => {
@@ -2866,7 +2787,7 @@ export const zipWithPrevious = self => mapAccumArray(self, Option.none, (acc, ar
  * // Output: [ [Option.none(), 1, Option.some(2)], [Option.some(1), 2, Option.some(3)], [Option.some(2), 3, Option.none()] ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipWithPreviousAndNext = self => mapAccumArray(self, () => ({
@@ -2924,8 +2845,8 @@ export const zipWithPreviousAndNext = self => mapAccumArray(self, () => ({
  * // Output: [ [ 1, "a", true ], [ 2, "a", true ], [ 3, "a", true ], [ 3, "b", true ], [ 3, "c", true ], [ 3, "c", false ], [ 3, "c", true ] ]
  * ```
  *
- * @category Zipping
- * @since 2.0.0
+ * @category zipping
+ * @since 3.3.0
  */
 export const zipLatestAll = (...streams) => fromChannel(Channel.suspend(() => {
   const latest = [];
@@ -2969,7 +2890,7 @@ export const zipLatestAll = (...streams) => fromChannel(Channel.suspend(() => {
  * // Output: [ [1, "a"] ]
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipLatest = /*#__PURE__*/dual(2, (left, right) => zipLatestAll(left, right));
@@ -3001,7 +2922,7 @@ export const zipLatest = /*#__PURE__*/dual(2, (left, right) => zipLatestAll(left
  * })
  * ```
  *
- * @category Zipping
+ * @category zipping
  * @since 2.0.0
  */
 export const zipLatestWith = /*#__PURE__*/dual(3, (left, right, f) => map(zipLatestAll(left, right), ([a, a2]) => f(a, a2)));
@@ -3014,7 +2935,7 @@ export const zipLatestWith = /*#__PURE__*/dual(3, (left, right, f) => map(zipLat
  * winner is chosen, that stream's later failures are propagated.
  *
  * @category Racing
- * @since 3.7.0
+ * @since 3.5.0
  *
  * **Example** (Racing multiple streams)
  *
@@ -3101,15 +3022,15 @@ export const race = /*#__PURE__*/dual(2, (left, right) => raceAll(left, right));
  * // Output: [ 2, 4 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const filter = /*#__PURE__*/dual(2, (self, predicate) => fromChannel(Channel.filterArray(toChannel(self), predicate)));
 /**
  * Filters and maps stream elements in one pass using a `Filter`.
  *
- * @category Filtering
- * @since 4.0.0
+ * @category filtering
+ * @since 2.0.0
  */
 export const filterMap = /*#__PURE__*/dual(2, (self, filter) => fromChannel(Channel.filterMapArray(toChannel(self), filter)));
 /**
@@ -3131,15 +3052,15 @@ export const filterMap = /*#__PURE__*/dual(2, (self, filter) => fromChannel(Chan
  * // Output: [ 3, 4 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const filterEffect = /*#__PURE__*/dual(2, (self, predicate) => fromChannel(Channel.filterArrayEffect(toChannel(self), predicate)));
 /**
  * Effectfully filters and maps elements in a single pass.
  *
- * @category Filtering
- * @since 4.0.0
+ * @category filtering
+ * @since 2.0.0
  */
 export const filterMapEffect = /*#__PURE__*/dual(2, (self, filter) => fromChannel(Channel.filterMapArrayEffect(toChannel(self), filter)));
 /**
@@ -3172,7 +3093,7 @@ export const filterMapEffect = /*#__PURE__*/dual(2, (self, filter) => fromChanne
  * Effect.runPromise(Effect.scoped(program))
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const partitionQueue = /*#__PURE__*/dual(args => isStream(args[0]), /*#__PURE__*/Effect.fnUntraced(function* (self, filter, options) {
@@ -3228,7 +3149,7 @@ export const partitionQueue = /*#__PURE__*/dual(args => isStream(args[0]), /*#__
  * consumed while that scope remains open. The first stream emits success values
  * from the filter, and the second emits failure values.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const partitionEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, filter, options) => Effect.map(partitionQueue(mapEffect(self, a => filter(a), options), result => result, options), ([passes, fails]) => [fromQueue(passes), fromQueue(fails)]));
@@ -3240,8 +3161,8 @@ export const partitionEffect = /*#__PURE__*/dual(args => isStream(args[0]), (sel
  * consumed while that scope remains open. The faster stream may advance up to
  * `bufferSize` elements ahead of the slower one.
  *
- * @category Filtering
- * @since 4.0.0
+ * @category filtering
+ * @since 2.0.0
  *
  * **Example** (Partitioning a stream)
  *
@@ -3285,7 +3206,7 @@ export const partition = /*#__PURE__*/dual(args => isStream(args[0]), (self, fil
  * // Output: []
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const when = /*#__PURE__*/dual(2, (self, test) => test.pipe(Effect.map(pass => pass ? self : empty), unwrap));
@@ -3315,7 +3236,7 @@ export const when = /*#__PURE__*/dual(2, (self, test) => test.pipe(Effect.map(pa
  * // Output: [ [1, 2, 3], [4, 5, 6] ]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const peel = /*#__PURE__*/dual(2, /*#__PURE__*/Effect.fnUntraced(function* (self, sink) {
@@ -3370,12 +3291,6 @@ export const buffer = /*#__PURE__*/dual(2, (self, options) => fromChannel(Channe
  * buffer is full. This combinator preserves chunking and is best with
  * power-of-2 capacities.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.bufferChunks`
- *
  * **Example** (Buffering stream chunks)
  *
  * ```ts
@@ -3393,7 +3308,7 @@ export const buffer = /*#__PURE__*/dual(2, (self, options) => fromChannel(Channe
  * ```
  *
  * @category Rate Limiting
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const bufferArray = /*#__PURE__*/dual(2, (self, options) => fromChannel(Channel.buffer(self.channel, options)));
 /**
@@ -3401,12 +3316,6 @@ export const bufferArray = /*#__PURE__*/dual(2, (self, options) => fromChannel(C
  * one fails. Allows recovery from all causes of failure, including
  * interruption if the stream is uninterruptible.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.catchAllCause`
- *
  * **Example** (Catching stream causes)
  *
  * ```ts
@@ -3430,20 +3339,14 @@ export const bufferArray = /*#__PURE__*/dual(2, (self, options) => fromChannel(C
  * // Output: [ 1, 2, 999 ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const catchCause = /*#__PURE__*/dual(2, (self, f) => self.channel.pipe(Channel.catchCause(cause => f(cause).channel), fromChannel));
 /**
  * Runs an effect when the stream fails without changing its values or error,
  * unless the tap effect itself fails.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.tapErrorCause`
- *
  * **Example** (Tapping stream causes)
  *
  * ```ts
@@ -3465,8 +3368,8 @@ export const catchCause = /*#__PURE__*/dual(2, (self, f) => self.channel.pipe(Ch
  * // Output: [ 1, 2, 0 ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const tapCause = /*#__PURE__*/dual(2, (self, f) => self.channel.pipe(Channel.tapCause(f), fromChannel));
 const catch_ = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.catch(self.channel, error => f(error).channel)));
@@ -3474,12 +3377,6 @@ export {
 /**
  * Switches over to the stream produced by the provided function if this one fails.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.catchAll`
- *
  * **Example** (Catching stream failures)
  *
  * ```ts
@@ -3499,7 +3396,7 @@ export {
  * // Output: [ 1, 2, 999 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 catch_ as catch };
@@ -3528,8 +3425,8 @@ catch_ as catch };
  * // [ 1, 2, 999 ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const tapError = /*#__PURE__*/dual(2, (self, f) => self.channel.pipe(Channel.tapError(f), fromChannel));
 /**
@@ -3539,12 +3436,6 @@ export const tapError = /*#__PURE__*/dual(2, (self, f) => self.channel.pipe(Chan
  * stream. Non-matching failures propagate downstream, so the error type is
  * preserved unless the filter narrows it.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.catchSome`
- *
  * **Example** (Catching matching failures)
  *
  * ```ts
@@ -3567,7 +3458,7 @@ export const tapError = /*#__PURE__*/dual(2, (self, f) => self.channel.pipe(Chan
  * Effect.runPromise(program)
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchIf = /*#__PURE__*/dual(args => isStream(args[0]), (self, predicate, f, orElse) => fromChannel(Channel.catchIf(toChannel(self), predicate, e => f(e).channel, orElse && (e => orElse(e).channel))));
@@ -3575,7 +3466,7 @@ export const catchIf = /*#__PURE__*/dual(args => isStream(args[0]), (self, predi
  * Recovers from errors that match a `Filter` by switching to a recovery
  * stream.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchFilter = /*#__PURE__*/dual(args => isStream(args[0]), (self, filter, f, orElse) => fromChannel(Channel.catchFilter(toChannel(self), filter, e => f(e).channel, orElse && (e => orElse(e).channel))));
@@ -3610,8 +3501,8 @@ export const catchFilter = /*#__PURE__*/dual(args => isStream(args[0]), (self, f
  * Effect.runPromise(program)
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const catchTag = /*#__PURE__*/dual(args => isStream(args[0]), (self, k, f, orElse) => {
   const pred = Array.isArray(k) ? e => hasProperty(e, "_tag") && k.includes(e._tag) : isTagged(k);
@@ -3651,8 +3542,8 @@ export const catchTag = /*#__PURE__*/dual(args => isStream(args[0]), (self, k, f
  * // Output: [ "fallback" ]
  * ```
  *
- * @category Error Handling
- * @since 4.0.0
+ * @category error handling
+ * @since 2.0.0
  */
 export const catchTags = /*#__PURE__*/dual(args => isStream(args[0]), (self, cases, orElse) => {
   let keys;
@@ -3702,7 +3593,7 @@ export const catchTags = /*#__PURE__*/dual(args => isStream(args[0]), (self, cas
  * // Output: [ "retry: 60" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchReason = /*#__PURE__*/dual(args => isStream(args[0]), (self, errorTag, reasonTag, f, orElse) => fromChannel(Channel.catchReason(toChannel(self), errorTag, reasonTag, (reason, error) => f(reason, error).channel, orElse && ((reason, error) => orElse(reason, error).channel))));
@@ -3745,7 +3636,7 @@ export const catchReason = /*#__PURE__*/dual(args => isStream(args[0]), (self, e
  * // Output: [ "retry: 60" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchReasons = /*#__PURE__*/dual(args => isStream(args[0]), (self, errorTag, cases, orElse) => {
@@ -3778,7 +3669,7 @@ export const catchReasons = /*#__PURE__*/dual(args => isStream(args[0]), (self,
  * // Output: [ "recovered from mapped: bad" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const mapError = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.mapError(self.channel, f)));
@@ -3786,12 +3677,6 @@ export const mapError = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.ma
  * Recovers from stream failures by filtering the `Cause` and switching to a recovery stream.
  * Non-matching causes are re-emitted as failures.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.catchSomeCause`
- *
  * **Example** (Catching matching causes)
  *
  * ```ts
@@ -3813,7 +3698,7 @@ export const mapError = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.ma
  * // Output: [ "Recovered: NetworkError" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchCauseIf = /*#__PURE__*/dual(3, (self, predicate, f) => fromChannel(Channel.catchCauseIf(self.channel, predicate, cause => f(cause).channel)));
@@ -3821,7 +3706,7 @@ export const catchCauseIf = /*#__PURE__*/dual(3, (self, predicate, f) => fromCha
  * Recovers from stream failures by filtering the `Cause` and switching to a
  * recovery stream.
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const catchCauseFilter = /*#__PURE__*/dual(3, (self, filter, f) => fromChannel(Channel.catchCauseFilter(self.channel, filter, (failure, cause) => f(failure, cause).channel)));
@@ -3845,7 +3730,7 @@ export const catchCauseFilter = /*#__PURE__*/dual(3, (self, filter, f) => fromCh
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const orElseIfEmpty = /*#__PURE__*/dual(2, (self, orElse) => fromChannel(Channel.orElseIfEmpty(self.channel, _ => toChannel(orElse()))));
@@ -3870,7 +3755,7 @@ export const orElseIfEmpty = /*#__PURE__*/dual(2, (self, orElse) => fromChannel(
  * // Output: [ "Recovered: NetworkError" ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const orElseSucceed = /*#__PURE__*/dual(2, (self, f) => catch_(self, e => succeed(f(e))));
@@ -3895,7 +3780,7 @@ export const orElseSucceed = /*#__PURE__*/dual(2, (self, f) => catch_(self, e =>
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const orDie = self => fromChannel(Channel.orDie(self.channel));
@@ -3938,7 +3823,7 @@ export const orDie = self => fromChannel(Channel.orDie(self.channel));
  * // []
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const ignore = /*#__PURE__*/dual(args => isStream(args[0]), (self, options) => fromChannel(Channel.ignore(self.channel, options)));
@@ -3964,7 +3849,7 @@ export const ignore = /*#__PURE__*/dual(args => isStream(args[0]), (self, option
  * // [ 1, 2 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 4.0.0
  */
 export const ignoreCause = /*#__PURE__*/dual(args => isStream(args[0]), (self, options) => fromChannel(Channel.ignoreCause(self.channel, options)));
@@ -3997,7 +3882,7 @@ export const ignoreCause = /*#__PURE__*/dual(args => isStream(args[0]), (self, o
  * // Output: [ 1, 1 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const retry = /*#__PURE__*/dual(2, (self, policy) => fromChannel(Channel.retry(self.channel, policy)));
@@ -4012,7 +3897,7 @@ export const retry = /*#__PURE__*/dual(2, (self, policy) => fromChannel(Channel.
  * **Example** (Applying an execution plan)
  *
  * ```ts
- * import { Console, Effect, ExecutionPlan, Layer, Context, Stream } from "effect"
+ * import { Console, Context, Effect, ExecutionPlan, Layer, Stream } from "effect"
  *
  * class Service extends Context.Service<Service>()("Service", {
  *   make: Effect.succeed({
@@ -4039,9 +3924,8 @@ export const retry = /*#__PURE__*/dual(2, (self, policy) => fromChannel(Channel.
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 3.16.0
- * @experimental
  */
 export const withExecutionPlan = /*#__PURE__*/dual(args => isStream(args[0]), (self, policy, options) => suspend(() => {
   const preventFallbackOnPartialStream = options?.preventFallbackOnPartialStream ?? false;
@@ -4114,7 +3998,7 @@ export const withExecutionPlan = /*#__PURE__*/dual(args => isStream(args[0]), (s
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const take = /*#__PURE__*/dual(2, (self, n) => n < 1 ? empty : takeUntil(self, (_, i) => i === n - 1));
@@ -4138,7 +4022,7 @@ export const take = /*#__PURE__*/dual(2, (self, n) => n < 1 ? empty : takeUntil(
  * // Output: [ 4, 5, 6 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeRight = /*#__PURE__*/dual(2, (self, n) => mapAccumArray(self, MutableList.make, (list, arr) => {
@@ -4181,7 +4065,7 @@ export const takeRight = /*#__PURE__*/dual(2, (self, n) => mapAccumArray(self, M
  * })
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeUntil = /*#__PURE__*/dual(args => isStream(args[0]), (self, predicate, options) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4218,7 +4102,7 @@ export const takeUntil = /*#__PURE__*/dual(args => isStream(args[0]), (self, pre
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeUntilEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, predicate, options) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4258,7 +4142,7 @@ export const takeUntilEffect = /*#__PURE__*/dual(args => isStream(args[0]), (sel
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const takeWhile = /*#__PURE__*/dual(2, (self, predicate) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4283,7 +4167,7 @@ export const takeWhile = /*#__PURE__*/dual(2, (self, predicate) => transformPull
  *
  * The stream stops at the first `Result.fail` returned by the filter.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const takeWhileFilter = /*#__PURE__*/dual(2, (self, filter) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4322,8 +4206,8 @@ export const takeWhileFilter = /*#__PURE__*/dual(2, (self, filter) => transformP
  * // Output: [ 1, 2 ]
  * ```
  *
- * @category Filtering
- * @since 2.0.0
+ * @category filtering
+ * @since 4.0.0
  */
 export const takeWhileEffect = /*#__PURE__*/dual(2, (self, predicate) => takeUntilEffect(self, (a, n) => Effect.map(predicate(a, n), b => !b), {
   excludeLast: true
@@ -4348,7 +4232,7 @@ export const takeWhileEffect = /*#__PURE__*/dual(2, (self, predicate) => takeUnt
  * // Output: [ 3, 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const drop = /*#__PURE__*/dual(2, (self, n) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4379,7 +4263,7 @@ export const drop = /*#__PURE__*/dual(2, (self, n) => transformPull(self, (pull,
  * })
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropUntil = /*#__PURE__*/dual(2, (self, predicate) => drop(dropWhile(self, (a, i) => !predicate(a, i)), 1));
@@ -4406,7 +4290,7 @@ export const dropUntil = /*#__PURE__*/dual(2, (self, predicate) => drop(dropWhil
  * // Output: [ 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropUntilEffect = /*#__PURE__*/dual(2, (self, predicate) => drop(dropWhileEffect(self, (a, i) => Effect.map(predicate(a, i), b => !b)), 1));
@@ -4430,7 +4314,7 @@ export const dropUntilEffect = /*#__PURE__*/dual(2, (self, predicate) => drop(dr
  * // Output: [ 3, 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropWhile = /*#__PURE__*/dual(2, (self, predicate) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4447,7 +4331,7 @@ export const dropWhile = /*#__PURE__*/dual(2, (self, predicate) => transformPull
 /**
  * Drops elements while the filter succeeds.
  *
- * @category Filtering
+ * @category filtering
  * @since 4.0.0
  */
 export const dropWhileFilter = /*#__PURE__*/dual(2, (self, filter) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4480,7 +4364,7 @@ export const dropWhileFilter = /*#__PURE__*/dual(2, (self, filter) => transformP
  * // Output: [ 3, 4, 5 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropWhileEffect = /*#__PURE__*/dual(2, (self, predicate) => transformPull(self, (pull, _scope) => Effect.sync(() => {
@@ -4521,7 +4405,7 @@ export const dropWhileEffect = /*#__PURE__*/dual(2, (self, predicate) => transfo
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Filtering
+ * @category filtering
  * @since 2.0.0
  */
 export const dropRight = /*#__PURE__*/dual(2, (self, n) => {
@@ -4634,7 +4518,7 @@ export const rechunk = /*#__PURE__*/dual(2, (self, target) => {
  * **Example** (Emitting sliding windows)
  *
  * ```ts
- * import { Console, Effect, Stream, pipe } from "effect"
+ * import { Console, Effect, pipe, Stream } from "effect"
  *
  * Effect.gen(function*() {
  *   const result = yield* pipe(
@@ -4792,12 +4676,6 @@ export const combine = /*#__PURE__*/dual(4, (self, that, s, f) => Channel.combin
  * internal state to control the combining process, with the initial state
  * being specified by `s`.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Stream.combineChunks`
- *
  * **Example** (Combining stream chunks with state)
  *
  * ```ts
@@ -4824,8 +4702,8 @@ export const combine = /*#__PURE__*/dual(4, (self, that, s, f) => Channel.combin
  * // Output: [ 1, 2, 10, 20 ]
  * ```
  *
- * @category Sequencing
- * @since 2.0.0
+ * @category sequencing
+ * @since 4.0.0
  */
 export const combineArray = /*#__PURE__*/dual(4, (self, that, s, f) => fromChannel(Channel.combine(self.channel, that.channel, s, f)));
 /**
@@ -4852,7 +4730,7 @@ export const combineArray = /*#__PURE__*/dual(4, (self, that, s, f) => fromChann
  * // Output: [ 0, 1, 3, 6, 10, 15, 21 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapAccum = /*#__PURE__*/dual(args => isStream(args[0]), (self, initial, f, options) => fromChannel(Channel.mapAccum(self.channel, initial, (state, arr) => {
@@ -4895,8 +4773,8 @@ export const mapAccum = /*#__PURE__*/dual(args => isStream(args[0]), (self, init
  * // Output: [ 3, 10, 21 ]
  * ```
  *
- * @category Mapping
- * @since 2.0.0
+ * @category mapping
+ * @since 4.0.0
  */
 export const mapAccumArray = /*#__PURE__*/dual(args => isStream(args[0]), (self, initial, f, options) => fromChannel(Channel.mapAccum(self.channel, initial, (state, arr) => {
   const [newState, values] = f(state, arr);
@@ -4937,7 +4815,7 @@ const emptyArr = /*#__PURE__*/Arr.empty();
  * // Output: [ 1, 2, 3 ]
  * ```
  *
- * @category Mapping
+ * @category mapping
  * @since 2.0.0
  */
 export const mapAccumEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, initial, f, options) => self.channel.pipe(Channel.flattenArray, Channel.mapAccum(initial, (state, a) => Effect.map(f(state, a), ([state, values]) => [state, Arr.isReadonlyArrayNonEmpty(values) ? Arr.of(values) : Arr.empty()]), options?.onHalt ? {
@@ -4976,8 +4854,8 @@ export const mapAccumEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self
  * // Output: [ 3, 10 ]
  * ```
  *
- * @category Mapping
- * @since 2.0.0
+ * @category mapping
+ * @since 4.0.0
  */
 export const mapAccumArrayEffect = /*#__PURE__*/dual(args => isStream(args), (self, initial, f, options) => self.channel.pipe(Channel.mapAccum(initial, (state, a) => Effect.map(f(state, a), ([state, values]) => [state, Arr.isReadonlyArrayNonEmpty(values) ? Arr.of(values) : emptyArr]), options?.onHalt ? {
   onHalt(state) {
@@ -5626,6 +5504,56 @@ export const aggregateWithin = /*#__PURE__*/dual(3, (self, sink, schedule) => fr
     return Effect.succeed(Effect.suspend(() => sink.transform(sinkUpstream, scope)));
   }).pipe(Effect.flatMap(pull => Effect.raceFirst(catchSinkHalt(pull), stepToBuffer)));
 }))));
+/**
+ * Fan out the stream, producing a fixed-size tuple of streams that each emit
+ * the same elements as the source stream.
+ *
+ * The source stream starts after all downstream streams have been subscribed.
+ * With the default suspend strategy, the source can only advance `capacity`
+ * chunks ahead of the slowest downstream stream. If a downstream stream is
+ * interrupted, it unsubscribes from the broadcast so it no longer contributes
+ * backpressure.
+ *
+ * **Example** (Broadcasting to two consumers)
+ *
+ * ```ts
+ * import { Console, Effect, Stream } from "effect"
+ *
+ * const program = Effect.scoped(
+ *   Effect.gen(function*() {
+ *     const [left, right] = yield* Stream.make(1, 2, 3).pipe(
+ *       Stream.broadcastN({ n: 2, capacity: 8 })
+ *     )
+ *
+ *     const values = yield* Effect.all([
+ *       Stream.runCollect(left),
+ *       Stream.runCollect(right)
+ *     ], { concurrency: "unbounded" })
+ *
+ *     yield* Console.log(values)
+ *   })
+ * )
+ *
+ * Effect.runPromise(program)
+ * // Output: [[1, 2, 3], [1, 2, 3]]
+ * ```
+ *
+ * @category Broadcast
+ * @since 4.0.0
+ */
+export const broadcastN = /*#__PURE__*/dual(2, /*#__PURE__*/Effect.fnUntraced(function* (self, options) {
+  const pubsub = yield* makePubSub(options);
+  const streams = new Array(options.n);
+  const parentScope = yield* Scope.Scope;
+  for (let i = 0; i < options.n; i++) {
+    const scope = Scope.forkUnsafe(parentScope);
+    const subscription = yield* PubSub.subscribe(pubsub).pipe(Effect.provideService(Scope.Scope, scope));
+    streams[i] = Channel.fromEffectTake(PubSub.take(subscription)).pipe(Channel.onExit(exit => Scope.close(scope, exit)), fromChannel);
+  }
+  yield* Channel.runForEach(self.channel, value => PubSub.publish(pubsub, value)).pipe(Effect.onExit(exit => PubSub.publish(pubsub, exit)), Effect.forkScoped);
+  return streams;
+}));
+const makePubSub = options => Effect.acquireRelease(options.capacity === "unbounded" ? PubSub.unbounded(options) : options.strategy === "dropping" ? PubSub.dropping(options) : options.strategy === "sliding" ? PubSub.sliding(options) : PubSub.bounded(options), PubSub.shutdown);
 /**
  * Creates a PubSub-backed stream that multicasts the source to all subscribers.
  *
@@ -5690,7 +5618,7 @@ export const broadcast = /*#__PURE__*/dual(2, (self, options) => Effect.map(toPu
  * ```
  *
  * @category Broadcast
- * @since 2.0.0
+ * @since 3.8.0
  */
 export const share = /*#__PURE__*/dual(2, (self, options) => Effect.map(RcRef.make({
   acquire: broadcast(self, options),
@@ -5811,7 +5739,7 @@ export const pipeThrough = /*#__PURE__*/dual(2, (self, sink) => self.channel.pip
  * ```
  *
  * @category Accumulation
- * @since 2.0.0
+ * @since 4.0.0
  */
 export const collect = self => fromEffect(runCollect(self));
 /**
@@ -5985,7 +5913,7 @@ export const changesWithEffect = /*#__PURE__*/dual(2, (self, f) => transformPull
  * // ["Hello", " World"]
  * ```
  *
- * @category Encoding
+ * @category encoding
  * @since 2.0.0
  */
 export const decodeText = /*#__PURE__*/dual(args => isStream(args[0]), (self, options) => suspend(() => {
@@ -6014,7 +5942,7 @@ export const decodeText = /*#__PURE__*/dual(args => isStream(args[0]), (self, op
  * // [[72, 101, 108, 108, 111], [32], [87, 111, 114, 108, 100]]
  * ```
  *
- * @category Encoding
+ * @category encoding
  * @since 2.0.0
  */
 export const encodeText = self => suspend(() => {
@@ -6038,7 +5966,7 @@ export const encodeText = self => suspend(() => {
  * // ["a", "b", "c"]
  * ```
  *
- * @category Encoding
+ * @category encoding
  * @since 2.0.0
  */
 export const splitLines = self => self.channel.pipe(Channel.pipeTo(Channel.splitLines()), fromChannel);
@@ -6060,7 +5988,7 @@ export const splitLines = self => self.channel.pipe(Channel.pipeTo(Channel.split
  * // [1, 0, 2, 0, 3, 0, 4]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const intersperse = /*#__PURE__*/dual(2, (self, element) => mapArray(self, (arr, i) => {
@@ -6098,7 +6026,7 @@ export const intersperse = /*#__PURE__*/dual(2, (self, element) => mapArray(self
  * // [ "[", "a", ",", "b", ",", "c", "]" ]
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 2.0.0
  */
 export const intersperseAffixes = /*#__PURE__*/dual(2, (self, options) => succeed(options.start).pipe(concat(intersperse(self, options.middle)), concat(succeed(options.end))));
@@ -6302,7 +6230,7 @@ export const onExit = /*#__PURE__*/dual(2, (self, finalizer) => fromChannel(Chan
  * // Stream failed: boom
  * ```
  *
- * @category Error Handling
+ * @category error handling
  * @since 2.0.0
  */
 export const onError = /*#__PURE__*/dual(2, (self, cleanup) => fromChannel(Channel.onError(self.channel, cleanup)));
@@ -6329,8 +6257,8 @@ export const onError = /*#__PURE__*/dual(2, (self, cleanup) => fromChannel(Chann
  * // [1, 2, 3]
  * ```
  *
- * @category Sequencing
- * @since 4.0.0
+ * @category sequencing
+ * @since 3.6.0
  */
 export const onStart = /*#__PURE__*/dual(2, (self, onStart) => fromChannel(Channel.onStart(self.channel, onStart)));
 /**
@@ -6350,7 +6278,7 @@ export const onStart = /*#__PURE__*/dual(2, (self, onStart) => fromChannel(Chann
  * // Output: first=1
  * ```
  *
- * @category Sequencing
+ * @category sequencing
  * @since 4.0.0
  */
 export const onFirst = /*#__PURE__*/dual(2, (self, onFirst) => fromChannel(Channel.onFirst(self.channel, arr => onFirst(arr[0]))));
@@ -6375,8 +6303,8 @@ export const onFirst = /*#__PURE__*/dual(2, (self, onFirst) => fromChannel(Chann
  * // [1, 2, 3]
  * ```
  *
- * @category Sequencing
- * @since 4.0.0
+ * @category sequencing
+ * @since 3.6.0
  */
 export const onEnd = /*#__PURE__*/dual(2, (self, onEnd) => fromChannel(Channel.onEnd(self.channel, onEnd)));
 /**
@@ -6402,7 +6330,7 @@ export const onEnd = /*#__PURE__*/dual(2, (self, onEnd) => fromChannel(Channel.o
  * ```
  *
  * @category Finalization
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const ensuring = /*#__PURE__*/dual(2, (self, finalizer) => fromChannel(Channel.ensuring(self.channel, finalizer)));
 /**
@@ -6410,12 +6338,10 @@ export const ensuring = /*#__PURE__*/dual(2, (self, finalizer) => fromChannel(Ch
  * service requirements. Use `options.local` to build the layer every time; by
  * default, layers are shared between provide calls.
  *
- * **Previously Known As:** `provideSomeLayer`, `provideSomeContext`.
- *
  * **Example** (Providing stream requirements)
  *
  * ```ts
- * import { Console, Effect, Layer, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Layer, Stream } from "effect"
  *
  * class Env extends Context.Service<Env, { readonly name: string }>()("Env") {}
  *
@@ -6439,7 +6365,7 @@ export const ensuring = /*#__PURE__*/dual(2, (self, finalizer) => fromChannel(Ch
  * // ["Hello, Ada"]
  * ```
  *
- * @category Services
+ * @category services
  * @since 4.0.0
  */
 export const provide = /*#__PURE__*/dual(args => isStream(args[0]), (self, layer, options) => fromChannel(Channel.provide(self.channel, layer, options)));
@@ -6449,7 +6375,7 @@ export const provide = /*#__PURE__*/dual(args => isStream(args[0]), (self, layer
  * **Example** (Providing multiple services to the stream using a context)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Config extends Context.Service<Config, { readonly prefix: string }>()("Config") {}
  * class Greeter extends Context.Service<Greeter, { greet: (name: string) => string }>()("Greeter") {}
@@ -6475,8 +6401,8 @@ export const provide = /*#__PURE__*/dual(args => isStream(args[0]), (self, layer
  * // ["Hello!"]
  * ```
  *
- * @category Services
- * @since 4.0.0
+ * @category services
+ * @since 2.0.0
  */
 export const provideContext = /*#__PURE__*/dual(2, (self, context) => fromChannel(Channel.provideContext(self.channel, context)));
 /**
@@ -6486,7 +6412,7 @@ export const provideContext = /*#__PURE__*/dual(2, (self, context) => fromChanne
  * **Example** (Providing a stream service)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Greeter extends Context.Service<Greeter, {
  *   greet: (name: string) => string
@@ -6513,8 +6439,8 @@ export const provideContext = /*#__PURE__*/dual(2, (self, context) => fromChanne
  * //=> ["Hello, Ada"]
  * ```
  *
- * @category Services
- * @since 4.0.0
+ * @category services
+ * @since 2.0.0
  */
 export const provideService = /*#__PURE__*/dual(3, (self, key, service) => fromChannel(Channel.provideService(self.channel, key, service)));
 /**
@@ -6523,7 +6449,7 @@ export const provideService = /*#__PURE__*/dual(3, (self, key, service) => fromC
  * **Example** (Providing a stream service effectfully)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class ApiConfig extends Context.Service<ApiConfig, { readonly baseUrl: string }>()("ApiConfig") {}
  *
@@ -6553,8 +6479,8 @@ export const provideService = /*#__PURE__*/dual(3, (self, key, service) => fromC
  * // ["https://example.com"]
  * ```
  *
- * @category Services
- * @since 4.0.0
+ * @category services
+ * @since 2.0.0
  */
 export const provideServiceEffect = /*#__PURE__*/dual(3, (self, key, service) => fromChannel(Channel.provideServiceEffect(self.channel, key, service)));
 /**
@@ -6564,7 +6490,7 @@ export const provideServiceEffect = /*#__PURE__*/dual(3, (self, key, service) =>
  * **Example** (Updating the stream context)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Logger extends Context.Service<Logger, { prefix: string }>()("Logger") {}
  * class Config extends Context.Service<Config, { name: string }>()("Config") {}
@@ -6594,8 +6520,8 @@ export const provideServiceEffect = /*#__PURE__*/dual(3, (self, key, service) =>
  * //=> [ "Hello World" ]
  * ```
  *
- * @category Services
- * @since 2.0.0
+ * @category services
+ * @since 4.0.0
  */
 export const updateContext = /*#__PURE__*/dual(2, (self, f) => fromChannel(Channel.updateContext(self.channel, f)));
 /**
@@ -6604,7 +6530,7 @@ export const updateContext = /*#__PURE__*/dual(2, (self, f) => fromChannel(Chann
  * **Example** (Updating a stream service)
  *
  * ```ts
- * import { Console, Effect, Context, Stream } from "effect"
+ * import { Console, Context, Effect, Stream } from "effect"
  *
  * class Counter extends Context.Service<Counter, { count: number }>()("Counter") {}
  *
@@ -6621,7 +6547,7 @@ export const updateContext = /*#__PURE__*/dual(2, (self, f) => fromChannel(Chann
  * // Output: Updated count: 1
  * ```
  *
- * @category Services
+ * @category services
  * @since 2.0.0
  */
 export const updateService = /*#__PURE__*/dual(3, (self, service, f) => updateContext(self, context => Context.add(context, service, f(Context.get(context, service)))));
@@ -6644,8 +6570,8 @@ export const updateService = /*#__PURE__*/dual(3, (self, service, f) => updateCo
  * // [1, 2, 3]
  * ```
  *
- * @category Tracing
- * @since 4.0.0
+ * @category tracing
+ * @since 2.0.0
  */
 export const withSpan = function () {
   const dataFirst = isStream(arguments[0]);
@@ -6663,7 +6589,7 @@ export const withSpan = function () {
  * **Example** (Starting stream do notation)
  *
  * ```ts
- * import { Console, Effect, Stream, pipe } from "effect"
+ * import { Console, Effect, pipe, Stream } from "effect"
  *
  * const program = pipe(
  *   Stream.Do,
@@ -6681,7 +6607,7 @@ export const withSpan = function () {
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const Do = /*#__PURE__*/succeed({});
 const let_ = /*#__PURE__*/dual(3, (self, name, f) => map(self, a => ({
@@ -6712,7 +6638,7 @@ export {
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 let_ as let };
 /**
@@ -6735,7 +6661,7 @@ let_ as let };
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bind = /*#__PURE__*/dual(args => isStream(args[0]), (self, tag, f, options) => flatMap(self, a => map(f(a), b => ({
   ...a,
@@ -6764,7 +6690,7 @@ export const bind = /*#__PURE__*/dual(args => isStream(args[0]), (self, tag, f,
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bindEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, tag, f, options) => mapEffect(self, a => Effect.map(f(a), b => ({
   ...a,
@@ -6787,7 +6713,7 @@ export const bindEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, ta
  * ```
  *
  * @category Do Notation
- * @since 4.0.0
+ * @since 2.0.0
  */
 export const bindTo = /*#__PURE__*/dual(2, (self, name) => map(self, a => ({
   [name]: a
@@ -6806,7 +6732,7 @@ export const bindTo = /*#__PURE__*/dual(2, (self, name) => map(self, a => ({
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const run = /*#__PURE__*/dual(2, (self, sink) => Effect.scopedWith(scope => Channel.toPullScoped(self.channel, scope).pipe(Effect.flatMap(upstream => sink.transform(upstream, scope)), Effect.map(([a]) => a))));
@@ -6829,7 +6755,7 @@ export const run = /*#__PURE__*/dual(2, (self, sink) => Effect.scopedWith(scope
  * // [1, 2, 3, 4, 5]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runCollect = self => Channel.runFold(self.channel, () => [], (acc, chunk) => {
@@ -6857,7 +6783,7 @@ export const runCollect = self => Channel.runFold(self.channel, () => [], (acc,
  * // 5
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runCount = self => Channel.runFold(self.channel, () => 0, (acc, chunk) => acc + chunk.length);
@@ -6878,7 +6804,7 @@ export const runCount = self => Channel.runFold(self.channel, () => 0, (acc, chu
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runSum = self => Channel.runFold(self.channel, () => 0, (acc, chunk) => {
@@ -6908,7 +6834,7 @@ export const runSum = self => Channel.runFold(self.channel, () => 0, (acc, chunk
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runFold = /*#__PURE__*/dual(3, (self, initial, f) => Channel.runFold(self.channel, initial, (acc, arr) => {
@@ -6938,7 +6864,7 @@ export const runFold = /*#__PURE__*/dual(3, (self, initial, f) => Channel.runFol
  * // 6
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runFoldEffect = /*#__PURE__*/dual(3, (self, initial, f) => Channel.runFoldEffect(self.channel, initial, (acc, arr) => {
@@ -6970,14 +6896,14 @@ export const runFoldEffect = /*#__PURE__*/dual(3, (self, initial, f) => Channel.
  * // 1
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runHead = self => Effect.map(Channel.runHead(self.channel), Option.map(Arr.getUnsafe(0)));
 /**
  * Runs the stream and returns the last element as an `Option`.
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runLast = self => Effect.map(Channel.runLast(self.channel), Option.map(Arr.lastNonEmpty));
@@ -7001,7 +6927,7 @@ export const runLast = self => Effect.map(Channel.runLast(self.channel), Option.
  * // Processing: 3
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runForEach = /*#__PURE__*/dual(2, (self, f) => Channel.runForEach(self.channel, arr => {
@@ -7038,7 +6964,7 @@ export const runForEach = /*#__PURE__*/dual(2, (self, f) => Channel.runForEach(s
  * // Processing: 3
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runForEachWhile = /*#__PURE__*/dual(2, (self, f) => Channel.runForEachWhile(self.channel, arr => {
@@ -7073,8 +6999,8 @@ export const runForEachWhile = /*#__PURE__*/dual(2, (self, f) => Channel.runForE
  * // Processing chunk: 1, 2, 3, 4, 5
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 4.0.0
  */
 export const runForEachArray = /*#__PURE__*/dual(2, (self, f) => Channel.runForEach(self.channel, f));
 /**
@@ -7099,7 +7025,7 @@ export const runForEachArray = /*#__PURE__*/dual(2, (self, f) => Channel.runForE
  * // Processing: 3
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runDrain = self => Channel.runDrain(self.channel);
@@ -7128,7 +7054,7 @@ export const runDrain = self => Channel.runDrain(self.channel);
  * // [1, 2, 3]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toPull = self => Channel.toPull(self.channel);
@@ -7150,7 +7076,7 @@ export const toPull = self => Channel.toPull(self.channel);
  * // Hello World!
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const mkString = self => Channel.runFold(self.channel, () => "", (acc, chunk) => acc + chunk.join(""));
@@ -7172,7 +7098,7 @@ export const mkString = self => Channel.runFold(self.channel, () => "", (acc, ch
  * // [1, 2, 3, 4]
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 4.0.0
  */
 export const mkUint8Array = self => Effect.map(Channel.runFold(self.channel, () => ({
@@ -7211,8 +7137,8 @@ export const mkUint8Array = self => Effect.map(Channel.runFold(self.channel, ()
  * const readableStream = Stream.toReadableStreamWith(stream, Context.empty())
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 4.0.0
  */
 export const toReadableStreamWith = /*#__PURE__*/dual(args => isStream(args[0]), (self, context, options) => {
   let currentResolve = undefined;
@@ -7262,7 +7188,7 @@ export const toReadableStreamWith = /*#__PURE__*/dual(args => isStream(args[0]),
  * const reader = readableStream.getReader()
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toReadableStream = /*#__PURE__*/dual(args => isStream(args[0]), (self, options) => toReadableStreamWith(self, Context.empty(), options));
@@ -7286,7 +7212,7 @@ export const toReadableStream = /*#__PURE__*/dual(args => isStream(args[0]), (se
  * Effect.runPromise(effect)
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toReadableStreamEffect = /*#__PURE__*/dual(args => isStream(args[0]), (self, options) => Effect.map(Effect.context(), context => toReadableStreamWith(self, context, options)));
@@ -7313,8 +7239,8 @@ export const toReadableStreamEffect = /*#__PURE__*/dual(args => isStream(args[0]
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 4.0.0
  */
 export const toAsyncIterableWith = /*#__PURE__*/dual(2, (self, context) => ({
   [Symbol.asyncIterator]() {
@@ -7378,8 +7304,8 @@ export const toAsyncIterableWith = /*#__PURE__*/dual(2, (self, context) => ({
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 3.15.0
  */
 export const toAsyncIterableEffect = self => Effect.map(Effect.context(), context => toAsyncIterableWith(self, context));
 /**
@@ -7405,8 +7331,8 @@ export const toAsyncIterableEffect = self => Effect.map(Effect.context(), contex
  * // [ 1, 2, 3 ]
  * ```
  *
- * @category Destructors
- * @since 2.0.0
+ * @category destructors
+ * @since 3.15.0
  */
 export const toAsyncIterable = self => toAsyncIterableWith(self, Context.empty());
 /**
@@ -7438,7 +7364,7 @@ export const toAsyncIterable = self => toAsyncIterableWith(self, Context.empty()
  * //=> 2
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runIntoPubSub = /*#__PURE__*/dual(args => isStream(args[0]), (self, pubsub, options) => Channel.runIntoPubSubArray(self.channel, pubsub, options));
@@ -7464,7 +7390,7 @@ export const runIntoPubSub = /*#__PURE__*/dual(args => isStream(args[0]), (self,
  * }))
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toPubSub = /*#__PURE__*/dual(2, (self, options) => Channel.toPubSubArray(self.channel, options));
@@ -7491,7 +7417,7 @@ export const toPubSub = /*#__PURE__*/dual(2, (self, options) => Channel.toPubSub
  * })
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 4.0.0
  */
 export const toPubSubTake = /*#__PURE__*/dual(2, (self, options) => Channel.toPubSubTake(self.channel, options));
@@ -7515,7 +7441,7 @@ export const toPubSubTake = /*#__PURE__*/dual(2, (self, options) => Channel.toPu
  * })
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const toQueue = /*#__PURE__*/dual(2, (self, options) => Channel.toQueueArray(self.channel, options));
@@ -7546,7 +7472,7 @@ export const toQueue = /*#__PURE__*/dual(2, (self, options) => Channel.toQueueAr
  * })
  * ```
  *
- * @category Destructors
+ * @category destructors
  * @since 2.0.0
  */
 export const runIntoQueue = /*#__PURE__*/dual(2, (self, queue) => Channel.runIntoQueueArray(self.channel, queue));