effect-machine 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-machine",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/cevr/effect-machine.git"

package/src/actor.ts

@@ -364,12 +364,14 @@ export const buildActorRefCore = <
   const waitFor = Effect.fn("effect-machine.actor.waitFor")(function* (
     predicate: (state: S) => boolean,
   ) {
-    const current = yield* SubscriptionRef.get(stateRef);
-    if (predicate(current)) {
-      return current;
-    }
-    const next = yield* stateRef.changes.pipe(Stream.filter(predicate), Stream.runHead);
-    return Option.getOrElse(next, () => current);
+    // Use stateRef.changes directly — it emits the current value as its first
+    // element inside the SubscriptionRef semaphore, so this is atomic and
+    // race-free (no gap between "check current" and "subscribe").
+    const result = yield* stateRef.changes.pipe(Stream.filter(predicate), Stream.runHead);
+    if (Option.isSome(result)) return result.value;
+    // Unreachable: changes always emits at least the current value.
+    // Fallback to snapshot for type completeness.
+    return yield* SubscriptionRef.get(stateRef);
   });
 
   const awaitFinal = waitFor((state) => machine.finalStates.has(state._tag)).pipe(
@@ -518,8 +520,10 @@ export const createActor = Effect.fn("effect-machine.actor.spawn")(function* <
     return buildActorRefCore(id, machine, stateRef, eventQueue, stoppedRef, listeners, stop);
   }
 
-  // Start the event loop
-  const loopFiber = yield* Effect.fork(
+  // Start the event loop — use forkScoped so the event loop fiber's lifetime
+  // is tied to the provided Scope, not the calling fiber. This prevents the
+  // event loop from being interrupted when a transient caller completes.
+  const loopFiber = yield* Effect.forkScoped(
     eventLoop(
       machine,
       stateRef,

package/src/index.ts

@@ -63,6 +63,7 @@ export type { SimulationResult, TestHarness, TestHarnessOptions } from "./testin
 
 // Inspection
 export type {
+  AnyInspectionEvent,
   EffectEvent,
   ErrorEvent,
   EventReceivedEvent,

package/src/inspection.ts

@@ -82,6 +82,17 @@ export type InspectionEvent<S, E> =
   | ErrorEvent<S, E>
   | StopEvent<S>;
 
+/**
+ * Convenience alias for untyped inspection events.
+ * Useful for general-purpose inspectors that don't need specific state/event types.
+ * State and event fields are typed as `{ readonly _tag: string }` so discriminated
+ * access to `_tag` works without casting.
+ */
+export type AnyInspectionEvent = InspectionEvent<
+  { readonly _tag: string },
+  { readonly _tag: string }
+>;
+
 // ============================================================================
 // Inspector Service
 // ============================================================================
@@ -101,9 +112,14 @@ export interface Inspector<S, E> {
 export const Inspector = Context.GenericTag<Inspector<any, any>>("@effect/machine/Inspector");
 
 /**
- * Create an inspector from a callback function
+ * Create an inspector from a callback function.
+ * Defaults to `AnyInspectionEvent` when type params are not provided,
+ * giving access to `_tag` on state/event fields without casts.
  */
-export const makeInspector = <S, E>(
+export const makeInspector = <
+  S extends { readonly _tag: string } = { readonly _tag: string },
+  E extends { readonly _tag: string } = { readonly _tag: string },
+>(
   onInspect: (event: InspectionEvent<S, E>) => void,
 ): Inspector<S, E> => ({ onInspect });
 
@@ -115,10 +131,10 @@ export const makeInspector = <S, E>(
  * Console inspector that logs events in a readable format
  */
 export const consoleInspector = <
-  S extends { readonly _tag: string },
-  E extends { readonly _tag: string },
+  S extends { readonly _tag: string } = { readonly _tag: string },
+  E extends { readonly _tag: string } = { readonly _tag: string },
 >(): Inspector<S, E> =>
-  makeInspector((event) => {
+  makeInspector<S, E>((event) => {
     const prefix = `[${event.actorId}]`;
     switch (event.type) {
       case "@machine.spawn":
@@ -145,5 +161,9 @@ export const consoleInspector = <
 /**
  * Collecting inspector that stores events in an array for testing
  */
-export const collectingInspector = <S, E>(events: InspectionEvent<S, E>[]): Inspector<S, E> =>
-  makeInspector((event) => events.push(event));
+export const collectingInspector = <
+  S extends { readonly _tag: string },
+  E extends { readonly _tag: string },
+>(
+  events: InspectionEvent<S, E>[],
+): Inspector<S, E> => makeInspector<S, E>((event) => events.push(event));