com.wallstop-studios.dxmessaging 2.1.0 → 2.1.2

package/Runtime/Core/Extensions/MessageBusExtensions.cs

@@ -4,7 +4,7 @@ namespace DxMessaging.Core.Extensions
     using DxMessaging.Core;
     using DxMessaging.Core.MessageBus;
     using DxMessaging.Core.Messages;
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
     using UnityEngine;
 #endif
 
@@ -98,7 +98,7 @@ namespace DxMessaging.Core.Extensions
             message.EmitBroadcast(source, messageBus);
         }
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         public static void EmitGameObjectTargeted<TMessage>(
             this IMessageBus messageBus,
             GameObject target,

package/Runtime/Core/Extensions/MessageExtensions.cs

@@ -37,7 +37,7 @@ namespace DxMessaging.Core.Extensions
     /// </example>
     public static class MessageExtensions
     {
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         /// <summary>
         /// Emits a TargetedMessage of the given type.
         /// </summary>
@@ -395,7 +395,7 @@ namespace DxMessaging.Core.Extensions
             resolvedBus.SourcedBroadcast(ref source, ref message);
         }
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         /// <summary>
         /// Emits a BroadcastMessage of the given type.
         /// </summary>

package/Runtime/Core/InstanceId.cs

@@ -30,7 +30,7 @@ namespace DxMessaging.Core
 
         private readonly int _id;
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         // ReSharper disable once InconsistentNaming
         public readonly UnityEngine.Object Object;
 #endif
@@ -38,10 +38,12 @@ namespace DxMessaging.Core
         public InstanceId(int id)
         {
             _id = id;
+#if UNITY_2021_3_OR_NEWER
             Object = null;
+#endif
         }
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         private InstanceId(UnityEngine.Object unityObject)
         {
             _id = unityObject.GetInstanceID();
@@ -81,7 +83,7 @@ namespace DxMessaging.Core
 
         public override string ToString()
         {
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
             UnityEngine.Object instance = Object;
             string objectName = instance == null ? string.Empty : instance.name;
             return new { Id = _id, Name = objectName }.ToString();

package/Runtime/Core/MessageBus/MessageBus.cs

@@ -12,7 +12,7 @@ namespace DxMessaging.Core.MessageBus
     using Helper;
     using Messages;
     using static IMessageBus;
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
     using UnityEngine;
 #endif
 
@@ -167,7 +167,7 @@ namespace DxMessaging.Core.MessageBus
             Dictionary<MethodSignatureKey, Action<MonoBehaviour, object[]>>
         > _methodCache = new();
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         private readonly HashSet<MonoBehaviour> _recipientCache = new();
         private readonly List<MonoBehaviour> _componentCache = new();
 #endif
@@ -1144,7 +1144,7 @@ namespace DxMessaging.Core.MessageBus
                         );
                     }
                 }
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
                 ref ReflexiveMessage reflexiveMessage = ref Unsafe.As<TMessage, ReflexiveMessage>(
                     ref typedMessage
                 );
