wip

Author: stephencelis

Sources/CustomDump/Diff.swift

@@ -360,7 +360,7 @@ public func diff<T>(_ lhs: T, _ rhs: T, format: DiffFormat = .default) -> String
           elementIndent: 2,
           elementSeparator: ",",
           collapseUnchanged: false,
-          filter: { $0.label.map { !$0.hasPrefix("_$") } ?? true }
+          filter: macroPropertyFilter(for: lhs)
         )
       }
 
@@ -505,7 +505,7 @@ public func diff<T>(_ lhs: T, _ rhs: T, format: DiffFormat = .default) -> String
         elementIndent: 2,
         elementSeparator: ",",
         collapseUnchanged: false,
-        filter: { $0.label.map { !$0.hasPrefix("_$") } ?? true }
+        filter: macroPropertyFilter(for: lhs)
       )
 
     case (_, .tuple?, _, .tuple?):

Sources/CustomDump/Dump.swift

@@ -198,7 +198,7 @@ func _customDump<T, TargetStream>(
           of: Mirror(value, children: children),
           prefix: "\(typeName(mirror.subjectType))\(id)(",
           suffix: ")",
-          filter: { $0.label.map { !$0.hasPrefix("_$") } ?? true }
+          filter: macroPropertyFilter(for: value)
         )
       }
 
@@ -279,7 +279,7 @@ func _customDump<T, TargetStream>(
         of: mirror,
         prefix: "\(typeName(mirror.subjectType))(",
         suffix: ")",
-        filter: { $0.label.map { !$0.hasPrefix("_$") } ?? true }
+        filter: macroPropertyFilter(for: value)
       )
 
     case (_, .tuple?):
@@ -331,3 +331,9 @@ func _customDump(_ value: Any, name: String?, indent: Int, isRoot: Bool, maxDept
   _customDump(value, to: &out, name: name, indent: indent, isRoot: isRoot, maxDepth: maxDepth)
   return out
 }
+
+func macroPropertyFilter(for value: Any) -> (Mirror.Child) -> Bool {
+  value is CustomDumpReflectable
+    ? { _ in true }
+    : { $0.label.map { !$0.hasPrefix("_$") } ?? true }
+}

Tests/CustomDumpTests/DumpTests.swift

@@ -1329,4 +1329,29 @@ final class DumpTests: XCTestCase {
       """
     )
   }
+
+  func testExplicitFilteredPropertyPreserved() {
+    struct ObservationRegistrar {}
+    class Object: CustomDumpReflectable {
+      let name = "Blob Sr."
+      let _$observationRegistrar = ObservationRegistrar()
+
+      var customDumpMirror: Mirror {
+        Mirror(
+          self,
+          children: ["name": self.name, "_$observationRegistrar": self._$observationRegistrar],
+          displayStyle: .class
+        )
+      }
+    }
+    XCTAssertNoDifference(
+      String(customDumping: Object()),
+      """
+      DumpTests.Object(
+        name: "Blob Sr.",
+        _$observationRegistrar: DumpTests.ObservationRegistrar()
+      )
+      """
+    )
+  }
 }

Tests/CustomDumpTests/Mocks.swift

@@ -94,6 +94,12 @@ struct Wrapper<RawValue>: CustomDumpRepresentable {
 struct LoginState: CustomDumpReflectable {
   var email = "", password = "", token: String
 
+  init(email: String = "", password: String = "", token: String) {
+    self.email = email
+    self.password = password
+    self.token = token
+  }
+
   var customDumpMirror: Mirror {
     .init(
       self,