Merge pull request #341 from microsoft/fix/parse-node-cancellation

fix: missing cancellation token

Author: baywet

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.12.1] - 2024-08-21
+
+### Changed
+
+- Fixed a bug where the cancellation token would not be passed to the ParseNodeFactory.
+
 ## [1.12.0] - 2024-08-20
 
 ### Changed

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <!-- Common default project properties for ALL projects-->
   <PropertyGroup>
-    <VersionPrefix>1.12.0</VersionPrefix>
+    <VersionPrefix>1.12.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <!-- This is overidden in test projects by setting to true-->
     <IsTestProject>false</IsTestProject>

src/abstractions/serialization/ParseNodeProxyFactory.cs

@@ -27,7 +27,7 @@ public abstract class ParseNodeProxyFactory : IAsyncParseNodeFactory
         /// <param name="concrete">The concrete factory to wrap.</param>
         /// <param name="onBefore">The callback to invoke before the deserialization of any model object.</param>
         /// <param name="onAfter">The callback to invoke after the deserialization of any model object.</param>
-        public ParseNodeProxyFactory(IParseNodeFactory concrete, Action<IParsable> onBefore, Action<IParsable> onAfter)
+        protected ParseNodeProxyFactory(IParseNodeFactory concrete, Action<IParsable> onBefore, Action<IParsable> onAfter)
         {
             _concrete = concrete ?? throw new ArgumentNullException(nameof(concrete));
             _onBefore = onBefore;
@@ -79,7 +79,7 @@ public async Task<IParseNode> GetRootParseNodeAsync(string contentType, Stream c
             {
                 throw new Exception("IAsyncParseNodeFactory is required for async operations");
             }
-            var node = await asyncConcrete.GetRootParseNodeAsync(contentType, content).ConfigureAwait(false);
+            var node = await asyncConcrete.GetRootParseNodeAsync(contentType, content, cancellationToken).ConfigureAwait(false);
             WireParseNode(node);
             return node;
         }

src/serialization/form/FormParseNodeFactory.cs

@@ -39,7 +39,11 @@ public async Task<IParseNode> GetRootParseNodeAsync(string contentType, Stream c
             throw new ArgumentNullException(nameof(content));
 
         using var reader = new StreamReader(content);
+#if NET7_0_OR_GREATER
+        var rawValue = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
+#else
         var rawValue = await reader.ReadToEndAsync().ConfigureAwait(false);
+#endif
         return new FormParseNode(rawValue);
     }
 }