diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-09-28 19:17:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-28 19:17:48 -0400 |
commit | 5faf769ac61b627d14710cdf487de7cd4eb3f9d3 (patch) | |
tree | 2cc4ab975522b3c8845ab3040c010fd998a769a6 /cli/factory.rs | |
parent | 3138478f66823348eb745c7f0c2d34eed378a3f0 (diff) |
refactor: extract out sloppy imports resolution from CLI crate (#25920)
This is slow progress towards creating a `deno_resolver` crate.
Waiting on:
* https://github.com/denoland/deno/pull/25918
* https://github.com/denoland/deno/pull/25916
Diffstat (limited to 'cli/factory.rs')
-rw-r--r-- | cli/factory.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cli/factory.rs b/cli/factory.rs index 8aea635d2..5e525ee32 100644 --- a/cli/factory.rs +++ b/cli/factory.rs @@ -41,8 +41,9 @@ use crate::resolver::CjsResolutionStore; use crate::resolver::CliGraphResolver; use crate::resolver::CliGraphResolverOptions; use crate::resolver::CliNodeResolver; +use crate::resolver::CliSloppyImportsResolver; use crate::resolver::NpmModuleLoader; -use crate::resolver::SloppyImportsResolver; +use crate::resolver::SloppyImportsCachedFs; use crate::standalone::DenoCompileBinaryWriter; use crate::tools::check::TypeChecker; use crate::tools::coverage::CoverageCollector; @@ -186,7 +187,7 @@ struct CliFactoryServices { npm_resolver: Deferred<Arc<dyn CliNpmResolver>>, permission_desc_parser: Deferred<Arc<RuntimePermissionDescriptorParser>>, root_permissions_container: Deferred<PermissionsContainer>, - sloppy_imports_resolver: Deferred<Option<Arc<SloppyImportsResolver>>>, + sloppy_imports_resolver: Deferred<Option<Arc<CliSloppyImportsResolver>>>, text_only_progress_bar: Deferred<ProgressBar>, type_checker: Deferred<Arc<TypeChecker>>, cjs_resolutions: Deferred<Arc<CjsResolutionStore>>, @@ -404,17 +405,16 @@ impl CliFactory { pub fn sloppy_imports_resolver( &self, - ) -> Result<Option<&Arc<SloppyImportsResolver>>, AnyError> { + ) -> Result<Option<&Arc<CliSloppyImportsResolver>>, AnyError> { self .services .sloppy_imports_resolver .get_or_try_init(|| { - Ok( - self - .cli_options()? - .unstable_sloppy_imports() - .then(|| Arc::new(SloppyImportsResolver::new(self.fs().clone()))), - ) + Ok(self.cli_options()?.unstable_sloppy_imports().then(|| { + Arc::new(CliSloppyImportsResolver::new(SloppyImportsCachedFs::new( + self.fs().clone(), + ))) + })) }) .map(|maybe| maybe.as_ref()) } |