Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public Parser(Compilation compilation, in JsonSourceGenerationContext sourceGene
_stringType = _metadataLoadContext.Resolve(SpecialType.System_String);

_dateTimeOffsetType = _metadataLoadContext.Resolve(typeof(DateTimeOffset));
_byteArrayType = _metadataLoadContext.Resolve(typeof(byte[]));
_byteArrayType = _metadataLoadContext.Resolve(typeof(byte)).MakeArrayType();
_guidType = _metadataLoadContext.Resolve(typeof(Guid));
_uriType = _metadataLoadContext.Resolve(typeof(Uri));
_versionType = _metadataLoadContext.Resolve(typeof(Version));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
Expand All @@ -20,7 +21,13 @@ public MetadataLoadContextInternal(Compilation compilation)
_compilation = compilation;
}

public Type? Resolve(Type type) => Resolve(type.FullName!);
public Compilation Compilation => _compilation;

public Type? Resolve(Type type)
{
Debug.Assert(!type.IsArray, "Resolution logic only capable of handling named types.");
return Resolve(type.FullName!);
}

public Type? Resolve(string fullyQualifiedMetadataName)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,11 @@ public override Type GetElementType()
return _elementType;
}

public override Type MakeArrayType()
{
return _metadataLoadContext.Compilation.CreateArrayTypeSymbol(_typeSymbol).AsType(_metadataLoadContext);
}

public override EventInfo GetEvent(string name, BindingFlags bindingAttr)
{
throw new NotImplementedException();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public interface ITestContext
public JsonTypeInfo<RealWorldContextTests.MyNestedClass> MyNestedClass { get; }
public JsonTypeInfo<RealWorldContextTests.MyNestedClass.MyNestedNestedClass> MyNestedNestedClass { get; }
public JsonTypeInfo<object[]> ObjectArray { get; }
public JsonTypeInfo<byte[]> ByteArray { get; }
public JsonTypeInfo<string> String { get; }
public JsonTypeInfo<(string Label1, int Label2, bool)> ValueTupleStringInt32Boolean { get; }
public JsonTypeInfo<RealWorldContextTests.ClassWithEnumAndNullable> ClassWithEnumAndNullable { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ namespace System.Text.Json.SourceGeneration.Tests
[JsonSerializable(typeof(MyTypeWithPropertyOrdering))]
[JsonSerializable(typeof(MyIntermediateType))]
[JsonSerializable(typeof(HighLowTempsImmutable))]
[JsonSerializable(typeof(byte[]))]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass))]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass.MyNestedNestedClass))]
[JsonSerializable(typeof(object[]))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace System.Text.Json.SourceGeneration.Tests
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass.MyNestedNestedClass), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof(object[]), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof(byte[]), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof(string), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof((string Label1, int Label2, bool)), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof(RealWorldContextTests.ClassWithEnumAndNullable), GenerationMode = JsonSourceGenerationMode.Metadata)]
Expand Down Expand Up @@ -66,6 +67,7 @@ public override void EnsureFastPathGeneratedAsExpected()
Assert.Null(MetadataWithPerTypeAttributeContext.Default.MyNestedClass.SerializeHandler);
Assert.Null(MetadataWithPerTypeAttributeContext.Default.MyNestedNestedClass.SerializeHandler);
Assert.Null(MetadataWithPerTypeAttributeContext.Default.ObjectArray.SerializeHandler);
Assert.Null(MetadataWithPerTypeAttributeContext.Default.ByteArray.SerializeHandler);
Assert.Null(MetadataWithPerTypeAttributeContext.Default.SampleEnum.SerializeHandler);
Assert.Null(MetadataWithPerTypeAttributeContext.Default.String.SerializeHandler);
Assert.Null(MetadataWithPerTypeAttributeContext.Default.ValueTupleStringInt32Boolean.SerializeHandler);
Expand Down Expand Up @@ -103,6 +105,7 @@ public override void EnsureFastPathGeneratedAsExpected()
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass))]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass.MyNestedNestedClass))]
[JsonSerializable(typeof(object[]))]
[JsonSerializable(typeof(byte[]))]
[JsonSerializable(typeof(string))]
[JsonSerializable(typeof((string Label1, int Label2, bool)))]
[JsonSerializable(typeof(RealWorldContextTests.ClassWithEnumAndNullable))]
Expand Down Expand Up @@ -168,6 +171,7 @@ public override void EnsureFastPathGeneratedAsExpected()
Assert.Null(MetadataContext.Default.MyNestedClass.SerializeHandler);
Assert.Null(MetadataContext.Default.MyNestedNestedClass.SerializeHandler);
Assert.Null(MetadataContext.Default.ObjectArray.SerializeHandler);
Assert.Null(MetadataContext.Default.ByteArray.SerializeHandler);
Assert.Null(MetadataContext.Default.SampleEnum.SerializeHandler);
Assert.Null(MetadataContext.Default.String.SerializeHandler);
Assert.Null(MetadataContext.Default.ValueTupleStringInt32Boolean.SerializeHandler);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace System.Text.Json.SourceGeneration.Tests
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass.MyNestedNestedClass), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(object[]), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof(byte[]), GenerationMode = JsonSourceGenerationMode.Metadata)]
[JsonSerializable(typeof(string), GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof((string Label1, int Label2, bool)), GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(RealWorldContextTests.ClassWithEnumAndNullable), GenerationMode = JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization)]
Expand Down Expand Up @@ -68,6 +69,7 @@ public override void EnsureFastPathGeneratedAsExpected()
Assert.NotNull(MixedModeContext.Default.MyNestedClass.SerializeHandler);
Assert.NotNull(MixedModeContext.Default.MyNestedNestedClass.SerializeHandler);
Assert.Null(MixedModeContext.Default.ObjectArray.SerializeHandler);
Assert.Null(MixedModeContext.Default.ByteArray.SerializeHandler);
Assert.Null(MixedModeContext.Default.SampleEnum.SerializeHandler);
Assert.Null(MixedModeContext.Default.String.SerializeHandler);
Assert.NotNull(MixedModeContext.Default.ValueTupleStringInt32Boolean.SerializeHandler);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,19 @@ public virtual void SerializeObjectArray_SimpleTypes_WithCustomOptions()
Assert.Equal("\"World\"", world.GetRawText());
}

