uncomment more builtins

darklang · Sep 18, 2024 · 4299937 · 4299937
1 parent c26872a
commit 4299937
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 51 deletions.
diff --git a/backend/fsdark.sln b/backend/fsdark.sln
@@ -25,8 +25,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Prelude", "src\Prelude\Prel
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibExecution", "src\LibExecution\LibExecution.fsproj", "{D8ECA989-4383-47D3-B443-4D7BFF1F05E7}"
 EndProject
-#Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibParser", "src\LibParser\LibParser.fsproj", "{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}"
-#EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibParser", "src\LibParser\LibParser.fsproj", "{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}"
+EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibTreeSitter", "src\LibTreeSitter\LibTreeSitter.fsproj", "{625B113A-D5DC-40A5-B833-4BA342AB4936}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuiltinExecution", "src\BuiltinExecution\BuiltinExecution.fsproj", "{BBFC824F-A0DE-4A28-B82F-49C04EBA7475}"
@@ -37,12 +37,12 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibBinarySerialization", "s
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibService", "src\LibService\LibService.fsproj", "{824DD2A5-7F01-4A8A-9ABD-9F91F52582AD}"
 EndProject
-#Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuiltinCloudExecution", "src\BuiltinCloudExecution\BuiltinCloudExecution.fsproj", "{82CA75E9-53BD-4324-B86B-44F280BAF331}"
-#EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuiltinCloudExecution", "src\BuiltinCloudExecution\BuiltinCloudExecution.fsproj", "{82CA75E9-53BD-4324-B86B-44F280BAF331}"
+EndProject
 #Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibCloudExecution", "src\LibCloudExecution\LibCloudExecution.fsproj", "{FA55A52D-B880-4931-A121-85C8DAD8DD28}"
 #EndProject
-#Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuiltinDarkInternal", "src\BuiltinDarkInternal\BuiltinDarkInternal.fsproj", "{B6933551-A7A3-4A85-BEF4-43214ABB04DF}"
-#EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BuiltinDarkInternal", "src\BuiltinDarkInternal\BuiltinDarkInternal.fsproj", "{B6933551-A7A3-4A85-BEF4-43214ABB04DF}"
+EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LibCloud", "src\LibCloud\LibCloud.fsproj", "{3FC57943-9D51-49AE-9FBD-4A112B4F68D6}"
 EndProject
 #Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "QueueWorker", "src\QueueWorker\QueueWorker.fsproj", "{36E1611F-55E4-4DFE-BB04-913FEA9950ED}"
@@ -129,10 +129,10 @@ Global
 		#{36E1611F-55E4-4DFE-BB04-913FEA9950ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		#{36E1611F-55E4-4DFE-BB04-913FEA9950ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		#{36E1611F-55E4-4DFE-BB04-913FEA9950ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		#{82CA75E9-53BD-4324-B86B-44F280BAF331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		#{82CA75E9-53BD-4324-B86B-44F280BAF331}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		#{82CA75E9-53BD-4324-B86B-44F280BAF331}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		#{82CA75E9-53BD-4324-B86B-44F280BAF331}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82CA75E9-53BD-4324-B86B-44F280BAF331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82CA75E9-53BD-4324-B86B-44F280BAF331}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82CA75E9-53BD-4324-B86B-44F280BAF331}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82CA75E9-53BD-4324-B86B-44F280BAF331}.Release|Any CPU.Build.0 = Release|Any CPU
 		#{DAE2B2E9-40AF-4D99-A5B0-79678F94BFDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		#{DAE2B2E9-40AF-4D99-A5B0-79678F94BFDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		#{DAE2B2E9-40AF-4D99-A5B0-79678F94BFDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -153,10 +153,10 @@ Global
 		{EDAB6E2C-A0C9-4C66-A9AB-D07FB64EA4A8}.Debug|Any CPU.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
-		#{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		#{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		#{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		#{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D8F42D9-28BA-4D96-A340-52B38E8F47DD}.Release|Any CPU.Build.0 = Release|Any CPU
 		#{DF812CBE-894C-4C90-9EDC-4558983CCDEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		#{DF812CBE-894C-4C90-9EDC-4558983CCDEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		#{DF812CBE-894C-4C90-9EDC-4558983CCDEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -173,10 +173,10 @@ Global
 		#{A44BDF6D-0D93-4AA4-9DFA-F48365A31B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		#{A44BDF6D-0D93-4AA4-9DFA-F48365A31B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		#{A44BDF6D-0D93-4AA4-9DFA-F48365A31B26}.Release|Any CPU.Build.0 = Release|Any CPU
