[johan-gorter]

Description

vi.resetAllMocks() iterates REGISTERED_MOCKS, which holds a WeakRef to every mock ever created in the worker, and calls mockReset() on each one that is still alive. Its cost therefore grows with the number of live mocks, not with the number of mocks a test actually touched.

With isolate: false this becomes the dominant cost of a run. One worker executes many test files, so module-level mocks and every vi.fn() that is still reachable keep accumulating. deref() also adds each mock to the WeakRef "keep during job" list, so the mocks a test created cannot be collected until the runner yields to the event loop, which rarely happens inside a file. With mockReset: true every test then pays for every mock in the worker.

Measured on a large suite (364 files, 6733 tests, pool: 'forks', isolate: false, mockReset: true, coverage off, 4 workers):

Vitest	wall time	resetAllMocks() CPU across workers	max mocks visited per reset
4.1.11 (Set of strong refs)	671 s	1838 s	~110,000
5.0.0 (WeakRef registry, #11092)	189 s	465 s	~66,000
5.0.0 + this change	26 s	0.4 s	5 to 50

The last row was measured with the first commit (strong Sets). With the weak-ref version the same suite takes 22.5 s wall time against 24.9 s for the first commit, measured back to back; see the comments below.

This PR applies the approach #11092 introduced for clearAllMocks() to resetAllMocks():

• DIRTY_MOCK_STATES already tracks mocks that were called since their last mockClear().
• A new DIRTY_MOCK_CONFIGS set tracks mocks whose config changed since their last mockReset(): mockImplementation, mockImplementationOnce, withImplementation, and mockName add the mock, mockReset() removes it. Every mockReturnValue*, mockResolvedValue*, mockRejectedValue*, and mockThrow* helper goes through one of these.
• resetAllMocks() iterates the two sets. mockReset() removes the mock from both, so a mock present in both is visited once.

A mock that is in neither set is already in its reset state, so behavior is unchanged. clearAllMocks() is unaffected: it still only touches DIRTY_MOCK_STATES, and a mock that was reconfigured but never called stays in DIRTY_MOCK_CONFIGS until resetAllMocks() sees it (covered by the new tests).

With this change nothing reads REGISTERED_MOCKS anymore, so the WeakRef registry and the FinalizationRegistry are removed. That also removes the per-mock WeakRef allocation and the deref() pass that pinned every live mock for the rest of the job. If you prefer to keep the registry for future use, that part of the diff can be dropped; the perf gain comes from the two loops in resetAllMocks(). The Firefox 79 note in docs/guide/browser/index.md that #11092 added for WeakRef support may no longer be needed after this; I left the docs untouched.

Update (second commit, see the comments below): the paragraph above no longer applies. Both dirty sets hold WeakRefs, and the FinalizationRegistry from #11092 stays and removes collected mocks from both sets. A mock gets its WeakRef the first time it is called or configured instead of at creation, so mocks that are never touched no longer get one; the REGISTERED_MOCKS set that held a ref to every mock is gone. Collectability of unused mocks is unchanged from #11092; this PR is about the iteration cost of resetAllMocks(), see #11197 (comment) by @hi-ogawa. The docs note on WeakRef support stays. The third commit merges main and adopts the Set.prototype.add guard from #11299 in the shared markDirty helper.

Related: #9492, #11092.

AI disclosure: Claude (Claude Code) assisted with drafting the change, the tests and this description; the diff was reviewed and measured by me.

Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

• It's really useful if your PR references an issue where it is discussed ahead of time. If the feature is substantial or introduces breaking changes without a discussion, PR might be closed.
• Ideally, include a test that fails without this PR but passes with it.
• Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.
• Please check Allow edits by maintainers to make review process faster. Note that this option is not available for repositories that are owned by Github organizations.

Tests

• Run the tests with pnpm test:ci.

Documentation

• If you introduce new functionality, document it. You can run documentation with pnpm run docs command.

Changesets

• Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.

[netlify]

✅ Deploy Preview for vitest-dev ready!

Built without sensitive environment variables

Name	Link
🔨 Latest commit	77806c5
🔍 Latest deploy log	https://app.netlify.com/projects/vitest-dev/deploys/6ac152d393bad200088695d4
😎 Deploy Preview	https://deploy-preview-11197--vitest-dev.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
🤖 Make changes	Run an agent on this branch

---

To edit notification comments on pull requests, go to your Netlify project configuration.

[sheremet-va]

Mocks are never removed from the global state now. Doesn't it reintroduce the issue that was fixed by the previous PR? CC @scttcper

[scttcper]

yeah, with only clearMocks enabled the new config set keeps a strong reference to every vi.fn(implementation), so it brings back the retention issue

[johan-gorter]

Addressed in the second commit: both sets now hold WeakRefs with the #11092 finalizer, and the third commit merges main with the #11299 guard. Retention test in vi-fn-retention.test.ts covers the clearMocks-only case you and @scttcper raised. Could you take another look when you have a moment?

[scttcper]

could we use weak refs for the config set? also found that calling mockReset() inside withImplementation leaves the restored implementation around after resetAllMocks().

[johan-gorter]

You're both right. The config set holds strong references and only mockReset() removes a mock, so with clearMocks alone every mock that had mockImplementation / mockReturnValue / mockName called on it stays alive for the lifetime of the worker. That's the leak #11092 fixed. DIRTY_MOCK_STATES has the same property when nothing ever clears, so both sets need the same treatment. And withImplementation is a real bug in this PR: if the callback calls mockReset() the mock leaves the set, the previous implementation is restored, and resetAllMocks() never sees it again. Reproduced with mockImplementation and with a pending mockImplementationOnce.

I'd fix it in this PR as follows:

• Both dirty sets hold WeakRefs. One WeakRef per mock, created lazily the first time a mock is called or configured and kept in a WeakMap, registered once with a FinalizationRegistry that removes it from both sets when the mock is collected.
• mockClear() / mockReset() delete the ref from their set. clearAllMocks() / resetAllMocks() deref only the dirty refs and drop dead ones as they go.
• The restore step of withImplementation adds the mock back to the config set.
• Compared to main this allocates a WeakRef only for mocks that were called or configured, and deref() only touches the dirty ones, so the numbers in the description should hold. I'll update the description, since the paragraph about removing the registry no longer applies.

[johan-gorter]

@scttcper @sheremet-va, shall I improve the PR with this approach or do you have a different insight?

[scttcper]

yeah, that sounds good to me. would be good to add tests for both cases and rerun the benchmark with the weak refs.

[johan-gorter]

Pushed the weak-ref version as a second commit on top of the one you reviewed.

What the second commit changes:

• Both dirty sets hold WeakRefs. A mock gets one ref the first time it is called or configured, kept in a WeakMap and registered once with the FinalizationRegistry from perf(spy): avoid scanning cleared mocks #11092, which drops it from both sets when the mock is collected. Iteration prunes dead refs as well. So the registry stays and the paragraph in the description about removing it no longer applies; the Firefox note in the docs stays too.
• The restore step of withImplementation marks the mock dirty again, so mockReset() inside the callback no longer hides the restored implementation from resetAllMocks().
• Tests: the two withImplementation + mockReset() cases, and test/unit/test/mocking/vi-fn-retention.test.ts with five scenarios (called, configured, vi.fn(impl) with clearMocks only, configured with clearMocks only, called and configured with clearMocks only) asserting that 100 dropped mocks are collected. It uses the --expose-gc flag flip from the leak-probe fixture and passes on threads, forks and vmThreads. All seven new tests fail on the first commit.

Two things worth knowing:

• vi.fn(impl) applies its implementation through mockImplementation, so it counts as configured: it gets its ref at creation and is visited once by the next resetAllMocks(), which restores the same implementation. I left that as is rather than special-casing it.
• Creating a WeakRef pins the target until the current job ends, so a mock's first call or configuration still pins it, the same way creation did on main. Only untouched mocks are now never pinned.

Benchmark rerun at the spy level (Node 24, built @vitest/spy, base 09bc9ad6 vs this PR). Each "test" calls 20 mocks, configures 20 others, then runs resetAllMocks():

live mocks in the worker	main	this PR
10,000	4.5 ms	0.13 ms
50,000	46 ms	0.19 ms
100,000	128 ms	0.18 ms

Per-call overhead is within noise (one mock called 1M times: 173 ms main, 169 ms PR; 1000 mocks x 1000 calls: 271 vs 259 ms). Retention with 20,000 dropped mocks per scenario and forced GC: main retains every called mock when nothing clears; this PR collects all of them in every scenario, including clearMocks only.

On the suite from the description (364 files, 6764 tests, isolate: false, mockReset: true, 4 forks, coverage off), measured back to back on one machine: 5.0.0 with the strong-Set commit b62516fc 24.9 s wall time, with this weak-ref commit 22.5 s. Unpatched 5.0.0 was 189 s in the earlier measurement from the description. @scttcper

[scttcper]

looks good on my end

[hi-ogawa]

There was a fix for guarding against Set.prototype.add mocking #11299. Can you fix conflict please?

[hi-ogawa]

I think it's worth calling out this is technically different nature from #11092 and #9492 where the main idea was to make unused mocks as garbage-collectable with enumerable weak set trick of const REGISTERED_MOCKS = new Set<WeakRef<Mock>>.

Compared to that, this PR is not about garbage-collctability but about reducing the iteration with more book-keeping. That's what I understood so far, but please let me know if I misread the idea.

[johan-gorter]

@hi-ogawa thanks, both points are right.

Conflict: merged main and carried the #11299 guard into this branch. Both dirty sets are filled through one markDirty helper, so it captures Set.prototype.add once and calls that; the two tests from #11299 pass on the branch. The same recursion would exist for a spy on WeakMap.prototype.get/set, which markDirty uses for the per-mock WeakRef and main does not touch on the call path. I left that unguarded, matching the scope of #11299; say so if you want those covered too.

Nature of the change: you read it correctly. #11092 and #9492 were about making unused mocks collectable. This PR is about the iteration cost of resetAllMocks(): with isolate: false and mockReset: true every test visited every live mock in the worker, and module-level mocks accumulate across files, so a single reset walked tens of thousands of mocks. The change keeps two sets of the mocks that actually need work (called since the last clear, configured since the last reset) and only visits those. The WeakRefs in those sets are there to keep the collectability #11092 introduced, not the goal of the PR. Two side effects, neither the point: a mock that is never called or configured no longer gets a WeakRef at all, and a called mock that nothing ever clears is now collectable, where main keeps it in DIRTY_MOCK_STATES for the lifetime of the worker.

What it costs: one WeakMap lookup plus the original Set.prototype.add per mock call, a WeakRef allocated on a mock's first call or configuration (which pins it until the current job ends, as creation did on main), and vi.fn(impl) counts as configured, so it is visited once by the next reset. Within noise in a microbenchmark and on our suite.

What it fixes in practice: our 364-file suite with isolate: false and mockReset: true went from 189 s on 5.0.0 to 22 s. Any project with that config and many module-level mocks pays the same per-test cost today. I struck the outdated paragraph in the description and added a note pointing here.

[sheremet-va]

LGTM, could you please resolve the conflict?

[johan-gorter]

Conflict resolved; the Node 26 failure is the ui.spec module-graph click timeout, unit tests passed. @sheremet-va