.

Author: SimonCropp

src/Verify/Target.cs

@@ -3,7 +3,7 @@
 public readonly struct Target
 {
     internal readonly StringBuilder? stringBuilderData;
-    readonly object? objectData;
+    internal readonly object? objectData;
     internal readonly Stream? streamData;
     public string Extension { get; }
     public string? Name { get; } = null;

src/Verify/Verifier/InnerVerifier_Inner.cs

@@ -20,13 +20,26 @@ async Task<VerifyResult> VerifyInner(object? root, Func<Task>? cleanup, IEnumera
         resultTargets.AddRange(extraTargets);
 
         var stringOrStreams = resultTargets.Select(_ =>
-                new StringOrStream
+            {
+                if (_.IsObject)
+                {
+                    return new()
+                    {
+                        Extension = _.Extension,
+                        Name = _.Name,
+                        Stream = _.streamData,
+                        StringBuilder = JsonFormatter.AsJson(settings, counter, _.objectData!),
+                    };
+                }
+
+                return new StringOrStream
                 {
                     Extension = _.Extension,
                     Name = _.Name,
                     Stream = _.streamData,
                     StringBuilder = _.stringBuilderData,
-                })
+                };
+            })
             .ToList();
         var engine = new VerifyEngine(
             directory,
@@ -98,7 +111,7 @@ async Task<VerifyResult> VerifyInner(object? root, Func<Task>? cleanup, IEnumera
         return (list, cleanup);
     }
 
-    bool TryGetRootTarget(object? root,bool ignoreNullRoot, [NotNullWhen(true)] out Target? target)
+    bool TryGetRootTarget(object? root, bool ignoreNullRoot, [NotNullWhen(true)] out Target? target)
     {
         var appends = VerifierSettings.GetJsonAppenders(settings);
 
@@ -120,12 +133,7 @@ bool TryGetRootTarget(object? root,bool ignoreNullRoot, [NotNullWhen(true)] out
 
             if (hasAppends)
             {
-                target = new(
-                    settings.TxtOrJson,
-                    JsonFormatter.AsJson(
-                        settings,
-                        counter,
-                        new InfoBuilder(false, stringRoot, appends)));
+                target = new(new InfoBuilder(false, stringRoot, appends), settings.TxtOrJson);
             }
             else
             {
@@ -137,12 +145,7 @@ bool TryGetRootTarget(object? root,bool ignoreNullRoot, [NotNullWhen(true)] out
             return true;
         }
 
-        target = new(
-            settings.TxtOrJson,
-            JsonFormatter.AsJson(
-                settings,
-                counter,
-                new InfoBuilder(ignoreNullRoot, root, appends)));
+        target = new(new InfoBuilder(ignoreNullRoot, root, appends), settings.TxtOrJson);
         return true;
     }
 }