From 0d291d1e286cfb707ad5a1974d594c21012ddcbf Mon Sep 17 00:00:00 2001 From: shrpne Date: Tue, 21 Feb 2023 14:41:42 +0300 Subject: [PATCH] fix types default export --- CHANGELOG.md | 1 + packages/web3-bzz/types/index.d.ts | 2 ++ packages/web3-bzz/types/tests/bzz-test.ts | 5 ++++- packages/web3-core-method/types/index.d.ts | 2 ++ packages/web3-eth-accounts/types/index.d.ts | 2 ++ packages/web3-eth-accounts/types/tests/accounts-tests.ts | 5 ++++- packages/web3-eth-contract/types/index.d.ts | 2 ++ packages/web3-eth-contract/types/tests/contract-test.ts | 6 +++++- packages/web3-eth-ens/types/index.d.ts | 2 ++ packages/web3-eth-ens/types/tests/ens-test.ts | 6 +++++- packages/web3-eth-iban/types/index.d.ts | 2 ++ packages/web3-eth-iban/types/tests/iban-tests.ts | 5 ++++- packages/web3-eth-personal/types/index.d.ts | 2 ++ packages/web3-eth-personal/types/tests/personal-tests.ts | 5 ++++- packages/web3-eth/types/index.d.ts | 2 ++ packages/web3-eth/types/tests/eth.tests.ts | 5 ++++- packages/web3-net/types/index.d.ts | 2 ++ packages/web3-net/types/tests/network-test.ts | 5 ++++- packages/web3-providers-http/types/index.d.ts | 2 ++ .../types/tests/web3-provider-http-tests.ts | 9 ++++++++- packages/web3-providers-ipc/types/index.d.ts | 2 ++ .../types/tests/web3-provider-ipc-tests.ts | 9 ++++++++- packages/web3-providers-ws/types/index.d.ts | 2 ++ .../types/tests/web3-provider-ws-tests.ts | 6 +++++- packages/web3-shh/types/index.d.ts | 2 ++ packages/web3-shh/types/tests/shh-test.ts | 5 ++++- 26 files changed, 86 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fa5c61b6cc..46796b399da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -646,3 +646,4 @@ Released with 1.0.0-beta.37 code base. - Fixed skipped ws-ganache tests (#5759) - Fixed "provider started to reconnect error" in web3-provider-ws (#5820) + - Fixed types for packages which have default exports but not declared default export in .d.ts diff --git a/packages/web3-bzz/types/index.d.ts b/packages/web3-bzz/types/index.d.ts index 340ee13b780..07fbaaf034d 100644 --- a/packages/web3-bzz/types/index.d.ts +++ b/packages/web3-bzz/types/index.d.ts @@ -38,3 +38,5 @@ export interface Pick { directory: () => Promise; data: () => Promise; } + +export default Bzz diff --git a/packages/web3-bzz/types/tests/bzz-test.ts b/packages/web3-bzz/types/tests/bzz-test.ts index 286486e82ba..d40cd74c018 100644 --- a/packages/web3-bzz/types/tests/bzz-test.ts +++ b/packages/web3-bzz/types/tests/bzz-test.ts @@ -17,7 +17,10 @@ * @date 2018 */ -import { Bzz } from 'web3-bzz'; +import BzzDefault, { Bzz } from 'web3-bzz'; + +// $ExpectType Bzz +const bzz_default_empty = new BzzDefault(); // $ExpectType Bzz const bzz_empty = new Bzz(); diff --git a/packages/web3-core-method/types/index.d.ts b/packages/web3-core-method/types/index.d.ts index 438b315ef4c..2801e729955 100644 --- a/packages/web3-core-method/types/index.d.ts +++ b/packages/web3-core-method/types/index.d.ts @@ -32,3 +32,5 @@ export interface Method { abiCoder?: any; handleRevert?: boolean; } + +export default Method diff --git a/packages/web3-eth-accounts/types/index.d.ts b/packages/web3-eth-accounts/types/index.d.ts index f92cdc13f7a..fa50abfbbea 100644 --- a/packages/web3-eth-accounts/types/index.d.ts +++ b/packages/web3-eth-accounts/types/index.d.ts @@ -36,3 +36,5 @@ export interface SignatureObject { s: string; v: string; } + +export default Accounts diff --git a/packages/web3-eth-accounts/types/tests/accounts-tests.ts b/packages/web3-eth-accounts/types/tests/accounts-tests.ts index aa7c1c3f24b..f3e2c595b70 100644 --- a/packages/web3-eth-accounts/types/tests/accounts-tests.ts +++ b/packages/web3-eth-accounts/types/tests/accounts-tests.ts @@ -16,7 +16,10 @@ * @author Josh Stevens * @date 2018 */ -import { Accounts, SignedTransaction } from 'web3-eth-accounts'; +import AccountsDefault, { Accounts, SignedTransaction } from 'web3-eth-accounts'; + +// $ExpectType Accounts +const accounts_default_empty = new AccountsDefault(); // $ExpectType Accounts const accounts_empty = new Accounts(); diff --git a/packages/web3-eth-contract/types/index.d.ts b/packages/web3-eth-contract/types/index.d.ts index 5abc6fe0ed4..55261dbd2e9 100644 --- a/packages/web3-eth-contract/types/index.d.ts +++ b/packages/web3-eth-contract/types/index.d.ts @@ -177,3 +177,5 @@ export interface EventData { blockNumber: number; address: string; } + +export default Contract diff --git a/packages/web3-eth-contract/types/tests/contract-test.ts b/packages/web3-eth-contract/types/tests/contract-test.ts index 56657810b37..55043a7f6bb 100644 --- a/packages/web3-eth-contract/types/tests/contract-test.ts +++ b/packages/web3-eth-contract/types/tests/contract-test.ts @@ -18,8 +18,12 @@ * @date 2018 */ -import { Contract } from 'web3-eth-contract'; +import ContractDefault, { Contract } from 'web3-eth-contract'; +// $ExpectType Contract +const contract_default = new ContractDefault([]); + +// $ExpectType Contract const contract = new Contract([]); // $ExpectType string | null diff --git a/packages/web3-eth-ens/types/index.d.ts b/packages/web3-eth-ens/types/index.d.ts index c47f21fac03..de52d97b5bf 100644 --- a/packages/web3-eth-ens/types/index.d.ts +++ b/packages/web3-eth-ens/types/index.d.ts @@ -402,3 +402,5 @@ export class Registry { callback?: (error: Error | TransactionRevertInstructionError, receipt: TransactionReceipt) => void ): PromiEvent } + +export default Ens diff --git a/packages/web3-eth-ens/types/tests/ens-test.ts b/packages/web3-eth-ens/types/tests/ens-test.ts index 17d0af5bcdd..c48a810a7f0 100644 --- a/packages/web3-eth-ens/types/tests/ens-test.ts +++ b/packages/web3-eth-ens/types/tests/ens-test.ts @@ -20,9 +20,13 @@ import { TransactionRevertInstructionError } from 'web3-core-helpers'; import { TransactionReceipt } from 'web3-core'; import { Contract } from 'web3-eth-contract'; -import { Ens, ContentHash } from 'web3-eth-ens'; +import EnsDefault, { Ens, ContentHash } from 'web3-eth-ens'; import { Eth } from 'web3-eth'; +// $ExpectType Ens +const ens_default = new EnsDefault(new Eth('http://localhost:8545')); + +// $ExpectType Ens const ens = new Ens(new Eth('http://localhost:8545')); // $ExpectType string | null diff --git a/packages/web3-eth-iban/types/index.d.ts b/packages/web3-eth-iban/types/index.d.ts index 6890787f65a..75c8daea45b 100644 --- a/packages/web3-eth-iban/types/index.d.ts +++ b/packages/web3-eth-iban/types/index.d.ts @@ -58,3 +58,5 @@ export interface IndirectOptions { institution: string; identifier: string; } + +export default Iban diff --git a/packages/web3-eth-iban/types/tests/iban-tests.ts b/packages/web3-eth-iban/types/tests/iban-tests.ts index 41c921d900b..71e50805b0c 100644 --- a/packages/web3-eth-iban/types/tests/iban-tests.ts +++ b/packages/web3-eth-iban/types/tests/iban-tests.ts @@ -20,11 +20,14 @@ * @date 2018 */ -import { Iban, IndirectOptions } from 'web3-eth-iban'; +import IbanDefault, { Iban, IndirectOptions } from 'web3-eth-iban'; const iban = 'XE7338O073KYGTWWZN0F2WZ0R8PX5ZPPZS'; const address = '0x45cd08334aeedd8a06265b2ae302e3597d8faa28'; +// $ExpectType Iban +const iban_default = new IbanDefault(iban); + // $ExpectType Iban const ibanClass = new Iban(iban); diff --git a/packages/web3-eth-personal/types/index.d.ts b/packages/web3-eth-personal/types/index.d.ts index 8d52ff9477d..029858e5d0e 100644 --- a/packages/web3-eth-personal/types/index.d.ts +++ b/packages/web3-eth-personal/types/index.d.ts @@ -93,3 +93,5 @@ export class Personal { callback?: (error: Error, result: string) => void ): Promise; } + +export default Personal diff --git a/packages/web3-eth-personal/types/tests/personal-tests.ts b/packages/web3-eth-personal/types/tests/personal-tests.ts index 556e6aa2848..7ef28e0c073 100644 --- a/packages/web3-eth-personal/types/tests/personal-tests.ts +++ b/packages/web3-eth-personal/types/tests/personal-tests.ts @@ -20,7 +20,10 @@ */ import { RLPEncodedTransaction } from 'web3-core'; -import { Personal } from 'web3-eth-personal'; +import PersonalDefault, { Personal } from 'web3-eth-personal'; + +// $ExpectType Personal +const personal_default_empty = new PersonalDefault(); // $ExpectType Personal const personal_empty = new Personal(); diff --git a/packages/web3-eth/types/index.d.ts b/packages/web3-eth/types/index.d.ts index b7499a0c49f..5bd33b99d4e 100644 --- a/packages/web3-eth/types/index.d.ts +++ b/packages/web3-eth/types/index.d.ts @@ -485,3 +485,5 @@ export interface FeeHistoryResult { oldestBlock: number; reward: string[][]; } + +export default Eth diff --git a/packages/web3-eth/types/tests/eth.tests.ts b/packages/web3-eth/types/tests/eth.tests.ts index 818926ca18e..0a18f3f7df8 100644 --- a/packages/web3-eth/types/tests/eth.tests.ts +++ b/packages/web3-eth/types/tests/eth.tests.ts @@ -19,7 +19,7 @@ */ import {Log} from 'web3-core'; -import { +import EthDefault, { BlockTransactionObject, BlockTransactionString, BlockHeader, @@ -38,6 +38,9 @@ import { import BN = require('bn.js'); import BigNumber from 'bignumber.js'; +// $ExpectType Eth +const eth_default_empty = new EthDefault(); + // $ExpectType Eth const eth_empty = new Eth(); diff --git a/packages/web3-net/types/index.d.ts b/packages/web3-net/types/index.d.ts index 0ebdd612c06..bf2b1e8c613 100644 --- a/packages/web3-net/types/index.d.ts +++ b/packages/web3-net/types/index.d.ts @@ -20,3 +20,5 @@ import { NetworkBase } from 'web3-core'; export class Network extends NetworkBase {} + +export default Network diff --git a/packages/web3-net/types/tests/network-test.ts b/packages/web3-net/types/tests/network-test.ts index 25a09ddbb2c..f3d3c2d90a3 100644 --- a/packages/web3-net/types/tests/network-test.ts +++ b/packages/web3-net/types/tests/network-test.ts @@ -17,7 +17,10 @@ * @date 2018 */ -import { Network } from 'web3-net'; +import NetworkDefault, { Network } from 'web3-net'; + +// $ExpectType Network +const network_default_empty = new NetworkDefault(); // $ExpectType Network const network_empty = new Network(); diff --git a/packages/web3-providers-http/types/index.d.ts b/packages/web3-providers-http/types/index.d.ts index 297b02dd35b..d3a4818fa23 100644 --- a/packages/web3-providers-http/types/index.d.ts +++ b/packages/web3-providers-http/types/index.d.ts @@ -63,3 +63,5 @@ export class HttpProvider extends HttpProviderBase { disconnect(): boolean; supportsSubscriptions(): boolean; } + +export default HttpProvider diff --git a/packages/web3-providers-http/types/tests/web3-provider-http-tests.ts b/packages/web3-providers-http/types/tests/web3-provider-http-tests.ts index 07504062131..5f8f2a1807b 100644 --- a/packages/web3-providers-http/types/tests/web3-provider-http-tests.ts +++ b/packages/web3-providers-http/types/tests/web3-provider-http-tests.ts @@ -22,9 +22,16 @@ import * as http from 'http'; import * as https from 'https'; -import { HttpProvider } from 'web3-providers'; +import HttpProviderDefault, { HttpProvider } from 'web3-providers'; import { JsonRpcResponse } from 'web3-core-helpers'; +// $ExpectType HttpProvider +const http_provider_default_empty = new HttpProviderDefault(); + +// $ExpectType HttpProvider +const http_provider_empty = new HttpProvider(); + +// $ExpectType HttpProvider const httpProvider = new HttpProvider('http://localhost:8545', { timeout: 20000, headers: [ diff --git a/packages/web3-providers-ipc/types/index.d.ts b/packages/web3-providers-ipc/types/index.d.ts index b18f4326f51..8b561fea9e1 100644 --- a/packages/web3-providers-ipc/types/index.d.ts +++ b/packages/web3-providers-ipc/types/index.d.ts @@ -23,3 +23,5 @@ import { IpcProviderBase } from 'web3-core-helpers'; export class IpcProvider extends IpcProviderBase { } + +export default IpcProvider diff --git a/packages/web3-providers-ipc/types/tests/web3-provider-ipc-tests.ts b/packages/web3-providers-ipc/types/tests/web3-provider-ipc-tests.ts index 19b0fcb4ab5..10450a3df19 100644 --- a/packages/web3-providers-ipc/types/tests/web3-provider-ipc-tests.ts +++ b/packages/web3-providers-ipc/types/tests/web3-provider-ipc-tests.ts @@ -21,9 +21,16 @@ */ import * as net from 'net'; -import { IpcProvider } from 'web3-providers'; +import IpcProviderDefault, { IpcProvider } from 'web3-providers'; import { JsonRpcResponse } from 'web3-core-helpers'; +// $ExpectType IpcProvider +const ipc_provider_default = new IpcProviderDefault( + '/Users/myuser/Library/Ethereum/geth.ipc', + new net.Server() +); + +// $ExpectType IpcProvider const ipcProvider = new IpcProvider( '/Users/myuser/Library/Ethereum/geth.ipc', new net.Server() diff --git a/packages/web3-providers-ws/types/index.d.ts b/packages/web3-providers-ws/types/index.d.ts index e8fec4bd7a5..f4cd8c56820 100644 --- a/packages/web3-providers-ws/types/index.d.ts +++ b/packages/web3-providers-ws/types/index.d.ts @@ -23,3 +23,5 @@ import { WebsocketProviderBase } from 'web3-core-helpers'; export class WebsocketProvider extends WebsocketProviderBase { } + +export default WebsocketProvider diff --git a/packages/web3-providers-ws/types/tests/web3-provider-ws-tests.ts b/packages/web3-providers-ws/types/tests/web3-provider-ws-tests.ts index 3d54e0f9473..3d20084b34e 100644 --- a/packages/web3-providers-ws/types/tests/web3-provider-ws-tests.ts +++ b/packages/web3-providers-ws/types/tests/web3-provider-ws-tests.ts @@ -21,7 +21,7 @@ */ import { WebsocketProviderOptions, JsonRpcResponse } from 'web3-core-helpers'; -import { WebsocketProvider } from 'web3-providers'; +import WebsocketProviderDefault, { WebsocketProvider } from 'web3-providers'; const options: WebsocketProviderOptions = { timeout: 30000, @@ -30,6 +30,10 @@ const options: WebsocketProviderOptions = { } }; +// $ExpectType WebsocketProvider +const ws_provider_default = new WebsocketProviderDefault('ws://localhost:8545', options); + +// $ExpectType WebsocketProvider const wsProvider = new WebsocketProvider('ws://localhost:8545', options); // $ExpectType boolean diff --git a/packages/web3-shh/types/index.d.ts b/packages/web3-shh/types/index.d.ts index a6954080a53..fd23527b7b6 100644 --- a/packages/web3-shh/types/index.d.ts +++ b/packages/web3-shh/types/index.d.ts @@ -197,3 +197,5 @@ export interface Subscribe { on(type: 'error', handler: (data: Error) => void): void; } + +export default Shh diff --git a/packages/web3-shh/types/tests/shh-test.ts b/packages/web3-shh/types/tests/shh-test.ts index ec7022f234c..a1435826ed6 100644 --- a/packages/web3-shh/types/tests/shh-test.ts +++ b/packages/web3-shh/types/tests/shh-test.ts @@ -17,7 +17,10 @@ * @date 2018 */ -import { Info, Notification, Shh } from 'web3-shh'; +import ShhDefault, { Info, Notification, Shh } from 'web3-shh'; + +// $ExpectType Shh +const shh_default_empty = new ShhDefault(); // $ExpectType Shh const shh_empty = new Shh();