Add AsyncContinueOnCapturedContext to SepSpec (#240)

nietras · Jan 26, 2025 · 151525c · 151525c
1 parent 1b2277b
commit 151525c
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -2187,7 +2187,8 @@ namespace nietras.SeparatedValues
     public readonly struct SepSpec : System.IEquatable<nietras.SeparatedValues.SepSpec>
     {
         public SepSpec() { }
-        public SepSpec(nietras.SeparatedValues.Sep sep, System.Globalization.CultureInfo? cultureInfo) { }
+        public SepSpec(nietras.SeparatedValues.Sep sep, System.Globalization.CultureInfo? cultureInfo, bool asyncContinueOnCapturedContext) { }
+        public bool AsyncContinueOnCapturedContext { get; init; }
         public System.Globalization.CultureInfo? CultureInfo { get; init; }
         public nietras.SeparatedValues.Sep Sep { get; init; }
     }

diff --git a/src/Sep.Test/SepReaderColTest.cs b/src/Sep.Test/SepReaderColTest.cs
@@ -295,11 +295,11 @@ static void Run(SepReader.ColAction action, string colValue = ColText, Func<SepR
             () => Sep.Reader(useConfigure).FromText(text),
             () => Sep.Default.Reader(useConfigure).FromText(text),
             () => ((Sep?)null).Reader(useConfigure).FromText(text),
-            () => new SepSpec(Sep.Default, null).Reader(useConfigure).FromText(text),
+            () => new SepSpec(Sep.Default, null, false).Reader(useConfigure).FromText(text),
         };
         if (configure is null)
         {
-            createReaders.Add(() => new SepSpec(Sep.Default, null).Reader().FromText(text));
+            createReaders.Add(() => new SepSpec(Sep.Default, null, false).Reader().FromText(text));
         }
 
         foreach (var createReader in createReaders)

diff --git a/src/Sep.Test/SepSpecTest.cs b/src/Sep.Test/SepSpecTest.cs
@@ -13,14 +13,31 @@ public void SepSpecTest_Defaults()
 
         Assert.AreEqual(Sep.Default, sut.Sep);
         Assert.AreSame(SepDefaults.CultureInfo, sut.CultureInfo);
+        Assert.IsFalse(sut.AsyncContinueOnCapturedContext);
+    }
+
+    [TestMethod]
+    public void SepSpecTest_Ctor_2()
+    {
+        var sut = new SepSpec(new(';'), CultureInfo.CurrentCulture);
+
+        Assert.AreEqual(new Sep(';'), sut.Sep);
+        Assert.AreSame(CultureInfo.CurrentCulture, sut.CultureInfo);
+        Assert.IsFalse(sut.AsyncContinueOnCapturedContext);
     }
 
     [TestMethod]
     public void SepSpecTest_With()
     {
-        var sut = new SepSpec() with { Sep = new(';'), CultureInfo = CultureInfo.CurrentCulture };
+        var sut = new SepSpec() with
+        {
+            Sep = new(';'),
+            CultureInfo = CultureInfo.CurrentCulture,
+            AsyncContinueOnCapturedContext = true,
+        };
 
         Assert.AreEqual(new Sep(';'), sut.Sep);
         Assert.AreSame(CultureInfo.CurrentCulture, sut.CultureInfo);
+        Assert.IsTrue(sut.AsyncContinueOnCapturedContext);
     }
 }
