@doeixd/machine 0.0.13 → 0.0.18

package/dist/types/middleware/history.d.ts

@@ -0,0 +1,54 @@
+/**
+ * @file History tracking middleware
+ */
+import type { BaseMachine } from '../index';
+/**
+ * A single history entry recording a transition.
+ */
+export interface HistoryEntry {
+    /** Unique ID for this history entry */
+    id: string;
+    /** Name of the transition that was called */
+    transitionName: string;
+    /** Arguments passed to the transition */
+    args: any[];
+    /** Timestamp when the transition occurred */
+    timestamp: number;
+    /** Optional serialized version of args for persistence */
+    serializedArgs?: string;
+}
+/**
+ * Serializer interface for converting context/args to/from strings.
+ */
+export interface Serializer<T = any> {
+    serialize: (value: T) => string;
+    deserialize: (str: string) => T;
+}
+/**
+ * Creates a machine with history tracking capabilities.
+ * Records all transitions that occur, allowing you to see the sequence of state changes.
+ *
+ * @template M - The machine type
+ * @param machine - The machine to track
+ * @param options - Configuration options
+ * @returns A new machine with history tracking
+ *
+ * @example
+ * ```typescript
+ * const tracked = withHistory(counter, { maxSize: 50 });
+ * tracked.increment();
+ * console.log(tracked.history); // [{ id: "entry-1", transitionName: "increment", ... }]
+ * ```
+ */
+export declare function withHistory<M extends BaseMachine<any>>(machine: M, options?: {
+    /** Maximum number of history entries to keep (default: unlimited) */
+    maxSize?: number;
+    /** Optional serializer for transition arguments */
+    serializer?: Serializer<any[]>;
+    /** Callback when a transition occurs */
+    onEntry?: (entry: HistoryEntry) => void;
+}): M & {
+    history: HistoryEntry[];
+    clearHistory: () => void;
+};
+//# sourceMappingURL=history.d.ts.map

package/dist/types/middleware/history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../../src/middleware/history.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5C;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,6CAA6C;IAC7C,cAAc,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC;IAChC,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;CACjC;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EACpD,OAAO,EAAE,CAAC,EACV,OAAO,GAAE;IACP,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,UAAU,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/B,wCAAwC;IACxC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CACpC,GACL,CAAC,GAAG;IAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,IAAI,CAAA;CAAE,CAsC3D"}

package/dist/types/middleware/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @file Middleware module exports
+ * @description Unified exports for all middleware functionality
+ */
+export * from './core';
+export * from './history';
+export * from './snapshot';
+export * from './time-travel';
+export * from './composition';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/middleware/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/middleware/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,cAAc,QAAQ,CAAC;AAGvB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}

package/dist/types/middleware/snapshot.d.ts

@@ -0,0 +1,63 @@
+/**
+ * @file Snapshot tracking middleware for context state
+ */
+import type { Context, BaseMachine } from '../index';
+import type { Serializer } from './history';
+/**
+ * A snapshot of machine context before and after a transition.
+ */
+export interface ContextSnapshot<C extends object> {
+    /** Unique ID for this snapshot */
+    id: string;
+    /** Name of the transition that caused this snapshot */
+    transitionName: string;
+    /** Context before the transition */
+    before: C;
+    /** Context after the transition */
+    after: C;
+    /** Timestamp of the snapshot */
+    timestamp: number;
+    /** Optional serialized versions of contexts */
+    serializedBefore?: string;
+    serializedAfter?: string;
+    /** Optional diff information */
+    diff?: any;
+}
+/**
+ * Creates a machine with snapshot tracking capabilities.
+ * Records context state before and after each transition for debugging and inspection.
+ *
+ * @template M - The machine type
+ * @param machine - The machine to track
+ * @param options - Configuration options
+ * @returns A new machine with snapshot tracking
+ *
+ * @example
+ * ```typescript
+ * const tracked = withSnapshot(counter, {
+ *   maxSize: 50,
+ *   serializer: {
+ *     serialize: (ctx) => JSON.stringify(ctx),
+ *     deserialize: (str) => JSON.parse(str)
+ *   }
+ * });
+ *
+ * tracked.increment();
+ * console.log(tracked.snapshots); // [{ before: { count: 0 }, after: { count: 1 }, ... }]
+ * ```
+ */
+export declare function withSnapshot<M extends BaseMachine<any>>(machine: M, options?: {
+    /** Maximum number of snapshots to keep (default: unlimited) */
+    maxSize?: number;
+    /** Optional serializer for context */
+    serializer?: Serializer<Context<M>>;
+    /** Custom function to capture additional snapshot data */
+    captureSnapshot?: (before: Context<M>, after: Context<M>) => any;
+    /** Only capture snapshots where context actually changed */
+    onlyOnChange?: boolean;
+}): M & {
+    snapshots: ContextSnapshot<Context<M>>[];
+    clearSnapshots: () => void;
+    restoreSnapshot: (snapshot: ContextSnapshot<Context<M>>['before']) => M;
+};
+//# sourceMappingURL=snapshot.d.ts.map

