com.wallstop-studios.dxmessaging 2.0.0-rc26 → 2.0.0-rc26.1

package/.config/dotnet-tools.json

@@ -3,8 +3,8 @@
   "isRoot": true,
   "tools": {
     "CSharpier": {
-      "version": "0.30.6",
-      "commands": ["dotnet-csharpier"]
+      "version": "1.0.1",
+      "commands": ["csharpier"]
     }
   }
 }

package/.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
         description: Install the .NET tools listed at .config/dotnet-tools.json.
       - id: csharpier
         name: Run CSharpier on C# files
-        entry: dotnet tool run dotnet-csharpier
+        entry: dotnet tool run Csharpier format
         language: system
         types:
           - c#

package/Editor/SetupCscRsp.cs

@@ -62,12 +62,7 @@ namespace DxMessaging.Editor
                     continue;
                 }
 
-                if (
-                    !dllPath.Contains(
-                        "Assets/Plugins/WallstopStudios.DxMessaging",
-                        StringComparison.OrdinalIgnoreCase
-                    )
-                )
+                if (!dllPath.Contains("Assets/Plugins", StringComparison.OrdinalIgnoreCase))
                 {
                     string dllName = Path.GetFileName(dllPath);
                     DllNames.Add(dllName);
@@ -95,10 +90,14 @@ namespace DxMessaging.Editor
                         }
 
                         const string pluginsDirectory =
-                            "Assets/Plugins/WallstopStudios.DxMessaging/";
+                            "Assets/Plugins/Editor/WallstopStudios.DxMessaging/";
                         string outputAsset = $"{pluginsDirectory}{requiredDllName}";
                         string sourceAsset = $"{relativeDirectory}{requiredDllName}";
-                        Directory.CreateDirectory(pluginsDirectory);
+                        if (!Directory.Exists(pluginsDirectory))
+                        {
+                            Directory.CreateDirectory(pluginsDirectory);
+                            AssetDatabase.Refresh();
+                        }
                         if (!File.Exists(outputAsset))
                         {
                             File.Copy(sourceAsset, outputAsset);

package/Runtime/Core/Extensions/MessageExtensions.cs

@@ -174,6 +174,24 @@
             messageBus.UntargetedBroadcast(ref message);
         }
 
+        /// <summary>
+        /// Emits an UntargetedMessage of the given type.
+        /// </summary>
+        /// <param name="message">UntargetedMessage to emit.</param>
+        /// <param name="messageBus">MessageBus to emit to. If null, uses the GlobalMessageBus.</param>
+        public static void Emit<TMessage>(this TMessage message, IMessageBus messageBus = null)
+            where TMessage : class, IUntargetedMessage
+        {
+            messageBus ??= MessageHandler.MessageBus;
+            if (typeof(TMessage) == typeof(IUntargetedMessage))
+            {
+                messageBus.UntypedUntargetedBroadcast(message);
+                return;
+            }
+
+            messageBus.UntargetedBroadcast(ref message);
+        }
+
         /// <summary>
         /// Emits an UntargetedMessage of the given type.
         /// </summary>
@@ -195,6 +213,24 @@
             messageBus.UntargetedBroadcast(ref message);
         }
 
+        /// <summary>
+        /// Emits an UntargetedMessage of the given type.
+        /// </summary>
+        /// <param name="message">UntargetedMessage to emit.</param>
+        /// <param name="messageBus">MessageBus to emit to. If null, uses the GlobalMessageBus.</param>
+        public static void Emit<TMessage>(this ref TMessage message, IMessageBus messageBus = null)
+            where TMessage : struct, IUntargetedMessage
+        {
+            messageBus ??= MessageHandler.MessageBus;
+            if (typeof(TMessage) == typeof(IUntargetedMessage))
+            {
+                messageBus.UntypedUntargetedBroadcast(message);
+                return;
+            }
+
+            messageBus.UntargetedBroadcast(ref message);
+        }
+
 #if UNITY_2017_1_OR_NEWER
         /// <summary>
         /// Emits a BroadcastMessage of the given type.
@@ -338,5 +374,35 @@
 
             messageBus.SourcedBroadcast(ref source, ref message);
         }
+
+        /// <summary>
+        /// Emits a StringMessage at the target containing the provided string.
+        /// </summary>
+        /// <param name="message">Message to send to the target.</param>
+        /// <param name="target">Target to send the message to.</param>
+        /// <param name="messageBus">MessageBus to emit to. If null, uses the GlobalMessageBus.</param>
+        public static void Emit(
+            this string message,
+            InstanceId target,
+            IMessageBus messageBus = null
+        )
+        {
+            StringMessage stringMessage = new(message);
+            (messageBus ?? MessageHandler.MessageBus).TargetedBroadcast(
+                ref target,
+                ref stringMessage
+            );
+        }
+
+        /// <summary>
+        /// Emits a GlobalStringMessage containing the provided string.
+        /// </summary>
+        /// <param name="message">Message to send globally.</param>
+        /// <param name="messageBus">MessageBus to emit to. If null, uses the GlobalMessageBus.</param>
+        public static void Emit(this string message, IMessageBus messageBus = null)
+        {
+            GlobalStringMessage stringMessage = new(message);
+            (messageBus ?? MessageHandler.MessageBus).UntargetedBroadcast(ref stringMessage);
+        }
     }
 }

