V5 (WIP)

packages/core/src/Machine.ts

@@ -42,6 +42,6 @@ export function createMachine<
 >(
   config: MachineConfig<TContext, TEvent, any>,
   options?: Partial<MachineOptions<TContext, TEvent>>
-): MachineNode<TContext, TEvent, TTypestate> {
+): MachineNode<TContext, TEvent, any, TTypestate> {
   return new MachineNode<TContext, TEvent, TTypestate>(config, options);
 }

packages/core/src/types.ts

@@ -1014,6 +1014,20 @@ export interface InterpreterOptions {
 
 export type AnyInterpreter = Interpreter<any, any, any>;
 
+/**
+ * Represents the `Interpreter` type of a given `MachineNode`.
+ *
+ * @typeParam TM - the machine to infer the interpreter's types from
+ */
+export type InterpreterOf<TM extends MachineNode> = TM extends MachineNode<
+  infer TContext,
+  infer TEvent,
+  infer TStateSchema,
+  infer TTypestate
+>
+  ? Interpreter<TContext, TEvent, TStateSchema, TTypestate>
+  : never;
+
 export declare namespace SCXML {
   // tslint:disable-next-line:no-shadowed-variable
   export interface Event<TEvent extends EventObject> {

packages/xstate-react/src/useMachine.ts

@@ -12,7 +12,8 @@ import {
   Typestate,
   ActionObject,
   ActionFunction,
-  ActionMeta
+  ActionMeta,
+  InterpreterOf
 } from 'xstate';
 import useConstant from './useConstant';
 import { partition } from './utils';
@@ -109,8 +110,8 @@ export function useMachine<
     Partial<MachineOptions<TContext, TEvent>> = {}
 ): [
   State<TContext, TEvent, any, TTypestate>,
-  Interpreter<TContext, TEvent, TTypestate>['send'],
-  Interpreter<TContext, TEvent, TTypestate>
+  InterpreterOf<typeof machine>['send'],
+  InterpreterOf<typeof machine>
 ] {
   if (process.env.NODE_ENV !== 'production') {
     const [initialMachine] = useState(machine);

packages/xstate-vue/src/index.ts

@@ -15,7 +15,8 @@ import {
   InterpreterOptions,
   MachineOptions,
   StateConfig,
-  Typestate
+  Typestate,
+  InterpreterOf
 } from 'xstate';
 
 interface UseMachineOptions<TContext, TEvent extends EventObject> {
@@ -40,9 +41,9 @@ export function useMachine<
     Partial<UseMachineOptions<TContext, TEvent>> &
     Partial<MachineOptions<TContext, TEvent>> = {}
 ): {
-  state: Ref<State<TContext, TEvent>, any, TTypestate>;
-  send: Interpreter<TContext, TEvent, any, TTypestate>['send'];
-  service: Interpreter<TContext, TEvent, any, TTypestate>;
+  state: Ref<State<TContext, TEvent, any, TTypestate>>;
+  send: InterpreterOf<typeof machine>['send'];
+  service: InterpreterOf<typeof machine>;
 } {
   const {
     context,