Some updates

Author: mcjazzyfunky

src/main/api/defineMessage.ts

@@ -1,9 +1,51 @@
 import buildMessageCreator from '../internal/buildMessageCreator'
-import MessageInitializer from '../internal/types/MessageInitializer'
-import MessageCreator from '../internal/types/MessageCreator'
 
-export default function defineMessage<K extends String, A extends any[]>
-  (type: string, initializer: MessageInitializer<A> = null): MessageCreator<A, any, any> {
+// --- defineMessage ------------------------------------------------
 
-  return buildMessageCreator(type, initializer)
+function defineMessage(
+  type: string
+): () => { type: string }
+
+function defineMessage<A extends any[], P>(
+  type: string,
+  getPayload: (...args: A) => P
+): (...args: A) => { type: string, payload: P }
+
+function defineMessage<A extends any[], P>(
+  type: string,
+
+  init: {
+    payload: (...args: A) => P,
+    validate?: (...args: A) => boolean | null | Error
+  }
+): (...args: A) => { type: string, payload: P } 
+
+function defineMessage<A extends any[], M>(
+  type: string,
+  
+  init: {
+    meta: (...args: A) => M,
+    validate?: (...args: A) => boolean | null | Error
+  }
+): (...args: A) => { type: string, meta: M} 
+
+function defineMessage<A extends any[], P, M>(
+  type: string,
+  
+  init: {
+    payload: (...args: A) => P,
+    meta: (...args: A) => M,
+    validate?: (...args: A) => boolean | null | Error
+  }
+): (...args: A) => { type: string, payload: P, meta: M }
+
+function defineMessage(
+  type: string,
+  init: any = null
+): any {
+  return buildMessageCreator(type, init)
 }
+
+// --- exports ------------------------------------------------------
+
+export default defineMessage

src/main/api/defineMessages.ts

@@ -1,16 +1,15 @@
 import Signature from '../internal/types/Signature'
 import MessagesConfig from '../internal/types/MessagesConfig'
 import MessageInitializer from '../internal/types/MessageInitializer'
-import MessageCreator from '../internal/types/MessageCreator'
 import buildMessageCreator from '../internal/buildMessageCreator';
 
 // --- defineMessages -----------------------------------------------
 
 function defineMessages<T extends MessagesConfig>(prefix: string, config: T):
-  { [K in keyof T]: MessageCreator<Arguments<any, T[K]>, Payload<T[K]>, Meta<T[K]>> }
+  { [K in keyof T]: MessageCreatorOf<T[K]> & { type: string }}
 
 function defineMessages<T extends MessagesConfig>(config: T):
-  { [K in keyof T]: MessageCreator<Arguments<any, T[K]>, Payload<T[K]>, Meta<T[K]>> }
+  { [K in keyof T]: MessageCreatorOf<T[K]> & { type: string } }
 
 function defineMessages(arg1: any, arg2?: any): any {
   const
@@ -32,28 +31,28 @@ function defineMessages(arg1: any, arg2?: any): any {
 
 // --- locals -------------------------------------------------------
 
-type Func<A extends any[], R> = (...args: A) => R
-
-type Arguments<A extends any[], I extends MessageInitializer<any>>
-  = I extends Func<A, any>
-    ? Signature<I>
-    : (I extends { payload: Func<A, any> }
-      ? Signature<I['payload']>
-      : []) 
-
-type Payload<I extends MessageInitializer<any>>
-  = I extends Func<any, any>
-    ? ReturnType<I> 
-    : (I extends { payload: Func<any, any> }
-      ? ReturnType<I['payload']>
-      : any) 
-
-type Meta<I extends MessageInitializer<any>>
-  = I extends Func<any, any>
-    ? ReturnType<I> 
-    : (I extends { meta: Func<any, any> }
-      ? ReturnType<I['meta']>
-      : any) 
+type MessageCreatorOf<T> =
+  T extends {
+      payload: (...args: infer A) => infer P,
+      meta: (...args: infer A) => infer M,
+      validate?: (...args: infer A) => boolean | null | Error
+    }
+  ? (...args: A) => { type: string, payload: P, meta: M}
+  : T extends {
+      meta: (...args: infer A) => infer M,
+      validate?: (...args: infer A) => boolean | null | Error
+    }
+  ? (...args: A) => { type: string, meta: M}
+  : T extends {
+    payload: (...args: infer A) => infer P,
+    validate?: (...args: infer A) => boolean | null | Error
+  } 
+  ? (...args: A) => { type: string, payload: P }
+  : T extends (...args: infer A) => infer P
+  ? (...args: A) => { type: string, payload: P }
+  : T extends {}
+  ? () => { type: string}
+  : never
 
 // --- exports ------------------------------------------------------
 

src/main/internal/types/MessageCreator.ts

@@ -1,11 +1,17 @@
-type MessageCreator<A extends any[], P, M> = {
-  readonly type: string,
-  
-  (...args: A): {
-    type: string,
-    payload?: P,
-    meta?: M
-  }
-}
+type MessageCreator<A extends any[], P, M> =
+  A extends []
+    ? {
+        readonly type: string,
+        (): { type: string }
+      }
+    : {
+        readonly type: string,
+
+        (...args: A): {
+          type: string,
+          payload?: P,
+          meta?: M
+        }
+    }
 
 export default MessageCreator

src/main/internal/types/MessageInitializer.ts

@@ -1,6 +1,6 @@
 type PayloadCreator<Args extends any[]> = (...args: Args) => any
 type MetaCreator<Args extends any[]> = (...args: Args) => any
-type Validator<Args extends any[]> = (...args: Args) => true | false | null | Error
+type Validator<Args extends any[]> = (...args: Args) => boolean | null | Error
 
 type MessageInitializer<Args extends any[]> =
   PayloadCreator<Args>

src/test/api/defineMessages.test.ts

@@ -17,8 +17,6 @@ const Actions = defineMessages({
   }
 })
 
-const x = Actions.action1()
-
 describe('defineMessages', () => {
   it('should create messages with neigther payload nor meta', () => {
     expect(Actions.action1())