Merge pull request #27 from stkevintan/feat_type

feat: remove other props in actions type inference

Author: runjuu

demo/index.tsx

@@ -32,6 +32,8 @@ class Count extends Ayanami<State> {
     count: 0,
   }
 
+  otherProps: string = ''
+
   constructor(private readonly tips: Tips) {
     super()
   }
@@ -41,6 +43,11 @@ class Count extends Ayanami<State> {
     return { count: state.count + count }
   }
 
+  @Reducer()
+  addOne(state: State): State {
+    return { count: state.count + 1 }
+  }
+
   @Reducer()
   reset(): State {
     return { count: 0 }

src/core/types.ts

@@ -94,22 +94,29 @@ type UnpackPayload<F, S> = UnpackEffectPayload<F, S> extends never
     : UnpackReducerPayload<F, S>
   : UnpackEffectPayload<F, S>
 
+type PayloadMethodKeySet<M, S, SS extends keyof M> = {
+  [key in SS]: M[key] extends
+    | (() => Observable<EffectAction>)
+    | ((payload$: Observable<any>) => Observable<EffectAction>)
+    | ((payload$: Observable<any>, state$: Observable<S>) => Observable<EffectAction>)
+    ? key
+    : M[key] extends (() => S) | ((state: S) => S) | ((state: S, payload: any) => S)
+    ? key
+    : M[key] extends ((state: Draft<S>) => void) | ((state: Draft<S>, payload: any) => void)
+    ? key
+    : M[key] extends Observable<any>
+    ? key
+    : never
+}[SS]
+
 export type ActionMethodOfAyanami<M extends Ayanami<S>, S> = Pick<
-  {
-    [key in keyof M]: UnpackPayload<M[key], S> extends never
-      ? never
-      : ActionMethod<UnpackPayload<M[key], S>>
-  },
-  Exclude<keyof M, keyof Ayanami<S>>
+  { [key in keyof M]: ActionMethod<UnpackPayload<M[key], S>> },
+  PayloadMethodKeySet<M, S, Exclude<keyof M, keyof Ayanami<S>>>
 >
 
 export type ActionOfAyanami<M extends Ayanami<S>, S> = Pick<
-  {
-    [key in keyof M]: UnpackPayload<M[key], S> extends never
-      ? never
-      : ActionMethod<UnpackPayload<M[key], S>, EffectAction>
-  },
-  Exclude<keyof M, keyof Ayanami<S>>
+  { [key in keyof M]: ActionMethod<UnpackPayload<M[key], S>, EffectAction> },
+  PayloadMethodKeySet<M, S, Exclude<keyof M, keyof Ayanami<S>>>
 >
 
 export interface ObjectOf<T> {