Make Options filterable on clients, and add SDK tests.

crates/bindings-cpp/include/spacetimedb/table_with_constraints.h

@@ -210,21 +210,30 @@ struct MultiColumnIndexTag {
 // Constraint Concepts
 // =============================================================================
 
+namespace detail {
+    template<typename T>
+    struct filterable_value_impl
+        : std::bool_constant<
+              std::integral<T> ||
+              std::same_as<T, std::string> ||
+              std::same_as<T, SpacetimeDB::Identity> ||
+              std::same_as<T, SpacetimeDB::ConnectionId> ||
+              std::same_as<T, SpacetimeDB::Timestamp> ||
+              std::same_as<T, SpacetimeDB::Uuid> ||
+              std::same_as<T, SpacetimeDB::I128> ||
+              std::same_as<T, SpacetimeDB::U128> ||
+              std::same_as<T, SpacetimeDB::I256> ||
+              std::same_as<T, SpacetimeDB::U256> ||
+              std::same_as<T, SpacetimeDB::i256> ||
+              std::same_as<T, SpacetimeDB::u256> ||
+              std::is_enum_v<T>> {};
+
+    template<typename T>
+    struct filterable_value_impl<std::optional<T>> : filterable_value_impl<std::remove_cvref_t<T>> {};
+}
+
 template<typename T>
-concept FilterableValue = 
-    std::integral<T> ||
-    std::same_as<T, std::string> ||
-    std::same_as<T, SpacetimeDB::Identity> ||
-    std::same_as<T, SpacetimeDB::ConnectionId> ||
-    std::same_as<T, SpacetimeDB::Timestamp> ||
-    std::same_as<T, SpacetimeDB::Uuid> ||
-    std::same_as<T, SpacetimeDB::I128> ||
-    std::same_as<T, SpacetimeDB::U128> ||
-    std::same_as<T, SpacetimeDB::I256> ||
-    std::same_as<T, SpacetimeDB::U256> ||
-    std::same_as<T, SpacetimeDB::i256> ||
-    std::same_as<T, SpacetimeDB::u256> ||
-    std::is_enum_v<T>;
+concept FilterableValue = detail::filterable_value_impl<std::remove_cvref_t<T>>::value;
 
 template<typename T>
 concept AutoIncrementable = 

crates/bindings-csharp/Codegen.Tests/Tests.cs

@@ -354,6 +354,117 @@ public static void @params(ProcedureContext ctx)
         Assert.Empty(GetCompilationErrors(compilationAfterGen));
     }
 
