darklang · StachuDotNet · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023 · Oct 8, 2023
diff --git a/backend/experiments/BwdDangerServer/DangerExecution.fs b/backend/experiments/BwdDangerServer/DangerExecution.fs
@@ -10,7 +10,6 @@ open Prelude
 
 module RT = LibExecution.RuntimeTypes
 module VT = RT.ValueType
-module Dval = LibExecution.Dval
 module PT = LibExecution.ProgramTypes
 module PT2RT = LibExecution.ProgramTypesToRuntimeTypes
 module AT = LibExecution.AnalysisTypes
@@ -148,7 +147,7 @@ let executeHandler
 
       let fields : List<string * RT.Dval> =
         [ "statusCode", RT.DInt 500
-          "headers", Dval.list (RT.KTTuple(VT.string, VT.string, [])) []
+          "headers", RT.Dval.list (RT.KTTuple(VT.string, VT.string, [])) []
           "body", RT.DBytes(UTF8.toBytes msg) ]
 
       RT.DRecord(typeName, typeName, [], Map fields)

diff --git a/backend/experiments/BwdDangerServer/Libs/Experiments.fs b/backend/experiments/BwdDangerServer/Libs/Experiments.fs
@@ -8,7 +8,6 @@ open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
 module VT = ValueType
-module Dval = LibExecution.Dval
 module PT2RT = LibExecution.ProgramTypesToRuntimeTypes
 
 // This makes extra careful that we're only accessing files where we expect to

diff --git a/backend/src/BuiltinCli/Libs/Directory.fs b/backend/src/BuiltinCli/Libs/Directory.fs
@@ -7,7 +7,6 @@ open FSharp.Control.Tasks
 open Prelude
 open LibExecution.RuntimeTypes
 module VT = ValueType
-module Dval = LibExecution.Dval
 module Builtin = LibExecution.Builtin
 open Builtin.Shortcuts
 

diff --git a/backend/src/BuiltinCli/Libs/Environment.fs b/backend/src/BuiltinCli/Libs/Environment.fs
@@ -7,8 +7,6 @@ open FSharp.Control.Tasks
 open Prelude
 open LibExecution.RuntimeTypes
 
-module VT = ValueType
-module Dval = LibExecution.Dval
 module Builtin = LibExecution.Builtin
 open Builtin.Shortcuts
 

diff --git a/backend/src/BuiltinCli/Libs/File.fs b/backend/src/BuiltinCli/Libs/File.fs
@@ -6,8 +6,6 @@ open FSharp.Control.Tasks
 
 open Prelude
 open LibExecution.RuntimeTypes
-module VT = ValueType
-module Dval = LibExecution.Dval
 module Builtin = LibExecution.Builtin
 open Builtin.Shortcuts
 

diff --git a/backend/src/BuiltinCli/Libs/Process.fs b/backend/src/BuiltinCli/Libs/Process.fs
@@ -7,7 +7,6 @@ open FSharp.Control.Tasks
 open Prelude
 open LibExecution.RuntimeTypes
 
-module Dval = LibExecution.Dval
 module Builtin = LibExecution.Builtin
 open Builtin.Shortcuts
 

diff --git a/backend/src/BuiltinCliHost/Libs/Cli.fs b/backend/src/BuiltinCliHost/Libs/Cli.fs
@@ -11,7 +11,6 @@ open LibExecution.Builtin.Shortcuts
 module PT = LibExecution.ProgramTypes
 module RT = LibExecution.RuntimeTypes
 module VT = RT.ValueType
-module Dval = LibExecution.Dval
 module PT2RT = LibExecution.ProgramTypesToRuntimeTypes
 module RT2DT = LibExecution.RuntimeTypesToDarkTypes
 module Exe = LibExecution.Execution

diff --git a/backend/src/BuiltinCloudExecution/Libs/DB.fs b/backend/src/BuiltinCloudExecution/Libs/DB.fs
@@ -6,8 +6,8 @@ open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
 module VT = ValueType
-module Dval = LibExecution.Dval
 module TypeChecker = LibExecution.TypeChecker
+module Dval = LibExecution.Dval
 
 module UserDB = LibCloud.UserDB
 module Db = LibCloud.Db
