diff options
Diffstat (limited to 'cli/compilers')
| -rw-r--r-- | cli/compilers/ts.rs | 199 |
1 files changed, 145 insertions, 54 deletions
diff --git a/cli/compilers/ts.rs b/cli/compilers/ts.rs index 8a02efeea..77297713e 100644 --- a/cli/compilers/ts.rs +++ b/cli/compilers/ts.rs @@ -1,16 +1,16 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. use super::compiler_worker::CompilerWorker; use crate::colors; -use crate::compilers::CompilationResultFuture; use crate::compilers::CompiledModule; use crate::diagnostics::Diagnostic; +use crate::diagnostics::DiagnosticItem; use crate::disk_cache::DiskCache; use crate::file_fetcher::SourceFile; use crate::file_fetcher::SourceFileFetcher; +use crate::fs as deno_fs; use crate::global_state::GlobalState; use crate::msg; use crate::op_error::OpError; -use crate::ops::JsonResult; use crate::source_maps::SourceMapGetter; use crate::startup_data; use crate::state::*; @@ -21,10 +21,11 @@ use crate::worker::WorkerEvent; use deno_core::Buf; use deno_core::ErrBox; use deno_core::ModuleSpecifier; -use futures::future::FutureExt; use log::info; use regex::Regex; +use serde::Deserialize; use serde_json::json; +use serde_json::Value; use std::collections::HashMap; use std::collections::HashSet; use std::fs; @@ -32,7 +33,6 @@ use std::hash::BuildHasher; use std::io; use std::ops::Deref; use std::path::PathBuf; -use std::pin::Pin; use std::str; use std::sync::atomic::Ordering; use std::sync::Arc; @@ -172,7 +172,6 @@ fn req( request_type: msg::CompilerRequestType, root_names: Vec<String>, compiler_config: CompilerConfig, - out_file: Option<PathBuf>, target: &str, bundle: bool, unstable: bool, @@ -183,7 +182,6 @@ fn req( "type": request_type as i32, "target": target, "rootNames": root_names, - "outFile": out_file, "bundle": bundle, "unstable": unstable, "configPath": config_path, @@ -194,7 +192,6 @@ fn req( "type": request_type as i32, "target": target, "rootNames": root_names, - "outFile": out_file, "bundle": bundle, "unstable": unstable, "cwd": cwd, @@ -238,6 +235,43 @@ impl Deref for TsCompiler { } } +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct EmittedSource { + filename: String, + contents: String, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct BundleResponse { + diagnostics: Diagnostic, + bundle_output: String, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct CompileResponse { + diagnostics: Diagnostic, + emit_map: HashMap<String, EmittedSource>, +} + +// TODO(bartlomieju): possible deduplicate once TS refactor is stabilized +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +#[allow(unused)] +struct RuntimeBundleResponse { + diagnostics: Vec<DiagnosticItem>, + output: String, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct RuntimeCompileResponse { + diagnostics: Vec<DiagnosticItem>, + emit_map: HashMap<String, EmittedSource>, +} + impl TsCompiler { pub fn new( file_fetcher: SourceFileFetcher, @@ -287,13 +321,13 @@ impl TsCompiler { "Invoking the compiler to bundle. module_name: {}", module_name ); + eprintln!("Bundling {}", module_name); let root_names = vec![module_name]; let req_msg = req( msg::CompilerRequestType::Compile, root_names, self.config.clone(), - out_file, "main", true, global_state.flags.unstable, @@ -302,9 +336,26 @@ impl TsCompiler { let msg = execute_in_thread(global_state.clone(), req_msg).await?; let json_str = std::str::from_utf8(&msg).unwrap(); debug!("Message: {}", json_str); - if let Some(diagnostics) = Diagnostic::from_emit_result(json_str) { - return Err(ErrBox::from(diagnostics)); + + let bundle_response: BundleResponse = serde_json::from_str(json_str)?; + + if !bundle_response.diagnostics.items.is_empty() { + return Err(ErrBox::from(bundle_response.diagnostics)); + } + + if let Some(out_file_) = out_file.as_ref() { + eprintln!("Emitting bundle to {:?}", out_file_); + + let output_bytes = bundle_response.bundle_output.as_bytes(); + let output_len = output_bytes.len(); + + deno_fs::write_file(out_file_, output_bytes, 0o666)?; + // TODO(bartlomieju): add "humanFileSize" method + eprintln!("{} bytes emmited.", output_len); + } else { + println!("{}", bundle_response.bundle_output); } + Ok(()) } @@ -375,7 +426,6 @@ impl TsCompiler { msg::CompilerRequestType::Compile, root_names, self.config.clone(), - None, target, false, global_state.flags.unstable, @@ -390,11 +440,15 @@ impl TsCompiler { ); let msg = execute_in_thread(global_state.clone(), req_msg).await?; - let json_str = std::str::from_utf8(&msg).unwrap(); - if let Some(diagnostics) = Diagnostic::from_emit_result(json_str) { - return Err(ErrBox::from(diagnostics)); + + let compile_response: CompileResponse = serde_json::from_str(json_str)?; + + if !compile_response.diagnostics.items.is_empty() { + return Err(ErrBox::from(compile_response.diagnostics)); } + + self.cache_emitted_files(compile_response.emit_map)?; ts_compiler.get_compiled_module(&source_file_.url) } @@ -418,6 +472,26 @@ impl TsCompiler { None } + fn cache_emitted_files( + &self, + emit_map: HashMap<String, EmittedSource>, + ) -> std::io::Result<()> { + for (emitted_name, source) in emit_map.iter() { + let specifier = ModuleSpecifier::resolve_url(&source.filename) + .expect("Should be a valid module specifier"); + + if emitted_name.ends_with(".map") { + self.cache_source_map(&specifier, &source.contents)?; + } else if emitted_name.ends_with(".js") { + self.cache_compiled_file(&specifier, &source.contents)?; + } else { + panic!("Trying to cache unknown file type {}", emitted_name); + } + } + + Ok(()) + } + pub fn get_compiled_module( &self, module_url: &Url, @@ -468,15 +542,23 @@ impl TsCompiler { module_specifier: &ModuleSpecifier, contents: &str, ) -> std::io::Result<()> { + let source_file = self + .file_fetcher + .fetch_cached_source_file(&module_specifier) + .expect("Source file not found"); + + // NOTE: JavaScript files are only cached to disk if `checkJs` + // option in on + if source_file.media_type == msg::MediaType::JavaScript && !self.compile_js + { + return Ok(()); + } + let js_key = self .disk_cache .get_cache_filename_with_extension(module_specifier.as_url(), "js"); self.disk_cache.set(&js_key, contents.as_bytes())?; self.mark_compiled(module_specifier.as_url()); - let source_file = self - .file_fetcher - .fetch_cached_source_file(&module_specifier) - .expect("Source file not found"); let version_hash = source_code_version_hash( &source_file.source_code, @@ -528,25 +610,23 @@ impl TsCompiler { module_specifier: &ModuleSpecifier, contents: &str, ) -> std::io::Result<()> { + let source_file = self + .file_fetcher + .fetch_cached_source_file(&module_specifier) + .expect("Source file not found"); + + // NOTE: JavaScript files are only cached to disk if `checkJs` + // option in on + if source_file.media_type == msg::MediaType::JavaScript && !self.compile_js + { + return Ok(()); + } + let source_map_key = self .disk_cache .get_cache_filename_with_extension(module_specifier.as_url(), "js.map"); self.disk_cache.set(&source_map_key, contents.as_bytes()) } - - /// This method is called by TS compiler via an "op". - pub fn cache_compiler_output( - &self, - module_specifier: &ModuleSpecifier, - extension: &str, - contents: &str, - ) -> std::io::Result<()> { - match extension { - ".map" => self.cache_source_map(module_specifier, contents), - ".js" => self.cache_compiled_file(module_specifier, contents), - _ => unreachable!(), - } - } } impl SourceMapGetter for TsCompiler { @@ -638,24 +718,14 @@ async fn execute_in_thread( Ok(buf) } -async fn execute_in_thread_json( - req_msg: Buf, - global_state: GlobalState, -) -> JsonResult { - let msg = execute_in_thread(global_state, req_msg) - .await - .map_err(|e| OpError::other(e.to_string()))?; - let json_str = std::str::from_utf8(&msg).unwrap(); - Ok(json!(json_str)) -} - -pub fn runtime_compile<S: BuildHasher>( +/// This function is used by `Deno.compile()` and `Deno.bundle()` APIs. +pub async fn runtime_compile<S: BuildHasher>( global_state: GlobalState, root_name: &str, sources: &Option<HashMap<String, String, S>>, bundle: bool, options: &Option<String>, -) -> Pin<Box<CompilationResultFuture>> { +) -> Result<Value, OpError> { let req_msg = json!({ "type": msg::CompilerRequestType::RuntimeCompile as i32, "target": "runtime", @@ -669,14 +739,35 @@ pub fn runtime_compile<S: BuildHasher>( .into_boxed_str() .into_boxed_bytes(); - execute_in_thread_json(req_msg, global_state).boxed_local() + let compiler = global_state.ts_compiler.clone(); + + let msg = execute_in_thread(global_state, req_msg).await?; + let json_str = std::str::from_utf8(&msg).unwrap(); + + // TODO(bartlomieju): factor `bundle` path into separate function `runtime_bundle` + if bundle { + let _response: RuntimeBundleResponse = serde_json::from_str(json_str)?; + return Ok(serde_json::from_str::<Value>(json_str).unwrap()); + } + + let response: RuntimeCompileResponse = serde_json::from_str(json_str)?; + + if response.diagnostics.is_empty() && sources.is_none() { + compiler.cache_emitted_files(response.emit_map)?; + } + + // We're returning `Ok()` instead of `Err()` because it's not runtime + // error if there were diagnostics produces; we want to let user handle + // diagnostics in the runtime. + Ok(serde_json::from_str::<Value>(json_str).unwrap()) } -pub fn runtime_transpile<S: BuildHasher>( +/// This function is used by `Deno.transpileOnly()` API. +pub async fn runtime_transpile<S: BuildHasher>( global_state: GlobalState, sources: &HashMap<String, String, S>, options: &Option<String>, -) -> Pin<Box<CompilationResultFuture>> { +) -> Result<Value, OpError> { let req_msg = json!({ "type": msg::CompilerRequestType::RuntimeTranspile as i32, "sources": sources, @@ -686,7 +777,11 @@ pub fn runtime_transpile<S: BuildHasher>( .into_boxed_str() .into_boxed_bytes(); - execute_in_thread_json(req_msg, global_state).boxed_local() + let msg = execute_in_thread(global_state, req_msg).await?; + let json_str = std::str::from_utf8(&msg).unwrap(); + let v = serde_json::from_str::<serde_json::Value>(json_str) + .expect("Error decoding JSON string."); + Ok(v) } #[cfg(test)] @@ -745,11 +840,7 @@ mod tests { let result = state .ts_compiler - .bundle( - state.clone(), - module_name, - Some(PathBuf::from("$deno$/bundle.js")), - ) + .bundle(state.clone(), module_name, None) .await; assert!(result.is_ok()); } |