refactor: improve internal types

refactor: continue improving internal types

refactor: again

chore: wip

chore: more wip

Author: Handfish

apps/demo/src/data-access/garage-door-operations.ts

@@ -3,6 +3,7 @@ import {
   createMachine,
   effect,
   interpret,
+  invoke,
   sendParent,
   type MachineSnapshot,
   type MachineActor,
@@ -205,7 +206,7 @@ export class GarageDoorMachineService extends Effect.Service<GarageDoorMachineSe
               assign(() => ({ position: 100, lastUpdated: new Date(), weather: { status: "loading" } })),
               effect(() => Effect.log("Entering: open - fetching weather")),
             ],
-            invoke: {
+            invoke: invoke({
               id: "fetchWeather",
               src: () => weatherService.getWeather(DEFAULT_LAT, DEFAULT_LON),
               assignResult: {
@@ -229,7 +230,7 @@ export class GarageDoorMachineService extends Effect.Service<GarageDoorMachineSe
                   weather: { status: "error", error: `Unexpected: ${String(defect)}` },
                 }),
               },
-            },
+            }),
             on: {
               CLICK: { target: "closing", guard: ({ context }) => context.isPowered },
               POWER_ON: { actions: [assign(() => ({ isPowered: true }))] },

apps/docs/src/content/docs/api/actions.mdx

@@ -350,7 +350,7 @@ function assignOnDefect<TContext>(
 **Example:**
 
 ```typescript
-invoke: {
+invoke: invoke({
   src: () => fetchUser(),
   onSuccess: {
     target: "ready",
@@ -369,7 +369,7 @@ invoke: {
       })),
     ],
   },
-}
+})
 ```
 
 ---
@@ -379,7 +379,7 @@ invoke: {
 A shorthand for handling all invoke outcomes in one place. Use this when you want to update context without transitioning to different states.
 
 ```typescript
-invoke: {
+invoke: invoke({
   src: () => Effect<TOutput, TError, R>,
   assignResult: {
     success: (params: { context: TContext; output: TOutput }) => Partial<TContext>;
@@ -389,13 +389,13 @@ invoke: {
     };
     defect?: (params: { context: TContext; defect: unknown }) => Partial<TContext>;
   }
-}
+})
 ```
 
 **Example:**
 
 ```typescript
-invoke: {
+invoke: invoke({
   src: () => fetchWeather(),
   assignResult: {
     success: ({ output }) => ({
@@ -408,13 +408,13 @@ invoke: {
       weather: { status: "crashed", message: String(defect) },
     }),
   },
-}
+})
 ```
 
 **With typed error handling:**
 
 ```typescript
-invoke: {
+invoke: invoke({
   src: () => fetchWeather(), // Effect<Weather, NetworkError | ParseError, never>
   assignResult: {
     success: ({ output }) => ({ weather: output }),
@@ -429,7 +429,7 @@ invoke: {
     failure: ({ error }) => ({ error: error.message }), // Fallback
     defect: ({ defect }) => ({ error: String(defect) }),
   },
-}
+})
 ```
 
 ## See Also

apps/docs/src/content/docs/api/create-machine.mdx

@@ -276,7 +276,11 @@ const machine = createMachine({
 
 ### With Invoke
 
+Use the `invoke()` helper for proper type inference:
+
 ```typescript
+import { createMachine, assign, invoke } from "effstate";
+
 const machine = createMachine({
   id: "userLoader",
   initial: "idle",
@@ -287,7 +291,7 @@ const machine = createMachine({
       on: { LOAD: { target: "loading" } },
     },
     loading: {
-      invoke: {
+      invoke: invoke({
         id: "loadUser",
         src: ({ context }) => fetchUser(context.userId),
         onSuccess: {
@@ -298,7 +302,7 @@ const machine = createMachine({
           target: "error",
           actions: [assign(({ event }) => ({ error: event.error }))],
         },
-      },
+      }),
     },
     ready: {},
     error: {},

apps/docs/src/content/docs/api/interpret.mdx

@@ -66,6 +66,8 @@ Effect.runPromise(
 ### With Service Dependencies
 
 ```typescript
+import { createMachine, invoke, interpret } from "effstate";
+
 class ApiClient extends Effect.Service<ApiClient>()("ApiClient", {
   succeed: {
     fetchUser: (id: string) => Effect.tryPromise(() => fetch(`/api/users/${id}`)),
@@ -76,14 +78,14 @@ class ApiClient extends Effect.Service<ApiClient>()("ApiClient", {
 const userMachine = createMachine({
   states: {
     loading: {
-      invoke: {
+      invoke: invoke({
         src: ({ context }) =>
           Effect.gen(function* () {
             const api = yield* ApiClient;
             return yield* api.fetchUser(context.userId);
           }),
         onSuccess: { target: "ready" },
-      },
+      }),
     },
   },
 });
@@ -189,22 +191,22 @@ function withRequirements<R>(): <...>(
 ### Example
 
 ```typescript
-import { withRequirements, createMachine } from "effstate";
+import { withRequirements, createMachine, invoke } from "effstate";
 
 // Machine that uses WeatherService in its invoke
 const garageDoorMachine = withRequirements<WeatherService>()(
   createMachine({
     id: "garageDoor",
     states: {
       checking: {
-        invoke: {
+        invoke: invoke({
           src: () =>
             Effect.gen(function* () {
               const weather = yield* WeatherService;
               return yield* weather.getCurrentWeather();
             }),
           onSuccess: { target: "ready" },
-        },
+        }),
       },
     },
   })

apps/docs/src/content/docs/api/types.mdx

@@ -161,17 +161,6 @@ actor.on<{ type: "notification"; message: string }>("notification", (event) => {
 
 ---
 
-## Effect.Service Pattern Types
-
-When using the Effect.Service pattern, these utility types help extract service requirements:
-
-```typescript
-import type { MachineServiceR } from "effstate";
-
-// Get R channel from a machine service
-type Requirements = MachineServiceR<typeof MyMachineService>;
-```
-
 ## See Also
 
 - [createMachine](/api/create-machine/) - Creating machine definitions

apps/docs/src/content/docs/getting-started/introduction.mdx

@@ -16,7 +16,7 @@ The recommended pattern for using effstate is to wrap your machines in `Effect.S
 - **Type Safety** - Full inference for dependencies and effects
 
 ```typescript
-import { createMachine, interpret, assign, effect } from "effstate";
+import { createMachine, interpret, assign, effect, invoke } from "effstate";
 import { Data, Effect, Schema } from "effect";
 
 // Define events
@@ -57,7 +57,7 @@ export class ConnectionMachine extends Effect.Service<ConnectionMachine>()(
             },
           },
           connecting: {
-            invoke: {
+            invoke: invoke({
               src: () => api.connect(), // Use injected service
               onSuccess: { target: "connected" },
               onFailure: {
@@ -69,7 +69,7 @@ export class ConnectionMachine extends Effect.Service<ConnectionMachine>()(
                   })),
                 ],
               },
-            },
+            }),
           },
           connected: {
             entry: [assign({ status: "connected", retryCount: 0 })],

apps/docs/src/content/docs/guides/actions.mdx

@@ -397,9 +397,9 @@ Special assign helpers for invoke handlers with proper typing:
 ### assignOnSuccess
 
 ```typescript
-import { assignOnSuccess } from "effstate";
+import { assignOnSuccess, invoke } from "effstate";
 
-invoke: {
+invoke: invoke({
   src: () => fetchUser(),
   onSuccess: {
     target: "ready",
@@ -410,15 +410,15 @@ invoke: {
       })),
     ],
   },
-}
+})
 ```
 
 ### assignOnFailure
 
 ```typescript
-import { assignOnFailure } from "effstate";
+import { assignOnFailure, invoke } from "effstate";
 
-invoke: {
+invoke: invoke({
   src: () => fetchUser(),
   onFailure: {
     target: "error",
@@ -428,15 +428,15 @@ invoke: {
       })),
     ],
   },
-}
+})
 ```
 
 ### assignOnDefect
 
 ```typescript
-import { assignOnDefect } from "effstate";
+import { assignOnDefect, invoke } from "effstate";
 
-invoke: {
+invoke: invoke({
   src: () => fetchUser(),
   onDefect: {
     target: "crashed",
@@ -446,7 +446,7 @@ invoke: {
       })),
     ],
   },
-}
+})
 ```
 
 ## Action Order

apps/docs/src/content/docs/guides/activities.mdx

@@ -254,9 +254,9 @@ activities: [
 ]
 
 // Invoke: one-shot operation with result handling
-invoke: {
+invoke: invoke({
   src: () => fetchUser(),
   onSuccess: { target: "ready" },
   onFailure: { target: "error" },
-}
+})
 ```

apps/docs/src/content/docs/guides/guards.mdx

@@ -167,7 +167,7 @@ The first transition whose guard returns `true` (or has no guard) will be taken.
 Guards can also control invoke result handling:
 
 ```typescript
-invoke: {
+invoke: invoke({
   src: () => fetchUser(),
   onSuccess: [
     {
@@ -179,7 +179,7 @@ invoke: {
       // No guard - default case
     },
   ],
-}
+})
 ```
 
 ## Type-Safe Guards
@@ -212,7 +212,7 @@ states: {
     },
   },
   validating: {
-    invoke: {
+    invoke: invoke({
       src: ({ context }) => validateData(context.data),
       onSuccess: {
         target: "valid",
@@ -223,7 +223,7 @@ states: {
         // Fallback when validation fails
       },
       onFailure: { target: "error" },
-    },
+    }),
   },
   valid: { /* proceed */ },
   invalid: { /* show errors */ },