[Fact]
public virtual void SerializeByteArray()
{
byte[] value = new byte[] { 1, 2, 3 };
const string expectedJson = "\"AQID\"";

string actualJson = JsonSerializer.Serialize(value, DefaultContext.ByteArray);
Assert.Equal(expectedJson, actualJson);

byte[] arr = JsonSerializer.Deserialize(actualJson, DefaultContext.ByteArray);
Assert.Equal(value, arr);
}

[Fact]
public virtual void HandlesNestedTypes()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace System.Text.Json.SourceGeneration.Tests
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass))]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass.MyNestedNestedClass))]
[JsonSerializable(typeof(object[]))]
[JsonSerializable(typeof(byte[]))]
[JsonSerializable(typeof(string))]
[JsonSerializable(typeof((string Label1, int Label2, bool)))]
[JsonSerializable(typeof(RealWorldContextTests.ClassWithEnumAndNullable))]
Expand Down Expand Up @@ -62,6 +63,7 @@ internal partial class SerializationContext : JsonSerializerContext, ITestContex
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass.MyNestedNestedClass), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(object[]), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(byte[]), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(string), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof((string Label1, int Label2, bool)), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(RealWorldContextTests.ClassWithEnumAndNullable), GenerationMode = JsonSourceGenerationMode.Serialization)]
Expand Down Expand Up @@ -100,6 +102,7 @@ internal partial class SerializationWithPerTypeAttributeContext : JsonSerializer
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(RealWorldContextTests.MyNestedClass.MyNestedNestedClass), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(object[]), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(byte[]), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(string), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof((string Label1, int Label2, bool)), GenerationMode = JsonSourceGenerationMode.Serialization)]
[JsonSerializable(typeof(RealWorldContextTests.ClassWithEnumAndNullable), GenerationMode = JsonSourceGenerationMode.Serialization)]
Expand Down Expand Up @@ -149,6 +152,7 @@ public override void EnsureFastPathGeneratedAsExpected()
Assert.NotNull(SerializationContext.Default.MyNestedClass.SerializeHandler);
Assert.NotNull(SerializationContext.Default.MyNestedNestedClass.SerializeHandler);
Assert.Null(SerializationContext.Default.ObjectArray.SerializeHandler);
Assert.Null(SerializationContext.Default.ByteArray.SerializeHandler);
Assert.Null(SerializationContext.Default.String.SerializeHandler);
Assert.NotNull(SerializationContext.Default.ValueTupleStringInt32Boolean.SerializeHandler);
Assert.NotNull(SerializationContext.Default.ClassWithEnumAndNullable.SerializeHandler);
Expand Down Expand Up @@ -451,6 +455,7 @@ public override void EnsureFastPathGeneratedAsExpected()
Assert.NotNull(SerializationWithPerTypeAttributeContext.Default.MyNestedClass.SerializeHandler);
Assert.NotNull(SerializationWithPerTypeAttributeContext.Default.MyNestedNestedClass.SerializeHandler);
Assert.Null(SerializationWithPerTypeAttributeContext.Default.ObjectArray.SerializeHandler);
Assert.Null(SerializationWithPerTypeAttributeContext.Default.ByteArray.SerializeHandler);
Assert.Null(SerializationWithPerTypeAttributeContext.Default.SampleEnum.SerializeHandler);
Assert.Null(SerializationWithPerTypeAttributeContext.Default.String.SerializeHandler);
Assert.NotNull(SerializationWithPerTypeAttributeContext.Default.ValueTupleStringInt32Boolean.SerializeHandler);
Expand Down