make new TypeScript option `esModuleInterop` happy

src/accessory.spec.ts

@@ -19,7 +19,7 @@
  */
 // tslint:disable:no-shadowed-variable
 import test  from 'blue-tape'
-// import * as sinon from 'sinon'
+// import sinon from 'sinon'
 
 import {
   cloneClass,

src/config.spec.ts

@@ -19,7 +19,7 @@
  */
 // tslint:disable:no-shadowed-variable
 import test  from 'blue-tape'
-// import * as sinon from 'sinon'
+// import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
 import { config } from './config'

src/config.ts

@@ -16,13 +16,13 @@
  *   limitations under the License.
  *
  */
-import * as fs    from 'fs'
-import * as os    from 'os'
-import * as path  from 'path'
+import fs    from 'fs'
+import os    from 'os'
+import path  from 'path'
 
-import * as readPkgUp from 'read-pkg-up'
-import * as Raven     from 'raven'
-import * as qrImage   from 'qr-image'
+import readPkgUp from 'read-pkg-up'
+import Raven     from 'raven'
+import qrImage   from 'qr-image'
 
 import { log }    from 'brolog'
 import {

src/contact.spec.ts

 #!/usr/bin/env ts-node
-import * as test  from 'blue-tape'
-// import * as sinon from 'sinon'
+import test  from 'blue-tape'
+// import sinon from 'sinon'
 
 import {
   cloneClass,

src/io-client.ts

@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-import * as express from 'express'
+import express from 'express'
 /**
  * DO NOT use `require('../')` here!
  * because it will casue a LOOP require ERROR

src/io.ts

@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-import * as WebSocket from 'ws'
+import WebSocket from 'ws'
 import StateSwitch    from 'state-switch'
 
 import {

src/message.ts

@@ -16,8 +16,8 @@
  *   limitations under the License.
  *   @ignore
  */
-// import * as path from 'path'
-// import * as cuid from 'cuid'
+// import path from 'path'
+// import cuid from 'cuid'
 
 import {
   FileBox,

src/misc.spec.ts

@@ -18,12 +18,12 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-import * as sinon from 'sinon'
+import test  from 'blue-tape'
+import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
-import * as http      from 'http'
-import * as express   from 'express'
+import http      from 'http'
+import express   from 'express'
 
 import promiseRetry = require('promise-retry')
 

src/misc.ts

@@ -16,16 +16,16 @@
  *   limitations under the License.
  *
  */
-import * as crypto  from 'crypto'
-import * as https   from 'https'
-import * as http    from 'http'
-import * as net     from 'net'
+import crypto  from 'crypto'
+import https   from 'https'
+import http    from 'http'
+import net     from 'net'
 import {
   Readable,
 }                   from 'stream'
-import * as url     from 'url'
+import url     from 'url'
 
-import * as cuid    from 'cuid'
+import cuid    from 'cuid'
 
 import promiseRetry = require('promise-retry')
 import { WrapOptions } from 'retry'

src/puppet-mock/puppet-mock.ts

@@ -16,7 +16,7 @@
  *   limitations under the License.
  *
  */
-import * as path  from 'path'
+import path  from 'path'
 
 import {
   FileBox,

src/puppet-padchat/puppet-padchat.ts

@@ -17,9 +17,9 @@
  *
  */
 
-// import * as path  from 'path'
-// import * as fs    from 'fs'
-// import * as cuid from 'cuid'
+// import path  from 'path'
+// import fs    from 'fs'
+// import cuid from 'cuid'
 
 import LRU from 'lru-cache'
 

src/puppet-padchat/pure-function-helper.spec.ts

 #!/usr/bin/env ts-node
 
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
+import test  from 'blue-tape'
 
 import {
   PadchatPureFunctionHelper as pfHelper,

src/puppet-puppeteer/bridge.spec.ts

@@ -17,10 +17,10 @@
  *   limitations under the License.
  *
  */
-import * as test  from 'blue-tape'
+import test  from 'blue-tape'
 // tslint:disable:no-shadowed-variable
 
-// import * as sinon from 'sinon'
+// import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
 import {

src/puppet-puppeteer/bridge.ts

@@ -17,8 +17,8 @@
  *
  */
 import { EventEmitter } from 'events'
-import * as fs          from 'fs'
-import * as path        from 'path'
+import fs          from 'fs'
+import path        from 'path'
 
 import {
   Browser,

src/puppet-puppeteer/event.spec.ts

@@ -18,9 +18,9 @@
  *   limitations under the License.
  *
  */
-import * as test  from 'blue-tape'
+import test  from 'blue-tape'
 // tslint:disable:no-shadowed-variable
-// import * as sinon from 'sinon'
+// import sinon from 'sinon'
 
 import {
   MemoryCard,

src/puppet-puppeteer/firer.spec.ts

@@ -23,8 +23,8 @@
  */
 
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-// import * as sinon from 'sinon'
+import test  from 'blue-tape'
+// import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
 import { PuppetPuppeteer }  from './puppet-puppeteer'

src/puppet-puppeteer/firer.ts

@@ -19,7 +19,7 @@
 
 /* tslint:disable:no-var-requires */
 // const retryPromise  = require('retry-promise').default
-// import * as cuid from 'cuid'
+// import cuid from 'cuid'
 
 import {
   log,

src/puppet-puppeteer/index.spec.ts

@@ -18,8 +18,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-// import * as sinon from 'sinon'
+import test  from 'blue-tape'
+// import sinon from 'sinon'
 
 import {
   PuppetPuppeteer,

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

@@ -18,8 +18,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-import * as sinon from 'sinon'
+import test  from 'blue-tape'
+import sinon from 'sinon'
 const sinonTest   = require('sinon-test')(sinon, {
   useFakeTimers: {  // https://github.com/sinonjs/lolex
     shouldAdvanceTime : true,

src/puppet-puppeteer/puppet-puppeteer.ts

@@ -16,13 +16,13 @@
  *   limitations under the License.
  *
  */
-// import * as http    from 'http'
-import * as path    from 'path'
-import * as nodeUrl from 'url'
+// import http    from 'http'
+import path    from 'path'
+import nodeUrl from 'url'
 
-import * as bl      from 'bl'
-import * as mime  from 'mime'
-import * as request from 'request'
+import bl      from 'bl'
+import mime  from 'mime'
+import request from 'request'
 
 // import cloneClass   from 'clone-class'
 import {

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

@@ -19,8 +19,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-import * as sinon from 'sinon'
+import test  from 'blue-tape'
+import sinon from 'sinon'
 
 import {
   cloneClass,

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

@@ -18,8 +18,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-import * as sinon from 'sinon'
+import test  from 'blue-tape'
+import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
 import {

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

@@ -18,8 +18,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-import * as sinon from 'sinon'
+import test  from 'blue-tape'
+import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
 import {

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

@@ -19,8 +19,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-import * as sinon from 'sinon'
+import test  from 'blue-tape'
+import sinon from 'sinon'
 
 // import cloneClass from 'clone-class'
 import {

src/puppet-wechat4u/puppet-wechat4u.ts

@@ -16,14 +16,14 @@
  *   limitations under the License.
  *
  */
-import * as LRU from 'lru-cache'
+import LRU from 'lru-cache'
 
 import {
   FileBox,
 }             from 'file-box'
 
 // tslint:disable-next-line
-import * as Wechat4u from 'wechat4u'
+import Wechat4u from 'wechat4u'
 
 import { Misc } from '../misc'
 

src/puppet/puppet.spec.ts

 #!/usr/bin/env ts-node
 
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
+import test  from 'blue-tape'
 
 import {
   FileBox,

src/puppet/puppet.ts

@@ -18,9 +18,9 @@
  */
 import { EventEmitter } from 'events'
 
-import * as normalize   from 'normalize-package-data'
-import * as readPkgUp   from 'read-pkg-up'
-import * as LRU         from 'lru-cache'
+import normalize   from 'normalize-package-data'
+import readPkgUp   from 'read-pkg-up'
+import LRU         from 'lru-cache'
 
 import {
   FileBox,

src/room.ts

@@ -17,7 +17,7 @@
  *
  *   @ignore
  */
-// import * as util from 'util'
+// import util from 'util'
 
 import {
   FileBox,

src/wechaty.spec.ts

@@ -19,10 +19,10 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-import * as sinon from 'sinon'
+import test  from 'blue-tape'
+import sinon from 'sinon'
 
-// import * as asyncHooks from 'async_hooks'
+// import asyncHooks from 'async_hooks'
 
 import {
   Wechaty,

src/wechaty.ts

@@ -17,9 +17,9 @@
  *
  *  @ignore
  */
-import * as cuid    from 'cuid'
-import * as os      from 'os'
-import * as semver  from 'semver'
+import cuid    from 'cuid'
+import os      from 'os'
+import semver  from 'semver'
 
 import {
   // Constructor,

tests/electron.spec.ts

@@ -19,8 +19,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-// import * as sinon from 'sinon'
+import test  from 'blue-tape'
+// import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
 test('Electron smoke testing', async t => {

tests/node.spec.ts

@@ -19,8 +19,8 @@
  *
  */
 // tslint:disable:no-shadowed-variable
-import * as test  from 'blue-tape'
-// import * as sinon from 'sinon'
+import test  from 'blue-tape'
+// import sinon from 'sinon'
 // const sinonTest   = require('sinon-test')(sinon)
 
 // import { log }  from '../src/config'