Merge pull request #24 from fable-compiler/feature/asyncio

dbrattli · web-flow · commit b2b763726930 · 2021-11-21T12:17:33.000+01:00
- Add initial asyncio support
- Align with F# tasks
- Fix builtins open
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "fable-py": {
-      "version": "4.0.0-alpha-012",
+      "version": "4.0.0-alpha-013",
       "commands": [
         "fable-py"
       ]
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.400
+          dotnet-version: 6.0.100
       - name: Setup dotnet tools
         run: dotnet tool restore
       - name: Install src dependencies
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.400
+          dotnet-version: 6.0.100
 
       - name: Setup tools
         run: dotnet tool restore
diff --git a/Build.fsproj b/Build.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Helpers.fs" />
diff --git a/examples/timeflies/TimeFlies.fsproj b/examples/timeflies/TimeFlies.fsproj
@@ -10,7 +10,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Fable.Python" Version="0.16.0" />
-    <PackageReference Include="Fable.Core.Experimental" Version="4.0.0-alpha-009" />
+    <PackageReference Include="Fable.Core.Experimental" Version="4.0.0-alpha-010" />
     <PackageReference Include="FSharp.Control.AsyncRx" Version="1.6.0" />
   </ItemGroup>
   </Project>
diff --git a/paket.dependencies b/paket.dependencies
@@ -2,18 +2,18 @@
 
 source https://api.nuget.org/v3/index.json
 storage: none
-framework: net5.0, netstandard2.0, netstandard2.1
+framework: net6.0, netstandard2.0, netstandard2.1
 
 nuget FSharp.Core ~> 4.7
-nuget Fable.Core.Experimental >= 4.0.0-alpha-002
+nuget Fable.Core.Experimental >= 4.0.0-alpha-013
 
 group Test
     source https://api.nuget.org/v3/index.json
     storage: none
-    framework: net5.0
+    framework: net6.0
 
     nuget FSharp.Core
-    nuget Fable.Core.Experimental >= 4.0.0-alpha-006
+    nuget Fable.Core.Experimental >= 4.0.0-alpha-013
     nuget Microsoft.NET.Test.Sdk ~> 16
     nuget XUnit ~> 2
     nuget xunit.runner.visualstudio ~>  2
@@ -22,7 +22,7 @@ group Test
 group Build
     source https://api.nuget.org/v3/index.json
     storage: none
-    framework: net5.0
+    framework: net6.0
 
     nuget Fake.Core.Target
     nuget Fake.IO.FileSystem
diff --git a/paket.lock b/paket.lock
@@ -1,14 +1,13 @@
 STORAGE: NONE
-RESTRICTION: || (== net5.0) (== netstandard2.0) (== netstandard2.1)
+RESTRICTION: || (== net6.0) (== netstandard2.0) (== netstandard2.1)
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Fable.Core.Experimental (4.0.0-alpha-006)
-      FSharp.Core (>= 4.7.2)
+    Fable.Core.Experimental (4.0.0-alpha-013)
     FSharp.Core (4.7.2)
 
 GROUP Build
 STORAGE: NONE
-RESTRICTION: == net5.0
+RESTRICTION: == net6.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     Fake.Core.CommandLineParsing (5.20.4)
@@ -53,23 +52,24 @@ NUGET
     FSharp.Control.Reactive (5.0.2)
       FSharp.Core (>= 4.7.2)
       System.Reactive (>= 5.0)
-    FSharp.Core (6.0)
-    System.Collections.Immutable (5.0)
+    FSharp.Core (6.0.1)
+    System.Collections.Immutable (6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
     System.Reactive (5.0)
+    System.Runtime.CompilerServices.Unsafe (6.0)
 
 GROUP Test
 STORAGE: NONE
-RESTRICTION: == net5.0
+RESTRICTION: == net6.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Fable.Core.Experimental (4.0.0-alpha-006)
-      FSharp.Core (>= 4.7.2)
-    FSharp.Core (6.0)
+    Fable.Core.Experimental (4.0.0-alpha-013)
+    FSharp.Core (6.0.1)
     Microsoft.CodeCoverage (17.0)
     Microsoft.NET.Test.Sdk (16.11)
       Microsoft.CodeCoverage (>= 16.11)
       Microsoft.TestPlatform.TestHost (>= 16.11)
-    Microsoft.NETCore.Platforms (5.0.4)
+    Microsoft.NETCore.Platforms (6.0)
     Microsoft.TestPlatform.ObjectModel (17.0)
       NuGet.Frameworks (>= 5.0)
       System.Reflection.Metadata (>= 1.6)
@@ -79,8 +79,12 @@ NUGET
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
     Newtonsoft.Json (13.0.1)
-    NuGet.Frameworks (5.11)
-    System.Reflection.Metadata (5.0)
+    NuGet.Frameworks (6.0)
+    System.Collections.Immutable (6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    System.Reflection.Metadata (6.0)
+      System.Collections.Immutable (>= 6.0)
+    System.Runtime.CompilerServices.Unsafe (6.0)
     xunit (2.4.1)
       xunit.analyzers (>= 0.10)
       xunit.assert (2.4.1)
diff --git a/src/Fable.Python.fsproj b/src/Fable.Python.fsproj
@@ -9,6 +9,9 @@
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="stdlib/asyncio/Futures.fs" />
+    <Compile Include="stdlib/asyncio/Events.fs" />
+    <Compile Include="stdlib/asyncio/Tasks.fs" />
     <Compile Include="stdlib/Ast.fs" />
     <Compile Include="stdlib/Base64.fs" />
     <Compile Include="stdlib/Builtins.fs" />
@@ -34,7 +37,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\LICENSE" Pack="true" Visible="false" PackagePath="\" />
-    <None Include="..\README.md" Pack="true" PackagePath="\"/>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/stdlib/Builtins.fs b/src/stdlib/Builtins.fs
@@ -1,6 +1,7 @@
 /// Type bindings for Python builtins: https://docs.python.org/3/library/functions.html#built-in-funcs
 module Fable.Python.Builtins
 
+open System
 open System.Collections.Generic
 open Fable.Core
 
@@ -11,6 +12,7 @@ type TextIOBase =
     abstract read : __size: int -> string
 
 type TextIOWrapper =
+    inherit IDisposable
     inherit TextIOBase
 
 [<StringEnum>]
@@ -75,9 +77,11 @@ type OpenTextMode =
 
 [<Erase>]
 type _OpenFile =
-    | StrOrBytesPath of string
+    | StringPath of string
     | FileDescriptor of int
 
+type _Opener = Tuple<string, int> -> int
+
 type IExports =
     /// Return the absolute value of the argument.
     abstract abs : int -> int
@@ -115,17 +119,8 @@ type IExports =
     /// Object to float
     abstract float : obj -> float
     abstract print : obj: obj -> unit
-    abstract read : file: _OpenFile -> TextIOWrapper
-    abstract read : file: _OpenFile * mode: OpenTextMode -> TextIOWrapper
-    abstract read : file: _OpenFile * mode: OpenTextMode * buffering: int -> TextIOWrapper
-    abstract read : file: _OpenFile * mode: OpenTextMode * buffering: int * encoding: string -> TextIOWrapper
-
-    abstract read :
-        file: _OpenFile * mode: OpenTextMode * buffering: int * encoding: string * errors: string -> TextIOWrapper
 
-    abstract read :
-        file: _OpenFile * mode: OpenTextMode * buffering: int * encoding: string * errors: string * newline: string ->
-        TextIOWrapper
+    [<NamedParams(fromIndex=1)>] abstract ``open`` : file: _OpenFile * ?mode: OpenTextMode * ?buffering: int * ?encoding: string * ?errors: string * ?newline: string * ?closefd: bool * ?opener: _Opener -> TextIOWrapper
 
 [<ImportAll("builtins")>]
 let builtins: IExports = nativeOnly
diff --git a/src/stdlib/asyncio/Events.fs b/src/stdlib/asyncio/Events.fs
@@ -0,0 +1,7 @@
+namespace Fable.Python.AsyncIO
+
+open Fable.Core
+
+type [<AllowNullLiteral>] AbstractEventLoop =
+    abstract member run_forever: unit -> unit
+    abstract member create_future<'T> :  unit -> Future<'T>
diff --git a/src/stdlib/asyncio/Futures.fs b/src/stdlib/asyncio/Futures.fs
@@ -0,0 +1,21 @@
+namespace Fable.Python.AsyncIO
+
+open Fable.Core
+
+type Awaitable<'T> = interface end
+
+type Future<'T> =
+    inherit Awaitable<'T>
+
+    abstract member cancel : unit -> unit
+    abstract member cancelled : unit -> bool
+    abstract member ``done`` : unit -> bool
+    [<Emit("$0.set_result($1)")>]
+    abstract set_result: __result: 'T -> unit
+    abstract member result : unit -> 'T
+    abstract member ``exception`` : unit -> exn
+    [<Emit("$0.set_exception($1)")>]
+    abstract set_exception: __exception: exn -> unit
+    abstract member add_done_callback : callback: (unit -> unit) -> unit
+    abstract set_name : string -> unit
+    abstract get_name : unit -> string
diff --git a/src/stdlib/asyncio/Tasks.fs b/src/stdlib/asyncio/Tasks.fs
@@ -0,0 +1,29 @@
+namespace Fable.Python.AsyncIO
+
+open Fable.Core
+
+type Task<'T> =
+    inherit Future<'T>
+
+type Coroutine<'T> =
+    inherit Awaitable<'T>
+
+    abstract member send: 'T -> unit
+    abstract member close: unit -> unit
+    abstract member throw: exn -> unit
+
+
+type IExports =
+    abstract create_task<'T> : fn: Coroutine<'T> -> Task<'T>
+    abstract sleep : seconds: float -> result: 'T -> Future<'T>
+    abstract run<'T> : main: Awaitable<'T> -> 'T
+    abstract run<'T> : main: System.Threading.Tasks.Task<'T> -> 'T
+    [<Emit("$0.get_running_loop()")>]
+    abstract get_running_loop : unit -> AbstractEventLoop
+    [<Emit("$0.get_event_loop()")>]
+    abstract get_event_loop : unit -> AbstractEventLoop
+
+[<AutoOpen>]
+module AsyncIOImpl =
+    [<ImportAll("asyncio")>]
+    let asyncio: IExports = nativeOnly
diff --git a/test/Fable.Python.Test.fsproj b/test/Fable.Python.Test.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -13,6 +13,7 @@
   <ItemGroup>
     <Compile Include="Util.fs" />
     <Compile Include="TestAst.fs" />
+    <Compile Include="TestAsyncIO.fs" />
     <Compile Include="TestBuiltins.fs" />
     <Compile Include="TestJson.fs" />
     <Compile Include="TestString.fs" />
diff --git a/test/TestAsyncIO.fs b/test/TestAsyncIO.fs
@@ -0,0 +1,21 @@
+module Fable.Python.Tests.AsyncIO
+
+open Util.Testing
+open Fable.Python.AsyncIO
+
+[<Fact>]
+let ``test builder run zero works`` () =
+    let tsk = task {
+        ()
+    }
+    let result = asyncio.run(tsk)
+    result |> equal ()
+
+[<Fact>]
+let ``test builder run int works`` () =
+    let tsk = task {
+        return 42
+    }
+    let result = asyncio.run(tsk)
+    result |> equal 42
+

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`]`
`16`	`16`	`},`
`17`	`17`	`"fable-py": {`
`18`		`- "version": "4.0.0-alpha-012",`
	`18`	`+ "version": "4.0.0-alpha-013",`
`19`	`19`	`"commands": [`
`20`	`20`	`"fable-py"`
`21`	`21`	`]`