Merge pull request #4588 from darklang/revert-4587-revert-4542-expand…

…-backend-clienttypes Fix and Re-merge "Extend backend "ClientTypes"
darklang · Nov 23, 2022 · e424be1 · e424be1
2 parents 0956a34 + dd78ddf
commit e424be1
Show file tree

Hide file tree

Showing 137 changed files with 4,070 additions and 2,359 deletions.
diff --git a/...lysis-PerformAnalysisParams_function.json → ...lysis-PerformAnalysisParams_function.json b/...lysis-PerformAnalysisParams_function.json → ...lysis-PerformAnalysisParams_function.json
diff --git a/...alysis-PerformAnalysisParams_handler.json → ...alysis-PerformAnalysisParams_handler.json b/...alysis-PerformAnalysisParams_handler.json → ...alysis-PerformAnalysisParams_handler.json
diff --git a/...piServer-DBs-DBStatsV1-Params_simple.json → ...tTypes-Api-DB-StatsV1-Request_simple.json b/...piServer-DBs-DBStatsV1-Params_simple.json → ...tTypes-Api-DB-StatsV1-Request_simple.json
diff --git a/...-DBs_ApiServer-DBs-Unlocked-T_simple.json → ...ypes-Api-DB-Unlocked-Response_simple.json b/...-DBs_ApiServer-DBs-Unlocked-T_simple.json → ...ypes-Api-DB-Unlocked-Response_simple.json
diff --git a/...r-Execution-FunctionV1-Params_simple.json → ...-Execution-FunctionV1-Request_simple.json b/...r-Execution-FunctionV1-Params_simple.json → ...-Execution-FunctionV1-Request_simple.json
diff --git a/...Server-Execution-FunctionV1-T_simple.json → ...Execution-FunctionV1-Response_simple.json b/...Server-Execution-FunctionV1-T_simple.json → ...Execution-FunctionV1-Response_simple.json
diff --git a/...er-Execution-HandlerV1-Params_simple.json → ...i-Execution-HandlerV1-Request_simple.json b/...er-Execution-HandlerV1-Params_simple.json → ...i-Execution-HandlerV1-Request_simple.json
diff --git a/...iServer-Execution-HandlerV1-T_simple.json → ...-Execution-HandlerV1-Response_simple.json b/...iServer-Execution-HandlerV1-T_simple.json → ...-Execution-HandlerV1-Response_simple.json
diff --git a/...ApiServer-F404s-Delete-Params_simple.json → ...Types-Api-F404-Delete-Request_simple.json b/...ApiServer-F404s-Delete-Params_simple.json → ...Types-Api-F404-Delete-Request_simple.json
diff --git a/...404s_ApiServer-F404s-Delete-T_simple.json → ...ypes-Api-F404-Delete-Response_simple.json b/...404s_ApiServer-F404s-Delete-T_simple.json → ...ypes-Api-F404-Delete-Response_simple.json
diff --git a/...-F404s_ApiServer-F404s-List-T_simple.json → ...tTypes-Api-F404-List-Response_simple.json b/...-F404s_ApiServer-F404s-List-T_simple.json → ...tTypes-Api-F404-List-Response_simple.json
diff --git a/...d_ApiServer-InitialLoad-V1-T_initial.json → ...-Api-InitialLoad-V1-Response_initial.json b/...d_ApiServer-InitialLoad-V1-T_initial.json → ...-Api-InitialLoad-V1-Response_initial.json
diff --git a/...erver-Secrets-DeleteV1-Params_simple.json → ...-Api-Secrets-DeleteV1-Request_simple.json b/...erver-Secrets-DeleteV1-Params_simple.json → ...-Api-Secrets-DeleteV1-Request_simple.json
diff --git a/..._ApiServer-Secrets-DeleteV1-T_simple.json → ...Api-Secrets-DeleteV1-Response_simple.json b/..._ApiServer-Secrets-DeleteV1-T_simple.json → ...Api-Secrets-DeleteV1-Response_simple.json
diff --git a/..._ApiServer-Secrets-InsertV1-T_simple.json → ...Api-Secrets-InsertV1-Response_simple.json b/..._ApiServer-Secrets-InsertV1-T_simple.json → ...Api-Secrets-InsertV1-Response_simple.json
diff --git a/...erver-Secrets-InsertV1-Secret_simple.json → ...lientTypes-Api-Secrets-Secret_simple.json b/...erver-Secrets-InsertV1-Secret_simple.json → ...lientTypes-Api-Secrets-Secret_simple.json
diff --git a/...erver-Toplevels-Delete-Params_simple.json → ...-Api-Toplevels-Delete-Request_simple.json b/...erver-Toplevels-Delete-Params_simple.json → ...-Api-Toplevels-Delete-Request_simple.json
diff --git a/..._ApiServer-Toplevels-Delete-T_simple.json → ...Api-Toplevels-Delete-Response_simple.json b/..._ApiServer-Toplevels-Delete-T_simple.json → ...Api-Toplevels-Delete-Response_simple.json
diff --git a/..._ApiServer-Traces-AllTraces-T_simple.json → ...-Traces-GetAllTraces-Response_simple.json b/..._ApiServer-Traces-AllTraces-T_simple.json → ...-Traces-GetAllTraces-Response_simple.json
diff --git a/...ver-Traces-TraceDataV1-Params_simple.json → ...Traces-GetTraceDataV1-Request_simple.json b/...ver-Traces-TraceDataV1-Params_simple.json → ...Traces-GetTraceDataV1-Request_simple.json
diff --git a/...piServer-Traces-TraceDataV1-T_simple.json → ...ces-GetTraceDataV1-Response-T_simple.json b/...piServer-Traces-TraceDataV1-T_simple.json → ...ces-GetTraceDataV1-Response-T_simple.json
diff --git a/...Server-Tunnels-Register-Params_empty.json → ...s-Api-Tunnels-Register-Request_empty.json b/...Server-Tunnels-Register-Params_empty.json → ...s-Api-Tunnels-Register-Request_empty.json
diff --git a/...erver-Tunnels-Register-Params_simple.json → ...-Api-Tunnels-Register-Request_simple.json b/...erver-Tunnels-Register-Params_simple.json → ...-Api-Tunnels-Register-Request_simple.json
diff --git a/..._ApiServer-Tunnels-Register-T_simple.json → ...Api-Tunnels-Register-Response_simple.json b/..._ApiServer-Tunnels-Register-T_simple.json → ...Api-Tunnels-Register-Response_simple.json
diff --git a/...rver-Workers-Scheduler-Params_simple.json → ...Api-Workers-Scheduler-Request_simple.json b/...rver-Workers-Scheduler-Params_simple.json → ...Api-Workers-Scheduler-Request_simple.json
diff --git a/...er-Workers-WorkerStats-Params_simple.json → ...i-Workers-WorkerStats-Request_simple.json b/...er-Workers-WorkerStats-Params_simple.json → ...i-Workers-WorkerStats-Request_simple.json
diff --git a/...iServer-Workers-WorkerStats-T_simple.json → ...-Workers-WorkerStats-Response_simple.json b/...iServer-Workers-WorkerStats-T_simple.json → ...-Workers-WorkerStats-Response_simple.json
diff --git a/...s_LibBackend-Op-AddOpParamsV1_simple.json → ...ClientTypes-Ops-AddOpParamsV1_simple.json b/...s_LibBackend-Op-AddOpParamsV1_simple.json → ...ClientTypes-Ops-AddOpParamsV1_simple.json
diff --git a/...s_LibBackend-Op-AddOpResultV1_simple.json → ...ClientTypes-Ops-AddOpResultV1_simple.json b/...s_LibBackend-Op-AddOpResultV1_simple.json → ...ClientTypes-Ops-AddOpResultV1_simple.json
diff --git a/...er_LibBackend-Op-AddOpEventV1_simple.json → ...tTypes-Pusher-Payload-AddOpV1_simple.json b/...er_LibBackend-Op-AddOpEventV1_simple.json → ...tTypes-Pusher-Payload-AddOpV1_simple.json
diff --git a/...pr-tests_ClientTypes-Dval-T_complete.json → ..._ClientTypes-Runtime-Dval-T_complete.json b/...pr-tests_ClientTypes-Dval-T_complete.json → ..._ClientTypes-Runtime-Dval-T_complete.json
diff --git a/...end-StaticAssets-StaticDeploy_simple.json → ...la_ClientTypes-StaticDeploy-T_simple.json b/...end-StaticAssets-StaticDeploy_simple.json → ...la_ClientTypes-StaticDeploy-T_simple.json
diff --git a/...EventQueueV2-NotificationData_simple.json → ...EventQueueV2-NotificationData_simple.json b/...EventQueueV2-NotificationData_simple.json → ...EventQueueV2-NotificationData_simple.json
diff --git a/...alization/vanilla_LibBackend-Pusher_LibBackend-Pusher-AddOpEventTooBigPayload_simple.json b/...alization/vanilla_LibBackend-Pusher_LibBackend-Pusher-AddOpEventTooBigPayload_simple.json
diff --git a/...e_LibBackend-Session-JsonData_simple.json → ...a_LibBackend-Session-JsonData_simple.json b/...e_LibBackend-Session-JsonData_simple.json → ...a_LibBackend-Session-JsonData_simple.json
diff --git a/...nalysisTypes-TraceData_testTraceData.json → ...nalysisTypes-TraceData_testTraceData.json b/...nalysisTypes-TraceData_testTraceData.json → ...nalysisTypes-TraceData_testTraceData.json
diff --git a/...eSerializationFormatV0-Dval_complete.json → ...eSerializationFormatV0-Dval_complete.json b/...eSerializationFormatV0-Dval_complete.json → ...eSerializationFormatV0-Dval_complete.json
diff --git a/...cution-ProgramTypes-Handler-T_simple.json → ...cution-ProgramTypes-Handler-T_simple.json b/...cution-ProgramTypes-Handler-T_simple.json → ...cution-ProgramTypes-Handler-T_simple.json
diff --git a/...n/vanilla_Prelude_Prelude-pos_simple.json → ...ecution-ProgramTypes-Position_simple.json b/...n/vanilla_Prelude_Prelude-pos_simple.json → ...ecution-ProgramTypes-Position_simple.json
diff --git a/...Service-Rollbar-HoneycombJson_simple.json → ...Service-Rollbar-HoneycombJson_simple.json b/...Service-Rollbar-HoneycombJson_simple.json → ...Service-Rollbar-HoneycombJson_simple.json
diff --git a/...tion-ProgramTypes-Package-Fn-_simple.json → ...ientTypes-Program-Package-Fn-_simple.json b/...tion-ProgramTypes-Package-Fn-_simple.json → ...ientTypes-Program-Package-Fn-_simple.json
diff --git a/...ApiServer-Functions-BuiltInFn-T-_all.json → ...entTypes-UI-Functions-BuiltInFn-_all.json b/...ApiServer-Functions-BuiltInFn-T-_all.json → ...entTypes-UI-Functions-BuiltInFn-_all.json
diff --git a/...ackend-PackageManager-Parameter-_all.json → ...ackend-PackageManager-Parameter-_all.json b/...ackend-PackageManager-Parameter-_all.json → ...ackend-PackageManager-Parameter-_all.json
diff --git a/...bExecution-ProgramTypes-Op-_complete.json → ...bExecution-ProgramTypes-Op-_complete.json b/...bExecution-ProgramTypes-Op-_complete.json → ...bExecution-ProgramTypes-Op-_complete.json
diff --git a/...ApiServer-DBs-DBStatsV1-Stat-_simple.json → ...Api-DB-StatsV1-Response-Stat-_simple.json b/...ApiServer-DBs-DBStatsV1-Stat-_simple.json → ...Api-DB-StatsV1-Response-Stat-_simple.json
diff --git a/...edulingRules-WorkerStates-State-_all.json → ...tring-_api-worker-scheduler-response.json b/...edulingRules-WorkerStates-State-_all.json → ...tring-_api-worker-scheduler-response.json
diff --git a/...-System-String-System-String-_simple.json → ...ystem-String-System-String-_baseline.json b/...-System-String-System-String-_simple.json → ...ystem-String-System-String-_baseline.json
diff --git a/...lingRules-WorkerStates-State-_simple.json → ...-String-_pusher-update-worker-states.json b/...lingRules-WorkerStates-State-_simple.json → ...-String-_pusher-update-worker-states.json
diff --git a/...daTime-Instant-System-String-_simple.json → ...daTime-Instant-System-String-_simple.json b/...daTime-Instant-System-String-_simple.json → ...daTime-Instant-System-String-_simple.json
diff --git a/...ecution-ProgramTypes-Position_simple.json → ...alization/vanilla_Prelude-pos_simple.json b/...ecution-ProgramTypes-Position_simple.json → ...alization/vanilla_Prelude-pos_simple.json
diff --git a/...s-FSharpList-1-System-UInt64-_simple.json → ...s-FSharpList-1-System-UInt64-_simple.json b/...s-FSharpList-1-System-UInt64-_simple.json → ...s-FSharpList-1-System-UInt64-_simple.json
diff --git a/...NodaTime-Instant-System-Guid-_simple.json → ...NodaTime-Instant-System-Guid-_simple.json b/...NodaTime-Instant-System-Guid-_simple.json → ...NodaTime-Instant-System-Guid-_simple.json
diff --git a/client/src/analysis/AnalysisTypes.res b/client/src/analysis/AnalysisTypes.res
@@ -400,6 +400,8 @@ module FourOhFour = {
   }
 }
 
