fix!: remove unauthorized spec

benchmark/Benchmark.cs

@@ -126,10 +126,10 @@ public int DeserializeAllProperties()
             ReadOnlySpan<int> integers = view.Integers;
             ReadOnlySpan<long> longs = view.Longs;
             ReadOnlySpan<PackedBenchmarkValue> packedValues = view.PackedValues;
-            NestedPayloadView nested = view.Nested;
-            int nestedVersion = nested.Version;
-            ReadOnlySpan<char> nestedLabel = nested.Label;
-            PackedBenchmarkValueView nestedSummary = nested.Summary;
+            NestedPayloadView? nested = view.Nested;
+            int nestedVersion = nested!.Value.Version;
+            ReadOnlySpan<char> nestedLabel = nested!.Value.Label;
+            PackedBenchmarkValueView nestedSummary = nested!.Value.Summary;
             NestedStructPayloadView nestedStruct = view.NestedStruct;
             int nestedStructCode = nestedStruct.Code;
             long nestedStructAmount = nestedStruct.Amount;

src/FieldGenerationModel.cs

@@ -33,6 +33,8 @@ internal FieldGenerationModel(
 
     internal int ElementByteCount { get; }
 
+    internal int BlittableByteOffset { get; set; }
+
     internal ITypeSymbol? ArrayElementType { get; }
 
     internal INamedTypeSymbol? NestedSerializableType { get; }

src/ZeroSerializerGenerator.cs

@@ -356,6 +356,7 @@
         }
 
         // Roslyn's member order is the wire declaration order; never infer a different order from file paths or spans.
+        int blittableByteOffset = 0;
         foreach (ISymbol declaredMember in serializableType.GetMembers())
         {
             // Only public getter properties define the wire contract; fields, setters, and indexers must never leak into it.
@@ -398,7 +399,9 @@
                     serializableProperty.Name));
             }
 
+            propertyModel.BlittableByteOffset = blittableByteOffset;
             generationModel.Fields.Add(propertyModel);
+            blittableByteOffset += propertyModel.ElementByteCount;
         }
 
         return generationModel;
@@ -1272,14 +1275,28 @@
             propertyType = field.Symbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
         }
 
-        sourceBuilder.AppendLine($"{propertyAccessibility} {propertyType} {EscapeIdentifier(field.Symbol.Name)}");
+        var propertyReturnType
+            = field.Kind is FieldSerializationKind.BlittableStruct or FieldSerializationKind.Nested
+            ? (field.NullableUnderlyingType is not null || field.Symbol.Type.TypeKind is TypeKind.Class)
+                ? GetQualifiedViewName(field.NestedSerializableType) + "?"
+                : GetQualifiedViewName(field.NestedSerializableType)
+            : propertyType;
+        sourceBuilder.AppendLine($"{propertyAccessibility} {propertyReturnType} {EscapeIdentifier(field.Symbol.Name)}");
         sourceBuilder.OpenBlock();
         sourceBuilder.AppendLine("get");
         sourceBuilder.OpenBlock();
         if (containingModel.IsBlittableStruct)
         {
-            sourceBuilder.AppendLine($"{containingModel.QualifiedSourceTypeName} blittableSourceValue = MemoryMarshal.Read<{containingModel.QualifiedSourceTypeName}>(serializedMemory.Span);");
-            sourceBuilder.AppendLine($"return blittableSourceValue.{EscapeIdentifier(field.Symbol.Name)};");
+            if (field.Kind == FieldSerializationKind.BlittableStruct
+                && field.NestedSerializableType is not null)
+            {
+                sourceBuilder.AppendLine($"return new {GetQualifiedViewName(field.NestedSerializableType)}(serializedMemory.Slice({field.BlittableByteOffset}, {field.ElementByteCount}));");
+            }
+            else
+            {
+                sourceBuilder.AppendLine($"{containingModel.QualifiedSourceTypeName} blittableSourceValue = MemoryMarshal.Read<{containingModel.QualifiedSourceTypeName}>(serializedMemory.Span);");
+                sourceBuilder.AppendLine($"return blittableSourceValue.{EscapeIdentifier(field.Symbol.Name)};");
+            }
             sourceBuilder.CloseBlock();
             sourceBuilder.CloseBlock();
             return;
@@ -1292,14 +1309,8 @@
             // Null is represented entirely by the offset table; no property payload marker is read.
             sourceBuilder.AppendLine("if (fieldDataOffset == 0)");
             sourceBuilder.OpenBlock();
-            if (field.NullableUnderlyingType is not null && field.Kind != FieldSerializationKind.Nested)
-            {
-                sourceBuilder.AppendLine("return null;");
-            }
-            else
-            {
-                sourceBuilder.AppendLine("return default;");
-            }
+            // Always use 'default' instead of 'null' for reference types.
+            sourceBuilder.AppendLine("return default;");
             sourceBuilder.CloseBlock();
         }
 

