chore(conformance): pre-merge simplifier pass — harness polish

dmealing · claude · dmealing · commit 4dde6cf0d7f2 · 2026-05-26T20:56:04.000-04:00
Tighten the harness changes added in e682311 without touching behavior or the cross-port assertion shape. All four ports' conformance suites stay green (TS 182 / C# 302 / Java 182 / Python 94). TS adapter.ts — extract a single `relativize()` for the envelope file normalization (it was duplicated across two near-identical json/yaml + merged/resolved branches) and collapse those branches into one block now that the only divergence (an optional jsonPath on resolved) is handled by a single conditional spread. C# ConformanceAdapter.BuildEnvelope — replace the if/return ladder with a `switch` expression and a local `Rel(files)` helper so the per-format-source mapping is one column. YamlConformanceTests — unify BuildYamlEnvelope and BuildYamlEnvelopeFromException to share a single switch expression (their inputs differ only in the carrier type). Java FixtureLint — collapse the two-arg `readJson(path, bytes)` helper (the `path` was unused) into a single-arg `readJsonFile(Path)` that does its own file read. ConformanceTest — drop the unused `import java.util.Arrays`. YamlConformanceTest — drop the unused `parseExpectedErrors(Path)` helper (only the envelope variant is still called). Python conformance_adapter._build_envelope — pull the repeated `tuple(_relativize(...) for f in env.files)` into a nested `rel_files()` so the four format branches each fit on one line. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
diff --git a/server/csharp/MetaObjects.Conformance.Tests/ConformanceAdapter.cs b/server/csharp/MetaObjects.Conformance.Tests/ConformanceAdapter.cs
@@ -82,29 +82,18 @@ public static LoadOutcome LoadFixture(string inputDir, IReadOnlyList<string> pro
     private static ErrorEnvelopeRecord BuildEnvelope(MetaError err, string inputDir)
     {
         var code = err.Code.ToString();
-        var src = err.Envelope;
-        if (src is JsonSource js)
+        IReadOnlyList<string> Rel(IEnumerable<string> files) =>
+            files.Select(f => RelativizeFile(f, inputDir)).ToList();
+        return err.Envelope switch
         {
-            return new ErrorEnvelopeRecord(code, "json", js.Files.Select(f => RelativizeFile(f, inputDir)).ToList(), js.JsonPath);
-        }
-        if (src is YamlSource ys)
-        {
-            return new ErrorEnvelopeRecord(code, "yaml", ys.Files.Select(f => RelativizeFile(f, inputDir)).ToList(), ys.JsonPath);
-        }
-        if (src is MergedSource ms)
-        {
-            return new ErrorEnvelopeRecord(code, "merged", ms.Files.Select(f => RelativizeFile(f, inputDir)).ToList(), ms.JsonPath);
-        }
-        if (src is ResolvedSource rs)
-        {
-            return new ErrorEnvelopeRecord(code, "resolved", rs.Files.Select(f => RelativizeFile(f, inputDir)).ToList(), rs.JsonPath);
-        }
-        if (src is CodeSource)
-        {
-            return new ErrorEnvelopeRecord(code, "code", new List<string>(), null);
-        }
-        // Pre-FR5a fallback: no envelope. Synthesize a minimal $-rooted JSON shape.
-        return new ErrorEnvelopeRecord(code, "json", new List<string>(), "$");
+            JsonSource js     => new ErrorEnvelopeRecord(code, "json",     Rel(js.Files), js.JsonPath),
+            YamlSource ys     => new ErrorEnvelopeRecord(code, "yaml",     Rel(ys.Files), ys.JsonPath),
+            MergedSource ms   => new ErrorEnvelopeRecord(code, "merged",   Rel(ms.Files), ms.JsonPath),
+            ResolvedSource rs => new ErrorEnvelopeRecord(code, "resolved", Rel(rs.Files), rs.JsonPath),
+            CodeSource        => new ErrorEnvelopeRecord(code, "code",     new List<string>(), null),
+            // Pre-FR5a fallback: no envelope. Synthesize a minimal $-rooted JSON shape.
+            _                 => new ErrorEnvelopeRecord(code, "json",     new List<string>(), "$"),
+        };
     }
 
     private static string RelativizeFile(string filePath, string inputDir)
diff --git a/server/csharp/MetaObjects.Conformance.Tests/YamlConformanceTests.cs b/server/csharp/MetaObjects.Conformance.Tests/YamlConformanceTests.cs
@@ -394,29 +394,20 @@ void AddEnvelope(MetaError err)
     /// YAML fixtures' file token is always "input.yaml" (the authoring file
     /// the consumer sees), not the per-port internal source id.
     /// </summary>
