Scarb execute: Rename output to program output in execution summary, force print if cli arg

extensions/scarb-execute/src/lib.rs

@@ -332,8 +332,8 @@ pub fn execute(
         .then(|| ExecutionResources::try_new(&runner, hint_processor))
         .transpose()?;
 
-    ui.print(ExecutionSummary {
-        output: args
+    let summary = ExecutionSummary {
+        program_output: args
             .run
             .print_program_output
             .then(|| ExecutionOutput::try_new(&mut runner))
@@ -343,7 +343,12 @@ pub fn execute(
             .print_resource_usage
             .then_some(execution_resources.clone())
             .flatten(),
-    });
+    };
+    if args.run.print_resource_usage || args.run.print_program_output {
+        ui.force_print(summary);
+    } else {
+        ui.print(summary);
+    }
 
     if output.is_cairo_pie() {
         let output_value = runner.get_cairo_pie()?;

extensions/scarb-execute/src/output.rs

@@ -17,7 +17,7 @@ use thousands::Separable;
 
 #[derive(Serialize)]
 pub struct ExecutionSummary {
-    pub output: Option<ExecutionOutput>,
+    pub program_output: Option<ExecutionOutput>,
     pub resources: Option<ExecutionResources>,
 }
 
@@ -26,7 +26,7 @@ impl Message for ExecutionSummary {
     where
         Self: Sized,
     {
-        if let Some(output) = self.output {
+        if let Some(output) = self.program_output {
             output.print_text();
         }
         if let Some(resources) = self.resources {
@@ -43,14 +43,14 @@ impl Message for ExecutionSummary {
 }
 
 #[derive(Serialize)]
+#[serde(transparent)]
 pub struct ExecutionOutput(String);
 
 impl ExecutionOutput {
     pub fn try_new(runner: &mut CairoRunner) -> Result<Self> {
-        let mut output_buffer = "Program output:\n".to_string();
+        let mut output_buffer = String::new();
         runner.vm.write_output(&mut output_buffer)?;
-        let output = output_buffer.trim_end().to_string();
-        Ok(Self(output))
+        Ok(Self(output_buffer.trim_end().to_string()))
     }
 }
 
@@ -59,7 +59,7 @@ impl Message for ExecutionOutput {
     where
         Self: Sized,
     {
-        println!("{}", self.0);
+        println!("Program output:\n{}", self.0);
     }
 
     fn structured<S: Serializer>(self, ser: S) -> std::result::Result<S::Ok, S::Error>

extensions/scarb-execute/tests/build.rs

@@ -565,3 +565,22 @@ fn allow_syscalls_triggers_layout_warning() {
         [..]Executing hello
         "#});
 }
+
+#[test]
+fn can_output_json_format() {
+    let t = build_executable_project();
+    Scarb::quick_command().arg("build").current_dir(&t).assert();
+    Scarb::quick_command()
+        .arg("execute")
+        .arg("--json")
+        .arg("--no-build")
+        .arg("--output=none")
+        .arg("--print-program-output")
+        .current_dir(&t)
+        .assert()
+        .success()
+        .stdout_eq(indoc! {r#"
+        {"status":"executing","message":"hello"}
+        {"program_output":"42","resources":null}
+        "#});
+}