Address audit matcher review comments

Author: AdamEssenmacher

scripts/FirebaseBindingAudit.Tests/AuditRunnerTests.cs

@@ -67,6 +67,17 @@ public void ShouldStageSharpieFrameworkSlices_SkipsWhenSharpieIsDisabled()
         Assert.True(AuditRunner.ShouldStageSharpieFrameworkSlices(CreateAuditOptions(disableSharpie: false)));
     }
 
+    [Fact]
+    public void CreateTempRootPath_ReturnsUniqueAuditWorkspacePaths()
+    {
+        var firstPath = AuditRunner.CreateTempRootPath();
+        var secondPath = AuditRunner.CreateTempRootPath();
+
+        Assert.NotEqual(firstPath, secondPath);
+        Assert.EndsWith("firebase-binding-audit", Directory.GetParent(firstPath)!.Name);
+        Assert.Contains("-", Path.GetFileName(firstPath), StringComparison.Ordinal);
+    }
+
     [Fact]
     public void TryResolveSharpieCompanionFrameworkPath_UsesLaterExistingImport()
     {

scripts/FirebaseBindingAudit.Tests/BindingComparerNormalizationTests.cs

@@ -134,7 +134,36 @@ public enum FIRAppDistributionError : long
     }
 
     [Fact]
-    public void Compare_MatchesGeneratedFieldConstantsInSeparateStaticContainer()
+    public void Compare_MatchesGeneratedManualFieldOnSameType()
+    {
+        var result = Compare(
+            """
+            namespace Firebase.AppDistribution;
+
+            [BaseType(typeof(NSObject), Name = "FIRAppDistribution")]
+            public interface AppDistribution
+            {
+                [Field("FIRAppDistributionErrorDomain", "__Internal")]
+                NSString ErrorDomain { get; }
+            }
+            """,
+            """
+            namespace FirebaseAppDistribution;
+
+            [BaseType(typeof(NSObject))]
+            public interface FIRAppDistribution
+            {
+                [Internal]
+                [Field("FIRAppDistributionErrorDomain", "__Internal")]
+                NSString ErrorDomain { get; }
+            }
+            """);
+
+        AssertNoFailures(result);
+    }
+
+    [Fact]
+    public void Compare_DoesNotMatchGeneratedManualFieldOnDifferentType()
     {
         var result = Compare(
             """
@@ -162,7 +191,11 @@ public static class FirebaseAppDistributionConstants
             }
             """);
 
-        AssertNoFailures(result);
+        Assert.Contains(
+            result.Failures,
+            static failure => failure.Category == "stale-baseline-binding" &&
+                              failure.ComparisonTypeKey == "FIRAppDistribution" &&
+                              failure.ComparisonMemberKey == "field|FIRAppDistributionErrorDomain");
     }
 
     [Fact]

scripts/FirebaseBindingAudit/AuditRunner.cs

@@ -109,7 +109,7 @@ public async Task<AuditRunResult> RunAsync(AuditOptions options, CancellationTok
         PrepareOutputDirectory(outputDirectory, detailsDirectory, logsDirectory);
 
         var selectedTargets = SelectTargets(options.SelectedTargets);
-        var tempRoot = Path.Combine(Path.GetTempPath(), "firebase-binding-audit", DateTime.UtcNow.ToString("yyyyMMddHHmmss"));
+        var tempRoot = CreateTempRootPath();
         Directory.CreateDirectory(tempRoot);
         var sharedNugetPackages = Path.Combine(Path.GetTempPath(), "firebase-binding-audit", "nuget-packages");
         var dotnetEnvironment = new Dictionary<string, string>(StringComparer.Ordinal)
@@ -393,6 +393,9 @@ sharpieRun is not null &&
     internal static bool ShouldStageSharpieFrameworkSlices(AuditOptions options) =>
         !options.DisableSharpie;
 
+    internal static string CreateTempRootPath() =>
+        Path.Combine(Path.GetTempPath(), "firebase-binding-audit", $"{DateTime.UtcNow:yyyyMMddHHmmss}-{Guid.NewGuid():N}");
+
     private static ConfidenceSummary BuildConfidenceSummary(IReadOnlyList<AuditFinding> findings)
     {
         return AuditFindingSummary.BuildConfidenceSummary(findings.ToList());

scripts/FirebaseBindingAudit/BindingModel.cs

@@ -1206,7 +1206,7 @@ public TargetComparisonResult Compare(
         var generatedManualMemberLookup = new HashSet<string>(
             generated.ManualItems
                 .Where(static item => !string.IsNullOrWhiteSpace(item.MatchMemberKey))
-                .Select(static item => item.MatchMemberKey!),
+                .Select(static item => CreateManualLookupKey(item.MatchTypeKey, item.MatchMemberKey!)),
             StringComparer.Ordinal);
 
         var smoothedDelegateKeys = new HashSet<string>(StringComparer.Ordinal);
@@ -1362,7 +1362,7 @@ private static void CompareMembers(
         {
             if (!TryGetComparableMember(generated.Members, baselineMemberEntry, out var generatedMember))
             {
-                if (IsMatchedGeneratedManualBinding(baselineMemberEntry, generatedManualMemberLookup))
+                if (IsMatchedGeneratedManualBinding(baseline.ComparisonKey, baselineMemberEntry, generatedManualMemberLookup, aliases))
                 {
                     continue;
                 }
@@ -1428,11 +1428,27 @@ private static bool IsExternalPlaceholderType(BoundTypeSurface type)
     }
 
     private static bool IsMatchedGeneratedManualBinding(
+        string baselineTypeKey,
         BindingMemberSurface baselineMember,
-        IReadOnlySet<string> generatedManualMemberLookup)
+        IReadOnlySet<string> generatedManualMemberLookup,
+        SymbolAliasLookup aliases)
+    {
+        if (!string.Equals(baselineMember.BindingAttribute, "Field", StringComparison.Ordinal))
+        {
+            return false;
+        }
+
+        return GetEquivalentManualLookupTypeKeys(baselineTypeKey, aliases)
+            .Any(typeKey => generatedManualMemberLookup.Contains(CreateManualLookupKey(typeKey, baselineMember.Key)));
+    }
+
+    private static IEnumerable<string> GetEquivalentManualLookupTypeKeys(string typeKey, SymbolAliasLookup aliases)
     {
-        return string.Equals(baselineMember.BindingAttribute, "Field", StringComparison.Ordinal) &&
-               generatedManualMemberLookup.Contains(baselineMember.Key);
+        yield return typeKey;
+        foreach (var equivalentTypeKey in aliases.GetEquivalentComparisonKeys(typeKey))
+        {
+            yield return equivalentTypeKey;
+        }
     }
 
     private static bool TryGetComparableMember(