Skip to content

[WIP] Client TypeProvider Splitting #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jberzy wants to merge 34 commits into
base: dev
Choose a base branch
from
Open

[WIP] Client TypeProvider Splitting #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
578162d
first take at middleware
Apr 19, 2021
c48cac2
first take at middleware
Apr 19, 2021
a7dcfa2
wip
Apr 22, 2021
19aac5e
add asp.net package
Apr 23, 2021
508250c
copy paste typo
Apr 23, 2021
9c5b02f
use the open type syntax for sample
Apr 23, 2021
0123992
Packaging and renaming
Apr 24, 2021
94d1d19
Remove Application Insights
Apr 24, 2021
7c996b8
First attempt at breaking up TP into more digestables parts
Apr 24, 2021
6b13f90
More splitting up of TP and renames
Apr 24, 2021
598c173
More splitting up of TP and renames
Apr 24, 2021
67b56af
Additional cleanup
Apr 24, 2021
b8135ab
fragment experiment
Apr 28, 2021
b3a4af5
temp
May 7, 2021
ee1b797
temp
May 11, 2021
7956893
temp
May 13, 2021
5da44b4
temp
May 22, 2021
362f592
minor refactor
Jun 5, 2021
b0d3958
inching...
Jun 11, 2021
215ac8e
inching...
Jun 11, 2021
97824fe
more micro commits
Jun 15, 2021
921516b
more minor cleanup
Jun 16, 2021
2d8c321
revert op lookup
Jun 17, 2021
da31e89
fix mistake when refactoring
Jun 18, 2021
aa2c7dd
mistake in non_nullable types
Jun 19, 2021
8c732f5
do not cache across multiple instances of TPs
Jun 19, 2021
6a5e55f
debug caching issue
Jun 22, 2021
9e2be0b
do not access option values directly
Jun 23, 2021
21e05f8
fix build
Jun 23, 2021
7254624
start migration to System.Text.Json
jberzy Jun 25, 2021
b6067a2
Add record serializer for pre-net5.0 compat
johnberzy-bazinga Jun 29, 2021
dc7785a
fix serialization issue
johnberzy-bazinga Jun 29, 2021
c59a2d9
generate serialization at design time based on schema
jberzy Sep 25, 2021
6e0dd9e
generate serialization at design time based on schema
jberzy Sep 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions FSharp.Data.GraphQL.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{9D5C46
samples\client-provider\file-upload\server\types.mjs = samples\client-provider\file-upload\server\types.mjs
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Data.GraphQL.Server.AspNet", "src\FSharp.Data.GraphQL.Server.AspNet\FSharp.Data.GraphQL.Server.AspNet.fsproj", "{F5640838-93AB-4903-822B-D31D4D0FEBE2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -243,6 +245,18 @@ Global
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.Build.0 = Release|Any CPU
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.ActiveCfg = Release|Any CPU
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.Build.0 = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x64.ActiveCfg = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x64.Build.0 = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x86.ActiveCfg = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x86.Build.0 = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|Any CPU.Build.0 = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x64.ActiveCfg = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x64.Build.0 = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x86.ActiveCfg = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -268,6 +282,7 @@ Global
{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {F66BEE6C-0CB7-4F39-97E4-243F797E8723}
{A47968E2-CDD1-4BCF-9093-D0C5225A815B} = {3D948D55-3CD2-496D-A04C-3B4E7BB69140}
{9D5C46E8-0C07-4384-8E58-903F7C2C7171} = {A47968E2-CDD1-4BCF-9093-D0C5225A815B}
{F5640838-93AB-4903-822B-D31D4D0FEBE2} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}
Expand Down
4 changes: 4 additions & 0 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ Target.create "PackMiddleware" (fun _ ->
pack "Server.Middleware"
)

Target.create "PackAspNet" (fun _ ->
pack "Server.AspNet"
)

// --------------------------------------------------------------------------------------
// Run all targets by default. Invoke 'build -t <Target>' to override
Expand All @@ -278,6 +281,7 @@ Target.create "PackAll" ignore
==> "PackServer"
==> "PackClient"
==> "PackMiddleware"
==> "PackAspNet"
==> "PackAll"

Target.runOrDefault "All"
24 changes: 12 additions & 12 deletions build.fsx.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,27 +189,27 @@ NUGET
System.Security.AccessControl (>= 5.0)
System.Security.Principal.Windows (>= 5.0)
Mono.Posix.NETStandard (1.0)
MSBuild.StructuredLogger (2.1.404)
MSBuild.StructuredLogger (2.1.488)
Microsoft.Build (>= 16.4)
Microsoft.Build.Framework (>= 16.4)
Microsoft.Build.Tasks.Core (>= 16.4)
Microsoft.Build.Utilities.Core (>= 16.4)
Newtonsoft.Json (13.0.1)
NuGet.Common (5.9)
NuGet.Frameworks (>= 5.9)
NuGet.Configuration (5.9)
NuGet.Common (>= 5.9)
NuGet.Common (5.9.1)
NuGet.Frameworks (>= 5.9.1)
NuGet.Configuration (5.9.1)
NuGet.Common (>= 5.9.1)
System.Security.Cryptography.ProtectedData (>= 4.4)
NuGet.Frameworks (5.9)
NuGet.Packaging (5.9)
NuGet.Frameworks (5.9.1)
NuGet.Packaging (5.9.1)
Newtonsoft.Json (>= 9.0.1)
NuGet.Configuration (>= 5.9)
NuGet.Versioning (>= 5.9)
NuGet.Configuration (>= 5.9.1)
NuGet.Versioning (>= 5.9.1)
System.Security.Cryptography.Cng (>= 5.0)
System.Security.Cryptography.Pkcs (>= 5.0)
NuGet.Protocol (5.9)
NuGet.Packaging (>= 5.9)
NuGet.Versioning (5.9)
NuGet.Protocol (5.9.1)
NuGet.Packaging (>= 5.9.1)
NuGet.Versioning (5.9.1)
Octokit (0.50)
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
Expand Down
17 changes: 14 additions & 3 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ group Common
source https://api.nuget.org/v3/index.json
frameworks: net5.0, netstandard2.0

nuget System.Text.Json
nuget System.Reactive

# Be explicit about FSharp.Core 4.7.2 when designing libraries.
Expand All @@ -19,8 +20,8 @@ group Common
nuget Microsoft.Extensions.Http 5

# Those are needed for the client type provider.
github fsprojects/FSharp.TypeProviders.SDK:377d56321ad062985ed5aa19f205c1c4f04ef328 src/ProvidedTypes.fsi
github fsprojects/FSharp.TypeProviders.SDK:377d56321ad062985ed5aa19f205c1c4f04ef328 src/ProvidedTypes.fs
github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fsi
github fsprojects/FSharp.TypeProviders.SDK:f4aca36af04aa84b16ec04df6f6bf55ac2f17a73 src/ProvidedTypes.fs

group TestsAndSamples
source https://api.nuget.org/v3/index.json
Expand All @@ -38,4 +39,14 @@ group TestsAndSamples
nuget xunit.runner.console
nuget xunit.runner.visualstudio
nuget BenchmarkDotNet
nuget FSharp.Data.TypeProviders
nuget FSharp.Data.TypeProviders

group AspNetLib
source https://api.nuget.org/v3/index.json
frameworks: net5.0, netstandard2.0

nuget Microsoft.AspNetCore.Http
nuget Microsoft.AspNetCore.Http.Abstractions
nuget Microsoft.AspNetCore.Http.Extensions
nuget System.Text.Json
nuget System.IO.Pipelines
Loading