use module style exports to maintain the way JS imports the compiled code

Author: the-jackalope

.gitignore

@@ -35,11 +35,6 @@ package-lock.json
 # Optional REPL history
 .node_repl_history
 
-# Build folder
-# Update 2018-08-07: currently build is done to / (before: dist/) due to
-# backwards compatibility reasons, JS files from root and root test/ folder
-# are excluded
-/*.js
 
 # IDE and text editor config files
 .idea

prettier.config.js

@@ -0,0 +1 @@
+module.exports = require('@ethereumjs/config-prettier')

src/hdkey.ts

@@ -1,8 +1,8 @@
-import { Wallet } from './index'
+import Wallet = require('./index')
 
 const HDKey = require('hdkey')
 
-export class EthereumHDKey {
+class EthereumHDKey {
   public static fromMasterSeed(seedBuffer: Buffer): EthereumHDKey {
     return new EthereumHDKey(HDKey.fromMasterSeed(seedBuffer))
   }
@@ -39,3 +39,5 @@ export class EthereumHDKey {
     return Wallet.fromPublicKey(this._hdkey._publicKey, true)
   }
 }
+
+export = EthereumHDKey

src/index.ts

@@ -101,7 +101,7 @@ function stripUnusedKDFParamsForScrypt(params: KDFParams): Partial<KDFParams> {
   return params
 }
 
-export class Wallet {
+class Wallet {
   // static methods
 
   public static generate(icapDirect: boolean = false): Wallet {
@@ -309,6 +309,9 @@ export class Wallet {
       throw new Error('Cannot supply both a private and a public key to the constructor')
     }
 
+    if (!privateKey && !publicKey) {
+    }
+
     if (privateKey && !ethUtil.isValidPrivate(privateKey)) {
       throw new Error('Private key does not satisfy the curve requirements (ie. it is invalid)')
     }
@@ -442,3 +445,5 @@ function runCipherBuffer(cipher: crypto.Cipher | crypto.Decipher, data: Buffer):
 function keyExists(k: Buffer | undefined): k is Buffer {
   return k !== undefined
 }
+
+export = Wallet

src/provider-engine.ts

@@ -1,8 +1,8 @@
-import { Wallet } from './index'
+import Wallet = require('./index')
 
 const HookedWalletEthTxSubprovider = require('web3-provider-engine/subproviders/hooked-wallet-ethtx')
 
-export class WalletSubprovider extends HookedWalletEthTxSubprovider {
+class WalletSubprovider extends HookedWalletEthTxSubprovider {
   constructor(wallet: Wallet, opts?: any) {
     if (!opts) {
       opts = {}
@@ -20,3 +20,5 @@ export class WalletSubprovider extends HookedWalletEthTxSubprovider {
     super(opts)
   }
 }
+
+export = WalletSubprovider

src/thirdparty.ts

@@ -1,7 +1,7 @@
 import * as crypto from 'crypto'
 import * as ethUtil from 'ethereumjs-util'
 
-import { Wallet } from './index'
+import Wallet = require('./index')
 
 const scryptsy = require('scrypt.js')
 const utf8 = require('utf8')
@@ -239,9 +239,11 @@ function fromQuorumWallet(passphrase: string, userid: string): Wallet {
   return new Wallet(seed)
 }
 
-export const Thirdparty = {
+const Thirdparty = {
   fromEtherWallet,
   fromEtherCamp,
   fromKryptoKit,
   fromQuorumWallet,
 }
+
+export = Thirdparty

test/hdkey.ts

@@ -1,5 +1,5 @@
 import * as assert from 'assert'
-import { EthereumHDKey } from '../src/hdkey'
+import EthereumHDKey = require('../src/hdkey')
 
 // from BIP39 mnemonic: awake book subject inch gentle blur grant damage process float month clown
 const fixtureseed = Buffer.from(

test/index.ts

@@ -2,8 +2,8 @@
 import * as assert from 'assert'
 import * as ethUtil from 'ethereumjs-util'
 
-import { Wallet } from '../src'
-import { Thirdparty } from '../src/thirdparty'
+import Wallet = require('../src')
+import Thirdparty = require('../src/thirdparty')
 
 const fixturePrivateKey = 'efca4cdd31923b50f4214af5d2ae10e7ac45a5019e9431cc195482d707485378'
 const fixturePrivateKeyStr = '0x' + fixturePrivateKey