+// TODO: these are used outside of analysis (e.g. in APIWorkers) so the type def
+// should probably move?
 module WorkerState = {
   @ppx.deriving(show({with_path: false}))
   type rec t = Running | Blocked | Paused

diff --git a/client/test/TestJsonEncoding.res b/client/test/TestJsonEncoding.res
@@ -144,23 +144,24 @@ let run = () => {
     )
     let ignores = [
       // Not used by client
-      "vanilla_ApiServer-F404s_ApiServer-F404s-Delete-T_simple.json", // we don't check the response
-      "vanilla_ApiServer-Secrets_ApiServer-Secrets-DeleteV1-Params_simple.json",
-      "vanilla_ApiServer-Secrets_ApiServer-Secrets-DeleteV1-T_simple.json",
-      "vanilla_ApiServer-Toplevels_ApiServer-Toplevels-Delete-T_simple.json", // we don't check the response
-      "vanilla_LibBackend-Pusher_LibBackend-Pusher-AddOpEventTooBigPayload_simple.json", // not used yet
+      "vanilla_Microsoft-FSharp-Collections-FSharpMap-2-System-String-System-String-_baseline.json",
+      "vanilla_ClientTypes-Api-F404-Delete-Response_simple.json", // we don't check the response
+      "vanilla_ClientTypes-Api-Secrets-DeleteV1-Request_simple.json",
+      "vanilla_ClientTypes-Api-Secrets-DeleteV1-Response_simple.json",
+      "vanilla_ClientTypes-Api-Toplevels-Delete-Response_simple.json", // we don't check the response
+      "vanilla_ClientTypes-Pusher-Payload-AddOpV1PayloadTooBig_simple.json", // not used yet
       // Internal to backend
-      "vanilla_LibBackend-session-db-storage_LibBackend-Session-JsonData_simple.json",
-      "vanilla_PackageManager_Microsoft-FSharp-Collections-FSharpList-1-LibBackend-PackageManager-Parameter-_all.json",
-      "vanilla_Prelude_Prelude-pos_simple.json",
-      "vanilla_Rollbar_LibService-Rollbar-HoneycombJson_simple.json",
-      "vanilla_RoundtrippableSerializationFormatV0-Dval_LibExecution-DvalReprInternalNew-RoundtrippableSerializationFormatV0-Dval_complete.json",
-      "vanilla_canvasClone_LibExecution-ProgramTypes-Handler-T_simple.json",
-      "vanilla_eventqueue-storage_LibBackend-EventQueueV2-NotificationData_simple.json",
-      "vanilla_loadJsonFromDisk_Microsoft-FSharp-Collections-FSharpList-1-LibExecution-ProgramTypes-Op-_complete.json",
-      "vanilla_saveTLIDs_LibExecution-ProgramTypes-Position_simple.json",
-      "vanilla_testTraceData_LibExecution-AnalysisTypes-TraceData_testTraceData.json",
-      "vanilla_tests-ApiServer-UI-heapioMetadata_Microsoft-FSharp-Collections-FSharpMap-2-System-String-System-String-_simple.json",
+      "vanilla_LibBackend-Session-JsonData_simple.json",
+      "vanilla_Microsoft-FSharp-Collections-FSharpList-1-LibBackend-PackageManager-Parameter-_all.json",
+      "vanilla_Prelude-pos_simple.json",
+      "vanilla_LibService-Rollbar-HoneycombJson_simple.json",
+      "vanilla_LibExecution-DvalReprInternalNew-RoundtrippableSerializationFormatV0-Dval_complete.json",
+      "vanilla_LibExecution-ProgramTypes-Handler-T_simple.json",
+      "vanilla_LibBackend-EventQueueV2-NotificationData_simple.json",
+      "vanilla_Microsoft-FSharp-Collections-FSharpList-1-LibExecution-ProgramTypes-Op-_complete.json",
+      "vanilla_LibExecution-ProgramTypes-Position_simple.json",
+      "vanilla_LibExecution-AnalysisTypes-TraceData_testTraceData.json",
+      // TODO ensure we don't have any unnecesarry ignores here
     ]
     Belt.MutableMap.String.removeMany(processedSerializationFiles, ignores)
 
@@ -175,179 +176,175 @@ let run = () => {
       })
     }
     t(
-      "vanilla_ApiServer-DBs_ApiServer-DBs-DBStatsV1-Params_simple.json",
+      "vanilla_ClientTypes-Api-DB-StatsV1-Request_simple.json",
       APIDBs.DBStats.Params.decode,
       APIDBs.DBStats.Params.encode,
     )
     t(
-      "vanilla_ApiServer-DBs_Microsoft-FSharp-Collections-FSharpMap-2-System-String-ApiServer-DBs-DBStatsV1-Stat-_simple.json",
+      "vanilla_Microsoft-FSharp-Collections-FSharpMap-2-System-String-ClientTypes-Api-DB-StatsV1-Response-Stat-_simple.json",
       APIDBs.DBStats.decode,
       APIDBs.DBStats.encode,
     )
     t(
-      "vanilla_ApiServer-DBs_ApiServer-DBs-Unlocked-T_simple.json",
+      "vanilla_ClientTypes-Api-DB-Unlocked-Response_simple.json",
       APIDBs.UnlockedDBs.decode,
       APIDBs.UnlockedDBs.encode,
     )
     t(
-      "vanilla_ApiServer-Execution_ApiServer-Execution-FunctionV1-Params_simple.json",
+      "vanilla_ClientTypes-Api-Execution-FunctionV1-Request_simple.json",
       APIExecution.Function.Params.decode,
       APIExecution.Function.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Execution_ApiServer-Execution-FunctionV1-T_simple.json",
+      "vanilla_ClientTypes-Api-Execution-FunctionV1-Response_simple.json",
       APIExecution.Function.decode,
       APIExecution.Function.encode,
     )
     t(
-      "vanilla_ApiServer-Execution_ApiServer-Execution-HandlerV1-Params_simple.json",
+      "vanilla_ClientTypes-Api-Execution-HandlerV1-Request_simple.json",
       APIExecution.Handler.Params.decode,
       APIExecution.Handler.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Execution_ApiServer-Execution-HandlerV1-T_simple.json",
+      "vanilla_ClientTypes-Api-Execution-HandlerV1-Response_simple.json",
       APIExecution.Handler.decode,
       APIExecution.Handler.encode,
     )
     t(
-      "vanilla_ApiServer-F404s_ApiServer-F404s-Delete-Params_simple.json",
+      "vanilla_ClientTypes-Api-F404-Delete-Request_simple.json",
       API404.Delete.Params.decode,
       API404.Delete.Params.encode,
     )
     t(
-      "vanilla_ApiServer-F404s_ApiServer-F404s-List-T_simple.json",
+      "vanilla_ClientTypes-Api-F404-List-Response_simple.json",
       API404.List.decode,
       API404.List.encode,
     )
     t(
-      "vanilla_ApiServer-InitialLoad_ApiServer-InitialLoad-V1-T_initial.json",
+      "vanilla_ClientTypes-Api-InitialLoad-V1-Response_initial.json",
       APIInitialLoad.decode,
       APIInitialLoad.encode,
     )
     t(
-      "vanilla_ApiServer-Secrets_ApiServer-Secrets-InsertV1-Secret_simple.json",
+      "vanilla_ClientTypes-Api-Secrets-Secret_simple.json",
       APISecrets.Insert.Params.decode,
       APISecrets.Insert.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Secrets_ApiServer-Secrets-InsertV1-T_simple.json",
+      "vanilla_ClientTypes-Api-Secrets-InsertV1-Response_simple.json",
       APISecrets.Insert.decode,
       APISecrets.Insert.encode,
     )
     t(
-      "vanilla_ApiServer-Toplevels_ApiServer-Toplevels-Delete-Params_simple.json",
+      "vanilla_ClientTypes-Api-Toplevels-Delete-Request_simple.json",
       APIToplevels.DeleteForever.Params.decode,
       APIToplevels.DeleteForever.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Traces_ApiServer-Traces-AllTraces-T_simple.json",
+      "vanilla_ClientTypes-Api-Traces-GetAllTraces-Response_simple.json",
       APITraces.AllTraces.decode,
       APITraces.AllTraces.encode,
     )
     t(
-      "vanilla_ApiServer-Traces_ApiServer-Traces-TraceDataV1-Params_simple.json",
+      "vanilla_ClientTypes-Api-Traces-GetTraceDataV1-Request_simple.json",
       APITraces.TraceData.Params.decode,
       APITraces.TraceData.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Traces_ApiServer-Traces-TraceDataV1-T_simple.json",
+      "vanilla_ClientTypes-Api-Traces-GetTraceDataV1-Response-T_simple.json",
       APITraces.TraceData.decode,
       APITraces.TraceData.encode,
     )
 
     t(
-      "vanilla_ApiServer-Workers_ApiServer-Workers-WorkerStats-Params_simple.json",
+      "vanilla_ClientTypes-Api-Workers-WorkerStats-Request_simple.json",
       APIWorkers.WorkerStats.Params.decode,
       APIWorkers.WorkerStats.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Workers_ApiServer-Workers-WorkerStats-T_simple.json",
+      "vanilla_ClientTypes-Api-Workers-WorkerStats-Response_simple.json",
       APIWorkers.WorkerStats.decode,
       APIWorkers.WorkerStats.encode,
     )
     t(
-      "vanilla_ApiServer-Workers_ApiServer-Workers-Scheduler-Params_simple.json",
+      "vanilla_ClientTypes-Api-Workers-Scheduler-Request_simple.json",
       APIWorkers.Scheduler.Params.decode,
       APIWorkers.Scheduler.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Workers-LibBackend-Pusher_Microsoft-FSharp-Collections-FSharpMap-2-System-String-LibBackend-QueueSchedulingRules-WorkerStates-State-_simple.json",
+      "vanilla_Microsoft-FSharp-Collections-FSharpMap-2-System-String-System-String-_pusher-update-worker-states.json",
       APIWorkers.Scheduler.decode,
       APIWorkers.Scheduler.encode,
     )
     t(
-      "vanilla_ApiServer-Workers-LibBackend-Pusher_Microsoft-FSharp-Collections-FSharpMap-2-System-String-LibBackend-QueueSchedulingRules-WorkerStates-State-_all.json",
+      "vanilla_Microsoft-FSharp-Collections-FSharpMap-2-System-String-System-String-_api-worker-scheduler-response.json",
       APIWorkers.Scheduler.decode,
       APIWorkers.Scheduler.encode,
     )
     t(
-      "vanilla_ApiServer-Tunnels_ApiServer-Tunnels-Register-T_simple.json",
+      "vanilla_ClientTypes-Api-Tunnels-Register-Response_simple.json",
       APITunnelHost.decode,
       APITunnelHost.encode,
     )
     t(
-      "vanilla_ApiServer-Tunnels_ApiServer-Tunnels-Register-Params_simple.json",
+      "vanilla_ClientTypes-Api-Tunnels-Register-Request_simple.json",
       APITunnelHost.Params.decode,
       APITunnelHost.Params.encode,
     )
     t(
-      "vanilla_ApiServer-Tunnels_ApiServer-Tunnels-Register-Params_empty.json",
+      "vanilla_ClientTypes-Api-Tunnels-Register-Request_empty.json",
       APITunnelHost.Params.decode,
       APITunnelHost.Params.encode,
     )
     t(
-      "vanilla_LibAnalysis_ClientTypes-Analysis-PerformAnalysisParams_handler.json",
+      "vanilla_ClientTypes-Analysis-PerformAnalysisParams_handler.json",
       AnalysisTypes.PerformAnalysis.Params.decode,
       AnalysisTypes.PerformAnalysis.Params.encode,
     )
     t(
-      "vanilla_LibAnalysis_ClientTypes-Analysis-PerformAnalysisParams_function.json",
+      "vanilla_ClientTypes-Analysis-PerformAnalysisParams_function.json",
       AnalysisTypes.PerformAnalysis.Params.decode,
       AnalysisTypes.PerformAnalysis.Params.encode,
     )