+    [Fact]
+    public static async Task NullableBTreeIndexesCompile()
+    {
+        var fixture = await Fixture.Compile("server");
+
+        const string source = """
+            using SpacetimeDB;
+
+            [SpacetimeDB.Table]
+            public partial struct NullableBTreeIndex
+            {
+                [SpacetimeDB.PrimaryKey]
+                public uint Id;
+
+                [SpacetimeDB.Index.BTree]
+                public uint? AccountId;
+
+                [SpacetimeDB.Reducer]
+                public static void TestNullableBTreeIndex(ReducerContext ctx)
+                {
+                    _ = ctx.Db.NullableBTreeIndex.AccountId.Filter((uint?)null);
+                    _ = ctx.Db.NullableBTreeIndex.AccountId.Filter((uint?)55);
+                    _ = ctx.Db.NullableBTreeIndex.AccountId.Filter(new Bound<uint?>(null, 99));
+                }
+            }
+
+            [SpacetimeDB.Table]
+            public partial struct NullableUniqueIndex
+            {
+                [SpacetimeDB.PrimaryKey]
+                public uint Id;
+
+                [SpacetimeDB.Unique]
+                public uint? AccountId;
+
+                [SpacetimeDB.Unique]
+                public string? Name;
+
+                [SpacetimeDB.Unique]
+                public SpacetimeDB.Uuid? ExternalId;
+
+                [SpacetimeDB.Reducer]
+                public static void TestNullableUniqueIndex(ReducerContext ctx)
+                {
+                    _ = ctx.Db.NullableUniqueIndex.AccountId.Find((uint?)null);
+                    _ = ctx.Db.NullableUniqueIndex.AccountId.Find((uint?)55);
+                    _ = ctx.Db.NullableUniqueIndex.Name.Find((string?)null);
+                    _ = ctx.Db.NullableUniqueIndex.Name.Find("name");
+                    _ = ctx.Db.NullableUniqueIndex.ExternalId.Find((SpacetimeDB.Uuid?)null);
+                    _ = ctx.Db.NullableUniqueIndex.ExternalId.Find(SpacetimeDB.Uuid.NIL);
+                }
+            }
+
+            [SpacetimeDB.Table]
+            public partial struct ExplicitNullableBTreeIndex
+            {
+                [SpacetimeDB.PrimaryKey]
+                public uint Id;
+
+                [SpacetimeDB.Index.BTree]
+                public System.Nullable<uint> AccountId;
+
+                [SpacetimeDB.Reducer]
+                public static void TestExplicitNullableBTreeIndex(ReducerContext ctx)
+                {
+                    _ = ctx.Db.ExplicitNullableBTreeIndex.AccountId.Filter((uint?)null);
+                    _ = ctx.Db.ExplicitNullableBTreeIndex.AccountId.Filter((uint?)55);
+                    _ = ctx.Db.ExplicitNullableBTreeIndex.AccountId.Filter(new Bound<uint?>(null, 99));
+                }
+            }
+
+            [SpacetimeDB.Table]
+            public partial struct ExplicitNullableUniqueIndex
+            {
+                [SpacetimeDB.PrimaryKey]
+                public uint Id;
+
+                [SpacetimeDB.Unique]
+                public System.Nullable<uint> AccountId;
+
+                [SpacetimeDB.Reducer]
+                public static void TestExplicitNullableUniqueIndex(ReducerContext ctx)
+                {
+                    _ = ctx.Db.ExplicitNullableUniqueIndex.AccountId.Find((uint?)null);
+                    _ = ctx.Db.ExplicitNullableUniqueIndex.AccountId.Find((uint?)55);
+                }
+            }
+            """;
+
+        var parseOptions = new CSharpParseOptions(fixture.SampleCompilation.LanguageVersion);
+        var tree = CSharpSyntaxTree.ParseText(source, parseOptions, path: "NullableBTreeIndex.cs");
+        var compilation = fixture.SampleCompilation.AddSyntaxTrees(tree);
+
+        var driver = CSharpGeneratorDriver.Create(
+            [
+                new SpacetimeDB.Codegen.Type().AsSourceGenerator(),
+                new SpacetimeDB.Codegen.Module().AsSourceGenerator(),
+            ],
+            driverOptions: new(
+                disabledOutputs: IncrementalGeneratorOutputKind.None,
+                trackIncrementalGeneratorSteps: true
+            ),
+            parseOptions: parseOptions
+        );
+
+        var runResult = driver.RunGenerators(compilation).GetRunResult();
+        var compilationAfterGen = compilation.AddSyntaxTrees(runResult.GeneratedTrees);
+
+        Assert.Empty(GetCompilationErrors(compilationAfterGen));
+    }
+
     [Fact]
     public static async Task TestDiagnostics()
     {

crates/bindings-csharp/Codegen.Tests/fixtures/diag/snapshots/Module.verified.txt

@@ -35,23 +35,6 @@
       }
     },
     {/*
-    [Unique]
-    public int? UniqueField;
-                ^^^^^^^^^^^
-
-*/
-      Message: Field UniqueField is marked as Unique but it has a type int? which is not an equatable primitive.,
-      Severity: Error,
-      Descriptor: {
-        Id: STDB0003,
-        Title: Unique fields must be equatable,
-        MessageFormat: Field {0} is marked as Unique but it has a type {1} which is not an equatable primitive.,
-        Category: SpacetimeDB,
-        DefaultSeverity: Error,
-        IsEnabledByDefault: true
-      }
-    },
-    {/*
 [SpacetimeDB.Table]
 public partial record TestTableTaggedEnum : SpacetimeDB.TaggedEnum<(int X, int Y)> { }
                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -69,23 +52,6 @@ public partial record TestTableTaggedEnum : SpacetimeDB.TaggedEnum<(int X, int Y
       }
     },
     {/*
-    [Unique]
-    public int? UniqueField;
-                ^^^^^^^^^^^
-
-*/
-      Message: Field UniqueField is marked as Unique but it has a type int? which is not an equatable primitive.,
-      Severity: Error,
-      Descriptor: {
-        Id: STDB0003,
-        Title: Unique fields must be equatable,
-        MessageFormat: Field {0} is marked as Unique but it has a type {1} which is not an equatable primitive.,
-        Category: SpacetimeDB,
-        DefaultSeverity: Error,
-        IsEnabledByDefault: true
-      }
-    },
-    {/*
 {
     [SpacetimeDB.Index.BTree(Accessor = "TestUnexpectedColumns", Columns = ["UnexpectedColumn"])]
      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -626,4 +592,4 @@ public partial struct TestScheduleIssues
       }
     }
   ]
-}
+}

crates/bindings-csharp/Codegen/Module.cs

@@ -160,9 +160,22 @@ public static bool IsNoPayloadEnum(ITypeSymbol type)
             && variants.All(field => field.Type.ToString() == "SpacetimeDB.Unit");
     }
 
-    public static bool IsEquatable(ITypeSymbol type) =>
-        (
-            IsInteger(type)
+    private static ITypeSymbol UnwrapNullable(ITypeSymbol type) =>
+        type switch
+        {
+            INamedTypeSymbol
+            {
+                OriginalDefinition.SpecialType: SpecialType.System_Nullable_T
+            } nullable => nullable.TypeArguments[0],
+            _ when type.NullableAnnotation == NullableAnnotation.Annotated =>
+                type.WithNullableAnnotation(NullableAnnotation.None),
+            _ => type,
+        };
+
+    public static bool IsEquatable(ITypeSymbol type)
+    {
+        type = UnwrapNullable(type);
+        return IsInteger(type)
             || IsNoPayloadEnum(type)
             || type.SpecialType switch
             {
@@ -173,9 +186,8 @@ public static bool IsEquatable(ITypeSymbol type) =>
                         or "SpacetimeDB.Timestamp"
                         or "SpacetimeDB.Uuid",
                 _ => false,
-            }
-        )
-        && type.NullableAnnotation != NullableAnnotation.Annotated;
+            };
+    }
 }
 
 /// <summary>

crates/bindings-typescript/src/lib/type_builders.test-d.ts

@@ -45,6 +45,27 @@ const _rowOptionOptionalSome: RowOptionOptional = {
   foo: 'hello',
 };
 
+// Optional columns whose inner type is filterable may be indexed and unique.
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const rowOptionIndex = {
+  id: t.u64(),
+  optionalId: t.option(t.u64()).index('btree').unique(),
+};
+type RowOptionIndex = InferTypeOfRow<typeof rowOptionIndex>;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const _rowOptionIndexNone: RowOptionIndex = {
+  id: 1n,
+  optionalId: undefined,
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const _rowOptionIndexSome: RowOptionIndex = {
+  id: 2n,
+  optionalId: 1n,
+};
+
+// @ts-expect-error optional arrays are not filterable and cannot be indexed.
+t.option(t.array(t.u64())).index('btree');
+
 // Test that a row must not allow non-TypeBuilder or ColumnBuilder values
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const row2 = {