feat: add npm specifiers to the graph #232
Merged
Conversation
This file contains 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
…directs the unresolved npm specifier to a resolved module
…NodeId` back to CLI later
bartlomieju
approved these changes
Feb 22, 2023
src/graph.rs
Outdated
Comment on lines
2014
to
2074
| for (specifier, npm_ref, maybe_range) in infos { | ||
| if !self.graph.module_slots.contains_key(&specifier) { | ||
| if let Some(npm_resolver) = &self.npm_resolver { | ||
| // todo: cache resolutions to ensure they always resolve the same | ||
| let resolution = npm_resolver.resolve_npm(&npm_ref.req); | ||
| match resolution { | ||
| Ok(pkg_id) => { | ||
| specifier_resolutions | ||
| .insert(specifier.clone(), pkg_id.clone()); | ||
| let pkg_id_ref = NpmPackageNvReference { | ||
| nv: pkg_id, | ||
| sub_path: npm_ref.sub_path, | ||
| }; | ||
| let resolved_specifier = pkg_id_ref.as_specifier(); | ||
| if resolved_specifier != specifier { | ||
| self | ||
| .graph | ||
| .redirects | ||
| .insert(specifier, resolved_specifier.clone()); | ||
| } | ||
| self.graph.module_slots.insert( | ||
| resolved_specifier.clone(), | ||
| ModuleSlot::Module(Module::Npm(NpmModule { | ||
| specifier: resolved_specifier, | ||
| nv_reference: pkg_id_ref, | ||
| })), | ||
| ); | ||
| } | ||
| Err(err) => { | ||
| self.graph.module_slots.insert( | ||
| specifier.clone(), | ||
| ModuleSlot::Err(ModuleGraphError::ResolutionError( | ||
| ResolutionError::ResolverError { | ||
| error: Arc::new(err), | ||
| specifier: specifier.to_string(), | ||
| // this should always be set, | ||
| range: maybe_range.unwrap_or_else(|| Range { | ||
| specifier, | ||
| start: Position::zeroed(), | ||
| end: Position::zeroed(), | ||
| }), | ||
| }, | ||
| )), | ||
| ); | ||
| } | ||
| } | ||
| } else { | ||
| self.graph.module_slots.insert( | ||
| specifier.clone(), | ||
| ModuleSlot::Err(ModuleGraphError::LoadingErr( | ||
| specifier, | ||
| maybe_range, | ||
| Arc::new(anyhow::anyhow!( | ||
| "npm specifiers are not supported in this environment" | ||
| )), | ||
| )), | ||
| ); | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This is very nice, consider factoring the whole body of while into a helper function, could be much easier to grep with fewer indents
There was a problem hiding this comment.
I was thinking about that, but got lazy. Will update soon
There was a problem hiding this comment.
It's a lot of work to do this properly. I'm going to skip on this for now and add a todo
dsherret
added a commit
to denoland/deno
that referenced
this pull request
Feb 22, 2023
This changes npm specifiers to be handled by deno_graph and resolved to an npm package name and version when the specifier is encountered. It also slightly changes how npm specifier resolution occurs—previously it would collect all the npm specifiers and resolve them all at once, but now it resolves them on the fly as they are encountered in the module graph. denoland/deno_graph#232 --------- Co-authored-by: Bartek Iwańczuk <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We're going to rely on integration tests in the CLI for this atm (opened #241 for the future).
Closes #230