fix(combineEvents): allow usage in sample directly

effector · Mar 17, 2023 · a398e10 · a398e10
1 parent 8e8b08b
commit a398e10
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/combine-events/index.ts b/src/combine-events/index.ts
@@ -3,6 +3,7 @@ import {
   createStore,
   Effect,
   Event,
+  EventAsReturnType,
   guard,
   is,
   merge,
@@ -36,7 +37,7 @@ type ReturnTarget<Result, Target> = Target extends Store<infer S>
 export function combineEvents<P extends Shape>(config: {
   events: Events<P>;
   reset?: Unit<any>;
-}): Event<P>;
+}): EventAsReturnType<P>;
 
 export function combineEvents<
   P extends Shape,

diff --git a/test-typings/combine-events.ts b/test-typings/combine-events.ts
@@ -6,6 +6,7 @@ import {
   createEvent,
   createStore,
   createEffect,
+  sample,
 } from 'effector';
 import { combineEvents } from '../src/combine-events';
 
@@ -260,3 +261,19 @@ import { combineEvents } from '../src/combine-events';
 
   expectType<Effect<Target, void>>(effect);
 }
+
+// Can be used in sample
+{
+  const foo = createEvent<number>();
+  const bar = createEvent<string>();
+
+  sample({
+    clock: combineEvents({
+      events: [foo, bar],
+    }),
+    fn: ([a, b]) => {
+      expectType<number>(a);
+      expectType<string>(b);
+    },
+  });
+}