com.wallstop-studios.dxmessaging 2.0.0-rc21 → 2.0.0-rc23

package/SourceGenerators/WallstopStudios.DxMessaging.SourceGenerators/DxMessageIdGenerator.cs

@@ -1,445 +1,306 @@
-namespace WallstopStudios.DxMessaging.SourceGenerators;
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-
-[Generator(LanguageNames.CSharp)]
-public sealed class DxMessageIdGenerator : IIncrementalGenerator
+namespace WallstopStudios.DxMessaging.SourceGenerators
 {
-    // --- Constants for Attributes and Interfaces ---
-    private const string BaseInterfaceFullName = "DxMessaging.Core.IMessage"; // Base interface
-
-    private const string BroadcastAttrFullName =
-        "DxMessaging.Core.Attributes.DxBroadcastMessageAttribute";
-    private const string TargetedAttrFullName =
-        "DxMessaging.Core.Attributes.DxTargetedMessageAttribute";
-    private const string UntargetedAttrFullName =
-        "DxMessaging.Core.Attributes.DxUntargetedMessageAttribute";
-
-    private const string BroadcastInterfaceFullName = "DxMessaging.Core.Messages.IBroadcastMessage";
-    private const string TargetedInterfaceFullName = "DxMessaging.Core.Messages.ITargetedMessage";
-    private const string UntargetedInterfaceFullName =
-        "DxMessaging.Core.Messages.IUntargetedMessage";
-
-    // --- Diagnostics ---
-    private static readonly DiagnosticDescriptor CollisionError = new DiagnosticDescriptor(
-        id: "DXMSG001",
-        title: "Message ID Collision",
-        messageFormat: "OptimizedMessageId collision detected across different message types. The generated ID '{0}' is shared by the following types: {1}. Please rename one or more types slightly to resolve the hash collision.",
-        category: "DxMessaging",
-        defaultSeverity: DiagnosticSeverity.Error,
-        isEnabledByDefault: true
-    );
-
-    private static readonly DiagnosticDescriptor CollisionWarning = new DiagnosticDescriptor(
-        id: "DXMSG003", // New ID
-        title: "Message ID Collision Fallback",
-        messageFormat: "OptimizedMessageId collision detected for ID '{0}'. The following types will use a fallback implementation (HasOptimizedId = false): {1}.",
-        category: "DxMessaging",
-        defaultSeverity: DiagnosticSeverity.Warning, // Set severity to Warning
-        isEnabledByDefault: true
-    );
-
-    private static readonly DiagnosticDescriptor MultipleAttributesError = new DiagnosticDescriptor(
-        id: "DXMSG002",
-        title: "Multiple Message Attributes",
-        messageFormat: "Type '{0}' cannot have more than one Dx message attribute ([DxBroadcastMessage], [DxTargetedMessage], [DxUntargetedMessage]).",
-        category: "DxMessaging",
-        defaultSeverity: DiagnosticSeverity.Error,
-        isEnabledByDefault: true
-    );
-
-    // Helper record to pass data through the pipeline
-    private record struct SemanticTargetInfo(
-        INamedTypeSymbol TypeSymbol,
-        TypeDeclarationSyntax DeclarationSyntax,
-        string TargetInterfaceFullName
-    );
-
-    // Helper record for final processing stage
-    private record struct MessageInfo(
-        INamedTypeSymbol TypeSymbol,
-        TypeDeclarationSyntax DeclarationSyntax,
-        string TargetInterfaceFullName,
-        int GeneratedId
-    );
-
-    // Helper record for final assignment stage
-    private record struct FinalMessageInfo(
-        INamedTypeSymbol TypeSymbol,
-        TypeDeclarationSyntax DeclarationSyntax,
-        string TargetInterfaceFullName,
-        int FinalId, // The ID actually assigned (hash or fallback)
-        bool WasCollision
-    ); // Flag indicating if it was part of a collision
-
-    public void Initialize(IncrementalGeneratorInitializationContext context)
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.Immutable;
+    using System.Linq;
+    using System.Text;
+    using System.Threading;
+    using Microsoft.CodeAnalysis;
+    using Microsoft.CodeAnalysis.CSharp;
+    using Microsoft.CodeAnalysis.CSharp.Syntax;
+    using Microsoft.CodeAnalysis.Text;
+
+    [Generator(LanguageNames.CSharp)]
+    public sealed class DxMessageIdGenerator : IIncrementalGenerator
     {
-        // --- Step 1: Find all classes/structs with attribute lists (Potential Candidates) ---
-        IncrementalValuesProvider<TypeDeclarationSyntax> potentialTypeDeclarations =
-            context.SyntaxProvider.CreateSyntaxProvider(
-                predicate: static (node, _) => IsSyntaxTargetForGeneration(node), // Quick syntax filter
-                transform: static (ctx, ct) => (TypeDeclarationSyntax)ctx.Node
-            ); // Just pass the node
-
-        // --- Step 2: Get Semantic Info and Filter by Attributes ---
-        IncrementalValuesProvider<SemanticTargetInfo?> semanticTargets = potentialTypeDeclarations
-            .Select(static (typeDecl, ct) => new { typeDecl, ct }) // Combine with CancellationToken if needed implicitly by GetSemanticTargetForGeneration
-            .Combine(context.CompilationProvider)
-            .Select(
-                static (data, ct) =>
-                    GetSemanticTargetForGeneration(data.Left.typeDecl, data.Right, ct)
-            );
+        // Base IMessage interface (used for implementation checks if needed, and property names)
+        // *** Assumes the user has defined this interface in their code ***
+        private const string BaseInterfaceFullName = "DxMessaging.Core.IMessage";
+
+        // Message Type Attribute Full Names (Ensure these match your attributes)
+        private const string BroadcastAttrFullName =
+            "DxMessaging.Core.Attributes.DxBroadcastMessageAttribute";
+        private const string TargetedAttrFullName =
+            "DxMessaging.Core.Attributes.DxTargetedMessageAttribute";
+        private const string UntargetedAttrFullName =
+            "DxMessaging.Core.Attributes.DxUntargetedMessageAttribute";
+
+        // Target Interface Full Names (Ensure these match your specific message interfaces)
+        private const string BroadcastInterfaceFullName =
+            "DxMessaging.Core.Messages.IBroadcastMessage";
+        private const string TargetedInterfaceFullName =
+            "DxMessaging.Core.Messages.ITargetedMessage";
+        private const string UntargetedInterfaceFullName =
+            "DxMessaging.Core.Messages.IUntargetedMessage";
+
+        // Diagnostics
+        private static readonly DiagnosticDescriptor MultipleAttributesError = new(
+            id: "DXMSG002",
+            title: "Multiple Message Attributes",
+            messageFormat: "Type '{0}' cannot have more than one Dx message attribute ([DxBroadcastMessage], [DxTargetedMessage], [DxUntargetedMessage]).",
+            category: "DxMessaging",
+            defaultSeverity: DiagnosticSeverity.Error,
+            isEnabledByDefault: true
+        );
 
-        // --- Step 3: Filter out invalid targets ---
-        IncrementalValuesProvider<SemanticTargetInfo> validSemanticTargets = semanticTargets
-            .Where(static target => target.HasValue)
-            .Select(static (target, _) => target!.Value); // Use non-null assertion or keep filtering
+        // Information needed during the generation phase for a valid message type
+        private record struct MessageToGenerateInfo(
+            INamedTypeSymbol TypeSymbol,
+            TypeDeclarationSyntax DeclarationSyntax,
+            string TargetInterfaceFullName // The specific interface like IBroadcastMessage
+        );
 
-        // --- Step 4: Calculate Hash IDs ---
-        IncrementalValuesProvider<MessageInfo> typesWithIds = validSemanticTargets.Select(
-            static (target, ct) =>
-            {
-                string fullyQualifiedName = target.TypeSymbol.ToDisplayString(
-                    SymbolDisplayFormat.FullyQualifiedFormat
-                );
-                int generatedId = ComputeStableHashCode(fullyQualifiedName);
-                return new MessageInfo(
-                    target.TypeSymbol,
-                    target.DeclarationSyntax,
-                    target.TargetInterfaceFullName,
-                    generatedId
+        public void Initialize(IncrementalGeneratorInitializationContext context)
+        {
+            // Find all class/struct/record declarations with attributes
+            IncrementalValuesProvider<TypeDeclarationSyntax> potentialTypeDeclarations =
+                context.SyntaxProvider.CreateSyntaxProvider(
+                    predicate: static (node, _) => IsSyntaxTargetForGeneration(node),
+                    transform: static (ctx, _) => (TypeDeclarationSyntax)ctx.Node
                 );
-            }
-        );
 
-        // --- Step 5: Collect all valid types with IDs ---
-        IncrementalValueProvider<(Compilation, ImmutableArray<MessageInfo>)> compilationAndTypes =
-            context.CompilationProvider.Combine(typesWithIds.Collect());
+            // Get semantic info for potential types
+            IncrementalValuesProvider<MessageToGenerateInfo?> semanticTargets =
+                potentialTypeDeclarations
+                    .Combine(context.CompilationProvider)
+                    .Select(
+                        static (data, ct) =>
+                            GetSemanticTargetForGeneration(data.Left, data.Right, ct)
+                    );
 
-        // --- Step 6: Generate source or diagnostics ---
-        context.RegisterSourceOutput(
-            compilationAndTypes,
-            static (spc, source) => Execute(source.Item1, source.Item2, spc)
-        );
-    }
+            // Filter out nulls (types that aren't valid messages)
+            IncrementalValuesProvider<MessageToGenerateInfo> validSemanticTargets = semanticTargets
+                .Where(static target => target.HasValue)
+                .Select(static (target, _) => target!.Value);
 
-    // Quick syntax filter: Checks if the node is a class or struct with any attributes
-    private static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
-        node is TypeDeclarationSyntax { AttributeLists.Count: > 0 } typeDecl
-        && (
-            typeDecl.IsKind(SyntaxKind.ClassDeclaration)
-            || typeDecl.IsKind(SyntaxKind.StructDeclaration)
-        );
+            // Group by type symbol to handle partial classes correctly and check for multiple attributes
+            IncrementalValueProvider<ImmutableArray<MessageToGenerateInfo>> collectedTargets =
+                validSemanticTargets.Collect();
 
-    // Semantic filter: Checks if the type has exactly one of the target attributes
-    private static SemanticTargetInfo? GetSemanticTargetForGeneration(
-        TypeDeclarationSyntax typeDeclarationSyntax,
-        Compilation compilation,
-        CancellationToken cancellationToken
-    )
-    {
-        SemanticModel semanticModel = compilation.GetSemanticModel(
-            typeDeclarationSyntax.SyntaxTree
-        );
-        if (
-            semanticModel.GetDeclaredSymbol(typeDeclarationSyntax, cancellationToken)
-            is not INamedTypeSymbol typeSymbol
-        )
-        {
-            return null;
+            IncrementalValueProvider<(
+                Compilation,
+                ImmutableArray<MessageToGenerateInfo>
+            )> compilationAndTypes = context.CompilationProvider.Combine(collectedTargets);
+
+            // Register the source output step
+            context.RegisterSourceOutput(
+                compilationAndTypes,
+                static (spc, source) => Execute(source.Item1, source.Item2, spc)
+            );
         }
 
-        string? foundTargetInterface = null;
-        bool multipleAttributes = false;
+        private static bool IsSyntaxTargetForGeneration(SyntaxNode node) =>
+            node is TypeDeclarationSyntax { AttributeLists.Count: > 0 } typeDecl
+            && (
+                typeDecl.IsKind(SyntaxKind.ClassDeclaration)
+                || typeDecl.IsKind(SyntaxKind.StructDeclaration)
+                || typeDecl.IsKind(SyntaxKind.RecordDeclaration)
+                || typeDecl.IsKind(SyntaxKind.RecordStructDeclaration)
+            );
 
-        foreach (AttributeData attributeData in typeSymbol.GetAttributes())
+        private static MessageToGenerateInfo? GetSemanticTargetForGeneration(
+            TypeDeclarationSyntax typeDeclarationSyntax,
+            Compilation compilation,
+            CancellationToken cancellationToken
+        )
         {
-            cancellationToken.ThrowIfCancellationRequested();
-            if (attributeData.AttributeClass == null)
-                continue;
-
-            string currentAttributeFullName = attributeData.AttributeClass.ToDisplayString();
-            string? targetInterfaceForThisAttribute = null;
-
-            switch (currentAttributeFullName)
+            SemanticModel semanticModel = compilation.GetSemanticModel(
+                typeDeclarationSyntax.SyntaxTree
+            );
+            if (
+                semanticModel.GetDeclaredSymbol(typeDeclarationSyntax, cancellationToken)
+                is not INamedTypeSymbol typeSymbol
+            )
             {
-                case BroadcastAttrFullName:
-                    targetInterfaceForThisAttribute = BroadcastInterfaceFullName;
-                    break;
-                case TargetedAttrFullName:
-                    targetInterfaceForThisAttribute = TargetedInterfaceFullName;
-                    break;
-                case UntargetedAttrFullName:
-                    targetInterfaceForThisAttribute = UntargetedInterfaceFullName;
-                    break;
+                return null;
             }
 
-            if (targetInterfaceForThisAttribute != null)
+            // Ensure it's not abstract or static (if class)
+            if (
+                typeSymbol.IsAbstract
+                || (typeSymbol.IsStatic && typeSymbol.TypeKind == TypeKind.Class)
+            )
             {
-                if (foundTargetInterface != null)
-                {
-                    // Found more than one relevant attribute!
-                    multipleAttributes = true;
-                    break; // No need to check further attributes
-                }
-                foundTargetInterface = targetInterfaceForThisAttribute;
+                return null; // Cannot be a concrete message type
             }
-        }
-
-        if (multipleAttributes || foundTargetInterface == null)
-        {
-            // Report error for multiple attributes later in Execute if needed,
-            // but don't consider this a valid target for generation now.
-            // If foundTargetInterface is null, it didn't have any relevant attribute.
-            return null;
-        }
-
-        // Found exactly one relevant attribute
-        return new SemanticTargetInfo(typeSymbol, typeDeclarationSyntax, foundTargetInterface);
-    }
 
-    // --- Main execution logic: collision check, warning, and source generation ---
-    private static void Execute(
-        Compilation compilation,
-        ImmutableArray<MessageInfo> typesToGenerate,
-        SourceProductionContext context
-    )
-    {
-        if (typesToGenerate.IsDefaultOrEmpty)
-        {
-            return; // Nothing to do
-        }
+            string? foundTargetInterface = null;
+            bool multipleAttributes = false;
 
-        var validTypes = new List<MessageInfo>(typesToGenerate.Length);
-        var typesWithMultipleAttributes = new HashSet<ISymbol>(SymbolEqualityComparer.Default);
-        var generatedIds = new HashSet<int>();
+            // Check attributes to find the specific message type (Broadcast, Targeted, etc.)
+            foreach (AttributeData attributeData in typeSymbol.GetAttributes())
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                string? currentAttributeFullName = attributeData.AttributeClass?.ToDisplayString();
+                string? targetInterfaceForThisAttribute = null;
 
-        // --- Step 1: Check for Multiple Attributes on the same type ---
-        var groupedByType = typesToGenerate.GroupBy(
-            m => m.TypeSymbol,
-            SymbolEqualityComparer.Default
-        );
+                switch (currentAttributeFullName)
+                {
+                    case BroadcastAttrFullName:
+                        targetInterfaceForThisAttribute = BroadcastInterfaceFullName;
+                        break;
+                    case TargetedAttrFullName:
+                        targetInterfaceForThisAttribute = TargetedInterfaceFullName;
+                        break;
+                    case UntargetedAttrFullName:
+                        targetInterfaceForThisAttribute = UntargetedInterfaceFullName;
+                        break;
+                }
 
-        foreach (var group in groupedByType)
-        {
-            if (group.Count() > 1)
-            {
-                ISymbol collidingSymbol = group.Key;
-                typesWithMultipleAttributes.Add(collidingSymbol);
-                context.ReportDiagnostic(
-                    Diagnostic.Create(
-                        MultipleAttributesError,
-                        collidingSymbol.Locations.FirstOrDefault() ?? Location.None,
-                        collidingSymbol.ToDisplayString()
+                if (targetInterfaceForThisAttribute != null)
+                {
+                    if (
+                        foundTargetInterface != null
+                        && foundTargetInterface != targetInterfaceForThisAttribute
                     )
-                );
+                    {
+                        multipleAttributes = true;
+                        break;
+                    }
+                    foundTargetInterface = targetInterfaceForThisAttribute;
+                }
             }
-            else
+
+            if (multipleAttributes || foundTargetInterface == null)
             {
-                // Add types with only one attribute to the list for further processing
-                validTypes.Add(group.First());
+                // Don't return info if multiple different message attrs or none found.
+                // The Execute method will report the error for multiple attributes later.
+                return null;
             }
-        }
 
-        // If no types remain after filtering multi-attribute ones, exit
-        if (validTypes.Count == 0)
-        {
-            return;
+            return new MessageToGenerateInfo(
+                typeSymbol,
+                typeDeclarationSyntax,
+                foundTargetInterface
+            );
         }
 
-        // --- Step 2: Assign Final IDs (Handling Collisions) ---
-        var finalAssignments = new List<FinalMessageInfo>(validTypes.Count);
-        var collisionWarnings = new List<Diagnostic>(); // Collect warnings
-        int fallbackIdCounter = -1; // Start fallback IDs from -1 and go down
-
-        // Group by the initial hash ID to find collisions
-        var groupedByHash = validTypes.GroupBy(m => m.GeneratedId);
-
-        foreach (var group in groupedByHash)
+        private static void Execute(
+            Compilation compilation,
+            ImmutableArray<MessageToGenerateInfo> typesToGenerate,
+            SourceProductionContext context
+        )
         {
-            if (group.Count() == 1)
+            if (typesToGenerate.IsDefaultOrEmpty)
             {
-                // No collision for this hash ID
-                var info = group.First();
-                generatedIds.Add(info.GeneratedId);
-                finalAssignments.Add(
-                    new FinalMessageInfo(
-                        info.TypeSymbol,
-                        info.DeclarationSyntax,
-                        info.TargetInterfaceFullName,
-                        info.GeneratedId,
-                        false
-                    )
-                );
+                return;
             }
-            else
-            {
-                // Collision detected for this hash ID!
-                // Sort colliding types deterministically (e.g., by fully qualified name)
-                var sortedCollidingTypes = group
-                    .OrderBy(
-                        m => m.TypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
-                        StringComparer.Ordinal
-                    )
-                    .ToList();
-
-                // The first type keeps the original hash ID (arbitrary but deterministic choice)
-                var firstInfo = sortedCollidingTypes[0];
-                generatedIds.Add(firstInfo.GeneratedId);
-                finalAssignments.Add(
-                    new FinalMessageInfo(
-                        firstInfo.TypeSymbol,
-                        firstInfo.DeclarationSyntax,
-                        firstInfo.TargetInterfaceFullName,
-                        firstInfo.GeneratedId,
-                        true
-                    )
-                ); // Mark as part of collision
-                // Prepare warning for this type (kept original ID but was part of collision)
-                collisionWarnings.Add(
-                    Diagnostic.Create(
-                        CollisionWarning,
-                        firstInfo.DeclarationSyntax.Identifier.GetLocation(),
-                        firstInfo.TypeSymbol.ToDisplayString(),
-                        firstInfo.GeneratedId,
-                        group.Key
-                    )
-                );
 
-                // Assign sequential fallback IDs (negative numbers) to the rest
-                for (int i = 1; i < sortedCollidingTypes.Count; i++)
+            // --- Step 1: Filter out types with multiple attributes applied ---
+            Dictionary<ISymbol, MessageToGenerateInfo> uniqueTypes = new(
+                SymbolEqualityComparer.Default
+            );
+            HashSet<ISymbol> typesWithMultipleAttributes = new(SymbolEqualityComparer.Default);
+
+            foreach (MessageToGenerateInfo typeInfo in typesToGenerate)
+            {
+                if (uniqueTypes.ContainsKey(typeInfo.TypeSymbol))
                 {
-                    var fallbackInfo = sortedCollidingTypes[i];
-                    int assignedFallbackId = fallbackIdCounter--; // Assign next negative ID
-                    while (!generatedIds.Add(assignedFallbackId))
+                    // If adding fails, it means the same TypeSymbol appeared multiple times.
+                    // This implies multiple different valid attributes were found, report error.
+                    if (typesWithMultipleAttributes.Add(typeInfo.TypeSymbol)) // Report only once
                     {
-                        assignedFallbackId--;
+                        context.ReportDiagnostic(
+                            Diagnostic.Create(
+                                MultipleAttributesError,
+                                typeInfo.DeclarationSyntax.Identifier.GetLocation(),
+                                typeInfo.TypeSymbol.ToDisplayString()
+                            )
+                        );
+                        // Also report for the one already in the dictionary if needed, but one report per type is usually sufficient.
                     }
-                    finalAssignments.Add(
-                        new FinalMessageInfo(
-                            fallbackInfo.TypeSymbol,
-                            fallbackInfo.DeclarationSyntax,
-                            fallbackInfo.TargetInterfaceFullName,
-                            assignedFallbackId,
-                            true
-                        )
-                    ); // Mark as part of collision, use new ID
-                    // Prepare warning for this type (received fallback ID)
-                    collisionWarnings.Add(
-                        Diagnostic.Create(
-                            CollisionWarning,
-                            fallbackInfo.DeclarationSyntax.Identifier.GetLocation(),
-                            fallbackInfo.TypeSymbol.ToDisplayString(),
-                            assignedFallbackId,
-                            group.Key
-                        )
-                    );
+                }
+                else
+                {
+                    uniqueTypes[typeInfo.TypeSymbol] = typeInfo;
                 }
             }
-        }
 
-        // --- Step 3: Report all collected warnings ---
-        foreach (var warning in collisionWarnings)
-        {
-            context.ReportDiagnostic(warning);
-        }
-
-        // --- Step 4: Generate Source using the final assigned IDs ---
-        foreach (var finalInfo in finalAssignments)
-        {
-            context.CancellationToken.ThrowIfCancellationRequested();
-
-            // Generate source using the final ID (hash or fallback)
-            string source = GenerateSource( // Call simplified GenerateSource
-                finalInfo.TargetInterfaceFullName,
-                finalInfo.TypeSymbol,
-                finalInfo.FinalId
-            ); // Pass the FINAL ID
-
-            context.AddSource(
-                $"{finalInfo.TypeSymbol.Name}_{finalInfo.TargetInterfaceFullName.Split('.').Last()}.g.cs",
-                SourceText.From(source, Encoding.UTF8)
-            );
-        }
-    }
+            List<MessageToGenerateInfo> validSingleAttrTypes = uniqueTypes
+                .Where(kvp => !typesWithMultipleAttributes.Contains(kvp.Key))
+                .Select(kvp => kvp.Value)
+                .ToList();
 
-    // --- Stable Hash Function (FNV-1a - remains the same) ---
-    private static int ComputeStableHashCode(string text)
-    {
-        unchecked
-        {
-            uint hash = 2166136261;
-            foreach (char c in text)
+            if (validSingleAttrTypes.Count == 0)
             {
-                hash = (hash ^ c) * 16777619;
+                return;
             }
-            return (int)hash;
-        }
-    }
 
-    // --- Source Generation Logic (Takes target interface name AND optimization flag) ---
-    private static string GenerateSource(
-        string targetInterfaceFullName,
-        INamedTypeSymbol typeSymbol,
-        int finalAssignedId
-    ) // Now takes the final assigned ID
-    {
-        string namespaceName = typeSymbol.ContainingNamespace.IsGlobalNamespace
-            ? string.Empty
-            : typeSymbol.ContainingNamespace.ToDisplayString();
+            // --- Step 2: Generate sources for each valid message type ---
+            foreach (MessageToGenerateInfo messageInfo in validSingleAttrTypes)
+            {
+                context.CancellationToken.ThrowIfCancellationRequested();
 
-        string typeNameWithGenerics = typeSymbol.ToDisplayString(
-            SymbolDisplayFormat.MinimallyQualifiedFormat
-        );
-        string fullyQualifiedName = typeSymbol.ToDisplayString(
-            SymbolDisplayFormat.FullyQualifiedFormat
-        );
+                // Generate the partial IMessage implementation source
+                string implSource = GenerateImplementationSource(
+                    messageInfo.TargetInterfaceFullName,
+                    messageInfo.TypeSymbol
+                );
+                string implHintName =
+                    $"{messageInfo.TypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}.IMessage.g.cs"
+                        .Replace("global::", "")
+                        .Replace("<", "_")
+                        .Replace(">", "_")
+                        .Replace(",", "_"); // Clean hint name
+
+                context.AddSource(implHintName, SourceText.From(implSource, Encoding.UTF8));
+            }
+        }
 
-        string typeKind = typeSymbol.TypeKind switch
+        // Generates the partial class/struct implementing IMessage
+        private static string GenerateImplementationSource(
+            string targetInterfaceFullName, // e.g., IBroadcastMessage
+            INamedTypeSymbol typeSymbol
+        )
         {
-            TypeKind.Class => "class",
-            TypeKind.Struct => "struct",
-            _ => throw new InvalidOperationException(
-                "Unsupported type kind for message generation"
-            ),
-        };
-
-        bool alreadyDeclaresInterface = typeSymbol.Interfaces.Any(iface =>
-            iface.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)
-            == targetInterfaceFullName
-        );
-
-        string interfaceDeclaration = alreadyDeclaresInterface
-            ? ""
-            : $": {targetInterfaceFullName}";
-
-        return $$"""
-            // <auto-generated by DxMessageIdGenerator/>
-            #pragma warning disable
-            #nullable enable annotations
+            string namespaceName = typeSymbol.ContainingNamespace.IsGlobalNamespace
+                ? string.Empty
+                : typeSymbol.ContainingNamespace.ToDisplayString();
+            string namespaceBlockOpen = string.IsNullOrEmpty(namespaceName)
+                ? "namespace\n{"
+                : $"namespace {namespaceName}\n{{";
+            const string namespaceBlockClose = "}";
+            const string indent = "    ";
+
+            string typeNameWithGenerics = typeSymbol.ToDisplayString(
+                SymbolDisplayFormat.MinimallyQualifiedFormat
+            );
+            string fullyQualifiedName = typeSymbol.ToDisplayString(
+                SymbolDisplayFormat.FullyQualifiedFormat
+            );
 
-            namespace {{namespaceName}}
+            string typeKind = typeSymbol.TypeKind switch
             {
-                partial {{typeKind}} {{typeNameWithGenerics}} {{interfaceDeclaration}}
-                {
-                    // Explicitly implement IMessage members using the base interface name
-
-                    /// <inheritdoc/>
-                    System.Type {{BaseInterfaceFullName}}.MessageType => typeof({{fullyQualifiedName}});
+                TypeKind.Class => typeSymbol.IsRecord ? "record class" : "class",
+                TypeKind.Struct => typeSymbol.IsRecord ? "record struct" : "struct",
+                _ => throw new InvalidOperationException("Unsupported type kind"),
+            };
 
-                    /// <inheritdoc/>
-                    int? {{BaseInterfaceFullName}}.OptimizedMessageId => {{finalAssignedId}};
-                }
-            }
-            """;
+            string accessibility = typeSymbol.DeclaredAccessibility switch
+            {
+                Accessibility.Public => "public ",
+                Accessibility.Internal => "internal ",
+                // Add others if necessary, default to internal if restrictive
+                _ => "internal ",
+            };
+
+            string interfaceDeclaration = $", global::{targetInterfaceFullName}";
+
+            return $$"""
+                // <auto-generated by DxMessageIdGenerator/>
+                #pragma warning disable
+                #nullable enable annotations
+
+                {{namespaceBlockOpen}}
+                {{indent}}// Partial implementation for {{typeNameWithGenerics}} to implement {{BaseInterfaceFullName}}
+                {{indent}}{{accessibility}}partial {{typeKind}} {{typeNameWithGenerics}} : global::{{BaseInterfaceFullName}} {{interfaceDeclaration}}
+                {{indent}}{
+                {{indent}}    /// <inheritdoc/>
+                {{indent}}    public global::System.Type MessageType => typeof({{fullyQualifiedName}});
+                {{indent}}}
+                {{namespaceBlockClose}}
+                """;
+        }
     }
 }