tests-unity/UnityCompatibility.cs

@@ -119,11 +119,11 @@
     && variableView.OptionalState == PacketState.Ready
     && variableView.OptionalPosition!.Value.X == 30
     && variableView.MissingOptionalPosition is null
-    && variableView.Child.Identifier == 99
+    && variableView.Child?.Identifier == 99
     && variableView.StructChild.Identifier == 100
     && variableView.StructChild.Name.SequenceEqual("struct".AsSpan())
-    && variableView.OptionalStructChild.Identifier == 101
-    && variableView.OptionalStructChild.Name.SequenceEqual("optional struct".AsSpan())
+    && variableView.OptionalStructChild?.Identifier == 101
+    && variableView.OptionalStructChild?.Name.SequenceEqual("optional struct".AsSpan()) == true
     && variableView.FloatValues.Length == 3
     && variableView.FloatValues[1] == 2.5f
     && variableView.DoubleValues.Length == 3
@@ -267,7 +267,7 @@
 }
 
 [ZeroSerializer]
 public struct FixedPacket
 {
     public bool BooleanValue { get; init; }
 
@@ -400,13 +400,13 @@
     public int IgnoredField;
 }
 
 [ZeroSerializer(EmitShapeTag = true)]
 public sealed class EmptyClassPacket
 {
 }
 
 [ZeroSerializer(EmitShapeTag = true)]
 public struct EmptyStructPacket
 {
 }
 
@@ -443,7 +443,7 @@
 }
 
 [ZeroSerializer]
 public record struct UnitySimpleRecordStruct
 {
     public int IntValue { get; init; }
     public double DoubleValue { get; init; }

tests/SerializationTests.cs

@@ -246,12 +246,12 @@ public void VariableDataRoundTrip()
 
         int expectedRequiredByteLength = -(24 + (4 * IntPtr.Size));
         TestAssert.Equal(expectedRequiredByteLength, VariableRecordView.RequiredByteLength, nameof(VariableRecordView.RequiredByteLength));
-        TestAssert.Equal(source.Text, view.Text.ToString(), nameof(view.Text));
-        TestAssert.SequenceEqual<int>(source.Values, view.Values, nameof(view.Values));
-        TestAssert.Equal(source.OptionalNumber, view.OptionalNumber, nameof(view.OptionalNumber));
-        TestAssert.Equal(source.Child.Identifier, view.Child.Identifier, nameof(view.Child.Identifier));
-        TestAssert.Equal(source.Child.State, view.Child.State, nameof(view.Child.State));
-        TestAssert.Equal(source.Tail, view.Tail, nameof(view.Tail));
+        TestAssert.Equal(source.Text, view.Text.ToString(), nameof(source.Text));
+        TestAssert.SequenceEqual<int>(source.Values, view.Values, nameof(source.Values));
+        TestAssert.Equal(source.OptionalNumber, view.OptionalNumber, nameof(source.OptionalNumber));
+        TestAssert.Equal(source.Child.Identifier, view.Child!.Value.Identifier, nameof(source.Child.Identifier));
+        TestAssert.Equal(source.Child.State, view.Child!.Value.State, nameof(source.Child.State));
+        TestAssert.Equal(source.Tail, view.Tail, nameof(source.Tail));
         int textFieldOffset = BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(0, 4));
         int valuesFieldOffset = BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(4, 4));
         int optionalNumberFieldOffset = BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(8, 4));
@@ -284,8 +284,8 @@ public void VariableViewOnlyRequiresCorrectSerializedStart()
         TestAssert.Equal(source.Text, view.Text.ToString(), nameof(view.Text));
         TestAssert.SequenceEqual<int>(source.Values, view.Values, nameof(view.Values));
         TestAssert.Equal(source.OptionalNumber, view.OptionalNumber, nameof(view.OptionalNumber));
-        TestAssert.Equal(source.Child.Identifier, view.Child.Identifier, nameof(view.Child.Identifier));
-        TestAssert.Equal(source.Child.State, view.Child.State, nameof(view.Child.State));
+        TestAssert.Equal(source.Child.Identifier, view.Child?.Identifier ?? -1, nameof(FixedClassView.Identifier));
+        TestAssert.Equal(source.Child.State, view.Child?.State ?? ByteState.None, nameof(FixedClassView.State));
         TestAssert.Equal(source.Tail, view.Tail, nameof(view.Tail));
 
         ReadOnlyMemory<byte> borrowedSerializedMemory = view;
