Some updates

Author: mcjazzyfunky

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-messages",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "license": "LGPL-3.0",
   "homepage": "https://github.com/js-works/js-messages",
   "main": "index.js",

src/main/api/defineMessages.ts

@@ -1,6 +1,3 @@
-import Signature from '../internal/types/Signature'
-import MessagesConfig from '../internal/types/MessagesConfig'
-import MessageInitializer from '../internal/types/MessageInitializer'
 import buildMessageCreator from '../internal/buildMessageCreator';
 
 // --- defineMessages -----------------------------------------------
@@ -31,6 +28,17 @@ function defineMessages(arg1: any, arg2?: any): any {
 
 // --- locals -------------------------------------------------------
 
+type MessagesConfig = {
+  [name: string]: MessageInitializer<any>
+}
+
+type MessageInitializer<A extends any[]> =
+  {
+    payload?: (...args: A) => any,
+    meta?: (...args: A) => any,
+    validate?: (args: A) => any
+  } | ((...args: A) => any)
+
 type MessageCreatorOf<T> =
   T extends {
       payload: (...args: infer A) => infer P,

src/main/internal/buildMessageCreator.ts

@@ -1,10 +1,7 @@
-import MessageInitializer from './types/MessageInitializer'
-import MessageCreator from './types/MessageCreator'
-
 // --- buildMessageCreator ------------------------------------------
 
 function buildMessageCreator<A extends any[]>
-  (type: string, initializer: MessageInitializer<A>): MessageCreator<A, any, any> {
+  (type: string, initializer: MessageInitializer<A>): MessageCreator<A> {
 
   let ret: any
 
@@ -45,6 +42,18 @@ function buildMessageCreator<A extends any[]>
   return ret
 }
 
+// --- local --------------------------------------------------------
+
+type MessageInitializer<A extends any[]> =
+  {
+    payload?: (...args: A) => any,
+    meta?: (...args: A) => any,
+    validate?: (args: A) => any
+  } | ((...args: A) => any)
+
+type MessageCreator<A extends any[]>
+  = (...args: A) => { type: string, payload?: any, meta?: any }
+
 // --- exports ------------------------------------------------------
 
 export default buildMessageCreator