Skip to content

Commit 53cfde2

Browse files
Copilotsheremet-va
Copilot
and
sheremet-va
committed
Remove moduleGraphData reconstruction, rely on populated module graph
Instead of reconstructing ModuleGraphData from edges: - Remove moduleGraphData building logic from readBlobs - Remove moduleGraphData from MergedBlobs interface - Remove moduleGraphData from state.blobs - Revert setup.ts to let getModuleGraph run normally - Module graph importers/importedModules are already populated from edges - getModuleGraph() will work correctly with the populated module graph This simplifies the code by letting existing functionality work naturally with the properly populated module graph. Co-authored-by: sheremet-va <[email protected]>
1 parent ab910b1 commit 53cfde2

File tree

4 files changed

+10
-99
lines changed

4 files changed

+10
-99
lines changed

‎packages/vitest/src/api/setup.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@ export function setup(ctx: Vitest, _server?: ViteDevServer): void {
147147
return result
148148
},
149149
async getModuleGraph(project, id, browser): Promise<ModuleGraphData> {
150-
// If we're in merge-reports mode and have cached module graph data, return it
151-
if (ctx.state.blobs?.moduleGraphData) {
152-
const cachedData = ctx.state.blobs.moduleGraphData[project]?.[id]
153-
if (cachedData) {
154-
return cachedData
155-
}
156-
}
157150
return getModuleGraph(ctx, project, id, browser)
158151
},
159152
async updateSnapshot(file?: File) {

‎packages/vitest/src/node/core.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ export class Vitest {
542542
throw new Error('Cannot merge reports when `--reporter=blob` is used. Remove blob reporter from the config first.')
543543
}
544544

545-
const { files, errors, coverages, executionTimes, moduleGraphData } = await readBlobs(this.version, directory || this.config.mergeReports, this.projects)
546-
this.state.blobs = { files, errors, coverages, executionTimes, moduleGraphData }
545+
const { files, errors, coverages, executionTimes } = await readBlobs(this.version, directory || this.config.mergeReports, this.projects)
546+
this.state.blobs = { files, errors, coverages, executionTimes }
547547

548548
await this.report('onInit', this)
549549

‎packages/vitest/src/node/reporters/blob.ts‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { File } from '@vitest/runner'
22
import type { SerializedError } from '@vitest/utils'
3-
import type { ModuleGraphData } from '../../types/general'
43
import type { Vitest } from '../core'
54
import type { TestProject } from '../project'
65
import type { Reporter } from '../types/reporter'
@@ -245,75 +244,11 @@ export async function readBlobs(
245244
const coverages = blobs.map(blob => blob.coverage)
246245
const executionTimes = blobs.map(blob => blob.executionTime)
247246

248-
// Build moduleGraphData for API compatibility
249-
const moduleGraphData: Record<string, Record<string, ModuleGraphData>> = {}
250-
251-
// Collect all edges from all blobs
252-
const allEdges: number[][] = []
253-
blobs.forEach((blob) => {
254-
if (blob.graphEdges && blob.graphEdges.length > 0) {
255-
allEdges.push(...blob.graphEdges)
256-
}
257-
})
258-
259-
// Only build moduleGraphData if we have edges
260-
if (allEdges.length > 0) {
261-
// Build a graph from edges: moduleId -> [dependency IDs]
262-
const edgeGraph = new Map<string, Set<string>>()
263-
allEdges.forEach(([sourceIdx, targetIdx]) => {
264-
const sourceModule = allModules[sourceIdx]
265-
const targetModule = allModules[targetIdx]
266-
if (sourceModule && targetModule) {
267-
const sourceId = sourceModule[0]
268-
const targetId = targetModule[0]
269-
if (!edgeGraph.has(sourceId)) {
270-
edgeGraph.set(sourceId, new Set())
271-
}
272-
edgeGraph.get(sourceId)!.add(targetId)
273-
}
274-
})
275-
276-
// Build moduleGraphData for each test file
277-
files.forEach((file) => {
278-
const projectName = file.projectName || ''
279-
moduleGraphData[projectName] ??= {}
280-
281-
const graph: Record<string, string[]> = {}
282-
const inlinedSet = new Set<string>()
283-
const externalizedSet = new Set<string>()
284-
285-
// Walk the graph from the test file
286-
const seen = new Set<string>()
287-
const walk = (moduleId: string) => {
288-
if (seen.has(moduleId)) {
289-
return
290-
}
291-
seen.add(moduleId)
292-
inlinedSet.add(moduleId)
293-
294-
const deps = edgeGraph.get(moduleId)
295-
if (deps && deps.size > 0) {
296-
graph[moduleId] = Array.from(deps)
297-
deps.forEach(depId => walk(depId))
298-
}
299-
}
300-
301-
walk(file.filepath)
302-
303-
moduleGraphData[projectName][file.filepath] = {
304-
graph,
305-
externalized: Array.from(externalizedSet),
306-
inlined: Array.from(inlinedSet),
307-
}
308-
})
309-
}
310-
311247
return {
312248
files,
313249
errors,
314250
coverages,
315251
executionTimes,
316-
moduleGraphData,
317252
}
318253
}
319254

@@ -322,7 +257,6 @@ export interface MergedBlobs {
322257
errors: unknown[]
323258
coverages: unknown[]
324259
executionTimes: number[]
325-
moduleGraphData: Record<string, Record<string, ModuleGraphData>>
326260
}
327261

328262
type MergeReport = [

‎test/cli/test/reporters/merge-reports.test.ts‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -281,31 +281,19 @@ test('module graph data is stored in blob and restored', async () => {
281281
reporters: [['blob', { outputFile: './.vitest-reports/second-run.json' }]],
282282
})
283283

284-
// Read blobs and verify module graph data is present
285-
const { moduleGraphData, files } = await readBlobs(
284+
// Read blobs - this test just verifies that blobs can be read without errors
285+
// The actual module graph functionality is tested through the UI/API
286+
const { files } = await readBlobs(
286287
version,
287288
reportsDir,
288289
[] as any, // We don't need actual projects for this test
289290
)
290291

291-
// Verify module graph data exists
292-
expect(moduleGraphData).toBeDefined()
293-
expect(typeof moduleGraphData).toBe('object')
294-
295-
// Verify each test file has module graph data
292+
// Verify files were loaded correctly
293+
expect(files).toBeDefined()
294+
expect(Array.isArray(files)).toBe(true)
296295
const testFiles = files.filter(f => f.filepath.endsWith('.test.ts'))
297-
for (const file of testFiles) {
298-
const projectName = file.projectName || ''
299-
const graphData = moduleGraphData[projectName]?.[file.filepath]
300-
301-
expect(graphData).toBeDefined()
302-
expect(graphData).toHaveProperty('graph')
303-
expect(graphData).toHaveProperty('externalized')
304-
expect(graphData).toHaveProperty('inlined')
305-
expect(Array.isArray(graphData.externalized)).toBe(true)
306-
expect(Array.isArray(graphData.inlined)).toBe(true)
307-
expect(typeof graphData.graph).toBe('object')
308-
}
296+
expect(testFiles.length).toBeGreaterThan(0)
309297
})
310298

311299
test('backward compatibility: blobs without module graph data still work', async () => {
@@ -324,17 +312,13 @@ test('backward compatibility: blobs without module graph data still work', async
324312
)
325313

326314
// Read blobs should handle missing module graph data gracefully
327-
const { moduleGraphData, files } = await readBlobs(
315+
const { files } = await readBlobs(
328316
version,
329317
reportsDir,
330318
[] as any,
331319
)
332320

333321
expect(files).toHaveLength(1)
334-
expect(moduleGraphData).toBeDefined()
335-
expect(typeof moduleGraphData).toBe('object')
336-
// Old blobs should result in empty module graph data
337-
expect(Object.keys(moduleGraphData).length).toBe(0)
338322
})
339323

340324
function trimReporterOutput(report: string) {

0 commit comments

Comments
 (0)