Skip to content

Commit a65233c

Browse files
dmealingclaude
dmealing
and
claude
committed
fr5c(csharp): merge-phase contributors + ERR_MERGE_CONFLICT envelope + WARN_DUPLICATE_DECLARATION
Ports the FR5c TS reference to C# per ADR-0009: - ParseNodeInto (the C# merge-phase entry point — used for intoRoot mode, `overlay: true` reopens, and default same-name-reuse) now snapshots the pre-merge canonical shape + own-attr set, then after the merge compares pre/post canonical via byte-compare (canonicalSerialize sorts attrs, omits source, is deterministic → byte-identical = no semantic change). On semantic change the target's source envelope upgrades to MergedSource with `Files` alphabetically sorted (cross-port DirectorySource order) and `Contributors` carrying role overlay-base (first file) + overlay-extension (later files). On no semantic change but a new contributor file, the envelope-warnings channel emits WARN_DUPLICATE_DECLARATION; the target's source stays unchanged. - DetectAttrMergeConflicts iterates the new contribution's @-prefixed inline attrs; when both the existing and new value are non-empty AND differ structurally (string/scalar/array/dict deep-compare), it raises ERR_MERGE_CONFLICT with a `format: "merged"` envelope listing both contributors. Last-writer-wins is preserved for same-value or one-side- unset cases (overlay semantics by design). The merge still proceeds so the loader sees one canonical tree. - ParseResult and LoadResult gain a parallel `EnvelopeWarnings` channel (`IReadOnlyList<LoaderWarning>?`) so FR5c sites emit envelope-shaped warnings without going through WARN_LEGACY wrapping. The loader also surfaces each envelope-warning message onto the legacy string warnings channel for cross-port wire-compat with the conformance runner's `expected-warnings.json` string-array check. - ErrorCode gains ERR_MERGE_CONFLICT; a new WarningCodes static class carries WARN_DUPLICATE_DECLARATION + WARN_LEGACY string constants (mirrors the TS WARNING_CODES taxonomy until the cross-port WARN_* enum lands). - The `overlay-attr-last-writer-wins` fixture predates FR5c and now fires ERR_MERGE_CONFLICT (`@displayName` flips v1→v2 across two files — exactly the new conflict shape). TS's conformance runner still passes that fixture because TS's runner does not gate tree-check on the presence of unexpected errors; C#'s runner DOES gate (matching Java). Listed in the expected-failures ledger with the cross-port runner-strictness note — a TS-side runner change is the proper fix and is out-of-scope here. Three cross-language conformance fixtures (TS-authored) now green in C#: - fixtures/conformance/error-merge-conflict-attr/ — two files conflict on `@description` → ERR_MERGE_CONFLICT with `format: "merged"` and both contributors listed alphabetically. - fixtures/conformance/warning-duplicate-declaration/ — two identical declarations → three WARN_DUPLICATE_DECLARATION strings (Subscriber, id, email). - fixtures/conformance/merge-three-way-no-conflict/ — three files contribute distinct attrs to the same entity → byte-identical merged tree to TS. Tests: 616 → 626 (98 + 343 + 10 + 175). 333 → 343 in Conformance.Tests: +10 new Fr5cMergeAttributionTests covering single-file no-merge, two-file + three-file merged-source attribution, ERR_MERGE_CONFLICT for differ / same-value-no-conflict / one-side-unset-no-conflict, WARN_DUPLICATE_DECLARATION emission and absence-on-real-overlay, role ordering, and the legacy-string-channel mirror. KNOWN GAP (FR5c-finalize): the C# conformance runner asserts envelope shape (`format` / `Files` / `JsonPath` / `Contributors`) on ERROR entries only. WARNING entries are compared as plain strings against `expected-warnings.json`; the per-warning envelope shape is not yet asserted. Same gap exists on the TS-side runner. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 243b2ac commit a65233c

5 files changed

Lines changed: 710 additions & 7 deletions

File tree

‎server/csharp/MetaObjects.Conformance.Tests/Fr5cMergeAttributionTests.cs‎