-		#{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		#{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		#{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		#{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6933551-A7A3-4A85-BEF4-43214ABB04DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		#{A74049E0-AD31-407B-9918-6A6A76C945C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		#{A74049E0-AD31-407B-9918-6A6A76C945C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		#{A74049E0-AD31-407B-9918-6A6A76C945C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -202,16 +202,16 @@ Global
 		{824DD2A5-7F01-4A8A-9ABD-9F91F52582AD} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{FA55A52D-B880-4931-A121-85C8DAD8DD28} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{36E1611F-55E4-4DFE-BB04-913FEA9950ED} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
-		#{82CA75E9-53BD-4324-B86B-44F280BAF331} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+		{82CA75E9-53BD-4324-B86B-44F280BAF331} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{DAE2B2E9-40AF-4D99-A5B0-79678F94BFDA} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{00488B6E-9BB3-49AA-AE42-C120799D803C} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{E30A79CB-BBB2-4B47-9170-A11DF11BD28C} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{5830D9BF-CA28-47B0-964F-343FAB28751B} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
-		#{4D8F42D9-28BA-4D96-A340-52B38E8F47DD} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+		{4D8F42D9-28BA-4D96-A340-52B38E8F47DD} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{DF812CBE-894C-4C90-9EDC-4558983CCDEA} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{FC9D3B85-2CD6-4A5C-B853-BCE770F76FC6} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{A44BDF6D-0D93-4AA4-9DFA-F48365A31B26} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
-		#{B6933551-A7A3-4A85-BEF4-43214ABB04DF} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
+		{B6933551-A7A3-4A85-BEF4-43214ABB04DF} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{A74049E0-AD31-407B-9918-6A6A76C945C9} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		#{B199C1DE-48A2-47B4-9672-BCCB7E4F8C78} = {F84DCF8A-FC1A-4677-AF4D-616AD7DB3470}
 		{DB61305F-4CA9-4D92-82A5-503495F515E8} = {3820D9E8-1B4E-486E-9C46-D52E3784D222}

diff --git a/backend/src/BuiltinCloudExecution/Builtin.fs b/backend/src/BuiltinCloudExecution/Builtin.fs
@@ -10,4 +10,9 @@ let fnRenames : Builtin.FnRenames =
   // eg: fn "Http" "respond" 0, fn "Http" "response" 0
   []
 
-let builtins = Builtin.combine [ Libs.DB.builtins; Libs.Event.builtins ] fnRenames
+let builtins =
+  Builtin.combine
+    [
+      //Libs.DB.builtins;
+      //Libs.Event.builtins
+      ] fnRenames
diff --git a/backend/src/BuiltinCloudExecution/BuiltinCloudExecution.fsproj b/backend/src/BuiltinCloudExecution/BuiltinCloudExecution.fsproj
@@ -15,8 +15,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="paket.references" />
-    <Compile Include="Libs/DB.fs" />
-    <Compile Include="Libs/Event.fs" />
+    <!--Compile Include="Libs/DB.fs" /-->
+    <!--Compile Include="Libs/Event.fs" /-->
     <Compile Include="Builtin.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />

diff --git a/backend/src/BuiltinDarkInternal/Builtin.fs b/backend/src/BuiltinDarkInternal/Builtin.fs
@@ -18,29 +18,31 @@ let fnRenames : Builtin.FnRenames =
 
 // only accessible to the LibCloud.Config.allowedDarkInternalCanvasID canvas
 let internalFn (f : BuiltInFnSig) : BuiltInFnSig =