package/dist/types/middleware/snapshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../src/middleware/snapshot.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAM5C;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,MAAM;IAC/C,kCAAkC;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,uDAAuD;IACvD,cAAc,EAAE,MAAM,CAAC;IACvB,oCAAoC;IACpC,MAAM,EAAE,CAAC,CAAC;IACV,mCAAmC;IACnC,KAAK,EAAE,CAAC,CAAC;IACT,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gCAAgC;IAChC,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAMD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EACrD,OAAO,EAAE,CAAC,EACV,OAAO,GAAE;IACP,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,0DAA0D;IAC1D,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;IACjE,4DAA4D;IAC5D,YAAY,CAAC,EAAE,OAAO,CAAC;CACnB,GACL,CAAC,GAAG;IACL,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;CACzE,CA4EA"}

package/dist/types/middleware/time-travel.d.ts

@@ -0,0 +1,81 @@
+/**
+ * @file Time travel middleware combining history, snapshots, and replay capabilities
+ */
+import type { Context, BaseMachine } from '../index';
+import { type HistoryEntry, type Serializer } from './history';
+import { type ContextSnapshot } from './snapshot';
+/**
+ * A machine enhanced with history tracking capabilities.
+ */
+export type WithHistory<M extends BaseMachine<any>> = M & {
+    /** History of all transitions */
+    history: HistoryEntry[];
+    /** Clear all history */
+    clearHistory: () => void;
+};
+/**
+ * A machine enhanced with snapshot tracking capabilities.
+ */
+export type WithSnapshot<M extends BaseMachine<any>> = M & {
+    /** Snapshots of context before/after each transition */
+    snapshots: ContextSnapshot<Context<M>>[];
+    /** Clear all snapshots */
+    clearSnapshots: () => void;
+    /** Restore machine to a previous context state */
+    restoreSnapshot: (context: Context<M>) => M;
+};
+/**
+ * A machine enhanced with time travel capabilities.
+ */
+export type WithTimeTravel<M extends BaseMachine<any>> = M & {
+    /** History of all transitions */
+    history: HistoryEntry[];
+    /** Snapshots of context before/after each transition */
+    snapshots: ContextSnapshot<Context<M>>[];
+    /** Clear all history and snapshots */
+    clearTimeTravel: () => void;
+    /** Clear just the history */
+    clearHistory: () => void;
+    /** Clear just the snapshots */
+    clearSnapshots: () => void;
+    /** Restore machine to a previous context state */
+    restoreSnapshot: (context: Context<M>) => M;
+    /** Replay transitions from a specific point in history */
+    replayFrom: (startIndex: number) => M;
+};
+/**
+ * Creates a machine with full time travel debugging capabilities.
+ * Combines history tracking, snapshots, and replay functionality.
+ *
+ * @template M - The machine type
+ * @param machine - The machine to enhance
+ * @param options - Configuration options
+ * @returns A machine with time travel capabilities
+ *
+ * @example
+ * ```typescript
+ * const debugMachine = withTimeTravel(counter);
+ *
+ * // Make some transitions
+ * debugMachine.increment();
+ * debugMachine.increment();
+ * debugMachine.decrement();
+ *
+ * // Time travel to previous states
+ * const previousState = debugMachine.replayFrom(0); // Replay from start
+ * const undoLast = debugMachine.restoreSnapshot(debugMachine.snapshots[1].before);
+ *
+ * // Inspect history
+ * console.log(debugMachine.history);
+ * console.log(debugMachine.snapshots);
+ * ```
+ */
+export declare function withTimeTravel<M extends BaseMachine<any>>(machine: M, options?: {
+    /** Maximum number of history entries/snapshots to keep */
+    maxSize?: number;
+    /** Optional serializer for persistence */
+    serializer?: Serializer;
+    /** Callback when history/snapshot events occur */
+    onRecord?: (type: 'history' | 'snapshot', data: any) => void;
+}): WithTimeTravel<M>;
+//# sourceMappingURL=time-travel.d.ts.map

