refactor: add WorkspaceFactory and ResolverFactory
#27766
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
… needing other services to be constructed
…_resolver_factory
dsherret
commented
Jan 22, 2025
| pub struct ImportMapSpecifierResolveError { | ||
| #[source] | ||
| source: deno_path_util::ResolveUrlOrPathError, | ||
| } |
There was a problem hiding this comment.
I shifted this code out of the CLI, but then I moved it back. I kept the changes.
dsherret
force-pushed
the
refactor_resolver_factory
branch
from
230d821 to
5afb334
Compare
dsherret
commented
Jan 22, 2025
| self.options.no_npm | ||
| } | ||
|
|
||
| pub fn node_modules_dir_mode( |
There was a problem hiding this comment.
Pay attention here. I rewrote the logic for determining the NodeModulesDirMode because previously it was convoluted. This should be much more straightforward.
dsherret
commented
Jan 22, 2025
resolvers/deno/npmrc.rs
Outdated
There was a problem hiding this comment.
Extracted from CLI crate.
dsherret
commented
Jan 22, 2025
| #[inline(always)] | ||
| fn is_builtin_node_module(&self, module_name: &str) -> bool { | ||
| DENO_SUPPORTED_BUILTIN_NODE_MODULES | ||
| .binary_search(&module_name) |
There was a problem hiding this comment.
Changed this to binary search instead of iterating because DENO_SUPPORTED_BUILTIN_NODE_MODULES is guaranteed to be sorted.
bartlomieju
approved these changes
Jan 23, 2025
Comment on lines
+59
to
+64
| /// Discover `.npmrc` file - currently we only support it next to `package.json`, | ||
| /// next to `deno.json`, or in the user's home directory. | ||
| /// | ||
| /// In the future we will need to support it in the global directory | ||
| /// as per https://docs.npmjs.com/cli/v10/configuring-npm/npmrc#files. | ||
| pub fn discover_npmrc_from_workspace<TSys: EnvVar + EnvHomeDir + FsRead>( |
There was a problem hiding this comment.
This will cause conflicts with #27119 :(
Comment on lines
+24
to
+25
| pub static DENO_SUPPORTED_BUILTIN_NODE_MODULES: &[&str] = &[ | ||
| // NOTE(bartlomieju): keep this list in sync with `ext/node/polyfills/01_require.js` |
There was a problem hiding this comment.
Make sure this is reachable when a crate is imported - Deploy relies on this list
There was a problem hiding this comment.
Double checked and it is.
bartlomieju
pushed a commit
that referenced
this pull request
Jan 30, 2025
Allows easily constructing a `DenoResolver` using the exact same logic that we use in the CLI (useful for dnt and for external bundlers). This code is then used in the CLI to ensure the logic is always up-to-date. ```rs use std::rc::Rc; use deno_resolver::factory::ResolverFactory; use deno_resolver::factory::WorkspaceFactory; use sys_traits::impls::RealSys; let sys = RealSys; let cwd = sys.env_current_dir()?; let workspace_factory = Rc::new(WorkspaceFactory::new(sys, cwd, Default::default())); let resolver_factory = ResolverFactory::new(workspace_factory.clone(), Default::default()); let deno_resolver = resolver_factory.deno_resolver().await?; ```
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.
Allows easily constructing a
DenoResolverusing the exact same logic that we use in the CLI (useful for dnt and for external bundlers). This code is then used in the CLI to ensure the logic is always up-to-date.