package/Runtime/{Unity → Core}/Messages/GlobalStringMessage.cs

@@ -1,7 +1,6 @@
-namespace DxMessaging.Unity.Messages
+namespace DxMessaging.Core.Messages
 {
     using System;
-    using Core.Messages;
 
     public readonly struct GlobalStringMessage : IUntargetedMessage<GlobalStringMessage>
     {

package/Runtime/{Unity → Core}/Messages/StringMessage.cs

@@ -1,7 +1,6 @@
-namespace DxMessaging.Unity.Messages
+namespace DxMessaging.Core.Messages
 {
     using System;
-    using Core.Messages;
 
     public readonly struct StringMessage : ITargetedMessage<StringMessage>
     {

package/Runtime/Unity/MessageAwareComponent.cs

@@ -1,7 +1,7 @@
 namespace DxMessaging.Unity
 {
     using Core;
-    using Messages;
+    using Core.Messages;
     using UnityEngine;
 
     [RequireComponent(typeof(MessagingComponent))]

package/Tests/Runtime/Benchmarks/PerformanceTests.cs

@@ -6,7 +6,6 @@
     using DxMessaging.Core;
     using DxMessaging.Core.Extensions;
     using DxMessaging.Core.Messages;
-    using global::Unity.PerformanceTesting;
     using NUnit.Framework;
     using Scripts.Components;
     using Scripts.Messages;
@@ -55,96 +54,6 @@
             RunTest(component => ReflexiveThreeArguments(timer, timeout, component.gameObject));
         }
 
-        [Test]
-        [Performance]
-        public void BenchmarkBroadcast()
-        {
-            GameObject go = CreateGameObject();
-            MessageRegistrationToken token = GetToken(
-                go.GetComponent<EmptyMessageAwareComponent>()
-            );
-            // ReSharper disable once NotAccessedVariable
-            int count = 0;
-            token.RegisterGameObjectBroadcast<SimpleBroadcastMessage>(go, Handle);
-
-            SimpleBroadcastMessage message = new();
-            SampleGroup time = new("Time", SampleUnit.Nanosecond);
-
-            Measure
-                .Method(() => message.EmitGameObjectBroadcast(go))
-                .SampleGroup(time)
-                .WarmupCount(10)
-                .IterationsPerMeasurement(1)
-                .MeasurementCount(10_000)
-                .Run();
-            return;
-
-            void Handle(SimpleBroadcastMessage _)
-            {
-                ++count;
-            }
-        }
-
-        [Test]
-        [Performance]
-        public void BenchmarkTargeted()
-        {
-            GameObject go = CreateGameObject();
-            MessageRegistrationToken token = GetToken(
-                go.GetComponent<EmptyMessageAwareComponent>()
-            );
-            // ReSharper disable once NotAccessedVariable
-            int count = 0;
-            token.RegisterGameObjectTargeted<SimpleTargetedMessage>(go, Handle);
-
-            SimpleTargetedMessage message = new();
-            SampleGroup time = new("Time", SampleUnit.Nanosecond);
-
-            Measure
-                .Method(() => message.EmitGameObjectTargeted(go))
-                .SampleGroup(time)
-                .WarmupCount(10)
-                .IterationsPerMeasurement(1)
-                .MeasurementCount(10_000)
-                .Run();
-            return;
-
-            void Handle(SimpleTargetedMessage _)
-            {
-                ++count;
-            }
-        }
-
-        [Test]
-        [Performance]
-        public void BenchmarkUntargeted()
-        {
-            GameObject go = CreateGameObject();
-            MessageRegistrationToken token = GetToken(
-                go.GetComponent<EmptyMessageAwareComponent>()
-            );
-            // ReSharper disable once NotAccessedVariable
-            int count = 0;
-            token.RegisterUntargeted<SimpleUntargetedMessage>(Handle);
-
-            SimpleUntargetedMessage message = new();
-            SampleGroup time = new("Time", SampleUnit.Nanosecond);
-
-            Measure
-                .Method(() => message.EmitUntargeted())
-                .SampleGroup(time)
-                .WarmupCount(10)
-                .IterationsPerMeasurement(1)
-                .MeasurementCount(10_000)
-                .Run();
-            return;
-
-            void Handle(SimpleUntargetedMessage _)
-            {
-                ++count;
-            }
-        }
-
         private GameObject CreateGameObject()
         {
             GameObject target = new(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.dxmessaging",
-  "version": "2.0.0-rc26",
+  "version": "2.0.0-rc26.1",
   "displayName": "DxMessaging",
   "description": "Synchronous Event Bus for Unity",
   "unity": "2021.3",
@@ -32,3 +32,4 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   }
 }
+

package/Runtime/Unity/Messages.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f1a132a737bb42a79205b2269554e818
-timeCreated: 1745160607