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

package/Runtime/Core/Attributes/DxOptionalParameterAttribute.cs

@@ -0,0 +1,10 @@
+namespace DxMessaging.Core.Attributes
+{
+    using System;
+
+    [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    public sealed class DxOptionalParameterAttribute : Attribute
+    {
+        public DxOptionalParameterAttribute() { }
+    }
+}

package/Runtime/Core/Attributes/DxOptionalParameterAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 87d96cdf2fc74f40ba77ae0d157be964
+timeCreated: 1749850608

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

@@ -18,6 +18,9 @@
         private const string AutoGenConstructorAttrFullName =
             "DxMessaging.Core.Attributes.DxAutoConstructorAttribute";
 
+        private const string OptionalParameterAttrFullName =
+            "DxMessaging.Core.Attributes.DxOptionalParameterAttribute";
+
         // Info needed during generation for a valid type
         private record struct TypeToGenerateInfo(
             INamedTypeSymbol TypeSymbol,
@@ -143,7 +146,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)
                 }
@@ -175,9 +178,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 typeName = typeSymbol.ToDisplayString(
@@ -212,18 +215,39 @@
                     SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers
                 );
 
-            for (int i = 0; i < fieldsToInject.Length; i++)
+            List<(string Type, string Name, bool IsOptional)> parameterDetails = [];
+
+            foreach (IFieldSymbol field in fieldsToInject)
             {
-                IFieldSymbol field = fieldsToInject[i];
                 string fieldType = field.Type.ToDisplayString(fieldTypeFormat);
                 string fieldName = field.Name;
+                bool isOptional = field
+                    .GetAttributes()
+                    .Any(attr =>
+                        string.Equals(
+                            attr.AttributeClass?.ToDisplayString(),
+                            OptionalParameterAttrFullName,
+                            StringComparison.Ordinal
+                        )
+                    );
+
+                parameterDetails.Add((fieldType, fieldName, isOptional));
+                constructorBody.AppendLine($"{indent}{indent}    this.{fieldName} = {fieldName};");
+            }
+
+            for (int i = 0; i < parameterDetails.Count; i++)
+            {
+                (string Type, string Name, bool IsOptional) p = parameterDetails[i];
+                constructorParams.Append($"{p.Type} {p.Name}");
+                if (p.IsOptional)
+                {
+                    constructorParams.Append(" = default");
+                }
 
-                constructorParams.Append($"{fieldType} {fieldName}");
-                if (i < fieldsToInject.Length - 1)
+                if (i < parameterDetails.Count - 1)
                 {
                     constructorParams.Append(", ");
                 }
-                constructorBody.AppendLine($"{indent}{indent}    this.{fieldName} = {fieldName};");
             }
 
             return $$"""

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.5",
   "displayName": "DxMessaging",
   "description": "Synchronous Event Bus for Unity",
   "unity": "2021.3",
@@ -35,3 +35,5 @@
 
 
 
+
+