effect-machine 0.13.0 → 0.15.0

package/dist/internal/runtime.js

@@ -1,9 +1,9 @@
 import { INTERNAL_INIT_EVENT } from "./utils.js";
-import { processEventCore, runSpawnEffects, shouldPostpone } from "./transition.js";
 import { NoReplyError } from "../errors.js";
+import { processEventCore, runSpawnEffects, shouldPostpone } from "./transition.js";
 import { ActorExit } from "../supervision.js";
 import { ActorSystem } from "../actor.js";
-import { Cause, Deferred, Effect, Exit, Fiber, Option, Queue, Ref, Schema, Scope, SubscriptionRef } from "effect";
+import { Cause, Deferred, Effect, Exit, Fiber, Queue, Ref, Schema, Scope, SubscriptionRef } from "effect";
 //#region src/internal/runtime.ts
 /**
 * Shared runtime kernel for machine event processing.
@@ -72,7 +72,6 @@ const createRuntime = Effect.fn("effect-machine.runtime.create")(function* (mach
 		})
 	};
 	const stateScopeRef = { current: yield* Scope.make() };
-	const backgroundFibers = [];
 	const initEvent = { _tag: INTERNAL_INIT_EVENT };
 	const ctx = {
 		actorId,
@@ -81,60 +80,72 @@ const createRuntime = Effect.fn("effect-machine.runtime.create")(function* (mach
 		self,
 		system
 	};
-	const { effects: effectSlots } = machine._slots;
-	for (const bg of machine.backgroundEffects) {
-		const fiber = yield* bg.handler({
-			actorId,
-			state: machine.initial,
-			event: initEvent,
-			self,
-			effects: effectSlots,
-			system
-		}).pipe(Effect.provideService(machine.Context, ctx), Effect.forkIn(actorScope));
-		backgroundFibers.push(fiber);
-	}
-	if (lifecycle?.onInitialSpawnEffects !== void 0) yield* lifecycle.onInitialSpawnEffects(machine.initial);
+	const slots = machine._slots;
 	const loopFiberRef = { current: void 0 };
-	const initialSpawnDefectSignal = (cause) => Deferred.succeed(exitDeferred, ActorExit.Defect(cause, "initial-spawn")).pipe(Effect.andThen(Ref.set(stoppedRef, true)), Effect.andThen(Effect.suspend(() => loopFiberRef.current !== void 0 ? Fiber.interrupt(loopFiberRef.current) : Effect.void)), Effect.asVoid);
-	yield* runSpawnEffects(machine, machine.initial, initEvent, self, stateScopeRef.current, system, actorId, hooks?.onError, initialSpawnDefectSignal).pipe(Effect.catchCause((cause) => {
-		return Effect.gen(function* () {
+	/** Set the exit deferred exactly once. */
+	const setExit = (exit) => Deferred.succeed(exitDeferred, exit).pipe(Effect.asVoid);
+	const startDeferred = yield* Deferred.make();
+	const startedRef = yield* Ref.make(false);
+	const start = Effect.gen(function* () {
+		if (yield* Ref.getAndSet(startedRef, true)) {
+			yield* Deferred.await(startDeferred);
+			return;
+		}
+		const backgroundFibers = [];
+		for (const bg of machine.backgroundEffects) {
+			const fiber = yield* bg.handler({
+				actorId,
+				state: machine.initial,
+				event: initEvent,
+				self,
+				slots,
+				system
+			}).pipe(Effect.provideService(machine.Context, ctx), Effect.forkIn(actorScope));
+			backgroundFibers.push(fiber);
+		}
+		if (lifecycle?.onInitialSpawnEffects !== void 0) yield* lifecycle.onInitialSpawnEffects(machine.initial);
+		const initialSpawnDefectSignal = (cause) => Deferred.succeed(exitDeferred, ActorExit.Defect(cause, "initial-spawn")).pipe(Effect.andThen(Ref.set(stoppedRef, true)), Effect.andThen(Effect.suspend(() => loopFiberRef.current !== void 0 ? Fiber.interrupt(loopFiberRef.current) : Effect.void)), Effect.asVoid);
+		yield* runSpawnEffects(machine, machine.initial, initEvent, self, stateScopeRef.current, system, actorId, hooks?.onError, initialSpawnDefectSignal).pipe(Effect.catchCause((cause) => {
+			return Effect.gen(function* () {
+				yield* Ref.set(stoppedRef, true);
+				yield* Scope.close(stateScopeRef.current, Exit.void);
+				yield* Scope.close(actorScope, Exit.void);
+				yield* Deferred.succeed(exitDeferred, ActorExit.Defect(cause, "initial-spawn"));
+				return yield* Effect.failCause(cause);
+			});
+		}));
+		if (machine.finalStates.has(machine.initial._tag)) {
+			if (lifecycle?.onFinal !== void 0) yield* lifecycle.onFinal(machine.initial);
 			yield* Ref.set(stoppedRef, true);
 			yield* Scope.close(stateScopeRef.current, Exit.void);
 			yield* Scope.close(actorScope, Exit.void);
-			yield* Deferred.succeed(exitDeferred, ActorExit.Defect(cause, "initial-spawn"));
-			return yield* Effect.failCause(cause);
-		});
-	}));
-	/** Set the exit deferred exactly once. */
-	const setExit = (exit) => Deferred.succeed(exitDeferred, exit).pipe(Effect.asVoid);
-	if (machine.finalStates.has(machine.initial._tag)) {
-		if (lifecycle?.onFinal !== void 0) yield* lifecycle.onFinal(machine.initial);
-		yield* Ref.set(stoppedRef, true);
-		yield* Scope.close(stateScopeRef.current, Exit.void);
-		yield* Scope.close(actorScope, Exit.void);
-		yield* setExit(ActorExit.Final(machine.initial));
-		return makeHandle(stateRef, stoppedRef, eventQueue, exitDeferred, actorScope);
-	}
-	const augmentedHooks = {
-		...hooks,
-		onSpawnDefect: (cause) => Deferred.succeed(exitDeferred, ActorExit.Defect(cause, "spawn")).pipe(Effect.andThen(Ref.set(stoppedRef, true)), Effect.andThen(Effect.suspend(() => loopFiberRef.current !== void 0 ? Fiber.interrupt(loopFiberRef.current) : Effect.void)), Effect.asVoid)
-	};
-	const loopFiber = yield* Effect.forkDetach(runtimeEventLoop(machine, stateRef, eventQueue, stoppedRef, self, stateScopeRef, actorId, system, exitDeferred, augmentedHooks, deferredReplyRef, lifecycle, config.wrapProcess, fork));
-	loopFiberRef.current = loopFiber;
-	if (backgroundFibers.length > 0) yield* Effect.raceAll(backgroundFibers.map((fiber) => Fiber.await(fiber).pipe(Effect.flatMap((exit) => {
-		if (exit._tag === "Failure" && !Cause.hasInterruptsOnly(exit.cause)) return setExit(ActorExit.Defect(exit.cause, "background")).pipe(Effect.andThen(Ref.set(stoppedRef, true)), Effect.andThen(Fiber.interrupt(loopFiber)));
-		return Effect.never;
-	})))).pipe(Effect.forkIn(actorScope));
-	yield* Effect.forkDetach(Effect.gen(function* () {
-		const loopExit = yield* Fiber.await(loopFiber);
-		if (loopExit._tag === "Success") yield* Scope.close(actorScope, Exit.void);
-		else yield* Scope.close(actorScope, loopExit);
-	}));
+			yield* setExit(ActorExit.Final(machine.initial));
+			yield* Deferred.succeed(startDeferred, void 0);
+			return;
+		}
+		const augmentedHooks = {
+			...hooks,
+			onSpawnDefect: (cause) => Deferred.succeed(exitDeferred, ActorExit.Defect(cause, "spawn")).pipe(Effect.andThen(Ref.set(stoppedRef, true)), Effect.andThen(Effect.suspend(() => loopFiberRef.current !== void 0 ? Fiber.interrupt(loopFiberRef.current) : Effect.void)), Effect.asVoid)
+		};
+		const loopFiber = yield* Effect.forkDetach(runtimeEventLoop(machine, stateRef, eventQueue, stoppedRef, self, stateScopeRef, actorId, system, exitDeferred, augmentedHooks, deferredReplyRef, lifecycle, config.wrapProcess, fork));
+		loopFiberRef.current = loopFiber;
+		if (backgroundFibers.length > 0) yield* Effect.raceAll(backgroundFibers.map((fiber) => Fiber.await(fiber).pipe(Effect.flatMap((exit) => {
+			if (exit._tag === "Failure" && !Cause.hasInterruptsOnly(exit.cause)) return setExit(ActorExit.Defect(exit.cause, "background")).pipe(Effect.andThen(Ref.set(stoppedRef, true)), Effect.andThen(Fiber.interrupt(loopFiber)));
+			return Effect.never;
+		})))).pipe(Effect.forkIn(actorScope));
+		yield* Effect.forkDetach(Effect.gen(function* () {
+			const loopExit = yield* Fiber.await(loopFiber);
+			if (loopExit._tag === "Success") yield* Scope.close(actorScope, Exit.void);
+			else yield* Scope.close(actorScope, loopExit);
+		}));
+		yield* Deferred.succeed(startDeferred, void 0);
+	}).pipe(Effect.catchCause((cause) => Deferred.failCause(startDeferred, cause).pipe(Effect.andThen(Effect.failCause(cause)))));
 	const stop = Effect.gen(function* () {
 		if (yield* Ref.get(stoppedRef)) return;
 		if (lifecycle?.onShutdown !== void 0) yield* lifecycle.onShutdown();
 		yield* Ref.set(stoppedRef, true);
-		yield* Fiber.interrupt(loopFiber);
+		const loopFiber = loopFiberRef.current;
+		if (loopFiber !== void 0) yield* Fiber.interrupt(loopFiber);
 		yield* Scope.close(stateScopeRef.current, Exit.void);
 		yield* Scope.close(actorScope, Exit.void);
 		yield* setExit(ActorExit.Stopped);
@@ -142,7 +153,8 @@ const createRuntime = Effect.fn("effect-machine.runtime.create")(function* (mach
 	if (config.skipFinalizer !== true) yield* Effect.addFinalizer(() => stop);
 	return {
 		...makeHandle(stateRef, stoppedRef, eventQueue, exitDeferred, actorScope),
-		stop
+		stop,
+		start
 	};
 });
 /**
@@ -184,6 +196,7 @@ const makeHandle = (stateRef, stoppedRef, eventQueue, exitDeferred, actorScope)
 	stateRef,
 	isStopped: Ref.get(stoppedRef),
 	stop: Effect.void,
+	start: Effect.void,
 	_queue: eventQueue,
 	_stoppedRef: stoppedRef,
 	exitDeferred,
@@ -278,12 +291,7 @@ const runtimeEventLoop = Effect.fn("effect-machine.runtime.eventLoop")(function*
 		yield* Ref.set(stoppedRef, true);
 		if (lifecycle?.onShutdown !== void 0) yield* lifecycle.onShutdown();
 		settlePostponed(postponed, actorId, forkEffect);
-		const remaining = [];
-		let next = yield* Queue.poll(eventQueue);
-		while (Option.isSome(next)) {
-			remaining.push(next.value);
-			next = yield* Queue.poll(eventQueue);
-		}
+		const remaining = yield* Queue.clear(eventQueue);
 		for (const entry of remaining) if (entry._tag === "sendWait") forkEffect(Deferred.succeed(entry.done, void 0));
 		else if (entry._tag === "ask") forkEffect(Deferred.fail(entry.reply, new NoReplyError({
 			actorId,

package/dist/internal/transition.d.ts

@@ -1,4 +1,4 @@
-import { EffectsDef, GuardsDef, MachineContext } from "../slot.js";
+import { MachineContext, SlotsDef } from "../slot.js";
 import { Machine, MachineRef, SpawnEffect, Transition } from "../machine.js";
 import { ActorSystem } from "../actor.js";
 import { Cause, Effect, Scope } from "effect";
@@ -29,7 +29,7 @@ declare const runTransitionHandler: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R, GD extends GuardsDef, EFD extends EffectsDef>(machine: Machine<S, E, R, Record<string, never>, Record<string, never>, GD, EFD>, transition: Transition<S, E, GD, EFD, R>, state: S, event: E, self: MachineRef<E>, system: ActorSystem, actorId: string) => Effect.Effect<{
+}, R, SD extends SlotsDef>(machine: Machine<S, E, R, any, any, SD>, transition: Transition<S, E, SD, R>, state: S, event: E, self: MachineRef<E>, system: ActorSystem, actorId: string) => Effect.Effect<{
   newState: S;
   hasReply: boolean;
   deferReply: boolean;
@@ -50,7 +50,7 @@ declare const executeTransition: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R, GD extends GuardsDef, EFD extends EffectsDef>(machine: Machine<S, E, R, Record<string, never>, Record<string, never>, GD, EFD>, currentState: S, event: E, self: MachineRef<E>, system: ActorSystem, actorId: string) => Effect.Effect<{
+}, R, SD extends SlotsDef>(machine: Machine<S, E, R, any, any, SD>, currentState: S, event: E, self: MachineRef<E>, system: ActorSystem, actorId: string) => Effect.Effect<{
   newState: S;
   transitioned: boolean;
   reenter: boolean;
@@ -111,7 +111,7 @@ declare const shouldPostpone: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R>(machine: Machine<S, E, R, any, any, any, any>, stateTag: string, eventTag: string) => boolean;
+}, R>(machine: Machine<S, E, R, any, any, any>, stateTag: string, eventTag: string) => boolean;
 /**
  * Process a single event through the machine.
  *
@@ -128,7 +128,7 @@ declare const processEventCore: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R, GD extends GuardsDef, EFD extends EffectsDef>(machine: Machine<S, E, R, Record<string, never>, Record<string, never>, GD, EFD>, currentState: S, event: E, self: MachineRef<E>, stateScopeRef: {
+}, R, SD extends SlotsDef>(machine: Machine<S, E, R, any, any, SD>, currentState: S, event: E, self: MachineRef<E>, stateScopeRef: {
   current: Scope.Closeable;
 }, system: ActorSystem, actorId: string, hooks?: ProcessEventHooks<S, E> | undefined) => Effect.Effect<{
   newState: S;
@@ -150,7 +150,7 @@ declare const runSpawnEffects: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R, GD extends GuardsDef, EFD extends EffectsDef>(machine: Machine<S, E, R, Record<string, never>, Record<string, never>, GD, EFD>, state: S, event: E, self: MachineRef<E>, stateScope: Scope.Closeable, system: ActorSystem, actorId: string, onError?: ((info: ProcessEventError<S, E>) => Effect.Effect<void>) | undefined, onSpawnDefect?: ((cause: Cause.Cause<unknown>) => Effect.Effect<void>) | undefined) => Effect.Effect<void, never, Exclude<Exclude<R, MachineContext<S, E, MachineRef<E>>>, Scope.Scope>>;
+}, R, SD extends SlotsDef>(machine: Machine<S, E, R, any, any, SD>, state: S, event: E, self: MachineRef<E>, stateScope: Scope.Closeable, system: ActorSystem, actorId: string, onError?: ((info: ProcessEventError<S, E>) => Effect.Effect<void>) | undefined, onSpawnDefect?: ((cause: Cause.Cause<unknown>) => Effect.Effect<void>) | undefined) => Effect.Effect<void, never, Exclude<Exclude<R, MachineContext<S, E, MachineRef<E>>>, Scope.Scope>>;
 /**
  * Resolve which transition should fire for a given state and event.
  * Uses indexed O(1) lookup. First matching transition wins.
@@ -159,7 +159,7 @@ declare const resolveTransition: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R>(machine: Machine<S, E, R, any, any, any, any>, currentState: S, event: E) => (typeof machine.transitions)[number] | undefined;
+}, R>(machine: Machine<S, E, R, any, any, any>, currentState: S, event: E) => (typeof machine.transitions)[number] | undefined;
 /**
  * Invalidate cached index for a machine (call after mutation).
  */
@@ -174,7 +174,7 @@ declare const findTransitions: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R, GD extends GuardsDef = Record<string, never>, EFD extends EffectsDef = Record<string, never>>(machine: Machine<S, E, R, any, any, GD, EFD>, stateTag: string, eventTag: string) => ReadonlyArray<Transition<S, E, GD, EFD, R>>;
+}, R, SD extends SlotsDef = Record<string, never>>(machine: Machine<S, E, R, any, any, SD>, stateTag: string, eventTag: string) => ReadonlyArray<Transition<S, E, SD, R>>;
 /**
  * Find all spawn effects for a state.
  * Returns empty array if no matches.
@@ -185,6 +185,6 @@ declare const findSpawnEffects: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R, GD extends GuardsDef = Record<string, never>, EFD extends EffectsDef = Record<string, never>>(machine: Machine<S, E, R, any, any, GD, EFD>, stateTag: string) => ReadonlyArray<SpawnEffect<S, E, EFD, R>>;
+}, R, SD extends SlotsDef = Record<string, never>>(machine: Machine<S, E, R, any, any, SD>, stateTag: string) => ReadonlyArray<SpawnEffect<S, E, SD, R>>;
 //#endregion
 export { ProcessEventError, ProcessEventHooks, ProcessEventResult, TransitionExecutionResult, executeTransition, findSpawnEffects, findTransitions, invalidateIndex, processEventCore, resolveTransition, runSpawnEffects, runTransitionHandler, shouldPostpone };

package/dist/internal/transition.js

@@ -29,12 +29,10 @@ const runTransitionHandler = Effect.fn("effect-machine.runTransitionHandler")(fu
 		self,
 		system
 	};
-	const { guards, effects } = machine._slots;
 	const handlerCtx = {
 		state,
 		event,
-		guards,
-		effects
+		slots: machine._slots
 	};
 	const raw = transition.handler(handlerCtx);
 	const resolved = isEffect(raw) ? yield* raw.pipe(Effect.provideService(machine.Context, ctx)) : raw;
@@ -166,7 +164,7 @@ const runSpawnEffects = Effect.fn("effect-machine.runSpawnEffects")(function* (m
 		self,
 		system
 	};
-	const { effects: effectSlots } = machine._slots;
+	const slots = machine._slots;
 	const reportError = onError;
 	const defectSignal = onSpawnDefect;
 	for (const spawnEffect of spawnEffects) {
@@ -175,7 +173,7 @@ const runSpawnEffects = Effect.fn("effect-machine.runSpawnEffects")(function* (m
 			state,
 			event,
 			self,
-			effects: effectSlots,
+			slots,
 			system
 		}).pipe(Effect.provideService(machine.Context, ctx), Effect.catchCause((cause) => {
 			if (Cause.hasInterruptsOnly(cause)) return Effect.interrupt;