@@ -81,7 +81,7 @@ let fns : List<BuiltInFn> =
           uply {
             let db = state.program.dbs[dbname]
             let! result = UserDB.getOption state db key
-            return TypeChecker.DvalCreator.option VT.unknownDbTODO result
+            return Dval.checkedOption VT.unknownDbTODO result
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotQueryable
@@ -111,10 +111,7 @@ let fns : List<BuiltInFn> =
               |> UserDB.getMany state db
 
             if List.length items = List.length keys then
-              return
-                items
-                |> TypeChecker.DvalCreator.list valueType
-                |> Dval.optionSome optType
+              return items |> Dval.checkedList valueType |> Dval.optionSome optType
             else
               return Dval.optionNone optType
           }
@@ -142,7 +139,7 @@ let fns : List<BuiltInFn> =
                 | DString s -> s
                 | dv -> Exception.raiseInternal "keys aren't strings" [ "key", dv ])
               |> UserDB.getMany state db
-            return result |> TypeChecker.DvalCreator.list VT.unknownDbTODO
+            return result |> Dval.checkedList VT.unknownDbTODO
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotQueryable
@@ -167,7 +164,7 @@ let fns : List<BuiltInFn> =
                 | DString s -> s
                 | dv -> Exception.raiseInternal "keys aren't strings" [ "key", dv ])
               |> UserDB.getManyWithKeys state db
-            return TypeChecker.DvalCreator.dict VT.unknownDbTODO result
+            return Dval.checkedDict VT.unknownDbTODO result
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotQueryable
@@ -224,10 +221,7 @@ let fns : List<BuiltInFn> =
           uply {
             let db = state.program.dbs[dbname]
             let! results = UserDB.getAll state db
-            return
-              results
-              |> List.map snd
-              |> TypeChecker.DvalCreator.list VT.unknownDbTODO
+            return results |> List.map snd |> Dval.checkedList VT.unknownDbTODO
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotQueryable
@@ -247,7 +241,7 @@ let fns : List<BuiltInFn> =
           uply {
             let db = state.program.dbs[dbname]
             let! result = UserDB.getAll state db
-            return TypeChecker.DvalCreator.dict VT.unknownDbTODO result
+            return Dval.checkedDict VT.unknownDbTODO result
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotQueryable
@@ -322,8 +316,7 @@ let fns : List<BuiltInFn> =
               let db = state.program.dbs[dbname]
               let! results = UserDB.queryValues state db b
               match results with
-              | Ok results ->
-                return results |> TypeChecker.DvalCreator.list VT.unknownDbTODO
+              | Ok results -> return results |> Dval.checkedList VT.unknownDbTODO
               | Error rte -> return raiseUntargetedRTE rte
             with e ->
               return handleUnexpectedExceptionDuringQuery state dbname b e
@@ -348,8 +341,7 @@ let fns : List<BuiltInFn> =
               let db = state.program.dbs[dbname]
               let! results = UserDB.query state db b
               match results with
-              | Ok results ->
-                return TypeChecker.DvalCreator.dict VT.unknownDbTODO results
+              | Ok results -> return Dval.checkedDict VT.unknownDbTODO results
               | Error rte -> return raiseUntargetedRTE rte
             with e ->
               return handleUnexpectedExceptionDuringQuery state dbname b e
@@ -376,8 +368,8 @@ let fns : List<BuiltInFn> =
               let! results = UserDB.query state db b
 
               match results with
-              | Ok [ (_, v) ] -> return TypeChecker.DvalCreator.optionSome optType v
-              | Ok _ -> return TypeChecker.DvalCreator.optionNone optType
+              | Ok [ (_, v) ] -> return Dval.checkedOptionSome optType v
+              | Ok _ -> return Dval.checkedOptionNone optType
               | Error rte -> return raiseUntargetedRTE rte
             with e ->
               return handleUnexpectedExceptionDuringQuery state dbname b e
@@ -405,11 +397,8 @@ let fns : List<BuiltInFn> =
 
               match results with
               | Ok [ (key, dv) ] ->
-                return
-                  TypeChecker.DvalCreator.optionSome
-                    optType
-                    (DTuple(DString key, dv, []))
-              | Ok _ -> return TypeChecker.DvalCreator.optionNone optType
+                return Dval.checkedOptionSome optType (DTuple(DString key, dv, []))
+              | Ok _ -> return Dval.checkedOptionNone optType
               | Error rte -> return raiseUntargetedRTE rte
             with e ->
               return handleUnexpectedExceptionDuringQuery state dbname b e

diff --git a/backend/src/BuiltinDarkInternal/Libs/Canvases.fs b/backend/src/BuiltinDarkInternal/Libs/Canvases.fs
@@ -9,7 +9,6 @@ open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
 module VT = ValueType
-module Dval = LibExecution.Dval
 module PT = LibExecution.ProgramTypes
 module Canvas = LibCloud.Canvas
 module Serialize = LibCloud.Serialize

diff --git a/backend/src/BuiltinDarkInternal/Libs/DBs.fs b/backend/src/BuiltinDarkInternal/Libs/DBs.fs
@@ -7,7 +7,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module Dval = LibExecution.Dval
 module UserDB = LibCloud.UserDB
 
 let modules = [ "DarkInternal"; "Canvas"; "DB" ]

diff --git a/backend/src/BuiltinDarkInternal/Libs/Documentation.fs b/backend/src/BuiltinDarkInternal/Libs/Documentation.fs
@@ -9,7 +9,6 @@ open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
 module VT = ValueType
-module Dval = LibExecution.Dval
 
 let modules = [ "DarkInternal"; "Documentation" ]
 

diff --git a/backend/src/BuiltinDarkInternal/Libs/Domains.fs b/backend/src/BuiltinDarkInternal/Libs/Domains.fs
@@ -7,8 +7,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module VT = ValueType
-module Dval = LibExecution.Dval
 module Canvas = LibCloud.Canvas
 
 let modules = [ "DarkInternal"; "Canvas"; "Domain" ]

diff --git a/backend/src/BuiltinDarkInternal/Libs/Infra.fs b/backend/src/BuiltinDarkInternal/Libs/Infra.fs
@@ -7,8 +7,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module VT = ValueType
-module Dval = LibExecution.Dval
 module DvalReprDeveloper = LibExecution.DvalReprDeveloper
 module Telemetry = LibService.Telemetry
 

diff --git a/backend/src/BuiltinDarkInternal/Libs/Secrets.fs b/backend/src/BuiltinDarkInternal/Libs/Secrets.fs
@@ -7,8 +7,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module VT = ValueType
-module Dval = LibExecution.Dval
 module Secret = LibCloud.Secret
 
 

diff --git a/backend/src/BuiltinDarkInternal/Libs/Workers.fs b/backend/src/BuiltinDarkInternal/Libs/Workers.fs
@@ -8,7 +8,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module Dval = LibExecution.Dval
 module DarkDateTime = LibExecution.DarkDateTime
 module SchedulingRules = LibCloud.QueueSchedulingRules
 module Pusher = LibCloud.Pusher

diff --git a/backend/src/BuiltinExecution/Libs/Base64.fs b/backend/src/BuiltinExecution/Libs/Base64.fs
@@ -9,7 +9,6 @@ open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
 module VT = ValueType
-module Dval = LibExecution.Dval
 
 
 let types : List<BuiltInType> = []

diff --git a/backend/src/BuiltinExecution/Libs/Bytes.fs b/backend/src/BuiltinExecution/Libs/Bytes.fs
@@ -8,8 +8,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module Dval = LibExecution.Dval
-
 let types : List<BuiltInType> = []
 
 let modules = [ "Bytes" ]

diff --git a/backend/src/BuiltinExecution/Libs/Char.fs b/backend/src/BuiltinExecution/Libs/Char.fs
@@ -8,9 +8,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module VT = ValueType
-module Dval = LibExecution.Dval
-
 
 let types : List<BuiltInType> = []
 let constants : List<BuiltInConstant> = []

diff --git a/backend/src/BuiltinExecution/Libs/DateTime.fs b/backend/src/BuiltinExecution/Libs/DateTime.fs
@@ -5,8 +5,6 @@ type Instant = NodaTime.Instant
 open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
-module VT = ValueType
-module Dval = LibExecution.Dval
 module DarkDateTime = LibExecution.DarkDateTime
 
 let ISO8601Format = "yyyy-MM-ddTHH:mm:ssZ"

diff --git a/backend/src/BuiltinExecution/Libs/Dict.fs b/backend/src/BuiltinExecution/Libs/Dict.fs
@@ -7,9 +7,9 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 module TypeChecker = LibExecution.TypeChecker
+module Dval = LibExecution.Dval
 
 module VT = ValueType
-module Dval = LibExecution.Dval
 module Interpreter = LibExecution.Interpreter
 
 let varA = TVariable "a"
@@ -116,7 +116,7 @@ let fns : List<BuiltInFn> =
                 [ "dval", dv ]
 
           List.fold f Map.empty l
-          |> TypeChecker.DvalCreator.dictFromMap VT.unknownTODO
+          |> Dval.checkedDictFromMap VT.unknownTODO
           |> Ply
         | _ -> incorrectArgs ())
       sqlSpec = NotYetImplemented
@@ -155,10 +155,8 @@ let fns : List<BuiltInFn> =
 
           match result with
           | Some entries ->
-            DDict(dictType, entries)
-            |> TypeChecker.DvalCreator.optionSome optType
-            |> Ply
-          | None -> TypeChecker.DvalCreator.optionNone optType |> Ply
+            DDict(dictType, entries) |> Dval.checkedOptionSome optType |> Ply
+          | None -> Dval.checkedOptionNone optType |> Ply
         | _ -> incorrectArgs ())
       sqlSpec = NotYetImplemented
       previewable = Pure