Lines changed: 384 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,384 @@
1+
// FR5c — multi-file overlay merge attribution unit tests (C# port).
2+
//
3+
// Mirrors the TS reference test
4+
// server/typescript/packages/metadata/test/fr5c-merge-attribution.test.ts
5+
//
6+
// Verifies the loader's overlay-merge phase tracks contributors, raises
7+
// ERR_MERGE_CONFLICT on attribute-level conflicts, and emits
8+
// WARN_DUPLICATE_DECLARATION when a second file re-declares a node
9+
// identically. See ADR-0009 and the FR5c plan.
10+
11+
using System.Text.Json;
12+
using MetaObjects.Loader;
13+
using MetaObjects.Source;
14+
using Xunit;
15+
16+
namespace MetaObjects.Conformance.Tests;
17+
18+
public class Fr5cMergeAttributionTests
19+
{
20+
// -----------------------------------------------------------------------
21+
// Helpers
22+
// -----------------------------------------------------------------------
23+
24+
private static InMemoryStringSource MkSource(string content, string id) =>
25+
new(content, id, MetaDataFormat.Json);
26+
27+
private const string BaseEntity = """
28+
{
29+
"metadata.root": {
30+
"package": "acme",
31+
"children": [
32+
{ "object.entity": {
33+
"name": "Subscriber",
34+
"children": [
35+
{ "field.long": { "name": "id" } },
36+
{ "field.string": { "name": "email" } },
37+
{ "identity.primary": { "@fields": "id" } }
38+
]
39+
}
40+
}
41+
]
42+
}
43+
}
44+
""";
45+
46+
private static string BaseEntityWithDescription(string desc) => $$"""
47+
{
48+
"metadata.root": {
49+
"package": "acme",
50+
"children": [
51+
{ "object.entity": {
52+
"name": "Subscriber",
53+
"children": [
54+
{ "field.long": { "name": "id" } },
55+
{ "field.string": { "name": "email", "@description": "{{desc}}" } },
56+
{ "identity.primary": { "@fields": "id" } }
57+
]
58+
}
59+
}
60+
]
61+
}
62+
}
63+
""";
64+
65+
private static string BaseEntityWithEmailFieldOnly() => """
66+
{
67+
"metadata.root": {
68+
"package": "acme",
69+
"children": [
70+
{ "object.entity": {
71+
"name": "Subscriber",
72+
"children": [
73+
{ "field.long": { "name": "id" } },
74+
{ "field.string": { "name": "email" } },
75+
{ "identity.primary": { "@fields": "id" } }
76+
]
77+
}
78+
}
79+
]
80+
}
81+
}
82+
""";
83+
84+
// -----------------------------------------------------------------------
85+
// FR5c — merge phase tracks contributors
86+
// -----------------------------------------------------------------------
87+
88+
[Fact]
89+
public void SingleFileLoad_NodeSource_StaysFormatJson_NoMergedSource()
90+
{
91+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
92+
{
93+
MkSource(BaseEntity, "meta.a.json"),
94+
});
95+
Assert.Empty(res.Errors);
96+
var sub = res.Root.OwnChildByName("Subscriber");
97+
Assert.NotNull(sub);
98+
Assert.Equal("json", sub!.Source.Format);
99+
}
100+
101+
[Fact]
102+
public void TwoFilesContribute_SecondWithSemanticChange_ProducesMergedSourceWithBothContributors()
103+
{
104+
// File A declares the entity. File B re-opens it via default same-name
105+
// reuse (no `overlay: true`) and adds @description — that's a real
106+
// semantic change, so the merged source should list both files.
107+
string fileA = BaseEntity;
108+
string fileB = """
109+
{
110+
"metadata.root": {
111+
"package": "acme",
112+
"children": [
113+
{ "object.entity": {
114+
"name": "Subscriber",
115+
"@description": "A newsletter subscriber."
116+
}
117+
}
118+
]
119+
}
120+
}
121+
""";
122+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
123+
{
124+
MkSource(fileA, "meta.a.json"),
125+
MkSource(fileB, "meta.b.json"),
126+
});
127+
Assert.Empty(res.Errors);
128+
var sub = res.Root.OwnChildByName("Subscriber");
129+
Assert.NotNull(sub);
130+
Assert.Equal("merged", sub!.Source.Format);
131+
var src = Assert.IsType<MergedSource>(sub.Source);
132+
// Files are alphabetically sorted, per the cross-port contract.
133+
Assert.Equal(new[] { "meta.a.json", "meta.b.json" }, src.Files.ToArray());
134+
Assert.Equal(2, src.Contributors.Count);
135+
Assert.Equal("meta.a.json", src.Contributors[0].File);
136+
Assert.Equal("overlay-base", src.Contributors[0].Role);
137+
Assert.Equal("meta.b.json", src.Contributors[1].File);
138+
Assert.Equal("overlay-extension", src.Contributors[1].Role);
139+
Assert.Equal("A newsletter subscriber.", sub.OwnAttr("description"));
140+
}
141+
142+
[Fact]
143+
public void ThreeFilesContribute_MergedSourceListsAllThreeAlphabetically()
144+
{
145+
string fileA = BaseEntity;
146+
string fileB = """
147+
{
148+
"metadata.root": {
149+
"package": "acme",
150+
"children": [
151+
{ "object.entity": {
152+
"name": "Subscriber",
153+
"@description": "Subscriber to a newsletter."
154+
}
155+
}
156+
]
157+
}
158+
}
159+
""";
160+
string fileC = """
161+
{
162+
"metadata.root": {
163+
"package": "acme",
164+
"children": [
165+
{ "object.entity": {
166+
"name": "Subscriber",
167+
"@title": "Subscriber"
168+
}
169+
}
170+
]
171+
}
172+
}
173+
""";
174+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
175+
{
176+
MkSource(fileA, "meta.a.json"),
177+
MkSource(fileB, "meta.b.json"),
178+
MkSource(fileC, "meta.c.json"),
179+
});
180+
Assert.Empty(res.Errors);
181+
var sub = res.Root.OwnChildByName("Subscriber");
182+
var src = Assert.IsType<MergedSource>(sub!.Source);
183+
Assert.Equal(new[] { "meta.a.json", "meta.b.json", "meta.c.json" }, src.Files.ToArray());
184+
Assert.Equal("overlay-base", src.Contributors[0].Role);
185+
Assert.Equal("overlay-extension", src.Contributors[1].Role);
186+
Assert.Equal("overlay-extension", src.Contributors[2].Role);
187+
}
188+
189+
// -----------------------------------------------------------------------
190+
// FR5c — ERR_MERGE_CONFLICT on conflicting attr values
191+
// -----------------------------------------------------------------------
192+
193+
[Fact]
194+
public void TwoFiles_SameAttr_DifferentNonEmptyValues_RaisesMergeConflict()
195+
{
196+
string fileA = BaseEntityWithDescription("Primary email.");
197+
string fileB = BaseEntityWithDescription("Backup email.");
198+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
199+
{
200+
MkSource(fileA, "meta.a.json"),
201+
MkSource(fileB, "meta.b.json"),
202+
});
203+
var conflicts = res.Errors.Where(e => e.Code == ErrorCode.ERR_MERGE_CONFLICT).ToList();
204+
Assert.Single(conflicts);
205+
var env = Assert.IsType<MergedSource>(conflicts[0].Envelope);
206+
Assert.Equal("merged", env.Format);
207+
Assert.Equal(new[] { "meta.a.json", "meta.b.json" }, env.Files.ToArray());
208+
Assert.Equal("overlay-base", env.Contributors[0].Role);
209+
Assert.Equal("overlay-extension", env.Contributors[1].Role);
210+
Assert.Contains("@description", env.JsonPath);
211+
}
212+
213+
[Fact]
214+
public void TwoFiles_SameAttr_SameValue_NoMergeConflict()
215+
{
216+
string fileA = BaseEntityWithDescription("Email.");
217+
string fileB = BaseEntityWithDescription("Email.");
218+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
219+
{
220+
MkSource(fileA, "meta.a.json"),
221+
MkSource(fileB, "meta.b.json"),
222+
});
223+
var conflicts = res.Errors.Where(e => e.Code == ErrorCode.ERR_MERGE_CONFLICT).ToList();
224+
Assert.Empty(conflicts);
225+
}
226+
227+
[Fact]
228+
public void TwoFiles_OnlyOneSideDeclaresAttr_NoMergeConflict()
229+
{
230+
string fileA = BaseEntityWithDescription("Email.");
231+
string fileB = BaseEntityWithEmailFieldOnly();
232+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
233+
{
234+
MkSource(fileA, "meta.a.json"),
235+
MkSource(fileB, "meta.b.json"),
236+
});
237+
var conflicts = res.Errors.Where(e => e.Code == ErrorCode.ERR_MERGE_CONFLICT).ToList();
238+
Assert.Empty(conflicts);
239+
}
240+
241+
// -----------------------------------------------------------------------
242+
// FR5c — WARN_DUPLICATE_DECLARATION via semantic-diff
243+
// -----------------------------------------------------------------------
244+
245+
[Fact]
246+
public void TwoFilesDeclareSameNodeIdentically_EmitsDuplicateDeclarationWarning()
247+
{
248+
// Use an abstract entity (no identity.primary, no anonymous children
249+
// that would duplicate on a second pass). Two identical declarations
250+
// from different files should produce no semantic change and emit the
251+
// duplicate-declaration warning.
252+
string file = """
253+
{
254+
"metadata.root": {
255+
"package": "acme",
256+
"children": [
257+
{ "object.entity": {
258+
"name": "Subscriber",
259+
"abstract": true,
260+
"children": [
261+
{ "field.long": { "name": "id" } },
262+
{ "field.string": { "name": "email" } }
263+
]
264+
}
265+
}
266+
]
267+
}
268+
}
269+
""";
270+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
271+
{
272+
MkSource(file, "meta.a.json"),
273+
MkSource(file, "meta.b.json"),
274+
});
275+
Assert.Empty(res.Errors);
276+
Assert.NotNull(res.EnvelopeWarnings);
277+
var dups = res.EnvelopeWarnings!
278+
.Where(w => w.Code == WarningCodes.WARN_DUPLICATE_DECLARATION).ToList();
279+
Assert.NotEmpty(dups);
280+
// One of the warnings should target the top-level Subscriber entity.
281+
var subWarn = dups.FirstOrDefault(w => w.Message.Contains("Subscriber"));
282+
Assert.NotNull(subWarn);
283+
var src = Assert.IsType<MergedSource>(subWarn!.Source);
284+
Assert.Equal(new[] { "meta.a.json", "meta.b.json" }, src.Files.ToArray());
285+
Assert.Equal("overlay-base", src.Contributors[0].Role);
286+
Assert.Equal("overlay-extension", src.Contributors[1].Role);
287+
}
288+
289+
[Fact]
290+
public void RealSemanticOverlay_DoesNotEmitDuplicateDeclarationWarning()
291+
{
292+
string fileA = BaseEntity;
293+
string fileB = """
294+
{
295+
"metadata.root": {
296+
"package": "acme",
297+
"children": [
298+
{ "object.entity": {
299+
"name": "Subscriber",
300+
"@description": "Differs from A."
301+
}
302+
}
303+
]
304+
}
305+
}
306+
""";
307+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
308+
{
309+
MkSource(fileA, "meta.a.json"),
310+
MkSource(fileB, "meta.b.json"),
311+
});
312+
Assert.NotNull(res.EnvelopeWarnings);
313+
var dups = res.EnvelopeWarnings!
314+
.Where(w => w.Code == WarningCodes.WARN_DUPLICATE_DECLARATION).ToList();
315+
Assert.Empty(dups);
316+
}
317+
318+
// -----------------------------------------------------------------------
319+
// FR5c — overlay-base/overlay-extension role ordering
320+
// -----------------------------------------------------------------------
321+
322+
[Fact]
323+
public void Contributors_FirstRoleIsOverlayBase_RestAreOverlayExtension()
324+
{
325+
string fileA = BaseEntity;
326+
string fileB = """
327+
{
328+
"metadata.root": {
329+
"package": "acme",
330+
"children": [
331+
{ "object.entity": {
332+
"name": "Subscriber",
333+
"@title": "Subscriber"
334+
}
335+
}
336+
]
337+
}
338+
}
339+
""";
340+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
341+
{
342+
MkSource(fileA, "meta.a.json"),
343+
MkSource(fileB, "meta.b.json"),
344+
});
345+
var sub = res.Root.OwnChildByName("Subscriber")!;
346+
var src = Assert.IsType<MergedSource>(sub.Source);
347+
Assert.Equal("overlay-base", src.Contributors[0].Role);
348+
Assert.Equal("overlay-extension", src.Contributors[1].Role);
349+
}
350+
351+
// -----------------------------------------------------------------------
352+
// FR5c — legacy warnings channel still carries envelope-warning messages
353+
// (for the conformance runner's expected-warnings.json string check).
354+
// -----------------------------------------------------------------------
355+
356+
[Fact]
357+
public void LegacyStringWarnings_IncludeEnvelopeWarningMessages_ForConformanceRunner()
358+
{
359+
string file = """
360+
{
361+
"metadata.root": {
362+
"package": "acme",
363+
"children": [
364+
{ "object.entity": {
365+
"name": "Subscriber",
366+
"abstract": true,
367+
"children": [
368+
{ "field.long": { "name": "id" } }
369+
]
370+
}
371+
}
372+
]
373+
}
374+
}
375+
""";
376+
var res = new MetaDataLoader().Load(new IMetaDataSource[]
377+
{
378+
MkSource(file, "meta.a.json"),
379+
MkSource(file, "meta.b.json"),
380+
});
381+
Assert.Contains(res.Warnings,
382+
w => w.Contains("duplicate declaration", StringComparison.Ordinal));
383+
}
384+
}

