Skip to content
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

fix: correctly automock nested interoped defaults #2559

Merged
merged 3 commits into from Dec 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions examples/mocks/src/external/cjs-pseudoesm.cjs
@@ -0,0 +1,4 @@
const fn = () => {}

exports.fn = fn
Object.defineProperty(exports, '__esModule', { value: true, enumerable: false })
1 change: 1 addition & 0 deletions examples/mocks/src/external/default-cjs.cjs
@@ -0,0 +1 @@
module.exports = require('./cjs-pseudoesm.cjs')
2 changes: 1 addition & 1 deletion examples/mocks/test/external.test.ts
@@ -1,4 +1,4 @@
import '../src/external.mjs'
import '../src/external/external.mjs'
import { expect, test, vi } from 'vitest'
import axios from 'axios'

Expand Down
9 changes: 9 additions & 0 deletions examples/mocks/test/nested-default.spec.ts
@@ -0,0 +1,9 @@
// @vitest-environment jsdom

import * as modDefaultCjs from '../src/external/default-cjs.cjs'

vi.mock('../src/external/default-cjs.cjs')

test('default is mocked', () => {
expect(vi.isMockFunction(modDefaultCjs.default.fn)).toBe(true)
})
2 changes: 1 addition & 1 deletion examples/mocks/vite.config.ts
Expand Up @@ -24,7 +24,7 @@ export default defineConfig({
globals: true,
environment: 'node',
deps: {
external: [/src\/external\.mjs/],
external: [/src\/external/],
},
},
})
20 changes: 20 additions & 0 deletions packages/vite-node/src/client.ts
Expand Up @@ -414,6 +414,26 @@ export class ViteNodeRunner {
return defaultExport !== undefined
return prop in mod || (defaultExport && prop in defaultExport)
},
// this is needed for mocker to know what is available to mock
ownKeys(mod) {
const keys = Reflect.ownKeys(mod)
if (!defaultExport || isPrimitive(defaultExport))
return keys
const allKeys = [...keys, 'default', ...Reflect.ownKeys(defaultExport)]
return Array.from(new Set(allKeys))
},
getOwnPropertyDescriptor(mod, prop) {
const descriptor = Reflect.getOwnPropertyDescriptor(mod, prop)
if (descriptor)
return descriptor
if (prop === 'default' && defaultExport !== undefined) {
return {
value: defaultExport,
enumerable: true,
configurable: true,
}
}
},
})
}
}
Expand Down