-  (fun (state, typeArgs, args) ->
+  (fun (exeState, vmState, typeArgs, args) ->
     uply {
-      if state.program.internalFnsAllowed then
-        return! f (state, typeArgs, args)
+      if exeState.program.internalFnsAllowed then
+        return! f (exeState, vmState, typeArgs, args)
       else
         return
           Exception.raiseInternal
             "internal function attempted to be used in another canvas"
-            [ "canavasId", state.program.canvasID ]
+            [ "canavasId", exeState.program.canvasID ]
     })
 
 
 let builtins : Builtins =
   let builtins =
     Builtin.combine
-      [ Libs.Canvases.builtins
-        Libs.DBs.builtins
-        Libs.Domains.builtins
-        Libs.F404.builtins
-        Libs.Infra.builtins
-        Libs.Secrets.builtins
-        Libs.Users.builtins
-        Libs.Workers.builtins ]
+      [
+        // Libs.Canvases.builtins
+        // Libs.DBs.builtins
+        // Libs.Domains.builtins
+        // Libs.F404.builtins
+        // Libs.Infra.builtins
+        // Libs.Secrets.builtins
+        // Libs.Users.builtins
+        // Libs.Workers.builtins
+        ]
       fnRenames
 
   { builtins with

diff --git a/backend/src/BuiltinDarkInternal/BuiltinDarkInternal.fsproj b/backend/src/BuiltinDarkInternal/BuiltinDarkInternal.fsproj
@@ -17,14 +17,14 @@
   <ItemGroup>
     <None Include="paket.references" />
     <Compile Include="Helpers/Permissions.fs" />
-    <Compile Include="Libs/Canvases.fs" />
-    <Compile Include="Libs/DBs.fs" />
-    <Compile Include="Libs/Domains.fs" />
-    <Compile Include="Libs/F404s.fs" />
-    <Compile Include="Libs/Infra.fs" />
-    <Compile Include="Libs/Secrets.fs" />
-    <Compile Include="Libs/Users.fs" />
-    <Compile Include="Libs/Workers.fs" />
+    <!--Compile Include="Libs/Canvases.fs" /-->
+    <!--Compile Include="Libs/DBs.fs" /-->
+    <!--Compile Include="Libs/Domains.fs" /-->
+    <!--Compile Include="Libs/F404s.fs" /-->
+    <!--Compile Include="Libs/Infra.fs" /-->
+    <!--Compile Include="Libs/Secrets.fs" /-->
+    <!--Compile Include="Libs/Users.fs" /-->
+    <!--Compile Include="Libs/Workers.fs" /-->
     <Compile Include="Builtin.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />

diff --git a/backend/src/BuiltinDarkInternal/Libs/Canvases.fs b/backend/src/BuiltinDarkInternal/Libs/Canvases.fs
@@ -8,7 +8,7 @@ open Prelude
 open LibExecution.RuntimeTypes
 open LibExecution.Builtin.Shortcuts
 
-module VT = ValueType
+module VT = LibExecution.ValueType
 module Dval = LibExecution.Dval
 module PT = LibExecution.ProgramTypes
 module Canvas = LibCloud.Canvas
@@ -24,7 +24,7 @@ let fns : List<BuiltInFn> =
       description = "Get a list of all canvas IDs"
       fn =
         (function
-        | _, _, [ DUnit ] ->
+        | _, _, _, [ DUnit ] ->
           uply {
             let! hosts = Canvas.allCanvasIDs ()
             return DList(VT.uuid, List.map DUuid hosts)

diff --git a/backend/tests/Tests/Tests.fsproj b/backend/tests/Tests/Tests.fsproj
@@ -18,16 +18,16 @@
     <ProjectReference Include="../../src/BuiltinExecution/BuiltinExecution.fsproj" />
 
     <!-- cloud -->
-    <!--ProjectReference Include="../../src/LibClientTypes/LibClientTypes.fsproj" /-->
+    <!--ProjectReference Include="../../src/LibPackageManager/LibPackageManager.fsproj" /-->
+    <ProjectReference Include="../../src/LibClientTypes/LibClientTypes.fsproj" />
     <ProjectReference Include="../../src/LibBinarySerialization/LibBinarySerialization.fsproj" />
-    <!--ProjectReference Include="../../src/BwdServer/BwdServer.fsproj" /-->
-    <!--ProjectReference Include="../../src/BuiltinCloudExecution/BuiltinCloudExecution.fsproj" /-->
+    <ProjectReference Include="../../src/BuiltinCloudExecution/BuiltinCloudExecution.fsproj" />
+    <ProjectReference Include="../../src/BuiltinDarkInternal/BuiltinDarkInternal.fsproj" />
     <!--ProjectReference Include="../../src/LibCloudExecution/LibCloudExecution.fsproj" /-->
-    <!--ProjectReference Include="../../src/BuiltinDarkInternal/BuiltinDarkInternal.fsproj" /-->
+    <!--ProjectReference Include="../../src/BwdServer/BwdServer.fsproj" /-->
     <!--ProjectReference Include="../../src/QueueWorker/QueueWorker.fsproj" /-->
 
     <!-- cross-cutting -->
-    <!--ProjectReference Include="../../src/LibPackageManager/LibPackageManager.fsproj" /-->
     <ProjectReference Include="../TestUtils/TestUtils.fsproj" />
   </ItemGroup>
   <ItemGroup>