-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
fix(mocker): fix mock transform with class #9421
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
sheremet-va
merged 1 commit into
vitest-dev:main
from
hi-ogawa:01-09-fix_mocker_fix_mock_transform_with_class
Jan 9, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1117,6 +1117,52 @@ const Baz = class extends Foo {} | |
| `) | ||
| }) | ||
|
|
||
| test('classDeclaration shadowing import', () => { | ||
| const input = `\ | ||
| import { Bar } from "./repro.js" | ||
| { | ||
| class Bar { | ||
| test() {} | ||
| } | ||
| const Zoo = class Zoo extends Bar {} | ||
| } | ||
| ` | ||
| expect(hoistSimpleCodeWithoutMocks(input)).toMatchInlineSnapshot(` | ||
| "vi.mock('faker'); | ||
| const __vi_import_0__ = await import("./repro.js"); | ||
| import {vi} from "vitest"; | ||
| { | ||
| class Bar { | ||
| test() {} | ||
| } | ||
| const Zoo = class Zoo extends Bar {} | ||
|
Comment on lines
+1136
to
+1139
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Without fix, this becomes: class Bar {
test() {}
}
const Zoo = class Zoo extends __vi_import_0__.Bar {} |
||
| }" | ||
| `) | ||
| }) | ||
|
|
||
| test('classExpression name shadowing import', () => { | ||
| const input = `\ | ||
| import { Foo } from "./foo.js" | ||
| const Bar = class Foo { | ||
| static create() { | ||
| return new Foo() | ||
| } | ||
| } | ||
| ` | ||
| expect(hoistSimpleCodeWithoutMocks(input)).toMatchInlineSnapshot(` | ||
| "vi.mock('faker'); | ||
| const __vi_import_0__ = await import("./foo.js"); | ||
| import {vi} from "vitest"; | ||
| const Bar = class Foo { | ||
| static create() { | ||
| return new Foo() | ||
| } | ||
| }" | ||
|
Comment on lines
+1158
to
+1162
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Without the fix, this becomes const Bar = class Foo {
static create() {
return new __vi_import_0__.Foo()
}
} |
||
| `) | ||
| }) | ||
|
|
||
| test('import assertion attribute', () => { | ||
| expect( | ||
| hoistSimpleCodeWithoutMocks(` | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Vite SSR transform has this already, so I just copied from there https://github.com/vitejs/vite/blob/964c718a382ff46ec1f906d7d6bc3f135a6dcd3f/packages/vite/src/node/ssr/ssrTransform.ts#L623-L631