Restructure project

Author: dbrattli

.gitignore

@@ -131,3 +131,5 @@ dmypy.json
 obj
 bin
 build
+
+.idea/

Build.fs

@@ -6,7 +6,7 @@ open Helpers
 initializeContext()
 
 let buildPath = Path.getFullName "build"
-let srcPath = Path.getFullName "stdlib"
+let srcPath = Path.getFullName "src"
 let deployPath = Path.getFullName "deploy"
 let testsPath = Path.getFullName "test"
 
@@ -21,7 +21,7 @@ Target.create "Clean" (fun _ ->
 
 Target.create "Build" (fun _ ->
     Shell.mkdir buildPath
-    run dotnet $"run -c Release -p {cliPath} -- --lang Python --exclude Fable.Core --outDir {buildPath}/stdlib" srcPath
+    run dotnet $"run -c Release -p {cliPath} -- --lang Python --exclude Fable.Core --outDir {buildPath}" srcPath
 )
 
 Target.create "Run" (fun _ ->
@@ -34,8 +34,6 @@ Target.create "Test" (fun _ ->
       "python", dotnet $"run -c Release -p {cliPath} -- --lang Python --exclude Fable.Core --outDir {buildPath}/tests" testsPath
       ]
     |> runParallel
-    Shell.Exec("touch", $"{buildPath}/tests/__init__.py") |> ignore
-    Shell.Exec("touch", $"{buildPath}/tests/stdlib/__init__.py") |> ignore
     run pytest $"{buildPath}/tests" ""
 )
 

examples/flask/App.fs

@@ -3,11 +3,17 @@ module Safe
 open Fable.Python.Builtins
 open Flask
 
-let app = Flask.Create(__name__)
+let app = Flask(__name__)
 let index = app.route("/")
 
+let a = builtins.len
+
 let hello_world () =
     "<p>Hello, World!</p>"
     //flask.render_template()
 
-hello_world |> index |> ignore
+hello_world |> index |> ignore
+
+[<EntryPoint>]
+let main args =
+    1

examples/flask/Flask.fsproj

@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
     <Author>Dag Brattli</Author>
     <Copyright>Dag Brattli</Copyright>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="App.fs" />

stdlib/Fable.Python.fsproj src/Fable.Python.fsprojstdlib/Fable.Python.fsproj renamed to src/Fable.Python.fsproj

@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Author>Dag Brattli</Author>
     <Copyright>Dag Brattli</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <Version>0.3.0</Version>
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Ast.fs" />
-    <Compile Include="Builtins.fs" />
-    <Compile Include="Json.fs" />
-    <Compile Include="Os.fs" />
+    <Compile Include="stdlib/Ast.fs" />
+    <Compile Include="stdlib/Builtins.fs" />
+    <Compile Include="stdlib/Json.fs" />
+    <Compile Include="stdlib/Os.fs" />
+    <Compile Include="stdlib/TkInter.fs" />
+
+    <Compile Include="flask/Flask.fs" />
+
+    <Compile Include="cognite-sdk/CogniteSdk.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../Fable/src/Fable.Core/Fable.Core.fsproj" />
@@ -21,7 +27,7 @@
     <Content Include="pyproject.toml; *.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\LICENSE" Pack="true" Visible="false" PackagePath=""/>
+    <None Include="..\LICENSE" Pack="true" Visible="false" PackagePath="" />
   </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

src/cognite-sdk/CogniteSdk.fs

@@ -0,0 +1,16 @@
+module Fable.Python.CogniteSdk
+
+open Fable.Core
+
+type ITimeSeries =
+    abstract plot: start: string * ``end``: string * aggregates: string array * granularity: string -> unit
+
+type ITimeSeriesApi =
+    abstract retrieve: id: int64 -> ITimeSeries
+    abstract list: unit -> ITimeSeries list
+
+[<Import("CogniteClient", from="cognite.client")>]
+type CogniteClient (?apiKey: string, ?api_subversion: string, ?project: string, ?clientName: string) =
+    abstract member time_series: ITimeSeriesApi with get
+    default this.time_series with get () = nativeOnly
+

flask/Flask.fs src/flask/Flask.fsflask/Flask.fs renamed to src/flask/Flask.fs

@@ -1,4 +1,4 @@
-module Flask
+module Fable.Python.Flask
 
 open Fable.Core
 
@@ -9,22 +9,16 @@ type RequestBase =
 type Request =
     inherit RequestBase
 
-type Flask =
-    abstract route : rule: string -> ((unit -> string) -> Flask)
-    abstract route : rule: string * methods: string array -> ((unit -> string) -> Flask)
-
-
-type FlaskStatic =
-    [<Emit("$0(import_name=$1)")>]
-    abstract Create : string -> Flask
-
 [<Import("Flask", "flask")>]
-let Flask: FlaskStatic = nativeOnly
+type Flask (name: string) =
+    member _.route(rule: string) : ((unit -> string) -> Flask) = nativeOnly
+    member _.route(rule: string, methods: string array) : ((unit -> string) -> Flask) = nativeOnly
+
 
 type IExports =
     abstract render_template : template_name_or_list: string -> string
     abstract render_template : template_name_or_list: string seq -> string
     abstract request : Request
 
 [<ImportAll("flask")>]
-let flask : IExports = nativeOnly
+let flask: IExports = nativeOnly