Merge branch 'master' into bfops/prevent-master-merge

DEVELOP.md

@@ -1,6 +1,17 @@
 # Notes for maintainers
 
-## `SpacetimeDB.ClientApi`
+## `ClientApi.cs`
 
-To regenerate this namespace, run the `tools/gen-client-api.sh` or the
-`tools/gen-client-api.bat` script.
+The file `ClientApi.cs` is generated by [ProtoBuf](https://protobuf.dev/)
+from [the SpacetimeDB client-api-messages proto definition](https://github.com/clockworklabs/SpacetimeDB/blob/master/crates/client-api-messages/protobuf/client_api.proto).
+This is not automated.
+Whenever the `client_api.proto` changes, you'll have to manually re-run `protoc` to re-generate the definitions.
+
+```sh
+cd ~/clockworklabs/SpacetimeDB/crates/client-api-messages/protobuf
+protoc --csharp_out=/absolute/path/to/spacetimedb-csharp-sdk/src \
+  ./client_api.proto
+```
+
+Note that `protoc` cannot understand paths that start with `~`;
+you must write the absolute path starting from `/`.

SpacetimeDB.ClientSDK.csproj

@@ -5,6 +5,7 @@
     <LangVersion>9</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>SpacetimeDB.ClientSDK</PackageId>
     <Title>SpacetimeDB SDK</Title>
     <Authors>jdetter</Authors>
@@ -16,15 +17,15 @@
     <PackageIcon>logo.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/clockworklabs/spacetimedb-csharp-sdk</RepositoryUrl>
-    <AssemblyVersion>0.12.0</AssemblyVersion>
+    <AssemblyVersion>0.11.0</AssemblyVersion>
     <Version>$(AssemblyVersion)</Version>
     <DefaultItemExcludes>$(DefaultItemExcludes);*~/**</DefaultItemExcludes>
     <!-- We want to save DLLs for Unity which doesn't support NuGet. -->
     <RestorePackagesPath>packages</RestorePackagesPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SpacetimeDB.BSATN.Runtime" Version="0.12.*" />
+    <PackageReference Include="SpacetimeDB.BSATN.Runtime" Version="0.11.*" />
 
     <InternalsVisibleTo Include="SpacetimeDB.Tests" />
   </ItemGroup>

src/Primitives.cs

@@ -0,0 +1,83 @@
+using SpacetimeDB.BSATN;
+
+using System;
+using System.IO;
+
+namespace SpacetimeDB
+{
+
+    public struct I128 : IEquatable<I128>
+    {
+        public long hi;
+        public ulong lo;
+
+        public I128(long hi, ulong lo)
+        {
+            this.hi = hi;
+            this.lo = lo;
+        }
+
+        public readonly bool Equals(I128 x) => hi == x.hi && lo == x.lo;
+
+        public override readonly bool Equals(object? o) => o is I128 x && Equals(x);
+
+        public static bool operator ==(I128 a, I128 b) => a.Equals(b);
+        public static bool operator !=(I128 a, I128 b) => !a.Equals(b);
+
+        public override readonly int GetHashCode() => hi.GetHashCode() ^ lo.GetHashCode();
+
+        public override readonly string ToString() => $"I128({hi},{lo})";
+
+        public readonly struct BSATN : IReadWrite<I128>
+        {
+            public I128 Read(BinaryReader reader) => new(reader.ReadInt64(), reader.ReadUInt64());
+
+            public void Write(BinaryWriter writer, I128 value)
+            {
+                writer.Write(value.hi);
+                writer.Write(value.lo);
+            }
+
+            public AlgebraicType GetAlgebraicType(ITypeRegistrar registrar) =>
+                new AlgebraicType.Builtin(new BuiltinType.I128(new Unit()));
+        }
+    }
+
+    public struct U128 : IEquatable<U128>
+    {
+        public ulong hi;
+        public ulong lo;
+
+        public U128(ulong hi, ulong lo)
+        {
+            this.lo = lo;
+            this.hi = hi;
+        }
+
+        public readonly bool Equals(U128 x) => hi == x.hi && lo == x.lo;
+
+        public override readonly bool Equals(object? o) => o is U128 x && Equals(x);
+
+        public static bool operator ==(U128 a, U128 b) => a.Equals(b);
+        public static bool operator !=(U128 a, U128 b) => !a.Equals(b);
+
+        public override readonly int GetHashCode() => hi.GetHashCode() ^ lo.GetHashCode();
+
+        public override readonly string ToString() => $"U128({hi},{lo})";
+
+        public readonly struct BSATN : IReadWrite<U128>
+        {
+            public U128 Read(BinaryReader reader) => new(reader.ReadUInt64(), reader.ReadUInt64());
+
+            public void Write(BinaryWriter writer, U128 value)
+            {
+                writer.Write(value.hi);
+                writer.Write(value.lo);
+            }
+
+            public AlgebraicType GetAlgebraicType(ITypeRegistrar registrar) =>
+                new AlgebraicType.Builtin(new BuiltinType.U128(new Unit()));
+        }
+    }
+
+}

src/SpacetimeDB/ClientApi/CallReducer.cs

@@ -12,16 +12,17 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class CallReducer
 	{
 		[DataMember(Name = "reducer")]
 		public string Reducer = "";
+
 		[DataMember(Name = "args")]
 		public SpacetimeDB.ClientApi.EncodedValue Args = null!;
+
 		[DataMember(Name = "request_id")]
 		public uint RequestId;
-
 	}
 }

src/SpacetimeDB/ClientApi/ClientMessage.cs

@@ -5,7 +5,6 @@
 #nullable enable
 
 using System;
-using SpacetimeDB;
 
 namespace SpacetimeDB.ClientApi
 {

src/SpacetimeDB/ClientApi/DatabaseUpdate.cs

@@ -12,12 +12,11 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class DatabaseUpdate
 	{
 		[DataMember(Name = "tables")]
 		public System.Collections.Generic.List<SpacetimeDB.ClientApi.TableUpdate> Tables = new();
-
 	}
 }

src/SpacetimeDB/ClientApi/EnergyQuanta.cs

@@ -12,12 +12,11 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class EnergyQuanta
 	{
 		[DataMember(Name = "quanta")]
 		public U128 Quanta;
-
 	}
 }

src/SpacetimeDB/ClientApi/IdentityToken.cs

@@ -12,16 +12,17 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class IdentityToken
 	{
 		[DataMember(Name = "identity")]
 		public SpacetimeDB.Identity Identity = new();
+
 		[DataMember(Name = "token")]
 		public string Token = "";
+
 		[DataMember(Name = "address")]
 		public SpacetimeDB.Address Address = new();
-
 	}
 }

src/SpacetimeDB/ClientApi/InitialSubscription.cs

@@ -12,16 +12,17 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class InitialSubscription
 	{
 		[DataMember(Name = "database_update")]
 		public SpacetimeDB.ClientApi.DatabaseUpdate DatabaseUpdate = new();
+
 		[DataMember(Name = "request_id")]
 		public uint RequestId;
+
 		[DataMember(Name = "total_host_execution_duration_micros")]
 		public ulong TotalHostExecutionDurationMicros;
-
 	}
 }

src/SpacetimeDB/ClientApi/OneOffQuery.cs

@@ -12,14 +12,14 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class OneOffQuery
 	{
 		[DataMember(Name = "message_id")]
 		public byte[] MessageId = Array.Empty<byte>();
+
 		[DataMember(Name = "query_string")]
 		public string QueryString = "";
-
 	}
 }

src/SpacetimeDB/ClientApi/OneOffQueryResponse.cs

@@ -12,18 +12,20 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class OneOffQueryResponse
 	{
 		[DataMember(Name = "message_id")]
 		public byte[] MessageId = Array.Empty<byte>();
+
 		[DataMember(Name = "error")]
 		public string? Error;
+
 		[DataMember(Name = "tables")]
-		public System.Collections.Generic.List<SpacetimeDB.ClientApi.OneOffTable> Tables = new();
+		public List<SpacetimeDB.ClientApi.OneOffTable> Tables = new();
+
 		[DataMember(Name = "total_host_execution_duration_micros")]
 		public ulong TotalHostExecutionDurationMicros;
-
 	}
 }

src/SpacetimeDB/ClientApi/OneOffTable.cs

@@ -12,14 +12,14 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class OneOffTable
 	{
 		[DataMember(Name = "table_name")]
 		public string TableName = "";
-		[DataMember(Name = "rows")]
-		public System.Collections.Generic.List<SpacetimeDB.ClientApi.EncodedValue> Rows = new();
 
+		[DataMember(Name = "rows")]
+		public List<SpacetimeDB.ClientApi.EncodedValue> Rows = new();
 	}
 }

src/SpacetimeDB/ClientApi/ReducerCallInfo.cs

@@ -12,18 +12,20 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class ReducerCallInfo
 	{
 		[DataMember(Name = "reducer_name")]
 		public string ReducerName = "";
+
 		[DataMember(Name = "reducer_id")]
 		public uint ReducerId;
+
 		[DataMember(Name = "args")]
 		public SpacetimeDB.ClientApi.EncodedValue Args = null!;
+
 		[DataMember(Name = "request_id")]
 		public uint RequestId;
-
 	}
 }

src/SpacetimeDB/ClientApi/ServerMessage.cs

@@ -5,7 +5,6 @@
 #nullable enable
 
 using System;
-using SpacetimeDB;
 
 namespace SpacetimeDB.ClientApi
 {

src/SpacetimeDB/ClientApi/Subscribe.cs

@@ -12,14 +12,14 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class Subscribe
 	{
 		[DataMember(Name = "query_strings")]
 		public System.Collections.Generic.List<string> QueryStrings = new();
+
 		[DataMember(Name = "request_id")]
 		public uint RequestId;
-
 	}
 }

src/SpacetimeDB/ClientApi/TableUpdate.cs

@@ -12,18 +12,20 @@
 
 namespace SpacetimeDB.ClientApi
 {
-	[SpacetimeDB.Type]
 	[DataContract]
+	[SpacetimeDB.Type]
 	public partial class TableUpdate
 	{
 		[DataMember(Name = "table_id")]
 		public uint TableId;
+
 		[DataMember(Name = "table_name")]
 		public string TableName = "";
+
 		[DataMember(Name = "deletes")]
-		public System.Collections.Generic.List<SpacetimeDB.ClientApi.EncodedValue> Deletes = new();
-		[DataMember(Name = "inserts")]
-		public System.Collections.Generic.List<SpacetimeDB.ClientApi.EncodedValue> Inserts = new();
+		public List<SpacetimeDB.ClientApi.EncodedValue> Deletes = new();
 
+		[DataMember(Name = "inserts")]
+		public List<SpacetimeDB.ClientApi.EncodedValue> Inserts = new();
 	}
 }

src/SpacetimeDB/ClientApi/TransactionUpdate.cs

@@ -18,18 +18,23 @@ public partial class TransactionUpdate
 	{
 		[DataMember(Name = "status")]
 		public SpacetimeDB.ClientApi.UpdateStatus Status = null!;
+
 		[DataMember(Name = "timestamp")]
 		public SpacetimeDB.ClientApi.Timestamp Timestamp = new();
+
 		[DataMember(Name = "caller_identity")]
 		public SpacetimeDB.Identity CallerIdentity = new();
+
 		[DataMember(Name = "caller_address")]
 		public SpacetimeDB.Address CallerAddress = new();
+
 		[DataMember(Name = "reducer_call")]
 		public SpacetimeDB.ClientApi.ReducerCallInfo ReducerCall = new();
+
 		[DataMember(Name = "energy_quanta_used")]
 		public SpacetimeDB.ClientApi.EnergyQuanta EnergyQuantaUsed = new();
+
 		[DataMember(Name = "host_execution_duration_micros")]
 		public ulong HostExecutionDurationMicros;
-
 	}
 }