com.wallstop-studios.dxmessaging 2.1.3 → 2.1.4

package/.github/workflows/dotnet-tests.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
@@ -47,7 +47,7 @@ jobs:
           cat artifacts/coverage/Summary.txt
 
       - name: Upload coverage report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: generator-coverage
           path: artifacts/coverage

package/.github/workflows/prettier-autofix.yml

@@ -46,10 +46,6 @@ jobs:
         if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
         run: npx --yes markdownlint-cli@0.40.0 "**/*.md" "**/*.markdown" --config .markdownlint.json --ignore-path .markdownlintignore --fix
 
-      - name: Fix EOL/BOM (Dependabot only)
-        if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
-        run: node scripts/fix-eol.js -v
-
       - name: Commit formatting changes to PR branch (Dependabot only)
         if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.user.login == 'dependabot[bot]' }}
         uses: stefanzweifel/git-auto-commit-action@v7
@@ -118,9 +114,6 @@ jobs:
       - name: Markdownlint (auto-fix)
         run: npx --yes markdownlint-cli@0.40.0 "**/*.md" "**/*.markdown" --config .markdownlint.json --ignore-path .markdownlintignore --fix
 
-      - name: Fix EOL/BOM
-        run: node scripts/fix-eol.js -v
-
       - name: Detect changes
         id: changes
         shell: bash

package/.pre-commit-config.yaml

@@ -57,14 +57,17 @@ repos:
 
   - repo: local
     hooks:
-      - id: eol-bom-fix
-        name: Auto-fix CRLF and remove BOM
-        entry: node scripts/fix-eol.js -v
+      - id: fix-eol
+        name: Normalize CRLF and strip BOM
+        entry: node scripts/fix-eol.js
         language: system
-        pass_filenames: false
         stages:
           - pre-commit
-        description: Convert line endings to CRLF and strip UTF-8 BOM on text files.
+        pass_filenames: true
+        description: Automatically rewrite text files to match CI EOL/BOM policy.
+
+  - repo: local
+    hooks:
       - id: eol-bom-check
         name: Enforce CRLF and no BOM
         entry: node scripts/check-eol.js

package/CONTRIBUTING.md

@@ -8,7 +8,12 @@ Before committing, please enable our git hooks and local linters so you catch is
 - Install hooks: `pre-commit install`
 - Run on all files: `pre-commit run --all-files`
 
-Note: If the "Enforce CRLF and no BOM" hook fails, run `node scripts/fix-eol.js -v` to auto-fix line endings and strip any BOM.
+Line endings: Git already normalizes files to CRLF through `.gitattributes`. Run this once after cloning (especially on Windows) so your working tree matches CI:
+
+```bash
+git config core.autocrlf false
+git add --renormalize .
+```
 
 What runs locally:
 
@@ -29,5 +34,6 @@ Handy commands:
 - Format JSON/.asmdef (manual): `npx prettier@3.6.2 --write "**/*.{json,asmdef}"`
 - Format YAML (all files): `pre-commit run prettier-yaml --all-files`
 - Check YAML formatting + lint: `npm run check:yaml`
-- Fix EOL/BOM issues quickly: `node scripts/fix-eol.js -v`
 - Format C#: `dotnet tool restore && dotnet tool run csharpier format`
+
+If you do still need to repair line endings manually (for example, after copying files from an external tool), run `node scripts/fix-eol.js -v` and then re-stage the affected files.

package/Docs/Performance.md