diff --git a/src/Sep.Test/SepWriterColTest.cs b/src/Sep.Test/SepWriterColTest.cs
@@ -205,7 +205,7 @@ static async ValueTask Run(SepWriter.ColAction action, string? expectedColValue
         [
             () => Sep.Writer(o => o with { CultureInfo = cultureInfo ?? SepDefaults.CultureInfo }).ToText(),
             () => Sep.Default.Writer(o => o with { CultureInfo = cultureInfo ?? SepDefaults.CultureInfo }).ToText(),
-            () => new SepSpec(Sep.Default, cultureInfo ?? SepDefaults.CultureInfo).Writer(o => o with { }).ToText(),
+            () => new SepSpec(Sep.Default, cultureInfo ?? SepDefaults.CultureInfo, false).Writer(o => o with { }).ToText(),
         ];
         foreach (var createWriter in createWriters)
         {

diff --git a/src/Sep/SepReader.cs b/src/Sep/SepReader.cs
@@ -90,7 +90,7 @@ internal SepReader(Info info, in SepReaderOptions options, TextReader reader)
     }
 
     public bool IsEmpty { get; private set; }
-    public SepSpec Spec => new(new(_separator), _cultureInfo);
+    public SepSpec Spec => new(new(_separator), _cultureInfo, _continueOnCapturedContext);
     public bool HasHeader { get => _hasHeader; private set => _hasHeader = value; }
     public bool HasRows { get; private set; }
     public SepReaderHeader Header => _header;

diff --git a/src/Sep/SepReaderExtensions.cs b/src/Sep/SepReaderExtensions.cs
@@ -17,7 +17,11 @@ public static partial class SepReaderExtensions
     public static SepReaderOptions Reader(this Sep sep) => new(sep);
     public static SepReaderOptions Reader(this Sep? sep) => new(sep);
     public static SepReaderOptions Reader(this SepSpec spec) =>
-        new SepReaderOptions(spec.Sep) with { CultureInfo = spec.CultureInfo };
+        new SepReaderOptions(spec.Sep) with
+        {
+            CultureInfo = spec.CultureInfo,
+            AsyncContinueOnCapturedContext = spec.AsyncContinueOnCapturedContext
+        };
 
     public static SepReaderOptions Reader(this Sep sep, Func<SepReaderOptions, SepReaderOptions> configure)
     {

diff --git a/src/Sep/SepSpec.cs b/src/Sep/SepSpec.cs
@@ -4,14 +4,19 @@ namespace nietras.SeparatedValues;
 
 public readonly record struct SepSpec
 {
-    public SepSpec() : this(Sep.Default, SepDefaults.CultureInfo) { }
+    public SepSpec() : this(Sep.Default, SepDefaults.CultureInfo, false) { }
 
     public SepSpec(Sep sep, CultureInfo? cultureInfo)
+        : this(sep, cultureInfo, false) { }
+
+    public SepSpec(Sep sep, CultureInfo? cultureInfo, bool asyncContinueOnCapturedContext)
     {
         Sep = sep;
         CultureInfo = cultureInfo;
+        AsyncContinueOnCapturedContext = asyncContinueOnCapturedContext;
     }
 
     public Sep Sep { get; init; }
     public CultureInfo? CultureInfo { get; init; }
+    public bool AsyncContinueOnCapturedContext { get; init; } = false;
 }
diff --git a/src/Sep/SepWriter.cs b/src/Sep/SepWriter.cs
@@ -53,7 +53,7 @@ internal SepWriter(SepWriterOptions options, TextWriter writer, ISepTextWriterDi
         Header = new(this);
     }
 
-    public SepSpec Spec => new(_sep, _cultureInfo);
+    public SepSpec Spec => new(_sep, _cultureInfo, _continueOnCapturedContext);
     public SepWriterHeader Header { get; }
 
     public Row NewRow()

diff --git a/src/Sep/SepWriterExtensions.cs b/src/Sep/SepWriterExtensions.cs
@@ -16,7 +16,11 @@ public static partial class SepWriterExtensions
 
     public static SepWriterOptions Writer(this Sep sep) => new(sep);
     public static SepWriterOptions Writer(this SepSpec spec) =>
-        new SepWriterOptions(spec.Sep) with { CultureInfo = spec.CultureInfo };
+        new SepWriterOptions(spec.Sep) with
+        {
+            CultureInfo = spec.CultureInfo,
+            AsyncContinueOnCapturedContext = spec.AsyncContinueOnCapturedContext
+        };
 
     public static SepWriterOptions Writer(this Sep sep, Func<SepWriterOptions, SepWriterOptions> configure)
     {