Skip to content

Commit dc2fe34

Browse files
eiriktsarpaliseiriktsarpalis
authored
Add json support for F# options, lists, sets, maps and records (#55108)
* Add json support for F# options, lists, sets, maps and records * fix ILLink warnings * address ILLink annotations feedback * add support for ValueOption * revert unneeded sln changes * add JsonIgnoreCondition tests for optional types * Revert "revert unneeded sln changes" This reverts commit 2e793422dca84bd22d55cdfa2cd6c9b6c5d4963e. * remove lock from singleton initialization * improve FSharp.Core missing member error mesages * throw NotSupportedException on discriminated unions * extend optional test coverage to include list, set and map payloads * simplify changes required to converter infrastructure
1 parent 54d4f62 commit dc2fe34

23 files changed

+1475
-37
lines changed

‎src/libraries/System.Text.Json/System.Text.Json.sln

+31-24
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{676B6044-FA4
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{74017ACD-3AC1-4BB5-804B-D57E305FFBD9}"
3737
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Json.SourceGeneration", "gen\System.Text.Json.SourceGeneration.csproj", "{6485EED4-C313-4551-9865-8ADCED603629}"
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "gen\System.Text.Json.SourceGeneration.csproj", "{6485EED4-C313-4551-9865-8ADCED603629}"
3939
EndProject
40-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Json.Tests", "tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj", "{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}"
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.Tests", "tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj", "{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}"
4141
EndProject
42-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Json.SourceGeneration.Tests", "tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Tests.csproj", "{33599A6C-F340-4E1B-9B4D-CB8946C22140}"
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.Tests", "tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Tests.csproj", "{33599A6C-F340-4E1B-9B4D-CB8946C22140}"
4343
EndProject
44-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Json.SourceGeneration.UnitTests", "tests\System.Text.Json.SourceGeneration.UnitTests\System.Text.Json.SourceGeneration.UnitTests.csproj", "{18173CEC-895F-4F62-B7BB-B724457FEDCD}"
44+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration.UnitTests", "tests\System.Text.Json.SourceGeneration.UnitTests\System.Text.Json.SourceGeneration.UnitTests.csproj", "{18173CEC-895F-4F62-B7BB-B724457FEDCD}"
45+
EndProject
46+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "System.Text.Json.FSharp.Tests", "tests\System.Text.Json.FSharp.Tests\System.Text.Json.FSharp.Tests.fsproj", "{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}"
4547
EndProject
4648
Global
47-
GlobalSection(NestedProjects) = preSolution
48-
{102945CA-3736-4B2C-8E68-242A0B247F2B} = {3C544454-BD8B-44F4-A174-B61F18957613}
49-
{73D5739C-E382-4E22-A7D3-B82705C58C74} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
50-
{25C42754-B384-4842-8FA7-75D7A79ADF0D} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
51-
{4774F56D-16A8-4ABB-8C73-5F57609F1773} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
52-
{E2077991-EB83-471C-B17F-72F569FFCE6D} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
53-
{BE230195-2A1C-4674-BACB-502C2CD864E9} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
54-
{D7276D7D-F117-47C5-B514-8E3E964769BE} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
55-
{7015E94D-D20D-48C8-86D7-6A996BE99E0E} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
56-
{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
57-
{1C8262DB-7355-40A8-A2EC-4EED7363134A} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
58-
{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
59-
{7909EB27-0D6E-46E6-B9F9-8A1EFD557018} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
60-
{9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
61-
{1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
62-
{6485EED4-C313-4551-9865-8ADCED603629} = {74017ACD-3AC1-4BB5-804B-D57E305FFBD9}
63-
{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC} = {3C544454-BD8B-44F4-A174-B61F18957613}
64-
{33599A6C-F340-4E1B-9B4D-CB8946C22140} = {3C544454-BD8B-44F4-A174-B61F18957613}
65-
{18173CEC-895F-4F62-B7BB-B724457FEDCD} = {3C544454-BD8B-44F4-A174-B61F18957613}
66-
EndGlobalSection
6749
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6850
Debug|Any CPU = Debug|Any CPU
6951
Release|Any CPU = Release|Any CPU
@@ -141,10 +123,35 @@ Global
141123
{18173CEC-895F-4F62-B7BB-B724457FEDCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
142124
{18173CEC-895F-4F62-B7BB-B724457FEDCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
143125
{18173CEC-895F-4F62-B7BB-B724457FEDCD}.Release|Any CPU.Build.0 = Release|Any CPU
126+
{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127+
{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
128+
{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
129+
{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Release|Any CPU.Build.0 = Release|Any CPU
144130
EndGlobalSection
145131
GlobalSection(SolutionProperties) = preSolution
146132
HideSolutionNode = FALSE
147133
EndGlobalSection
134+
GlobalSection(NestedProjects) = preSolution
135+
{102945CA-3736-4B2C-8E68-242A0B247F2B} = {3C544454-BD8B-44F4-A174-B61F18957613}
136+
{73D5739C-E382-4E22-A7D3-B82705C58C74} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
137+
{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
138+
{25C42754-B384-4842-8FA7-75D7A79ADF0D} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
139+
{1C8262DB-7355-40A8-A2EC-4EED7363134A} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
140+
{4774F56D-16A8-4ABB-8C73-5F57609F1773} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
141+
{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
142+
{E2077991-EB83-471C-B17F-72F569FFCE6D} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
143+
{7909EB27-0D6E-46E6-B9F9-8A1EFD557018} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
144+
{BE230195-2A1C-4674-BACB-502C2CD864E9} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
145+
{D7276D7D-F117-47C5-B514-8E3E964769BE} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
146+
{9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
147+
{7015E94D-D20D-48C8-86D7-6A996BE99E0E} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
148+
{1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
149+
{6485EED4-C313-4551-9865-8ADCED603629} = {74017ACD-3AC1-4BB5-804B-D57E305FFBD9}
150+
{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC} = {3C544454-BD8B-44F4-A174-B61F18957613}
151+
{33599A6C-F340-4E1B-9B4D-CB8946C22140} = {3C544454-BD8B-44F4-A174-B61F18957613}
152+
{18173CEC-895F-4F62-B7BB-B724457FEDCD} = {3C544454-BD8B-44F4-A174-B61F18957613}
153+
{5720BF06-2031-4AD8-B9B4-31A01E27ABB8} = {3C544454-BD8B-44F4-A174-B61F18957613}
154+
EndGlobalSection
148155
GlobalSection(ExtensibilityGlobals) = postSolution
149156
SolutionGuid = {5868B757-D821-41FC-952E-2113A0519506}
150157
EndGlobalSection

‎src/libraries/System.Text.Json/src/Resources/Strings.resx

+7-1
Original file line numberDiff line numberDiff line change
@@ -611,4 +611,10 @@
611611
<data name="FieldCannotBeVirtual" xml:space="preserve">
612612
<value>A 'field' member cannot be 'virtual'. See arguments for the '{0}' and '{1}' parameters. </value>
613613
</data>
614-
</root>
614+
<data name="MissingFSharpCoreMember" xml:space="preserve">
615+
<value>Could not locate required member '{0}' from FSharp.Core. This might happen because your application has enabled member-level trimming.</value>
616+
</data>
617+
<data name="FSharpDiscriminatedUnionsNotSupported" xml:space="preserve">
618+
<value>F# discriminated union serialization is not supported. Consider authoring a custom converter for the type.</value>
619+
</data>
620+
</root>

‎src/libraries/System.Text.Json/src/System.Text.Json.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<Compile Include="System\Text\Json\Serialization\IJsonOnSerialized.cs" />
9898
<Compile Include="System\Text\Json\Serialization\IJsonOnSerializing.cs" />
9999
<Compile Include="System\Text\Json\Serialization\JsonSerializerContext.cs" />
100+
<Compile Include="System\Text\Json\Serialization\Metadata\FSharpCoreReflectionProxy.cs" />
100101
<Compile Include="System\Text\Json\Serialization\Metadata\JsonMetadataServices.Collections.cs" />
101102
<Compile Include="System\Text\Json\Serialization\Metadata\JsonMetadataServices.Converters.cs" />
102103
<Compile Include="System\Text\Json\Serialization\Metadata\JsonTypeInfoInternalOfT.cs" />
@@ -132,6 +133,12 @@
132133
<Compile Include="System\Text\Json\Serialization\Converters\Collection\ListOfTConverter.cs" />
133134
<Compile Include="System\Text\Json\Serialization\Converters\Collection\QueueOfTConverter.cs" />
134135
<Compile Include="System\Text\Json\Serialization\Converters\Collection\StackOfTConverter.cs" />
136+
<Compile Include="System\Text\Json\Serialization\Converters\FSharp\FSharpListConverter.cs" />
137+
<Compile Include="System\Text\Json\Serialization\Converters\FSharp\FSharpMapConverter.cs" />
138+
<Compile Include="System\Text\Json\Serialization\Converters\FSharp\FSharpSetConverter.cs" />
139+
<Compile Include="System\Text\Json\Serialization\Converters\FSharp\FSharpTypeConverterFactory.cs" />
140+
<Compile Include="System\Text\Json\Serialization\Converters\FSharp\FSharpOptionConverter.cs" />
141+
<Compile Include="System\Text\Json\Serialization\Converters\FSharp\FSharpValueOptionConverter.cs" />
135142
<Compile Include="System\Text\Json\Serialization\Converters\Node\JsonArrayConverter.cs" />
136143
<Compile Include="System\Text\Json\Serialization\Converters\Node\JsonNodeConverter.cs" />
137144
<Compile Include="System\Text\Json\Serialization\Converters\Node\JsonNodeConverterFactory.cs" />

‎src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/FSharp/FSharpListConverter.cs

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Collections.Generic;
5+
using System.Diagnostics.CodeAnalysis;
6+
using System.Text.Json.Serialization.Metadata;
7+
8+
namespace System.Text.Json.Serialization.Converters
9+
{
10+
// Converter for F# lists: https://fsharp.github.io/fsharp-core-docs/reference/fsharp-collections-list-1.html
11+
internal sealed class FSharpListConverter<TList, TElement> : IEnumerableDefaultConverter<TList, TElement>
12+
where TList : IEnumerable<TElement>
13+
{
14+
private readonly Func<IEnumerable<TElement>, TList> _listConstructor;
15+
16+
[RequiresUnreferencedCode(FSharpCoreReflectionProxy.FSharpCoreUnreferencedCodeMessage)]
17+
public FSharpListConverter()
18+
{
19+
_listConstructor = FSharpCoreReflectionProxy.Instance.CreateFSharpListConstructor<TList, TElement>();
20+
}
21+
22+
protected override void Add(in TElement value, ref ReadStack state)
23+
{
24+
((List<TElement>)state.Current.ReturnValue!).Add(value);
25+
}
26+
27+
protected override void CreateCollection(ref Utf8JsonReader reader, ref ReadStack state, JsonSerializerOptions options)
28+
{
29+
state.Current.ReturnValue = new List<TElement>();
30+
}
31+
32+
protected override void ConvertCollection(ref ReadStack state, JsonSerializerOptions options)
33+
{
34+
state.Current.ReturnValue = _listConstructor((List<TElement>)state.Current.ReturnValue!);
35+
}
36+
37+
protected override bool OnWriteResume(Utf8JsonWriter writer, TList value, JsonSerializerOptions options, ref WriteStack state)
38+
{
39+
IEnumerator<TElement> enumerator;
40+
if (state.Current.CollectionEnumerator == null)
41+
{
42+
enumerator = value.GetEnumerator();
43+
if (!enumerator.MoveNext())
44+
{
45+
enumerator.Dispose();
46+
return true;
47+
}
48+
}
49+
else
50+
{
51+
enumerator = (IEnumerator<TElement>)state.Current.CollectionEnumerator;
52+
}
53+
54+
JsonConverter<TElement> converter = GetElementConverter(ref state);
55+
do
56+
{
57+
if (ShouldFlush(writer, ref state))
58+
{
59+
state.Current.CollectionEnumerator = enumerator;
60+
return false;
61+
}
62+
63+
TElement element = enumerator.Current;
64+
if (!converter.TryWrite(writer, element, options, ref state))
65+
{
66+
state.Current.CollectionEnumerator = enumerator;
67+
return false;
68+
}
69+
} while (enumerator.MoveNext());
70+
71+
enumerator.Dispose();
72+
return true;
73+
}
74+
}
75+
}

‎src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/FSharp/FSharpMapConverter.cs

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Collections.Generic;
5+
using System.Diagnostics.CodeAnalysis;
6+
using System.Text.Json.Serialization.Metadata;
7+
8+
namespace System.Text.Json.Serialization.Converters
9+
{
10+
// Converter for F# maps: https://fsharp.github.io/fsharp-core-docs/reference/fsharp-collections-fsharpmap-2.html
11+
internal sealed class FSharpMapConverter<TMap, TKey, TValue> : DictionaryDefaultConverter<TMap, TKey, TValue>
12+
where TMap : IEnumerable<KeyValuePair<TKey, TValue>>
13+
where TKey : notnull
14+
{
15+
private readonly Func<IEnumerable<Tuple<TKey, TValue>>, TMap> _mapConstructor;
16+
17+
[RequiresUnreferencedCode(FSharpCoreReflectionProxy.FSharpCoreUnreferencedCodeMessage)]
18+
public FSharpMapConverter()
19+
{
20+
_mapConstructor = FSharpCoreReflectionProxy.Instance.CreateFSharpMapConstructor<TMap, TKey, TValue>();
21+
}
22+
23+
protected override void Add(TKey key, in TValue value, JsonSerializerOptions options, ref ReadStack state)
24+
{
25+
((List<Tuple<TKey, TValue>>)state.Current.ReturnValue!).Add (new Tuple<TKey, TValue>(key, value));
26+
}
27+
28+
internal override bool CanHaveIdMetadata => false;
29+
30+
protected override void CreateCollection(ref Utf8JsonReader reader, ref ReadStack state)
31+
{
32+
state.Current.ReturnValue = new List<Tuple<TKey, TValue>>();
33+
}
34+
35+
protected override void ConvertCollection(ref ReadStack state, JsonSerializerOptions options)
36+
{
37+
state.Current.ReturnValue = _mapConstructor((List<Tuple<TKey, TValue>>)state.Current.ReturnValue!);
38+
}
39+
40+
protected internal override bool OnWriteResume(Utf8JsonWriter writer, TMap value, JsonSerializerOptions options, ref WriteStack state)
41+
{
42+
IEnumerator<KeyValuePair<TKey, TValue>> enumerator;
43+
if (state.Current.CollectionEnumerator == null)
44+
{
45+
enumerator = value.GetEnumerator();
46+
if (!enumerator.MoveNext())
47+
{
48+
enumerator.Dispose();
49+
return true;
50+
}
51+
}
52+
else
53+
{
54+
enumerator = (IEnumerator<KeyValuePair<TKey, TValue>>)state.Current.CollectionEnumerator;
55+
}
56+
57+
JsonTypeInfo typeInfo = state.Current.JsonTypeInfo;
58+
_keyConverter ??= GetConverter<TKey>(typeInfo.KeyTypeInfo!);
59+
_valueConverter ??= GetConverter<TValue>(typeInfo.ElementTypeInfo!);
60+
61+
do
62+
{
63+
if (ShouldFlush(writer, ref state))
64+
{
65+
state.Current.CollectionEnumerator = enumerator;
66+
return false;
67+
}
68+
69+
if (state.Current.PropertyState < StackFramePropertyState.Name)
70+
{
71+
state.Current.PropertyState = StackFramePropertyState.Name;
72+
73+
TKey key = enumerator.Current.Key;
74+
_keyConverter.WriteWithQuotes(writer, key, options, ref state);
75+
}
76+
77+
TValue element = enumerator.Current.Value;
78+
if (!_valueConverter.TryWrite(writer, element, options, ref state))
79+
{
80+
state.Current.CollectionEnumerator = enumerator;
81+
return false;
82+
}
83+
84+
state.Current.EndDictionaryElement();
85+
} while (enumerator.MoveNext());
86+
87+
enumerator.Dispose();
88+
return true;
89+
}
90+
}
91+
}

‎src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/FSharp/FSharpOptionConverter.cs

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Diagnostics.CodeAnalysis;
5+
using System.Text.Json.Serialization.Metadata;
6+
7+
namespace System.Text.Json.Serialization.Converters
8+
{
9+
// Converter for F# optional values: https://fsharp.github.io/fsharp-core-docs/reference/fsharp-core-option-1.html
10+
// Serializes `Some(value)` using the format of `value` and `None` values as `null`.
11+
internal sealed class FSharpOptionConverter<TOption, TElement> : JsonConverter<TOption>
12+
where TOption : class
13+
{
14+
// Reflect the converter strategy of the element type, since we use the identical contract for Some(_) values.
15+
internal override ConverterStrategy ConverterStrategy => _converterStrategy;
16+
internal override Type? ElementType => typeof(TElement);
17+
// 'None' is encoded using 'null' at runtime and serialized as 'null' in JSON.
18+
public override bool HandleNull => true;
19+
20+
private readonly JsonConverter<TElement> _elementConverter;
21+
private readonly Func<TOption, TElement> _optionValueGetter;
22+
private readonly Func<TElement?, TOption> _optionConstructor;
23+
private readonly ConverterStrategy _converterStrategy;
24+
25+
[RequiresUnreferencedCode(FSharpCoreReflectionProxy.FSharpCoreUnreferencedCodeMessage)]
26+
public FSharpOptionConverter(JsonConverter<TElement> elementConverter)
27+
{
28+
_elementConverter = elementConverter;
29+
_optionValueGetter = FSharpCoreReflectionProxy.Instance.CreateFSharpOptionValueGetter<TOption, TElement>();
30+
_optionConstructor = FSharpCoreReflectionProxy.Instance.CreateFSharpOptionSomeConstructor<TOption, TElement>();
31+
32+
// temporary workaround for JsonConverter base constructor needing to access
33+
// ConverterStrategy when calculating `CanUseDirectReadOrWrite`.
34+
// TODO move `CanUseDirectReadOrWrite` from JsonConverter to JsonTypeInfo.
35+
_converterStrategy = _elementConverter.ConverterStrategy;
36+
CanUseDirectReadOrWrite = _converterStrategy == ConverterStrategy.Value;
37+
}
38+
39+
internal override bool OnTryRead(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, ref ReadStack state, out TOption? value)
40+
{
41+
// `null` values deserialize as `None`
42+
if (!state.IsContinuation && reader.TokenType == JsonTokenType.Null)
43+
{
44+
value = null;
45+
return true;
46+
}
47+
48+
state.Current.JsonPropertyInfo = state.Current.JsonTypeInfo.ElementTypeInfo!.PropertyInfoForTypeInfo;
49+
if (_elementConverter.TryRead(ref reader, typeof(TElement), options, ref state, out TElement? element))
50+
{
51+
value = _optionConstructor(element);
52+
return true;
53+
}
54+
55+
value = null;
56+
return false;
57+
}
58+
59+
internal override bool OnTryWrite(Utf8JsonWriter writer, TOption value, JsonSerializerOptions options, ref WriteStack state)
60+
{
61+
if (value is null)
62+
{
63+
// Write `None` values as null
64+
writer.WriteNullValue();
65+
return true;
66+
}
67+
68+
TElement element = _optionValueGetter(value);
69+
state.Current.DeclaredJsonPropertyInfo = state.Current.JsonTypeInfo.ElementTypeInfo!.PropertyInfoForTypeInfo;
70+
return _elementConverter.TryWrite(writer, element, options, ref state);
71+
}
72+
73+
// Since this is a hybrid converter (ConverterStrategy depends on the element converter),
74+
// we need to override the value converter Write and Read methods too.
75+
76+
public override void Write(Utf8JsonWriter writer, TOption value, JsonSerializerOptions options)
77+
{
78+
if (value is null)
79+
{
80+
writer.WriteNullValue();
81+
}
82+
else
83+
{
84+
TElement element = _optionValueGetter(value);
85+
_elementConverter.Write(writer, element, options);
86+
}
87+
}
88+
89+
public override TOption? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
90+
{
91+
if (reader.TokenType == JsonTokenType.Null)
92+
{
93+
return null;
94+
}
95+
96+
TElement? element = _elementConverter.Read(ref reader, typeToConvert, options);
97+
return _optionConstructor(element);
98+
}
99+
}
100+
}

0 commit comments

Comments
 (0)