@@ -14,17 +14,17 @@ See also: [Performance optimizations](./DesignAndArchitecture.md#performance-opt
 
 | Message Tech                               | Operations / Second | Allocations? |
 | ------------------------------------------ | ------------------- | ------------ |
-| Unity                                      | 2,504,000           | Yes          |
-| DxMessaging (GameObject) - Normal          | 8,522,000           | No           |
-| DxMessaging (Component) - Normal           | 8,524,000           | No           |
-| DxMessaging (GameObject) - No-Copy         | 9,398,000           | No           |
-| DxMessaging (Component) - No-Copy          | 9,508,000           | No           |
-| DxMessaging (Untargeted) - No-Copy         | 14,742,000          | No           |
-| DxMessaging (Untargeted) - Interceptors    | 6,620,000           | No           |
-| DxMessaging (Untargeted) - Post-Processors | 5,234,000           | No           |
-| Reflexive (One Argument)                   | 2,840,000           | No           |
-| Reflexive (Two Arguments)                  | 2,352,000           | No           |
-| Reflexive (Three Arguments)                | 2,318,000           | No           |
+| Unity                                      | 2,522,000           | Yes          |
+| DxMessaging (GameObject) - Normal          | 8,606,000           | No           |
+| DxMessaging (Component) - Normal           | 8,608,000           | No           |
+| DxMessaging (GameObject) - No-Copy         | 9,534,000           | No           |
+| DxMessaging (Component) - No-Copy          | 9,658,000           | No           |
+| DxMessaging (Untargeted) - No-Copy         | 15,008,000          | No           |
+| DxMessaging (Untargeted) - Interceptors    | 6,944,000           | No           |
+| DxMessaging (Untargeted) - Post-Processors | 5,146,000           | No           |
+| Reflexive (One Argument)                   | 2,822,000           | No           |
+| Reflexive (Two Arguments)                  | 2,370,000           | No           |
+| Reflexive (Three Arguments)                | 2,342,000           | No           |
 
 ## macOS
 

package/Runtime/Core/MessageBus/MessageBus.cs

@@ -47,6 +47,18 @@ namespace DxMessaging.Core.MessageBus
             }
         }
 