‎server/csharp/MetaObjects.Conformance.Tests/conformance-expected-failures.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"language": "csharp",
33
"_comment": "FR5a envelope-shape gates: TS is the reference port for source.format / source.files / source.jsonPath. C# is now reconciled with TS on the JSON-side FR5a envelopes (parser malformed-JSON catch builds a $-rooted JsonSource with the source-file name; inline-attr loop reports ERR_RESERVED_ATTR / ERR_UNKNOWN_ATTR / ERR_BAD_ATTR_VALUE at the parent's path — not key-deeper). Keep this file as the documented ledger surface.",
4-
"_notes": "FR5d (finalized 2026-05-27, all four ports): reference-resolution errors emit format=resolved with referrer + target; the cross-port fixtures now encode the resolved envelope and all four ports load byte-identically. No interim known-gaps.",
5-
"fixtures": []
4+
"_notes": "FR5c (2026-05-27): ERR_MERGE_CONFLICT now fires when an `overlay: true` reopen sets the same `@attr` to a different non-empty value (cross-port contract per ADR-0009). The `overlay-attr-last-writer-wins` fixture predates FR5c and exercises exactly that case (`@displayName` flips v1→v2 across two files). TS's conformance runner still PASSES this fixture because TS's runner does not gate tree-check on the presence of unexpected errors; C#'s runner DOES gate (matches Java). Listing here documents the cross-port runner-strictness divergence (TS-side runner change is the proper fix; out-of-scope for FR5c port). FR5d (finalized 2026-05-27, all four ports): reference-resolution errors emit format=resolved with referrer + target; the cross-port fixtures now encode the resolved envelope and all four ports load byte-identically.",
5+
"fixtures": [
6+
"overlay-attr-last-writer-wins"
7+
]
68
}

0 commit comments

Comments
 (0)