-    private static ErrorEnvelopeRecord BuildYamlEnvelope(MetaError err)
-    {
-        var code = err.Code.ToString();
-        var env = err.Envelope;
-        return env switch
+    private static ErrorEnvelopeRecord BuildYamlEnvelope(MetaError err) =>
+        BuildYamlEnvelope(err.Code.ToString(), err.Envelope);
+
+    private static ErrorEnvelopeRecord BuildYamlEnvelopeFromException(ParseException ex) =>
+        BuildYamlEnvelope(ex.Code.ToString(), ex.Envelope);
+
+    private static ErrorEnvelopeRecord BuildYamlEnvelope(string code, ErrorSource? envelope) =>
+        envelope switch
         {
-            JsonSource js => new ErrorEnvelopeRecord(code, "json", new[] { "input.yaml" }, js.JsonPath),
-            YamlSource ys => new ErrorEnvelopeRecord(code, "yaml", new[] { "input.yaml" }, ys.JsonPath),
-            MergedSource ms => new ErrorEnvelopeRecord(code, "merged", ms.Files, ms.JsonPath),
+            JsonSource js     => new ErrorEnvelopeRecord(code, "json",     new[] { "input.yaml" }, js.JsonPath),
+            YamlSource ys     => new ErrorEnvelopeRecord(code, "yaml",     new[] { "input.yaml" }, ys.JsonPath),
+            MergedSource ms   => new ErrorEnvelopeRecord(code, "merged",   ms.Files, ms.JsonPath),
             ResolvedSource rs => new ErrorEnvelopeRecord(code, "resolved", rs.Files, rs.JsonPath),
-            CodeSource => new ErrorEnvelopeRecord(code, "code", Array.Empty<string>(), null),
-            _ => new ErrorEnvelopeRecord(code, "yaml", new[] { "input.yaml" }, "$"),
+            CodeSource        => new ErrorEnvelopeRecord(code, "code",     Array.Empty<string>(), null),
+            _                 => new ErrorEnvelopeRecord(code, "yaml",     new[] { "input.yaml" }, "$"),
         };
-    }
-
-    private static ErrorEnvelopeRecord BuildYamlEnvelopeFromException(ParseException ex)
-    {
-        var code = ex.Code.ToString();
-        var env = ex.Envelope;
-        if (env is JsonSource js)
-            return new ErrorEnvelopeRecord(code, "json", new[] { "input.yaml" }, js.JsonPath);
-        if (env is YamlSource ys)
-            return new ErrorEnvelopeRecord(code, "yaml", new[] { "input.yaml" }, ys.JsonPath);
-        return new ErrorEnvelopeRecord(code, "yaml", new[] { "input.yaml" }, "$");
-    }
 }
