use typed-emitter@1.5.0-from-event for fromEvent typing (#4)

Author: huan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-redux",
-  "version": "1.1.2",
+  "version": "1.7.0",
   "description": "Wechaty Redux Plugin Powered By Ducks",
   "type": "module",
   "exports": {
@@ -53,13 +53,13 @@
     "typesafe-actions": "^5.1.0"
   },
   "peerDependencies": {
-    "gerror": "^1.0.8",
+    "gerror": "^1.0.14",
     "redux": "^4.1.2",
     "redux-observable": "^2.0.0",
     "rxjs": "^7.4",
-    "state-switch": "^1.3.5",
+    "state-switch": "^1.6.1",
     "uuid": "^8.3.2",
-    "wechaty-puppet": "^1.7.5"
+    "wechaty-puppet": "^1.7.19"
   },
   "devDependencies": {
     "@chatie/eslint-config": "^1.0.4",
@@ -72,10 +72,10 @@
     "ducks": "^1.0.2",
     "glob": "^7.2.0",
     "remote-redux-devtools": "^0.5.16",
-    "typed-emitter": "^1.4.0",
+    "typed-emitter": "^1.5.0-from-event",
     "utility-types": "^3.10.0",
-    "wechaty": "^1.5.2",
-    "wechaty-puppet-mock": "^1.0.3"
+    "wechaty": "^1.7.24",
+    "wechaty-puppet-mock": "^1.7.1"
   },
   "files": [
     "bin/",

src/wechaty-redux.ts

@@ -27,9 +27,11 @@ import {
 }             from 'wechaty'
 
 import {
-  fromEvent,
+  fromEvent as rxFromEvent,
   merge,
-}             from 'rxjs'
+}                             from 'rxjs'
+import type { FromEvent }     from 'typed-emitter/rxjs'
+import type { StateSwitch }   from 'state-switch'
 import {
   map,
 }             from 'rxjs/operators'
@@ -42,7 +44,9 @@ import * as duck  from './duck/mod.js'
 
 import * as instances from './manager.js'
 
-export interface WechatyReduxOptions {
+const fromEvent: FromEvent = rxFromEvent
+
+interface WechatyReduxOptions {
   store: Store,
 }
 
@@ -94,30 +98,31 @@ function install (
    *  but the Puppet for convenience
    */
 
-  // TODO: find a better way to remove `any` with StateSwitch interface
-  const switchActive$   = fromEvent<true | 'pending'>(wechaty.puppet.state as any, 'active')
-  const switchInactive$ = fromEvent<true | 'pending'>(wechaty.puppet.state as any, 'inactive')
+  const state = wechaty.puppet.state as StateSwitch
+
+  const switchActive$   = fromEvent(state, 'active')
+  const switchInactive$ = fromEvent(state, 'inactive')
 
   /**
    * FIXME: Huan(20200312) remove the specified explicit types
    *  https://github.com/wechaty/wechaty-redux/issues/4
    */
-  const puppet = wechaty.puppet
-
-  const dong$       = fromEvent<PUPPET.payload.EventDong>       (puppet, 'dong')
-  const error$      = fromEvent<PUPPET.payload.EventError>      (puppet, 'error')
-  const friendship$ = fromEvent<PUPPET.payload.EventFriendship> (puppet, 'friendship')
-  const heartbeat$  = fromEvent<PUPPET.payload.EventHeartbeat>  (puppet, 'heartbeat')
-  const login$      = fromEvent<PUPPET.payload.EventLogin>      (puppet, 'login')
-  const logout$     = fromEvent<PUPPET.payload.EventLogout>     (puppet, 'logout')
-  const message$    = fromEvent<PUPPET.payload.EventMessage>    (puppet, 'message')
-  const ready$      = fromEvent<PUPPET.payload.EventReady>      (puppet, 'ready')
-  const reset$      = fromEvent<PUPPET.payload.EventReset>      (puppet, 'reset')
-  const roomInvite$ = fromEvent<PUPPET.payload.EventRoomInvite> (puppet, 'room-invite')
-  const roomJoin$   = fromEvent<PUPPET.payload.EventRoomJoin>   (puppet, 'room-join')
-  const roomLeave$  = fromEvent<PUPPET.payload.EventRoomLeave>  (puppet, 'room-leave')
-  const roomTopic$  = fromEvent<PUPPET.payload.EventRoomTopic>  (puppet, 'room-topic')
-  const scan$       = fromEvent<PUPPET.payload.EventScan>       (puppet, 'scan')
+  const puppet = wechaty.puppet as PUPPET.impl.PuppetAbstract
+
+  const dong$       = fromEvent(puppet, 'dong')
+  const error$      = fromEvent(puppet, 'error')
+  const friendship$ = fromEvent(puppet, 'friendship')
+  const heartbeat$  = fromEvent(puppet, 'heartbeat')
+  const login$      = fromEvent(puppet, 'login')
+  const logout$     = fromEvent(puppet, 'logout')
+  const message$    = fromEvent(puppet, 'message')
+  const ready$      = fromEvent(puppet, 'ready')
+  const reset$      = fromEvent(puppet, 'reset')
+  const roomInvite$ = fromEvent(puppet, 'room-invite')
+  const roomJoin$   = fromEvent(puppet, 'room-join')
+  const roomLeave$  = fromEvent(puppet, 'room-leave')
+  const roomTopic$  = fromEvent(puppet, 'room-topic')
+  const scan$       = fromEvent(puppet, 'scan')
 
   merge(
     /* eslint-disable no-whitespace-before-property */
@@ -141,6 +146,9 @@ function install (
   ).subscribe(store.dispatch)
 }
 
+export type {
+  WechatyReduxOptions,
+}
 export {
   WechatyRedux,
 }