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

feat(vite-node): moduleCache.invalidateDepTree utiltity #1872

Merged
merged 2 commits into from Aug 18, 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
55 changes: 41 additions & 14 deletions packages/vite-node/src/client.ts
Expand Up @@ -63,15 +63,34 @@ export class ModuleCacheMap extends Map<string, ModuleCache> {
return super.set(fsPath, mod)
}

get(fsPath: string) {
get(fsPath: string): ModuleCache {
fsPath = this.normalizePath(fsPath)
return super.get(fsPath)
if (!super.has(fsPath))
super.set(fsPath, {})
return super.get(fsPath)!
}

delete(fsPath: string) {
fsPath = this.normalizePath(fsPath)
return super.delete(fsPath)
}

/**
* Invalidate modules that dependent on the given modules, up to the main entry
*/
invalidateDepTree(ids: string[] | Set<string>, invalidated = new Set<string>()) {
for (const _id of ids) {
const id = this.normalizePath(_id)
if (invalidated.has(id))
continue
invalidated.add(id)
const mod = super.get(id)
if (mod?.importers)
this.invalidateDepTree(mod.importers, invalidated)
super.delete(id)
}
return invalidated
}
}

export class ViteNodeRunner {
Expand Down Expand Up @@ -104,16 +123,24 @@ export class ViteNodeRunner {
const id = normalizeRequestId(rawId, this.options.base)
const fsPath = toFilePath(id, this.root)

const mod = this.moduleCache.get(fsPath)
const importee = callstack[callstack.length - 1]

if (!mod.importers)
mod.importers = new Set()
if (importee)
mod.importers.add(importee)

// the callstack reference itself circularly
if (callstack.includes(fsPath) && this.moduleCache.get(fsPath)?.exports)
return this.moduleCache.get(fsPath)?.exports
if (callstack.includes(fsPath) && mod.exports)
return mod.exports

// cached module
if (this.moduleCache.get(fsPath)?.promise)
return this.moduleCache.get(fsPath)?.promise
if (mod.promise)
return mod.promise

const promise = this.directRequest(id, fsPath, callstack)
this.moduleCache.update(fsPath, { promise })
Object.assign(mod, { promise })

return await promise
}
Expand All @@ -122,6 +149,8 @@ export class ViteNodeRunner {
async directRequest(id: string, fsPath: string, _callstack: string[]) {
const callstack = [..._callstack, fsPath]

const mod = this.moduleCache.get(fsPath)

const request = async (dep: string) => {
const depFsPath = toFilePath(normalizeRequestId(dep, this.options.base), this.root)
const getStack = () => {
Expand All @@ -140,9 +169,7 @@ export class ViteNodeRunner {
throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`)
}

const mod = await this.cachedRequest(dep, callstack)

return mod
return await this.cachedRequest(dep, callstack)
}
finally {
if (debugTimer)
Expand Down Expand Up @@ -179,9 +206,9 @@ export class ViteNodeRunner {
let { code: transformed, externalize } = await this.options.fetchModule(id)
if (externalize) {
debugNative(externalize)
const mod = await this.interopedImport(externalize)
this.moduleCache.update(fsPath, { exports: mod })
return mod
const exports = await this.interopedImport(externalize)
mod.exports = exports
return exports
}

if (transformed == null)
Expand All @@ -197,7 +224,7 @@ export class ViteNodeRunner {
configurable: false,
})

this.moduleCache.update(fsPath, { code: transformed, exports })
Object.assign(mod, { code: transformed, exports })

const __filename = fileURLToPath(url)
const moduleProxy = {
Expand Down
4 changes: 4 additions & 0 deletions packages/vite-node/src/types.ts
Expand Up @@ -45,6 +45,10 @@ export interface ModuleCache {
promise?: Promise<any>
exports?: any
code?: string
/**
* Module ids that imports this module
*/
importers?: Set<string>
}

export interface ViteNodeRunnerOptions {
Expand Down