Skip to content

Commit f1092b3

Browse files
authored
perf(coverage): istanbul to collect uncovered files in Promise.all (#11713)
1 parent 867a5e4 commit f1092b3

2 files changed

Lines changed: 41 additions & 29 deletions

File tree

‎packages/coverage-istanbul/src/provider.ts‎

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -212,37 +212,47 @@ export class IstanbulCoverageProvider extends BaseCoverageProvider implements Co
212212

213213
const transform = this.createUncoveredFileTransformer(this.ctx)
214214

215-
for (const [index, filename] of uncoveredFiles.entries()) {
216-
let timeout: ReturnType<typeof setTimeout> | undefined
217-
let start: number | undefined
215+
let processed = 0
218216

217+
for (const chunk of this.toSlices(uncoveredFiles, this.options.processingConcurrency)) {
219218
if (debug.enabled) {
220-
start = performance.now()
221-
timeout = setTimeout(
222-
() => debug(c.bgRed(`File "${filename}" is taking longer than 3s`)),
223-
3_000,
224-
)
225-
226-
debug('Uncovered file %d/%d', index, uncoveredFiles.length)
219+
processed += chunk.length
220+
debug('Uncovered files %d/%d', processed, uncoveredFiles.length)
227221
}
228222

229-
// Unique key makes sure file is not served from cache
230-
const uncoveredKey = `${cacheKey}-${index}`
231-
await transform(`${filename}?cache=${uncoveredKey}&vitest-uncovered-coverage=true`)
232-
233-
const fileCoverage =
234-
this.uncoveredFileCoverages.get(uncoveredKey) ?? this.instrumenter.lastFileCoverage()
235-
this.uncoveredFileCoverages.delete(uncoveredKey)
236-
237-
coverageMap.addFileCoverage(fileCoverage)
238-
239-
if (debug.enabled) {
240-
clearTimeout(timeout)
241-
242-
const diff = performance.now() - start!
243-
const color = diff > 500 ? c.bgRed : c.bgGreen
244-
debug(`${color(` ${diff.toFixed()} ms `)} ${filename}`)
245-
}
223+
await Promise.all(
224+
chunk.map(async (filename, index) => {
225+
let timeout: ReturnType<typeof setTimeout> | undefined
226+
let start: number | undefined
227+
228+
if (debug.enabled) {
229+
start = performance.now()
230+
timeout = setTimeout(
231+
() => debug(c.bgRed(`File "${filename}" is taking longer than 3s`)),
232+
3_000,
233+
)
234+
}
235+
236+
// Unique key makes sure file is not served from cache
237+
const uncoveredKey = `${cacheKey}-${index}`
238+
await transform(`${filename}?cache=${uncoveredKey}&vitest-uncovered-coverage=true`)
239+
240+
const fileCoverage = this.uncoveredFileCoverages.get(uncoveredKey)
241+
this.uncoveredFileCoverages.delete(uncoveredKey)
242+
243+
if (fileCoverage) {
244+
coverageMap.addFileCoverage(fileCoverage)
245+
}
246+
247+
if (debug.enabled) {
248+
clearTimeout(timeout)
249+
250+
const diff = performance.now() - start!
251+
const color = diff > 500 ? c.bgRed : c.bgGreen
252+
debug(`${color(` ${diff.toFixed()} ms `)} ${filename}`)
253+
}
254+
}),
255+
)
246256
}
247257

248258
return coverageMap

‎test/coverage-test/fixtures/configs/vitest.config.conditional.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ export default defineConfig({
99
order: 'pre',
1010
handler(source) {
1111
if (source.includes("fixtures/src/conditional")) {
12+
const params = source.split("?").pop()
13+
1214
if (this.environment.config.consumer === 'server') {
13-
return resolve('fixtures/src/conditional/ssr.ts')
15+
return resolve('fixtures/src/conditional/ssr.ts') + "?" + params
1416
}
15-
return resolve('fixtures/src/conditional/web.ts')
17+
return resolve('fixtures/src/conditional/web.ts') + "?" + params
1618
}
1719
}
1820
},

0 commit comments

Comments
 (0)