2022-01-07 22:09:52 -05:00
|
|
|
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
|
2020-09-05 20:34:02 -04:00
|
|
|
|
2022-06-29 11:51:11 -04:00
|
|
|
use crate::args::CliOptions;
|
2022-06-28 16:45:55 -04:00
|
|
|
use crate::args::DenoSubcommand;
|
2022-06-27 16:54:09 -04:00
|
|
|
use crate::args::Flags;
|
|
|
|
use crate::args::TypeCheckMode;
|
2021-10-10 17:26:22 -04:00
|
|
|
use crate::cache;
|
2022-07-12 18:58:39 -04:00
|
|
|
use crate::cache::EmitCache;
|
2022-07-19 11:58:18 -04:00
|
|
|
use crate::cache::FastInsecureHasher;
|
2022-08-22 12:14:59 -04:00
|
|
|
use crate::cache::ParsedSourceCache;
|
2022-07-12 18:58:39 -04:00
|
|
|
use crate::cache::TypeCheckCache;
|
2019-11-04 10:38:52 -05:00
|
|
|
use crate::deno_dir;
|
2022-07-19 11:58:18 -04:00
|
|
|
use crate::emit::emit_parsed_source;
|
2022-06-28 16:45:55 -04:00
|
|
|
use crate::emit::TsConfigType;
|
|
|
|
use crate::emit::TsTypeLib;
|
2020-11-05 19:38:21 -05:00
|
|
|
use crate::file_fetcher::FileFetcher;
|
2021-12-16 05:45:41 -05:00
|
|
|
use crate::graph_util::graph_lock_or_exit;
|
|
|
|
use crate::graph_util::GraphData;
|
|
|
|
use crate::graph_util::ModuleEntry;
|
2020-02-19 08:17:13 -05:00
|
|
|
use crate::http_cache;
|
2021-10-10 17:26:22 -04:00
|
|
|
use crate::lockfile::as_maybe_locker;
|
2019-11-04 10:38:52 -05:00
|
|
|
use crate::lockfile::Lockfile;
|
2022-08-20 11:31:33 -04:00
|
|
|
use crate::node;
|
2022-09-06 06:57:28 -04:00
|
|
|
use crate::node::NodeResolution;
|
2022-09-13 11:59:01 -04:00
|
|
|
use crate::npm::NpmCache;
|
2022-08-20 11:31:33 -04:00
|
|
|
use crate::npm::NpmPackageReference;
|
|
|
|
use crate::npm::NpmPackageResolver;
|
2022-09-13 11:59:01 -04:00
|
|
|
use crate::npm::NpmRegistryApi;
|
2022-09-09 15:57:39 -04:00
|
|
|
use crate::progress_bar::ProgressBar;
|
2021-10-10 17:26:22 -04:00
|
|
|
use crate::resolver::ImportMapResolver;
|
2021-11-08 20:26:39 -05:00
|
|
|
use crate::resolver::JsxResolver;
|
2022-09-02 10:54:40 -04:00
|
|
|
use crate::tools::check;
|
2020-10-22 20:50:15 -04:00
|
|
|
|
2022-08-23 10:30:14 -04:00
|
|
|
use deno_ast::MediaType;
|
2021-11-16 09:02:28 -05:00
|
|
|
use deno_core::anyhow::anyhow;
|
2022-08-20 11:31:33 -04:00
|
|
|
use deno_core::anyhow::bail;
|
2021-11-16 09:02:28 -05:00
|
|
|
use deno_core::anyhow::Context;
|
2021-10-10 17:26:22 -04:00
|
|
|
use deno_core::error::custom_error;
|
2020-09-14 12:48:57 -04:00
|
|
|
use deno_core::error::AnyError;
|
2021-12-16 05:45:41 -05:00
|
|
|
use deno_core::futures;
|
2021-07-06 23:48:01 -04:00
|
|
|
use deno_core::parking_lot::Mutex;
|
2021-12-16 05:45:41 -05:00
|
|
|
use deno_core::parking_lot::RwLock;
|
2020-10-22 20:50:15 -04:00
|
|
|
use deno_core::url::Url;
|
2021-09-29 04:47:24 -04:00
|
|
|
use deno_core::CompiledWasmModuleStore;
|
2020-01-05 11:56:18 -05:00
|
|
|
use deno_core::ModuleSpecifier;
|
2021-09-10 21:38:24 -04:00
|
|
|
use deno_core::SharedArrayBufferStore;
|
2021-11-15 18:25:52 -05:00
|
|
|
use deno_graph::create_graph;
|
2021-12-16 05:45:41 -05:00
|
|
|
use deno_graph::source::CacheInfo;
|
|
|
|
use deno_graph::source::LoadFuture;
|
|
|
|
use deno_graph::source::Loader;
|
2022-03-10 20:33:02 -05:00
|
|
|
use deno_graph::source::ResolveResponse;
|
2022-01-31 17:33:57 -05:00
|
|
|
use deno_graph::ModuleKind;
|
|
|
|
use deno_graph::Resolved;
|
2021-09-10 21:38:24 -04:00
|
|
|
use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
|
2021-12-01 11:13:11 -05:00
|
|
|
use deno_runtime::deno_tls::rustls::RootCertStore;
|
2021-09-10 21:38:24 -04:00
|
|
|
use deno_runtime::deno_web::BlobStore;
|
|
|
|
use deno_runtime::inspector_server::InspectorServer;
|
|
|
|
use deno_runtime::permissions::Permissions;
|
|
|
|
use import_map::ImportMap;
|
2022-01-13 18:17:56 -05:00
|
|
|
use log::warn;
|
2021-06-19 10:14:43 -04:00
|
|
|
use std::collections::HashSet;
|
2021-09-24 11:10:42 -04:00
|
|
|
use std::ops::Deref;
|
2022-06-08 06:07:25 -04:00
|
|
|
use std::path::PathBuf;
|
2019-11-04 10:38:52 -05:00
|
|
|
use std::sync::Arc;
|
|
|
|
|
|
|
|
/// This structure represents state of single "deno" program.
|
|
|
|
///
|
|
|
|
/// It is shared by all created workers (thus V8 isolates).
|
2021-09-24 11:10:42 -04:00
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct ProcState(Arc<Inner>);
|
|
|
|
|
|
|
|
pub struct Inner {
|
2019-11-04 10:38:52 -05:00
|
|
|
pub dir: deno_dir::DenoDir,
|
2020-11-05 19:38:21 -05:00
|
|
|
pub file_fetcher: FileFetcher,
|
2022-06-29 11:51:11 -04:00
|
|
|
pub options: Arc<CliOptions>,
|
2022-07-19 11:58:18 -04:00
|
|
|
pub emit_cache: EmitCache,
|
|
|
|
pub emit_options: deno_ast::EmitOptions,
|
|
|
|
pub emit_options_hash: u64,
|
|
|
|
pub graph_data: Arc<RwLock<GraphData>>,
|
2020-10-23 17:01:54 -04:00
|
|
|
pub lockfile: Option<Arc<Mutex<Lockfile>>>,
|
2021-11-08 20:26:39 -05:00
|
|
|
pub maybe_import_map: Option<Arc<ImportMap>>,
|
2020-09-25 04:24:51 -04:00
|
|
|
pub maybe_inspector_server: Option<Arc<InspectorServer>>,
|
2022-06-28 16:45:55 -04:00
|
|
|
pub root_cert_store: RootCertStore,
|
2021-07-05 09:34:37 -04:00
|
|
|
pub blob_store: BlobStore,
|
2021-05-22 12:08:24 -04:00
|
|
|
pub broadcast_channel: InMemoryBroadcastChannel,
|
2021-07-06 13:42:52 -04:00
|
|
|
pub shared_array_buffer_store: SharedArrayBufferStore,
|
2021-09-29 04:47:24 -04:00
|
|
|
pub compiled_wasm_module_store: CompiledWasmModuleStore,
|
2022-08-22 12:14:59 -04:00
|
|
|
pub parsed_source_cache: ParsedSourceCache,
|
2021-11-24 10:55:10 -05:00
|
|
|
maybe_resolver: Option<Arc<dyn deno_graph::source::Resolver + Send + Sync>>,
|
2022-06-08 06:07:25 -04:00
|
|
|
maybe_file_watcher_reporter: Option<FileWatcherReporter>,
|
2022-09-13 11:59:01 -04:00
|
|
|
pub npm_cache: NpmCache,
|
|
|
|
pub npm_resolver: NpmPackageResolver,
|
2022-08-20 11:31:33 -04:00
|
|
|
pub cjs_resolutions: Mutex<HashSet<ModuleSpecifier>>,
|
2022-09-09 15:57:39 -04:00
|
|
|
progress_bar: ProgressBar,
|
2019-11-04 10:38:52 -05:00
|
|
|
}
|
|
|
|
|
2021-09-24 11:10:42 -04:00
|
|
|
impl Deref for ProcState {
|
|
|
|
type Target = Arc<Inner>;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
|
|
&self.0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ProcState {
|
2022-06-28 16:45:55 -04:00
|
|
|
pub async fn build(flags: Flags) -> Result<Self, AnyError> {
|
2022-06-29 11:51:11 -04:00
|
|
|
Self::from_options(Arc::new(CliOptions::from_flags(flags)?)).await
|
2022-06-28 16:45:55 -04:00
|
|
|
}
|
|
|
|
|
2022-06-29 11:51:11 -04:00
|
|
|
pub async fn from_options(
|
|
|
|
options: Arc<CliOptions>,
|
2022-06-28 16:45:55 -04:00
|
|
|
) -> Result<Self, AnyError> {
|
2022-06-29 11:51:11 -04:00
|
|
|
Self::build_with_sender(options, None).await
|
2022-06-08 06:07:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
pub async fn build_for_file_watcher(
|
2022-06-28 16:45:55 -04:00
|
|
|
flags: Flags,
|
2022-06-08 06:07:25 -04:00
|
|
|
files_to_watch_sender: tokio::sync::mpsc::UnboundedSender<Vec<PathBuf>>,
|
|
|
|
) -> Result<Self, AnyError> {
|
2022-06-28 16:45:55 -04:00
|
|
|
// resolve the config each time
|
2022-06-29 11:51:11 -04:00
|
|
|
let cli_options = Arc::new(CliOptions::from_flags(flags)?);
|
2022-06-28 16:45:55 -04:00
|
|
|
let ps =
|
2022-06-29 11:51:11 -04:00
|
|
|
Self::build_with_sender(cli_options, Some(files_to_watch_sender.clone()))
|
2022-06-28 16:45:55 -04:00
|
|
|
.await?;
|
2022-06-08 06:07:25 -04:00
|
|
|
|
|
|
|
// Add the extra files listed in the watch flag
|
2022-06-29 11:51:11 -04:00
|
|
|
if let Some(watch_paths) = ps.options.watch_paths() {
|
2022-06-08 06:07:25 -04:00
|
|
|
files_to_watch_sender.send(watch_paths.clone()).unwrap();
|
|
|
|
}
|
|
|
|
|
2022-06-28 16:45:55 -04:00
|
|
|
if let Ok(Some(import_map_path)) = ps
|
2022-06-29 11:51:11 -04:00
|
|
|
.options
|
2022-06-29 20:41:48 -04:00
|
|
|
.resolve_import_map_specifier()
|
2022-06-28 16:45:55 -04:00
|
|
|
.map(|ms| ms.and_then(|ref s| s.to_file_path().ok()))
|
2022-06-08 06:07:25 -04:00
|
|
|
{
|
|
|
|
files_to_watch_sender.send(vec![import_map_path]).unwrap();
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(ps)
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn build_with_sender(
|
2022-06-29 11:51:11 -04:00
|
|
|
cli_options: Arc<CliOptions>,
|
2022-06-08 06:07:25 -04:00
|
|
|
maybe_sender: Option<tokio::sync::mpsc::UnboundedSender<Vec<PathBuf>>>,
|
|
|
|
) -> Result<Self, AnyError> {
|
2021-07-05 09:34:37 -04:00
|
|
|
let blob_store = BlobStore::default();
|
2021-05-22 12:08:24 -04:00
|
|
|
let broadcast_channel = InMemoryBroadcastChannel::default();
|
2021-07-06 13:42:52 -04:00
|
|
|
let shared_array_buffer_store = SharedArrayBufferStore::default();
|
2021-09-29 04:47:24 -04:00
|
|
|
let compiled_wasm_module_store = CompiledWasmModuleStore::default();
|
2022-06-29 11:51:11 -04:00
|
|
|
let dir = cli_options.resolve_deno_dir()?;
|
2022-06-28 16:45:55 -04:00
|
|
|
let deps_cache_location = dir.root.join("deps");
|
|
|
|
let http_cache = http_cache::HttpCache::new(&deps_cache_location);
|
2022-06-29 11:51:11 -04:00
|
|
|
let root_cert_store = cli_options.resolve_root_cert_store()?;
|
|
|
|
let cache_usage = cli_options.cache_setting();
|
2022-09-09 15:57:39 -04:00
|
|
|
let progress_bar = ProgressBar::default();
|
2020-11-05 19:38:21 -05:00
|
|
|
let file_fetcher = FileFetcher::new(
|
2020-02-19 08:17:13 -05:00
|
|
|
http_cache,
|
2020-11-05 19:38:21 -05:00
|
|
|
cache_usage,
|
2022-06-29 11:51:11 -04:00
|
|
|
!cli_options.no_remote(),
|
2021-08-07 08:49:38 -04:00
|
|
|
Some(root_cert_store.clone()),
|
2021-07-05 09:34:37 -04:00
|
|
|
blob_store.clone(),
|
2022-06-29 11:51:11 -04:00
|
|
|
cli_options
|
2022-06-28 16:45:55 -04:00
|
|
|
.unsafely_ignore_certificate_errors()
|
|
|
|
.map(ToOwned::to_owned),
|
2022-09-09 15:57:39 -04:00
|
|
|
Some(progress_bar.clone()),
|
2019-11-04 10:38:52 -05:00
|
|
|
)?;
|
|
|
|
|
2022-06-29 11:51:11 -04:00
|
|
|
let lockfile = cli_options
|
2022-06-28 16:45:55 -04:00
|
|
|
.resolve_lock_file()?
|
|
|
|
.map(|f| Arc::new(Mutex::new(f)));
|
2022-06-29 20:41:48 -04:00
|
|
|
let maybe_import_map_specifier =
|
|
|
|
cli_options.resolve_import_map_specifier()?;
|
2022-02-22 18:51:14 -05:00
|
|
|
|
|
|
|
let maybe_import_map =
|
|
|
|
if let Some(import_map_specifier) = maybe_import_map_specifier {
|
|
|
|
let file = file_fetcher
|
|
|
|
.fetch(&import_map_specifier, &mut Permissions::allow_all())
|
|
|
|
.await
|
|
|
|
.context(format!(
|
|
|
|
"Unable to load '{}' import map",
|
|
|
|
import_map_specifier
|
|
|
|
))?;
|
|
|
|
let import_map =
|
|
|
|
import_map_from_text(&import_map_specifier, &file.source)?;
|
|
|
|
Some(Arc::new(import_map))
|
|
|
|
} else {
|
|
|
|
None
|
2020-05-29 10:32:15 -04:00
|
|
|
};
|
|
|
|
|
2022-06-28 16:45:55 -04:00
|
|
|
let maybe_inspector_server =
|
2022-06-29 11:51:11 -04:00
|
|
|
cli_options.resolve_inspector_server().map(Arc::new);
|
2020-09-25 04:24:51 -04:00
|
|
|
|
2021-11-24 10:55:10 -05:00
|
|
|
// FIXME(bartlomieju): `NodeEsmResolver` is not aware of JSX resolver
|
|
|
|
// created below
|
|
|
|
let maybe_import_map_resolver =
|
|
|
|
maybe_import_map.clone().map(ImportMapResolver::new);
|
2022-06-29 11:51:11 -04:00
|
|
|
let maybe_jsx_resolver = cli_options
|
2022-08-24 13:36:05 -04:00
|
|
|
.to_maybe_jsx_import_source_config()
|
|
|
|
.map(|cfg| JsxResolver::new(cfg, maybe_import_map_resolver.clone()));
|
2021-11-24 10:55:10 -05:00
|
|
|
let maybe_resolver: Option<
|
|
|
|
Arc<dyn deno_graph::source::Resolver + Send + Sync>,
|
2022-09-03 12:19:30 -04:00
|
|
|
> = if let Some(jsx_resolver) = maybe_jsx_resolver {
|
2021-11-24 10:55:10 -05:00
|
|
|
// the JSX resolver offloads to the import map if present, otherwise uses
|
|
|
|
// the default Deno explicit import resolution.
|
|
|
|
Some(Arc::new(jsx_resolver))
|
|
|
|
} else if let Some(import_map_resolver) = maybe_import_map_resolver {
|
|
|
|
Some(Arc::new(import_map_resolver))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
2022-06-08 06:07:25 -04:00
|
|
|
let maybe_file_watcher_reporter =
|
|
|
|
maybe_sender.map(|sender| FileWatcherReporter {
|
|
|
|
sender,
|
|
|
|
file_paths: Arc::new(Mutex::new(vec![])),
|
|
|
|
});
|
|
|
|
|
2022-07-19 11:58:18 -04:00
|
|
|
let ts_config_result =
|
|
|
|
cli_options.resolve_ts_config_for_emit(TsConfigType::Emit)?;
|
|
|
|
if let Some(ignored_options) = ts_config_result.maybe_ignored_options {
|
|
|
|
warn!("{}", ignored_options);
|
|
|
|
}
|
|
|
|
let emit_cache = EmitCache::new(dir.gen_cache.clone());
|
2022-08-22 12:14:59 -04:00
|
|
|
let parsed_source_cache =
|
|
|
|
ParsedSourceCache::new(Some(dir.dep_analysis_db_file_path()));
|
2022-09-13 11:59:01 -04:00
|
|
|
let registry_url = NpmRegistryApi::default_url();
|
|
|
|
let npm_cache = NpmCache::from_deno_dir(
|
2022-08-22 11:35:04 -04:00
|
|
|
&dir,
|
2022-09-13 11:59:01 -04:00
|
|
|
cli_options.cache_setting(),
|
|
|
|
progress_bar.clone(),
|
|
|
|
);
|
|
|
|
let api = NpmRegistryApi::new(
|
|
|
|
registry_url,
|
|
|
|
npm_cache.clone(),
|
2022-08-22 11:35:04 -04:00
|
|
|
cli_options.reload_flag(),
|
|
|
|
cli_options.cache_setting(),
|
2022-09-13 11:59:01 -04:00
|
|
|
progress_bar.clone(),
|
|
|
|
);
|
|
|
|
let npm_resolver = NpmPackageResolver::new(
|
|
|
|
npm_cache.clone(),
|
|
|
|
api,
|
2022-09-01 12:06:23 -04:00
|
|
|
cli_options.unstable()
|
|
|
|
// don't do the unstable error when in the lsp
|
|
|
|
|| matches!(cli_options.sub_command(), DenoSubcommand::Lsp),
|
2022-09-07 09:33:51 -04:00
|
|
|
cli_options.no_npm(),
|
2022-09-01 12:37:14 -04:00
|
|
|
);
|
2022-07-19 11:58:18 -04:00
|
|
|
|
2022-09-07 15:06:18 -04:00
|
|
|
let emit_options: deno_ast::EmitOptions = ts_config_result.ts_config.into();
|
2021-09-24 11:10:42 -04:00
|
|
|
Ok(ProcState(Arc::new(Inner {
|
2019-11-04 10:38:52 -05:00
|
|
|
dir,
|
2022-06-29 11:51:11 -04:00
|
|
|
options: cli_options,
|
2022-07-19 11:58:18 -04:00
|
|
|
emit_cache,
|
|
|
|
emit_options_hash: FastInsecureHasher::new()
|
2022-09-07 15:06:18 -04:00
|
|
|
.write_hashable(&emit_options)
|
2022-07-19 11:58:18 -04:00
|
|
|
.finish(),
|
2022-09-07 15:06:18 -04:00
|
|
|
emit_options,
|
2019-11-04 10:38:52 -05:00
|
|
|
file_fetcher,
|
2021-10-19 10:01:46 -04:00
|
|
|
graph_data: Default::default(),
|
2019-11-04 10:38:52 -05:00
|
|
|
lockfile,
|
2020-05-29 10:32:15 -04:00
|
|
|
maybe_import_map,
|
2020-09-25 04:24:51 -04:00
|
|
|
maybe_inspector_server,
|
2022-06-28 16:45:55 -04:00
|
|
|
root_cert_store,
|
2021-07-05 09:34:37 -04:00
|
|
|
blob_store,
|
2021-05-22 12:08:24 -04:00
|
|
|
broadcast_channel,
|
2021-07-06 13:42:52 -04:00
|
|
|
shared_array_buffer_store,
|
2021-09-29 04:47:24 -04:00
|
|
|
compiled_wasm_module_store,
|
2022-08-22 12:14:59 -04:00
|
|
|
parsed_source_cache,
|
2021-11-24 10:55:10 -05:00
|
|
|
maybe_resolver,
|
2022-06-08 06:07:25 -04:00
|
|
|
maybe_file_watcher_reporter,
|
2022-09-13 11:59:01 -04:00
|
|
|
npm_cache,
|
2022-08-20 11:31:33 -04:00
|
|
|
npm_resolver,
|
|
|
|
cjs_resolutions: Default::default(),
|
2022-09-09 15:57:39 -04:00
|
|
|
progress_bar,
|
2021-09-24 11:10:42 -04:00
|
|
|
})))
|
2019-11-04 10:38:52 -05:00
|
|
|
}
|
|
|
|
|
2021-11-15 18:25:52 -05:00
|
|
|
/// This method must be called for a module or a static importer of that
|
|
|
|
/// module before attempting to `load()` it from a `JsRuntime`. It will
|
2021-12-16 05:45:41 -05:00
|
|
|
/// populate `self.graph_data` in memory with the necessary source code, write
|
|
|
|
/// emits where necessary or report any module graph / type checking errors.
|
2022-03-23 09:54:22 -04:00
|
|
|
pub async fn prepare_module_load(
|
2021-09-24 11:10:42 -04:00
|
|
|
&self,
|
2022-03-10 20:33:02 -05:00
|
|
|
roots: Vec<ModuleSpecifier>,
|
2021-10-10 17:26:22 -04:00
|
|
|
is_dynamic: bool,
|
2022-06-28 16:45:55 -04:00
|
|
|
lib: TsTypeLib,
|
2021-05-17 03:44:38 -04:00
|
|
|
root_permissions: Permissions,
|
|
|
|
dynamic_permissions: Permissions,
|
2021-11-15 18:25:52 -05:00
|
|
|
reload_on_watch: bool,
|
2021-04-28 14:17:04 -04:00
|
|
|
) -> Result<(), AnyError> {
|
2022-03-10 20:33:02 -05:00
|
|
|
let maybe_resolver: Option<&dyn deno_graph::source::Resolver> =
|
|
|
|
if let Some(resolver) = &self.maybe_resolver {
|
|
|
|
Some(resolver.as_ref())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
|
|
|
// NOTE(@bartlomieju):
|
|
|
|
// Even though `roots` are fully resolved at this point, we are going
|
|
|
|
// to resolve them through `maybe_resolver` to get module kind for the graph
|
|
|
|
// or default to ESM.
|
|
|
|
//
|
|
|
|
// One might argue that this is a code smell, and I would agree. However
|
|
|
|
// due to flux in "Node compatibility" it's not clear where it should be
|
|
|
|
// decided what `ModuleKind` is decided for root specifier.
|
2022-09-03 12:19:30 -04:00
|
|
|
let roots: Vec<(deno_core::url::Url, deno_graph::ModuleKind)> = roots
|
2022-03-10 20:33:02 -05:00
|
|
|
.into_iter()
|
|
|
|
.map(|r| {
|
|
|
|
if let Some(resolver) = &maybe_resolver {
|
|
|
|
let response =
|
|
|
|
resolver.resolve(r.as_str(), &Url::parse("unused:").unwrap());
|
|
|
|
// TODO(bartlomieju): this should be implemented in `deno_graph`
|
|
|
|
match response {
|
|
|
|
ResolveResponse::CommonJs(_) => (r, ModuleKind::CommonJs),
|
|
|
|
ResolveResponse::Err(_) => unreachable!(),
|
|
|
|
_ => (r, ModuleKind::Esm),
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
(r, ModuleKind::Esm)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
|
2021-11-15 18:25:52 -05:00
|
|
|
// TODO(bartlomieju): this is very make-shift, is there an existing API
|
|
|
|
// that we could include it like with "maybe_imports"?
|
|
|
|
if !reload_on_watch {
|
2021-12-16 05:45:41 -05:00
|
|
|
let graph_data = self.graph_data.read();
|
2022-06-29 11:51:11 -04:00
|
|
|
if self.options.type_check_mode() == TypeCheckMode::None
|
2021-12-16 05:45:41 -05:00
|
|
|
|| graph_data.is_type_checked(&roots, &lib)
|
2021-11-15 18:25:52 -05:00
|
|
|
{
|
2021-12-22 08:25:06 -05:00
|
|
|
if let Some(result) = graph_data.check(
|
|
|
|
&roots,
|
2022-06-29 11:51:11 -04:00
|
|
|
self.options.type_check_mode() != TypeCheckMode::None,
|
2021-12-22 08:25:06 -05:00
|
|
|
false,
|
|
|
|
) {
|
2021-11-15 18:25:52 -05:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-10-10 17:26:22 -04:00
|
|
|
let mut cache = cache::FetchCacher::new(
|
2022-07-19 11:58:18 -04:00
|
|
|
self.emit_cache.clone(),
|
2021-10-10 17:26:22 -04:00
|
|
|
self.file_fetcher.clone(),
|
|
|
|
root_permissions.clone(),
|
|
|
|
dynamic_permissions.clone(),
|
|
|
|
);
|
|
|
|
let maybe_locker = as_maybe_locker(self.lockfile.clone());
|
2022-06-29 11:51:11 -04:00
|
|
|
let maybe_imports = self.options.to_maybe_imports()?;
|
2021-12-16 05:45:41 -05:00
|
|
|
|
|
|
|
struct ProcStateLoader<'a> {
|
|
|
|
inner: &'a mut cache::FetchCacher,
|
|
|
|
graph_data: Arc<RwLock<GraphData>>,
|
|
|
|
reload: bool,
|
|
|
|
}
|
|
|
|
impl Loader for ProcStateLoader<'_> {
|
|
|
|
fn get_cache_info(
|
|
|
|
&self,
|
|
|
|
specifier: &ModuleSpecifier,
|
|
|
|
) -> Option<CacheInfo> {
|
|
|
|
self.inner.get_cache_info(specifier)
|
|
|
|
}
|
|
|
|
fn load(
|
|
|
|
&mut self,
|
|
|
|
specifier: &ModuleSpecifier,
|
|
|
|
is_dynamic: bool,
|
|
|
|
) -> LoadFuture {
|
|
|
|
let graph_data = self.graph_data.read();
|
|
|
|
let found_specifier = graph_data.follow_redirect(specifier);
|
|
|
|
match graph_data.get(&found_specifier) {
|
2022-01-13 11:58:00 -05:00
|
|
|
Some(_) if !self.reload => {
|
|
|
|
Box::pin(futures::future::ready(Err(anyhow!(""))))
|
|
|
|
}
|
2021-12-16 05:45:41 -05:00
|
|
|
_ => self.inner.load(specifier, is_dynamic),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let mut loader = ProcStateLoader {
|
|
|
|
inner: &mut cache,
|
|
|
|
graph_data: self.graph_data.clone(),
|
|
|
|
reload: reload_on_watch,
|
|
|
|
};
|
2022-03-10 20:33:02 -05:00
|
|
|
|
2022-06-08 06:07:25 -04:00
|
|
|
let maybe_file_watcher_reporter: Option<&dyn deno_graph::source::Reporter> =
|
|
|
|
if let Some(reporter) = &self.maybe_file_watcher_reporter {
|
|
|
|
Some(reporter)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
2022-08-22 12:14:59 -04:00
|
|
|
let analyzer = self.parsed_source_cache.as_analyzer();
|
2021-11-15 18:25:52 -05:00
|
|
|
let graph = create_graph(
|
|
|
|
roots.clone(),
|
2021-10-10 17:26:22 -04:00
|
|
|
is_dynamic,
|
|
|
|
maybe_imports,
|
2021-12-16 05:45:41 -05:00
|
|
|
&mut loader,
|
2021-10-18 13:36:28 -04:00
|
|
|
maybe_resolver,
|
2021-10-10 17:26:22 -04:00
|
|
|
maybe_locker,
|
2022-08-22 12:14:59 -04:00
|
|
|
Some(&*analyzer),
|
2022-06-08 06:07:25 -04:00
|
|
|
maybe_file_watcher_reporter,
|
2021-10-10 17:26:22 -04:00
|
|
|
)
|
|
|
|
.await;
|
2022-02-27 08:38:45 -05:00
|
|
|
|
2021-10-10 17:26:22 -04:00
|
|
|
// If there was a locker, validate the integrity of all the modules in the
|
|
|
|
// locker.
|
2021-12-16 05:45:41 -05:00
|
|
|
graph_lock_or_exit(&graph);
|
2021-10-10 17:26:22 -04:00
|
|
|
|
|
|
|
// Determine any modules that have already been emitted this session and
|
|
|
|
// should be skipped.
|
|
|
|
let reload_exclusions: HashSet<ModuleSpecifier> = {
|
2021-12-16 05:45:41 -05:00
|
|
|
let graph_data = self.graph_data.read();
|
2022-07-12 18:58:39 -04:00
|
|
|
graph_data.entries().map(|(s, _)| s).cloned().collect()
|
2021-06-19 10:14:43 -04:00
|
|
|
};
|
2021-04-28 14:17:04 -04:00
|
|
|
|
2022-08-20 11:31:33 -04:00
|
|
|
let npm_package_references = {
|
2021-12-16 05:45:41 -05:00
|
|
|
let mut graph_data = self.graph_data.write();
|
|
|
|
graph_data.add_graph(&graph, reload_on_watch);
|
2022-06-29 11:51:11 -04:00
|
|
|
let check_js = self.options.check_js();
|
2021-12-16 05:45:41 -05:00
|
|
|
graph_data
|
2022-03-28 21:48:29 -04:00
|
|
|
.check(
|
|
|
|
&roots,
|
2022-06-29 11:51:11 -04:00
|
|
|
self.options.type_check_mode() != TypeCheckMode::None,
|
2022-03-28 21:48:29 -04:00
|
|
|
check_js,
|
|
|
|
)
|
2021-12-16 05:45:41 -05:00
|
|
|
.unwrap()?;
|
2022-08-20 11:31:33 -04:00
|
|
|
graph_data.npm_package_reqs()
|
|
|
|
};
|
|
|
|
|
|
|
|
if !npm_package_references.is_empty() {
|
|
|
|
self
|
|
|
|
.npm_resolver
|
|
|
|
.add_package_reqs(npm_package_references)
|
|
|
|
.await?;
|
2022-08-23 10:39:19 -04:00
|
|
|
self.prepare_node_std_graph().await?;
|
2021-12-16 05:45:41 -05:00
|
|
|
}
|
|
|
|
|
2022-09-09 15:57:39 -04:00
|
|
|
self.progress_bar.clear();
|
|
|
|
|
2022-07-19 11:58:18 -04:00
|
|
|
// type check if necessary
|
|
|
|
if self.options.type_check_mode() != TypeCheckMode::None {
|
|
|
|
let maybe_config_specifier = self.options.maybe_config_file_specifier();
|
|
|
|
let roots = roots.clone();
|
2022-09-02 10:54:40 -04:00
|
|
|
let options = check::CheckOptions {
|
2022-07-19 11:58:18 -04:00
|
|
|
type_check_mode: self.options.type_check_mode(),
|
|
|
|
debug: self.options.log_level() == Some(log::Level::Debug),
|
|
|
|
maybe_config_specifier,
|
|
|
|
ts_config: self
|
|
|
|
.options
|
|
|
|
.resolve_ts_config_for_emit(TsConfigType::Check { lib })?
|
|
|
|
.ts_config,
|
|
|
|
log_checks: true,
|
|
|
|
reload: self.options.reload_flag()
|
|
|
|
&& !roots.iter().all(|r| reload_exclusions.contains(&r.0)),
|
2021-12-16 05:45:41 -05:00
|
|
|
};
|
2022-07-19 11:58:18 -04:00
|
|
|
let check_cache =
|
|
|
|
TypeCheckCache::new(&self.dir.type_checking_cache_db_file_path());
|
|
|
|
let graph_data = self.graph_data.clone();
|
|
|
|
let check_result =
|
2022-09-02 10:54:40 -04:00
|
|
|
check::check(&roots, graph_data, &check_cache, options)?;
|
2022-07-19 11:58:18 -04:00
|
|
|
if !check_result.diagnostics.is_empty() {
|
|
|
|
return Err(anyhow!(check_result.diagnostics));
|
2021-10-10 17:26:22 -04:00
|
|
|
}
|
2022-07-19 11:58:18 -04:00
|
|
|
log::debug!("{}", check_result.stats);
|
2021-10-10 17:26:22 -04:00
|
|
|
}
|
|
|
|
|
2022-06-29 11:51:11 -04:00
|
|
|
if self.options.type_check_mode() != TypeCheckMode::None {
|
2021-12-16 05:45:41 -05:00
|
|
|
let mut graph_data = self.graph_data.write();
|
2022-06-28 16:45:55 -04:00
|
|
|
graph_data.set_type_checked(&roots, lib);
|
2021-10-10 17:26:22 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// any updates to the lockfile should be updated now
|
2021-04-28 14:17:04 -04:00
|
|
|
if let Some(ref lockfile) = self.lockfile {
|
2021-07-06 23:48:01 -04:00
|
|
|
let g = lockfile.lock();
|
2021-04-28 14:17:04 -04:00
|
|
|
g.write()?;
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2022-08-23 10:39:19 -04:00
|
|
|
/// Add the builtin node modules to the graph data.
|
|
|
|
pub async fn prepare_node_std_graph(&self) -> Result<(), AnyError> {
|
|
|
|
let node_std_graph = self
|
2022-08-29 14:19:54 -04:00
|
|
|
.create_graph(vec![(node::MODULE_ALL_URL.clone(), ModuleKind::Esm)])
|
2022-08-23 10:39:19 -04:00
|
|
|
.await?;
|
|
|
|
self.graph_data.write().add_graph(&node_std_graph, false);
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
2022-08-20 11:31:33 -04:00
|
|
|
fn handle_node_resolve_result(
|
|
|
|
&self,
|
2022-09-06 06:57:28 -04:00
|
|
|
result: Result<Option<node::NodeResolution>, AnyError>,
|
2022-08-20 11:31:33 -04:00
|
|
|
) -> Result<ModuleSpecifier, AnyError> {
|
|
|
|
let response = match result? {
|
|
|
|
Some(response) => response,
|
|
|
|
None => bail!("Not found."),
|
|
|
|
};
|
2022-09-06 06:57:28 -04:00
|
|
|
if let NodeResolution::CommonJs(specifier) = &response {
|
2022-08-20 11:31:33 -04:00
|
|
|
// remember that this was a common js resolution
|
|
|
|
self.cjs_resolutions.lock().insert(specifier.clone());
|
2022-09-06 06:57:28 -04:00
|
|
|
} else if let NodeResolution::BuiltIn(specifier) = &response {
|
|
|
|
return node::resolve_builtin_node_module(specifier);
|
2022-08-20 11:31:33 -04:00
|
|
|
}
|
2022-09-06 06:57:28 -04:00
|
|
|
Ok(response.into_url())
|
2022-08-20 11:31:33 -04:00
|
|
|
}
|
|
|
|
|
2022-03-23 09:54:22 -04:00
|
|
|
pub fn resolve(
|
2021-09-24 11:10:42 -04:00
|
|
|
&self,
|
2021-10-10 17:26:22 -04:00
|
|
|
specifier: &str,
|
|
|
|
referrer: &str,
|
|
|
|
) -> Result<ModuleSpecifier, AnyError> {
|
2021-11-23 16:30:52 -05:00
|
|
|
if let Ok(referrer) = deno_core::resolve_url_or_path(referrer) {
|
2022-08-20 11:31:33 -04:00
|
|
|
if self.npm_resolver.in_npm_package(&referrer) {
|
|
|
|
// we're in an npm package, so use node resolution
|
|
|
|
return self
|
|
|
|
.handle_node_resolve_result(node::node_resolve(
|
|
|
|
specifier,
|
|
|
|
&referrer,
|
|
|
|
&self.npm_resolver,
|
|
|
|
))
|
|
|
|
.with_context(|| {
|
|
|
|
format!(
|
|
|
|
"Could not resolve '{}' from '{}'.",
|
|
|
|
specifier,
|
|
|
|
self
|
|
|
|
.npm_resolver
|
|
|
|
.resolve_package_from_specifier(&referrer)
|
|
|
|
.unwrap()
|
|
|
|
.id
|
|
|
|
)
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2021-12-16 05:45:41 -05:00
|
|
|
let graph_data = self.graph_data.read();
|
|
|
|
let found_referrer = graph_data.follow_redirect(&referrer);
|
|
|
|
let maybe_resolved = match graph_data.get(&found_referrer) {
|
2022-01-31 17:33:57 -05:00
|
|
|
Some(ModuleEntry::Module { dependencies, .. }) => {
|
|
|
|
dependencies.get(specifier).map(|d| &d.maybe_code)
|
|
|
|
}
|
2021-11-23 16:30:52 -05:00
|
|
|
_ => None,
|
2021-10-19 10:01:46 -04:00
|
|
|
};
|
|
|
|
|
2021-11-23 16:30:52 -05:00
|
|
|
match maybe_resolved {
|
2022-08-20 11:31:33 -04:00
|
|
|
Some(Resolved::Ok { specifier, .. }) => {
|
|
|
|
if let Ok(reference) = NpmPackageReference::from_specifier(specifier)
|
|
|
|
{
|
|
|
|
return self
|
|
|
|
.handle_node_resolve_result(node::node_resolve_npm_reference(
|
|
|
|
&reference,
|
|
|
|
&self.npm_resolver,
|
|
|
|
))
|
|
|
|
.with_context(|| format!("Could not resolve '{}'.", reference));
|
|
|
|
} else {
|
|
|
|
return Ok(specifier.clone());
|
|
|
|
}
|
|
|
|
}
|
2022-01-31 17:33:57 -05:00
|
|
|
Some(Resolved::Err(err)) => {
|
2021-11-23 16:30:52 -05:00
|
|
|
return Err(custom_error(
|
|
|
|
"TypeError",
|
|
|
|
format!("{}\n", err.to_string_with_range()),
|
|
|
|
))
|
2021-10-10 17:26:22 -04:00
|
|
|
}
|
2022-01-31 17:33:57 -05:00
|
|
|
Some(Resolved::None) | None => {}
|
2020-09-24 18:31:17 -04:00
|
|
|
}
|
2021-10-10 17:26:22 -04:00
|
|
|
}
|
2021-10-19 10:01:46 -04:00
|
|
|
|
2021-11-24 10:55:10 -05:00
|
|
|
// FIXME(bartlomieju): this is a hacky way to provide compatibility with REPL
|
|
|
|
// and `Deno.core.evalContext` API. Ideally we should always have a referrer filled
|
|
|
|
// but sadly that's not the case due to missing APIs in V8.
|
2022-06-28 16:45:55 -04:00
|
|
|
let referrer = if referrer.is_empty()
|
2022-06-29 11:51:11 -04:00
|
|
|
&& matches!(self.options.sub_command(), DenoSubcommand::Repl(_))
|
2022-06-28 16:45:55 -04:00
|
|
|
{
|
2021-11-24 10:55:10 -05:00
|
|
|
deno_core::resolve_url_or_path("./$deno$repl.ts").unwrap()
|
2020-09-24 18:31:17 -04:00
|
|
|
} else {
|
2021-11-24 10:55:10 -05:00
|
|
|
deno_core::resolve_url_or_path(referrer).unwrap()
|
2020-10-22 20:50:15 -04:00
|
|
|
};
|
2021-11-24 10:55:10 -05:00
|
|
|
|
|
|
|
let maybe_resolver: Option<&dyn deno_graph::source::Resolver> =
|
|
|
|
if let Some(resolver) = &self.maybe_resolver {
|
|
|
|
Some(resolver.as_ref())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
if let Some(resolver) = &maybe_resolver {
|
2022-01-31 17:33:57 -05:00
|
|
|
resolver.resolve(specifier, &referrer).to_result()
|
2021-10-10 17:26:22 -04:00
|
|
|
} else {
|
2021-11-24 10:55:10 -05:00
|
|
|
deno_core::resolve_import(specifier, referrer.as_str())
|
|
|
|
.map_err(|err| err.into())
|
2020-07-02 11:54:51 -04:00
|
|
|
}
|
2020-05-29 10:32:15 -04:00
|
|
|
}
|
|
|
|
|
2022-07-19 11:58:18 -04:00
|
|
|
pub fn cache_module_emits(&self) -> Result<(), AnyError> {
|
2021-12-16 05:45:41 -05:00
|
|
|
let graph_data = self.graph_data.read();
|
2022-07-19 11:58:18 -04:00
|
|
|
for (specifier, entry) in graph_data.entries() {
|
|
|
|
if let ModuleEntry::Module {
|
2022-08-22 12:14:59 -04:00
|
|
|
code, media_type, ..
|
2022-07-19 11:58:18 -04:00
|
|
|
} = entry
|
|
|
|
{
|
2022-08-23 10:30:14 -04:00
|
|
|
let is_emittable = matches!(
|
|
|
|
media_type,
|
|
|
|
MediaType::TypeScript
|
|
|
|
| MediaType::Mts
|
|
|
|
| MediaType::Cts
|
|
|
|
| MediaType::Jsx
|
|
|
|
| MediaType::Tsx
|
|
|
|
);
|
|
|
|
if is_emittable {
|
|
|
|
emit_parsed_source(
|
|
|
|
&self.emit_cache,
|
|
|
|
&self.parsed_source_cache,
|
|
|
|
specifier,
|
|
|
|
*media_type,
|
|
|
|
code,
|
|
|
|
&self.emit_options,
|
|
|
|
self.emit_options_hash,
|
|
|
|
)?;
|
|
|
|
}
|
2021-12-16 05:45:41 -05:00
|
|
|
}
|
2021-10-19 10:01:46 -04:00
|
|
|
}
|
2022-07-19 11:58:18 -04:00
|
|
|
Ok(())
|
2019-11-04 10:38:52 -05:00
|
|
|
}
|
2022-07-01 11:50:16 -04:00
|
|
|
|
|
|
|
pub async fn create_graph(
|
|
|
|
&self,
|
|
|
|
roots: Vec<(ModuleSpecifier, ModuleKind)>,
|
|
|
|
) -> Result<deno_graph::ModuleGraph, AnyError> {
|
|
|
|
let mut cache = cache::FetchCacher::new(
|
2022-07-19 11:58:18 -04:00
|
|
|
self.emit_cache.clone(),
|
2022-07-01 11:50:16 -04:00
|
|
|
self.file_fetcher.clone(),
|
|
|
|
Permissions::allow_all(),
|
|
|
|
Permissions::allow_all(),
|
|
|
|
);
|
|
|
|
let maybe_locker = as_maybe_locker(self.lockfile.clone());
|
|
|
|
let maybe_import_map_resolver =
|
|
|
|
self.maybe_import_map.clone().map(ImportMapResolver::new);
|
|
|
|
let maybe_imports = self.options.to_maybe_imports()?;
|
|
|
|
let maybe_jsx_resolver = self
|
|
|
|
.options
|
2022-08-24 13:36:05 -04:00
|
|
|
.to_maybe_jsx_import_source_config()
|
|
|
|
.map(|cfg| JsxResolver::new(cfg, maybe_import_map_resolver.clone()));
|
2022-07-01 11:50:16 -04:00
|
|
|
let maybe_resolver = if maybe_jsx_resolver.is_some() {
|
|
|
|
maybe_jsx_resolver.as_ref().map(|jr| jr.as_resolver())
|
|
|
|
} else {
|
|
|
|
maybe_import_map_resolver
|
|
|
|
.as_ref()
|
|
|
|
.map(|im| im.as_resolver())
|
|
|
|
};
|
2022-08-22 12:14:59 -04:00
|
|
|
let analyzer = self.parsed_source_cache.as_analyzer();
|
2022-07-01 11:50:16 -04:00
|
|
|
|
2022-08-20 11:31:33 -04:00
|
|
|
let graph = create_graph(
|
|
|
|
roots,
|
|
|
|
false,
|
|
|
|
maybe_imports,
|
|
|
|
&mut cache,
|
|
|
|
maybe_resolver,
|
|
|
|
maybe_locker,
|
2022-08-22 12:14:59 -04:00
|
|
|
Some(&*analyzer),
|
2022-08-20 11:31:33 -04:00
|
|
|
None,
|
2022-07-01 11:50:16 -04:00
|
|
|
)
|
2022-08-20 11:31:33 -04:00
|
|
|
.await;
|
|
|
|
|
|
|
|
// add the found npm package references to the npm resolver and cache them
|
|
|
|
let mut package_reqs = Vec::new();
|
|
|
|
for (specifier, _) in graph.specifiers() {
|
|
|
|
if let Ok(reference) = NpmPackageReference::from_specifier(&specifier) {
|
|
|
|
package_reqs.push(reference.req);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !package_reqs.is_empty() {
|
|
|
|
self.npm_resolver.add_package_reqs(package_reqs).await?;
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(graph)
|
2022-07-01 11:50:16 -04:00
|
|
|
}
|
2019-11-04 10:38:52 -05:00
|
|
|
}
|
|
|
|
|
2022-01-13 18:17:56 -05:00
|
|
|
pub fn import_map_from_text(
|
|
|
|
specifier: &Url,
|
|
|
|
json_text: &str,
|
|
|
|
) -> Result<ImportMap, AnyError> {
|
2022-06-14 10:05:37 -04:00
|
|
|
debug_assert!(
|
|
|
|
!specifier.as_str().contains("../"),
|
|
|
|
"Import map specifier incorrectly contained ../: {}",
|
|
|
|
specifier.as_str()
|
|
|
|
);
|
|
|
|
let result = import_map::parse_from_json(specifier, json_text)?;
|
2022-01-13 18:17:56 -05:00
|
|
|
if !result.diagnostics.is_empty() {
|
|
|
|
warn!(
|
|
|
|
"Import map diagnostics:\n{}",
|
|
|
|
result
|
|
|
|
.diagnostics
|
|
|
|
.into_iter()
|
|
|
|
.map(|d| format!(" - {}", d))
|
|
|
|
.collect::<Vec<_>>()
|
|
|
|
.join("\n")
|
2022-06-14 10:05:37 -04:00
|
|
|
);
|
2022-01-13 18:17:56 -05:00
|
|
|
}
|
|
|
|
Ok(result.import_map)
|
|
|
|
}
|
|
|
|
|
2022-06-08 06:07:25 -04:00
|
|
|
#[derive(Debug)]
|
|
|
|
struct FileWatcherReporter {
|
|
|
|
sender: tokio::sync::mpsc::UnboundedSender<Vec<PathBuf>>,
|
|
|
|
file_paths: Arc<Mutex<Vec<PathBuf>>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl deno_graph::source::Reporter for FileWatcherReporter {
|
|
|
|
fn on_load(
|
|
|
|
&self,
|
|
|
|
specifier: &ModuleSpecifier,
|
|
|
|
modules_done: usize,
|
|
|
|
modules_total: usize,
|
|
|
|
) {
|
|
|
|
let mut file_paths = self.file_paths.lock();
|
|
|
|
if specifier.scheme() == "file" {
|
|
|
|
file_paths.push(specifier.to_file_path().unwrap());
|
|
|
|
}
|
|
|
|
|
|
|
|
if modules_done == modules_total {
|
|
|
|
self.sender.send(file_paths.drain(..).collect()).unwrap();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|