Fix type ContractRunner (#837)

Co-authored-by: Clouds Flowing <[email protected]>
dethcrypto · May 13, 2023 · 13db3fc · 13db3fc
1 parent 6707876
commit 13db3fc
Show file tree

Hide file tree

Showing 28 changed files with 35 additions and 33 deletions.
diff --git a/.changeset/ethers-v6-runner.md b/.changeset/ethers-v6-runner.md
@@ -0,0 +1,5 @@
+---
+"@typechain/ethers-v6": patch
+---
+
+fix import type ContractRunner
diff --git a/examples/ethers-v6/types/ethers-contracts/factories/Dai__factory.ts b/examples/ethers-v6/types/ethers-contracts/factories/Dai__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { Dai, DaiInterface } from "../Dai";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesInput__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesInput__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   DataTypesInput,
   DataTypesInputInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesPure__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesPure__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   DataTypesPure,
   DataTypesPureInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesView__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesView__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   DataTypesView,
   DataTypesViewInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Events__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Events__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { Events, EventsInterface } from "../../v0.6.4/Events";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { A, AInterface } from "../../../v0.6.4/Issue428_Reproduction/A";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { B, BInterface } from "../../../v0.6.4/Issue428_Reproduction/B";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Library/Lib__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Library/Lib__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { Lib, LibInterface } from "../../../v0.6.4/Library/Lib";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/LibraryConsumer__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/LibraryConsumer__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   LibraryConsumer,
   LibraryConsumerInterface,

diff --git a/...ges/target-ethers-v6-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts b/...ges/target-ethers-v6-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   NAME12mangling,
   NAME12manglingInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Overloads__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Overloads__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { Overloads, OverloadsInterface } from "../../v0.6.4/Overloads";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   PayableFactory,
   PayableFactoryInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/Payable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/Payable__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   Payable,
   PayableInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/ISimpleToken__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/ISimpleToken__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   ISimpleToken,
   ISimpleTokenInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   Issue552_Reproduction,
   Issue552_ReproductionInterface,

diff --git a/...ages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts b/...ages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   KingOfTheHill,
   KingOfTheHillInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   Withdrawable,
   WithdrawableInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   ERC721Enumerable,
   ERC721EnumerableInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { ERC721, ERC721Interface } from "../../../v0.8.9/Rarity/ERC721";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   IERC721Enumerable,
   IERC721EnumerableInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   IERC721Receiver,
   IERC721ReceiverInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { IERC721, IERC721Interface } from "../../../v0.8.9/Rarity/IERC721";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type { Rarity, RarityInterface } from "../../../v0.8.9/Rarity/Rarity";
 
 const _abi = [

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/SimpleToken__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/SimpleToken__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   SimpleToken,
   SimpleTokenInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   NestedLibrary,
   NestedLibraryInterface,

diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts
@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Contract, Interface, ContractRunner } from "ethers";
+import { Contract, Interface, type ContractRunner } from "ethers";
 import type {
   NestedLibrary,
   NestedLibraryInterface,

diff --git a/packages/target-ethers-v6/src/codegen/index.ts b/packages/target-ethers-v6/src/codegen/index.ts
@@ -81,7 +81,7 @@ export function codegenContractTypings(contract: Contract, codegenConfig: Codege
 
 
     getFunction<T extends ContractMethod = ContractMethod>(key: string | FunctionFragment): T;
-    
+
     ${values(contract.functions)
       .flatMap((v) => processDeclaration(v, alwaysGenerateOverloads, generateGetFunctionForContract))
       .join('\n')}
@@ -187,15 +187,12 @@ export function codegenContractFactory(
   const imports =
     createImportsForUsedIdentifiers(
       {
-        ethers: [
+        ethers: ['Contract', 'ContractFactory', 'ContractTransactionResponse', 'Interface'],
+        'type ethers': [
           'Signer',
-          'Contract',
-          'ContractFactory',
           'BytesLike',
           'BigNumberish',
           'Overrides',
-          'ContractTransactionResponse',
-          'Interface',
           'AddressLike',
           'ContractDeployTransaction',
           'Provider',
@@ -214,7 +211,7 @@ export function codegenContractFactory(
 export function codegenAbstractContractFactory(contract: Contract, abi: any): string {
   const { body, header } = codegenCommonContractFactory(contract, abi)
   return `
-  import { Contract, Interface, ContractRunner } from "ethers";
+  import { Contract, Interface, type ContractRunner } from "ethers";
   ${header}
 
   export class ${contract.name}${FACTORY_POSTFIX} {