effect 3.10.18 → 3.11.0

package/dist/cjs/internal/channel.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.zipRight = exports.zipLeft = exports.zip = exports.writeChunk = exports.writeAll = exports.withSpan = exports.updateService = exports.unwrapScoped = exports.unwrap = exports.toQueue = exports.toPull = exports.toPubSub = exports.splitLines = exports.serviceWithEffect = exports.serviceWithChannel = exports.serviceWith = exports.service = exports.scoped = exports.runDrain = exports.runCollect = exports.run = exports.repeated = exports.read = exports.provideSomeLayer = exports.provideService = exports.provideLayer = exports.pipeToOrFail = exports.orElse = exports.orDieWith = exports.orDie = exports.never = exports.mergeWith = exports.mergeOutWith = exports.mergeOut = exports.mergeMap = exports.mergeAllWith = exports.mergeAllUnboundedWith = exports.mergeAllUnbounded = exports.mergeAll = exports.mapOutEffectPar = exports.mapOutEffect = exports.mapOut = exports.mapInputInEffect = exports.mapInputIn = exports.mapInputErrorEffect = exports.mapInputError = exports.mapInputEffect = exports.mapInputContext = exports.mapInput = exports.mapErrorCause = exports.mapError = exports.mapEffect = exports.map = exports.isChannelException = exports.interruptWhenDeferred = exports.interruptWhen = exports.identityChannel = exports.fromQueue = exports.fromPubSubScoped = exports.fromPubSub = exports.fromOption = exports.fromInput = exports.fromEither = exports.foldChannel = exports.flatten = exports.ensuring = exports.emitCollect = exports.drain = exports.doneCollect = exports.contextWithEffect = exports.contextWithChannel = exports.contextWith = exports.context = exports.concatOut = exports.concatMap = exports.collect = exports.catchAll = exports.bufferChunk = exports.buffer = exports.asVoid = exports.as = exports.acquireUseRelease = exports.ChannelExceptionTypeId = exports.ChannelException = void 0;
+exports.zipRight = exports.zipLeft = exports.zip = exports.writeChunk = exports.writeAll = exports.withSpan = exports.updateService = exports.unwrapScopedWith = exports.unwrapScoped = exports.unwrap = exports.toQueue = exports.toPullIn = exports.toPull = exports.toPubSub = exports.splitLines = exports.serviceWithEffect = exports.serviceWithChannel = exports.serviceWith = exports.service = exports.scopedWith = exports.scoped = exports.runScoped = exports.runDrain = exports.runCollect = exports.run = exports.repeated = exports.read = exports.provideSomeLayer = exports.provideService = exports.provideLayer = exports.pipeToOrFail = exports.orElse = exports.orDieWith = exports.orDie = exports.never = exports.mergeWith = exports.mergeOutWith = exports.mergeOut = exports.mergeMap = exports.mergeAllWith = exports.mergeAllUnboundedWith = exports.mergeAllUnbounded = exports.mergeAll = exports.mapOutEffectPar = exports.mapOutEffect = exports.mapOut = exports.mapInputInEffect = exports.mapInputIn = exports.mapInputErrorEffect = exports.mapInputError = exports.mapInputEffect = exports.mapInputContext = exports.mapInput = exports.mapErrorCause = exports.mapError = exports.mapEffect = exports.map = exports.isChannelException = exports.interruptWhenDeferred = exports.interruptWhen = exports.identityChannel = exports.fromQueue = exports.fromPubSubScoped = exports.fromPubSub = exports.fromOption = exports.fromInput = exports.fromEither = exports.foldChannel = exports.flatten = exports.ensuring = exports.emitCollect = exports.drain = exports.doneCollect = exports.contextWithEffect = exports.contextWithChannel = exports.contextWith = exports.context = exports.concatOut = exports.concatMap = exports.collect = exports.catchAll = exports.bufferChunk = exports.buffer = exports.asVoid = exports.as = exports.acquireUseRelease = exports.ChannelExceptionTypeId = exports.ChannelException = void 0;
 var Cause = _interopRequireWildcard(require("../Cause.js"));
 var Chunk = _interopRequireWildcard(require("../Chunk.js"));
 var Context = _interopRequireWildcard(require("../Context.js"));
