wip: array nullable reference type

Author: meixger

XmlSchemaClassGenerator.Tests/NullableElementReferenceList.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml.Schema;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace XmlSchemaClassGenerator.Tests;
+
+public class NullableElementReferenceListTest(ITestOutputHelper testOutputHelper)
+{
+    [Fact]
+    public void Test()
+    {
+        var mow = new MemoryOutputWriter();
+        var gen = new Generator()
+        {
+            OutputWriter = mow,
+            Log = testOutputHelper.WriteLine,
+            GenerateNullables = true,
+            EnableNullableReferenceAttributes = true,
+            GenerateInterfaces = false,
+            CompactTypeNames = true,
+            CollectionType = typeof(Array),
+            CollectionSettersMode = CollectionSettersMode.PublicWithoutConstructorInitialization,
+            UseShouldSerializePattern = true,
+            SerializeEmptyCollections = true
+        };
+        gen.Generate(GetXmlSchemaSet(Schema));
+
+        // log generated code
+        foreach (var line in mow.Content.SelectMany(l => l.Split(Environment.NewLine))) testOutputHelper.WriteLine(line);
+
+        var assembly = Compiler.Compile(nameof(Test), mow.Content.ToArray());
+        void assertNullable(string typename, bool nullable)
+        {
+            Type c = assembly.GetType(typename);
+            var property = c.GetProperty("Text");
+            var setParameter = property.SetMethod.GetParameters();
+            var getReturnParameter = property.GetMethod.ReturnParameter;
+            var allowNullableAttribute = setParameter.Single().CustomAttributes.SingleOrDefault(a => a.AttributeType == typeof(AllowNullAttribute));
+            var maybeNullAttribute = getReturnParameter.CustomAttributes.SingleOrDefault(a => a.AttributeType == typeof(MaybeNullAttribute));
+            var hasAllowNullAttribute = allowNullableAttribute != null;
+            var hasMaybeNullAttribute = maybeNullAttribute != null;
+            Assert.Equal(nullable, hasAllowNullAttribute);
+            Assert.Equal(nullable, hasMaybeNullAttribute);
+        }
+        assertNullable("SampleNamespace.ElementReferenceList", true);
+    }
+
+    const string Schema = """
+                          <?xml version="1.0" encoding="UTF-8"?>
+                          <xs:schema xmlns="SampleNamespace" targetNamespace="SampleNamespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+                          	<xs:element name="ElementReferenceList">
+                          		<xs:complexType>
+                          			<xs:sequence>
+                          				<xs:element name="Text" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                          				<xs:element name="Todo" type="xs:string" minOccurs="0"/>
+                          			</xs:sequence>
+                          		</xs:complexType>
+                          	</xs:element>
+                          </xs:schema>
+                          """;
+
+    private XmlSchemaSet GetXmlSchemaSet(string xsd)
+    {
+        var ms = new MemoryStream(Encoding.UTF8.GetBytes(xsd));
+        var schema = XmlSchema.Read(ms, null)!;
+        var set = new XmlSchemaSet();
+        set.Add(schema);
+        return set;
+    }
+}

XmlSchemaClassGenerator.Tests/XmlTests.cs

@@ -2688,7 +2688,7 @@ void assertNullable(string typename, bool nullable)
                 Assert.Equal(nullable, hasMaybeNullAttribute);
             }
             assertNullable("Test.ElementReferenceNullable", true);
-            assertNullable("Test.ElementReferenceList", false);
+            assertNullable("Test.ElementReferenceList", false);             // fails
             assertNullable("Test.ElementReferenceNonNullable", false);
             assertNullable("Test.AttributeReferenceNullable", true);
             assertNullable("Test.AttributeReferenceNonNullable", false);

XmlSchemaClassGenerator/TypeModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
@@ -606,7 +606,10 @@ string checkEquality()
 
         private bool IsNullableValueType => IsNullable && IsValueType;
 
-        private bool IsNullableReferenceType => IsNullable && (PropertyType is ClassModel || (PropertyType is SimpleModel model && !model.ValueType.IsValueType));
+        // IsNullable excludes enumerables
+        // private bool IsNullableReferenceType => IsNullable && (PropertyType is ClassModel || (PropertyType is SimpleModel model && !model.ValueType.IsValueType));
+        
+        private bool IsNullableReferenceType => DefaultValue == null && !IsRequired && (PropertyType is ClassModel || (PropertyType is SimpleModel model && !model.ValueType.IsValueType));
 
         private bool IsNillableValueType => IsNillable && !IsEnumerable && IsValueType;