Skip to content

Commit 1b99aa1

Browse files
TarmilTarmil
committed
chore: fantomas format + lf line endings
1 parent 3db9964 commit 1b99aa1

12 files changed

Lines changed: 335 additions & 466 deletions

File tree

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
.paket/Paket.Restore.targets text eol=crlf
12
*.yml text eol=lf

‎benchmarks/FSharp.SystemTextJson.Benchmarks/Program.fs‎

Lines changed: 116 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,116 @@
1-
module FSharp.SystemTextJson.Benchmarks
2-
3-
open FSharp.Reflection
4-
5-
open System
6-
open BenchmarkDotNet.Attributes
7-
open BenchmarkDotNet.Diagnosers
8-
open BenchmarkDotNet.Configs
9-
open BenchmarkDotNet.Jobs
10-
open BenchmarkDotNet.Running
11-
open BenchmarkDotNet.Validators
12-
open BenchmarkDotNet.Exporters
13-
open BenchmarkDotNet.Environments
14-
open System.Reflection
15-
open BenchmarkDotNet.Configs
16-
17-
open System.Text.Json
18-
open System.Text.Json.Serialization
19-
open Newtonsoft.Json
20-
open Newtonsoft.Json.Linq
21-
22-
type TestRecord =
23-
{ name: string
24-
thing: bool option
25-
time: System.DateTimeOffset }
26-
27-
type SimpleClass() =
28-
member val Name: string = null with get, set
29-
member val Thing: bool option = None with get, set
30-
member val Time: DateTimeOffset = DateTimeOffset.MinValue with get, set
31-
32-
type ArrayTestBase<'t>(instance: 't) =
33-
let systemTextOptions =
34-
let options = JsonSerializerOptions()
35-
options.Converters.Add(JsonFSharpConverter())
36-
options
37-
38-
39-
[<Params(10, 100)>]
40-
member val ArrayLength = 0 with get, set
41-
42-
member val InstanceArray = [||] with get, set
43-
44-
[<GlobalSetup>]
45-
member this.InitArray() =
46-
this.InstanceArray <- Array.replicate this.ArrayLength instance
47-
48-
[<Benchmark>]
49-
member this.Newtonsoft() =
50-
JsonConvert.SerializeObject this.InstanceArray
51-
52-
[<Benchmark>]
53-
member this.SystemTextJson() =
54-
System.Text.Json.JsonSerializer.Serialize(this.InstanceArray, systemTextOptions)
55-
56-
let recordInstance =
57-
{ name = "sample"
58-
thing = Some true
59-
time = System.DateTimeOffset.UnixEpoch.AddDays(200.) }
60-
61-
62-
type Records() =
63-
inherit ArrayTestBase<TestRecord>(recordInstance)
64-
65-
type Classes() =
66-
inherit ArrayTestBase<SimpleClass>(SimpleClass(
67-
Name = "sample",
68-
Thing = Some true,
69-
Time = DateTimeOffset.UnixEpoch.AddDays(200.)
70-
))
71-
72-
73-
type ReflectionComparison() =
74-
75-
[<Params(10, 100, 1000)>]
76-
member val Iterations = 0 with get, set
77-
78-
[<Benchmark>]
79-
member this.FSharpUnion() =
80-
for i in 0 .. this.Iterations do
81-
FSharpType.IsUnion(typeof<bool option>, true) |> ignore
82-
83-
[<Benchmark>]
84-
member this.FSharpUnionCached() =
85-
for i in 0 .. this.Iterations do
86-
TypeCache.isUnion typeof<bool option> |> ignore
87-
88-
[<Benchmark>]
89-
member this.FSharpRecord() =
90-
for i in 0 .. this.Iterations do
91-
Reflection.FSharpType.IsRecord(typeof<TestRecord>, true) |> ignore
92-
93-
[<Benchmark>]
94-
member this.FSharpRecordCached() =
95-
for i in 0 .. this.Iterations do
96-
TypeCache.isRecord typeof<TestRecord> |> ignore
97-
98-
99-
let config =
100-
ManualConfig
101-
.Create(DefaultConfig.Instance)
102-
.AddDiagnoser(MemoryDiagnoser.Default)
103-
.AddExporter(MarkdownExporter.GitHub)
104-
.AddValidator(ExecutionValidator.FailOnError)
105-
106-
let defaultSwitch () =
107-
BenchmarkSwitcher(
108-
[| typeof<Records>
109-
typeof<Classes>
110-
typeof<ReflectionComparison> |]
111-
)
112-
113-
114-
[<EntryPoint>]
115-
let main argv =
116-
let _summary = defaultSwitch().Run(argv, config)
117-
0
1+
module FSharp.SystemTextJson.Benchmarks
2+
3+
open FSharp.Reflection
4+
5+
open System
6+
open BenchmarkDotNet.Attributes
7+
open BenchmarkDotNet.Diagnosers
8+
open BenchmarkDotNet.Configs
9+
open BenchmarkDotNet.Jobs
10+
open BenchmarkDotNet.Running
11+
open BenchmarkDotNet.Validators
12+
open BenchmarkDotNet.Exporters
13+
open BenchmarkDotNet.Environments
14+
open System.Reflection
15+
open BenchmarkDotNet.Configs
16+
17+
open System.Text.Json
18+
open System.Text.Json.Serialization
19+
open Newtonsoft.Json
20+
open Newtonsoft.Json.Linq
21+
22+
type TestRecord =
23+
{ name: string
24+
thing: bool option
25+
time: System.DateTimeOffset }
26+
27+
type SimpleClass() =
28+
member val Name: string = null with get, set
29+
member val Thing: bool option = None with get, set
30+
member val Time: DateTimeOffset = DateTimeOffset.MinValue with get, set
31+
32+
type ArrayTestBase<'t>(instance: 't) =
33+
let systemTextOptions =
34+
let options = JsonSerializerOptions()
35+
options.Converters.Add(JsonFSharpConverter())
36+
options
37+
38+
39+
[<Params(10, 100)>]
40+
member val ArrayLength = 0 with get, set
41+
42+
member val InstanceArray = [||] with get, set
43+
44+
[<GlobalSetup>]
45+
member this.InitArray() =
46+
this.InstanceArray <- Array.replicate this.ArrayLength instance
47+
48+
[<Benchmark>]
49+
member this.Newtonsoft() =
50+
JsonConvert.SerializeObject this.InstanceArray
51+
52+
[<Benchmark>]
53+
member this.SystemTextJson() =
54+
System.Text.Json.JsonSerializer.Serialize(this.InstanceArray, systemTextOptions)
55+
56+
let recordInstance =
57+
{ name = "sample"
58+
thing = Some true
59+
time = System.DateTimeOffset.UnixEpoch.AddDays(200.) }
60+
61+
62+
type Records() =
63+
inherit ArrayTestBase<TestRecord>(recordInstance)
64+
65+
type Classes() =
66+
inherit
67+
ArrayTestBase<SimpleClass>(
68+
SimpleClass(Name = "sample", Thing = Some true, Time = DateTimeOffset.UnixEpoch.AddDays(200.))
69+
)
70+
71+
72+
type ReflectionComparison() =
73+
74+
[<Params(10, 100, 1000)>]
75+
member val Iterations = 0 with get, set
76+
77+
[<Benchmark>]
78+
member this.FSharpUnion() =
79+
for i in 0 .. this.Iterations do
80+
FSharpType.IsUnion(typeof<bool option>, true) |> ignore
81+
82+
[<Benchmark>]
83+
member this.FSharpUnionCached() =
84+
for i in 0 .. this.Iterations do
85+
TypeCache.isUnion typeof<bool option> |> ignore
86+
87+
[<Benchmark>]
88+
member this.FSharpRecord() =
89+
for i in 0 .. this.Iterations do
90+
Reflection.FSharpType.IsRecord(typeof<TestRecord>, true) |> ignore
91+
92+
[<Benchmark>]
93+
member this.FSharpRecordCached() =
94+
for i in 0 .. this.Iterations do
95+
TypeCache.isRecord typeof<TestRecord> |> ignore
96+
97+
98+
let config =
99+
ManualConfig
100+
.Create(DefaultConfig.Instance)
101+
.AddDiagnoser(MemoryDiagnoser.Default)
102+
.AddExporter(MarkdownExporter.GitHub)
103+
.AddValidator(ExecutionValidator.FailOnError)
104+
105+
let defaultSwitch () =
106+
BenchmarkSwitcher(
107+
[| typeof<Records>
108+
typeof<Classes>
109+
typeof<ReflectionComparison> |]
110+
)
111+
112+
113+
[<EntryPoint>]
114+
let main argv =
115+
let _summary = defaultSwitch().Run(argv, config)
116+
0

