.

Author: SimonCropp

src/Verify/Naming/GetFileNames.cs

@@ -1,3 +1,3 @@
-delegate FilePair GetFileNames(Target target);
+delegate FilePair GetFileNames(StringOrStream target);
 
-delegate FilePair GetIndexedFileNames(Target target, string index);
+delegate FilePair GetIndexedFileNames(StringOrStream target, string index);

src/Verify/Target.cs

@@ -2,13 +2,26 @@
 
 public readonly struct Target
 {
-    readonly StringBuilder? stringBuilderData;
-    readonly Stream? streamData;
+    internal readonly StringBuilder? stringBuilderData;
+    internal readonly Stream? streamData;
     public string Extension { get; }
     public string? Name { get; } = null;
     public bool PerformConversion { get; } = true;
     public string NameOrTarget => Name ?? "target";
 
+    public StringBuilder StringBuilderData
+    {
+        get
+        {
+            if (stringBuilderData is null)
+            {
+                throw new("Use StreamData.");
+            }
+
+            return stringBuilderData;
+        }
+    }
+
     public Stream StreamData
     {
         get

src/Verify/Verifier/InnerVerifier_Inner.cs

@@ -27,7 +27,16 @@ async Task<VerifyResult> VerifyInner(object? root, Func<Task>? cleanup, IEnumera
             settings.TypeName ?? typeName,
             settings.MethodName ?? methodName);
 
-        await engine.HandleResults(resultTargets);
+        await engine.HandleResults(
+            resultTargets.Select(_ =>
+                    new StringOrStream
+                    {
+                        Extension = _.Extension,
+                        Name = _.Name,
+                        Stream = _.streamData,
+                        StringBuilder = _.stringBuilderData,
+                    })
+                .ToList());
 
         await cleanup();
 

src/Verify/Verifier/VerifyEngine.cs

@@ -23,16 +23,16 @@ class VerifyEngine(
     public IReadOnlyList<FilePair> Equal => equal;
     public IReadOnlyList<FilePair> AutoVerified => autoVerified;
 
-    static async Task<EqualityResult> GetResult(VerifySettings settings, FilePair file, Target target, bool previousTextFailed)
+    static async Task<EqualityResult> GetResult(VerifySettings settings, FilePair file, StringOrStream target, bool previousTextFailed)
     {
         try
         {
-            if (target.TryGetStringBuilder(out var value))
+            if (target.StringBuilder != null)
             {
-                return await Comparer.Text(file, value, settings);
+                return await Comparer.Text(file, target.StringBuilder, settings);
             }
 
-            using var stream = target.StreamData;
+            using var stream = target.Stream!;
             stream.MoveToStart();
             return await FileComparer.DoCompare(settings, file, previousTextFailed, stream);
         }
@@ -48,7 +48,7 @@ static async Task<EqualityResult> GetResult(VerifySettings settings, FilePair fi
         }
     }
 
-    public async Task HandleResults(List<Target> targetList)
+    public async Task HandleResults(List<StringOrStream> targetList)
     {
         if (targetList.Count == 1)
         {
@@ -61,7 +61,7 @@ public async Task HandleResults(List<Target> targetList)
 
         var textHasFailed = false;
 
-        async Task Inner(FilePair file, Target target)
+        async Task Inner(FilePair file, StringOrStream target)
         {
             var result = await GetResult(settings, file, target, textHasFailed);
 
@@ -290,4 +290,17 @@ static void AcceptChanges(in FilePair file)
         File.Delete(file.VerifiedPath);
         File.Move(file.ReceivedPath, file.VerifiedPath);
     }
+}
+
+class StringOrStream
+{
+    public required string? Name { get; init; }
+    //TODO: should be nullable
+    public required string Extension { get; init; }
+    [MemberNotNullWhen(true, nameof(IsString))]
+    public StringBuilder? StringBuilder { get; init; }
+    [MemberNotNullWhen(false, nameof(IsString))]
+    public Stream? Stream { get; init; }
+    public string NameOrTarget => Name ?? "target";
+    public bool IsString => StringBuilder != null;
 }