@@ -4152,7 +4152,7 @@ namespace DxMessaging.Core.MessageBus
             }
         }
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         private static Action<MonoBehaviour, object[]> CompileMethodAction(MethodInfo methodInfo)
         {
             ParameterExpression componentParameter = Expression.Parameter(

package/Runtime/Core/MessageBus/MessageRegistrationBuilder.cs

@@ -41,7 +41,7 @@ namespace DxMessaging.Core.MessageBus
         /// </summary>
         public InstanceId? Owner { get; set; }
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         /// <summary>
         /// Unity object to treat as the owner. Overrides <see cref="Owner"/> when supplied.
         /// </summary>
@@ -314,7 +314,7 @@ namespace DxMessaging.Core.MessageBus
 
         private static InstanceId ResolveOwner(MessageRegistrationBuildOptions options)
         {
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
             if (options.UnityOwner != null)
             {
                 if (options.UnityOwner is UnityEngine.GameObject gameObject)

package/Runtime/Core/MessageBus/MessagingRegistration.cs

@@ -58,7 +58,7 @@ namespace DxMessaging.Core.MessageBus
         /// </summary>
         public readonly RegistrationMethod registrationMethod;
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         /// <summary>
         /// Unity time of the registration
         /// </summary>
@@ -83,7 +83,7 @@ namespace DxMessaging.Core.MessageBus
             this.type = type;
             this.registrationType = registrationType;
             this.registrationMethod = registrationMethod;
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
             time = UnityEngine.Time.time;
 #endif
         }
@@ -92,7 +92,7 @@ namespace DxMessaging.Core.MessageBus
         {
             return new
             {
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
                 time,
 #endif
                 id,

package/Runtime/Core/MessageHandler.cs

@@ -502,7 +502,7 @@ namespace DxMessaging.Core
         /// <note>
         /// Ideally, this would be something like a Dictionary[T, Handler[T]], but that can't be done with C#s type system.
         /// </note>
-        private readonly List<MessageCache<object>> _handlersByTypeByMessageBus;
+        internal readonly List<MessageCache<object>> _handlersByTypeByMessageBus;
         private IMessageBus _defaultMessageBus;
 
         /// <summary>
@@ -1934,6 +1934,33 @@ namespace DxMessaging.Core
             return false;
         }
 
+        internal int GetUntargetedPostProcessingPrefreezeCount<T>(
+            IMessageBus messageBus,
+            int priority
+        )
+            where T : IMessage
+        {
+            if (
+                !GetHandlerForType(messageBus, out TypedHandler<T> handler)
+                || handler._untargetedPostProcessingFastHandlers == null
+            )
+            {
+                return 0;
+            }
+
+            if (
+                handler._untargetedPostProcessingFastHandlers.TryGetValue(
+                    priority,
+                    out HandlerActionCache<FastHandler<T>> cache
+                )
+            )
+            {
+                return cache.prefreezeInvocationCount;
+            }
+
+            return 0;
+        }
+
         private sealed class HandlerActionCache<T>
         {
             internal readonly struct Entry
@@ -3673,7 +3700,12 @@ namespace DxMessaging.Core
                     {
                         List<TU> list = actionCache.cache;
                         list.Clear();
-                        foreach (var kvp in actionCache.entries)
+                        foreach (
+                            KeyValuePair<
+                                TU,
+                                HandlerActionCache<TU>.Entry
+                            > kvp in actionCache.entries
+                        )
                         {
                             list.Add(kvp.Value.handler);
                         }

package/Runtime/Core/MessageRegistrationToken.cs

@@ -166,7 +166,7 @@ namespace DxMessaging.Core
             );
         }
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         /// <summary>
         /// Stages a registration to accept targeted messages of type <typeparamref name="T"/> directed at the given GameObject.
         /// </summary>
@@ -1024,7 +1024,7 @@ namespace DxMessaging.Core
             );
         }
 
-#if UNITY_2017_1_OR_NEWER
+#if UNITY_2021_3_OR_NEWER
         /// <summary>
         /// Stages a registration to accept broadcast messages of type <typeparamref name="T"/> from a given source.
         /// </summary>

package/Runtime/Core/Messages/IBroadcastMessage.cs

@@ -25,7 +25,7 @@ namespace DxMessaging.Core.Messages
     /// // Attribute + auto constructor
     /// [DxMessaging.Core.Attributes.DxBroadcastMessage]
     /// [DxMessaging.Core.Attributes.DxAutoConstructor]
-    /// public readonly struct PickedUpItem { public readonly int itemId; }
+    /// public readonly partial struct PickedUpItem { public readonly int itemId; }
     /// </code>
     /// </example>
     public interface IBroadcastMessage : IMessage { }

package/Runtime/Core/Messages/ITargetedMessage.cs

@@ -26,7 +26,7 @@ namespace DxMessaging.Core.Messages
     /// // Attribute form with auto constructor
     /// [DxMessaging.Core.Attributes.DxTargetedMessage]
     /// [DxMessaging.Core.Attributes.DxAutoConstructor]
-    /// public readonly struct EquipWeapon { public readonly int weaponId; }
+    /// public readonly partial struct EquipWeapon { public readonly int weaponId; }
     /// </code>
     /// </example>
     public interface ITargetedMessage : IMessage { }

package/Runtime/Core/Messages/IUntargetedMessage.cs

@@ -26,7 +26,7 @@ namespace DxMessaging.Core.Messages
     /// // Or with attribute + DxAutoConstructor
     /// [DxMessaging.Core.Attributes.DxUntargetedMessage]
     /// [DxMessaging.Core.Attributes.DxAutoConstructor]
-    /// public readonly struct WorldRegenerated { public readonly int seed; }
+    /// public readonly partial struct WorldRegenerated { public readonly int seed; }
     /// </code>
     /// </example>
     public interface IUntargetedMessage : IMessage { }

package/Runtime/Unity/CurrentGlobalMessageBusProvider.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity
 {
     using DxMessaging.Core;
@@ -29,3 +30,4 @@ namespace DxMessaging.Unity
         }
     }
 }
