Repository navigation
Memoize getTransitiveDeps in src/jsifier.mjs. NFC
#28054
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,27 +127,40 @@ function isDefined(symName) { | |
| return false; | ||
| } | ||
|
|
||
| const transitiveDepsCache = new Map(); | ||
|
|
||
| function getTransitiveDeps(symbol) { | ||
| // TODO(sbc): Use some kind of cache to avoid quadratic behaviour here. | ||
| let result = transitiveDepsCache.get(symbol); | ||
| if (result) { | ||
| return result; | ||
| } | ||
| const transitiveDeps = new Set(); | ||
| const seen = new Set(); | ||
| const toVisit = [symbol]; | ||
| while (toVisit.length) { | ||
| const sym = toVisit.pop(); | ||
| if (!seen.has(sym)) { | ||
| let directDeps = LibraryManager.library[sym + '__deps'] ?? []; | ||
| directDeps = directDeps.filter((d) => typeof d === 'string'); | ||
| for (const dep of directDeps) { | ||
| const cached = transitiveDepsCache.get(sym); | ||
| let deps = cached; | ||
| if (!deps) { | ||
| deps = LibraryManager.library[sym + '__deps'] ?? []; | ||
| deps = deps.filter((d) => typeof d === 'string'); | ||
| } | ||
|
Comment on lines
+143
to
+148
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. |
||
| for (const dep of deps) { | ||
| if (!transitiveDeps.has(dep)) { | ||
| debugLog(`adding dependency ${symbol} -> ${dep}`); | ||
| transitiveDeps.add(dep); | ||
| if (!cached) { | ||
| toVisit.push(dep); | ||
| } | ||
| } | ||
| transitiveDeps.add(dep); | ||
| toVisit.push(dep); | ||
| } | ||
| seen.add(sym); | ||
| } | ||
| } | ||
| return Array.from(transitiveDeps); | ||
| result = Array.from(transitiveDeps); | ||
| transitiveDepsCache.set(symbol, result); | ||
| return result; | ||
| } | ||
|
|
||
| function shouldPreprocess(fileName) { | ||
|
|
@@ -413,9 +426,9 @@ const PROXY_SYNC = 1; | |
| const PROXY_SYNC_ASYNC = 2; | ||
|
|
||
| export async function runJSify(outputFile, symbolsOnly) { | ||
| transitiveDepsCache.clear(); | ||
| const libraryItems = []; | ||
| const libraryAliases = []; | ||
| const symbolDeps = {}; | ||
| const asyncFuncs = []; | ||
| let postSets = []; | ||
|
|
||
|
|
@@ -629,13 +642,6 @@ function(${args}) { | |
| } | ||
|
|
||
| if (symbolsOnly) { | ||
| if (LibraryManager.library.hasOwnProperty(symbol)) { | ||
| // Resolve aliases before looking up deps | ||
| var transitiveDeps = getTransitiveDeps(symbol); | ||
| symbolDeps[symbol] = transitiveDeps.filter( | ||
| (d) => !isJsOnlySymbol(d) && !(d in LibraryManager.library), | ||
| ); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
|
|
@@ -1003,6 +1009,15 @@ var proxiedFunctionTable = [ | |
| timer.stop('symbolHandler'); | ||
|
|
||
| if (symbolsOnly) { | ||
| const symbolDeps = {}; | ||
| for (const sym of Object.keys(LibraryManager.library)) { | ||
| if (!isDecorator(sym)) { | ||
| const transitiveDeps = getTransitiveDeps(sym); | ||
| symbolDeps[sym] = transitiveDeps.filter( | ||
| (d) => !isJsOnlySymbol(d) && !(d in LibraryManager.library), | ||
| ); | ||
| } | ||
| } | ||
| writeOutput( | ||
| JSON.stringify({ | ||
| deps: symbolDeps, | ||
|
|
||
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.
Since
runJSifycan be called multiple times within the same Node.js process (for example, in test suites or in-process build pipelines), a module-level globalMapliketransitiveDepsCachewill persist across different compilations. This can lead to stale cache entries and incorrect dependency resolution if different compilations use different libraries or settings.To prevent this cross-compilation contamination,
transitiveDepsCacheshould be cleared at the start ofrunJSify: