wip

darklang · Apr 9, 2024 · 7f356c7 · 7f356c7
1 parent 952428e
commit 7f356c7
Show file tree

Hide file tree

Showing 87 changed files with 4,895 additions and 4,518 deletions.
diff --git a/backend/fsdark.sln b/backend/fsdark.sln
@@ -64,6 +64,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuiltinCliHost", "src\Built
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibTreeSitter", "src\LibTreeSitter\LibTreeSitter.fsproj", "{625B113A-D5DC-40A5-B833-4BA342AB4936}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuiltinPackagesOnDisk", "src\BuiltinPackagesOnDisk\BuiltinPackagesOnDisk.fsproj", "{D826D495-2AFF-4895-B216-5E8A1344609E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -377,6 +379,18 @@ Global
 		{625B113A-D5DC-40A5-B833-4BA342AB4936}.Release|x64.Build.0 = Release|Any CPU
 		{625B113A-D5DC-40A5-B833-4BA342AB4936}.Release|x86.ActiveCfg = Release|Any CPU
 		{625B113A-D5DC-40A5-B833-4BA342AB4936}.Release|x86.Build.0 = Release|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Debug|x64.Build.0 = Debug|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Debug|x86.Build.0 = Debug|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Release|x64.ActiveCfg = Release|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Release|x64.Build.0 = Release|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Release|x86.ActiveCfg = Release|Any CPU
+		{D826D495-2AFF-4895-B216-5E8A1344609E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B56110F0-2D27-4718-8C80-E7FDE3439A63} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
@@ -402,5 +416,6 @@ Global
 		{A74049E0-AD31-407B-9918-6A6A76C945C9} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{B199C1DE-48A2-47B4-9672-BCCB7E4F8C78} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{625B113A-D5DC-40A5-B833-4BA342AB4936} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+		{D826D495-2AFF-4895-B216-5E8A1344609E} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 	EndGlobalSection
 EndGlobal
diff --git a/backend/src/BuiltinCli/Libs/Directory.fs b/backend/src/BuiltinCli/Libs/Directory.fs
@@ -101,5 +101,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCli/Libs/Environment.fs b/backend/src/BuiltinCli/Libs/Environment.fs
@@ -62,4 +62,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCli/Libs/Execution.fs b/backend/src/BuiltinCli/Libs/Execution.fs
@@ -75,4 +75,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 let constants : List<BuiltInConstant> = []
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCli/Libs/File.fs b/backend/src/BuiltinCli/Libs/File.fs
@@ -244,4 +244,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCli/Libs/LanguageServerProtocol.fs b/backend/src/BuiltinCli/Libs/LanguageServerProtocol.fs
@@ -112,4 +112,4 @@ let fns : List<BuiltInFn> =
 *)
 
 
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCli/Libs/Output.fs b/backend/src/BuiltinCli/Libs/Output.fs
@@ -66,4 +66,4 @@ let fns : List<BuiltInFn> =
     ]
 
 
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCli/Libs/Stdin.fs b/backend/src/BuiltinCli/Libs/Stdin.fs
@@ -29,4 +29,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCli/Libs/Time.fs b/backend/src/BuiltinCli/Libs/Time.fs
@@ -32,4 +32,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents : Builtin.Contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCliHost/BuiltinCliHost.fsproj b/backend/src/BuiltinCliHost/BuiltinCliHost.fsproj
@@ -16,8 +16,11 @@
     <ProjectReference Include="../Prelude/Prelude.fsproj" />
     <ProjectReference Include="../LibExecution/LibExecution.fsproj" />
     <ProjectReference Include="../LibParser/LibParser.fsproj" />
+
     <ProjectReference Include="../BuiltinExecution/BuiltinExecution.fsproj" />
     <ProjectReference Include="../BuiltinCli/BuiltinCli.fsproj" />
+    <ProjectReference Include="../BuiltinPackagesOnDisk/BuiltinPackagesOnDisk.fsproj" />
+
     <ProjectReference Include="../LibPackageManager/LibPackageManager.fsproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />

diff --git a/backend/src/BuiltinCliHost/Libs/Cli.fs b/backend/src/BuiltinCliHost/Libs/Cli.fs
@@ -71,10 +71,12 @@ module CliRuntimeError =
 let libExecutionContents =
   BuiltinExecution.Builtin.contents BuiltinExecution.Libs.HttpClient.defaultConfig
 
-let builtIns : RT.BuiltIns =
+let builtIns : RT.Builtins =
   let (fns, constants) =
     LibExecution.Builtin.combine
-      [ libExecutionContents; BuiltinCli.Builtin.contents ]
+      [ libExecutionContents
+        BuiltinCli.Builtin.contents
+        BuiltinPackagesOnDisk.Builtin.contents ]
       []
   { fns = fns |> Map.fromListBy _.name
     constants = constants |> Map.fromListBy _.name }
@@ -456,4 +458,4 @@ let fns : List<BuiltInFn> =
     ]
 
 let constants : List<BuiltInConstant> = []
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCloudExecution/Libs/DB.fs b/backend/src/BuiltinCloudExecution/Libs/DB.fs
@@ -442,4 +442,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinCloudExecution/Libs/Event.fs b/backend/src/BuiltinCloudExecution/Libs/Event.fs
@@ -38,4 +38,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/Canvases.fs b/backend/src/BuiltinDarkInternal/Libs/Canvases.fs
@@ -210,4 +210,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/DBs.fs b/backend/src/BuiltinDarkInternal/Libs/DBs.fs
@@ -50,4 +50,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/Domains.fs b/backend/src/BuiltinDarkInternal/Libs/Domains.fs
@@ -55,4 +55,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/F404s.fs b/backend/src/BuiltinDarkInternal/Libs/F404s.fs
@@ -64,4 +64,4 @@ let fns : List<BuiltInFn> = []
 //     previewable = Impure
 //     deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/Infra.fs b/backend/src/BuiltinDarkInternal/Libs/Infra.fs
@@ -134,4 +134,4 @@ human-readable data."
       deprecated = NotDeprecated } ]
 
 let constants : List<BuiltInConstant> = []
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/Secrets.fs b/backend/src/BuiltinDarkInternal/Libs/Secrets.fs
@@ -99,4 +99,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/Users.fs b/backend/src/BuiltinDarkInternal/Libs/Users.fs
@@ -29,4 +29,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinDarkInternal/Libs/Workers.fs b/backend/src/BuiltinDarkInternal/Libs/Workers.fs
@@ -143,4 +143,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 let constants : List<BuiltInConstant> = []
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Builtin.fs b/backend/src/BuiltinExecution/Builtin.fs
@@ -10,7 +10,7 @@ let fnRenames =
   // eg: fn "Http" "respond" 0, fn "Http" "response" 0
   []
 
