Fix transform on filter exception. (#665)

.github/workflows/ci-build.yml

@@ -15,7 +15,14 @@ jobs:
     runs-on: windows-2022
     outputs:
       nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
-    steps:
+    steps:        
+    - name: Get Current Visual Studio Information
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        echo "## About RELEASE ##"
+        vs where release
+        
     - name: Checkout
       uses: actions/checkout@v3
       with:
@@ -33,12 +40,11 @@ jobs:
         $process.StartInfo = $startInfo
         $process.Start()
         $process.WaitForExit()
-        
+
     - name: Install .NET 6
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 6.0.x
-        include-prerelease: true
 
     - name: NBGV
       id: nbgv
@@ -58,17 +64,21 @@ jobs:
     - name: Build
       run: msbuild /t:build,pack /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }}
       working-directory: src
-
+
+    #- name: Run Unit Tests and Generate Coverage
+    #  uses: glennawatson/coverlet-msbuild@v1
+    #  with:
+    #    project-files: '**/*Tests*.csproj'
+    #    no-build: true
+    #    exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*'
+    #    include-filter: '[${{env.productNamespacePrefix}}*]*'
+    #    output-format: cobertura
+    #    output: '../../artifacts/'
+    #    configuration: ${{ env.configuration }}
+
     - name: Run Unit Tests and Generate Coverage
-      uses: glennawatson/coverlet-msbuild@v1
-      with:
-        project-files: '**/*Tests*.csproj'
-        no-build: true
-        exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*'
-        include-filter: '[${{env.productNamespacePrefix}}*]*'
-        output-format: cobertura
-        output: '../../artifacts/'
-        configuration: ${{ env.configuration }}
+      run: dotnet test /p:CollectCoverage=true --no-build /p:Exclude=DynamicData.Tests /p:Include=DynamicData.* --configuration Release /p:CoverletOutput=..\..\artifacts\DynamicData.Tests.xml /p:CoverletOutputFormat=cobertura
+      working-directory: src
 
     - name: Upload Code Coverage
       shell: bash

.github/workflows/release.yml

@@ -16,6 +16,13 @@ jobs:
     outputs:
       nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
+    - name: Get Current Visual Studio Information
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        echo "## About RELEASE ##"
+        vs where release
+       
     - name: Checkout
       uses: actions/checkout@v3
       with:
@@ -32,12 +39,11 @@ jobs:
         $process.StartInfo = $startInfo
         $process.Start()
         $process.WaitForExit()
-        
+ 
     - name: Install .NET 6
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 6.0.x
-        include-prerelease: true
 
     - name: NBGV
       id: nbgv

src/DynamicData.Tests/AutoRefreshFilter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using DynamicData.Binding;
@@ -12,6 +13,26 @@ namespace DynamicData.Tests;
 
 public class AutoRefreshFilter
 {
+    [Fact]
+    public void Bind_Transform_and_FilterOnObservable()
+    {
+        var count = 3;
+        var list = new SourceList<string>();
+        list.AddRange(Enumerable.Range(1, count).Select(c => $"item {c}"));
+
+        var bindedList = new ObservableCollectionExtended<string>();
+
+        list.Connect()
+            .FilterOnObservable(_ => Observable.Return(true))
+            .Transform(str => str)
+            .Bind(bindedList)
+            .Subscribe(
+                _ => { },
+                ex => {Assert.Fail("There should be no error");}
+            );
+    }
+
+
     [Fact]
     public void Test()
     {

src/DynamicData.Tests/DynamicData.Tests.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.console" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

src/DynamicData/List/Internal/FilterOnObservable.cs

@@ -43,22 +43,25 @@ public IObservable<IChangeSet<TObject>> Run()
                     .Publish();
 
                 // monitor each item observable and create change, carry the value of the observable property
-                IObservable<ObjWithFilterValue> itemHasChanged = shared.MergeMany(v => _filter(v.Obj).Select(prop => new ObjWithFilterValue(v.Obj, prop)));
+                var itemHasChanged = shared.MergeMany(v => _filter(v.Obj).Select(prop => new ObjWithFilterValue(v.Obj, prop)));
 
                 // create a change set, either buffered or one item at the time
-                IObservable<IEnumerable<ObjWithFilterValue>> itemsChanged = _buffer is null ?
+                var itemsChanged = _buffer is null ?
                     itemHasChanged.Select(t => new[] { t }) :
                     itemHasChanged.Buffer(_buffer.Value, _scheduler ?? Scheduler.Default).Where(list => list.Count > 0);
 
-                IObservable<IChangeSet<ObjWithFilterValue>> requiresRefresh = itemsChanged.Synchronize(locker).Select(
+                var requiresRefresh = itemsChanged.Synchronize(locker).Select(
                     items =>
                     {
                         // catch all the indices of items which have been refreshed
                         return IndexOfMany(allItems, items, v => v.Obj, (t, idx) => new Change<ObjWithFilterValue>(ListChangeReason.Refresh, t, idx));
                     }).Select(changes => new ChangeSet<ObjWithFilterValue>(changes));
 
                 // publish refreshes and underlying changes
-                var publisher = shared.Merge(requiresRefresh).Filter(v => v.Filter).Transform(v => v.Obj).SuppressRefresh() // suppress refreshes from filter, avoids excessive refresh messages for no-op filter updates
+                var publisher = shared.Merge(requiresRefresh).Filter(v => v.Filter)
+                    .Transform(v => v.Obj)
+                    .SuppressRefresh() // suppress refreshes from filter, avoids excessive refresh messages for no-op filter updates
+                    .NotEmpty()
                     .SubscribeSafe(observer);
 
                 return new CompositeDisposable(publisher, shared.Connect());

src/DynamicData/List/ObservableListEx.cs

@@ -1504,7 +1504,16 @@ public static IObservable<IChangeSet<T>> SubscribeMany<T>(this IObservable<IChan
     /// <returns>An observable which emits the change set.</returns>
     public static IObservable<IChangeSet<T>> SuppressRefresh<T>(this IObservable<IChangeSet<T>> source)
     {
-        return source.WhereReasonsAreNot(ListChangeReason.Refresh);
+        if (source == null)
+        {
+            throw new ArgumentNullException(nameof(source));
+        }
+
+        return source.Select(changes =>
+        {
+            var filtered = changes.Where(c => c.Reason != ListChangeReason.Refresh);
+            return new ChangeSet<T>(filtered);
+        });
     }
 
     /// <summary>

src/global.json

@@ -1,4 +1,9 @@
 {
+    "sdk": {
+        "version": "6.0",
+        "rollForward": "latestMinor",
+        "allowPrerelease": true
+    },
     "msbuild-sdks": {
         "MSBuild.Sdk.Extras": "3.0.44"
     }