Implement result, fix invalid returns (#213)

* Implementing result * Fixing result, don't panick when nothing is returned * Jest tests, typescript files
three-em · Oct 28, 2022 · 747b552 · 747b552
1 parent 0555da8
commit 747b552
Show file tree

Hide file tree

Showing 12 changed files with 410 additions and 149 deletions.
diff --git a/crates/cli/dry_run.rs b/crates/cli/dry_run.rs
@@ -140,14 +140,20 @@ pub async fn dry_run(
 ) -> Result<(), AnyError> {
   let execution = dry_run_result(port, host, protocol, file).await;
 
-  if let ExecuteResult::V8(value, validity_table, _) = execution {
+  if let ExecuteResult::V8(data) = execution {
+    let (state, validity, result) = (
+      data.state,
+      data.validity,
+      data.result.unwrap_or(Value::default()),
+    );
     let value = if show_validity {
       serde_json::json!({
-          "state": value,
-          "validity": validity_table
+          "state": state,
+          "validity": validity,
+          "result": result
       })
     } else {
-      value
+      state
     };
 
     if pretty_print {
@@ -185,7 +191,9 @@ mod tests {
     )
     .await;
 
-    if let ExecuteResult::V8(value, validity_table, _) = execution {
+    if let ExecuteResult::V8(data) = execution {
+      let value = data.state;
+      let validity_table = data.validity;
       assert_eq!(
         value,
         serde_json::json!({

diff --git a/crates/cli/local_server.rs b/crates/cli/local_server.rs
@@ -70,18 +70,23 @@ async fn echo(req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
                 match execute_result {
                      Ok(result) => {
                          match result {
-                             ExecuteResult::V8(val, validity, _) => {
+                             ExecuteResult::V8(data) => {
+                                 let val = data.state;
+                                 let validity = data.validity;
+                                 let result = data.result.unwrap_or(serde_json::Value::Null);
                                  if show_validity {
                                      response_result = Some(Response::new(Body::from(
                                          serde_json::json!({
                                              "state": val,
-                                             "validity": validity
+                                             "validity": validity,
+                                             "result": result
                                          }).to_string()
                                      )));
                                  } else {
                                      response_result = Some(Response::new(Body::from(
                                          serde_json::json!({
-                                             "state": val
+                                             "state": val,
+                                             "result": result
                                          }).to_string()
                                      )));
                                  }

diff --git a/crates/cli/run.rs b/crates/cli/run.rs
@@ -35,14 +35,19 @@ pub async fn run(
   }
 
   match execution {
-    ExecuteResult::V8(value, validity_table, _) => {
+    ExecuteResult::V8(data) => {
+      let state = data.state;
+      let validity_table = data.validity;
+      let result = data.result.unwrap_or(serde_json::Value::Null);
+
       let value = if show_validity {
         serde_json::json!({
-            "state": value,
-            "validity": validity_table
+            "state": state,
+            "validity": validity_table,
+            "result": result
         })
       } else {
-        value
+        state
       };
 
       if !no_print {