Optimize current reading

BinaryWizard.Sample/SampleEntity.cs

@@ -18,17 +18,18 @@ namespace BinaryWizard.Sample;
 
 [BinarySerializable]
 public partial class SampleEntity {
-    public int VectorCount;
+    public int IntegersCount;
 
-    [BinaryArray(Size = 2)] public SampleVector[] ConstantSizeVectors;
-
-    [BinaryArray(SizeMember = nameof(VectorCount))]
-    public SampleVector[] DynamicSizeVectors;
+    // [BinaryArray(Size = 2)] public int[] ConstantInts;
+    // [BinaryArray(Size = 2)] public SampleVector[] ConstantSizeVectors;
+    //
+    [BinaryArray(SizeMember = nameof(IntegersCount))]
+    public int[] DynamicSizeVectors;
 }
 
-[BinarySerializable]
-public partial class SampleVector {
-    public int X;
-    public int Y;
-    public int Z;
-}
+// [BinarySerializable]
+// public partial class SampleVector {
+//     public int X;
+//     public int Y;
+//     public int Z;
+// }

BinaryWizard.Tests/Samples/Arrays.cs

@@ -0,0 +1,10 @@
+namespace BinaryWizard.Tests.Samples;
+
+[BinarySerializable]
+public partial struct Arrays {
+    [BinaryArray(Size = 16)] public int[] NumberArray;
+    public int OtherNumbersSize;
+
+    [BinaryArray(SizeMember = nameof(OtherNumbersSize))]
+    public int[] OtherNumbers;
+}

BinaryWizard.Tests/Samples/Entity.cs

@@ -1,8 +1,8 @@
-namespace BinaryWizard.Tests.Samples;
-
-[BinarySerializable]
-public partial struct Entity {
-    public int Id;
-    public string Name;
-    public Vector3 Position;
-}
+// namespace BinaryWizard.Tests.Samples;
+//
+// [BinarySerializable]
+// public partial struct Entity {
+//     public int Id;
+//     public string Name;
+//     public Vector3 Position;
+// }

BinaryWizard.Tests/SerializerTests.cs

@@ -34,31 +34,63 @@ public void Vector3_CorrectlySerialized() {
         using var reader = new BinaryReader(stream);
 
         var actual = Vector3.FromBinary(reader);
-        var expected = new Vector3 { X = 1, Y = 2, Z = 3 };
+        var expected = new Vector3 {
+            X = 1, Y = 2, Z = 3,
+        };
 
         Assert.Equal(expected, actual);
     }
 
     [Fact]
-    public void Entity_CorrectlySerialized() {
+    public void Arrays_CorrectlySerialized() {
         using var stream = new MemoryStream();
         using (var writer = new BinaryWriter(stream, Encoding.UTF8, leaveOpen: true)) {
-            writer.Write(69); // Id
-            writer.Write("glomdom"); // Name
-
-            // Position: Vector3
-            writer.Write(1); // X
-            writer.Write(2); // Y
-            writer.Write(3); // Z
+            for (var i = 0; i < 16; i++) {
+                writer.Write(i);
+            }
+
+            writer.Write(4);
+
+            for (var i = 0; i < 4; i++) {
+                writer.Write(i);
+            }
         }
 
         stream.Position = 0;
 
         using var reader = new BinaryReader(stream);
+        var actual = Arrays.FromBinary(reader);
+        var expected = new Arrays {
+            NumberArray = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+            OtherNumbersSize = 4,
+            OtherNumbers = [0, 1, 2, 3],
+        };
 
-        var actual = Entity.FromBinary(reader);
-        var expected = new Entity { Id = 69, Name = "glomdom", Position = new Vector3 { X = 1, Y = 2, Z = 3 } };
-
-        Assert.Equal(expected, actual);
+        Assert.Equal(expected.NumberArray, actual.NumberArray);
+        Assert.Equal(expected.OtherNumbersSize, actual.OtherNumbersSize);
+        Assert.Equal(expected.OtherNumbers, actual.OtherNumbers);
     }
+
+    // [Fact]
+    // public void Entity_CorrectlySerialized() {
+    //     using var stream = new MemoryStream();
+    //     using (var writer = new BinaryWriter(stream, Encoding.UTF8, leaveOpen: true)) {
+    //         writer.Write(69); // Id
+    //         writer.Write("glomdom"); // Name
+    //
+    //         // Position: Vector3
+    //         writer.Write(1); // X
+    //         writer.Write(2); // Y
+    //         writer.Write(3); // Z
+    //     }
+    //
+    //     stream.Position = 0;
+    //
+    //     using var reader = new BinaryReader(stream);
+    //
+    //     var actual = Entity.FromBinary(reader);
+    //     var expected = new Entity { Id = 69, Name = "glomdom", Position = new Vector3 { X = 1, Y = 2, Z = 3 } };
+    //
+    //     Assert.Equal(expected, actual);
+    // }
 }

BinaryWizard/AnalyzerReleases.Unshipped.md

@@ -1,8 +1,8 @@
 ### New Rules
 
 Rule ID | Category | Severity | Notes
---------|----------|----------|----------
-BW0001  | Usage    | Error    | Object is not marked with `[BinarySerializable]` inside marked object.
-BW0002  | Usage    | Error    | Array type does not have a `[BinaryArray]` attribute.
-BW0003  | Usage    | Error    | Array marked with `[BinaryArray]` is missing argument defining size.
-BW0004  | Usage    | Error    | Array marked with `[BinaryArray]` has conflicting size arguments.
+--------|----------|----------|-------------
+BW0001  | Usage    | Error    | BinaryWizard
+BW0002  | Usage    | Error    | BinaryWizard
+BW0003  | Usage    | Error    | BinaryWizard
+BW0004  | Usage    | Error    | BinaryWizard

BinaryWizard/BinaryWizard.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
+        <LangVersion>13</LangVersion>
 
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
         <IsRoslynComponent>true</IsRoslynComponent>

BinaryWizard/Context.cs

@@ -0,0 +1,5 @@
+namespace BinaryWizard;
+
+public sealed record Context {
+    public int Offset { get; set; }
+}

BinaryWizard/DebugUtilities.cs

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 glomdom
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Diagnostics;
+using BinaryWizard.Model;
+
+namespace BinaryWizard;
+
+public static class DebugUtilities {
+    [Conditional("DEBUG")]
+    public static void CreatedFieldDef(FieldDef def) {
+        Debug.WriteLine($"Created field definition {def.Name} of {def.TypeModel.Type} ({def.ByteSize} bytes) (dynamic? {def.IsDynamic})");
+    }
+}