diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-10-25 18:13:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 18:13:22 -0400 |
| commit | 842e29057d6e545c6b498c584a5366fff34f6aa7 (patch) | |
| tree | aba1bb9d767945ba72be5f11c5c87027f65c5678 /cli/tools | |
| parent | 79a9f2a77c1c517282a0e3ac77f8a1252b6c50b9 (diff) | |
refactor: break out ModuleInfoCache from ParsedSourceCache (#20977)
As title. This will help use the two independently from the other, which
will help in an upcoming deno doc PR where I need to parse the source
files with scope analysis.
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/compile.rs | 2 | ||||
| -rw-r--r-- | cli/tools/doc.rs | 2 | ||||
| -rw-r--r-- | cli/tools/vendor/mod.rs | 2 | ||||
| -rw-r--r-- | cli/tools/vendor/test.rs | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/cli/tools/compile.rs b/cli/tools/compile.rs index d925b0ea3..ebba884cd 100644 --- a/cli/tools/compile.rs +++ b/cli/tools/compile.rs @@ -25,7 +25,7 @@ pub async fn compile( let factory = CliFactory::from_flags(flags).await?; let cli_options = factory.cli_options(); let module_graph_builder = factory.module_graph_builder().await?; - let parsed_source_cache = factory.parsed_source_cache()?; + let parsed_source_cache = factory.parsed_source_cache(); let binary_writer = factory.create_compile_binary_writer().await?; let module_specifier = cli_options.resolve_main_module()?; let module_roots = { diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs index 73982f819..66fb3bfd5 100644 --- a/cli/tools/doc.rs +++ b/cli/tools/doc.rs @@ -65,7 +65,7 @@ pub async fn print_docs( let file_fetcher = factory.file_fetcher()?; let module_graph_builder = factory.module_graph_builder().await?; let maybe_lockfile = factory.maybe_lockfile(); - let parsed_source_cache = factory.parsed_source_cache()?; + let parsed_source_cache = factory.parsed_source_cache(); let module_specifier = resolve_url_or_path(&source_file, cli_options.initial_cwd())?; diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs index 42909598d..6c7fefa50 100644 --- a/cli/tools/vendor/mod.rs +++ b/cli/tools/vendor/mod.rs @@ -62,7 +62,7 @@ pub async fn vendor( } .boxed_local() }, - parsed_source_cache: factory.parsed_source_cache()?, + parsed_source_cache: factory.parsed_source_cache(), output_dir: &output_dir, maybe_original_import_map: factory.maybe_import_map().await?.as_deref(), maybe_lockfile: factory.maybe_lockfile().clone(), diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs index 73a4324cf..94e692a92 100644 --- a/cli/tools/vendor/test.rs +++ b/cli/tools/vendor/test.rs @@ -17,6 +17,7 @@ use deno_core::serde_json; use deno_graph::source::LoadFuture; use deno_graph::source::LoadResponse; use deno_graph::source::Loader; +use deno_graph::DefaultModuleAnalyzer; use deno_graph::GraphKind; use deno_graph::ModuleGraph; use deno_runtime::deno_fs::RealFs; @@ -234,8 +235,7 @@ impl VendorTestBuilder { let output_dir = make_path("/vendor"); let entry_points = self.entry_points.clone(); let loader = self.loader.clone(); - let parsed_source_cache = ParsedSourceCache::new_in_memory(); - let analyzer = parsed_source_cache.as_analyzer(); + let parsed_source_cache = ParsedSourceCache::default(); let resolver = Arc::new(build_resolver( self.jsx_import_source_config.clone(), self.original_import_map.clone(), @@ -246,12 +246,13 @@ impl VendorTestBuilder { let resolver = resolver.clone(); move |entry_points| { async move { + let analyzer = DefaultModuleAnalyzer::default(); Ok( build_test_graph( entry_points, loader, resolver.as_graph_resolver(), - &*analyzer, + &analyzer, ) .await, ) |
