Migrate C# ModuleDef to V9

crates/bindings-csharp/BSATN.Codegen/BSATN.Codegen.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.BSATN.Codegen</AssemblyName>
-    <Version>1.0.0-rc1-hotfix1</Version>
+    <Version>1.0.0-rc2</Version>
     <Title>SpacetimeDB BSATN Codegen</Title>
     <Description>The SpacetimeDB BSATN Codegen implements the Roslyn incremental generators for BSATN serialization/deserialization in C#.</Description>
   </PropertyGroup>

crates/bindings-csharp/BSATN.Codegen/Diag.cs

@@ -91,10 +91,41 @@ Func<TContext, ISymbol> toLocation
     )
         : this(group, title, interpolate, ctx => toLocation(ctx).Locations.FirstOrDefault()) { }
 
+    public ErrorDescriptor(
+        ErrorDescriptorGroup group,
+        string title,
+        Expression<Func<TContext, FormattableString>> interpolate,
+        Func<TContext, AttributeData> toLocation
+    )
+        : this(
+            group,
+            title,
+            interpolate,
+            ctx =>
+                toLocation(ctx).ApplicationSyntaxReference is { } r
+                    ? r.SyntaxTree.GetLocation(r.Span)
+                    : null
+        ) { }
+
     public Diagnostic ToDiag(TContext ctx) =>
         Diagnostic.Create(descriptor, toLocation(ctx), makeFormatArgs(ctx));
 }
 