‎build/build.fs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ module Target =
5959
else
6060
action o
6161

62-
Target.create "Clean" (fun _ -> !! "artifacts" |> Shell.cleanDirs)
62+
Target.create "Clean" (fun _ -> !!"artifacts" |> Shell.cleanDirs)
6363

6464
Target.create "Build" (fun _ -> DotNet.build id Paths.sln)
6565

@@ -113,8 +113,11 @@ Target.create "All" ignore
113113
"All" <== [ "Test"; "TestTrim"; "Pack" ]
114114
"Test" <== [ "Build" ]
115115
"Pack" <== [ "Build" ]
116-
"Build" <== [ if Cli.clean then "Clean" ]
116+
"Build"
117+
<== [ if Cli.clean then
118+
"Clean" ]
117119

118120

119-
if BuildServer.isGitHubActionsBuild then printfn "::endgroup::"
121+
if BuildServer.isGitHubActionsBuild then
122+
printfn "::endgroup::"
120123
Target.runOrDefaultWithArguments "All"

‎src/FSharp.SystemTextJson/All.fs‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,20 @@ type JsonFSharpConverter(fsOptions: JsonFSharpOptions, [<Optional>] overrides: I
5454

5555
new() = JsonFSharpConverter(JsonFSharpOptions())
5656

57-
new([<Optional; DefaultParameterValue(Default.UnionEncoding)>] unionEncoding: JsonUnionEncoding,
58-
[<Optional; DefaultParameterValue(Default.UnionTagName)>] unionTagName: JsonUnionTagName,
59-
[<Optional; DefaultParameterValue(Default.UnionFieldsName)>] unionFieldsName: JsonUnionFieldsName,
60-
[<Optional; DefaultParameterValue(Default.UnionTagNamingPolicy)>] unionTagNamingPolicy: JsonNamingPolicy,
61-
[<Optional; DefaultParameterValue(Default.UnionTagNamingPolicy)>] unionFieldNamingPolicy: JsonNamingPolicy,
62-
[<Optional; DefaultParameterValue(Default.UnionTagCaseInsensitive)>] unionTagCaseInsensitive: bool,
63-
[<Optional; DefaultParameterValue(Default.AllowNullFields)>] allowNullFields: bool,
64-
[<Optional; DefaultParameterValue(Default.IncludeRecordProperties)>] includeRecordProperties: bool,
65-
[<Optional; DefaultParameterValue(Default.Types)>] types: JsonFSharpTypes,
66-
[<Optional; DefaultParameterValue(false)>] allowOverride: bool,
67-
[<Optional>] overrides: IDictionary<Type, JsonFSharpOptions>) =
57+
new
58+
(
59+
[<Optional; DefaultParameterValue(Default.UnionEncoding)>] unionEncoding: JsonUnionEncoding,
60+
[<Optional; DefaultParameterValue(Default.UnionTagName)>] unionTagName: JsonUnionTagName,
61+
[<Optional; DefaultParameterValue(Default.UnionFieldsName)>] unionFieldsName: JsonUnionFieldsName,
62+
[<Optional; DefaultParameterValue(Default.UnionTagNamingPolicy)>] unionTagNamingPolicy: JsonNamingPolicy,
63+
[<Optional; DefaultParameterValue(Default.UnionTagNamingPolicy)>] unionFieldNamingPolicy: JsonNamingPolicy,
64+
[<Optional; DefaultParameterValue(Default.UnionTagCaseInsensitive)>] unionTagCaseInsensitive: bool,
65+
[<Optional; DefaultParameterValue(Default.AllowNullFields)>] allowNullFields: bool,
66+
[<Optional; DefaultParameterValue(Default.IncludeRecordProperties)>] includeRecordProperties: bool,
67+
[<Optional; DefaultParameterValue(Default.Types)>] types: JsonFSharpTypes,
68+
[<Optional; DefaultParameterValue(false)>] allowOverride: bool,
69+
[<Optional>] overrides: IDictionary<Type, JsonFSharpOptions>
70+
) =
6871
JsonFSharpConverter(
6972
JsonFSharpOptions(
7073
unionEncoding = unionEncoding,
@@ -134,15 +137,21 @@ type JsonFSharpConverterAttribute(fsOptions: JsonFSharpOptions) =
134137

135138
new() = JsonFSharpConverterAttribute(JsonFSharpOptions())
136139

137-
new([<Optional; DefaultParameterValue(Default.UnionEncoding ||| JsonUnionEncoding.Inherit)>] unionEncoding: JsonUnionEncoding,
138-
[<Optional; DefaultParameterValue(Default.UnionTagName)>] unionTagName: JsonUnionTagName,
139-
[<Optional; DefaultParameterValue(Default.UnionFieldsName)>] unionFieldsName: JsonUnionFieldsName,
140-
[<Optional; DefaultParameterValue(JsonKnownNamingPolicy.Unspecified)>] unionTagNamingPolicy: JsonKnownNamingPolicy,
141-
[<Optional; DefaultParameterValue(JsonKnownNamingPolicy.Unspecified)>] unionFieldNamingPolicy: JsonKnownNamingPolicy,
142-
[<Optional; DefaultParameterValue(Default.UnionTagCaseInsensitive)>] unionTagCaseInsensitive: bool,
143-
[<Optional; DefaultParameterValue(Default.AllowNullFields)>] allowNullFields: bool,
144-
[<Optional; DefaultParameterValue(Default.IncludeRecordProperties)>] includeRecordProperties: bool,
145-
[<Optional; DefaultParameterValue(Default.Types)>] types: JsonFSharpTypes) =
140+
new
141+
(
142+
[<Optional; DefaultParameterValue(Default.UnionEncoding ||| JsonUnionEncoding.Inherit)>] unionEncoding:
143+
JsonUnionEncoding,
144+
[<Optional; DefaultParameterValue(Default.UnionTagName)>] unionTagName: JsonUnionTagName,
145+
[<Optional; DefaultParameterValue(Default.UnionFieldsName)>] unionFieldsName: JsonUnionFieldsName,
146+
[<Optional; DefaultParameterValue(JsonKnownNamingPolicy.Unspecified)>] unionTagNamingPolicy:
147+
JsonKnownNamingPolicy,
148+
[<Optional; DefaultParameterValue(JsonKnownNamingPolicy.Unspecified)>] unionFieldNamingPolicy:
149+
JsonKnownNamingPolicy,
150+
[<Optional; DefaultParameterValue(Default.UnionTagCaseInsensitive)>] unionTagCaseInsensitive: bool,
151+
[<Optional; DefaultParameterValue(Default.AllowNullFields)>] allowNullFields: bool,
152+
[<Optional; DefaultParameterValue(Default.IncludeRecordProperties)>] includeRecordProperties: bool,
153+
[<Optional; DefaultParameterValue(Default.Types)>] types: JsonFSharpTypes
154+
) =
146155
let fsOptions =
147156
JsonFSharpOptions(
148157
unionEncoding = unionEncoding,

‎src/FSharp.SystemTextJson/Collection.fs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,21 +177,15 @@ type JsonMapConverter(fsOptions: JsonFSharpOptions) =
177177
:?> JsonConverter
178178

179179
static let jsonMapArrayOfPairsConverter genArgs =
180-
typedefof<JsonMapArrayOfPairsConverter<_, _>>
181-
.MakeGenericType(genArgs)
182-
.GetConstructor([||])
183-
.Invoke([||])
180+
typedefof<JsonMapArrayOfPairsConverter<_, _>>.MakeGenericType(genArgs).GetConstructor([||]).Invoke([||])
184181
:?> JsonConverter
185182

186183
static member internal CanConvert(typeToConvert: Type) =
187184
TypeCache.isMap typeToConvert
188185

189186
static member internal CreateConverter
190-
(
191-
typeToConvert: Type,
192-
options: JsonSerializerOptions,
193-
fsOptions: JsonFSharpOptions
194-
) =
187+
(typeToConvert: Type, options: JsonSerializerOptions, fsOptions: JsonFSharpOptions)
188+
=
195189
let genArgs = typeToConvert.GetGenericArguments()
196190
match fsOptions.MapFormat with
197191
| MapFormat.Object -> jsonMapObjectConverter genArgs options

0 commit comments

Comments
 (0)