com.wallstop-studios.dxmessaging 2.0.0-rc26.3 → 2.0.0-rc26.4

package/SourceGenerators/WallstopStudios.DxMessaging.SourceGenerators/DxAutoConstructorGenerator.cs

@@ -143,7 +143,7 @@
 
             foreach (TypeToGenerateInfo typeInfo in typesToGenerate)
             {
-                if (!processedTypes.Add(typeInfo.TypeSymbol))
+                if (!processedTypes.Add(typeInfo.TypeSymbol) || typeInfo.FieldsToInject.Length == 0)
                 {
                     continue; // Already processed this type (e.g., from another partial definition)
                 }
@@ -171,13 +171,14 @@
             ImmutableArray<IFieldSymbol> fieldsToInject
         )
         {
+
             string namespaceName = typeSymbol.ContainingNamespace.IsGlobalNamespace
                 ? string.Empty
                 : typeSymbol.ContainingNamespace.ToDisplayString();
             string namespaceBlockOpen = string.IsNullOrEmpty(namespaceName)
-                ? "namespace\n{"
+                ? string.Empty
                 : $"namespace {namespaceName}\n{{";
-            const string namespaceBlockClose = "}";
+            string namespaceBlockClose = string.IsNullOrEmpty(namespaceName) ? string.Empty : "}";
             const string indent = "    ";
 
             string typeName = typeSymbol.ToDisplayString(

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

@@ -258,9 +258,9 @@
                 ? string.Empty
                 : typeSymbol.ContainingNamespace.ToDisplayString();
             string namespaceBlockOpen = string.IsNullOrEmpty(namespaceName)
-                ? "namespace\n{"
+                ? string.Empty
                 : $"namespace {namespaceName}\n{{";
-            const string namespaceBlockClose = "}";
+            string namespaceBlockClose = string.IsNullOrEmpty(namespaceName) ? string.Empty : "}";
             const string indent = "    ";
 
             string typeNameWithGenerics = typeSymbol.ToDisplayString(
@@ -279,10 +279,12 @@
 
             string accessibility = typeSymbol.DeclaredAccessibility switch
             {
-                Accessibility.Public => "public ",
-                Accessibility.Internal => "internal ",
+                Accessibility.Public => "public",
+                Accessibility.Protected => "protected",
+                Accessibility.Private => "private",
+                Accessibility.Internal => "internal",
                 // Add others if necessary, default to internal if restrictive
-                _ => "internal ",
+                _ => "internal",
             };
 
             string interfaceDeclaration = $", global::{targetInterfaceFullName}";
@@ -294,7 +296,7 @@
 
                 {{namespaceBlockOpen}}
                 {{indent}}// Partial implementation for {{typeNameWithGenerics}} to implement {{BaseInterfaceFullName}}
-                {{indent}}{{accessibility}}partial {{typeKind}} {{typeNameWithGenerics}} : global::{{BaseInterfaceFullName}} {{interfaceDeclaration}}
+                {{indent}}{{accessibility}} partial {{typeKind}} {{typeNameWithGenerics}} : global::{{BaseInterfaceFullName}} {{interfaceDeclaration}}
                 {{indent}}{
                 {{indent}}    /// <inheritdoc/>
                 {{indent}}    public global::System.Type MessageType => typeof({{fullyQualifiedName}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.dxmessaging",
-  "version": "2.0.0-rc26.3",
+  "version": "2.0.0-rc26.4",
   "displayName": "DxMessaging",
   "description": "Synchronous Event Bus for Unity",
   "unity": "2021.3",
@@ -35,3 +35,4 @@
 
 
 
+