restructure the source files

package.json

@@ -24,7 +24,7 @@
     "lint": "npm run check-node-version && npm run lint:ts && npm run lint:es && npm run lint:sh",
     "lint:es": "eslint \"{bin,examples,scripts,src,tests}/**/*.js\" --ignore-pattern=\"tests/fixtures/**\"",
     "lint:md": "markdownlint README.md",
-    "lint:ts": "tslint --project tsconfig.json --exclude \"tests/fixtures/**\" && tsc --noEmit",
+    "lint:ts": "tslint --project tsconfig.json && tsc --noEmit",
     "lint:sh": "bash -n bin/*.sh",
     "sloc": "sloc bin examples scripts src tests --details --format cli-table --keys total,source,comment && sloc bin examples scripts src tests",
     "ts-node": "ts-node",

src/puppet/contact.ts → src/contact.ts

@@ -23,8 +23,8 @@ import {
   log,
   Raven,
   Sayable,
-}                       from '../config'
-import PuppetAccessory  from '../puppet-accessory'
+}                       from './config'
+import PuppetAccessory  from './puppet-accessory'
 
 import Message          from './message'
 

src/deprecated.ts

-import {
-  log,
-}               from './config'
-
 export class MediaMessage {
-  constructor() {
+  constructor(..._: any[]) {
     const msg = '`MediaMessage` is deprecated. Please use `Message` instead. See: https://github.com/Chatie/wechaty/issues/1164'
-    log.warn('MediaMessage', msg)
     throw new Error(msg)
   }
 }

src/puppet/friend-request.ts → src/friend-request.ts

@@ -21,13 +21,13 @@
  /* tslint:disable:no-var-requires */
 const retryPromise  = require('retry-promise').default
 
-import PuppetAccessory  from '../puppet-accessory'
+import PuppetAccessory  from './puppet-accessory'
 
 import Contact          from './contact'
 
 import {
   log,
-}                       from '../config'
+}                       from './config'
 
 export enum FriendRequestType {
   Unknown = 0,

src/index.ts

@@ -14,10 +14,25 @@ import {
 
 export {
   Contact,
+  ContactPayload,
+  ContactQueryFilter,
+  ContactType,
+  Gender,
+}                         from './contact'
+export {
   FriendRequest,
+  FriendRequestPayload,
+  FriendRequestType,
+}                         from './friend-request'
+export {
   Message,
+}                         from './message'
+export {
   Room,
-}                     from './puppet/'
+  RoomMemberQueryFilter,
+  RoomPayload,
+  RoomQueryFilter,
+}                         from './room'
 
 export {
   MediaMessage,

src/io-client.ts

@@ -24,7 +24,7 @@ import * as express from 'express'
 // import Brolog       from 'brolog'
 import StateSwitch  from 'state-switch'
 
-import { Message }      from './puppet/'
+import { Message }      from './message'
 
 import {
   config,

src/io.ts

@@ -21,8 +21,11 @@ import StateSwitch    from 'state-switch'
 
 import {
   Message,
+}             from './message'
+
+import {
   ScanData,
-}           from './puppet/'
+}             from './puppet/'
 
 import {
   config,

src/puppet/message.ts → src/message.ts

@@ -26,8 +26,8 @@ import {
 import {
   log,
   Sayable,
-}                       from '../config'
-import PuppetAccessory  from '../puppet-accessory'
+}                       from './config'
+import PuppetAccessory  from './puppet-accessory'
 
 import Contact          from './contact'
 import Room             from './room'

src/puppet-mock/puppet-mock.ts

@@ -26,19 +26,19 @@ import {
   Message,
   MessagePayload,
   MessageDirection,
-}                       from '../puppet/message'
+}                       from '../message'
 import {
   Contact,
   ContactQueryFilter,
   Gender,
   ContactType,
   ContactPayload,
-}                       from '../puppet/contact'
+}                       from '../contact'
 import {
   Room,
   RoomPayload,
   RoomQueryFilter,
-}                       from '../puppet/room'
+}                       from '../room'
 // import {
 //   FriendRequest,
 // }                       from '../puppet/friend-request'

src/puppet-puppeteer/event.ts

@@ -27,8 +27,8 @@ import {
   ScanData,
 }                 from '../puppet/'
 
-import Contact from '../puppet/contact'
-import Message from '../puppet/message'
+import { Contact } from '../contact'
+import { Message } from '../message'
 
 import Firer            from './firer'
 import PuppetPuppeteer  from './puppet-puppeteer'

src/puppet-puppeteer/firer.ts

@@ -31,13 +31,15 @@ import {
 }                             from './web-schemas'
 import PuppetPuppeteer        from './puppet-puppeteer'
 