@@ -309,15 +309,17 @@ public void NullValuesRoundTrip()
         int writtenBytes = source.Serialize(buffer);
         var view = new VariableRecordView(buffer.AsMemory(0, writtenBytes));
 
-        TestAssert.Equal(0, view.Text.Length, nameof(view.Text.Length));
-        TestAssert.Equal(0, view.Values.Length, nameof(view.Values.Length));
-        TestAssert.Equal<int?>(null, view.OptionalNumber, nameof(view.OptionalNumber));
         TestAssert.Equal(0, BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(0, 4)), "Null string offset");
         TestAssert.Equal(0, BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(4, 4)), "Null array offset");
         TestAssert.Equal(0, BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(8, 4)), "Null nullable offset");
         TestAssert.Equal(0, BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(12, 4)), "Null reference offset");
         TestAssert.Equal(20, BinaryPrimitives.ReadInt32LittleEndian(buffer.AsSpan(16, 4)), "Tail offset");
         TestAssert.Equal(24, writtenBytes, nameof(writtenBytes));
+
+        TestAssert.Equal(0, view.Text.Length, nameof(view.Text.Length));
+        TestAssert.Equal(0, view.Values.Length, nameof(view.Values.Length));
+        TestAssert.Equal<int?>(null, view.OptionalNumber, nameof(view.OptionalNumber));
+        TestAssert.Equal<FixedClassView?>(null, view.Child, nameof(view.Child));
         TestAssert.Equal(5, view.Tail, nameof(view.Tail));
     }
 
@@ -521,9 +523,9 @@ public void EveryTruncatedSerializedBufferThrowsStandardBoundsExceptionWhenRead(
                 _ = view.Text.Length;
                 _ = view.Values.Length;
                 _ = view.OptionalNumber;
-                FixedClassView childView = view.Child;
-                _ = childView.Identifier;
-                _ = childView.State;
+                FixedClassView? childView = view.Child;
+                _ = childView?.Identifier;
+                _ = childView?.State;
                 _ = view.Tail;
             },
             nameof(VariableRecord));
@@ -777,7 +779,7 @@ public void NestedTypesReturnViewsTest()
         // 2. Assert that nested non-blittable type returns view
         PropertyInfo? childProperty = typeof(VariableRecordView).GetProperty(nameof(VariableRecordView.Child));
         Assert.NotNull(childProperty);
-        Assert.Equal(typeof(FixedClassView), childProperty!.PropertyType);
+        Assert.Equal(typeof(FixedClassView?), childProperty!.PropertyType);
     }
 
     public void StrictBlittableStructTests()
@@ -1301,13 +1303,13 @@ public void SharedReferenceInstancesRoundTrip()
         int writtenBytes = container.Serialize(buffer);
         var view = new DuplicateInstanceContainerView(buffer.AsMemory(0, writtenBytes));
 
-        TestAssert.Equal(100, view.Foo.Value, nameof(view.Foo.Value));
-        TestAssert.Equal(100, view.Bar.Value, nameof(view.Bar.Value));
-        TestAssert.Equal(200, view.Baz.Value, nameof(view.Baz.Value));
+        TestAssert.Equal(100, view.Foo?.Value, nameof(container.Foo.Value));
+        TestAssert.Equal(100, view.Bar?.Value, nameof(container.Bar.Value));
+        TestAssert.Equal(200, view.Baz?.Value, nameof(container.Baz.Value));
 
-        TestAssert.Equal(42, view.Foo.Nested.NestedValue, nameof(view.Foo.Nested.NestedValue));
-        TestAssert.Equal(42, view.Bar.Nested.NestedValue, nameof(view.Bar.Nested.NestedValue));
-        TestAssert.Equal(42, view.Baz.Nested.NestedValue, nameof(view.Baz.Nested.NestedValue));
+        TestAssert.Equal(42, view.Foo?.Nested?.NestedValue, nameof(container.Foo.Nested.NestedValue));
+        TestAssert.Equal(42, view.Bar?.Nested?.NestedValue, nameof(container.Bar.Nested.NestedValue));
+        TestAssert.Equal(42, view.Baz?.Nested?.NestedValue, nameof(container.Baz.Nested.NestedValue));
 
         TestAssert.Equal(writtenBytes, view.GetByteLength(), "SharedReferenceInstances GetByteLength");
     }