@typeonce/effect-machine 0.7.0 → 0.9.0

package/src/internal/machine/symbols.ts

@@ -1,2 +1,5 @@
 /** @internal */
 export const InitialEventTypeId: unique symbol = Symbol("effect/Machine/InitialEvent")
+
+/** @internal Returns process logic for a child descriptor and optional input. */
+export const ChildMachineLogicTypeId: unique symbol = Symbol("effect/Machine/ChildMachineLogic")

package/src/internal/machine/topology.ts

@@ -70,7 +70,7 @@ interface NormalizedStateNodeDefinitionBase {
 type NormalizedStateNodeDefinition =
   | (NormalizedStateNodeDefinitionBase & {
     readonly type: "atomic"
-    readonly schema: Machine.TaggedSchema
+    readonly schema: Machine.TaggedSchema | undefined
     readonly output: undefined
     readonly history: undefined
     readonly initial: undefined
@@ -78,7 +78,7 @@ type NormalizedStateNodeDefinition =
   })
   | (NormalizedStateNodeDefinitionBase & {
     readonly type: "compound"
-    readonly schema: Machine.TaggedSchema
+    readonly schema: Machine.TaggedSchema | undefined
     readonly output: undefined
     readonly history: undefined
     readonly initial: string
@@ -86,7 +86,7 @@ type NormalizedStateNodeDefinition =
   })
   | (NormalizedStateNodeDefinitionBase & {
     readonly type: "parallel"
-    readonly schema: Machine.TaggedSchema
+    readonly schema: Machine.TaggedSchema | undefined
     readonly output: Schema.Top | undefined
     readonly history: undefined
     readonly initial: undefined
@@ -94,7 +94,7 @@ type NormalizedStateNodeDefinition =
   })
   | (NormalizedStateNodeDefinitionBase & {
     readonly type: "final"
-    readonly schema: Machine.TaggedSchema
+    readonly schema: Machine.TaggedSchema | undefined
     readonly output: Schema.Top | undefined
     readonly history: undefined
     readonly initial: undefined
@@ -154,9 +154,10 @@ export const getStateNodeDefinition = (
       states: undefined
     }
   }
-  if (!hasProperty(definition, "schema") || !Schema.isSchema(definition.schema)) {
-    throw new Error(`Machine.make expected state "${path}" to be a tagged schema or state node config`)
-  }
+  const schema = hasProperty(definition, "schema") && Schema.isSchema(definition.schema)
+    ? definition.schema as Machine.TaggedSchema
+    : undefined
+  const annotations = schema === undefined ? definition.annotations : Schema.resolveAnnotations(schema)
   if (definition.type === "parallel" && !hasProperty(definition, "states")) {
     throw new Error(`Machine.make expected parallel state "${path}" to declare child regions`)
   }
@@ -167,9 +168,9 @@ export const getStateNodeDefinition = (
     }
     if (definition.type === "parallel") {
       return {
-        schema: definition.schema,
+        schema,
         output: Schema.isSchema(definition.output) ? definition.output : undefined,
-        annotations: Schema.resolveAnnotations(definition.schema),
+        annotations,
         type: "parallel",
         history: undefined,
         initial: undefined,
@@ -180,9 +181,9 @@ export const getStateNodeDefinition = (
       throw new Error(`Machine.make expected compound state "${path}" to declare an initial child`)
     }
     return {
-      schema: definition.schema,
+      schema,
       output: undefined,
-      annotations: Schema.resolveAnnotations(definition.schema),
+      annotations,
       type: "compound",
       history: undefined,
       initial: definition.initial,
@@ -192,18 +193,18 @@ export const getStateNodeDefinition = (
   const output = Schema.isSchema(definition.output) ? definition.output : undefined
   return definition.type === "final"
     ? {
-      schema: definition.schema,
+      schema,
       output,
-      annotations: Schema.resolveAnnotations(definition.schema),
+      annotations,
       type: "final",
       history: undefined,
       initial: undefined,
       states: undefined
     }
     : {
-      schema: definition.schema,
+      schema,
       output: undefined,
-      annotations: Schema.resolveAnnotations(definition.schema),
+      annotations,
       type: "atomic",
       history: undefined,
       initial: undefined,
@@ -391,6 +392,29 @@ export const transitionDefinitions = (
         targets: transitionTargets(config.onDone)
       })
     }
+    const invokes = config.invoke === undefined
+      ? []
+      : Array.isArray(config.invoke)
+      ? config.invoke
+      : [config.invoke]
+    for (const invoke of invokes) {
+      const id = "child" in invoke ? String(invoke.child.id) : String(invoke.id)
+      for (const outcome of ["done", "failure", "snapshot"] as const) {
+        const handler = outcome === "done"
+          ? invoke.onDone
+          : outcome === "failure"
+          ? invoke.onFailure
+          : invoke.onSnapshot
+        if (handler !== undefined) {
+          definitions.push({
+            source: node.path,
+            trigger: { type: "invoke", id, outcome },
+            reenter: typeof handler === "object" && handler !== null && handler.reenter === true,
+            targets: transitionTargets(handler)
+          })
+        }
+      }
+    }
   }
   return definitions
 }
@@ -405,7 +429,7 @@ export const makeTarget = <
     readonly snapshot?: Machine.SnapshotByIdentifier<States, StateId>
     readonly values?: Partial<
       {
-        readonly [AncestorStateId in Machine.StateIdentifier<States>]: Machine.StateByIdentifier<
+        readonly [AncestorStateId in Machine.ValuedStateIdentifier<States>]: Machine.StateByIdentifier<
           States,
           AncestorStateId
         >
@@ -445,7 +469,9 @@ export const getSnapshotByPath = (
     return Option.none()
   }
   if (parents !== undefined) {
-    parents[snapshot.path] = snapshot.value
+    if (snapshot.value !== undefined) {
+      parents[snapshot.path] = snapshot.value
+    }
   }
   if (hasProperty(snapshot, "state") && isSnapshot(snapshot.state)) {
     return getSnapshotByPath(snapshot.state, path, parents)
@@ -473,7 +499,7 @@ export const getNode = (machine: Machine.Any, path: string): Machine.StateNode =
 
 export const getStateNodeSchema = (node: Machine.StateNode): Machine.TaggedSchema => {
   if (node.schema === undefined) {
-    throw new Error(`Machine pseudo-state "${node.path}" has no active value schema`)
+    throw new Error(`Machine state "${node.path}" has no value schema`)
   }
   return node.schema
 }

package/src/internal/testing/machine/verification.ts

@@ -1114,7 +1114,9 @@ export const verify = <M extends AnyMachine>(
         }
         return
       }
-      if (reportConfiguration && !schemaMatches(node.schema, current.value)) {
+      if (reportConfiguration && node.schema === undefined && current.value !== undefined) {
+        add("configuration.schema", location, `${label} structural state "${path}" contains a value`, path)
+      } else if (reportConfiguration && node.schema !== undefined && !schemaMatches(node.schema, current.value)) {
         add("configuration.schema", location, `${label} value for "${path}" does not match its schema`, path)
       }
 
@@ -1284,9 +1286,17 @@ export const verify = <M extends AnyMachine>(
             path
           )
         }
-        if (!hasOwn(entry.values, path)) {
+        const hasValue = hasOwn(entry.values, path)
+        if (node.schema === undefined && hasValue) {
+          add(
+            "history.value",
+            location,
+            `${label} history record "${historyPath}" values structural state "${path}"`,
+            path
+          )
+        } else if (node.schema !== undefined && !hasValue) {
           add("history.value", location, `${label} history record "${historyPath}" omits value for "${path}"`, path)
-        } else if (!schemaMatches(node.schema, entry.values[path])) {
+        } else if (node.schema !== undefined && !schemaMatches(node.schema, entry.values[path])) {
           add(
             "history.value",
             location,

package/src/unstable/reactivity/AtomMachine.ts

@@ -291,6 +291,13 @@ type SnapshotIdentifier<State> = SnapshotNode<State> extends infer Node ?
   Node extends { readonly path: infer Path extends string } ? Path : never
   : never
 
+type ValuedSnapshotIdentifier<State> = SnapshotNode<State> extends infer Node ?
+  Node extends { readonly path: infer Path extends string; readonly value: infer Value } ?
+    [Value] extends [undefined] ? never
+    : Path
+  : never
+  : never
+
 type SnapshotValueByIdentifier<State, Path extends SnapshotIdentifier<State>> = SnapshotNode<State> extends infer Node ?
   Node extends { readonly path: Path; readonly value: infer Value } ? Value : never
   : never
@@ -338,7 +345,7 @@ export const select: <
   Error,
   Output,
   StartError,
-  const Path extends SnapshotIdentifier<State>
+  const Path extends ValuedSnapshotIdentifier<State>
 >(self: MachineAtom<State, Event, Error, Output, StartError>, path: Path) => Atom.Atom<
   AsyncResult.AsyncResult<Option.Option<SnapshotValueByIdentifier<State, Path>>, StartError | Error>
 > = internal.select
@@ -384,7 +391,7 @@ export const selectSnapshot: <
 export const selectChild: <
   Child extends Machine.ChildMachine.Any,
   StartError,
-  const Path extends SnapshotIdentifier<ChildState<Child>>
+  const Path extends ValuedSnapshotIdentifier<ChildState<Child>>
 >(self: ChildMachineAtom<Child, StartError>, path: Path) => Atom.Atom<
   AsyncResult.AsyncResult<
     Option.Option<SnapshotValueByIdentifier<ChildState<Child>, Path>>,
@@ -530,7 +537,7 @@ type MachineInputArgsOf<M extends Machine.Machine.Any> = [
 
 type MachineAtomOf<M extends Machine.Machine.Any, RuntimeError> = MachineAtom<
   Machine.Machine.Snapshot<Machine.Machine.States<M>>,
-  Machine.Machine.InputEvent<M>,
+  Machine.Machine.EventInput<Machine.Machine.InputEvent<M>>,
   MachineRuntimeError<Machine.Machine.Error<M>, Machine.Machine.Services<M>>,
   Machine.Machine.Output<M>,
   MachineStartError<
@@ -544,7 +551,7 @@ type MachineAtomOf<M extends Machine.Machine.Any, RuntimeError> = MachineAtom<
 
 type ResumedMachineAtomOf<M extends Machine.Machine.Any, RuntimeError> = MachineAtom<
   Machine.Machine.Snapshot<Machine.Machine.States<M>>,
-  Machine.Machine.InputEvent<M>,
+  Machine.Machine.EventInput<Machine.Machine.InputEvent<M>>,
   MachineRuntimeError<Machine.Machine.Error<M>, Machine.Machine.Services<M>>,
   Machine.Machine.Output<M>,
   Machine.MachineSchemaDecodeError | RuntimeError
@@ -654,7 +661,7 @@ export const make: {
     ...args: [...Machine.Machine.InputArgs<Input>]
   ): MachineAtom<
     Machine.Machine.Snapshot<States>,
-    Machine.Machine.EventOf<InputEvents>,
+    Machine.Machine.EventInputOf<InputEvents>,
     MachineRuntimeError<E, R>,
     Output,
     MachineStartError<InitialE, E, InitialR, R>