-import PuppeteerContact       from '../puppet/contact'
+import {
+  Contact,
+}                       from '../contact'
 import {
   FriendRequest,
-}                             from '../puppet/friend-request'
+}                       from '../friend-request'
 import {
   Message,
-}                             from '../puppet/message'
+}                       from '../message'
 
 /* tslint:disable:variable-name */
 export const Firer = {
@@ -125,7 +127,7 @@ async function checkFriendRequest(
     throw new Error('no recommendInfo')
   }
 
-  const contact   = PuppeteerContact.load(recommendInfo.UserName)
+  const contact   = Contact.load(recommendInfo.UserName)
   contact.puppet  = this
 
   const hello = recommendInfo.Content
@@ -251,8 +253,8 @@ async function checkRoomJoin(
                               inviter,
           )
 
-  let inviterContact: PuppeteerContact | null = null
-  let inviteeContactList: PuppeteerContact[] = []
+  let inviterContact: Contact | null = null
+  let inviteeContactList: Contact[] = []
 
   try {
     if (inviter === 'You' || inviter === '你' || inviter === 'you') {
@@ -273,7 +275,7 @@ async function checkRoomJoin(
       let inviteeListAllDone = true
 
       for (const i in inviteeList) {
-        const loaded = inviteeContactList[i] instanceof PuppeteerContact
+        const loaded = inviteeContactList[i] instanceof Contact
 
         if (!loaded) {
           const c = room.member(inviteeList[i])
@@ -292,7 +294,7 @@ async function checkRoomJoin(
           }
         }
 
-        if (inviteeContactList[i] instanceof PuppeteerContact) {
+        if (inviteeContactList[i] instanceof Contact) {
           const isReady = inviteeContactList[i].isReady()
           if (!isReady) {
             log.warn('PuppetPuppeteerFirer', 'fireRoomJoin() retryPromise() isReady false for contact %s', inviteeContactList[i].id)
@@ -310,7 +312,7 @@ async function checkRoomJoin(
 
       if (inviteeListAllDone && inviterContact) {
         log.silly('PuppetPuppeteerFirer', 'fireRoomJoin() resolve() inviteeContactList: %s, inviterContact: %s',
-                                    inviteeContactList.map((c: PuppeteerContact) => c.name()).join(','),
+                                    inviteeContactList.map((c: Contact) => c.name()).join(','),
                                     inviterContact.name(),
                 )
         return true
@@ -322,7 +324,7 @@ async function checkRoomJoin(
 
     }).catch((e: Error) => {
       log.warn('PuppetPuppeteerFirer', 'fireRoomJoin() reject() inviteeContactList: %s, inviterContact: %s, error %s',
-                                 inviteeContactList.map((c: PuppeteerContact) => c.name()).join(','),
+                                 inviteeContactList.map((c: Contact) => c.name()).join(','),
                                  inviter,
                                  e.message,
       )
@@ -332,11 +334,11 @@ async function checkRoomJoin(
       log.error('PuppetPuppeteerFirer', 'firmRoomJoin() inivter not found for %s , `room-join` & `join` event will not fired', inviter)
       return false
     }
-    if (!inviteeContactList.every(c => c instanceof PuppeteerContact)) {
+    if (!inviteeContactList.every(c => c instanceof Contact)) {
       log.error('PuppetPuppeteerFirer', 'firmRoomJoin() inviteeList not all found for %s , only part of them will in the `room-join` or `join` event',
                                   inviteeContactList.join(','),
               )
-      inviteeContactList = inviteeContactList.filter(c => (c instanceof PuppeteerContact))
+      inviteeContactList = inviteeContactList.filter(c => (c instanceof Contact))
       if (inviteeContactList.length < 1) {
         log.error('PuppetPuppeteerFirer', 'firmRoomJoin() inviteeList empty.  `room-join` & `join` event will not fired')
         return false
@@ -401,7 +403,7 @@ async function checkRoomLeave(
    * FIXME: leaver maybe is a list
    * @lijiarui: I have checked, leaver will never be a list. If the bot remove 2 leavers at the same time, it will be 2 sys message, instead of 1 sys message contains 2 leavers.
    */
-  let leaverContact: PuppeteerContact | null, removerContact: PuppeteerContact | null
+  let leaverContact: Contact | null, removerContact: Contact | null
   if (leaver === this.userSelf().id) {
     leaverContact = this.userSelf()
 
@@ -414,7 +416,7 @@ async function checkRoomLeave(
     // }
 
   } else {
-    removerContact = PuppeteerContact.load(this.userSelf().id)
+    removerContact = Contact.load(this.userSelf().id)
     removerContact.puppet = m.puppet
 
     // not sure which is better
@@ -478,7 +480,7 @@ async function checkRoomTopic(
 
   const oldTopic = room.topic()
 
-  let changerContact: PuppeteerContact | null
+  let changerContact: Contact | null
   if (/^You$/.test(changer) || /^你$/.test(changer)) {
     changerContact = this.userSelf()
     changerContact.puppet = m.puppet

src/puppet-puppeteer/puppet-puppeteer.spec.ts

@@ -35,7 +35,7 @@ import Wechaty      from '../wechaty'
 
 import {
   Contact,
-}                   from '../puppet/'
+}                   from '../contact'
 
 import PuppetPuppeteer  from './puppet-puppeteer'
 import Bridge           from './bridge'

src/puppet-puppeteer/puppet-puppeteer.ts

@@ -63,19 +63,19 @@ import {
   ContactPayload,
   ContactQueryFilter,
   Gender,
-}                             from '../puppet/contact'
+}                             from '../contact'
 import {
   Message,
   MessageDirection,
   MessagePayload,
   MessageType,
-}                             from '../puppet/message'
+}                             from '../message'
 import {
   Room,
   RoomMemberQueryFilter,
   RoomPayload,
   RoomQueryFilter,
-}                             from '../puppet/room'
+}                             from '../room'
 // import {
 //   FriendRequest,
 // }                             from '../puppet/friend-request'

src/puppet-puppeteer/puppeteer-contact.spec.ts

@@ -30,7 +30,7 @@ import {
 import Profile from '../profile'
 import Wechaty from '../wechaty'
 
-import Contact from '../puppet/contact'
+import Contact from '../contact'
 
 import PuppetPuppeteer  from './puppet-puppeteer'
 

src/puppet-puppeteer/puppeteer-friend-request.spec.ts

@@ -36,9 +36,9 @@ import {
 //   PuppetMock,
 // }                     from '../puppet-mock/'
 
-import Contact       from '../puppet/contact'
-import Message       from '../puppet/message'
-import FriendRequest from '../puppet/friend-request'
+import Contact       from '../contact'
+import Message       from '../message'
+import FriendRequest from '../friend-request'
 import { PuppetPuppeteer } from './puppet-puppeteer'
 
 test('PuppetPuppeteerFriendRequest.receive smoke testing', async t => {

src/puppet-puppeteer/puppeteer-message.spec.ts

@@ -35,14 +35,14 @@ import Wechaty    from '../wechaty'
 
 import {
   Contact,
-}                   from '../puppet/contact'
+}                   from '../contact'
 import {
   Message,
   MessagePayload,
- }                  from '../puppet/message'
+ }                  from '../message'
 import {
   Room,
-}                   from '../puppet/room'
+}                   from '../room'
 
 import PuppetPuppeteer  from './puppet-puppeteer'
 

src/puppet-puppeteer/puppeteer-room.spec.ts

@@ -30,9 +30,9 @@ import Profile    from '../profile'
 import Wechaty    from '../wechaty'
 
 import PuppetPuppeteer  from './puppet-puppeteer'
-import Contact from '../puppet/contact'
-import Message from '../puppet/message'
-import Room    from '../puppet/room'
+import Contact from '../contact'
+import Message from '../message'
+import Room    from '../room'
 
 // tslint:disable-next-line:variable-name
 const MyRoom = cloneClass(Room)

src/puppet/index.ts

-export {
-  Contact,
-  ContactPayload,
-  ContactQueryFilter,
-  ContactType,
-  Gender,
-}                         from './contact'
-export {
-  FriendRequest,
-  FriendRequestPayload,
-  FriendRequestType,
-}                         from './friend-request'
-export {
-  Message,
-}                         from './message'
-export {
-  Room,
-  RoomMemberQueryFilter,
-  RoomPayload,
-  RoomQueryFilter,
-}                         from './room'
-
 export {
   Puppet,
   PuppetEventName,

src/puppet/puppet.ts

@@ -52,21 +52,19 @@ import {
   Contact,
   ContactPayload,
   ContactQueryFilter,
-}                       from './contact'
+}                       from '../contact'
 import {
   FriendRequest,
-}                       from './friend-request'
+}                       from '../friend-request'
 import {
   Message,
-}                       from './message'
-import {
   MessagePayload,
-}                       from './message.type'
+}                       from '../message'
 import {
   Room,
   RoomPayload,
   RoomQueryFilter,
-}                       from './room'
+}                       from '../room'
 
 // XXX: Name??? ScanInfo? ScanEvent? ScanXXX?
 export interface ScanData {

src/puppet/room.ts → src/room.ts

@@ -26,8 +26,8 @@ import {
   Raven,
   Sayable,
   log,
-}                       from '../config'
-import PuppetAccessory  from '../puppet-accessory'
+}                       from './config'
+import PuppetAccessory  from './puppet-accessory'
 
 import Contact          from './contact'
 import Message          from './message'

src/wechaty.ts

@@ -48,10 +48,18 @@ import {
 
 import {
   Contact,
+}                       from './contact'
+import {
   FriendRequest,
+}                       from './friend-request'
+import {
   Message,
-  Puppet,
+}                       from './message'
+import {
   Room,
+}                       from './room'
+import {
+  Puppet,
 }                       from './puppet/'
 
 export const WECHAT_EVENT_DICT = {