slowly bringing more .fs tests back

darklang · Nov 5, 2024 · c4bd61f · c4bd61f
1 parent 50678db
commit c4bd61f
Show file tree

Hide file tree

Showing 9 changed files with 1,189 additions and 1,186 deletions.
diff --git a/backend/src/BwdServer/Server.fs b/backend/src/BwdServer/Server.fs
@@ -476,8 +476,8 @@ let initSerializers () =
     "Canvas.loadJsonFromDisk"
   Json.Vanilla.allow<LibExecution.ProgramTypes.Toplevel.T> "Canvas.loadJsonFromDisk"
   // Json.Vanilla.allow<LibCloud.Queue.NotificationData> "eventqueue storage"
-  // Json.Vanilla.allow<LibCloud.TraceCloudStorage.CloudStorageFormat>
-  //   "TraceCloudStorageFormat"
+  Json.Vanilla.allow<LibCloud.TraceCloudStorage.CloudStorageFormat>
+    "TraceCloudStorageFormat"
   Json.Vanilla.allow<LibService.Rollbar.HoneycombJson> "Rollbar"
 
   // for Pusher.com payloads

diff --git a/backend/src/LibExecution/Execution.fs b/backend/src/LibExecution/Execution.fs
@@ -220,23 +220,25 @@ let traceDvals () : Dictionary.T<id, RT.Dval> * RT.Tracing.TraceDval =
   (results, trace)
 
 
-// let rec rteToString
-//   (state : RT.ExecutionState)
-//   (rte : RT.RuntimeError)
-//   : Ply<string> =
-//   uply {
-//     let errorMessageFn =
-//       RT.FQFnName.fqPackage
-//         PackageIDs.Fn.LanguageTools.RuntimeErrors.Error.toErrorMessage
-
-//     let rte = RT.RuntimeError.toDT rte
-
-//     let! rteMessage = executeFunction state errorMessageFn [] (NEList.ofList rte [])
-
-//     match rteMessage with
-//     | Ok(RT.DString msg) -> return msg
-//     | Ok(other) -> return string other
-//     | Error(_, rte) ->
-//       debuG "Error converting RTE to string" rte
-//       return! rteToString state rte
-//   }
+let rec rteToString
+  (rteToDval : RT.RuntimeError.Error -> RT.Dval)
+  (state : RT.ExecutionState)
+  (rte : RT.RuntimeError.Error)
+  : Ply<string> =
+  uply {
+    let errorMessageFn =
+      RT.FQFnName.fqPackage
+        PackageIDs.Fn.PrettyPrinter.RuntimeTypes.RuntimeError.toErrorMessage
+
+    let rteDval = rteToDval rte
+
+    let! rteMessage =
+      executeFunction state errorMessageFn [] (NEList.ofList rteDval [])
+
+    match rteMessage with
+    | Ok(RT.DString msg) -> return msg
+    | Ok(other) -> return string other
+    | Error(rte) ->
+      debuG "Error converting RTE to string" rte
+      return! rteToString rteToDval state rte
+  }
diff --git a/backend/src/ProdExec/ProdExec.fs b/backend/src/ProdExec/ProdExec.fs
@@ -161,8 +161,8 @@ let initSerializers () =
   // Json.Vanilla.allow<LibExecution.DvalReprInternalRoundtrippable.FormatV0.Dval>
   //   "RoundtrippableSerializationFormatV0.Dval"
   //Json.Vanilla.allow<LibCloud.Queue.NotificationData> "eventqueue storage"
-  // Json.Vanilla.allow<LibCloud.TraceCloudStorage.CloudStorageFormat>
-  //   "TraceCloudStorageFormat"
+  Json.Vanilla.allow<LibCloud.TraceCloudStorage.CloudStorageFormat>
+    "TraceCloudStorageFormat"
   Json.Vanilla.allow<LibService.Rollbar.HoneycombJson> "Rollbar"
 
   // for Pusher.com payloads