Skip to content

Commit bf57860

Browse files
kimkim
committed
Merge master into 'kim/core/durability-bounded-chan'
2 parents bc2c40f + 5c6f308 commit bf57860

95 files changed

Lines changed: 3261 additions & 798 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ static string GetTypeInfoForNamedType(INamedTypeSymbol type)
175175
"SpacetimeDB.I256" => "SpacetimeDB.BSATN.I256",
176176
"SpacetimeDB.U256" => "SpacetimeDB.BSATN.U256",
177177
"System.Collections.Generic.List<T>" => $"SpacetimeDB.BSATN.List",
178+
"System.Collections.Generic.IEnumerable<T>" => $"SpacetimeDB.BSATN.List",
178179
// If we're here, then this is nullable *value* type like `int?`.
179180
"System.Nullable<T>" => $"SpacetimeDB.BSATN.ValueOption",
180181
var name when name.StartsWith("System.") => throw new InvalidOperationException(

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,16 +381,15 @@ public static async Task ViewInvalidReturnHighlightsReturnType()
381381
Method = method,
382382
})
383383
)
384-
.Single(entry => entry.Method.Identifier.Text == "ViewDefIEnumerableReturnFromIter");
384+
.Single(entry => entry.Method.Identifier.Text == "ViewDefWrongReturn");
385385

386386
var returnTypeSpan = method.Method.ReturnType.Span;
387387
var diagnostics = runResult
388388
.Results.SelectMany(result => result.Diagnostics)
389389
.Where(d => d.Id == "STDB0024")
390390
.ToList();
391391
var diagnostic = diagnostics.FirstOrDefault(d =>
392-
d.GetMessage().Contains("ViewDefIEnumerableReturnFromIter")
393-
&& d.Location.SourceTree == method.Tree
392+
d.GetMessage().Contains("ViewDefWrongReturn") && d.Location.SourceTree == method.Tree
394393
);
395394

396395
Assert.NotNull(diagnostic);
@@ -400,6 +399,6 @@ public static async Task ViewInvalidReturnHighlightsReturnType()
400399
var returnTypeText = method
401400
.Root.ToFullString()
402401
.Substring(returnTypeSpan.Start, returnTypeSpan.Length);
403-
Assert.Contains("IEnumerable", returnTypeText);
402+
Assert.Contains("Player", returnTypeText);
404403
}
405404
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,14 +576,14 @@ public static Player ViewDefWrongReturn(ViewContext ctx)
576576
return new Player { Identity = new() };
577577
}
578578

579-
// Invalid: IEnumerable<T> return type (from Iter()) is not List<T> or T?
579+
// Valid: IEnumerable<T> return type (from Iter()) is supported
580580
[SpacetimeDB.View(Accessor = "view_def_ienumerable_return_from_iter", Public = true)]
581581
public static IEnumerable<Player> ViewDefIEnumerableReturnFromIter(ViewContext ctx)
582582
{
583583
return ctx.Db.Player.Iter();
584584
}
585585

