1
+ import type { ResolvedFile } from "./resolver.js" ;
2
+ import type * as taskTypes from "../types/builtin-tasks/index.js" ;
3
+ import type { SolcConfig , SolidityConfig } from "../types/index.js" ;
4
+
1
5
import { assertHardhatInvariant } from "@nomicfoundation/hardhat-errors" ;
2
6
import debug from "debug" ;
3
7
import { deepEqual } from "fast-equals" ;
4
8
import semver from "semver" ;
5
9
6
- import * as taskTypes from "../types/builtin-tasks/index.js" ;
7
- import {
8
- CompilationJobCreationError ,
9
- CompilationJobCreationErrorReason ,
10
- CompilationJobsCreationResult ,
11
- } from "../types/builtin-tasks/index.js" ;
12
- import { SolcConfig , SolidityConfig } from "../types/index.js" ;
13
-
14
- import { ResolvedFile } from "./resolver.js" ;
10
+ import { CompilationJobCreationErrorReason } from "../types/builtin-tasks/index.js" ;
15
11
16
12
// this should have a proper version range when it's fixed
17
13
const SOLC_BUG_9573_VERSIONS = "<0.8.0" ;
@@ -21,7 +17,7 @@ function isCompilationJobCreationError(
21
17
| taskTypes . CompilationJob
22
18
| taskTypes . CompilationJobCreationError
23
19
| SolcConfig ,
24
- ) : x is CompilationJobCreationError {
20
+ ) : x is taskTypes . CompilationJobCreationError {
25
21
return "reason" in x ;
26
22
}
27
23
@@ -31,7 +27,7 @@ export async function createCompilationJobFromFile(
31
27
dependencyGraph : taskTypes . DependencyGraph ,
32
28
file : ResolvedFile ,
33
29
solidityConfig : SolidityConfig ,
34
- ) : Promise < CompilationJob | CompilationJobCreationError > {
30
+ ) : Promise < CompilationJob | taskTypes . CompilationJobCreationError > {
35
31
const directDependencies = dependencyGraph . getDependencies ( file ) ;
36
32
const transitiveDependencies =
37
33
dependencyGraph . getTransitiveDependencies ( file ) ;
@@ -73,10 +69,12 @@ export async function createCompilationJobsFromConnectedComponent(
73
69
connectedComponent : taskTypes . DependencyGraph ,
74
70
getFromFile : (
75
71
file : ResolvedFile ,
76
- ) => Promise < taskTypes . CompilationJob | CompilationJobCreationError > ,
77
- ) : Promise < CompilationJobsCreationResult > {
72
+ ) => Promise <
73
+ taskTypes . CompilationJob | taskTypes . CompilationJobCreationError
74
+ > ,
75
+ ) : Promise < taskTypes . CompilationJobsCreationResult > {
78
76
const compilationJobs : taskTypes . CompilationJob [ ] = [ ] ;
79
- const errors : CompilationJobCreationError [ ] = [ ] ;
77
+ const errors : taskTypes . CompilationJobCreationError [ ] = [ ] ;
80
78
81
79
for ( const file of connectedComponent . getResolvedFiles ( ) ) {
82
80
const compilationJobOrError = await getFromFile ( file ) ;
@@ -187,7 +185,7 @@ function getCompilerConfigForFile(
187
185
directDependencies : ResolvedFile [ ] ,
188
186
transitiveDependencies : taskTypes . TransitiveDependency [ ] ,
189
187
solidityConfig : SolidityConfig ,
190
- ) : SolcConfig | CompilationJobCreationError {
188
+ ) : SolcConfig | taskTypes . CompilationJobCreationError {
191
189
const transitiveDependenciesVersionPragmas = transitiveDependencies . map (
192
190
( { dependency } ) => dependency . content . versionPragmas ,
193
191
) ;
@@ -249,7 +247,7 @@ function getCompilationJobCreationError(
249
247
transitiveDependencies : taskTypes . TransitiveDependency [ ] ,
250
248
compilerVersions : string [ ] ,
251
249
overriden : boolean ,
252
- ) : CompilationJobCreationError {
250
+ ) : taskTypes . CompilationJobCreationError {
253
251
const fileVersionRange = file . content . versionPragmas . join ( " " ) ;
254
252
if ( semver . maxSatisfying ( compilerVersions , fileVersionRange ) === null ) {
255
253
const reason = overriden
0 commit comments