-    t("vanilla_dvalrepr-tests_ClientTypes-Dval-T_complete.json", RT.Dval.decode, RT.Dval.encode)
+    t("vanilla_ClientTypes-Runtime-Dval-T_complete.json", RT.Dval.decode, RT.Dval.encode)
+    t("vanilla_ClientTypes-Ops-AddOpResultV1_simple.json", APIAddOps.decode, APIAddOps.encode)
     t(
-      "vanilla_ApiServer-AddOps_LibBackend-Op-AddOpResultV1_simple.json",
-      APIAddOps.decode,
-      APIAddOps.encode,
-    )
-    t(
-      "vanilla_ApiServer-AddOps_LibBackend-Op-AddOpParamsV1_simple.json",
+      "vanilla_ClientTypes-Ops-AddOpParamsV1_simple.json",
       APIAddOps.Params.decode,
       APIAddOps.Params.encode,
     )
     t(
-      "vanilla_LibBackend-Pusher_System-Tuple-5-System-String-System-String-System-String-NodaTime-Instant-System-Guid-_simple.json",
+      "vanilla_System-Tuple-5-System-String-System-String-System-String-NodaTime-Instant-System-Guid-_simple.json",
       AnalysisTypes.FourOhFour.decode,
       AnalysisTypes.FourOhFour.encode,
     )
     t(
-      "vanilla_LibBackend-Pusher_System-Tuple-2-System-Guid-Microsoft-FSharp-Collections-FSharpList-1-System-UInt64-_simple.json",
+      "vanilla_System-Tuple-2-System-Guid-Microsoft-FSharp-Collections-FSharpList-1-System-UInt64-_simple.json",
       AnalysisTypes.NewTrace.decode,
       AnalysisTypes.NewTrace.encode,
     )
     t(
-      "vanilla_LibBackend-Pusher_LibBackend-StaticAssets-StaticDeploy_simple.json",
+      "vanilla_ClientTypes-StaticDeploy-T_simple.json",
       StaticAssets.Deploy.decode,
       StaticAssets.Deploy.encode,
     )
     t(
-      "vanilla_LibBackend-Pusher_LibBackend-Op-AddOpEventV1_simple.json",
+      "vanilla_ClientTypes-Pusher-Payload-AddOpV1_simple.json",
       PusherTypes.AddOps.decode,
       PusherTypes.AddOps.encode,
     )
     t(
-      "vanilla_ApiServer-Functions_Microsoft-FSharp-Collections-FSharpList-1-ApiServer-Functions-BuiltInFn-T-_all.json",
+      "vanilla_Microsoft-FSharp-Collections-FSharpList-1-ClientTypes-UI-Functions-BuiltInFn-_all.json",
       Json.Decode.list(RT.BuiltInFn.decode),
       Json.Encode.list(RT.BuiltInFn.encode),
     )
     t(
-      "vanilla_ApiServer-Packages_Microsoft-FSharp-Collections-FSharpList-1-LibExecution-ProgramTypes-Package-Fn-_simple.json",
+      "vanilla_Microsoft-FSharp-Collections-FSharpList-1-ClientTypes-Program-Package-Fn-_simple.json",
       Json.Decode.list(ProgramTypes.Package.Fn.decode),
       Json.Encode.list(ProgramTypes.Package.Fn.encode),
     )
     t(
-      "vanilla_LibAnalysis_Microsoft-FSharp-Core-FSharpResult-2-System-Tuple-4-System-Guid-System-Collections-Generic-Dictionary-2-System-UInt64-ClientTypes-Analysis-ExecutionResult-T-System-Int32-NodaTime-Instant-System-String-_simple.json",
+      "vanilla_Microsoft-FSharp-Core-FSharpResult-2-System-Tuple-4-System-Guid-System-Collections-Generic-Dictionary-2-System-UInt64-ClientTypes-Analysis-ExecutionResult-System-Int32-NodaTime-Instant-System-String-_simple.json",
       Json.Decode.result(AnalysisTypes.PerformAnalysis.Envelope.decode, Json.Decode.string),
       Json.Encode.result(AnalysisTypes.PerformAnalysis.Envelope.encode, Json.Encode.string),
     )