586-
// Invalid: IEnumerable<T> return type (from Filter()) is not List<T> or T?
586+
// Valid: IEnumerable<T> return type (from Filter()) is supported
587587
[SpacetimeDB.View(Accessor = "view_def_ienumerable_return_from_filter", Public = true)]
588588
public static IEnumerable<TestScheduleIssues> ViewDefIEnumerableReturnFromFilter(
589589
ViewContext ctx

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public partial struct TestDefaultFieldValues
256256

257257
var returnValue = Module.ViewDefWrongContext((SpacetimeDB.ViewContext)ctx);
258258
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
259-
SpacetimeDB.BSATN.List<Player, Player.BSATN> returnRW = new();
259+
var listSerializer = new SpacetimeDB.BSATN.List<Player, Player.BSATN>();
260260
*/
261261
Message: Argument 1: cannot convert from 'SpacetimeDB.ViewContext' to 'SpacetimeDB.ReducerContext',
262262
Severity: Error,
@@ -325,7 +325,7 @@ SpacetimeDB.Internal.Module.RegisterClientVisibilityFilter(global::Module.MY_THI
325325

326326
var returnValue = Module.ViewDefNoContext((SpacetimeDB.ViewContext)ctx);
327327
^^^^^^^^^^^^^^^^
328-
SpacetimeDB.BSATN.List<Player, Player.BSATN> returnRW = new();
328+
var listSerializer = new SpacetimeDB.BSATN.List<Player, Player.BSATN>();
329329
*/
330330
Message: No overload for method 'ViewDefNoContext' takes 1 arguments,
331331
Severity: Error,

‎crates/bindings-csharp/Codegen.Tests/fixtures/diag/snapshots/Module#FFI.verified.cs‎

Lines changed: 23 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -375,80 +375,12 @@ public partial struct TestScheduleIssues
375375
^^^^^^
376376
{
377377
*/
378-
Message: View 'ViewDefWrongReturn' must return T?, List<T>, or IQuery<T>,
378+
Message: View 'ViewDefWrongReturn' must return T?, List<T>, IQuery<T>, or IEnumerable<T>.,
379379
Severity: Error,
380380
Descriptor: {
381381
Id: STDB0024,
382-
Title: Views must return T?, List<T>, or IQuery<T>,
383-
MessageFormat: View '{0}' must return T?, List<T>, or IQuery<T>,
384-
Category: SpacetimeDB,
385-
DefaultSeverity: Error,
386-
IsEnabledByDefault: true
387-
}
388-
},
389-
{/*
390-
[SpacetimeDB.View(Accessor = "view_def_ienumerable_return_from_iter", Public = true)]
391-
public static IEnumerable<Player> ViewDefIEnumerableReturnFromIter(ViewContext ctx)
392-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
393-
{
394-
*/
395-
Message: BSATN implementation for System.Collections.Generic.IEnumerable<Player> is not found: Unsupported system type System.Collections.Generic.IEnumerable<T>,
396-
Severity: Error,
397-
Descriptor: {
398-
Id: BSATN0001,
399-
Title: Unsupported type,
400-
MessageFormat: BSATN implementation for {0} is not found: {1},
401-
Category: SpacetimeDB.BSATN,
402-
DefaultSeverity: Error,
403-
IsEnabledByDefault: true
404-
}
405-
},
406-
{/*
407-
[SpacetimeDB.View(Accessor = "view_def_ienumerable_return_from_iter", Public = true)]
408-
public static IEnumerable<Player> ViewDefIEnumerableReturnFromIter(ViewContext ctx)
409-
^^^^^^^^^^^^^^^^^^^
410-
{
411-
*/
412-
Message: View 'ViewDefIEnumerableReturnFromIter' must return T?, List<T>, or IQuery<T>,
413-
Severity: Error,
414-
Descriptor: {
415-
Id: STDB0024,
416-
Title: Views must return T?, List<T>, or IQuery<T>,
417-
MessageFormat: View '{0}' must return T?, List<T>, or IQuery<T>,
418-
Category: SpacetimeDB,
419-
DefaultSeverity: Error,
420-
IsEnabledByDefault: true
421-
}
422-
},
423-
{/*
424-
[SpacetimeDB.View(Accessor = "view_def_ienumerable_return_from_filter", Public = true)]
425-
public static IEnumerable<TestScheduleIssues> ViewDefIEnumerableReturnFromFilter(
426-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
427-
ViewContext ctx
428-
*/
429-
Message: BSATN implementation for System.Collections.Generic.IEnumerable<TestScheduleIssues> is not found: Unsupported system type System.Collections.Generic.IEnumerable<T>,
430-
Severity: Error,
431-
Descriptor: {
432-
Id: BSATN0001,
433-
Title: Unsupported type,
434-
MessageFormat: BSATN implementation for {0} is not found: {1},
435-
Category: SpacetimeDB.BSATN,
436-
DefaultSeverity: Error,
437-
IsEnabledByDefault: true
438-
}
439-
},
440-
{/*
441-
[SpacetimeDB.View(Accessor = "view_def_ienumerable_return_from_filter", Public = true)]
442-
public static IEnumerable<TestScheduleIssues> ViewDefIEnumerableReturnFromFilter(
443-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
444-
ViewContext ctx
445-
*/
446-
Message: View 'ViewDefIEnumerableReturnFromFilter' must return T?, List<T>, or IQuery<T>,
447-
Severity: Error,
448-
Descriptor: {
449-
Id: STDB0024,
450-
Title: Views must return T?, List<T>, or IQuery<T>,
451-
MessageFormat: View '{0}' must return T?, List<T>, or IQuery<T>,
382+
Title: Views must return T?, List<T>, IQuery<T>, or IEnumerable<T>,
383+
MessageFormat: View '{0}' must return T?, List<T>, IQuery<T>, or IEnumerable<T>.,
452384
Category: SpacetimeDB,
453385
DefaultSeverity: Error,
454386
IsEnabledByDefault: true

‎crates/bindings-csharp/Codegen.Tests/fixtures/explicitnames/snapshots/Module#FFI.verified.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,13 +372,14 @@ public byte[] Invoke(
372372
try
373373
{
374374
var returnValue = Reducers.DemoView((SpacetimeDB.ViewContext)ctx);
375-
SpacetimeDB.BSATN.List<DemoTable, DemoTable.BSATN> returnRW = new();
375+
var listSerializer = new SpacetimeDB.BSATN.List<DemoTable, DemoTable.BSATN>();
376+
var listValue = global::System.Linq.Enumerable.ToList(returnValue);
376377
var header = new global::SpacetimeDB.Internal.ViewResultHeader.RowData(default);
377378
var headerRW = new global::SpacetimeDB.Internal.ViewResultHeader.BSATN();
378379
using var output = new System.IO.MemoryStream();
379380
using var writer = new System.IO.BinaryWriter(output);
380381
headerRW.Write(writer, header);
381-
returnRW.Write(writer, returnValue);
382+
listSerializer.Write(writer, listValue);
382383
return output.ToArray();
383384
}
384385
catch (System.Exception e)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,9 @@ string typeName
215215
public static readonly ErrorDescriptor<MethodDeclarationSyntax> ViewInvalidReturn =
216216
new(
217217
group,
218-
"Views must return T?, List<T>, or IQuery<T>",
219-
method => $"View '{method.Identifier}' must return T?, List<T>, or IQuery<T>",
218+
"Views must return T?, List<T>, IQuery<T>, or IEnumerable<T>",
219+
method =>
220+
$"View '{method.Identifier}' must return T?, List<T>, IQuery<T>, or IEnumerable<T>.",
220221
method => method.ReturnType
221222
);
222223

‎crates/bindings-csharp/Codegen/Module.cs‎

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,7 @@ record ViewDeclaration
11431143
public readonly bool IsAnonymous;
11441144
public readonly bool IsPublic;
11451145
public readonly bool ReturnsQuery;
1146+
public readonly bool ReturnsEnumerable;
11461147
public readonly TypeUse ReturnType;
11471148
public readonly TypeUse? QueryRowType;
11481149
public readonly EquatableArray<MemberDeclaration> Parameters;
@@ -1179,6 +1180,7 @@ public ViewDeclaration(GeneratorAttributeSyntaxContext context, DiagReporter dia
11791180
IsAnonymous = isAnonymousContext;
11801181

11811182
ReturnsQuery = false;
1183+
ReturnsEnumerable = false;
11821184
INamedTypeSymbol? iquery = null;
11831185
if (
11841186
method.ReturnType is INamedTypeSymbol
@@ -1212,10 +1214,41 @@ method.ReturnType is INamedTypeSymbol
12121214
QueryRowType = rowType;
12131215
ReturnType = rowType;
12141216
}
1217+
else if (
1218+
method.ReturnType
1219+
is INamedTypeSymbol
1220+
{
1221+
OriginalDefinition: var originalDefinition,
1222+
TypeArguments: [var enumerableElementType]
1223+
}
1224+
&& originalDefinition.ToString() == "System.Collections.Generic.IEnumerable<T>"
1225+
)
1226+
{
1227+
ReturnsEnumerable = true;
1228+
var elementType = TypeUse.Parse(method, enumerableElementType, diag);
1229+
var elementTypeName = SymbolToName(enumerableElementType);
1230+
var listTypeName = $"System.Collections.Generic.List<{elementTypeName}>";
1231+
var listTypeInfo =
1232+
$"SpacetimeDB.BSATN.List<{elementTypeName}, {elementType.BSATNName}>";
1233+
ReturnType = new ListUse(listTypeName, listTypeInfo, elementType);
1234+
}
12151235
else
12161236
{
12171237
QueryRowType = null;
12181238
ReturnType = TypeUse.Parse(method, method.ReturnType, diag);
1239+
1240+
if (
1241+
method.ReturnType
1242+
is INamedTypeSymbol
1243+
{
1244+
OriginalDefinition: var listDefinition,
1245+
TypeArguments.Length: 1,
1246+
}
1247+
&& listDefinition.ToString() == "System.Collections.Generic.List<T>"
1248+
)
1249+
{
1250+
ReturnsEnumerable = true;
1251+
}
12191252
}
12201253
Scope = new Scope(methodSyntax.Parent as MemberDeclarationSyntax);
12211254

@@ -1231,13 +1264,12 @@ method.ReturnType is INamedTypeSymbol
12311264
diag.Report(ErrorDescriptor.ViewContextParam, methodSyntax);
12321265
}
12331266

1234-
// Validate return type: must be List<T>, T?, or IQuery<T>.
1235-
if (
1236-
!ReturnsQuery
1237-
&& !ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.ValueOption")
1238-
&& !ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.RefOption")
1239-
&& !ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.List")
1240-
)
1267+
// Validate return type: must be List<T>, T?, or IEnumerable<T>
1268+
var isOption =
1269+
ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.ValueOption")
1270+
|| ReturnType.BSATNName.Contains("SpacetimeDB.BSATN.RefOption");
1271+
1272+
if (!ReturnsQuery && !ReturnsEnumerable && !isOption)
12411273
{
12421274
diag.Report(ErrorDescriptor.ViewInvalidReturn, methodSyntax);
12431275
}
@@ -1319,6 +1351,18 @@ public string GenerateDispatcherClass(uint index)
13191351
listSerializer.Write(writer, listValue);
13201352
return output.ToArray();
13211353
"""
1354+
: ReturnsEnumerable
1355+
? $$$"""
1356+
var listSerializer = new {{{ReturnType.BSATNName}}}();
1357+
var listValue = global::System.Linq.Enumerable.ToList(returnValue);
1358+
var header = new global::SpacetimeDB.Internal.ViewResultHeader.RowData(default);
1359+
var headerRW = new global::SpacetimeDB.Internal.ViewResultHeader.BSATN();
1360+
using var output = new System.IO.MemoryStream();
1361+
using var writer = new System.IO.BinaryWriter(output);
1362+
headerRW.Write(writer, header);
1363+
listSerializer.Write(writer, listValue);
1364+
return output.ToArray();
1365+
"""
13221366
: $$$"""
13231367
{{{ReturnType.BSATNName}}} returnRW = new();
13241368
var header = new global::SpacetimeDB.Internal.ViewResultHeader.RowData(default);

0 commit comments

Comments
 (0)