Serialize TransformAsync using Concat (#639)

Use Concat to ensure serialized sequence for List.TransformAsync
reactivemarbles · Sep 6, 2022 · dfa5eef · dfa5eef
1 parent 17fe918
commit dfa5eef
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/DynamicData/List/Internal/TransformAsync.cs b/src/DynamicData/List/Internal/TransformAsync.cs
@@ -40,21 +40,21 @@ private IObservable<IChangeSet<TDestination>> RunImpl()
         var state = new ChangeAwareList<Transformer<TSource, TDestination>.TransformedItemContainer>();
         var asyncLock = new SemaphoreSlim(1, 1);
 
-        return _source.Select(
-            async changes =>
-            {
-                try
-                {
-                    await asyncLock.WaitAsync().ConfigureAwait(false);
-                    await Transform(state, changes).ConfigureAwait(false);
-                    return state;
-                }
-                finally
+        return _source.Select(async changes =>
                 {
-                    asyncLock.Release();
-                }
-            }).Select(tasks => tasks.ToObservable()).SelectMany(items => items).Select(
-            transformed =>
+                    try
+                    {
+                        await asyncLock.WaitAsync();
+                        await Transform(state, changes);
+                        return state;
+                    }
+                    finally
+                    {
+                        asyncLock.Release();
+                    }
+                })
+            .Concat()
+            .Select(transformed =>
             {
                 var changed = transformed.CaptureChanges();
                 return changed.Transform(container => container.Destination);