-let contents (httpConfig : Libs.HttpClient.Configuration) : Builtin.Contents =
+let contents (httpConfig : Libs.HttpClient.Configuration) : Builtins =
   Builtin.combine
     [ Libs.Bool.contents
       Libs.Base64.contents

diff --git a/backend/src/BuiltinExecution/Libs/AltJson.fs b/backend/src/BuiltinExecution/Libs/AltJson.fs
@@ -228,4 +228,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Base64.fs b/backend/src/BuiltinExecution/Libs/Base64.fs
@@ -13,8 +13,6 @@ module Dval = LibExecution.Dval
 
 let constants : List<BuiltInConstant> = []
 
-
-
 let fns : List<BuiltInFn> =
   [ { name = fn "base64Decode" 0
       typeParams = []
@@ -102,4 +100,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Bool.fs b/backend/src/BuiltinExecution/Libs/Bool.fs
@@ -28,4 +28,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Bytes.fs b/backend/src/BuiltinExecution/Libs/Bytes.fs
@@ -44,4 +44,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Char.fs b/backend/src/BuiltinExecution/Libs/Char.fs
@@ -138,4 +138,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Crypto.fs b/backend/src/BuiltinExecution/Libs/Crypto.fs
@@ -113,4 +113,4 @@ let fns : List<BuiltInFn> =
       previewable = ImpurePreviewable
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/DateTime.fs b/backend/src/BuiltinExecution/Libs/DateTime.fs
@@ -397,4 +397,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Dict.fs b/backend/src/BuiltinExecution/Libs/Dict.fs
@@ -428,4 +428,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Float.fs b/backend/src/BuiltinExecution/Libs/Float.fs
@@ -347,4 +347,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Int128.fs b/backend/src/BuiltinExecution/Libs/Int128.fs
@@ -472,4 +472,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Int16.fs b/backend/src/BuiltinExecution/Libs/Int16.fs
@@ -567,4 +567,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Int32.fs b/backend/src/BuiltinExecution/Libs/Int32.fs
@@ -521,4 +521,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Int64.fs b/backend/src/BuiltinExecution/Libs/Int64.fs
@@ -576,4 +576,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Int8.fs b/backend/src/BuiltinExecution/Libs/Int8.fs
@@ -576,4 +576,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Json.fs b/backend/src/BuiltinExecution/Libs/Json.fs
@@ -861,4 +861,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/LanguageTools.fs b/backend/src/BuiltinExecution/Libs/LanguageTools.fs
@@ -65,4 +65,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/List.fs b/backend/src/BuiltinExecution/Libs/List.fs
@@ -699,4 +699,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Math.fs b/backend/src/BuiltinExecution/Libs/Math.fs
@@ -211,4 +211,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/NoModule.fs b/backend/src/BuiltinExecution/Libs/NoModule.fs
@@ -429,4 +429,4 @@ let fns : List<BuiltInFn> =
       deprecated = NotDeprecated } ]
 
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Parser.fs b/backend/src/BuiltinExecution/Libs/Parser.fs
@@ -111,4 +111,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/String.fs b/backend/src/BuiltinExecution/Libs/String.fs
@@ -485,4 +485,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/UInt128.fs b/backend/src/BuiltinExecution/Libs/UInt128.fs
@@ -353,4 +353,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/UInt16.fs b/backend/src/BuiltinExecution/Libs/UInt16.fs
@@ -520,4 +520,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/UInt32.fs b/backend/src/BuiltinExecution/Libs/UInt32.fs
@@ -513,4 +513,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/UInt64.fs b/backend/src/BuiltinExecution/Libs/UInt64.fs
@@ -504,4 +504,4 @@ let fns : List<BuiltInFn> =
       previewable = Pure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/UInt8.fs b/backend/src/BuiltinExecution/Libs/UInt8.fs
@@ -506,4 +506,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/Uuid.fs b/backend/src/BuiltinExecution/Libs/Uuid.fs
@@ -93,4 +93,4 @@ let fns : List<BuiltInFn> =
 
     ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinExecution/Libs/X509.fs b/backend/src/BuiltinExecution/Libs/X509.fs
@@ -57,4 +57,4 @@ let fns : List<BuiltInFn> =
       previewable = Impure
       deprecated = NotDeprecated } ]
 
-let contents = (fns, constants)
+let contents : Builtins = Builtin.fromContents constants fns
diff --git a/backend/src/BuiltinPackagesOnDisk/Builtin.fs b/backend/src/BuiltinPackagesOnDisk/Builtin.fs
@@ -0,0 +1,14 @@
+module BuiltinPackagesOnDisk.Builtin
+
+open Prelude
+open LibExecution.RuntimeTypes
+
+module Builtin = LibExecution.Builtin
+
+
+let fnRenames : Builtin.FnRenames =
+  // old names, new names
+  // eg: fn "Http" "respond" 0, fn "Http" "response" 0
+  []
+
+let contents = Builtin.combine [ Libs.Packages.contents ] fnRenames