+#endif

package/Runtime/Unity/InitialGlobalMessageBusProvider.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity
 {
     using DxMessaging.Core;
@@ -36,3 +37,4 @@ namespace DxMessaging.Unity
         }
     }
 }
+#endif

package/Runtime/Unity/Integrations/Reflex/ReflexRegistrationInstaller.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity.Integrations.Reflex
 {
 #if REFLEX_PRESENT
@@ -71,3 +72,4 @@ namespace DxMessaging.Unity.Integrations.Reflex
     }
 #endif
 }
+#endif

package/Runtime/Unity/Integrations/VContainer/VContainerRegistrationExtensions.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity.Integrations.VContainer
 {
 #if VCONTAINER_PRESENT
@@ -44,3 +45,4 @@ namespace DxMessaging.Unity.Integrations.VContainer
     }
 #endif
 }
+#endif

package/Runtime/Unity/Integrations/Zenject/ZenjectRegistrationInstaller.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity.Integrations.Zenject
 {
 #if ZENJECT_PRESENT
@@ -53,3 +54,4 @@ namespace DxMessaging.Unity.Integrations.Zenject
     }
 #endif
 }
+#endif

package/Runtime/Unity/MessageAwareComponent.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity
 {
     using Core;
@@ -273,3 +274,4 @@ namespace DxMessaging.Unity
         }
     }
 }
+#endif

package/Runtime/Unity/MessageBusProviderHandle.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity
 {
     using System;
@@ -18,6 +19,8 @@ namespace DxMessaging.Unity
         [NonSerialized]
         private IMessageBusProvider _runtimeProvider;
 
+        internal ScriptableMessageBusProvider SerializedProvider => _provider;
+
         /// <summary>
         /// Initializes a new instance referencing the supplied provider asset.
         /// </summary>
@@ -95,3 +98,4 @@ namespace DxMessaging.Unity
         }
     }
 }
+#endif

package/Runtime/Unity/MessagingComponent.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity
 {
     using System;
@@ -44,6 +45,20 @@ namespace DxMessaging.Unity
         internal readonly Dictionary<MonoBehaviour, MessageRegistrationToken> _registeredListeners =
             new();
 
+        internal bool AutoConfigureSerializedProviderOnAwake =>
+            autoConfigureSerializedProviderOnAwake;
+
+        internal bool HasRuntimeProvider => _messageBusProvider != null;
+
+        internal bool HasMessageBusOverride => _messageBusOverride != null;
+
+        internal bool HasSerializedProvider => _serializedProviderHandle.TryGetProvider(out _);
+
+        internal MessageBusProviderHandle SerializedProviderHandle => _serializedProviderHandle;
+
+        internal ScriptableMessageBusProvider SerializedProviderAsset =>
+            _serializedProviderHandle.SerializedProvider;
+
         /// <summary>
         /// Creates a <see cref="IMessageRegistrationBuilder"/> aligned with this component's configured bus or provider.
         /// </summary>
@@ -72,10 +87,10 @@ namespace DxMessaging.Unity
                 throw new ArgumentNullException(nameof(listener));
             }
 
-            if (gameObject.GetInstanceID() != listener.gameObject.GetInstanceID())
+            if (gameObject != listener.gameObject)
             {
                 throw new ArgumentException(
-                    $"Cannot create a RegistrationToken without an valid owner. {listener.gameObject.GetInstanceID()}."
+                    $"Cannot create a RegistrationToken without a mismatched owner. {listener.gameObject} != existing {gameObject}."
                 );
             }
 
@@ -86,11 +101,15 @@ namespace DxMessaging.Unity
                 )
             )
             {
-                MessagingDebug.Log(
-                    LogLevel.Warn,
-                    "Ignoring double RegistrationToken request for {0}.",
-                    listener
-                );
+                if (MessagingDebug.enabled)
+                {
+                    MessagingDebug.Log(
+                        LogLevel.Warn,
+                        "Ignoring double RegistrationToken request for {0}.",
+                        listener
+                    );
+                }
+
                 return createdToken;
             }
 
@@ -309,3 +328,4 @@ namespace DxMessaging.Unity
         }
     }
 }
+#endif

package/Runtime/Unity/MessagingComponentInstaller.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity
 {
     using System.Collections.Generic;
@@ -118,3 +119,4 @@ namespace DxMessaging.Unity
         }
     }
 }
