[@xstate/store] Fix go-to-definition (#5410)

* Fix go to definition for triggers

* Changeset

Author: davidkpiano

.changeset/large-monkeys-doubt.md

@@ -0,0 +1,5 @@
+---
+'@xstate/store': minor
+---
+
+Fix go-to-definition for triggers

packages/xstate-store/src/react.ts

@@ -117,14 +117,14 @@ export const useStore: {
     TEmitted extends EventPayloadMap
   >(
     definition: StoreConfig<TContext, TEventPayloadMap, TEmitted>
-  ): Store<TContext, ExtractEvents<TEventPayloadMap>, ExtractEvents<TEmitted>>;
+  ): Store<TContext, TEventPayloadMap, ExtractEvents<TEmitted>>;
   <
     TContext extends StoreContext,
     TEventPayloadMap extends EventPayloadMap,
     TEmitted extends EventPayloadMap
   >(
     definition: StoreConfig<TContext, TEventPayloadMap, TEmitted>
-  ): Store<TContext, ExtractEvents<TEventPayloadMap>, ExtractEvents<TEmitted>>;
+  ): Store<TContext, TEventPayloadMap, ExtractEvents<TEmitted>>;
 } = function useStoreImpl<
   TContext extends StoreContext,
   TEventPayloadMap extends EventPayloadMap,
@@ -219,11 +219,7 @@ export function createStoreHook<
   TEventPayloadMap extends EventPayloadMap,
   TEmitted extends EventPayloadMap
 >(definition: StoreConfig<TContext, TEventPayloadMap, TEmitted>) {
-  type TStore = Store<
-    TContext,
-    ExtractEvents<TEventPayloadMap>,
-    ExtractEvents<TEmitted>
-  >;
+  type TStore = Store<TContext, TEventPayloadMap, ExtractEvents<TEmitted>>;
   type TSnapshot = StoreSnapshot<TContext>;
 
   const store = createStore(definition);

packages/xstate-store/src/store.ts

@@ -41,7 +41,7 @@ function createStoreCore<
 >(
   logic: StoreLogic<TSnapshot, ExtractEvents<TEventPayloadMap>, TEmitted>,
   emits?: Record<string, (payload: any) => void> // TODO: improve this type
-): Store<TContext, ExtractEvents<TEventPayloadMap>, TEmitted> {
+): Store<TContext, TEventPayloadMap, TEmitted> {
   type StoreEvent = ExtractEvents<TEventPayloadMap>;
   let listeners: Map<TEmitted['type'], Set<any>> | undefined;
   const initialSnapshot = logic.getInitialSnapshot();
@@ -88,7 +88,7 @@ function createStoreCore<
     }
   }
 
-  const store: Store<TContext, StoreEvent, TEmitted> &
+  const store: Store<TContext, TEventPayloadMap, TEmitted> &
     Pick<InternalBaseAtom<any>, '_snapshot'> = {
     get _snapshot() {
       return (atom as unknown as InternalBaseAtom<any>)._snapshot;
@@ -166,16 +166,19 @@ function createStoreCore<
         }
       };
     },
-    trigger: new Proxy({} as Store<TContext, StoreEvent, TEmitted>['trigger'], {
-      get: (_, eventType: string) => {
-        return (payload: any) => {
-          store.send({
-            ...payload,
-            type: eventType
-          });
-        };
+    trigger: new Proxy(
+      {} as Store<TContext, TEventPayloadMap, TEmitted>['trigger'],
+      {
+        get: (_, eventType: string) => {
+          return (payload: any) => {
+            store.send({
+              ...payload,
+              type: eventType
+            });
+          };
+        }
       }
-    }),
+    ),
     select<TSelected>(
       selector: Selector<TContext, TSelected>,
       equalityFn: (a: TSelected, b: TSelected) => boolean = Object.is
@@ -237,15 +240,11 @@ export type TransitionsFromEventPayloadMap<
  */
 export function createStore<
   TContext extends StoreContext,
-  TEventPayloadMap extends EventPayloadMap,
+  const TEventPayloadMap extends EventPayloadMap,
   TEmittedPayloadMap extends EventPayloadMap
 >(
   definition: StoreConfig<TContext, TEventPayloadMap, TEmittedPayloadMap>
-): Store<
-  TContext,
-  ExtractEvents<TEventPayloadMap>,
-  ExtractEvents<TEmittedPayloadMap>
->;
+): Store<TContext, TEventPayloadMap, ExtractEvents<TEmittedPayloadMap>>;
 export function createStore<
   TContext extends StoreContext,
   TEvent extends EventObject,
@@ -254,7 +253,13 @@ export function createStore<
   definition:
     | SpecificStoreConfig<TContext, TEvent, TEmitted>
     | StoreLogic<StoreSnapshot<TContext>, TEvent, TEmitted>
-): Store<TContext, TEvent, TEmitted>;
+): Store<
+  TContext,
+  {
+    [E in TEvent as E['type']]: E;
+  },
+  TEmitted
+>;
 export function createStore(
   definitionOrLogic: StoreConfig<any, any, any> | AnyStoreLogic
 ) {
@@ -350,11 +355,7 @@ export function createStoreWithProducer<
       ) => void;
     };
   }
-): Store<
-  TContext,
-  ExtractEvents<TEventPayloadMap>,
-  ExtractEvents<TEmittedPayloadMap>
-> {
+): Store<TContext, TEventPayloadMap, ExtractEvents<TEmittedPayloadMap>> {
   const transition = createStoreTransition(config.on, producer);
   const logic = {
     getInitialSnapshot: () => ({

packages/xstate-store/src/types.ts

@@ -76,12 +76,12 @@ export type StoreSnapshot<TContext> = Snapshot<undefined> & {
  */
 export interface Store<
   TContext extends StoreContext,
-  TEvent extends EventObject,
+  TEventPayloadMap extends EventPayloadMap,
   TEmitted extends EventObject
 > extends Subscribable<StoreSnapshot<TContext>>,
     InteropObservable<StoreSnapshot<TContext>>,
     BaseAtom<StoreSnapshot<TContext>> {
-  send: (event: TEvent) => void;
+  send: (event: ExtractEvents<TEventPayloadMap>) => void;
   getSnapshot: () => StoreSnapshot<TContext>;
   /** @alias getSnapshot */
   get: () => StoreSnapshot<TContext>;
@@ -118,11 +118,11 @@ export interface Store<
    * ```
    */
   trigger: {
-    [E in TEvent as E['type'] & string]: IsEmptyObject<
-      DistributiveOmit<E, 'type'>
+    [K in keyof TEventPayloadMap]: IsEmptyObject<
+      DistributiveOmit<TEventPayloadMap[K], 'type'>
     > extends true
       ? () => void
-      : (eventPayload: DistributiveOmit<E, 'type'>) => void;
+      : (eventPayload: DistributiveOmit<TEventPayloadMap[K], 'type'>) => void;
   };
   select<TSelected>(
     selector: Selector<TContext, TSelected>,
@@ -141,7 +141,11 @@ export interface Store<
    * });
    * ```
    */
-  transition: StoreTransition<TContext, TEvent, TEmitted>;
+  transition: StoreTransition<
+    TContext,
+    ExtractEvents<TEventPayloadMap>,
+    TEmitted
+  >;
 }
 
 export type StoreTransition<
@@ -160,7 +164,7 @@ export type StoreConfig<
 > = {
   context: TContext;
   emits?: {
-    [K in keyof TEmitted & string]: (payload: TEmitted[K]) => void;
+    [K in keyof TEmitted]: (payload: TEmitted[K]) => void;
   };
   on: {
     [K in keyof TEventPayloadMap & string]: StoreAssigner<
@@ -267,8 +271,8 @@ export type SnapshotFromStore<TStore extends Store<any, any, any>> =
  * ```
  */
 export type EventFromStore<TStore extends Store<any, any, any>> =
-  TStore extends Store<infer _TContext, infer TEvent, infer _TEmitted>
-    ? TEvent
+  TStore extends Store<infer _TContext, infer TEventPayloadMap, infer _TEmitted>
+    ? ExtractEvents<TEventPayloadMap>
     : never;
 
 // Copied from XState core