xstate 6.0.0-beta.1 → 6.0.0-beta.3

package/dist/{machineSchemas-6d96bef4.development.cjs.js → legacySnapshot-2e2c1d3b.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-a49ae0ce.development.cjs.js');
+var createActor = require('./createActor-dfb6b790.development.cjs.js');
 var validation = require('./validation-f2714a35.development.cjs.js');
 
 var isDevelopment = true;
@@ -131,7 +131,7 @@ class StateNode {
     this.machine = options._machine;
     if (this.parent && createActor.hasUnescapedDot(this.key)) {
       throw new Error(// The suggestion is written as a JS string literal.
-      `State key "${this.key}" contains "." — nest the states or escape it as "${this.key.replaceAll(/(?<!\\)\./g, '\\\\.')}".` );
+      `State key "${this.key}" contains ".". Nest the states or escape it as "${this.key.replaceAll(/(?<!\\)\./g, '\\\\.')}".` );
     }
     this.path = this.parent ? this.parent.path.concat(this.key) : [];
     const firstStateKey = this.config.states ? Object.keys(this.config.states)[0] : undefined;
@@ -674,6 +674,15 @@ class StateMachine {
     /** @internal */
     this.idMap = new Map();
     this.root = void 0;
+    /**
+     * Returns the machine itself, never a Proxy wrapped around it (a function
+     * member is not wrapped by reactive proxies, so it still closes over the raw
+     * instance). Persistence resolves state nodes through it, matching the
+     * bound `transition` / `getInitialSnapshot`.
+     *
+     * @internal
+     */
+    this._raw = () => this;
     /**
      * The machine's `id`, or the empty string when the config declares none.
      * The root state node has this id; a machine without one has no `#id` root.
@@ -1370,10 +1379,117 @@ function eventSchema(machine) {
   }));
 }
 
+// TODO(v7): remove this module and its callers. It reads snapshots written by
+// 6.0.0-beta.1, which used `$`- and `_`-prefixed field names that stores such
+// as Convex reject. Snapshots are written with the new names only.
+
+// Legacy marker key -> [new key, other keys the marker object may have].
+const markers = {
+  $actor: ['@actor', ['incarnation']],
+  $error: ['@error', ['message']],
+  $stateNode: ['@stateNode', []],
+  $systemMapper: ['@systemMapper', []]
+};
+const fields = {
+  _stateInputs: 'stateInputs',
+  _nextTimerId: 'nextTimerId',
+  _nextActorIds: 'nextActorIds'
+};
+
+// Persisted snapshots are JSON; live objects (actors, state nodes, errors)
+// are left alone.
+function isPlain(value) {
+  if (!value || typeof value !== 'object') return false;
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null || Array.isArray(value);
+}
+function renameMarkers(value, allowed) {
+  if (!isPlain(value)) return value;
+  if (Array.isArray(value)) {
+    const items = value.map(item => renameMarkers(item, allowed));
+    return items.some((item, i) => item !== value[i]) ? items : value;
+  }
+  const keys = Object.keys(value);
+  const legacy = keys.find(key => allowed.includes(key));
+  if (legacy && typeof value[legacy] === 'string' && keys.every(key => key === legacy || markers[legacy][1].includes(key))) {
+    const {
+      [legacy]: name,
+      ...rest
+    } = value;
+    return {
+      [markers[legacy][0]]: name,
+      ...rest
+    };
+  }
+  let copy;
+  for (const key of keys) {
+    const item = renameMarkers(value[key], allowed);
+    if (item !== value[key]) (copy ??= {
+      ...value
+    })[key] = item;
+  }
+  return copy ?? value;
+}
+
+// beta.1 always wrote `_nextTimerId` on machine snapshots. Current snapshots
+// write `nextTimerId`, so marker-shaped data in them is left alone.
+function isLegacyEnvelope(envelope) {
+  return isPlain(envelope) && '_nextTimerId' in envelope && !('nextTimerId' in envelope);
+}
+function renameFields(envelope) {
+  // A live machine snapshot keeps its `_`-prefixed in-memory fields.
+  if (!isPlain(envelope) || typeof envelope.matches === 'function') return envelope;
+  let copy;
+  for (const [legacy, name] of Object.entries(fields)) {
+    if (legacy in envelope && !(name in envelope)) {
+      const {
+        [legacy]: value,
+        ...rest
+      } = copy ?? envelope;
+      copy = {
+        ...rest,
+        [name]: value
+      };
+    }
+  }
+  return copy ?? envelope;
+}
+
+/** Upgrades a persisted machine snapshot written by 6.0.0-beta.1. */
+function upgradeLegacyPersistedSnapshot(snapshot) {
+  if (snapshot?.machine && typeof snapshot.matches === 'function') return snapshot;
+  if (!isLegacyEnvelope(snapshot)) return snapshot;
+  return renameMarkers(renameFields(snapshot), ['$actor']);
+}
+
+/** Upgrades a `systemTransition` snapshot written by 6.0.0-beta.1. */
+function upgradeLegacySystemSnapshot(snapshot) {
+  const actors = Object.values(snapshot?.actors ?? {});
+  if (!actors.some(actor => isLegacyEnvelope(actor?.snapshot))) return snapshot;
+  const upgraded = renameMarkers(snapshot, Object.keys(markers));
+  if (!upgraded?.actors) return upgraded;
+  let renamed;
+  for (const [address, actor] of Object.entries(upgraded.actors)) {
+    const data = renameFields(actor?.snapshot);
+    if (data !== actor?.snapshot) (renamed ??= {
+      ...upgraded.actors
+    })[address] = {
+      ...actor,
+      snapshot: data
+    };
+  }
+  return renamed ? {
+    ...upgraded,
+    actors: renamed
+  } : upgraded;
+}
+
 exports.InvalidSnapshotError = InvalidSnapshotError;
 exports.StateMachine = StateMachine;
 exports.StateNode = StateNode;
 exports.eventSchema = eventSchema;
 exports.historicalEventSchema = historicalEventSchema;
 exports.snapshotSchema = snapshotSchema;
+exports.upgradeLegacyPersistedSnapshot = upgradeLegacyPersistedSnapshot;
+exports.upgradeLegacySystemSnapshot = upgradeLegacySystemSnapshot;
 exports.validatePersistedSnapshot = validatePersistedSnapshot;

package/dist/{machineSchemas-88d01821.cjs.js → legacySnapshot-a85dfbe2.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-25900f76.cjs.js');
+var createActor = require('./createActor-73aa92ba.cjs.js');
 var validation = require('./validation-4561b43c.cjs.js');
 
 var isDevelopment = false;
@@ -605,6 +605,15 @@ class StateMachine {
     /** @internal */
     this.idMap = new Map();
     this.root = void 0;
+    /**
+     * Returns the machine itself, never a Proxy wrapped around it (a function
+     * member is not wrapped by reactive proxies, so it still closes over the raw
+     * instance). Persistence resolves state nodes through it, matching the
+     * bound `transition` / `getInitialSnapshot`.
+     *
+     * @internal
+     */
+    this._raw = () => this;
     /**
      * The machine's `id`, or the empty string when the config declares none.
      * The root state node has this id; a machine without one has no `#id` root.
@@ -1291,10 +1300,117 @@ function eventSchema(machine) {
   }));
 }
 
+// TODO(v7): remove this module and its callers. It reads snapshots written by
+// 6.0.0-beta.1, which used `$`- and `_`-prefixed field names that stores such
+// as Convex reject. Snapshots are written with the new names only.
+
+// Legacy marker key -> [new key, other keys the marker object may have].
+const markers = {
+  $actor: ['@actor', ['incarnation']],
+  $error: ['@error', ['message']],
+  $stateNode: ['@stateNode', []],
+  $systemMapper: ['@systemMapper', []]
+};
+const fields = {
+  _stateInputs: 'stateInputs',
+  _nextTimerId: 'nextTimerId',
+  _nextActorIds: 'nextActorIds'
+};
+
+// Persisted snapshots are JSON; live objects (actors, state nodes, errors)
+// are left alone.
+function isPlain(value) {
+  if (!value || typeof value !== 'object') return false;
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null || Array.isArray(value);
+}
+function renameMarkers(value, allowed) {
+  if (!isPlain(value)) return value;
+  if (Array.isArray(value)) {
+    const items = value.map(item => renameMarkers(item, allowed));
+    return items.some((item, i) => item !== value[i]) ? items : value;
+  }
+  const keys = Object.keys(value);
+  const legacy = keys.find(key => allowed.includes(key));
+  if (legacy && typeof value[legacy] === 'string' && keys.every(key => key === legacy || markers[legacy][1].includes(key))) {
+    const {
+      [legacy]: name,
+      ...rest
+    } = value;
+    return {
+      [markers[legacy][0]]: name,
+      ...rest
+    };
+  }
+  let copy;
+  for (const key of keys) {
+    const item = renameMarkers(value[key], allowed);
+    if (item !== value[key]) (copy ??= {
+      ...value
+    })[key] = item;
+  }
+  return copy ?? value;
+}
+
+// beta.1 always wrote `_nextTimerId` on machine snapshots. Current snapshots
+// write `nextTimerId`, so marker-shaped data in them is left alone.
+function isLegacyEnvelope(envelope) {
+  return isPlain(envelope) && '_nextTimerId' in envelope && !('nextTimerId' in envelope);
+}
+function renameFields(envelope) {
+  // A live machine snapshot keeps its `_`-prefixed in-memory fields.
+  if (!isPlain(envelope) || typeof envelope.matches === 'function') return envelope;
+  let copy;
+  for (const [legacy, name] of Object.entries(fields)) {
+    if (legacy in envelope && !(name in envelope)) {
+      const {
+        [legacy]: value,
+        ...rest
+      } = copy ?? envelope;
+      copy = {
+        ...rest,
+        [name]: value
+      };
+    }
+  }
+  return copy ?? envelope;
+}
+
+/** Upgrades a persisted machine snapshot written by 6.0.0-beta.1. */
+function upgradeLegacyPersistedSnapshot(snapshot) {
+  if (snapshot?.machine && typeof snapshot.matches === 'function') return snapshot;
+  if (!isLegacyEnvelope(snapshot)) return snapshot;
+  return renameMarkers(renameFields(snapshot), ['$actor']);
+}
+
+/** Upgrades a `systemTransition` snapshot written by 6.0.0-beta.1. */
+function upgradeLegacySystemSnapshot(snapshot) {
+  const actors = Object.values(snapshot?.actors ?? {});
+  if (!actors.some(actor => isLegacyEnvelope(actor?.snapshot))) return snapshot;
+  const upgraded = renameMarkers(snapshot, Object.keys(markers));
+  if (!upgraded?.actors) return upgraded;
+  let renamed;
+  for (const [address, actor] of Object.entries(upgraded.actors)) {
+    const data = renameFields(actor?.snapshot);
+    if (data !== actor?.snapshot) (renamed ??= {
+      ...upgraded.actors
+    })[address] = {
+      ...actor,
+      snapshot: data
+    };
+  }
+  return renamed ? {
+    ...upgraded,
+    actors: renamed
+  } : upgraded;
+}
+
 exports.InvalidSnapshotError = InvalidSnapshotError;
 exports.StateMachine = StateMachine;
 exports.StateNode = StateNode;
 exports.eventSchema = eventSchema;
 exports.historicalEventSchema = historicalEventSchema;
 exports.snapshotSchema = snapshotSchema;
+exports.upgradeLegacyPersistedSnapshot = upgradeLegacyPersistedSnapshot;
+exports.upgradeLegacySystemSnapshot = upgradeLegacySystemSnapshot;
 exports.validatePersistedSnapshot = validatePersistedSnapshot;

package/dist/{machineSchemas-45c21bc2.esm.js → legacySnapshot-fffe81a0.esm.js}

@@ -1,4 +1,4 @@
-import { $ as resolveRegisteredActorSource, a0 as allocateChildId, a1 as assertChildIdFree, a2 as reserveChildId, a3 as hasUnescapedDot, x as xstateError, a4 as STATE_DELIMITER, a5 as mapValues, t as toArray, a6 as createInvokeId, a7 as getDelayedTransitions, a8 as getCandidates, a9 as evaluateCandidate, aa as formatTransition, ab as NULL_EVENT, ac as toTransitionConfigArray, ad as matchesActorSession, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, ae as describeMachine, o as isSerializedActorRef, af as formatRouteTransitions, ag as resolveStateValue, e as createMachineSnapshot, ah as isInFinalState, ai as createInertActorScope, aj as setInertActorScopeSnapshot, R as createDeadLetterEffect, ak as beginSpawnAllocation, al as attachSnapshotActorRef, am as macrostep, an as isInertActorScope, ao as setSnapshotActorRef, ap as cloneMachineSnapshot, aq as transitionNode, ar as XSTATE_TIMER, m as matchesEventDescriptor, as as getTransitionResult, at as hasEffect, au as createErrorPlatformEvent, av as withActorSelf, aw as resolveActionsWithContext, ax as takeSpawnAllocationCounters, ay as mergeActorIdCounters, Q as createInitEvent, az as createSpawnEffect, aA as initialMicrostep, aB as createStartEffect, aC as isStateId, aD as getPersistedSnapshot, aE as detachedScopes, h as createActor } from './createActor-cbe3abac.esm.js';
+import { a0 as resolveRegisteredActorSource, a1 as allocateChildId, a2 as assertChildIdFree, a3 as reserveChildId, a4 as hasUnescapedDot, x as xstateError, a5 as STATE_DELIMITER, a6 as mapValues, t as toArray, a7 as createInvokeId, a8 as getDelayedTransitions, a9 as getCandidates, aa as evaluateCandidate, ab as formatTransition, ac as NULL_EVENT, ad as toTransitionConfigArray, ae as matchesActorSession, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, af as describeMachine, o as isSerializedActorRef, ag as formatRouteTransitions, ah as resolveStateValue, e as createMachineSnapshot, ai as isInFinalState, aj as createInertActorScope, ak as setInertActorScopeSnapshot, S as createDeadLetterEffect, al as beginSpawnAllocation, am as attachSnapshotActorRef, an as macrostep, ao as isInertActorScope, ap as setSnapshotActorRef, aq as cloneMachineSnapshot, ar as transitionNode, as as XSTATE_TIMER, m as matchesEventDescriptor, at as getTransitionResult, au as hasEffect, av as createErrorPlatformEvent, aw as withActorSelf, ax as resolveActionsWithContext, ay as takeSpawnAllocationCounters, az as mergeActorIdCounters, R as createInitEvent, aA as createSpawnEffect, aB as initialMicrostep, aC as createStartEffect, aD as isStateId, aE as getPersistedSnapshot, aF as detachedScopes, h as createActor } from './createActor-49ea55ba.esm.js';
 import { a as assertValid } from './validation-05f1d517.esm.js';
 
 var isDevelopment = false;
@@ -603,6 +603,15 @@ class StateMachine {
     /** @internal */
     this.idMap = new Map();
     this.root = void 0;
+    /**
+     * Returns the machine itself, never a Proxy wrapped around it (a function
+     * member is not wrapped by reactive proxies, so it still closes over the raw
+     * instance). Persistence resolves state nodes through it, matching the
+     * bound `transition` / `getInitialSnapshot`.
+     *
+     * @internal
+     */
+    this._raw = () => this;
     /**
      * The machine's `id`, or the empty string when the config declares none.
      * The root state node has this id; a machine without one has no `#id` root.
@@ -1289,4 +1298,109 @@ function eventSchema(machine) {
   }));
 }
 
-export { InvalidSnapshotError as I, StateMachine as S, StateNode as a, eventSchema as e, historicalEventSchema as h, snapshotSchema as s, validatePersistedSnapshot as v };
+// TODO(v7): remove this module and its callers. It reads snapshots written by
+// 6.0.0-beta.1, which used `$`- and `_`-prefixed field names that stores such
+// as Convex reject. Snapshots are written with the new names only.
+
+// Legacy marker key -> [new key, other keys the marker object may have].
+const markers = {
+  $actor: ['@actor', ['incarnation']],
+  $error: ['@error', ['message']],
+  $stateNode: ['@stateNode', []],
+  $systemMapper: ['@systemMapper', []]
+};
+const fields = {
+  _stateInputs: 'stateInputs',
+  _nextTimerId: 'nextTimerId',
+  _nextActorIds: 'nextActorIds'
+};
+
+// Persisted snapshots are JSON; live objects (actors, state nodes, errors)
+// are left alone.
+function isPlain(value) {
+  if (!value || typeof value !== 'object') return false;
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null || Array.isArray(value);
+}
+function renameMarkers(value, allowed) {
+  if (!isPlain(value)) return value;
+  if (Array.isArray(value)) {
+    const items = value.map(item => renameMarkers(item, allowed));
+    return items.some((item, i) => item !== value[i]) ? items : value;
+  }
+  const keys = Object.keys(value);
+  const legacy = keys.find(key => allowed.includes(key));
+  if (legacy && typeof value[legacy] === 'string' && keys.every(key => key === legacy || markers[legacy][1].includes(key))) {
+    const {
+      [legacy]: name,
+      ...rest
+    } = value;
+    return {
+      [markers[legacy][0]]: name,
+      ...rest
+    };
+  }
+  let copy;
+  for (const key of keys) {
+    const item = renameMarkers(value[key], allowed);
+    if (item !== value[key]) (copy ??= {
+      ...value
+    })[key] = item;
+  }
+  return copy ?? value;
+}
+
+// beta.1 always wrote `_nextTimerId` on machine snapshots. Current snapshots
+// write `nextTimerId`, so marker-shaped data in them is left alone.
+function isLegacyEnvelope(envelope) {
+  return isPlain(envelope) && '_nextTimerId' in envelope && !('nextTimerId' in envelope);
+}
+function renameFields(envelope) {
+  // A live machine snapshot keeps its `_`-prefixed in-memory fields.
+  if (!isPlain(envelope) || typeof envelope.matches === 'function') return envelope;
+  let copy;
+  for (const [legacy, name] of Object.entries(fields)) {
+    if (legacy in envelope && !(name in envelope)) {
+      const {
+        [legacy]: value,
+        ...rest
+      } = copy ?? envelope;
+      copy = {
+        ...rest,
+        [name]: value
+      };
+    }
+  }
+  return copy ?? envelope;
+}
+
+/** Upgrades a persisted machine snapshot written by 6.0.0-beta.1. */
+function upgradeLegacyPersistedSnapshot(snapshot) {
+  if (snapshot?.machine && typeof snapshot.matches === 'function') return snapshot;
+  if (!isLegacyEnvelope(snapshot)) return snapshot;
+  return renameMarkers(renameFields(snapshot), ['$actor']);
+}
+
+/** Upgrades a `systemTransition` snapshot written by 6.0.0-beta.1. */
+function upgradeLegacySystemSnapshot(snapshot) {
+  const actors = Object.values(snapshot?.actors ?? {});
+  if (!actors.some(actor => isLegacyEnvelope(actor?.snapshot))) return snapshot;
+  const upgraded = renameMarkers(snapshot, Object.keys(markers));
+  if (!upgraded?.actors) return upgraded;
+  let renamed;
+  for (const [address, actor] of Object.entries(upgraded.actors)) {
+    const data = renameFields(actor?.snapshot);
+    if (data !== actor?.snapshot) (renamed ??= {
+      ...upgraded.actors
+    })[address] = {
+      ...actor,
+      snapshot: data
+    };
+  }
+  return renamed ? {
+    ...upgraded,
+    actors: renamed
+  } : upgraded;
+}
+
+export { InvalidSnapshotError as I, StateMachine as S, StateNode as a, upgradeLegacyPersistedSnapshot as b, eventSchema as e, historicalEventSchema as h, snapshotSchema as s, upgradeLegacySystemSnapshot as u, validatePersistedSnapshot as v };

package/dist/xstate-actors.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createActor = require('./createActor-25900f76.cjs.js');
+var createActor = require('./createActor-73aa92ba.cjs.js');
 var validation = require('./validation-4561b43c.cjs.js');
 
 /** @public */
@@ -253,6 +253,7 @@ function createStepLogic(config) {
 }
 
 const instanceStates = /* #__PURE__ */new WeakMap();
+const XSTATE_CALLBACK_SEND_BACK = 'xstate.callback.sendBack';
 
 /** @public */
 
@@ -372,8 +373,10 @@ function createCallbackLogic(callbackOrConfig) {
   const callback = typeof callbackOrConfig === 'function' ? callbackOrConfig : callbackOrConfig.run;
   const schemas = typeof callbackOrConfig === 'function' ? undefined : callbackOrConfig.schemas;
   const validator = typeof callbackOrConfig === 'function' ? undefined : callbackOrConfig.validator;
-  return createStepLogic({
-    validator,
+  const logic = createStepLogic({
+    validator: validator && {
+      check: request => request.kind === 'event' && request.event.type === XSTATE_CALLBACK_SEND_BACK ? undefined : validator.check(request)
+    },
     schemas,
     context: undefined,
     run: (args, enq) => {
@@ -383,6 +386,10 @@ function createCallbackLogic(callbackOrConfig) {
         self,
         system
       } = args;
+      if (event.type === XSTATE_CALLBACK_SEND_BACK) {
+        enq.sendBack(event.event);
+        return;
+      }
       const emit = args.emit;
       const callbackState = instanceStates.get(self);
       callbackState?.receivers?.forEach(receiver => receiver(event));
@@ -402,7 +409,10 @@ function createCallbackLogic(callbackOrConfig) {
             }
             const parent = self._parent;
             if (parent) {
-              system._relay(self, parent, event);
+              system._relay(self, self, {
+                type: XSTATE_CALLBACK_SEND_BACK,
+                event
+              });
             }
           },
           receive: listener => {
@@ -419,6 +429,10 @@ function createCallbackLogic(callbackOrConfig) {
       });
     }
   });
+  Object.assign(logic, {
+    isInternalEventType: eventType => eventType === XSTATE_CALLBACK_SEND_BACK
+  });
+  return logic;
 }
 
 const XSTATE_OBSERVABLE_NEXT = 'xstate.observable.next';
@@ -667,6 +681,11 @@ function createEventObservableLogic(lazyObservableOrConfig) {
         return [state, []];
       }
       switch (event.type) {
+        case XSTATE_OBSERVABLE_NEXT:
+          {
+            const parent = actorScope.self._parent;
+            return [state, parent ? [createActor.createSendToEffect(actorScope, parent, event.data)] : []];
+          }
         case XSTATE_OBSERVABLE_ERROR:
           return createActor.finalizeTransitionResult(actorScope, state, [{
             ...state,
@@ -732,7 +751,10 @@ function createEventObservableLogic(lazyObservableOrConfig) {
       }).subscribe({
         next: value => {
           if (self._parent) {
-            system._relay(self, self._parent, value);
+            system._relay(self, self, {
+              type: XSTATE_OBSERVABLE_NEXT,
+              data: value
+            });
           }
         },
         error: err => {
@@ -757,6 +779,9 @@ function createEventObservableLogic(lazyObservableOrConfig) {
       _subscription: undefined
     })
   };
+  Object.assign(logic, {
+    isInternalEventType: eventType => eventType === XSTATE_OBSERVABLE_NEXT || eventType === XSTATE_OBSERVABLE_ERROR || eventType === XSTATE_OBSERVABLE_COMPLETE
+  });
   return logic;
 }
 

package/dist/xstate-actors.development.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createActor = require('./createActor-a49ae0ce.development.cjs.js');
+var createActor = require('./createActor-dfb6b790.development.cjs.js');
 var validation = require('./validation-f2714a35.development.cjs.js');
 
 /** @public */
@@ -253,6 +253,7 @@ function createStepLogic(config) {
 }
 
 const instanceStates = /* #__PURE__ */new WeakMap();
+const XSTATE_CALLBACK_SEND_BACK = 'xstate.callback.sendBack';
 
 /** @public */
 
@@ -372,8 +373,10 @@ function createCallbackLogic(callbackOrConfig) {
   const callback = typeof callbackOrConfig === 'function' ? callbackOrConfig : callbackOrConfig.run;
   const schemas = typeof callbackOrConfig === 'function' ? undefined : callbackOrConfig.schemas;
   const validator = typeof callbackOrConfig === 'function' ? undefined : callbackOrConfig.validator;
-  return createStepLogic({
-    validator,
+  const logic = createStepLogic({
+    validator: validator && {
+      check: request => request.kind === 'event' && request.event.type === XSTATE_CALLBACK_SEND_BACK ? undefined : validator.check(request)
+    },
     schemas,
     context: undefined,
     run: (args, enq) => {
@@ -383,6 +386,10 @@ function createCallbackLogic(callbackOrConfig) {
         self,
         system
       } = args;
+      if (event.type === XSTATE_CALLBACK_SEND_BACK) {
+        enq.sendBack(event.event);
+        return;
+      }
       const emit = args.emit;
       const callbackState = instanceStates.get(self);
       callbackState?.receivers?.forEach(receiver => receiver(event));
@@ -402,7 +409,10 @@ function createCallbackLogic(callbackOrConfig) {
             }
             const parent = self._parent;
             if (parent) {
-              system._relay(self, parent, event);
+              system._relay(self, self, {
+                type: XSTATE_CALLBACK_SEND_BACK,
+                event
+              });
             }
           },
           receive: listener => {
@@ -419,6 +429,10 @@ function createCallbackLogic(callbackOrConfig) {
       });
     }
   });
+  Object.assign(logic, {
+    isInternalEventType: eventType => eventType === XSTATE_CALLBACK_SEND_BACK
+  });
+  return logic;
 }
 
 const XSTATE_OBSERVABLE_NEXT = 'xstate.observable.next';
@@ -667,6 +681,11 @@ function createEventObservableLogic(lazyObservableOrConfig) {
         return [state, []];
       }
       switch (event.type) {
+        case XSTATE_OBSERVABLE_NEXT:
+          {
+            const parent = actorScope.self._parent;
+            return [state, parent ? [createActor.createSendToEffect(actorScope, parent, event.data)] : []];
+          }
         case XSTATE_OBSERVABLE_ERROR:
           return createActor.finalizeTransitionResult(actorScope, state, [{
             ...state,
@@ -732,7 +751,10 @@ function createEventObservableLogic(lazyObservableOrConfig) {
       }).subscribe({
         next: value => {
           if (self._parent) {
-            system._relay(self, self._parent, value);
+            system._relay(self, self, {
+              type: XSTATE_OBSERVABLE_NEXT,
+              data: value
+            });
           }
         },
         error: err => {
@@ -757,6 +779,9 @@ function createEventObservableLogic(lazyObservableOrConfig) {
       _subscription: undefined
     })
   };
+  Object.assign(logic, {
+    isInternalEventType: eventType => eventType === XSTATE_OBSERVABLE_NEXT || eventType === XSTATE_OBSERVABLE_ERROR || eventType === XSTATE_OBSERVABLE_COMPLETE
+  });
   return logic;
 }