Simplified iteration and TaskSeq module function names

Author: xperiandri

Cosmos/Cosmos.fs

@@ -112,7 +112,7 @@ module Operations =
         /// <param name="cancellationToken">Cancellation token</param>
         member container.CountAsync (requestOptions : QueryRequestOptions, [<Optional>] cancellationToken : CancellationToken) =
             container.GetItemQueryIterator<int> (countQuery, requestOptions = getRequestOptionsWithMaxItemCount1 requestOptions)
-            |> TaskSeq.ofFeedIteratorWithCancellation cancellationToken
+            |> CancellableTaskSeq.ofFeedIterator cancellationToken
             |> TaskSeq.tryHead
             |> Task.map (Option.defaultValue 0)
 
@@ -150,7 +150,7 @@ module Operations =
             (requestOptions : QueryRequestOptions, [<Optional>] cancellationToken : CancellationToken)
             =
             container.GetItemQueryIterator<int64> (countQuery, requestOptions = getRequestOptionsWithMaxItemCount1 requestOptions)
-            |> TaskSeq.ofFeedIteratorWithCancellation cancellationToken
+            |> CancellableTaskSeq.ofFeedIterator cancellationToken
             |> TaskSeq.tryHead
             |> Task.map (Option.defaultValue 0)
 
@@ -192,7 +192,7 @@ module Operations =
                         query,
                         requestOptions = getRequestOptionsWithMaxItemCount1 requestOptions
                     )
-                    |> TaskSeq.ofFeedIteratorWithCancellation cancellationToken
+                    |> CancellableTaskSeq.ofFeedIterator cancellationToken
                     |> TaskSeq.tryHead
                     |> Task.map (Option.defaultValue 0)
                 return count = 1
@@ -232,7 +232,7 @@ module Operations =
                         query,
                         requestOptions = getRequestOptionsWithMaxItemCount1 requiestOptions
                     )
-                    |> TaskSeq.ofFeedIteratorWithCancellation cancellationToken
+                    |> CancellableTaskSeq.ofFeedIterator cancellationToken
                     |> TaskSeq.tryHead
                     |> Task.map (Option.defaultValue 0)
                 return count = 1

Cosmos/FSharp.Azure.Cosmos.fsproj

@@ -37,8 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="FeedIterator.fs" />
-    <Compile Include="Queryable.fs" />
+    <Compile Include="IterationExtensions.fs" />
     <Compile Include="TaskSeq.fs" />
     <Compile Include="CosmosResponse.fs" />
     <Compile Include="Cosmos.fs" />

Cosmos/FeedIterator.fs

@@ -0,0 +1,35 @@
+namespace Microsoft.Azure.Cosmos
+
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+open System.Threading
+open Microsoft.Azure.Cosmos
+open FSharp.Control
+
+[<AutoOpen>]
+module FeedIteratorExtensions =
+
+    // See https://github.com/Azure/azure-cosmos-dotnet-v3/issues/903
+    type FeedIterator<'T> with
+
+        /// Converts the iterator to an async sequence of items.
+        member iterator.AsAsyncEnumerable<'T> ([<Optional; EnumeratorCancellation>] cancellationToken : CancellationToken) = taskSeq {
+            while iterator.HasMoreResults do
+                let! page = iterator.ReadNextAsync (cancellationToken)
+
+                for item in page do
+                    cancellationToken.ThrowIfCancellationRequested ()
+                    yield item
+        }
+
+open System.Linq
+open Microsoft.Azure.Cosmos
+open Microsoft.Azure.Cosmos.Linq
+
+[<AutoOpen>]
+module QueryableExtensions =
+
+    type IQueryable<'T> with
+
+        member inline query.AsAsyncEnumerable<'T> ([<Optional; EnumeratorCancellation>] cancellationToken : CancellationToken) =
+            query.ToFeedIterator().AsAsyncEnumerable<'T> (cancellationToken)

Cosmos/IterationExtensions.fs

@@ -1,48 +1,40 @@
-module Microsoft.Azure.Cosmos.TaskSeq
+namespace Microsoft.Azure.Cosmos
 
 open System.Linq
 open System.Threading
 open Microsoft.Azure.Cosmos
 open Microsoft.Azure.Cosmos.Linq
 