+        private sealed class InterceptorCache<TValue>
+        {
+            public readonly SortedList<int, List<TValue>> handlers = new();
+            public long lastSeenEmissionId;
+
+            public void Clear()
+            {
+                handlers.Clear();
+                lastSeenEmissionId = 0;
+            }
+        }
+
         private sealed class HandlerCache
         {
             public readonly Dictionary<MessageHandler, int> handlers = new();
@@ -165,12 +177,9 @@ namespace DxMessaging.Core.MessageBus
         private readonly HandlerCache _globalSinks = new();
 
         // Interceptors split by category to avoid mixing types
-        private readonly MessageCache<HandlerCache<int, List<object>>> _untargetedInterceptsByType =
-            new();
-        private readonly MessageCache<HandlerCache<int, List<object>>> _targetedInterceptsByType =
-            new();
-        private readonly MessageCache<HandlerCache<int, List<object>>> _broadcastInterceptsByType =
-            new();
+        private readonly MessageCache<InterceptorCache<object>> _untargetedInterceptsByType = new();
+        private readonly MessageCache<InterceptorCache<object>> _targetedInterceptsByType = new();
+        private readonly MessageCache<InterceptorCache<object>> _broadcastInterceptsByType = new();
         private readonly Dictionary<object, Dictionary<int, int>> _uniqueInterceptorsAndPriorities =
             new();
 
@@ -367,29 +376,9 @@ namespace DxMessaging.Core.MessageBus
         )
             where T : IUntargetedMessage
         {
-            HandlerCache<int, List<object>> prioritizedInterceptors =
+            InterceptorCache<object> prioritizedInterceptors =
                 _untargetedInterceptsByType.GetOrAdd<T>();
 
-            if (
-                !prioritizedInterceptors.handlers.TryGetValue(
-                    priority,
-                    out List<object> interceptors
-                )
-            )
-            {
-                prioritizedInterceptors.version++;
-                interceptors = new List<object>();
-                prioritizedInterceptors.handlers[priority] = interceptors;
-                // maintain sorted order
-                List<int> order = prioritizedInterceptors.order;
-                int idx = 0;
-                while (idx < order.Count && order[idx] < priority)
-                {
-                    idx++;
-                }
-                order.Insert(idx, priority);
-            }
-
             if (
                 !_uniqueInterceptorsAndPriorities.TryGetValue(
                     interceptor,
@@ -401,6 +390,13 @@ namespace DxMessaging.Core.MessageBus
                 _uniqueInterceptorsAndPriorities[interceptor] = priorityCount;
             }
 
+            List<object> interceptors;
+            if (!prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors))
+            {
+                interceptors = new List<object>();
+                prioritizedInterceptors.handlers.Add(priority, interceptors);
+            }
+
             if (!priorityCount.TryGetValue(priority, out int count))
             {
                 count = 0;
@@ -464,20 +460,17 @@ namespace DxMessaging.Core.MessageBus
                 {
                     if (_untargetedInterceptsByType.TryGetValue<T>(out prioritizedInterceptors))
                     {
-                        prioritizedInterceptors.version++;
                         if (
-                            prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors)
+                            prioritizedInterceptors.handlers.TryGetValue(
+                                priority,
+                                out List<object> interceptors
+                            )
                         )
                         {
                             complete = interceptors.Remove(interceptor);
                             if (interceptors.Count == 0)
                             {
                                 _ = prioritizedInterceptors.handlers.Remove(priority);
-                                int removeIdx = prioritizedInterceptors.order.IndexOf(priority);
-                                if (removeIdx >= 0)
-                                {
-                                    prioritizedInterceptors.order.RemoveAt(removeIdx);
-                                }
                             }
                         }
                     }
@@ -501,29 +494,9 @@ namespace DxMessaging.Core.MessageBus
         )
             where T : ITargetedMessage
         {
-            HandlerCache<int, List<object>> prioritizedInterceptors =
+            InterceptorCache<object> prioritizedInterceptors =
                 _targetedInterceptsByType.GetOrAdd<T>();
 
-            if (
-                !prioritizedInterceptors.handlers.TryGetValue(
-                    priority,
-                    out List<object> interceptors
-                )
-            )
-            {
-                prioritizedInterceptors.version++;
-                interceptors = new List<object>();
-                prioritizedInterceptors.handlers[priority] = interceptors;
-                // maintain sorted order
-                List<int> order = prioritizedInterceptors.order;
-                int idx = 0;
-                while (idx < order.Count && order[idx] < priority)
-                {
-                    idx++;
-                }
-                order.Insert(idx, priority);
-            }
-
             if (
                 !_uniqueInterceptorsAndPriorities.TryGetValue(
                     interceptor,
@@ -535,6 +508,13 @@ namespace DxMessaging.Core.MessageBus
                 _uniqueInterceptorsAndPriorities[interceptor] = priorityCount;
             }
 
+            List<object> interceptors;
+            if (!prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors))
+            {
+                interceptors = new List<object>();
+                prioritizedInterceptors.handlers.Add(priority, interceptors);
+            }
+
             if (!priorityCount.TryGetValue(priority, out int count))
             {
                 count = 0;
@@ -598,20 +578,17 @@ namespace DxMessaging.Core.MessageBus
                 {
                     if (_targetedInterceptsByType.TryGetValue<T>(out prioritizedInterceptors))
                     {
-                        prioritizedInterceptors.version++;
                         if (
-                            prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors)
+                            prioritizedInterceptors.handlers.TryGetValue(
+                                priority,
+                                out List<object> interceptors
+                            )
                         )
                         {
                             complete = interceptors.Remove(interceptor);
                             if (interceptors.Count == 0)
                             {
                                 _ = prioritizedInterceptors.handlers.Remove(priority);
-                                int removeIdx = prioritizedInterceptors.order.IndexOf(priority);
-                                if (removeIdx >= 0)
-                                {
-                                    prioritizedInterceptors.order.RemoveAt(removeIdx);
-                                }
                             }
                         }
                     }
@@ -635,29 +612,9 @@ namespace DxMessaging.Core.MessageBus
         )
             where T : IBroadcastMessage
         {
-            HandlerCache<int, List<object>> prioritizedInterceptors =
+            InterceptorCache<object> prioritizedInterceptors =
                 _broadcastInterceptsByType.GetOrAdd<T>();
 
-            if (
-                !prioritizedInterceptors.handlers.TryGetValue(
-                    priority,
-                    out List<object> interceptors
-                )
-            )
-            {
-                prioritizedInterceptors.version++;
-                interceptors = new List<object>();
-                prioritizedInterceptors.handlers[priority] = interceptors;
-                // maintain sorted order
-                List<int> order = prioritizedInterceptors.order;
-                int idx = 0;
-                while (idx < order.Count && order[idx] < priority)
-                {
-                    idx++;
-                }
-                order.Insert(idx, priority);
-            }
-
             if (
                 !_uniqueInterceptorsAndPriorities.TryGetValue(
                     interceptor,
@@ -669,6 +626,13 @@ namespace DxMessaging.Core.MessageBus
                 _uniqueInterceptorsAndPriorities[interceptor] = priorityCount;
             }
 
+            List<object> interceptors;
+            if (!prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors))
+            {
+                interceptors = new List<object>();
+                prioritizedInterceptors.handlers.Add(priority, interceptors);
+            }
+
             if (!priorityCount.TryGetValue(priority, out int count))
             {
                 count = 0;
@@ -732,20 +696,17 @@ namespace DxMessaging.Core.MessageBus
                 {
                     if (_broadcastInterceptsByType.TryGetValue<T>(out prioritizedInterceptors))
                     {
-                        prioritizedInterceptors.version++;
                         if (
-                            prioritizedInterceptors.handlers.TryGetValue(priority, out interceptors)
+                            prioritizedInterceptors.handlers.TryGetValue(
+                                priority,
+                                out List<object> interceptors
+                            )
                         )
                         {
                             complete = interceptors.Remove(interceptor);
                             if (interceptors.Count == 0)
                             {
                                 _ = prioritizedInterceptors.handlers.Remove(priority);
-                                int removeIdx = prioritizedInterceptors.order.IndexOf(priority);
-                                if (removeIdx >= 0)
-                                {
-                                    prioritizedInterceptors.order.RemoveAt(removeIdx);
-                                }
                             }
                         }
                     }
@@ -3010,39 +2971,24 @@ namespace DxMessaging.Core.MessageBus
         }
 
         private bool TryGetUntargetedInterceptorCaches<TMessage>(
-            out List<KeyValuePair<int, List<object>>> interceptorStack,
+            out SortedList<int, List<object>> interceptorHandlers,
             out List<object> interceptorObjects
         )
             where TMessage : IUntargetedMessage
         {
             if (
                 !_untargetedInterceptsByType.TryGetValue<TMessage>(
-                    out HandlerCache<int, List<object>> interceptors
+                    out InterceptorCache<object> interceptors
                 )
                 || interceptors.handlers.Count == 0
             )
             {
-                interceptorStack = default;
+                interceptorHandlers = default;
                 interceptorObjects = default;
                 return false;
             }
 
-            interceptorStack = interceptors.cache;
-            if (interceptors.version != interceptors.lastSeenVersion)
-            {
-                interceptorStack.Clear();
-                List<int> keys = interceptors.order;
-                for (int i = 0; i < keys.Count; ++i)
-                {
-                    int key = keys[i];
-                    if (interceptors.handlers.TryGetValue(key, out List<object> values))
-                    {
-                        interceptorStack.Add(new KeyValuePair<int, List<object>>(key, values));
-                    }
-                }
-
-                interceptors.lastSeenVersion = interceptors.version;
-            }
+            interceptorHandlers = interceptors.handlers;
 
             if (!_innerInterceptorsStack.TryPop(out interceptorObjects))
             {
@@ -3053,39 +2999,24 @@ namespace DxMessaging.Core.MessageBus
         }
 
         private bool TryGetTargetedInterceptorCaches<TMessage>(
-            out List<KeyValuePair<int, List<object>>> interceptorStack,
+            out SortedList<int, List<object>> interceptorHandlers,
             out List<object> interceptorObjects
         )
             where TMessage : ITargetedMessage
         {
             if (
                 !_targetedInterceptsByType.TryGetValue<TMessage>(
-                    out HandlerCache<int, List<object>> interceptors
+                    out InterceptorCache<object> interceptors
                 )
                 || interceptors.handlers.Count == 0
             )
             {
-                interceptorStack = default;
+                interceptorHandlers = default;
                 interceptorObjects = default;
                 return false;
             }
 
-            interceptorStack = interceptors.cache;
-            if (interceptors.version != interceptors.lastSeenVersion)
-            {
-                interceptorStack.Clear();
-                List<int> keys = interceptors.order;
-                for (int i = 0; i < keys.Count; ++i)
-                {
-                    int key = keys[i];
-                    if (interceptors.handlers.TryGetValue(key, out List<object> values))
-                    {
-                        interceptorStack.Add(new KeyValuePair<int, List<object>>(key, values));
-                    }
-                }
-
-                interceptors.lastSeenVersion = interceptors.version;
-            }
+            interceptorHandlers = interceptors.handlers;
 
             if (!_innerInterceptorsStack.TryPop(out interceptorObjects))
             {
@@ -3096,39 +3027,24 @@ namespace DxMessaging.Core.MessageBus
         }
 
         private bool TryGetBroadcastInterceptorCaches<TMessage>(
-            out List<KeyValuePair<int, List<object>>> interceptorStack,
+            out SortedList<int, List<object>> interceptorHandlers,
             out List<object> interceptorObjects
         )
             where TMessage : IBroadcastMessage
         {
             if (
                 !_broadcastInterceptsByType.TryGetValue<TMessage>(
-                    out HandlerCache<int, List<object>> interceptors
+                    out InterceptorCache<object> interceptors
                 )
                 || interceptors.handlers.Count == 0
             )
             {
-                interceptorStack = default;
+                interceptorHandlers = default;
                 interceptorObjects = default;
                 return false;
             }
 
-            interceptorStack = interceptors.cache;
-            if (interceptors.version != interceptors.lastSeenVersion)
-            {
-                interceptorStack.Clear();
-                List<int> keys = interceptors.order;
-                for (int i = 0; i < keys.Count; ++i)
-                {
-                    int key = keys[i];
-                    if (interceptors.handlers.TryGetValue(key, out List<object> values))
-                    {
-                        interceptorStack.Add(new KeyValuePair<int, List<object>>(key, values));
-                    }
-                }
-
-                interceptors.lastSeenVersion = interceptors.version;
-            }
+            interceptorHandlers = interceptors.handlers;
 
             if (!_innerInterceptorsStack.TryPop(out interceptorObjects))
             {
@@ -3143,7 +3059,7 @@ namespace DxMessaging.Core.MessageBus
         {
             if (
                 !TryGetUntargetedInterceptorCaches<T>(
-                    out List<KeyValuePair<int, List<object>>> interceptorStack,
+                    out SortedList<int, List<object>> interceptorHandlers,
                     out List<object> interceptorObjects
                 )
             )
@@ -3153,11 +3069,11 @@ namespace DxMessaging.Core.MessageBus
 
             try
             {
-                for (int s = 0; s < interceptorStack.Count; ++s)
+                IList<List<object>> prioritizedInterceptors = interceptorHandlers.Values;
+                for (int s = 0; s < prioritizedInterceptors.Count; ++s)
                 {
-                    KeyValuePair<int, List<object>> entry = interceptorStack[s];
                     interceptorObjects.Clear();
-                    List<object> interceptors = entry.Value;
+                    List<object> interceptors = prioritizedInterceptors[s];
                     interceptorObjects.AddRange(interceptors);
 
                     for (int i = 0; i < interceptorObjects.Count; ++i)
@@ -3185,7 +3101,7 @@ namespace DxMessaging.Core.MessageBus
         {
             if (
                 !TryGetTargetedInterceptorCaches<T>(
-                    out List<KeyValuePair<int, List<object>>> interceptorStack,
+                    out SortedList<int, List<object>> interceptorHandlers,
                     out List<object> interceptorObjects
                 )
             )
@@ -3195,11 +3111,11 @@ namespace DxMessaging.Core.MessageBus
 
             try
             {
-                for (int s = 0; s < interceptorStack.Count; ++s)
+                IList<List<object>> prioritizedInterceptors = interceptorHandlers.Values;
+                for (int s = 0; s < prioritizedInterceptors.Count; ++s)
                 {
-                    KeyValuePair<int, List<object>> entry = interceptorStack[s];
                     interceptorObjects.Clear();
-                    List<object> interceptors = entry.Value;
+                    List<object> interceptors = prioritizedInterceptors[s];
                     interceptorObjects.AddRange(interceptors);
 
                     for (int i = 0; i < interceptorObjects.Count; ++i)
@@ -3227,7 +3143,7 @@ namespace DxMessaging.Core.MessageBus
         {
             if (
                 !TryGetBroadcastInterceptorCaches<T>(
-                    out List<KeyValuePair<int, List<object>>> interceptorStack,
+                    out SortedList<int, List<object>> interceptorHandlers,
                     out List<object> interceptorObjects
                 )
             )
@@ -3237,11 +3153,11 @@ namespace DxMessaging.Core.MessageBus
 
             try
             {
-                for (int s = 0; s < interceptorStack.Count; ++s)
+                IList<List<object>> prioritizedInterceptors = interceptorHandlers.Values;
+                for (int s = 0; s < prioritizedInterceptors.Count; ++s)
                 {
-                    KeyValuePair<int, List<object>> entry = interceptorStack[s];
                     interceptorObjects.Clear();
-                    List<object> interceptors = entry.Value;
+                    List<object> interceptors = prioritizedInterceptors[s];
                     interceptorObjects.AddRange(interceptors);
 
                     for (int i = 0; i < interceptorObjects.Count; ++i)

package/Tests/Runtime/Core/Extensions/MessageBusExtensionsTests.cs

@@ -33,9 +33,7 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             MessageHandler handler = new MessageHandler(new InstanceId(10), bus) { active = true };
             MessageRegistrationToken token = MessageRegistrationToken.Create(handler, bus);
             int count = 0;
-            _ = token.RegisterUntargeted<ClassUntargetedMessage>(
-                (ref ClassUntargetedMessage _) => count++
-            );
+            _ = token.RegisterUntargeted((ref ClassUntargetedMessage _) => count++);
             token.Enable();
 
             ClassUntargetedMessage message = new ClassUntargetedMessage();
@@ -52,9 +50,7 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             MessageHandler handler = new MessageHandler(new InstanceId(20), bus) { active = true };
             MessageRegistrationToken token = MessageRegistrationToken.Create(handler, bus);
             int count = 0;
-            _ = token.RegisterUntargeted<StructUntargetedMessage>(
-                (ref StructUntargetedMessage _) => count++
-            );
+            _ = token.RegisterUntargeted((ref StructUntargetedMessage _) => count++);
             token.Enable();
 
             StructUntargetedMessage message = new StructUntargetedMessage(1);
@@ -73,7 +69,7 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             StructInterceptedMessage intercepted = default;
             int postProcessCount = 0;
 
-            _ = bus.RegisterUntargetedInterceptor<StructInterceptedMessage>(
+            _ = bus.RegisterUntargetedInterceptor(
                 (ref StructInterceptedMessage msg) =>
                 {
                     msg.Value += 10;
@@ -81,11 +77,9 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
                 }
             );
 
-            _ = token.RegisterUntargeted<StructInterceptedMessage>(
-                (ref StructInterceptedMessage msg) => intercepted = msg
-            );
+            _ = token.RegisterUntargeted((ref StructInterceptedMessage msg) => intercepted = msg);
 
-            _ = token.RegisterUntargetedPostProcessor<StructInterceptedMessage>(
+            _ = token.RegisterUntargetedPostProcessor(
                 (ref StructInterceptedMessage _) => postProcessCount++
             );
 
@@ -108,9 +102,7 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             MessageRegistrationToken token = MessageRegistrationToken.Create(handler, bus);
             int busSum = 0;
 
-            _ = token.RegisterUntargeted<StructUntargetedMessage>(
-                (ref StructUntargetedMessage msg) => busSum += msg.Value
-            );
+            _ = token.RegisterUntargeted((ref StructUntargetedMessage msg) => busSum += msg.Value);
 
             token.Enable();
 
@@ -132,7 +124,7 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             MessageRegistrationToken token2 = MessageRegistrationToken.Create(handler2, bus);
             int messageSum = 0;
 
-            _ = token2.RegisterUntargeted<StructUntargetedMessage>(
+            _ = token2.RegisterUntargeted(
                 (ref StructUntargetedMessage msg) => messageSum += msg.Value
             );
 
@@ -158,10 +150,7 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             MessageHandler handler = new MessageHandler(new InstanceId(30), bus) { active = true };
             MessageRegistrationToken token = MessageRegistrationToken.Create(handler, bus);
             int count = 0;
-            _ = token.RegisterTargeted<StructTargetedMessage>(
-                target,
-                (ref StructTargetedMessage _) => count++
-            );
+            _ = token.RegisterTargeted(target, (ref StructTargetedMessage _) => count++);
             token.Enable();
 
             StructTargetedMessage message = new StructTargetedMessage(5);
@@ -180,10 +169,7 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             MessageHandler handler = new MessageHandler(new InstanceId(40), bus) { active = true };
             MessageRegistrationToken token = MessageRegistrationToken.Create(handler, bus);
             int count = 0;
-            _ = token.RegisterBroadcast<StructBroadcastMessage>(
-                source,
-                (ref StructBroadcastMessage _) => count++
-            );
+            _ = token.RegisterBroadcast(source, (ref StructBroadcastMessage _) => count++);
             token.Enable();
 
             StructBroadcastMessage message = new StructBroadcastMessage(7);
@@ -206,19 +192,14 @@ namespace DxMessaging.Tests.Runtime.Core.Extensions
             string broadcast = null;
             string untargeted = null;
 
-            _ = token.RegisterTargeted<StringMessage>(
-                target,
-                (ref StringMessage m) => targeted = m.message
-            );
+            _ = token.RegisterTargeted(target, (ref StringMessage m) => targeted = m.message);
 
-            _ = token.RegisterBroadcast<SourcedStringMessage>(
+            _ = token.RegisterBroadcast(
                 source,
                 (ref SourcedStringMessage m) => broadcast = m.message
             );
 
-            _ = token.RegisterUntargeted<GlobalStringMessage>(
-                (ref GlobalStringMessage m) => untargeted = m.message
-            );
+            _ = token.RegisterUntargeted((ref GlobalStringMessage m) => untargeted = m.message);
 
             token.Enable();