+#endif

package/Runtime/Unity/ScriptableMessageBusProvider.cs

@@ -1,3 +1,4 @@
+#if UNITY_2021_3_OR_NEWER
 namespace DxMessaging.Unity
 {
     using DxMessaging.Core.MessageBus;
@@ -12,3 +13,4 @@ namespace DxMessaging.Unity
         public abstract IMessageBus Resolve();
     }
 }
+#endif

package/Samples~/DI/Reflex/SampleInstaller.cs

@@ -2,6 +2,7 @@
 namespace DxMessaging.Samples.DI.Reflex
 {
     using DxMessaging.Core;
+    using DxMessaging.Core.Attributes;
     using DxMessaging.Core.MessageBus;
     using DxMessaging.Core.Messages;
     using DxMessaging.Unity.Integrations.Reflex;
@@ -61,14 +62,13 @@ namespace DxMessaging.Samples.DI.Reflex
             }
         }
 
-        private readonly struct PlayerAlert : IBroadcastMessage
+        [DxBroadcastMessage]
+        [DxAutoConstructor]
+        private readonly partial struct PlayerAlert
         {
-            public PlayerAlert(InstanceId source)
-            {
-                Source = source;
-            }
+            public readonly InstanceId source;
 
-            public InstanceId Source { get; }
+            public InstanceId Source => source;
         }
     }
 }

package/Samples~/DI/VContainer/SampleLifetimeScope.cs

@@ -2,9 +2,9 @@
 namespace DxMessaging.Samples.DI.VContainer
 {
     using System;
-    using Core.Attributes;
-    using Core.Extensions;
-    using Core.MessageBus;
+    using DxMessaging.Core.Attributes;
+    using DxMessaging.Core.Extensions;
+    using DxMessaging.Core.MessageBus;
     using DxMessaging.Unity.Integrations.VContainer;
     using UnityEngine;
     using VContainer;
@@ -25,14 +25,12 @@ namespace DxMessaging.Samples.DI.VContainer
         }
 
         [DxUntargetedMessage]
-        private readonly struct ScoreUpdated
+        [DxAutoConstructor]
+        private readonly partial struct ScoreUpdated
         {
-            public readonly int Value;
+            public readonly int value;
 
-            public ScoreUpdated(int value)
-            {
-                Value = value;
-            }
+            public int Value => value;
         }
 
         private sealed class ScoreboardService : IStartable, ITickable, IDisposable

package/Samples~/DI/Zenject/SampleInstaller.cs

@@ -2,8 +2,8 @@
 namespace DxMessaging.Samples.DI.Zenject
 {
     using System;
-    using Core.Attributes;
-    using Core.MessageBus;
+    using DxMessaging.Core.Attributes;
+    using DxMessaging.Core.MessageBus;
     using UnityEngine;
     using Zenject;
 
@@ -20,14 +20,12 @@ namespace DxMessaging.Samples.DI.Zenject
         }
 
         [DxUntargetedMessage]
-        private readonly struct PlayerSpawned
+        [DxAutoConstructor]
+        private readonly partial struct PlayerSpawned
         {
-            public readonly string PlayerName;
+            public readonly string playerName;
 
-            public PlayerSpawned(string playerName)
-            {
-                PlayerName = playerName;
-            }
+            public string PlayerName => playerName;
         }
 
         private sealed class PlayerSpawnTracker : IInitializable, IDisposable

package/SourceGenerators/Directory.Build.props

@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup Condition="'$(MSBuildProjectName)' == 'WallstopStudios.DxMessaging.SourceGenerators.Tests'">
+    <SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)..\</SolutionDir>
+    <ArtifactsRoot>$(SolutionDir).artifacts/SourceGenerators.Tests/</ArtifactsRoot>
+    <IntermediateOutputPath>$(ArtifactsRoot)obj/$(Configuration)/</IntermediateOutputPath>
+    <OutputPath>$(ArtifactsRoot)bin/$(Configuration)/</OutputPath>
+    <VSTestResultsDirectory>$(ArtifactsRoot)TestResults/</VSTestResultsDirectory>
+  </PropertyGroup>
+</Project>

package/{package-lock.json.meta → SourceGenerators/Directory.Build.props.meta}

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 6c3d7e44fbd165847a830ad23b17aeb7
-TextScriptImporter:
+guid: 5b80e1cf4c3c72a43bbd48e4667f00f7
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: