diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2020-05-18 12:59:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-18 12:59:29 +0200 |
commit | 9d63772fe5bacc8fa1e0a8cbb152a2f107ae268f (patch) | |
tree | f6f547b3b052d101df196850a5cf2cfb56f06f5c /cli/ops/compiler.rs | |
parent | ce81064e4c78a5d6213aa19351281c6b86e3e1cb (diff) |
refactor: rewrite TS dependency analysis in Rust (#5029)
This commit completely overhauls how module analysis is
performed in TS compiler by moving the logic to Rust.
In the current setup module analysis is performed using
"ts.preProcessFile" API in a special TS compiler worker
running on a separate thread.
"ts.preProcessFile" allowed us to build a lot of functionality
in CLI including X-TypeScript-Types header support
and @deno-types directive support. Unfortunately at the
same time complexity of the ops required to perform
supporting tasks exploded and caused some hidden
permission escapes.
This PR introduces "ModuleGraphLoader" which can parse
source and load recursively all dependent source files; as
well as declaration files. All dependencies used in TS
compiler and now fetched and collected upfront in Rust
before spinning up TS compiler.
To achieve feature parity with existing APIs this commit
includes a lot of changes:
* add "ModuleGraphLoader"
- can fetch local and remote sources
- parses source code using SWC and extracts imports, exports, file references, special
headers
- this struct inherited all of the hidden complexity and cruft from TS version and requires
several follow up PRs
* rewrite cli/tsc.rs to perform module analysis upfront and send all required source code to
TS worker in one message
* remove op_resolve_modules and op_fetch_source_files from cli/ops/compiler.rs
* run TS worker on the same thread
Diffstat (limited to 'cli/ops/compiler.rs')
-rw-r--r-- | cli/ops/compiler.rs | 147 |
1 files changed, 4 insertions, 143 deletions
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs index b84401187..2e5842c0f 100644 --- a/cli/ops/compiler.rs +++ b/cli/ops/compiler.rs @@ -1,152 +1,13 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use super::dispatch_json::Deserialize; -use super::dispatch_json::JsonOp; -use super::dispatch_json::Value; -use crate::futures::future::try_join_all; -use crate::op_error::OpError; use crate::state::State; use deno_core::CoreIsolate; -use deno_core::ModuleLoader; -use deno_core::ModuleSpecifier; -use deno_core::ZeroCopyBuf; -use futures::future::FutureExt; -pub fn init(i: &mut CoreIsolate, s: &State) { - i.register_op("op_resolve_modules", s.stateful_json_op(op_resolve_modules)); - i.register_op( - "op_fetch_source_files", - s.stateful_json_op(op_fetch_source_files), - ); - let custom_assets = std::collections::HashMap::new(); // TODO(ry) use None. +pub fn init(i: &mut CoreIsolate, _s: &State) { + let custom_assets = std::collections::HashMap::new(); + // TODO(ry) use None. + // TODO(bartlomieju): is this op even required? i.register_op( "op_fetch_asset", deno_typescript::op_fetch_asset(custom_assets), ); } - -#[derive(Deserialize, Debug)] -struct SpecifiersReferrerArgs { - specifiers: Vec<String>, - referrer: Option<String>, -} - -fn op_resolve_modules( - state: &State, - args: Value, - _data: Option<ZeroCopyBuf>, -) -> Result<JsonOp, OpError> { - let args: SpecifiersReferrerArgs = serde_json::from_value(args)?; - let (referrer, is_main) = if let Some(referrer) = args.referrer { - (referrer, false) - } else { - ("<unknown>".to_owned(), true) - }; - - let mut specifiers = vec![]; - - for specifier in &args.specifiers { - let specifier = state - .resolve(specifier, &referrer, is_main) - .map_err(OpError::from)?; - specifiers.push(specifier.as_str().to_owned()); - } - - Ok(JsonOp::Sync(json!(specifiers))) -} - -fn op_fetch_source_files( - state: &State, - args: Value, - _data: Option<ZeroCopyBuf>, -) -> Result<JsonOp, OpError> { - let args: SpecifiersReferrerArgs = serde_json::from_value(args)?; - - let ref_specifier = if let Some(referrer) = args.referrer { - let specifier = ModuleSpecifier::resolve_url(&referrer) - .expect("Referrer is not a valid specifier"); - Some(specifier) - } else { - None - }; - - let s = state.borrow(); - let global_state = s.global_state.clone(); - let permissions = s.permissions.clone(); - let perms_ = permissions.clone(); - drop(s); - let file_fetcher = global_state.file_fetcher.clone(); - let specifiers = args.specifiers.clone(); - let future = async move { - let file_futures: Vec<_> = specifiers - .into_iter() - .map(|specifier| { - let file_fetcher_ = file_fetcher.clone(); - let ref_specifier_ = ref_specifier.clone(); - let perms_ = perms_.clone(); - async move { - let resolved_specifier = ModuleSpecifier::resolve_url(&specifier) - .expect("Invalid specifier"); - // TODO(bartlomieju): duplicated from `state.rs::ModuleLoader::load` - deduplicate - // Verify that remote file doesn't try to statically import local file. - if let Some(referrer) = ref_specifier_.as_ref() { - let referrer_url = referrer.as_url(); - match referrer_url.scheme() { - "http" | "https" => { - let specifier_url = resolved_specifier.as_url(); - match specifier_url.scheme() { - "http" | "https" => {}, - _ => { - let e = OpError::permission_denied("Remote module are not allowed to statically import local modules. Use dynamic import instead.".to_string()); - return Err(e.into()); - } - } - }, - _ => {} - } - } - file_fetcher_ - .fetch_source_file(&resolved_specifier, ref_specifier_, perms_) - .await - } - .boxed_local() - }) - .collect(); - - let files = try_join_all(file_futures).await.map_err(OpError::from)?; - // We want to get an array of futures that resolves to - let v = files.into_iter().map(|f| { - async { - // if the source file contains a `types_url` we need to replace - // the module with the type definition when requested by the compiler - let file = match f.types_url { - Some(types_url) => { - let types_specifier = ModuleSpecifier::from(types_url); - global_state - .file_fetcher - .fetch_source_file( - &types_specifier, - ref_specifier.clone(), - permissions.clone(), - ) - .await - .map_err(OpError::from)? - } - _ => f, - }; - let source_code = String::from_utf8(file.source_code).map_err(|_| OpError::invalid_utf8())?; - Ok::<_, OpError>(json!({ - "url": file.url.to_string(), - "filename": file.filename.to_str().unwrap(), - "mediaType": file.media_type as i32, - "sourceCode": source_code, - })) - } - }); - - let v = try_join_all(v).await?; - Ok(v.into()) - } - .boxed_local(); - - Ok(JsonOp::Async(future)) -} |