@@ -175,7 +173,7 @@ let fns : List<BuiltInFn> =
       fn =
         (function
         | _, _, [ DDict(_vtTODO, o); DString s ] ->
-          Map.find s o |> TypeChecker.DvalCreator.option VT.unknownTODO |> Ply
+          Map.find s o |> Dval.checkedOption VT.unknownTODO |> Ply
         | _ -> incorrectArgs ())
       sqlSpec = NotYetImplemented
       previewable = Pure
@@ -227,7 +225,7 @@ let fns : List<BuiltInFn> =
                   Interpreter.applyFnVal state state.caller b [] args)
                 mapped
 
-            return TypeChecker.DvalCreator.dictFromMap VT.unknownTODO result
+            return Dval.checkedDictFromMap VT.unknownTODO result
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotYetImplemented
@@ -301,7 +299,7 @@ let fns : List<BuiltInFn> =
                     TypeChecker.raiseFnValResultNotExpectedType state.caller v TBool
               }
             let! result = Ply.Map.filterSequentially f o
-            return TypeChecker.DvalCreator.dictFromMap VT.unknownTODO result
+            return Dval.checkedDictFromMap VT.unknownTODO result
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotYetImplemented
@@ -360,7 +358,7 @@ let fns : List<BuiltInFn> =
               }
 
             let! result = Ply.Map.filterMapSequentially f o
-            return TypeChecker.DvalCreator.dictFromMap VT.unknownTODO result
+            return Dval.checkedDictFromMap VT.unknownTODO result
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotYetImplemented
@@ -392,7 +390,7 @@ let fns : List<BuiltInFn> =
         (function
         | _, _, [ DDict(_vtTODO1, l); DDict(_vtTODO2, r) ] ->
           Map.mergeFavoringRight l r
-          |> TypeChecker.DvalCreator.dictFromMap VT.unknownTODO
+          |> Dval.checkedDictFromMap VT.unknownTODO
           |> Ply
         | _ -> incorrectArgs ())
       sqlSpec = NotYetImplemented

diff --git a/backend/src/BuiltinExecution/Libs/Float.fs b/backend/src/BuiltinExecution/Libs/Float.fs
@@ -6,9 +6,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module VT = ValueType
-module Dval = LibExecution.Dval
-
 let types : List<BuiltInType> = []
 let constants : List<BuiltInConstant> = []
 

diff --git a/backend/src/BuiltinExecution/Libs/Int.fs b/backend/src/BuiltinExecution/Libs/Int.fs
@@ -9,9 +9,6 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module VT = ValueType
-module Dval = LibExecution.Dval
-
 let types : List<BuiltInType> = []
 let constants : List<BuiltInConstant> = []