diff --git a/server/java/metadata/src/test/java/com/metaobjects/conformance/ConformanceTest.java b/server/java/metadata/src/test/java/com/metaobjects/conformance/ConformanceTest.java
@@ -36,7 +36,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
diff --git a/server/java/metadata/src/test/java/com/metaobjects/conformance/FixtureLint.java b/server/java/metadata/src/test/java/com/metaobjects/conformance/FixtureLint.java
@@ -62,8 +62,7 @@ public static List<String> lintFixture(FixtureDiscovery.Fixture fix,
         // expected-errors.json — each code must be in the registry
         if (fix.hasExpectedErrors) {
             try {
-                JsonElement parsed = readJson(fix.dir.resolve("expected-errors.json").toString(),
-                    Files.readAllBytes(fix.dir.resolve("expected-errors.json")));
+                JsonElement parsed = readJsonFile(fix.dir.resolve("expected-errors.json"));
                 List<String> codes = parseExpectedErrors(parsed);
                 for (String code : codes) {
                     if (!registeredErrorCodes.contains(code)) {
@@ -79,8 +78,7 @@ public static List<String> lintFixture(FixtureDiscovery.Fixture fix,
         // script.json — shape + navigate-segment grammar
         if (fix.hasScript) {
             try {
-                JsonElement parsed = readJson(fix.dir.resolve("script.json").toString(),
-                    Files.readAllBytes(fix.dir.resolve("script.json")));
+                JsonElement parsed = readJsonFile(fix.dir.resolve("script.json"));
                 lintScriptShape(fix, parsed, problems);
             } catch (Exception ex) {
                 problems.add(fix.name + ": malformed script.json — " + ex.getMessage());
@@ -94,8 +92,9 @@ public static List<String> lintFixture(FixtureDiscovery.Fixture fix,
     // helpers
     // ---------------------------------------------------------------------
 
-    private static JsonElement readJson(String path, byte[] bytes) {
-        return JsonParser.parseString(new String(bytes, StandardCharsets.UTF_8));
+    private static JsonElement readJsonFile(java.nio.file.Path path) throws IOException {
+        return JsonParser.parseString(
+            new String(Files.readAllBytes(path), StandardCharsets.UTF_8));
     }
 
     /**
diff --git a/server/java/metadata/src/test/java/com/metaobjects/conformance/YamlConformanceTest.java b/server/java/metadata/src/test/java/com/metaobjects/conformance/YamlConformanceTest.java
@@ -380,16 +380,6 @@ private static String scanMessageForErrorCode(String message) {
         return ErrorCode.ERR_UNKNOWN.name();
     }
 
-    private static List<String> parseExpectedErrors(Path file) {
-        try {
-            JsonElement el = JsonParser.parseString(new String(
-                Files.readAllBytes(file), StandardCharsets.UTF_8));
-            return FixtureLint.parseExpectedErrors(el);
-        } catch (IOException ex) {
-            throw new AssertionError("expected-errors.json read error: " + ex.getMessage(), ex);
-        }
-    }
-
     /** Parse the YAML fixture's expected-errors.json into the FR5a envelope shape. */
     private static FixtureLint.ExpectedErrorsEnvelope parseExpectedErrorsEnvelope(Path file) {
         try {
diff --git a/server/python/tests/conformance/conformance_adapter.py b/server/python/tests/conformance/conformance_adapter.py
@@ -49,18 +49,18 @@ def _build_envelope(err, input_dir: Path) -> ErrorEnvelopeRecord:
     """Convert a Python MetaError into the cross-port envelope record."""
     code = err.code.name
     env = err.envelope
+
+    def rel_files() -> tuple[str, ...]:
+        return tuple(_relativize(f, input_dir) for f in env.files)
+
     if isinstance(env, JsonSource):
-        files = tuple(_relativize(f, input_dir) for f in env.files)
-        return ErrorEnvelopeRecord(code, "json", files, env.json_path)
+        return ErrorEnvelopeRecord(code, "json", rel_files(), env.json_path)
     if isinstance(env, YamlSource):
-        files = tuple(_relativize(f, input_dir) for f in env.files)
-        return ErrorEnvelopeRecord(code, "yaml", files, env.json_path)
+        return ErrorEnvelopeRecord(code, "yaml", rel_files(), env.json_path)
     if isinstance(env, MergedSource):
-        files = tuple(_relativize(f, input_dir) for f in env.files)
-        return ErrorEnvelopeRecord(code, "merged", files, env.json_path)
+        return ErrorEnvelopeRecord(code, "merged", rel_files(), env.json_path)
     if isinstance(env, ResolvedSource):
-        files = tuple(_relativize(f, input_dir) for f in env.files)
-        return ErrorEnvelopeRecord(code, "resolved", files, env.json_path)
+        return ErrorEnvelopeRecord(code, "resolved", rel_files(), env.json_path)
     if isinstance(env, CodeSource):
         return ErrorEnvelopeRecord(code, "code", (), None)
     # No envelope — synthesize a minimal root-level shape.
diff --git a/server/typescript/packages/metadata/test/conformance/adapter.ts b/server/typescript/packages/metadata/test/conformance/adapter.ts
@@ -62,23 +62,23 @@ export const tsAdapter: ConformanceAdapter = {
     // relative to the fixture's inputDir so the cross-port assertion has a
     // portable file token. Errors without an envelope (rare; only non-ParseError)
     // synthesize a minimal $-rooted shape.
+    function relativize(f: string): string {
+      const fwd = f.replace(/\\/g, "/");
+      return f.startsWith(inputDir) ? relative(inputDir, f).replace(/\\/g, "/") : fwd;
+    }
     const envelopes: ErrorEnvelopeRecord[] = result.errors.map((err) => {
       if (err instanceof ParseError) {
         const src = err.source;
-        if (src.format === "json" || src.format === "yaml") {
-          const files = src.files.map((f) => {
-            if (f.startsWith(inputDir)) return relative(inputDir, f).replace(/\\/g, "/");
-            return f.replace(/\\/g, "/");
-          });
-          return { code: err.code, source: { format: src.format, files, jsonPath: src.jsonPath } };
-        }
-        if (src.format === "merged" || src.format === "resolved") {
-          const files = src.files.map((f) => {
-            if (f.startsWith(inputDir)) return relative(inputDir, f).replace(/\\/g, "/");
-            return f.replace(/\\/g, "/");
-          });
+        if (src.format === "json" || src.format === "yaml"
+          || src.format === "merged" || src.format === "resolved") {
+          const files = src.files.map(relativize);
           const jp = (src as { jsonPath?: string }).jsonPath;
-          return { code: err.code, source: jp !== undefined ? { format: src.format, files, jsonPath: jp } : { format: src.format, files } };
+          return {
+            code: err.code,
+            source: jp !== undefined
+              ? { format: src.format, files, jsonPath: jp }
+              : { format: src.format, files },
+          };
         }
         return { code: err.code, source: { format: src.format, files: [] } };
       }
