🎨

Author: andersstorhaug

TronDotNet.SystemTextJson/TronJsonEncoder.cs

@@ -96,11 +96,11 @@ private static Status EncodeSwitch(ReadOnlySpan<byte> buffer, int nestingDepth,
                 writer.WriteStringValue(value.GetUtf8());
                 break;
             case ValueKind.Object:
-                if ((status = EncodeObject(buffer, value.TypeOffset, nestingDepth, ref writer)) < 0)
+                if ((status = EncodeObject(buffer, value.Offset, nestingDepth, ref writer)) < 0)
                     return status;
                 break;
             case ValueKind.Array:
-                if ((status = EncodeArray(buffer, value.TypeOffset, nestingDepth, ref writer)) < 0)
+                if ((status = EncodeArray(buffer, value.Offset, nestingDepth, ref writer)) < 0)
                     return status;
                 break;
             default:

TronDotNet.Tests/BufferApiExamples.cs

@@ -106,7 +106,7 @@ public void Can_read_messages()
         if (priceValue.GetValueKind() == ValueKind.F64)
         {
             output.WriteLine($"price value: {priceValue.GetDouble()}");
-            output.WriteLine($"price value type size: {priceValue.GetValueKindSize()}");
+            output.WriteLine($"price value type size: {priceValue.GetValueSize()}");
         }
 
         var entryCount = Tron.GetCount(buffer, 0);

TronDotNet.Tests/ContextApiExamples.cs

@@ -110,7 +110,7 @@ public void Can_read_messages()
         if (priceValue.GetValueKind() == ValueKind.F64)
         {
             output.WriteLine($"price value: {priceValue.GetDouble()}");
-            output.WriteLine($"price value type size: {priceValue.GetValueKindSize()}");
+            output.WriteLine($"price value type size: {priceValue.GetValueSize()}");
         }
 
         var entryCount = context.GetCount(0);

TronDotNet/Lite3.Core.H.cs

@@ -101,8 +101,8 @@ public enum ValueKind : byte
     public readonly ref struct ReadOnlyValueEntry(ReadOnlySpan<byte> buffer, int startOffset)
     {
         private readonly ReadOnlySpan<byte> _buffer = buffer;
-        internal byte Type => _buffer[TypeOffset];
-        public readonly int TypeOffset = startOffset;
+        internal byte Type => _buffer[Offset];
+        public readonly int Offset = startOffset;
         internal readonly int ValueOffset = startOffset + ValueSize;
         internal ReadOnlySpan<byte> Value => _buffer[ValueOffset..];
     }
@@ -118,7 +118,7 @@ internal ref struct ValueEntry(Span<byte> buffer, int startOffset)
     private const int ValueSize = 1;
 
     /// <remarks><em>Ported from C <c>lite3_type_sizes</c>.</em></remarks>
-    private static readonly int[] ValueKindSizes =
+    internal static readonly int[] ValueKindSizes =
     [
         0, // Null
         1, // Bool
@@ -1062,7 +1062,7 @@ public static ValueKind GetValueKind(ReadOnlySpan<byte> buffer, int offset, Read
     /// </remarks>
     [TronApi(KeyDataArg = nameof(keyData))]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static Status GetValueKindSize(ReadOnlySpan<byte> buffer, int offset, ReadOnlySpan<byte> key, KeyData keyData, out uint value)
+    public static Status GetValueSize(ReadOnlySpan<byte> buffer, int offset, ReadOnlySpan<byte> key, KeyData keyData, out uint value)
     {
         Status status;
         value = 0;
@@ -1469,7 +1469,7 @@ internal static Status GetBytes(ReadOnlySpan<byte> buffer, int offset, ReadOnlyS
         }
 
         value = new BytesEntry(
-            BinaryPrimitives.ReadUInt32LittleEndian(buffer[entry.TypeOffset..]),
+            BinaryPrimitives.ReadUInt32LittleEndian(buffer[entry.Offset..]),
             (int)BinaryPrimitives.ReadUInt32LittleEndian(buffer[entry.ValueOffset..]),
             entry.ValueOffset
         );
@@ -1544,7 +1544,7 @@ public static Status GetObject(ReadOnlySpan<byte> buffer, int offset, ReadOnlySp
             return Status.ValueKindDoesNotMatch;
         }
 
-        objectOffset = entry.TypeOffset;
+        objectOffset = entry.Offset;
         return 0;
     }
 
@@ -1577,7 +1577,7 @@ public static Status GetArray(ReadOnlySpan<byte> buffer, int offset, ReadOnlySpa
             return Status.ValueKindDoesNotMatch;
         }
 
-        arrayOffset = entry.TypeOffset;
+        arrayOffset = entry.Offset;
         return 0;
     }
 
@@ -1760,7 +1760,7 @@ public static Status ArrayGetObject(ReadOnlySpan<byte> buffer, int offset, uint
             return Status.ValueKindDoesNotMatch;
         }
 
-        objectOffset = entry.TypeOffset;
+        objectOffset = entry.Offset;
         return 0;
     }
 
@@ -1789,7 +1789,7 @@ public static Status ArrayGetArray(ReadOnlySpan<byte> buffer, int offset, uint i
             return Status.ValueKindDoesNotMatch;
         }
 
-        arrayOffset = entry.TypeOffset;
+        arrayOffset = entry.Offset;
         return 0;
     }
 
@@ -1852,7 +1852,7 @@ public static ValueKind GetValueKind(in ReadOnlyValueEntry entry)
     /// </remarks>
     [TronApi(IsTryPattern = false)]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static int GetValueKindSize(in ReadOnlyValueEntry entry)
+    internal static int GetValueSize(in ReadOnlyValueEntry entry)
     {
         var type = (ValueKind)entry.Type;
 

TronDotNet/Tron.cs

@@ -101,10 +101,13 @@ public string GetStringValue(TronContext context)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Lite3.ValueKind GetValueKind() => Lite3.GetValueKind(value);
 
-        /// <inheritdoc cref="Lite3.GetValueKindSize" />
+        /// <inheritdoc cref="Lite3.GetValueSize" />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int GetValueKindSize() => Lite3.GetValueKindSize(value);
-
+        public int GetValueSize() => Lite3.GetValueSize(value);
+        
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public int GetSize() => Lite3.ValueKindSizes[value.Type] + Lite3.GetValueSize(value);
+        
         /// <inheritdoc cref="Lite3.ValueIsNull" />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool IsNull() => Lite3.ValueIsNull(value);