package/dist/types/middleware/time-travel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"time-travel.d.ts","sourceRoot":"","sources":["../../../src/middleware/time-travel.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAMlD;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG;IACxD,iCAAiC;IACjC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,wBAAwB;IACxB,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG;IACzD,wDAAwD;IACxD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,0BAA0B;IAC1B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,kDAAkD;IAClD,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;CAC7C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG;IAC3D,iCAAiC;IACjC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,wDAAwD;IACxD,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,sCAAsC;IACtC,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,6BAA6B;IAC7B,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,+BAA+B;IAC/B,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,kDAAkD;IAClD,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,CAAC,CAAC;CACvC,CAAC;AAMF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EACvD,OAAO,EAAE,CAAC,EACV,OAAO,GAAE;IACP,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0CAA0C;IAC1C,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,UAAU,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;CACzD,GACL,cAAc,CAAC,CAAC,CAAC,CA2InB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doeixd/machine",
-  "version": "0.0.13",
+  "version": "0.0.18",
   "files": [
     "dist",
     "src"
@@ -46,10 +46,7 @@
       "optional": true
     }
   },
-  "dependencies": {
-    "ts-morph": "^27.0.2",
-    "tsx": "^4.20.6"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@types/node": "^22.10.2",
     "@types/react": "^19.2.4",
@@ -57,6 +54,8 @@
     "chalk": "^5.6.2",
     "chokidar": "^4.0.3",
     "commander": "^14.0.2",
+    "ts-morph": "^27.0.2",
+    "tsx": "^4.20.6",
     "pridepack": "2.6.4",
     "react": "^19.2.0",
     "solid-js": "^1.8.22",
@@ -97,6 +96,7 @@
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/production/index.js",
   "module": "./dist/esm/production/index.js",
+  "sideEffects": false,
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
@@ -106,10 +106,23 @@
       },
       "require": "./dist/cjs/production/index.js",
       "import": "./dist/esm/production/index.js"
