Merge pull request #7 from BurningMarshmallow/master

Add support for nullable reference types in properties

Author: mifopen

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

.github/workflows/pr.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

src/LazyCoder/BaseCoder.cs

@@ -156,8 +156,8 @@ private static IEnumerable<Type> GetInterfaces(Type type, bool includeInherited)
             switch (csTypeMember)
             {
                 case CsProperty csProperty:
-                    var forceNullable = csProperty.Attributes
-                                                  .Any(a => a.Name.Contains("CanBeNull"));
+                    var forceNullable = csProperty.Attributes.Any(a => a.Name.Contains("CanBeNull"))
+                                        || csProperty.IsNullable;
                     return new TsPropertySignature
                            {
                                Name = csProperty.Name,

src/LazyCoder/CSharp/CsClass.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace LazyCoder.CSharp
 {

src/LazyCoder/CSharp/CsInterface.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace LazyCoder.CSharp
 {

src/LazyCoder/CSharp/CsProperty.cs

@@ -3,5 +3,6 @@ namespace LazyCoder.CSharp
     public class CsProperty: CsTypeMember
     {
         public CsType Type { get; set; }
+        public bool IsNullable { get; set; }
     }
 }

src/LazyCoder/CsDeclarationFactory.cs

@@ -149,6 +149,8 @@ private static CsTypeMember Create(FieldInfo fieldInfo)
                 return null;
             }
 
+            var context = new NullabilityInfoContext();
+            var info = context.Create(fieldInfo);
             return new CsField
                    {
                        Name = fieldInfo.Name,
@@ -213,6 +215,8 @@ private static CsProperty Create(PropertyInfo propertyInfo)
                 return null;
             }
 
+            var context = new NullabilityInfoContext();
+            var info = context.Create(propertyInfo);
             return new CsProperty
                    {
                        Name = propertyInfo.Name,
@@ -229,7 +233,8 @@ private static CsProperty Create(PropertyInfo propertyInfo)
                                                                  OriginalType = x.AttributeType
                                                              })
                                                 .ToArray(),
-                       Type = new CsType(propertyInfo.PropertyType)
+                       Type = new CsType(propertyInfo.PropertyType),
+                       IsNullable = info.ReadState == NullabilityState.Nullable
                    };
         }
 

src/LazyCoder/DefaultCoder.cs

@@ -1,6 +1,3 @@
-using LazyCoder.CSharp;
-using LazyCoder.Typescript;
-
 namespace LazyCoder
 {
     public class DefaultCoder: BaseCoder

src/LazyCoder/LazyCoder.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
-        <LangVersion>9</LangVersion>
+        <TargetFramework>net6.0</TargetFramework>
+        <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
         <Version>0.03.12</Version>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
 </Project>

src/LazyCoder/Typescript/TsTypeReference.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using LazyCoder.CSharp;
 
 namespace LazyCoder.Typescript

tests/LazyCoder.Tests/LazyCoder.Tests.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
-        <LangVersion>9</LangVersion>
+        <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>

tests/LazyCoder.Tests/Samples/Literals/Simple.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics.Contracts;
-using System.Linq;
+using System.Linq;
 using Shouldly;
 using Xunit;
 

tests/LazyCoder.Tests/Samples/Simple/FirstClass.ts

@@ -3,5 +3,6 @@ import { SecondClass } from "./Simple/SecondClass";
 
 export interface FirstClass {
     StringProperty: string;
+    StringNullableProperty: (string | null);
     SecondClassProperty: SecondClass;
 }

tests/LazyCoder.Tests/Samples/Simple/Simple.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -69,7 +68,7 @@ private static TsTypeMember[] GetProperties(CsClass csClass)
                               .Select(p => new TsPropertySignature
                                            {
                                                Name = p.Name,
-                                               Type = TsType.From(p.Type),
+                                               Type = TsType.From(p.Type, p.IsNullable),
                                                Optional = false
                                            })
                               .ToArray();
@@ -79,6 +78,7 @@ private static TsTypeMember[] GetProperties(CsClass csClass)
         private class FirstClass
         {
             public string StringProperty { get; set; }
+            public string? StringNullableProperty { get; set; }
             public SecondClass SecondClassProperty { get; set; }
         }