Handle compiler errors in Rust.

.gitignore

@@ -16,3 +16,6 @@ node_modules
 /website/data.json
 /website/recent.json
 /js/gen
+# cached for some of the tests
+/js/deps/https/deno.land/std@v*/
+/js/deps/https/raw.githubusercontent.com/

cli/BUILD.gn

@@ -73,6 +73,7 @@ ts_sources = [
   "../js/copy_file.ts",
   "../js/core.ts",
   "../js/custom_event.ts",
+  "../js/diagnostics.ts",
   "../js/deno.ts",
   "../js/dir.ts",
   "../js/dispatch.ts",

cli/ansi.rs

@@ -1,6 +1,8 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
+use ansi_term::Color::Black;
 use ansi_term::Color::Fixed;
 use ansi_term::Color::Red;
+use ansi_term::Color::White;
 use ansi_term::Style;
 use regex::Regex;
 use std::env;
@@ -27,18 +29,34 @@ pub fn use_color() -> bool {
   !(*NO_COLOR)
 }
 
-pub fn red_bold(s: String) -> impl fmt::Display {
+pub fn italic_bold(s: String) -> impl fmt::Display {
   let mut style = Style::new();
   if use_color() {
-    style = style.bold().fg(Red);
+    style = style.italic().bold();
   }
   style.paint(s)
 }
 
-pub fn italic_bold(s: String) -> impl fmt::Display {
+pub fn black_on_white(s: String) -> impl fmt::Display {
   let mut style = Style::new();
   if use_color() {
-    style = style.italic().bold();
+    style = style.on(White).fg(Black);
+  }
+  style.paint(s)
+}
+
+pub fn red(s: String) -> impl fmt::Display {
+  let mut style = Style::new();
+  if use_color() {
+    style = style.fg(Red);
+  }
+  style.paint(s)
+}
+
+pub fn grey(s: String) -> impl fmt::Display {
+  let mut style = Style::new();
+  if use_color() {
+    style = style.fg(Fixed(8));
   }
   style.paint(s)
 }

cli/compiler.rs

@@ -7,9 +7,10 @@ use crate::tokio_util;
 use crate::worker::Worker;
 use deno::js_check;
 use deno::Buf;
-use deno::JSError;
+use deno::Diagnostic;
 use futures::Future;
 use futures::Stream;
+use serde_json;
 use std::str;
 use std::sync::atomic::Ordering;
 
@@ -87,7 +88,7 @@ pub fn compile_async(
   specifier: &str,
   referrer: &str,
   module_meta_data: &ModuleMetaData,
-) -> impl Future<Item = ModuleMetaData, Error = JSError> {
+) -> impl Future<Item = ModuleMetaData, Error = Diagnostic> {
   debug!(
     "Running rust part of compile_sync. specifier: {}, referrer: {}",
     &specifier, &referrer
@@ -136,14 +137,23 @@ pub fn compile_async(
   first_msg_fut
     .map_err(|_| panic!("not handled"))
     .and_then(move |maybe_msg: Option<Buf>| {
-      let _res_msg = maybe_msg.unwrap();
-
       debug!("Received message from worker");
 
-      // TODO res is EmitResult, use serde_derive to parse it. Errors from the
-      // worker or Diagnostics should be somehow forwarded to the caller!
-      // Currently they are handled inside compiler.ts with os.exit(1) and above
-      // with std::process::exit(1). This bad.
+      if maybe_msg.is_some() {
+        let msg = &maybe_msg.unwrap();
+        let res_json = std::str::from_utf8(msg).unwrap();
+        debug!("Message: {}", res_json);
+        let res = serde_json::from_str::<serde_json::Value>(res_json)
+          .expect("Error decoding compiler response");
+        let diagnostics_o = res.get("diagnostics");
+        if let Some(diagnostics_v) = diagnostics_o {
+          if let Some(diagnostics) =
+            Diagnostic::from_compiler_json_value(diagnostics_v)
+          {
+            return Err(diagnostics);
+          }
+        }
+      }
 
       let r = state.dir.fetch_module_meta_data(
         &module_meta_data_.module_name,
@@ -169,7 +179,7 @@ pub fn compile_sync(
   specifier: &str,
   referrer: &str,
   module_meta_data: &ModuleMetaData,
-) -> Result<ModuleMetaData, JSError> {
+) -> Result<ModuleMetaData, Diagnostic> {
   tokio_util::block_on(compile_async(
     state,
     specifier,

cli/deno_dir.rs

@@ -1,12 +1,12 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 use crate::compiler::ModuleMetaData;
+use crate::diagnostics::SourceMapGetter;
 use crate::errors;
 use crate::errors::DenoError;
 use crate::errors::DenoResult;
 use crate::errors::ErrorKind;
 use crate::fs as deno_fs;
 use crate::http_util;
-use crate::js_errors::SourceMapGetter;
 use crate::msg;
 use crate::progress::Progress;
 use crate::tokio_util;