@@ -273,31 +273,27 @@ const mapOutEffect = exports.mapOutEffect = /*#__PURE__*/(0, _Function.dual)(2,
   return core.pipeTo(self, reader);
 });
 /** @internal */
-const mapOutEffectPar = exports.mapOutEffectPar = /*#__PURE__*/(0, _Function.dual)(3, (self, f, n) => (0, _Function.pipe)(Effect.gen(function* ($) {
-  const queue = yield* $(Effect.acquireRelease(Queue.bounded(n), queue => Queue.shutdown(queue)));
-  const errorSignal = yield* $(Deferred.make());
-  const withPermits = n === Number.POSITIVE_INFINITY ? _ => _Function.identity : (yield* $(Effect.makeSemaphore(n))).withPermits;
-  const pull = yield* $(toPull(self));
-  yield* $(Effect.matchCauseEffect(pull, {
+const mapOutEffectPar = exports.mapOutEffectPar = /*#__PURE__*/(0, _Function.dual)(3, (self, f, n) => unwrapScopedWith(scope => Effect.gen(function* () {
+  const input = yield* singleProducerAsyncInput.make();
+  const queueReader = fromInput(input);
+  const queue = yield* Queue.bounded(n);
+  yield* Scope.addFinalizer(scope, Queue.shutdown(queue));
+  const errorSignal = yield* Deferred.make();
+  const withPermits = n === Number.POSITIVE_INFINITY ? _ => _Function.identity : (yield* Effect.makeSemaphore(n)).withPermits;
+  const pull = yield* queueReader.pipe(core.pipeTo(self), toPullIn(scope));
+  yield* pull.pipe(Effect.matchCauseEffect({
     onFailure: cause => Queue.offer(queue, Effect.failCause(cause)),
-    onSuccess: either => Either.match(either, {
-      onLeft: outDone => {
-        const lock = withPermits(n);
-        return Effect.zipRight(Effect.interruptible(lock(Effect.void)), Effect.asVoid(Queue.offer(queue, Effect.succeed(Either.left(outDone)))));
-      },
-      onRight: outElem => Effect.gen(function* ($) {
-        const deferred = yield* $(Deferred.make());
-        const latch = yield* $(Deferred.make());
-        yield* $(Effect.asVoid(Queue.offer(queue, Effect.map(Deferred.await(deferred), Either.right))));
-        yield* $(Deferred.succeed(latch, void 0), Effect.zipRight((0, _Function.pipe)(Effect.uninterruptibleMask(restore => (0, _Function.pipe)(Effect.exit(restore(Deferred.await(errorSignal))), Effect.raceFirst(Effect.exit(restore(f(outElem)))),
-        // TODO: remove
-        Effect.flatMap(exit => Effect.suspend(() => exit)))), Effect.tapErrorCause(cause => Deferred.failCause(errorSignal, cause)), Effect.intoDeferred(deferred))), withPermits(1), Effect.forkScoped);
-        yield* $(Deferred.await(latch));
+    onSuccess: Either.match({
+      onLeft: outDone => Effect.zipRight(Effect.interruptible(withPermits(n)(Effect.void)), Effect.asVoid(Queue.offer(queue, Effect.succeed(Either.left(outDone))))),
+      onRight: outElem => Effect.gen(function* () {
+        const deferred = yield* Deferred.make();
+        const latch = yield* Deferred.make();
+        yield* Queue.offer(queue, Effect.map(Deferred.await(deferred), Either.right));
+        yield* Deferred.succeed(latch, void 0).pipe(Effect.zipRight(Effect.uninterruptibleMask(restore => Effect.exit(restore(Deferred.await(errorSignal))).pipe(Effect.raceFirst(Effect.exit(restore(f(outElem)))), Effect.flatMap(_Function.identity))).pipe(Effect.tapErrorCause(cause => Deferred.failCause(errorSignal, cause)), Effect.intoDeferred(deferred))), withPermits(1), Effect.forkIn(scope));
+        yield* Deferred.await(latch);
       })
     })
-  }), Effect.forever, Effect.interruptible, Effect.forkScoped);
-  return queue;
-}), Effect.map(queue => {
+  }), Effect.forever, Effect.interruptible, Effect.forkIn(scope));
   const consumer = unwrap(Effect.matchCause(Effect.flatten(Queue.take(queue)), {
     onFailure: core.failCause,
     onSuccess: Either.match({
@@ -305,8 +301,8 @@ const mapOutEffectPar = exports.mapOutEffectPar = /*#__PURE__*/(0, _Function.dua
       onRight: outElem => core.flatMap(core.write(outElem), () => consumer)
     })
   }));
-  return consumer;
-}), unwrapScoped));
+  return core.embedInput(consumer, input);
+})));
 /** @internal */
 const mergeAll = options => {
   return channels => mergeAllWith(options)(channels, _Function.constVoid);
@@ -327,63 +323,65 @@ const mergeAllWith = ({
   bufferSize = 16,
   concurrency,
   mergeStrategy = _mergeStrategy.BackPressure()
-}) => (channels, f) => (0, _Function.pipe)(Effect.gen(function* ($) {
+}) => (channels, f) => unwrapScopedWith(scope => Effect.gen(function* () {
   const concurrencyN = concurrency === "unbounded" ? Number.MAX_SAFE_INTEGER : concurrency;
-  const input = yield* $(singleProducerAsyncInput.make());
+  const input = yield* singleProducerAsyncInput.make();
   const queueReader = fromInput(input);
-  const queue = yield* $(Effect.acquireRelease(Queue.bounded(bufferSize), queue => Queue.shutdown(queue)));
-  const cancelers = yield* $(Effect.acquireRelease(Queue.unbounded(), queue => Queue.shutdown(queue)));
-  const lastDone = yield* $(Ref.make(Option.none()));
-  const errorSignal = yield* $(Deferred.make());
-  const withPermits = (yield* $(Effect.makeSemaphore(concurrencyN))).withPermits;
-  const pull = yield* $(toPull(channels));
-  const evaluatePull = pull => (0, _Function.pipe)(Effect.flatMap(pull, Either.match({
-    onLeft: done => Effect.succeed(Option.some(done)),
-    onRight: outElem => Effect.as(Queue.offer(queue, Effect.succeed(Either.right(outElem))), Option.none())
-  })), Effect.repeat({
-    until: _ => Option.isSome(_)
-  }), Effect.flatMap(outDone => Ref.update(lastDone, Option.match({
-    onNone: () => Option.some(outDone.value),
-    onSome: lastDone => Option.some(f(lastDone, outDone.value))
-  }))), Effect.catchAllCause(cause => Cause.isInterrupted(cause) ? Effect.failCause(cause) : (0, _Function.pipe)(Queue.offer(queue, Effect.failCause(cause)), Effect.zipRight(Deferred.succeed(errorSignal, void 0)), Effect.asVoid)));
-  yield* $(Effect.matchCauseEffect(pull, {
-    onFailure: cause => (0, _Function.pipe)(Queue.offer(queue, Effect.failCause(cause)), Effect.zipRight(Effect.succeed(false))),
+  const queue = yield* Queue.bounded(bufferSize);
+  yield* Scope.addFinalizer(scope, Queue.shutdown(queue));
+  const cancelers = yield* Queue.unbounded();
+  yield* Scope.addFinalizer(scope, Queue.shutdown(cancelers));
+  const lastDone = yield* Ref.make(Option.none());
+  const errorSignal = yield* Deferred.make();
+  const withPermits = (yield* Effect.makeSemaphore(concurrencyN)).withPermits;
+  const pull = yield* toPullIn(core.pipeTo(queueReader, channels), scope);
+  function evaluatePull(pull) {
+    return pull.pipe(Effect.flatMap(Either.match({
+      onLeft: done => Effect.succeed(Option.some(done)),
+      onRight: outElem => Effect.as(Queue.offer(queue, Effect.succeed(Either.right(outElem))), Option.none())
+    })), Effect.repeat({
+      until: _ => Option.isSome(_)
+    }), Effect.flatMap(outDone => Ref.update(lastDone, Option.match({
+      onNone: () => Option.some(outDone.value),
+      onSome: lastDone => Option.some(f(lastDone, outDone.value))
+    }))), Effect.catchAllCause(cause => Cause.isInterrupted(cause) ? Effect.failCause(cause) : Queue.offer(queue, Effect.failCause(cause)).pipe(Effect.zipRight(Deferred.succeed(errorSignal, void 0)), Effect.asVoid)));
+  }
+  yield* pull.pipe(Effect.matchCauseEffect({
+    onFailure: cause => Queue.offer(queue, Effect.failCause(cause)).pipe(Effect.zipRight(Effect.succeed(false))),
     onSuccess: Either.match({
       onLeft: outDone => Effect.raceWith(Effect.interruptible(Deferred.await(errorSignal)), Effect.interruptible(withPermits(concurrencyN)(Effect.void)), {
         onSelfDone: (_, permitAcquisition) => Effect.as(Fiber.interrupt(permitAcquisition), false),
-        onOtherDone: (_, failureAwait) => Effect.zipRight(Fiber.interrupt(failureAwait), (0, _Function.pipe)(Ref.get(lastDone), Effect.flatMap(Option.match({
+        onOtherDone: (_, failureAwait) => Effect.zipRight(Fiber.interrupt(failureAwait), Ref.get(lastDone).pipe(Effect.flatMap(Option.match({
           onNone: () => Queue.offer(queue, Effect.succeed(Either.left(outDone))),
           onSome: lastDone => Queue.offer(queue, Effect.succeed(Either.left(f(lastDone, outDone))))
         })), Effect.as(false)))
       }),
       onRight: channel => _mergeStrategy.match(mergeStrategy, {
-        onBackPressure: () => Effect.gen(function* ($) {
-          const latch = yield* $(Deferred.make());
-          const raceEffects = (0, _Function.pipe)(queueReader, core.pipeTo(channel), toPull, Effect.flatMap(pull => Effect.race(evaluatePull(pull), Effect.interruptible(Deferred.await(errorSignal)))), Effect.scoped);
-          yield* $(Deferred.succeed(latch, void 0), Effect.zipRight(raceEffects), withPermits(1), Effect.forkScoped);
-          yield* $(Deferred.await(latch));
-          const errored = yield* $(Deferred.isDone(errorSignal));
+        onBackPressure: () => Effect.gen(function* () {
+          const latch = yield* Deferred.make();
+          const raceEffects = Effect.scopedWith(scope => toPullIn(core.pipeTo(queueReader, channel), scope).pipe(Effect.flatMap(pull => Effect.race(Effect.exit(evaluatePull(pull)), Effect.exit(Effect.interruptible(Deferred.await(errorSignal))))), Effect.flatMap(_Function.identity)));
+          yield* Deferred.succeed(latch, void 0).pipe(Effect.zipRight(raceEffects), withPermits(1), Effect.forkIn(scope));
+          yield* Deferred.await(latch);
+          const errored = yield* Deferred.isDone(errorSignal);
           return !errored;
         }),
-        onBufferSliding: () => Effect.gen(function* ($) {
-          const canceler = yield* $(Deferred.make());
-          const latch = yield* $(Deferred.make());
-          const size = yield* $(Queue.size(cancelers));
-          yield* $(Queue.take(cancelers), Effect.flatMap(_ => Deferred.succeed(_, void 0)), Effect.when(() => size >= concurrencyN));
-          yield* $(Queue.offer(cancelers, canceler));
-          const raceEffects = (0, _Function.pipe)(queueReader, core.pipeTo(channel), toPull, Effect.flatMap(pull => (0, _Function.pipe)(evaluatePull(pull), Effect.race(Effect.interruptible(Deferred.await(errorSignal))), Effect.race(Effect.interruptible(Deferred.await(canceler))))), Effect.scoped);
-          yield* $(Deferred.succeed(latch, void 0), Effect.zipRight(raceEffects), withPermits(1), Effect.forkScoped);
-          yield* $(Deferred.await(latch));
-          const errored = yield* $(Deferred.isDone(errorSignal));
+        onBufferSliding: () => Effect.gen(function* () {
+          const canceler = yield* Deferred.make();
+          const latch = yield* Deferred.make();
+          const size = yield* Queue.size(cancelers);
+          yield* Queue.take(cancelers).pipe(Effect.flatMap(canceler => Deferred.succeed(canceler, void 0)), Effect.when(() => size >= concurrencyN));
+          yield* Queue.offer(cancelers, canceler);
+          const raceEffects = Effect.scopedWith(scope => toPullIn(core.pipeTo(queueReader, channel), scope).pipe(Effect.flatMap(pull => Effect.exit(evaluatePull(pull)).pipe(Effect.race(Effect.exit(Effect.interruptible(Deferred.await(errorSignal)))), Effect.race(Effect.exit(Effect.interruptible(Deferred.await(canceler)))))), Effect.flatMap(_Function.identity)));
+          yield* Deferred.succeed(latch, void 0).pipe(Effect.zipRight(raceEffects), withPermits(1), Effect.forkIn(scope));
+          yield* Deferred.await(latch);
+          const errored = yield* Deferred.isDone(errorSignal);
           return !errored;
         })
       })
     })
   }), Effect.repeat({
     while: _ => _
-  }), Effect.forkScoped);
-  return [queue, input];
-}), Effect.map(([queue, input]) => {
+  }), Effect.forkIn(scope));
   const consumer = (0, _Function.pipe)(Queue.take(queue), Effect.flatten, Effect.matchCause({
     onFailure: core.failCause,
     onSuccess: Either.match({
@@ -392,7 +390,7 @@ const mergeAllWith = ({
     })
   }), unwrap);
   return core.embedInput(consumer, input);
-}), unwrapScoped);
+}));
 /** @internal */
 exports.mergeAllWith = mergeAllWith;
 const mergeMap = exports.mergeMap = /*#__PURE__*/(0, _Function.dual)(3, (self, f, options) => mergeAll(options)(mapOut(self, f)));
@@ -405,67 +403,84 @@ const mergeOutWith = exports.mergeOutWith = /*#__PURE__*/(0, _Function.dual)(3,
   concurrency: n
 })(mapOut(self, _Function.identity), f));
 /** @internal */
-const mergeWith = exports.mergeWith = /*#__PURE__*/(0, _Function.dual)(2, (self, options) => unwrapScoped(Effect.flatMap(singleProducerAsyncInput.make(), input => {
-  const queueReader = fromInput(input);
-  return Effect.map(Effect.all([toPull(core.pipeTo(queueReader, self)), toPull(core.pipeTo(queueReader, options.other)), Effect.scope]), ([pullL, pullR, scope]) => {
-    const handleSide = (exit, fiber, pull) => (done, both, single) => {
-      const onDecision = decision => {
-        const op = decision;
-        if (op._tag === MergeDecisionOpCodes.OP_DONE) {
-          return Effect.succeed(core.fromEffect(Effect.zipRight(Fiber.interrupt(fiber), op.effect)));
-        }
-        return Effect.map(Fiber.await(fiber), Exit.match({
-          onFailure: cause => core.fromEffect(op.f(Exit.failCause(cause))),
-          onSuccess: Either.match({
-            onLeft: done => core.fromEffect(op.f(Exit.succeed(done))),
-            onRight: elem => zipRight(core.write(elem), go(single(op.f)))
-          })
-        }));
-      };
-      return Exit.match(exit, {
-        onFailure: cause => onDecision(done(Exit.failCause(cause))),
-        onSuccess: Either.match({
-          onLeft: z => onDecision(done(Exit.succeed(z))),
-          onRight: elem => Effect.succeed(core.flatMap(core.write(elem), () => core.flatMap(core.fromEffect(Effect.forkIn(Effect.interruptible(pull), scope)), leftFiber => go(both(leftFiber, fiber)))))
-        })
-      });
-    };
-    const go = state => {
-      switch (state._tag) {
-        case MergeStateOpCodes.OP_BOTH_RUNNING:
-          {
-            const leftJoin = Effect.interruptible(Fiber.join(state.left));
-            const rightJoin = Effect.interruptible(Fiber.join(state.right));
-            return unwrap(Effect.raceWith(leftJoin, rightJoin, {
-              onSelfDone: (leftExit, rf) => Effect.zipRight(Fiber.interrupt(rf), handleSide(leftExit, state.right, pullL)(options.onSelfDone, mergeState.BothRunning, f => mergeState.LeftDone(f))),
-              onOtherDone: (rightExit, lf) => Effect.zipRight(Fiber.interrupt(lf), handleSide(rightExit, state.left, pullR)(options.onOtherDone, (left, right) => mergeState.BothRunning(right, left), f => mergeState.RightDone(f)))
-            }));
-          }
-        case MergeStateOpCodes.OP_LEFT_DONE:
-          {
-            return unwrap(Effect.map(Effect.exit(pullR), Exit.match({
-              onFailure: cause => core.fromEffect(state.f(Exit.failCause(cause))),
-              onSuccess: Either.match({
-                onLeft: done => core.fromEffect(state.f(Exit.succeed(done))),
-                onRight: elem => core.flatMap(core.write(elem), () => go(mergeState.LeftDone(state.f)))
-              })
-            })));
-          }
-        case MergeStateOpCodes.OP_RIGHT_DONE:
-          {
-            return unwrap(Effect.map(Effect.exit(pullL), Exit.match({
-              onFailure: cause => core.fromEffect(state.f(Exit.failCause(cause))),
+const mergeWith = exports.mergeWith = /*#__PURE__*/(0, _Function.dual)(2, (self, options) => {
+  function merge(scope) {
+    return Effect.gen(function* () {
+      const input = yield* singleProducerAsyncInput.make();
+      const queueReader = fromInput(input);
+      const pullL = yield* toPullIn(core.pipeTo(queueReader, self), scope);
+      const pullR = yield* toPullIn(core.pipeTo(queueReader, options.other), scope);
+      function handleSide(exit, fiber, pull) {
+        return (done, both, single) => {
+          function onDecision(decision) {
+            const op = decision;
+            if (op._tag === MergeDecisionOpCodes.OP_DONE) {
+              return Effect.succeed(core.fromEffect(Effect.zipRight(Fiber.interrupt(fiber), op.effect)));
+            }
+            return Effect.map(Fiber.await(fiber), Exit.match({
+              onFailure: cause => core.fromEffect(op.f(Exit.failCause(cause))),
               onSuccess: Either.match({
-                onLeft: done => core.fromEffect(state.f(Exit.succeed(done))),
-                onRight: elem => core.flatMap(core.write(elem), () => go(mergeState.RightDone(state.f)))
+                onLeft: done => core.fromEffect(op.f(Exit.succeed(done))),
+                onRight: elem => zipRight(core.write(elem), go(single(op.f)))
               })
-            })));
+            }));
           }
+          return Exit.match(exit, {
+            onFailure: cause => onDecision(done(Exit.failCause(cause))),
+            onSuccess: Either.match({
+              onLeft: z => onDecision(done(Exit.succeed(z))),
+              onRight: elem => Effect.succeed(core.flatMap(core.write(elem), () => core.flatMap(core.fromEffect(Effect.forkIn(Effect.interruptible(pull), scope)), leftFiber => go(both(leftFiber, fiber)))))
+            })
+          });
+        };
       }
-    };
-    return (0, _Function.pipe)(core.fromEffect(Effect.zipWith(Effect.forkIn(Effect.interruptible(pullL), scope), Effect.forkIn(Effect.interruptible(pullR), scope), (left, right) => mergeState.BothRunning(left, right))), core.flatMap(go), core.embedInput(input));
-  });
-})));
+      function go(state) {
+        switch (state._tag) {
+          case MergeStateOpCodes.OP_BOTH_RUNNING:
+            {
+              const leftJoin = Effect.interruptible(Fiber.join(state.left));
+              const rightJoin = Effect.interruptible(Fiber.join(state.right));
+              return unwrap(Effect.raceWith(leftJoin, rightJoin, {
+                onSelfDone: (leftExit, rf) => Effect.zipRight(Fiber.interrupt(rf), handleSide(leftExit, state.right, pullL)(options.onSelfDone, mergeState.BothRunning, f => mergeState.LeftDone(f))),
+                onOtherDone: (rightExit, lf) => Effect.zipRight(Fiber.interrupt(lf), handleSide(rightExit, state.left, pullR)(options.onOtherDone, (left, right) => mergeState.BothRunning(right, left), f => mergeState.RightDone(f)))
+              }));
+            }
+          case MergeStateOpCodes.OP_LEFT_DONE:
+            {
+              return unwrap(Effect.map(Effect.exit(pullR), Exit.match({
+                onFailure: cause => core.fromEffect(state.f(Exit.failCause(cause))),
+                onSuccess: Either.match({
+                  onLeft: done => core.fromEffect(state.f(Exit.succeed(done))),
+                  onRight: elem => core.flatMap(core.write(elem), () => go(mergeState.LeftDone(state.f)))
+                })
+              })));
+            }
+          case MergeStateOpCodes.OP_RIGHT_DONE:
+            {
+              return unwrap(Effect.map(Effect.exit(pullL), Exit.match({
+                onFailure: cause => core.fromEffect(state.f(Exit.failCause(cause))),
+                onSuccess: Either.match({
+                  onLeft: done => core.fromEffect(state.f(Exit.succeed(done))),
+                  onRight: elem => core.flatMap(core.write(elem), () => go(mergeState.RightDone(state.f)))
+                })
+              })));
+            }
+        }
+      }
+      return core.fromEffect(Effect.withFiberRuntime(parent => {
+        const inherit = Effect.withFiberRuntime(state => {
+          ;
+          state.transferChildren(parent.scope());
+          return Effect.void;
+        });
+        const leftFiber = Effect.interruptible(pullL).pipe(Effect.ensuring(inherit), Effect.forkIn(scope));
+        const rightFiber = Effect.interruptible(pullR).pipe(Effect.ensuring(inherit), Effect.forkIn(scope));
+        return Effect.zipWith(leftFiber, rightFiber, (left, right) => mergeState.BothRunning(left, right));
+      })).pipe(core.flatMap(go), core.embedInput(input));
+    });
+  }
+  return unwrapScopedWith(merge);
+});
 /** @internal */
 const never = exports.never = /*#__PURE__*/core.fromEffect(Effect.never);
 /** @internal */
@@ -499,7 +514,7 @@ const provideService = exports.provideService = /*#__PURE__*/(0, _Function.dual)
   return core.flatMap(context(), context => core.provideContext(self, Context.add(context, tag, service)));
 });
 /** @internal */
-const provideLayer = exports.provideLayer = /*#__PURE__*/(0, _Function.dual)(2, (self, layer) => unwrapScoped(Effect.map(Layer.build(layer), env => core.provideContext(self, env))));
+const provideLayer = exports.provideLayer = /*#__PURE__*/(0, _Function.dual)(2, (self, layer) => unwrapScopedWith(scope => Effect.map(Layer.buildWithScope(layer, scope), context => core.provideContext(self, context))));
 /** @internal */
 const mapInputContext = exports.mapInputContext = /*#__PURE__*/(0, _Function.dual)(2, (self, f) => contextWithChannel(context => core.provideContext(self, f(context))));
 /** @internal */
@@ -513,18 +528,24 @@ exports.read = read;
 const repeated = self => core.flatMap(self, () => repeated(self));
 /** @internal */
 exports.repeated = repeated;
-const run = self => Effect.scoped(executor.runScoped(self));
+const run = self => Effect.scopedWith(scope => executor.runIn(self, scope));
 /** @internal */
 exports.run = run;
-const runCollect = self => executor.run(core.collectElements(self));
+const runCollect = self => run(core.collectElements(self));
 /** @internal */
 exports.runCollect = runCollect;
-const runDrain = self => executor.run(drain(self));
+const runDrain = self => run(drain(self));
 /** @internal */
 exports.runDrain = runDrain;
+const runScoped = self => Effect.scopeWith(scope => executor.runIn(self, scope));
+/** @internal */
+exports.runScoped = runScoped;
 const scoped = effect => unwrap(Effect.uninterruptibleMask(restore => Effect.map(Scope.make(), scope => core.acquireReleaseOut(Effect.tapErrorCause(restore(Scope.extend(effect, scope)), cause => Scope.close(scope, Exit.failCause(cause))), (_, exit) => Scope.close(scope, exit)))));
 /** @internal */
 exports.scoped = scoped;
+const scopedWith = f => unwrapScoped(Effect.map(Effect.scope, scope => core.flatMap(core.fromEffect(f(scope)), core.write)));
+/** @internal */
+exports.scopedWith = scopedWith;
 const service = tag => core.fromEffect(tag);
 /** @internal */
 exports.service = service;
@@ -614,12 +635,14 @@ exports.splitLines = splitLines;
 const toPubSub = pubsub => toQueue(pubsub);
 /** @internal */
 exports.toPubSub = toPubSub;
-const toPull = self => Effect.map(Effect.acquireRelease(Effect.sync(() => new executor.ChannelExecutor(self, void 0, _Function.identity)), (exec, exit) => {
-  const finalize = exec.close(exit);
-  return finalize === undefined ? Effect.void : finalize;
-}), exec => Effect.suspend(() => interpretToPull(exec.run(), exec)));
+const toPull = self => Effect.flatMap(Effect.scope, scope => toPullIn(self, scope));
 /** @internal */
 exports.toPull = toPull;
+const toPullIn = exports.toPullIn = /*#__PURE__*/(0, _Function.dual)(2, (self, scope) => Effect.zip(Effect.sync(() => new executor.ChannelExecutor(self, void 0, _Function.identity)), Effect.runtime()).pipe(Effect.tap(([executor, runtime]) => Scope.addFinalizerExit(scope, exit => {
+  const finalizer = executor.close(exit);
+  return finalizer !== undefined ? Effect.provide(finalizer, runtime) : Effect.void;
+})), Effect.uninterruptible, Effect.map(([executor]) => Effect.suspend(() => interpretToPull(executor.run(), executor)))));
+/** @internal */
 const interpretToPull = (channelState, exec) => {
   const state = channelState;
   switch (state._tag) {
@@ -662,6 +685,9 @@ exports.unwrap = unwrap;
 const unwrapScoped = self => core.concatAllWith(scoped(self), (d, _) => d, (d, _) => d);
 /** @internal */
 exports.unwrapScoped = unwrapScoped;
+const unwrapScopedWith = f => core.concatAllWith(scopedWith(f), (d, _) => d, (d, _) => d);
+/** @internal */
+exports.unwrapScopedWith = unwrapScopedWith;
 const updateService = exports.updateService = /*#__PURE__*/(0, _Function.dual)(3, (self, tag, f) => mapInputContext(self, context => Context.merge(context, Context.make(tag, f(Context.unsafeGet(context, tag))))));
 /** @internal */
 const withSpan = function () {