diff --git a/docs/production/kubectl-rollout.md b/docs/production/kubectl-rollout.md
@@ -1,13 +1,20 @@
-kubernetes rollouts
-===================
+# kubernetes rollouts
+
+# deployments
+
+Get a list of Dark deployments with `kubectl get deployments -n darklang`.
+
+Some services (at time of writing, cronchecker) may be outside of the `darklang`
+namespace, so find those with `kubectl get deployments`. Commands below will need
+adjustment for such as well.
 
 ## history
-Use `kubectl rollout history <deployment>` to get
-the history:
+
+Use `kubectl rollout history <deployment>` to get the history:
 
 ```
-dark@dark-dev:~/app$ kubectl rollout history deployment/bwd-deployment
-deployment.extensions/bwd-deployment 
+dark@dark-dev:~/app$ kubectl rollout history -n darklang deployment/bwd-deployment
+deployment.extensions/bwd-deployment
 REVISION  CHANGE-CAUSE
 701       'circle=https://circleci.com/gh/darklang/dark/2276 ; orig-time: Wed Oct 31 23:01:15 UTC 2018'
 703       'circle=https://circleci.com/gh/darklang/dark/2279 ; orig-time: Thu Nov  1 18:33:05 UTC 2018'
@@ -17,6 +24,7 @@ REVISION  CHANGE-CAUSE
 ```
 
 ## undo
