fix(gateway): resolve array attribute constraints by bare name via [] fallback

2026-06-18 03:25:48 -04:00
parent e328758c53
commit 8a1f037d5a
3 changed files with 194 additions and 5 deletions
@@ -141,6 +141,112 @@ public sealed class GatewayArrayWriteWiringTests
        Assert.Equal(new[] { 0, 7, 0, 0 }, forwarded.ArrayValue.Int32Values.Values);
    }

+    /// <summary>
+    ///     A bare array <c>AddItem2</c> address is normalized to its writable array form on the wire,
+    ///     and the normalized address lands in the tracked <see cref="SessionItemRegistration"/>.
+    /// </summary>
+    [Fact]
+    public async Task AddItem2_BareArrayAddress_NormalizedOnWireAndInRegistration()
+    {
+        CapturingWorkerClient worker = new();
+        GatewaySession session = CreateReadySession(worker);
+
+        WorkerCommand command = new()
+        {
+            Command = new MxCommand
+            {
+                Kind = MxCommandKind.AddItem2,
+                AddItem2 = new AddItem2Command
+                {
+                    ServerHandle = 1,
+                    ItemDefinition = "Obj.Arr",
+                },
+            },
+        };
+
+        worker.NextReply = new WorkerCommandReply
+        {
+            Reply = new MxCommandReply
+            {
+                Kind = MxCommandKind.AddItem2,
+                ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
+                AddItem2 = new AddItem2Reply { ItemHandle = 43 },
+            },
+        };
+
+        await session.InvokeAsync(command, CancellationToken.None);
+
+        Assert.NotNull(worker.LastCommand);
+        Assert.Equal("Obj.Arr[]", worker.LastCommand!.Command.AddItem2.ItemDefinition);
+
+        MxCommand trackingCopy = new()
+        {
+            Kind = MxCommandKind.AddItem2,
+            AddItem2 = new AddItem2Command
+            {
+                ServerHandle = 1,
+                ItemDefinition = "Obj.Arr",
+            },
+        };
+        session.TrackCommandReply(trackingCopy, worker.NextReply.Reply);
+
+        Assert.True(session.TryGetItemRegistration(1, 43, out SessionItemRegistration registration));
+        Assert.Equal("Obj.Arr[]", registration.TagAddress);
+    }
+
+    /// <summary>
+    ///     A sparse-array entry in a <see cref="WriteBulkCommand"/> is expanded to a full,
+    ///     default-filled <see cref="MxArray"/> before reaching the worker; no sparse value is ever
+    ///     forwarded inside a bulk write.
+    /// </summary>
+    [Fact]
+    public async Task WriteBulk_SparseArrayEntryValue_ExpandedBeforeReachingWorker()
+    {
+        CapturingWorkerClient worker = new();
+        GatewaySession session = CreateReadySession(worker);
+
+        WorkerCommand command = new()
+        {
+            Command = new MxCommand
+            {
+                Kind = MxCommandKind.WriteBulk,
+                WriteBulk = new WriteBulkCommand
+                {
+                    ServerHandle = 1,
+                    Entries =
+                    {
+                        new WriteBulkEntry
+                        {
+                            ItemHandle = 42,
+                            Value = new MxValue
+                            {
+                                SparseArrayValue = new MxSparseArray
+                                {
+                                    ElementDataType = MxDataType.Integer,
+                                    TotalLength = 4,
+                                    Elements =
+                                    {
+                                        new MxSparseElement
+                                        {
+                                            Index = 1,
+                                            Value = new MxValue { Int32Value = 7 },
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        };
+
+        await session.InvokeAsync(command, CancellationToken.None);
+
+        MxValue forwarded = worker.LastCommand!.Command.WriteBulk.Entries[0].Value;
+        Assert.Equal(MxValue.KindOneofCase.ArrayValue, forwarded.KindCase);
+        Assert.Equal(new[] { 0, 7, 0, 0 }, forwarded.ArrayValue.Int32Values.Values);
+    }
+
    private static GatewaySession CreateReadySession(IWorkerClient workerClient)
    {
        GatewaySession session = new(