Added check to forc_abi to fail on non-contracts

forc/src/lib.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 mod cli;
 mod ops;
-mod utils;
+pub mod utils;
 
 #[cfg(feature = "test")]
 pub mod test {

forc/src/ops/forc_abi_json.rs

@@ -1,30 +1,80 @@
 use crate::cli::{BuildCommand, JsonAbiCommand};
+use crate::utils::cli_error::CliError;
 use anyhow::Result;
+use forc_pkg::Manifest;
+use forc_util::find_manifest_dir;
 use serde_json::{json, Value};
 use std::fs::File;
+use std::path::PathBuf;
+use sway_core::{parse, TreeType};
+use sway_utils::constants::*;
 
-pub fn build(command: JsonAbiCommand) -> Result<Value> {
-    let build_command = BuildCommand {
-        path: command.path,
-        offline_mode: command.offline_mode,
-        silent_mode: command.silent_mode,
-        minify_json_abi: command.minify,
-        ..Default::default()
-    };
-    let compiled = crate::ops::forc_build::build(build_command)?;
-    let json_abi = json!(compiled.json_abi);
-    if let Some(outfile) = command.json_outfile {
-        let file = File::create(outfile).map_err(|e| e)?;
-        let res = if command.minify {
-            serde_json::to_writer(&file, &json_abi)
-        } else {
-            serde_json::to_writer_pretty(&file, &json_abi)
-        };
-        res.map_err(|e| e)?;
-    } else if command.minify {
-        println!("{}", json_abi);
+pub fn build(command: JsonAbiCommand) -> Result<Value, CliError> {
+    let curr_dir = if let Some(ref path) = command.path {
+        PathBuf::from(path)
     } else {
-        println!("{:#}", json_abi);
+        std::env::current_dir()?
+    };
+
+    // Parse manifest and return error if non-contract
+    // Note that this same code is in `forc_deploy` & `forc_run` and may be more useful as a helper function.
+    // Its only difference is in what functionality it performs once it finds a `Contract`.
+    match find_manifest_dir(&curr_dir) {
+        Some(manifest_dir) => {
+            let manifest = Manifest::from_dir(&manifest_dir)?;
+            let project_name = &manifest.project.name;
+            let entry_string = manifest.entry_string(&manifest_dir)?;
+
+            let parsed_result = parse(entry_string, None);
+            match parsed_result.value {
+                Some(parse_tree) => match parse_tree.tree_type {
+                    TreeType::Contract => {
+                        let build_command = BuildCommand {
+                            path: command.path,
+                            offline_mode: command.offline_mode,
+                            silent_mode: command.silent_mode,
+                            minify_json_abi: command.minify,
+                            ..Default::default()
+                        };
+
+                        let compiled = crate::ops::forc_build::build(build_command)?;
+                        let json_abi = json!(compiled.json_abi);
+
+                        if let Some(outfile) = command.json_outfile {
+                            let file = File::create(outfile).map_err(|e| e)?;
+                            let res = if command.minify {
+                                serde_json::to_writer(&file, &json_abi)
+                            } else {
+                                serde_json::to_writer_pretty(&file, &json_abi)
+                            };
+                            res.map_err(|e| e)?;
+                        } else if command.minify {
+                            println!("{}", json_abi);
+                        } else {
+                            println!("{:#}", json_abi);
+                        }
+
+                        Ok(json_abi)
+                    }
+                    TreeType::Script => Err(CliError::wrong_sway_type(
+                        project_name,
+                        SWAY_CONTRACT,
+                        SWAY_SCRIPT,
+                    )),
+                    TreeType::Predicate => Err(CliError::wrong_sway_type(
+                        project_name,
+                        SWAY_CONTRACT,
+                        SWAY_PREDICATE,
+                    )),
+                    TreeType::Library { .. } => Err(CliError::wrong_sway_type(
+                        project_name,
+                        SWAY_CONTRACT,
+                        SWAY_LIBRARY,
+                    )),
+                },
+                None => Err(CliError::parsing_failed(project_name, parsed_result.errors)),
+            }
+        }
+        None => Err(CliError::manifest_file_missing(curr_dir)),
     }
-    Ok(json_abi)
 }

forc/src/utils/cli_error.rs

@@ -48,7 +48,7 @@ impl CliError {
 
 impl fmt::Display for CliError {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        write!(f, "{}", self)
+        write!(f, "{:?}", self)
     }
 }
 
@@ -89,3 +89,13 @@ impl From<anyhow::Error> for CliError {
         }
     }
 }
+
+impl From<serde_json::Error> for CliError {
+    fn from(e: serde_json::Error) -> Self {
+        CliError {
+            message: e.to_string(),
+        }
+    }
+}
+
+impl std::error::Error for CliError {}

test/src/e2e_vm_tests/harness.rs

@@ -3,6 +3,7 @@ use forc::test::{
     forc_abi_json, forc_build, forc_deploy, forc_run, BuildCommand, DeployCommand, JsonAbiCommand,
     RunCommand,
 };
+use forc::utils::cli_error::CliError;
 use fuel_tx::Transaction;
 use fuel_vm::interpreter::Interpreter;
 use fuel_vm::prelude::*;
@@ -121,7 +122,7 @@ pub(crate) fn compile_to_bytes(file_name: &str) -> Result<Vec<u8>> {
 }
 
 pub(crate) fn test_json_abi(file_name: &str) -> Result<()> {
-    let _script = compile_to_json_abi(file_name)?;
+    let _compiled_res = compile_to_json_abi(file_name)?;
     let manifest_dir = env!("CARGO_MANIFEST_DIR");
     let oracle_path = format!(
         "{}/src/e2e_vm_tests/test_programs/{}/{}",
@@ -147,7 +148,7 @@ pub(crate) fn test_json_abi(file_name: &str) -> Result<()> {
     Ok(())
 }
 
-fn compile_to_json_abi(file_name: &str) -> Result<Value> {
+fn compile_to_json_abi(file_name: &str) -> Result<Value, CliError> {
     println!("   ABI gen {}", file_name);
     let manifest_dir = env!("CARGO_MANIFEST_DIR");
     forc_abi_json::build(JsonAbiCommand {