From fa27dda530f57ef55a04d5f16295260f7b99a3ae Mon Sep 17 00:00:00 2001
From: Jerko Steiner <jerko.steiner@gmail.com>
Date: Thu, 1 Aug 2019 13:57:51 +0700
Subject: [PATCH] Add ability to infer jsonrpc redux action types

---
 packages/jsonrpc/src/redux.test.ts | 41 ++++++++++++++++++++++-
 packages/jsonrpc/src/types.ts      | 53 ++++++++++++++++++++++++++----
 2 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/packages/jsonrpc/src/redux.test.ts b/packages/jsonrpc/src/redux.test.ts
index 158bde3..7b1698f 100644
--- a/packages/jsonrpc/src/redux.test.ts
+++ b/packages/jsonrpc/src/redux.test.ts
@@ -10,12 +10,14 @@ import {createReduxClient} from './redux'
 import {createRemoteClient} from './remote'
 import {jsonrpc} from './express'
 import {keys} from 'ts-transformer-keys'
+import {TActionCreators, TAllActions} from './types'
 
 describe('createReduxClient', () => {
 
   interface IService {
     add(a: number, b: number): number
     addAsync(a: number, b: number): Promise<number>
+    addStringsAsync(a: string, b: string): Promise<string>
     addWithContext(a: number, b: number): (ctx: IContext) => number
     addAsyncWithContext(a: number, b: number): (ctx: IContext) =>
       Promise<number>
@@ -32,6 +34,9 @@ describe('createReduxClient', () => {
     addAsync(a: number, b: number) {
       return new Promise<number>(resolve => resolve(a + b))
     }
+    addStringsAsync(a: string, b: string) {
+      return new Promise<string>(resolve => resolve(a + b))
+    }
     addWithContext = (a: number, b: number) => (ctx: IContext) =>
       a + b + ctx.userId
     addAsyncWithContext = (a: number, b: number) => (ctx: IContext) =>
@@ -63,7 +68,41 @@ describe('createReduxClient', () => {
   function getClient() {
     const remoteClient = createRemoteClient<IService>(
       baseUrl, '/service', keys<IService>())
-    return createReduxClient(remoteClient, 'myService')
+    const client = createReduxClient(remoteClient, 'myService')
+
+    // type R<T> = T extends (...args: any[]) => infer RV ? RV : never
+
+    type Client = typeof client
+    type ActionCreators = TActionCreators<typeof client>
+    type AllActions = TAllActions<typeof client>
+
+    function handleAction(state: any, action: AllActions) {
+      if (action.type !== 'myService') {
+        return
+      }
+      switch (action.method) {
+        case 'add':
+          switch (action.status) {
+            case 'pending':
+              const p1: Promise<number> = action.payload
+              return
+            case 'rejected':
+              const p2: Error = action.payload
+              return
+            case 'resolved':
+              const p3: number = action.payload
+              return
+          }
+        case 'addAsync':
+        // case 'addAsync1234':
+        // case
+      }
+    }
+
+    // type Values<T> = T[keyof T]
+    // type C = ReturnType<Values<typeof client>>
+
+    return client
   }
 
   describe('action creators', () => {
diff --git a/packages/jsonrpc/src/types.ts b/packages/jsonrpc/src/types.ts
index 49d6416..46666b6 100644
--- a/packages/jsonrpc/src/types.ts
+++ b/packages/jsonrpc/src/types.ts
@@ -6,15 +6,56 @@ type RetProm<T> = T extends Promise<any> ? T : Promise<T>
 type PromisifyReturnType<T> = (...a: ArgumentTypes<T>) =>
   RetProm<UnwrapHOC<RetType<T>>>
 
+import {IPendingAction, IResolvedAction, IRejectedAction} from '@rondo/client'
+
 export type TAsyncified<T> = {
   [K in keyof T]: PromisifyReturnType<T[K]>
 }
 
 export type TReduxed<T, ActionType extends string> = {
-  [K in keyof T]: (...a: ArgumentTypes<T[K]>) => {
-    type: ActionType
-    payload: RetProm<UnwrapHOC<RetType<T[K]>>>
-    method: K
-    status: 'pending'
-  }
+  // [K in keyof T]: (...a: ArgumentTypes<T[K]>) => {
+  //   type: ActionType
+  //   payload: RetProm<UnwrapHOC<RetType<T[K]>>>
+  //   method: K
+  //   status: 'pending'
+  // }
+  // [K in keyof T]: (...a: ArgumentTypes<T[K]>) =>
+  //   IPendingAction<RetProm<UnwrapHOC<RetType<T[K]>>>, ActionType> & {
+  //     method: K,
+  //   }
+  [K in keyof T]: (...a: ArgumentTypes<T[K]>) =>
+    IRPCPendingAction<UnwrapHOC<RetType<T[K]>>, ActionType, K>
 }
+
+export interface IRPCPendingAction<
+  T, ActionType extends string, Method extends string | number | symbol
+> extends IPendingAction<T, ActionType> {
+  method: Method
+}
+
+export interface IRPCResolvedAction<
+  T, ActionType extends string, Method extends string | symbol | number
+> extends IResolvedAction<T, ActionType> {
+  method: Method
+}
+
+export interface IRPCRejectedAction<
+  ActionType extends string, Method extends string | symbol | number
+> extends IRejectedAction<ActionType> {
+  method: Method
+}
+
+export type TResolved<A> =
+  A extends IRPCPendingAction<infer T, infer ActionType, infer Method>
+  ? IRPCResolvedAction<T, ActionType, Method>
+  : never
+
+export type TRejected<A> =
+  A extends IRPCPendingAction<infer T, infer ActionType, infer Method>
+  ? IRPCRejectedAction<ActionType, Method>
+  : never
+
+type Values<T> = T[keyof T]
+export type TActionCreators<T> = RetType<Values<T>>
+export type TAllActions<T> = TActionCreators<T>
+  | TResolved<TActionCreators<T>> | TRejected<TActionCreators<T>>