+
 `kubectl rollout undo <deployment> --to-revision=N`
 Note that, as above, rolling back to revision N will create a new revision,
 _and_ remove N from the revision history.
@@ -25,6 +33,7 @@ If you do this, you'll likely also want to use `kubectl rollout pause` until
 CI/CD is fixed.
 
 ## pause and resume
+
 `kubectl rollout pause <deployment>` will prevent any further changes to the
 spec from taking effect (that is, `kubectl apply` and `kubectl set image` will
 still run successfully, but they will not scale up).

diff --git a/fsharp-backend/fsbinaries.sln b/fsharp-backend/fsbinaries.sln
@@ -56,6 +56,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibAnalysis", "src\LibAnaly
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ClientTypes", "src\ClientTypes\ClientTypes.fsproj", "{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ClientTypes2ExecutionTypes", "src\ClientTypes2ExecutionTypes\ClientTypes2ExecutionTypes.fsproj", "{BB90A7BB-2276-483B-BF83-32B2DE3F4436}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ClientTypes2BackendTypes", "src\ClientTypes2ExecutionTypes\ClientTypes2ExecutionTypes.fsproj", "{45B04553-C8BF-4966-AC17-52C1533f98FB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -309,6 +313,19 @@ Global
 		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|x64.Build.0 = Release|Any CPU
 		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|x86.ActiveCfg = Release|Any CPU
 		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|x86.Build.0 = Release|Any CPU
+
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Release|x64.Build.0 = Release|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB90A7BB-2276-483B-BF83-32B2DE3F4436}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B56110F0-2D27-4718-8C80-E7FDE3439A63} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
@@ -330,5 +347,7 @@ Global
 		{5830D9BF-CA28-47B0-964F-343FAB28751B} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{7C0939B2-2AD9-4556-B005-ADD512F2456B} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+    {BB90A7BB-2276-483B-BF83-32B2DE3F4436} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+    {45B04553-C8BF-4966-AC17-52C1533f98FB} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 	EndGlobalSection
 EndGlobal
