effect 2.0.0-next.57 → 2.0.0-next.59

package/dist/esm/internal/fiberRuntime.js

@@ -77,6 +77,10 @@ const runtimeFiberVariance = {
 const absurd = _ => {
   throw new Error(`BUG: FiberRuntime - ${JSON.stringify(_)} - please report an issue at https://github.com/Effect-TS/effect/issues`);
 };
+const YieldedOp = /*#__PURE__*/Symbol.for("effect/internal/fiberRuntime/YieldedOp");
+const yieldedOpChannel = /*#__PURE__*/globalValue("effect/internal/fiberRuntime/yieldedOpChannel", () => ({
+  currentOp: null
+}));
 const contOpSuccess = {
   [OpCodes.OP_ON_SUCCESS]: (_, cont, value) => {
     return cont.i1(value);
@@ -380,7 +384,7 @@ export class FiberRuntime {
    * **NOTE**: This method must be invoked by the fiber itself.
    */
   setFiberRef(fiberRef, value) {
-    this._fiberRefs = fiberRefs.updatedAs(this._fiberRefs, {
+    this._fiberRefs = fiberRefs.updateAs(this._fiberRefs, {
       fiberId: this._fiberId,
       fiberRef,
       value
@@ -564,6 +568,9 @@ export class FiberRuntime {
   reportExitValue(exit) {
     if (_runtimeFlags.runtimeMetrics(this._runtimeFlags)) {
       const tags = this.getFiberRef(core.currentMetricLabels);
+      const startTimeMillis = this.id().startTimeMillis;
+      const endTimeMillis = Date.now();
+      fiberLifetimes.unsafeUpdate(endTimeMillis - startTimeMillis, tags);
       fiberActive.unsafeUpdate(-1, tags);
       switch (exit._tag) {
         case OpCodes.OP_SUCCESS:
@@ -587,12 +594,6 @@ export class FiberRuntime {
   }
   setExitValue(exit) {
     this._exitValue = exit;
-    if (_runtimeFlags.runtimeMetrics(this._runtimeFlags)) {
-      const tags = this.getFiberRef(core.currentMetricLabels);
-      const startTimeMillis = this.id().startTimeMillis;
-      const endTimeMillis = new Date().getTime();
-      fiberLifetimes.unsafeUpdate(endTimeMillis - startTimeMillis, tags);
-    }
     this.reportExitValue(exit);
     for (let i = this._observers.length - 1; i >= 0; i--) {
       this._observers[i](exit);
@@ -678,9 +679,24 @@ export class FiberRuntime {
     try {
       let effect = _runtimeFlags.interruptible(this._runtimeFlags) && this.isInterrupted() ? core.exitFailCause(this.getInterruptedCause()) : effect0;
       while (effect !== null) {
-        try {
-          const eff = effect;
-          const exit = this.runLoop(eff);
+        const eff = effect;
+        const exit = this.runLoop(eff);
+        if (exit === YieldedOp) {
+          const op = yieldedOpChannel.currentOp;
+          yieldedOpChannel.currentOp = null;
+          if (op._op === OpCodes.OP_YIELD) {
+            if (_runtimeFlags.cooperativeYielding(this._runtimeFlags)) {
+              this.tell(FiberMessage.yieldNow());
+              this.tell(FiberMessage.resume(core.exitUnit));
+              effect = null;
+            } else {
+              effect = core.exitUnit;
+            }
+          } else if (op._op === OpCodes.OP_ASYNC) {
+            // Terminate this evaluation, async resumption will continue evaluation:
+            effect = null;
+          }
+        } else {
           this._runtimeFlags = pipe(this._runtimeFlags, _runtimeFlags.enable(_runtimeFlags.WindDown));
           const interruption = this.interruptAllChildren();
           if (interruption !== null) {
@@ -697,23 +713,6 @@ export class FiberRuntime {
             }
             effect = null;
           }
-        } catch (e) {
-          if (core.isEffect(e)) {
-            if (e._op === OpCodes.OP_YIELD) {
-              if (_runtimeFlags.cooperativeYielding(this._runtimeFlags)) {
-                this.tell(FiberMessage.yieldNow());
-                this.tell(FiberMessage.resume(core.exitUnit));
-                effect = null;
-              } else {
-                effect = core.exitUnit;
-              }
-            } else if (e._op === OpCodes.OP_ASYNC) {
-              // Terminate this evaluation, async resumption will continue evaluation:
-              effect = null;
-            }
-          } else {
-            throw e;
-          }
         }
       }
     } finally {
@@ -859,7 +858,8 @@ export class FiberRuntime {
       // @ts-expect-error
       return contOpSuccess[cont._op](this, cont, value);
     } else {
-      throw core.exitSucceed(value);
+      yieldedOpChannel.currentOp = core.exitSucceed(value);
+      return YieldedOp;
     }
   }
   [OpCodes.OP_SUCCESS](op) {
@@ -873,7 +873,8 @@ export class FiberRuntime {
       // @ts-expect-error
       return contOpSuccess[cont._op](this, cont, oldCur.i0);
     } else {
-      throw oldCur;
+      yieldedOpChannel.currentOp = oldCur;
+      return YieldedOp;
     }
   }
   [OpCodes.OP_FAILURE](op) {
@@ -913,7 +914,8 @@ export class FiberRuntime {
           }
       }
     } else {
-      throw core.exitFailCause(cause);
+      yieldedOpChannel.currentOp = core.exitFailCause(cause);
+      return YieldedOp;
     }
   }
   [OpCodes.OP_WITH_RUNTIME](op) {
@@ -990,11 +992,13 @@ export class FiberRuntime {
   [OpCodes.OP_ASYNC](op) {
     this._asyncBlockingOn = op.i1;
     this.initiateAsync(this._runtimeFlags, op.i0);
-    throw op;
+    yieldedOpChannel.currentOp = op;
+    return YieldedOp;
   }
   [OpCodes.OP_YIELD](op) {
     this.isYielding = false;
-    throw op;
+    yieldedOpChannel.currentOp = op;
+    return YieldedOp;
   }
   [OpCodes.OP_WHILE](op) {
     const check = op.i0;
@@ -1050,16 +1054,16 @@ export class FiberRuntime {
           // @ts-expect-error
           return this[cur._op](cur);
         }, this);
-      } catch (e) {
-        if (core.isEffect(e)) {
-          if (e._op === OpCodes.OP_YIELD || e._op === OpCodes.OP_ASYNC) {
-            throw e;
-          } else if (e._op === OpCodes.OP_SUCCESS || e._op === OpCodes.OP_FAILURE) {
-            return e;
-          } else {
-            cur = core.exitFailCause(internalCause.die(e));
+        if (cur === YieldedOp) {
+          const op = yieldedOpChannel.currentOp;
+          if (op._op === OpCodes.OP_YIELD || op._op === OpCodes.OP_ASYNC) {
+            return YieldedOp;
           }
-        } else if (core.isEffectError(e)) {
+          yieldedOpChannel.currentOp = null;
+          return op._op === OpCodes.OP_SUCCESS || op._op === OpCodes.OP_FAILURE ? op : core.exitFailCause(internalCause.die(op));
+        }
+      } catch (e) {
+        if (core.isEffectError(e)) {
           cur = core.exitFailCause(e.cause);
         } else if (core.isInterruptedException(e)) {
           cur = core.exitFailCause(internalCause.sequential(internalCause.die(e), internalCause.interrupt(FiberId.none)));
@@ -1561,9 +1565,7 @@ export const sequentialFinalizers = self => core.contextWithEffect(context => Op
 /* @internal */
 export const tagMetricsScoped = (key, value) => labelMetricsScoped([metricLabel.make(key, value)]);
 /* @internal */
-export const labelMetricsScoped = labels => labelMetricsScopedSet(HashSet.fromIterable(labels));
-/* @internal */
-export const labelMetricsScopedSet = labels => fiberRefLocallyScopedWith(core.currentMetricLabels, set => pipe(set, HashSet.union(labels)));
+export const labelMetricsScoped = labels => fiberRefLocallyScopedWith(core.currentMetricLabels, old => RA.union(old, labels));
 /* @internal */
 export const using = /*#__PURE__*/dual(2, (self, use) => core.acquireUseRelease(scopeMake(), scope => core.flatMap(scopeExtend(self, scope), use), (scope, exit) => core.scopeClose(scope, exit)));
 /** @internal */
@@ -1688,7 +1690,7 @@ export const fiberAll = fibers => ({
   [internalFiber.FiberTypeId]: internalFiber.fiberVariance,
   id: () => RA.fromIterable(fibers).reduce((id, fiber) => FiberId.combine(id, fiber.id()), FiberId.none),
   await: core.exit(forEachParUnbounded(fibers, fiber => core.flatten(fiber.await), false)),
-  children: core.map(forEachParUnbounded(fibers, fiber => fiber.children, false), children => RA.flatten(children)),
+  children: core.map(forEachParUnbounded(fibers, fiber => fiber.children, false), RA.flatten),
   inheritAll: core.forEachSequentialDiscard(fibers, fiber => fiber.inheritAll),
   poll: core.map(core.forEachSequential(fibers, fiber => fiber.poll), RA.reduceRight(Option.some(core.exitSucceed(new Array())), (optionB, optionA) => {
     switch (optionA._tag) {