-/// <summary>
-/// Asynchronously iterates Cosmos DB <see cref="FeedIterator{T}" />.
-/// </summary>
-/// <param name="iterator">Cosmos DB feed iterator</param>
-let ofFeedIterator<'T> (iterator : FeedIterator<'T>) = iterator.AsAsyncEnumerable<'T> ()
+module TaskSeq =
 
-/// <summary>
-/// Asynchronously iterates Cosmos DB <see cref="FeedIterator{T}" />.
-/// </summary>
-/// <param name="cancellationToken">Cancellation token</param>
-/// <param name="iterator">Cosmos DB feed iterator</param>
-let ofFeedIteratorWithCancellation<'T> (cancellationToken : CancellationToken) (iterator : FeedIterator<'T>) =
-    iterator.AsAsyncEnumerable<'T> (cancellationToken)
+    /// <summary>
+    /// Executes Cosmos DB query and asynchronously iterates Cosmos DB <see cref="FeedIterator{T}" />.
+    /// </summary>
+    /// <param name="iterator">Cosmos DB feed iterator</param>
+    let ofFeedIterator<'T> (iterator : FeedIterator<'T>) = iterator.AsAsyncEnumerable<'T> ()
 
-/// <summary>
-/// Asynchronously iterates Cosmos DB <see cref="FeedIterator{T}" /> producing items with their ETag values.
-/// </summary>
-/// <param name="iterator">Cosmos DB feed iterator</param>
-let ofFeedIteratorWithETags<'T> (iterator : FeedIterator<'T>) = iterator.AsTaggedAsyncEnumerable<'T> ()
+    /// <summary>
+    /// Creates Cosmos DB <see cref="FeedIterator{T}" /> from <see cref="IQueryable{T}" />
+    /// and asynchronously iterates it.
+    /// </summary>
+    /// <param name="query">Cosmos DB queryable</param>
+    let ofCosmosDbQueryable<'T> (query : IQueryable<'T>) = query.ToFeedIterator().AsAsyncEnumerable<'T> ()
 
-/// <summary>
-/// Asynchronously iterates Cosmos DB <see cref="FeedIterator{T}" /> producing items with their ETag values.
-/// </summary>
-/// <param name="cancellationToken">Cancellation token</param>
-/// <param name="iterator">Cosmos DB feed iterator</param>
-let ofFeedIteratorWithETagsAndCancellation<'T> (cancellationToken : CancellationToken) (iterator : FeedIterator<'T>) =
-    iterator.AsTaggedAsyncEnumerable<'T> (cancellationToken)
+module CancellableTaskSeq =
 
-/// <summary>
-/// Created Cosmos DB <see cref="FeedIterator{T}" /> from <see cref="IQueryable{T}" /> and asynchronously iterates it.
-/// </summary>
-/// <param name="query">Cosmos DB querable</param>
-let ofCosmosDbQuerable<'T> (query : IQueryable<'T>) = query.ToFeedIterator().AsAsyncEnumerable<'T> ()
+    /// <summary>
+    /// Executes Cosmos DB query and asynchronously iterates Cosmos DB <see cref="FeedIterator{T}" />.
+    /// </summary>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <param name="iterator">Cosmos DB feed iterator</param>
+    let ofFeedIterator<'T> (cancellationToken : CancellationToken) (iterator : FeedIterator<'T>) =
+        iterator.AsAsyncEnumerable<'T> (cancellationToken)
 
-/// <summary>
-/// Created Cosmos DB <see cref="FeedIterator{T}" /> from <see cref="IQueryable{T}" /> and asynchronously iterates it.
-/// </summary>
-/// <param name="query">Cosmos DB querable</param>
-/// <param name="cancellationToken">Cancellation token</param>
-let ofCosmosDbQuerableWithCancellation<'T> (cancellationToken : CancellationToken) (query : IQueryable<'T>) =
-    query.ToFeedIterator().AsAsyncEnumerable<'T> (cancellationToken)
+    /// <summary>
+    /// Creates Cosmos DB <see cref="FeedIterator{T}" /> from <see cref="IQueryable{T}" />
+    /// and asynchronously iterates it.
+    /// </summary>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <param name="query">Cosmos DB queryable</param>
+    let ofCosmosDbQueryable<'T> (cancellationToken : CancellationToken) (query : IQueryable<'T>) =
+        query.ToFeedIterator().AsAsyncEnumerable<'T> (cancellationToken)