feat: exit(1) on failed checks, improve watch feature

Author: lgalabru

deno/index.ts

@@ -111,10 +111,10 @@ export class Chain {
   }
 
   mineBlock(transactions: Array<Tx>): Block {
-    let result = (Deno as any).core.opSync("mine_block", {
+    let result = JSON.parse((Deno as any).core.opSync("mine_block", {
       sessionId: this.sessionId,
       transactions: transactions,
-    });
+    }));
     this.blockHeight = result.block_height;
     let block: Block = {
       height: result.block_height,
@@ -124,10 +124,10 @@ export class Chain {
   }
 
   mineEmptyBlock(count: number): EmptyBlock {
-    let result = (Deno as any).core.opSync("mine_empty_blocks", {
+    let result = JSON.parse((Deno as any).core.opSync("mine_empty_blocks", {
       sessionId: this.sessionId,
       count: count,
-    });
+    }));
     this.blockHeight = result.block_height;
     let emptyBlock: EmptyBlock = {
       session_id: result.session_id,
@@ -150,13 +150,13 @@ export class Chain {
     args: Array<any>,
     sender: string,
   ): ReadOnlyFn {
-    let result = (Deno as any).core.opSync("call_read_only_fn", {
+    let result = JSON.parse((Deno as any).core.opSync("call_read_only_fn", {
       sessionId: this.sessionId,
       contract: contract,
       method: method,
       args: args,
       sender: sender,
-    });    
+    }));  
     let readOnlyFn: ReadOnlyFn = {
       session_id: result.session_id,
       result: result.result,
@@ -166,9 +166,9 @@ export class Chain {
   }
 
   getAssetsMaps(): AssetsMaps {
-    let result = (Deno as any).core.opSync("get_assets_maps", {
+    let result = JSON.parse((Deno as any).core.opSync("get_assets_maps", {
       sessionId: this.sessionId,
-    });
+    }));
     let assetsMaps: AssetsMaps = {
       session_id: result.session_id,
       assets: result.assets

src/console/mod.rs

@@ -89,7 +89,13 @@ pub fn load_session(start_repl: bool, env: String) -> Result<repl::SessionSettin
         terminal.start();
     } else {
         let mut session = repl::Session::new(settings.clone());
-        session.check()?;
+        match session.check() {
+            Err(message) => {
+                println!("Error: {}", message);
+                std::process::exit(1);
+            }
+            _ => {}
+        };
     }
     Ok(settings)
 }

src/test/deno.rs

@@ -165,7 +165,6 @@ pub async fn do_run_tests(include: Vec<String>, include_coverage: bool, watch: b
       include.clone()
     };
 
-    let doc_modules = vec![];
     let allow_none = true;
     let no_run = false;
     let concurrent_jobs = 2;
@@ -191,9 +190,9 @@ pub async fn do_run_tests(include: Vec<String>, include_coverage: bool, watch: b
         let doc_modules_result = test_runner::collect_test_module_specifiers(
           include.clone(),
           &cwd,
-          fs_util::is_supported_ext,
+          is_supported_ext,
         );
-  
+
         let test_modules_result = test_runner::collect_test_module_specifiers(
           include.clone(),
           &cwd,
@@ -207,6 +206,8 @@ pub async fn do_run_tests(include: Vec<String>, include_coverage: bool, watch: b
         let program_state = program_state.clone();
         let files_changed = changed.is_some();
         async move {
+          let doc_modules = doc_modules_result?;
+
           let test_modules = test_modules_result?;
 
           let mut paths_to_watch = paths_to_watch_clone;
@@ -284,9 +285,13 @@ pub async fn do_run_tests(include: Vec<String>, include_coverage: bool, watch: b
               for path in changed.iter().filter_map(|path| {
                 deno_core::resolve_url_or_path(&path.to_string_lossy()).ok()
               }) {
-                if modules.contains(&&path) {
-                  modules_to_reload.push(specifier);
-                  break;
+                if path.path().ends_with(".clar") {
+                  modules_to_reload.push(specifier.clone());
+                } else {
+                  if modules.contains(&&path) {
+                    modules_to_reload.push(specifier);
+                    break;
+                  }  
                 }
               }
             }
@@ -295,23 +300,17 @@ pub async fn do_run_tests(include: Vec<String>, include_coverage: bool, watch: b
           Ok((paths_to_watch, modules_to_reload))
         }
         .map(move |result| {
-          if files_changed
-            && matches!(result, Ok((_, ref modules)) if modules.is_empty())
-          {
-            ResolutionResult::Ignore
-          } else {
-            match result {
-              Ok((paths_to_watch, modules_to_reload)) => {
-                ResolutionResult::Restart {
-                  paths_to_watch,
-                  result: Ok(modules_to_reload),
-                }
-              }
-              Err(e) => ResolutionResult::Restart {
+          match result {
+            Ok((paths_to_watch, modules_to_reload)) => {
+              ResolutionResult::Restart {
                 paths_to_watch,
-                result: Err(e),
-              },
+                result: Ok(modules_to_reload),
+              }
             }
+            Err(e) => ResolutionResult::Restart {
+              paths_to_watch,
+              result: Err(e),
+            },
           }
         })
       };
@@ -338,6 +337,8 @@ pub async fn do_run_tests(include: Vec<String>, include_coverage: bool, watch: b
       )
       .await?;
     } else {
+      let doc_modules = vec![];
+
       let test_modules = test_runner::collect_test_module_specifiers(
         include.clone(),
         &cwd,
@@ -386,6 +387,14 @@ pub async fn do_run_tests(include: Vec<String>, include_coverage: bool, watch: b
     Ok(true)
 }
 
+pub fn is_supported_ext(path: &Path) -> bool {
+  if let Some(ext) = fs_util::get_extension(path) {
+    matches!(ext.as_str(), "ts" | "js" | "clar")
+  } else {
+    false
+  }
+}
+
 #[allow(clippy::too_many_arguments)]
 pub async fn run_tests(
   program_state: Arc<ProgramState>,

vendor/deno/cli/ops/errors.rs

@@ -30,7 +30,7 @@ fn op_apply_source_map(
   state: &mut OpState,
   args: Value,
   _: (),
-) -> Result<Value, AnyError> {
+) -> Result<String, AnyError> {
   let args: ApplySourceMap = serde_json::from_value(args)?;
 
   let mut mappings_map: CachedMaps = HashMap::new();
@@ -49,7 +49,7 @@ fn op_apply_source_map(
     "fileName": orig_file_name,
     "lineNumber": orig_line_number as u32,
     "columnNumber": orig_column_number as u32,
-  }))
+  }).to_string())
 }
 
 fn op_format_diagnostic(

vendor/deno/runtime/js/40_error_stack.js

@@ -9,7 +9,7 @@
   }
 
   function opApplySourceMap(location) {
-    const res = core.opSync("op_apply_source_map", location);
+    const res = JSON.parse(core.opSync("op_apply_source_map", location));
     return {
       fileName: res.fileName,
       lineNumber: res.lineNumber,