+/// <summary>
+/// No-op error descriptor placeholder.
+///
+/// <para>Error descriptors must have strong ID to avoid breaking semver, since they are used for diagnostic suppression by users.</para>
+/// <para>To ensure this, we cannot reorder to delete unused diagnostics - instead, we need to put some placeholders where they used to be.</para>
+/// <para>This class serves that purpose - it's a no-op error descriptor that you can instantiate just to reserve said ID.</para>
+/// </summary>
+public sealed class UnusedErrorDescriptor
+{
+    public UnusedErrorDescriptor(ErrorDescriptorGroup group)
+    {
+        group.NextId();
+    }
+}
+
 internal static class ErrorDescriptor
 {
     private static readonly ErrorDescriptorGroup group = new("BSATN", "SpacetimeDB.BSATN");

crates/bindings-csharp/BSATN.Codegen/Type.cs

@@ -234,10 +234,13 @@ public void Write(System.IO.BinaryWriter writer, {{FullName}} value) {
                     {{write}}
                 }
 
-                public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(SpacetimeDB.BSATN.ITypeRegistrar registrar) =>
+                public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(SpacetimeDB.BSATN.ITypeRegistrar registrar) =>
                     registrar.RegisterType<{{FullName}}>(_ => new SpacetimeDB.BSATN.AlgebraicType.{{Kind}}(new SpacetimeDB.BSATN.AggregateElement[] {
                         {{MemberDeclaration.GenerateDefs(Members)}}
                     }));
+
+                SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<{{FullName}}>.GetAlgebraicType(SpacetimeDB.BSATN.ITypeRegistrar registrar) =>
+                    GetAlgebraicType(registrar);
             }
             """
         );

crates/bindings-csharp/BSATN.Codegen/Utils.cs

@@ -313,7 +313,11 @@ public override string ToString()
                         sb.Append(" : ").AppendJoin(", ", BaseTypes);
                     }
 
-                    sb.Append(typeScope.Constraints).AppendLine(" {");
+                    if (typeScope.Constraints.Length > 0)
+                    {
+                        sb.Append(' ').Append(typeScope.Constraints);
+                    }
+                    sb.AppendLine(" {");
                 }
 
                 sb.AppendLine();

crates/bindings-csharp/BSATN.Runtime/BSATN.Runtime.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SpacetimeDB.BSATN.Runtime</AssemblyName>
-    <Version>1.0.0-rc1-hotfix1</Version>
+    <Version>1.0.0-rc2</Version>
     <Title>SpacetimeDB BSATN Runtime</Title>
     <Description>The SpacetimeDB BSATN Runtime implements APIs for BSATN serialization/deserialization in C#.</Description>
   </PropertyGroup>

crates/bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#CustomClass.verified.cs

@@ -29,7 +29,7 @@ public void Write(System.IO.BinaryWriter writer, CustomClass value)
             value.WriteFields(writer);
         }
 
-        public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
+        public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
             SpacetimeDB.BSATN.ITypeRegistrar registrar
         ) =>
             registrar.RegisterType<CustomClass>(_ => new SpacetimeDB.BSATN.AlgebraicType.Product(
@@ -39,5 +39,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                     new(nameof(StringField), StringField.GetAlgebraicType(registrar))
                 }
             ));
+
+        SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<CustomClass>.GetAlgebraicType(
+            SpacetimeDB.BSATN.ITypeRegistrar registrar
+        ) => GetAlgebraicType(registrar);
     }
 } // CustomClass

crates/bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#CustomStruct.verified.cs

@@ -29,7 +29,7 @@ public void Write(System.IO.BinaryWriter writer, CustomStruct value)
             value.WriteFields(writer);
         }
 
-        public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
+        public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
             SpacetimeDB.BSATN.ITypeRegistrar registrar
         ) =>
             registrar.RegisterType<CustomStruct>(_ => new SpacetimeDB.BSATN.AlgebraicType.Product(
@@ -39,5 +39,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                     new(nameof(StringField), StringField.GetAlgebraicType(registrar))
                 }
             ));
+
+        SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<CustomStruct>.GetAlgebraicType(
+            SpacetimeDB.BSATN.ITypeRegistrar registrar
+        ) => GetAlgebraicType(registrar);
     }
 } // CustomStruct

crates/bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#CustomTaggedEnum.verified.cs

@@ -48,7 +48,7 @@ public void Write(System.IO.BinaryWriter writer, CustomTaggedEnum value)
             }
         }
 
-        public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
+        public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
             SpacetimeDB.BSATN.ITypeRegistrar registrar
         ) =>
             registrar.RegisterType<CustomTaggedEnum>(_ => new SpacetimeDB.BSATN.AlgebraicType.Sum(
@@ -58,5 +58,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                     new(nameof(StringVariant), StringVariant.GetAlgebraicType(registrar))
                 }
             ));
+
+        SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<CustomTaggedEnum>.GetAlgebraicType(
+            SpacetimeDB.BSATN.ITypeRegistrar registrar
+        ) => GetAlgebraicType(registrar);
     }
 } // CustomTaggedEnum

crates/bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#PublicTable.verified.cs

@@ -105,7 +105,7 @@ public void Write(System.IO.BinaryWriter writer, PublicTable value)
             value.WriteFields(writer);
         }
 
-        public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
+        public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
             SpacetimeDB.BSATN.ITypeRegistrar registrar
         ) =>
             registrar.RegisterType<PublicTable>(_ => new SpacetimeDB.BSATN.AlgebraicType.Product(
@@ -144,5 +144,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                     )
                 }
             ));
+
+        SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<PublicTable>.GetAlgebraicType(
+            SpacetimeDB.BSATN.ITypeRegistrar registrar
+        ) => GetAlgebraicType(registrar);
     }
 } // PublicTable

crates/bindings-csharp/Codegen.Tests/fixtures/diag/Lib.cs

@@ -361,24 +361,42 @@ public static partial class InAnotherNamespace
     public partial struct TestDuplicateTableName { }
 }
 
-[SpacetimeDB.Table(
-    Name = "TestIncompatibleSchedule1",
-    Scheduled = nameof(TestIncompatibleScheduleReducer)
-)]
-[SpacetimeDB.Table(Name = "TestIncompatibleSchedule2")]
-public partial struct TestIncompatibleSchedule
-{
-    [SpacetimeDB.Reducer]
-    public static void TestIncompatibleScheduleReducer(
-        ReducerContext ctx,
-        TestIncompatibleSchedule table
-    ) { }
-}
-
 [SpacetimeDB.Table]
 [SpacetimeDB.Index]
 public partial struct TestIndexWithoutColumns { }
 
 [SpacetimeDB.Table]
 [SpacetimeDB.Index(BTree = [])]
 public partial struct TestIndexWithEmptyColumns { }
+
+[SpacetimeDB.Table(
+    Name = "TestScheduleWithoutPrimaryKey",
+    Scheduled = "DummyScheduledReducer",
+    ScheduledAt = nameof(ScheduleAtCorrectType)
+)]
+[SpacetimeDB.Table(
+    Name = "TestScheduleWithWrongPrimaryKeyType",
+    Scheduled = "DummyScheduledReducer",
+    ScheduledAt = nameof(ScheduleAtCorrectType)
+)]
+[SpacetimeDB.Table(Name = "TestScheduleWithoutScheduleAt", Scheduled = "DummyScheduledReducer")]
+[SpacetimeDB.Table(
+    Name = "TestScheduleWithWrongScheduleAtType",
+    Scheduled = "DummyScheduledReducer",
+    ScheduledAt = nameof(ScheduleAtWrongType)
+)]
+public partial struct TestScheduleIssues
+{
+    [SpacetimeDB.PrimaryKey(Table = "TestScheduleWithWrongPrimaryKeyType")]
+    public string IdWrongType;
+
+    [SpacetimeDB.PrimaryKey(Table = "TestScheduleWithoutScheduleAt")]
+    [SpacetimeDB.PrimaryKey(Table = "TestScheduleWithWrongScheduleAtType")]
+    public int IdCorrectType;
+
+    public int ScheduleAtWrongType;
+    public ScheduleAt ScheduleAtCorrectType;
+
+    [SpacetimeDB.Reducer]
+    public static void DummyScheduledReducer(ReducerContext ctx, TestScheduleIssues table) { }
+}