+    },
+    "./core": {
+      "types": "./dist/types/core.d.ts",
+      "development": {
+        "require": "./dist/cjs/development/core.js",
+        "import": "./dist/esm/development/core.js"
+      },
+      "require": "./dist/cjs/production/core.js",
+      "import": "./dist/esm/production/core.js"
     }
   },
   "typesVersions": {
-    "*": {}
+    "*": {
+      "core": [
+        "./dist/types/core.d.ts"
+      ]
+    }
   },
   "bin": {
     "extract": "./scripts/extract-statechart.ts"

package/src/core.ts

@@ -0,0 +1,167 @@
+/**
+ * @file Core library exports without framework integrations
+ * @description Minimal bundle for users who don't need React/Solid.js
+ */
+
+// =============================================================================
+// SECTION: CORE TYPES & INTERFACES
+// =============================================================================
+
+export type {
+  MaybePromise,
+  Machine,
+  AsyncMachine,
+  AsyncTransitionArgs,
+  TransitionOptions,
+  BaseMachine,
+  DeepReadonly,
+  InferMachine,
+  Event,
+  MachineLike,
+  MachineResult
+} from './index';
+
+// =============================================================================
+// SECTION: TYPE UTILITIES & INTROSPECTION
+// =============================================================================
+
+export type {
+  Context,
+  Transitions,
+  TransitionArgs,
+  TransitionNames
+} from './index';
+
+// =============================================================================
+// SECTION: MACHINE CREATION (FUNCTIONAL & OOP)
+// =============================================================================
+
+export {
+  createMachine,
+  createAsyncMachine,
+  createMachineFactory,
+  createMachineBuilder,
+  MachineBase,
+  next,
+  matchMachine,
+  hasState
+} from './index';
+
+// =============================================================================
+// SECTION: ADVANCED CREATION & IMMUTABLE HELPERS
+// =============================================================================
+
+export {
+  setContext,
+  overrideTransitions,
+  extendTransitions,
+  combineFactories
+} from './index';
+
+// =============================================================================
+// SECTION: RUNTIME & EVENT DISPATCHER
+// =============================================================================
+
+export {
+  runMachine
+} from './index';
+
+// =============================================================================
+// SECTION: GENERATOR-BASED COMPOSITION
+// =============================================================================
+
+export {
+  run,
+  step,
+  yieldMachine,
+  runSequence,
+  createFlow,
+  runWithDebug,
+  runAsync,
+  stepAsync
+} from './generators';
+
+// =============================================================================
+// SECTION: TYPE-LEVEL METADATA PRIMITIVES
+// =============================================================================
+
+export {
+  transitionTo,
+  describe,
+  guarded,
+  guard,
+  guardAsync,
+  whenGuard,
+  whenGuardAsync,
+  invoke,
+  action,
+  metadata,
+  META_KEY,
+  type TransitionMeta,
+  type GuardMeta,
+  type InvokeMeta,
+  type ActionMeta,
+  type ClassConstructor,
+  type WithMeta,
+  type GuardOptions,
+  type GuardFallback,
+  type GuardedTransition
+} from './primitives';
+
+// =============================================================================
+// SECTION: STATECHART EXTRACTION (Build-time only)
+// =============================================================================
+
+// Note: Extraction tools are available as dev dependencies for build-time use
+// They are not included in the runtime bundle for size optimization
+// Use: npx tsx scripts/extract-statechart.ts
+
+export type {
+  MachineConfig,
+  ExtractionConfig
+} from './extract';
+
+// =============================================================================
+// SECTION: MIDDLEWARE & INTERCEPTION
+// =============================================================================
+
+export * from './middleware/index';
+
+// =============================================================================
+// SECTION: UTILITIES & HELPERS
+// =============================================================================
+
+export {
+  isState,
+  createEvent,
+  createTransition,
+  mergeContext,
+  pipeTransitions,
+  logState,
+  call,
+  bindTransitions,
+  BoundMachine
+} from './utils';
+
+// =============================================================================
+// SECTION: FUNCTIONAL COMBINATORS
+// =============================================================================
+
+export {
+  createTransitionFactory,
+  createTransitionExtender,
+  createFunctionalMachine,
+  state
+} from './functional-combinators';
+
+// =============================================================================
+// SECTION: MULTI-MACHINE COORDINATION
+// =============================================================================
+
+export * from './multi';
+
+// =============================================================================
+// SECTION: HIGHER-ORDER MACHINES
+// =============================================================================
+
+export * from './higher-order';

package/src/entry-react.ts

@@ -0,0 +1,9 @@
+/**
+ * @file React integration entry point
+ */
+
+// Re-export core functionality
+export * from './core';
+
+// Re-export React-specific functionality
+export * from './react';

package/src/entry-solid.ts

@@ -0,0 +1,9 @@
+/**
+ * @file Solid.js integration entry point
+ */
+
+// Re-export core functionality
+export * from './core';
+
+// Re-export Solid-specific functionality
+export * from './solid';

package/src/extract.ts

@@ -106,8 +106,8 @@ export interface ExtractionConfig {
  * @returns A JSON-compatible value (string, number, object, array).
  * @internal
  */
-// @ts-expect-error - verbose parameter is used but TypeScript doesn't detect it
-function _typeToJson(type: Type, verbose = false): any {
+
+export function _typeToJson(type: Type, verbose = false): any {
   // --- Terminal Types ---
   const symbol = type.getSymbol();
   if (symbol && symbol.getDeclarations().some(Node.isClassDeclaration)) {
@@ -324,65 +324,65 @@ function extractFromCallExpression(call: Node, verbose = false): any | null {
       break;
 
     case 'action':
-       // Args: (action, transition)
-       if (args[0]) {
-         const actionMeta = parseObjectLiteral(args[0]);
-         if (Object.keys(actionMeta).length > 0) {
-           metadata.actions = [actionMeta];
-         }
-       }
-       // Recurse into wrapped transition
-       if (args[1] && Node.isCallExpression(args[1])) {
-         const nested = extractFromCallExpression(args[1], verbose);
-         if (nested) {
-           Object.assign(metadata, nested);
-         }
-       }
-       break;
-
-     case 'guard':
-       // Args: (condition, transition, options?)
-       // Extract description from options object (third argument)
-       if (args[2]) {
-         const options = parseObjectLiteral(args[2]);
-         if (options.description) {
-           metadata.description = options.description;
-         }
-       }
-       // Add a generic guard condition for static analysis
-       metadata.guards = [{ name: 'runtime_guard', description: metadata.description || 'Synchronous condition check' }];
-       // Recurse into the transition (second argument)
-       if (args[1] && Node.isCallExpression(args[1])) {
-         const nested = extractFromCallExpression(args[1], verbose);
-         if (nested) {
-           Object.assign(metadata, nested);
-         }
-       }
-       break;
-
-     case 'guardAsync':
-       // Args: (condition, transition, options?)
-       // Extract description from options object (third argument)
-       if (args[2]) {
-         const options = parseObjectLiteral(args[2]);
-         if (options.description) {
-           metadata.description = options.description;
-         }
-       }
-       // Add a generic guard condition for static analysis
-       metadata.guards = [{ name: 'runtime_guard_async', description: metadata.description || 'Asynchronous condition check' }];
-       // Recurse into the transition (second argument)
-       if (args[1] && Node.isCallExpression(args[1])) {
-         const nested = extractFromCallExpression(args[1], verbose);
-         if (nested) {
-           Object.assign(metadata, nested);
-         }
-       }
-       break;
-
-     default:
-       // Not a DSL primitive we recognize
-       return null;
+      // Args: (action, transition)
+      if (args[0]) {
+        const actionMeta = parseObjectLiteral(args[0]);
+        if (Object.keys(actionMeta).length > 0) {
+          metadata.actions = [actionMeta];
+        }
+      }
+      // Recurse into wrapped transition
+      if (args[1] && Node.isCallExpression(args[1])) {
+        const nested = extractFromCallExpression(args[1], verbose);
+        if (nested) {
+          Object.assign(metadata, nested);
+        }
+      }
+      break;
+
+    case 'guard':
+      // Args: (condition, transition, options?)
+      // Extract description from options object (third argument)
+      if (args[2]) {
+        const options = parseObjectLiteral(args[2]);
+        if (options.description) {
+          metadata.description = options.description;
+        }
+      }
+      // Add a generic guard condition for static analysis
+      metadata.guards = [{ name: 'runtime_guard', description: metadata.description || 'Synchronous condition check' }];
+      // Recurse into the transition (second argument)
+      if (args[1] && Node.isCallExpression(args[1])) {
+        const nested = extractFromCallExpression(args[1], verbose);
+        if (nested) {
+          Object.assign(metadata, nested);
+        }
+      }
+      break;
+
+    case 'guardAsync':
+      // Args: (condition, transition, options?)
+      // Extract description from options object (third argument)
+      if (args[2]) {
+        const options = parseObjectLiteral(args[2]);
+        if (options.description) {
+          metadata.description = options.description;
+        }
+      }
+      // Add a generic guard condition for static analysis
+      metadata.guards = [{ name: 'runtime_guard_async', description: metadata.description || 'Asynchronous condition check' }];
+      // Recurse into the transition (second argument)
+      if (args[1] && Node.isCallExpression(args[1])) {
+        const nested = extractFromCallExpression(args[1], verbose);
+        if (nested) {
+          Object.assign(metadata, nested);
+        }
+      }
+      break;
+
+    default:
+      // Not a DSL primitive we recognize
+      return null;
   }
 
   return Object.keys(metadata).length > 0 ? metadata : null;

package/src/functional-combinators.ts

@@ -1,4 +1,4 @@
-import { createMachine, Machine, extendTransitions } from './index';
+import { createMachine, Machine, BaseMachine, extendTransitions } from './index';
 
 /**
  * Creates a factory for building type-safe transitions for a specific machine.
@@ -75,7 +75,7 @@ export function createTransitionFactory<C extends object>() {
   return function createTransition<TArgs extends any[]>(
     transformer: (ctx: C, ...args: TArgs) => C
   ) {
-    return function (this: Machine<C>, ...args: TArgs): Machine<C> {
+    return function (this: BaseMachine<C>, ...args: TArgs): Machine<C> {
       const nextContext = transformer(this.context, ...args);
       // Use `this` as the transitions object, which includes all current transitions
       return createMachine(nextContext, this);
@@ -196,7 +196,7 @@ type MachineTransitions<
   C extends object
 > = {
   [K in keyof T]: T[K] extends (ctx: C, ...args: infer A) => C
-    ? (this: { context: C } & T, ...args: A) => Machine<C>
+    ? (this: Machine<C>, ...args: A) => Machine<C>
     : never;
 };