diff --git a/fsharp-backend/fsdark.sln b/fsharp-backend/fsdark.sln
@@ -58,6 +58,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibAnalysis", "src\LibAnaly
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ClientTypes", "src\ClientTypes\ClientTypes.fsproj", "{298758A3-E968-4DBC-A83B-F045E6767CB4}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ClientTypes2ExecutionTypes", "src\ClientTypes2ExecutionTypes\ClientTypes2ExecutionTypes.fsproj", "{BB90A7BB-2276-483B-BF83-32B2DE3F4436}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ClientTypes2BackendTypes", "src\ClientTypes2ExecutionTypes\ClientTypes2ExecutionTypes.fsproj", "{45B04553-C8BF-4966-AC17-52C1533f98FB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -323,6 +327,18 @@ Global
 		{298758A3-E968-4DBC-A83B-F045E6767CB4}.Release|x64.Build.0 = Release|Any CPU
 		{298758A3-E968-4DBC-A83B-F045E6767CB4}.Release|x86.ActiveCfg = Release|Any CPU
 		{298758A3-E968-4DBC-A83B-F045E6767CB4}.Release|x86.Build.0 = Release|Any CPU
+    {EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Debug|x64.Build.0 = Debug|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Debug|x86.Build.0 = Debug|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|x64.ActiveCfg = Release|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|x64.Build.0 = Release|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|x86.ActiveCfg = Release|Any CPU
+		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B56110F0-2D27-4718-8C80-E7FDE3439A63} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
@@ -345,5 +361,7 @@ Global
 		{5830D9BF-CA28-47B0-964F-343FAB28751B} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{5A7E2A40-18EB-4BF9-8CF7-7A2545DD1F0B} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{298758A3-E968-4DBC-A83B-F045E6767CB4} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+    {BB90A7BB-2276-483B-BF83-32B2DE3F4436} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+    {45B04553-C8BF-4966-AC17-52C1533f98FB} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 	EndGlobalSection
 EndGlobal