Skip to content
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

fix(dotnet): F# dictionaries cause NullReferenceException #1655

Merged
merged 3 commits into from
May 14, 2020
Merged

fix(dotnet): F# dictionaries cause NullReferenceException #1655

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9745b1
fix(dotnet): F# dictionaries cause NullReferenceException
RomainMuller May 12, 2020
3b89846
add test
RomainMuller May 13, 2020
29dc4b9
Merge branch 'master' into rmuller/make-fsharp-dicts-work
mergify[bot] May 14, 2020
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
35 changes: 35 additions & 0 deletions ...n.JSII.Runtime.IntegrationTests.FSharp/Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>

<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

<IsPackable>false</IsPackable>
<VSTestLogger>xunit</VSTestLogger>
</PropertyGroup>

<ItemGroup>
<Compile Include="Tests.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId" Version="[$(JsiiVersion)]" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="XunitXml.TestLogger" Version="2.1.26" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\dotnet-runtime\src\Amazon.JSII.Runtime\Amazon.JSII.Runtime.csproj" />
</ItemGroup>

</Project>
15 changes: 15 additions & 0 deletions packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.FSharp/Tests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
namespace Amazon.JSII.Runtime.IntegrationTests.FSharp
#nowarn "44" // Usage of Obsolete entity

open Amazon.JSII.Tests.CalculatorNamespace
open Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
open System
open Xunit

type [<Sealed>] Tests () =

[<Fact>]
member this.FSharpDictCanBePassedDown () =
let allTypes = new AllTypes()
let number = new Number(1337.0)
allTypes.MapProperty = dict[("number", number)]
8 changes: 7 additions & 1 deletion packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Runtime.Integra
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Runtime", "..\..\dotnet-runtime\src\Amazon.JSII.Runtime\Amazon.JSII.Runtime.csproj", "{CA2CBE1C-5435-416B-B4E6-22D1FABA8AFF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.JsonModel", "..\..\dotnet-jsonmodel\src\Amazon.JSII.JsonModel\Amazon.JSII.JsonModel.csproj", "{1E0BFD79-D221-425D-ADFF-1DF939BCFC58}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.JsonModel", "..\..\dotnet-runtime\src\Amazon.JSII.JsonModel\Amazon.JSII.JsonModel.csproj", "{1E0BFD79-D221-425D-ADFF-1DF939BCFC58}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Amazon.JSII.Runtime.IntegrationTests.FSharp", "Amazon.JSII.Runtime.IntegrationTests.FSharp\Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj", "{224406B0-12D5-408C-91E9-7420F72C2855}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -25,5 +27,9 @@ Global
{1E0BFD79-D221-425D-ADFF-1DF939BCFC58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E0BFD79-D221-425D-ADFF-1DF939BCFC58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E0BFD79-D221-425D-ADFF-1DF939BCFC58}.Release|Any CPU.Build.0 = Release|Any CPU
{224406B0-12D5-408C-91E9-7420F72C2855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{224406B0-12D5-408C-91E9-7420F72C2855}.Debug|Any CPU.Build.0 = Debug|Any CPU
{224406B0-12D5-408C-91E9-7420F72C2855}.Release|Any CPU.ActiveCfg = Release|Any CPU
{224406B0-12D5-408C-91E9-7420F72C2855}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
14 changes: 7 additions & 7 deletions ...ii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/FrameworkToJsiiConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ protected override bool TryConvertClass(Type type, IReferenceMap referenceMap, o
var structInfo = new JObject();
structInfo.Add(new JProperty("fqn", byValueAttribute.FullyQualifiedName));
structInfo.Add(new JProperty("data", data));

var resultObject = new JObject();
resultObject.Add(new JProperty("$jsii.struct", structInfo));

result = resultObject;
return true;
}
Expand Down Expand Up @@ -253,8 +253,8 @@ protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference
return true;
}

Type valueType = value.GetType()!;
Type dictionaryInterface = valueType.GetInterfaces()
Type dictionaryInterface = value.GetType()!
.GetInterfaces()
.FirstOrDefault(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IDictionary<,>));

if (dictionaryInterface == null ||
Expand All @@ -264,8 +264,8 @@ protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference
return false;
}

IEnumerable<string> keys = (IEnumerable<string>) valueType.GetProperty("Keys")!.GetValue(value)!;
PropertyInfo indexer = ReflectionUtils.GetIndexer(valueType);
IEnumerable<string> keys = (IEnumerable<string>)dictionaryInterface.GetProperty("Keys")!.GetValue(value)!;
PropertyInfo indexer = ReflectionUtils.GetIndexer(dictionaryInterface);

JObject resultObject = new JObject();
foreach (string key in keys)
Expand Down Expand Up @@ -408,7 +408,7 @@ TypeReference InferType(IReferenceMap referenceMap, Type type)
(
kind: CollectionKind.Map,
elementType: typeof(Object) == elementType
? new TypeReference(primitive: PrimitiveType.Any)
? new TypeReference(primitive: PrimitiveType.Any)
: InferType(referenceMap, elementType)
)
);
Expand Down