From 09f751a4f7d482146520fabc346eaaf0f85607cc Mon Sep 17 00:00:00 2001 From: GeWuYou <95328647+GeWuYou@users.noreply.github.com> Date: Thu, 16 Apr 2026 20:36:15 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20CQRS=20=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E6=A8=A1=E5=BC=8F=E5=92=8C=E6=B8=B8=E6=88=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=B3=BB=E7=BB=9F=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 CQRS 核心概念、命令查询处理器实现指南 - 添加 CQRS 高级用法包括通知发布、管道行为和流式处理 - 提供 CQRS 最佳实践和常见问题解决方案 - 添加游戏配置系统完整接入模板和运行时读取示例 - 包含 YAML 配置文件和 JSON Schema 结构定义说明 - 提供 Godot 引擎配置桥接和热重载功能使用指南 - 添加架构模块集成和生成查询辅助功能文档 --- CLAUDE.md | 5 +- .../Architectures/IArchitecture.cs | 15 -- .../Ioc/IIocContainer.cs | 15 +- .../AutoRegisterModuleAttribute.cs | 0 .../Architectures/RegisterModelAttribute.cs | 0 .../Architectures/RegisterSystemAttribute.cs | 0 .../Architectures/RegisterUtilityAttribute.cs | 0 .../Bases/PriorityAttribute.cs | 2 +- .../Directory.Build.props | 0 .../Enums/GenerateEnumExtensionsAttribute.cs | 2 +- ....Core.SourceGenerators.Abstractions.csproj | 0 .../GlobalUsings.cs | 2 +- .../Logging/LogAttribute.cs | 2 +- .../Rule/ContextAwareAttribute.cs | 2 +- .../Rule/GetAllAttribute.cs | 2 +- .../Rule/GetModelAttribute.cs | 2 +- .../Rule/GetModelsAttribute.cs | 2 +- .../Rule/GetServiceAttribute.cs | 2 +- .../Rule/GetServicesAttribute.cs | 2 +- .../Rule/GetSystemAttribute.cs | 2 +- .../Rule/GetSystemsAttribute.cs | 2 +- .../Rule/GetUtilitiesAttribute.cs | 2 +- .../Rule/GetUtilityAttribute.cs | 2 +- .../AnalyzerReleases.Shipped.md | 0 .../AnalyzerReleases.Unshipped.md | 10 -- .../Analyzers/ContextRegistrationAnalyzer.cs | 78 ++++++---- .../Analyzers/PriorityUsageAnalyzer.cs | 4 +- .../AutoRegisterModuleGenerator.cs | 0 .../Bases/PriorityGenerator.cs | 6 +- .../AutoRegisterModuleDiagnostics.cs | 0 .../Diagnostics/ContextAwareDiagnostic.cs | 6 +- .../Diagnostics/ContextGetDiagnostics.cs | 2 +- .../ContextRegistrationDiagnostics.cs | 0 .../Diagnostics/LoggerDiagnostic.cs | 6 +- .../Diagnostics/PriorityDiagnostic.cs | 4 +- .../Enums/EnumExtensionsGenerator.cs | 7 +- .../GFramework.Core.SourceGenerators.csproj | 4 +- ...u.GFramework.Core.SourceGenerators.targets | 15 ++ .../GlobalUsings.cs | 2 +- .../Logging/LoggerGenerator.cs | 7 +- .../README.md | 0 .../Rule/ContextAwareGenerator.cs | 8 +- .../Rule/ContextGetGenerator.cs | 3 +- .../ArchitectureModulesBehaviorTests.cs | 22 --- .../RegistryInitializationHookBaseTests.cs | 12 -- .../MediatorCompatibilityDeprecationTests.cs | 99 ------------- .../GFramework.Core.Tests.csproj | 8 +- GFramework.Core/Architectures/Architecture.cs | 16 --- .../Architectures/ArchitectureModules.cs | 15 -- .../Extensions/MediatorCoroutineExtensions.cs | 47 ------ .../ContextAwareMediatorCommandExtensions.cs | 49 ------- .../ContextAwareMediatorExtensions.cs | 123 ---------------- .../ContextAwareMediatorQueryExtensions.cs | 48 ------- GFramework.Core/Ioc/MicrosoftDiContainer.cs | 15 -- .../Cqrs/CqrsHandlerRegistryGenerator.cs | 135 ++++++++++++++++-- .../GFramework.Cqrs.SourceGenerators.csproj | 49 +++++++ .../GlobalUsings.cs | 13 ++ .../AnalyzerReleases.Shipped.md | 2 + .../AnalyzerReleases.Unshipped.md | 17 +++ .../Config/SchemaConfigGenerator.cs | 6 +- .../Diagnostics/ConfigSchemaDiagnostics.cs | 0 .../GFramework.Game.SourceGenerators.csproj | 55 +++++++ ...u.GFramework.Game.SourceGenerators.targets | 19 +-- .../GlobalUsings.cs | 14 ++ .../GFramework.Game.Tests.csproj | 11 +- .../Cqrs/CqrsHandlerRegistryGeneratorTests.cs | 20 ++- .../GFramework.SourceGenerators.Tests.csproj | 4 +- GFramework.csproj | 26 +++- GFramework.sln | 84 +++++++---- docs/zh-CN/core/cqrs.md | 5 +- docs/zh-CN/game/config-system.md | 17 ++- 71 files changed, 485 insertions(+), 671 deletions(-) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Architectures/AutoRegisterModuleAttribute.cs (100%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Architectures/RegisterModelAttribute.cs (100%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Architectures/RegisterSystemAttribute.cs (100%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Architectures/RegisterUtilityAttribute.cs (100%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Bases/PriorityAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Directory.Build.props (100%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Enums/GenerateEnumExtensionsAttribute.cs (99%) rename GFramework.SourceGenerators.Abstractions/GFramework.SourceGenerators.Abstractions.csproj => GFramework.Core.SourceGenerators.Abstractions/GFramework.Core.SourceGenerators.Abstractions.csproj (100%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/GlobalUsings.cs (95%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Logging/LogAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/ContextAwareAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetAllAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetModelAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetModelsAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetServiceAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetServicesAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetSystemAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetSystemsAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetUtilitiesAttribute.cs (99%) rename {GFramework.SourceGenerators.Abstractions => GFramework.Core.SourceGenerators.Abstractions}/Rule/GetUtilityAttribute.cs (99%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/AnalyzerReleases.Shipped.md (100%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/AnalyzerReleases.Unshipped.md (73%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Analyzers/ContextRegistrationAnalyzer.cs (94%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Analyzers/PriorityUsageAnalyzer.cs (98%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Architectures/AutoRegisterModuleGenerator.cs (100%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Bases/PriorityGenerator.cs (97%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Diagnostics/AutoRegisterModuleDiagnostics.cs (100%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Diagnostics/ContextAwareDiagnostic.cs (86%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Diagnostics/ContextGetDiagnostics.cs (99%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Diagnostics/ContextRegistrationDiagnostics.cs (100%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Diagnostics/LoggerDiagnostic.cs (87%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Diagnostics/PriorityDiagnostic.cs (99%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Enums/EnumExtensionsGenerator.cs (96%) rename GFramework.SourceGenerators/GFramework.SourceGenerators.csproj => GFramework.Core.SourceGenerators/GFramework.Core.SourceGenerators.csproj (92%) create mode 100644 GFramework.Core.SourceGenerators/GeWuYou.GFramework.Core.SourceGenerators.targets rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/GlobalUsings.cs (97%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Logging/LoggerGenerator.cs (95%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/README.md (100%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Rule/ContextAwareGenerator.cs (97%) rename {GFramework.SourceGenerators => GFramework.Core.SourceGenerators}/Rule/ContextGetGenerator.cs (99%) delete mode 100644 GFramework.Core.Tests/Cqrs/MediatorCompatibilityDeprecationTests.cs delete mode 100644 GFramework.Core/Coroutine/Extensions/MediatorCoroutineExtensions.cs delete mode 100644 GFramework.Core/Extensions/ContextAwareMediatorCommandExtensions.cs delete mode 100644 GFramework.Core/Extensions/ContextAwareMediatorExtensions.cs delete mode 100644 GFramework.Core/Extensions/ContextAwareMediatorQueryExtensions.cs rename {GFramework.SourceGenerators => GFramework.Cqrs.SourceGenerators}/Cqrs/CqrsHandlerRegistryGenerator.cs (91%) create mode 100644 GFramework.Cqrs.SourceGenerators/GFramework.Cqrs.SourceGenerators.csproj create mode 100644 GFramework.Cqrs.SourceGenerators/GlobalUsings.cs create mode 100644 GFramework.Game.SourceGenerators/AnalyzerReleases.Shipped.md create mode 100644 GFramework.Game.SourceGenerators/AnalyzerReleases.Unshipped.md rename {GFramework.SourceGenerators => GFramework.Game.SourceGenerators}/Config/SchemaConfigGenerator.cs (99%) rename {GFramework.SourceGenerators => GFramework.Game.SourceGenerators}/Diagnostics/ConfigSchemaDiagnostics.cs (100%) create mode 100644 GFramework.Game.SourceGenerators/GFramework.Game.SourceGenerators.csproj rename GFramework.SourceGenerators/GeWuYou.GFramework.SourceGenerators.targets => GFramework.Game.SourceGenerators/GeWuYou.GFramework.Game.SourceGenerators.targets (57%) create mode 100644 GFramework.Game.SourceGenerators/GlobalUsings.cs diff --git a/CLAUDE.md b/CLAUDE.md index da7e13c6..b847b5cd 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -73,9 +73,8 @@ Architecture 负责统一生命周期编排，核心阶段包括： ### CQRS -命令与查询分离，支持同步与异步执行。当前版本内建自有 CQRS runtime、行为管道和 handler 自动注册；公开 API 里仍保留少量历史 -`Mediator` 命名以兼容旧调用点，但这些别名已进入正式弃用周期：新代码应使用 `Cqrs` 命名入口，旧别名会继续兼容一段时间并计划在未来 -major 版本中移除。 +命令与查询分离，支持同步与异步执行。当前版本内建自有 CQRS runtime、行为管道和 handler 自动注册；历史 `Mediator` +兼容别名已从公开 API 移除，统一使用 `Cqrs` 命名入口。 ### EventBus diff --git a/GFramework.Core.Abstractions/Architectures/IArchitecture.cs b/GFramework.Core.Abstractions/Architectures/IArchitecture.cs index e1687ff9..bbdbf25b 100644 --- a/GFramework.Core.Abstractions/Architectures/IArchitecture.cs +++ b/GFramework.Core.Abstractions/Architectures/IArchitecture.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using System.Reflection; using GFramework.Core.Abstractions.Lifecycle; using GFramework.Core.Abstractions.Model; @@ -82,20 +81,6 @@ public interface IArchitecture : IAsyncInitializable, IAsyncDestroyable, IInitia void RegisterCqrsPipelineBehavior() where TBehavior : class; - /// - /// 注册 CQRS 请求管道行为。 - /// 该成员保留旧名称以兼容历史调用点，内部行为与 一致。 - /// 新代码不应继续依赖该别名；兼容层计划在未来的 major 版本中移除。 - /// 既支持实现 IPipelineBehavior<,> 的开放泛型行为类型， - /// 也支持绑定到单一请求/响应对的封闭行为类型。 - /// - /// 行为类型，必须是引用类型 - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete( - "Use RegisterCqrsPipelineBehavior() instead. This compatibility alias will be removed in a future major version.")] - void RegisterMediatorBehavior() - where TBehavior : class; - /// /// 从指定程序集显式注册 CQRS 处理器。 /// 当处理器位于默认架构程序集之外的模块或扩展程序集中时，可在初始化阶段调用该入口接入对应程序集。 diff --git a/GFramework.Core.Abstractions/Ioc/IIocContainer.cs b/GFramework.Core.Abstractions/Ioc/IIocContainer.cs index 3149b3c4..26e80968 100644 --- a/GFramework.Core.Abstractions/Ioc/IIocContainer.cs +++ b/GFramework.Core.Abstractions/Ioc/IIocContainer.cs @@ -1,5 +1,4 @@ -using System.ComponentModel; -using System.Reflection; +using System.Reflection; using GFramework.Core.Abstractions.Rule; using GFramework.Core.Abstractions.Systems; @@ -97,18 +96,6 @@ public interface IIocContainer : IContextAware void RegisterCqrsPipelineBehavior() where TBehavior : class; - /// - /// 注册 CQRS 请求管道行为。 - /// 该成员保留旧名称以兼容历史调用点，内部行为与 一致。 - /// 新代码不应继续依赖该别名；兼容层计划在未来的 major 版本中移除。 - /// - /// 行为类型，必须是引用类型 - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete( - "Use RegisterCqrsPipelineBehavior() instead. This compatibility alias will be removed in a future major version.")] - void RegisterMediatorBehavior() - where TBehavior : class; - /// /// 从指定程序集显式注册 CQRS 处理器。 /// 该入口适用于处理器不位于默认架构程序集中的场景，例如扩展包、模块程序集或拆分后的业务程序集。 diff --git a/GFramework.SourceGenerators.Abstractions/Architectures/AutoRegisterModuleAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Architectures/AutoRegisterModuleAttribute.cs similarity index 100% rename from GFramework.SourceGenerators.Abstractions/Architectures/AutoRegisterModuleAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Architectures/AutoRegisterModuleAttribute.cs diff --git a/GFramework.SourceGenerators.Abstractions/Architectures/RegisterModelAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Architectures/RegisterModelAttribute.cs similarity index 100% rename from GFramework.SourceGenerators.Abstractions/Architectures/RegisterModelAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Architectures/RegisterModelAttribute.cs diff --git a/GFramework.SourceGenerators.Abstractions/Architectures/RegisterSystemAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Architectures/RegisterSystemAttribute.cs similarity index 100% rename from GFramework.SourceGenerators.Abstractions/Architectures/RegisterSystemAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Architectures/RegisterSystemAttribute.cs diff --git a/GFramework.SourceGenerators.Abstractions/Architectures/RegisterUtilityAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Architectures/RegisterUtilityAttribute.cs similarity index 100% rename from GFramework.SourceGenerators.Abstractions/Architectures/RegisterUtilityAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Architectures/RegisterUtilityAttribute.cs diff --git a/GFramework.SourceGenerators.Abstractions/Bases/PriorityAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Bases/PriorityAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Bases/PriorityAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Bases/PriorityAttribute.cs index d406bb92..42459498 100644 --- a/GFramework.SourceGenerators.Abstractions/Bases/PriorityAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Bases/PriorityAttribute.cs @@ -32,4 +32,4 @@ public sealed class PriorityAttribute : Attribute /// 获取优先级值 /// public int Value { get; } -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Directory.Build.props b/GFramework.Core.SourceGenerators.Abstractions/Directory.Build.props similarity index 100% rename from GFramework.SourceGenerators.Abstractions/Directory.Build.props rename to GFramework.Core.SourceGenerators.Abstractions/Directory.Build.props diff --git a/GFramework.SourceGenerators.Abstractions/Enums/GenerateEnumExtensionsAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Enums/GenerateEnumExtensionsAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Enums/GenerateEnumExtensionsAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Enums/GenerateEnumExtensionsAttribute.cs index 4780fc78..c5136a88 100644 --- a/GFramework.SourceGenerators.Abstractions/Enums/GenerateEnumExtensionsAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Enums/GenerateEnumExtensionsAttribute.cs @@ -15,4 +15,4 @@ public sealed class GenerateEnumExtensionsAttribute : Attribute /// 是否生成一个 IsIn(params T[]) 方法以简化多值判断（默认 true）。 /// public bool GenerateIsInMethod { get; set; } = true; -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/GFramework.SourceGenerators.Abstractions.csproj b/GFramework.Core.SourceGenerators.Abstractions/GFramework.Core.SourceGenerators.Abstractions.csproj similarity index 100% rename from GFramework.SourceGenerators.Abstractions/GFramework.SourceGenerators.Abstractions.csproj rename to GFramework.Core.SourceGenerators.Abstractions/GFramework.Core.SourceGenerators.Abstractions.csproj diff --git a/GFramework.SourceGenerators.Abstractions/GlobalUsings.cs b/GFramework.Core.SourceGenerators.Abstractions/GlobalUsings.cs similarity index 95% rename from GFramework.SourceGenerators.Abstractions/GlobalUsings.cs rename to GFramework.Core.SourceGenerators.Abstractions/GlobalUsings.cs index 4d271811..68e12683 100644 --- a/GFramework.SourceGenerators.Abstractions/GlobalUsings.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/GlobalUsings.cs @@ -15,4 +15,4 @@ global using System; global using System.Collections.Generic; global using System.Linq; global using System.Threading; -global using System.Threading.Tasks; \ No newline at end of file +global using System.Threading.Tasks; diff --git a/GFramework.SourceGenerators.Abstractions/Logging/LogAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Logging/LogAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Logging/LogAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Logging/LogAttribute.cs index 679d3b63..0cddf94c 100644 --- a/GFramework.SourceGenerators.Abstractions/Logging/LogAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Logging/LogAttribute.cs @@ -35,4 +35,4 @@ public sealed class LogAttribute : Attribute /// 访问修饰符 public string AccessModifier { get; set; } = "private"; -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/ContextAwareAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/ContextAwareAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/ContextAwareAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/ContextAwareAttribute.cs index d1423583..7cb75238 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/ContextAwareAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/ContextAwareAttribute.cs @@ -6,4 +6,4 @@ [AttributeUsage(AttributeTargets.Class, Inherited = false)] public sealed class ContextAwareAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetAllAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetAllAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetAllAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetAllAttribute.cs index 5722ff42..cd310da6 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetAllAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetAllAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)] public sealed class GetAllAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetModelAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetModelAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetModelAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetModelAttribute.cs index 31e6a8d3..b97d395f 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetModelAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetModelAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetModelAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetModelsAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetModelsAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetModelsAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetModelsAttribute.cs index fb14d7c7..a6173a25 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetModelsAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetModelsAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetModelsAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetServiceAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetServiceAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetServiceAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetServiceAttribute.cs index 5a8563fd..46c23320 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetServiceAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetServiceAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetServiceAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetServicesAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetServicesAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetServicesAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetServicesAttribute.cs index 19cff728..5341d6a3 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetServicesAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetServicesAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetServicesAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetSystemAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetSystemAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetSystemAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetSystemAttribute.cs index c3352b2e..072cd112 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetSystemAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetSystemAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetSystemAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetSystemsAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetSystemsAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetSystemsAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetSystemsAttribute.cs index d8b1c037..da214089 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetSystemsAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetSystemsAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetSystemsAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetUtilitiesAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetUtilitiesAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetUtilitiesAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetUtilitiesAttribute.cs index 9b78d74f..afeb63ee 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetUtilitiesAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetUtilitiesAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetUtilitiesAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators.Abstractions/Rule/GetUtilityAttribute.cs b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetUtilityAttribute.cs similarity index 99% rename from GFramework.SourceGenerators.Abstractions/Rule/GetUtilityAttribute.cs rename to GFramework.Core.SourceGenerators.Abstractions/Rule/GetUtilityAttribute.cs index 5c87bc45..99059a96 100644 --- a/GFramework.SourceGenerators.Abstractions/Rule/GetUtilityAttribute.cs +++ b/GFramework.Core.SourceGenerators.Abstractions/Rule/GetUtilityAttribute.cs @@ -6,4 +6,4 @@ namespace GFramework.SourceGenerators.Abstractions.Rule; [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] public sealed class GetUtilityAttribute : Attribute { -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/AnalyzerReleases.Shipped.md b/GFramework.Core.SourceGenerators/AnalyzerReleases.Shipped.md similarity index 100% rename from GFramework.SourceGenerators/AnalyzerReleases.Shipped.md rename to GFramework.Core.SourceGenerators/AnalyzerReleases.Shipped.md diff --git a/GFramework.SourceGenerators/AnalyzerReleases.Unshipped.md b/GFramework.Core.SourceGenerators/AnalyzerReleases.Unshipped.md similarity index 73% rename from GFramework.SourceGenerators/AnalyzerReleases.Unshipped.md rename to GFramework.Core.SourceGenerators/AnalyzerReleases.Unshipped.md index 752f563a..9e0a6cb0 100644 --- a/GFramework.SourceGenerators/AnalyzerReleases.Unshipped.md +++ b/GFramework.Core.SourceGenerators/AnalyzerReleases.Unshipped.md @@ -18,16 +18,6 @@ GF_ContextRegistration_001 | GFramework.SourceGenerators.rule | Warning | ContextRegistrationDiagnostics GF_ContextRegistration_002 | GFramework.SourceGenerators.rule | Warning | ContextRegistrationDiagnostics GF_ContextRegistration_003 | GFramework.SourceGenerators.rule | Warning | ContextRegistrationDiagnostics - GF_ConfigSchema_001 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_002 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_003 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_004 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_005 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_006 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_007 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_008 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_009 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics - GF_ConfigSchema_010 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics GF_AutoModule_001 | GFramework.SourceGenerators.Architecture | Error | AutoRegisterModuleDiagnostics GF_AutoModule_002 | GFramework.SourceGenerators.Architecture | Error | AutoRegisterModuleDiagnostics GF_AutoModule_003 | GFramework.SourceGenerators.Architecture | Error | AutoRegisterModuleDiagnostics diff --git a/GFramework.SourceGenerators/Analyzers/ContextRegistrationAnalyzer.cs b/GFramework.Core.SourceGenerators/Analyzers/ContextRegistrationAnalyzer.cs similarity index 94% rename from GFramework.SourceGenerators/Analyzers/ContextRegistrationAnalyzer.cs rename to GFramework.Core.SourceGenerators/Analyzers/ContextRegistrationAnalyzer.cs index ffbc0aae..dcd25ca8 100644 --- a/GFramework.SourceGenerators/Analyzers/ContextRegistrationAnalyzer.cs +++ b/GFramework.Core.SourceGenerators/Analyzers/ContextRegistrationAnalyzer.cs @@ -1,4 +1,3 @@ -using System.Collections.Immutable; using GFramework.SourceGenerators.Common.Constants; using GFramework.SourceGenerators.Diagnostics; using Microsoft.CodeAnalysis.Diagnostics; @@ -12,6 +11,17 @@ namespace GFramework.SourceGenerators.Analyzers; [DiagnosticAnalyzer(LanguageNames.CSharp)] public sealed class ContextRegistrationAnalyzer : DiagnosticAnalyzer { + private static readonly IReadOnlyDictionary _contextAwareBindingNames = + new Dictionary(StringComparer.Ordinal) + { + ["GetModel"] = ComponentKind.Model, + ["GetModels"] = ComponentKind.Model, + ["GetSystem"] = ComponentKind.System, + ["GetSystems"] = ComponentKind.System, + ["GetUtility"] = ComponentKind.Utility, + ["GetUtilities"] = ComponentKind.Utility + }; + /// /// 当前分析器支持的诊断规则。 /// @@ -58,10 +68,12 @@ public sealed class ContextRegistrationAnalyzer : DiagnosticAnalyzer if (context.Node is not VariableDeclaratorSyntax variableDeclarator) return; - if (context.SemanticModel.GetDeclaredSymbol(variableDeclarator, context.CancellationToken) is not IFieldSymbol fieldSymbol) + if (context.SemanticModel.GetDeclaredSymbol(variableDeclarator, context.CancellationToken) is not IFieldSymbol + fieldSymbol) return; - if (!TryCreateBindingRequest(fieldSymbol, variableDeclarator.Identifier.GetLocation(), symbols, out var request)) + if (!TryCreateBindingRequest(fieldSymbol, variableDeclarator.Identifier.GetLocation(), symbols, + out var request)) return; ReportMissingRegistration(context, registrationIndex, request); @@ -272,17 +284,6 @@ public sealed class ContextRegistrationAnalyzer : DiagnosticAnalyzer return namedType.TypeArguments[0] as INamedTypeSymbol; } - private static readonly IReadOnlyDictionary _contextAwareBindingNames = - new Dictionary(StringComparer.Ordinal) - { - ["GetModel"] = ComponentKind.Model, - ["GetModels"] = ComponentKind.Model, - ["GetSystem"] = ComponentKind.System, - ["GetSystems"] = ComponentKind.System, - ["GetUtility"] = ComponentKind.Utility, - ["GetUtilities"] = ComponentKind.Utility - }; - private enum ComponentKind { Model, @@ -368,22 +369,35 @@ public sealed class ContextRegistrationAnalyzer : DiagnosticAnalyzer { return new SymbolCache( compilation.GetTypeByMetadataName($"{PathContests.CoreNamespace}.Architectures.Architecture"), - compilation.GetTypeByMetadataName($"{PathContests.CoreAbstractionsNamespace}.Architectures.IArchitecture"), - compilation.GetTypeByMetadataName($"{PathContests.CoreAbstractionsNamespace}.Architectures.IArchitectureModule"), - compilation.GetTypeByMetadataName($"{PathContests.CoreAbstractionsNamespace}.Architectures.IArchitectureContext"), + compilation.GetTypeByMetadataName( + $"{PathContests.CoreAbstractionsNamespace}.Architectures.IArchitecture"), + compilation.GetTypeByMetadataName( + $"{PathContests.CoreAbstractionsNamespace}.Architectures.IArchitectureModule"), + compilation.GetTypeByMetadataName( + $"{PathContests.CoreAbstractionsNamespace}.Architectures.IArchitectureContext"), compilation.GetTypeByMetadataName("System.Collections.Generic.IReadOnlyList`1"), - compilation.GetTypeByMetadataName($"{PathContests.CoreNamespace}.Extensions.ContextAwareServiceExtensions"), - compilation.GetTypeByMetadataName($"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetModelAttribute"), - compilation.GetTypeByMetadataName($"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetModelsAttribute"), - compilation.GetTypeByMetadataName($"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetSystemAttribute"), - compilation.GetTypeByMetadataName($"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetSystemsAttribute"), - compilation.GetTypeByMetadataName($"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetUtilityAttribute"), - compilation.GetTypeByMetadataName($"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetUtilitiesAttribute")); + compilation.GetTypeByMetadataName( + $"{PathContests.CoreNamespace}.Extensions.ContextAwareServiceExtensions"), + compilation.GetTypeByMetadataName( + $"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetModelAttribute"), + compilation.GetTypeByMetadataName( + $"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetModelsAttribute"), + compilation.GetTypeByMetadataName( + $"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetSystemAttribute"), + compilation.GetTypeByMetadataName( + $"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetSystemsAttribute"), + compilation.GetTypeByMetadataName( + $"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetUtilityAttribute"), + compilation.GetTypeByMetadataName( + $"{PathContests.SourceGeneratorsAbstractionsPath}.Rule.GetUtilitiesAttribute")); } } private sealed class RegistrationIndex { + private readonly Compilation _compilation; + private readonly IReadOnlyDictionary _registrations; + private RegistrationIndex( Compilation compilation, IReadOnlyDictionary registrations) @@ -392,14 +406,12 @@ public sealed class ContextRegistrationAnalyzer : DiagnosticAnalyzer _registrations = registrations; } - private readonly Compilation _compilation; - private readonly IReadOnlyDictionary _registrations; - public static RegistrationIndex Build( Compilation compilation, SymbolCache symbols) { - var registrations = new Dictionary(SymbolEqualityComparer.Default); + var registrations = + new Dictionary(SymbolEqualityComparer.Default); foreach (var type in SymbolHelpers.EnumerateNamedTypes(compilation.Assembly.GlobalNamespace)) { @@ -690,7 +702,8 @@ public sealed class ContextRegistrationAnalyzer : DiagnosticAnalyzer return helperMethod.DeclaringSyntaxReferences.Length > 0; } - helperMethod = SymbolHelpers.ResolveHierarchyMethodImplementation(targetMethod, concreteType) ?? targetMethod; + helperMethod = SymbolHelpers.ResolveHierarchyMethodImplementation(targetMethod, concreteType) ?? + targetMethod; return helperMethod.DeclaringSyntaxReferences.Length > 0; } } @@ -813,9 +826,12 @@ public sealed class ContextRegistrationAnalyzer : DiagnosticAnalyzer if (SymbolEqualityComparer.Default.Equals(candidate.OriginalDefinition, method.OriginalDefinition)) return candidate; - for (var overridden = candidate.OverriddenMethod; overridden != null; overridden = overridden.OverriddenMethod) + for (var overridden = candidate.OverriddenMethod; + overridden != null; + overridden = overridden.OverriddenMethod) { - if (SymbolEqualityComparer.Default.Equals(overridden.OriginalDefinition, method.OriginalDefinition)) + if (SymbolEqualityComparer.Default.Equals(overridden.OriginalDefinition, + method.OriginalDefinition)) return candidate; } } diff --git a/GFramework.SourceGenerators/Analyzers/PriorityUsageAnalyzer.cs b/GFramework.Core.SourceGenerators/Analyzers/PriorityUsageAnalyzer.cs similarity index 98% rename from GFramework.SourceGenerators/Analyzers/PriorityUsageAnalyzer.cs rename to GFramework.Core.SourceGenerators/Analyzers/PriorityUsageAnalyzer.cs index 6fc3a961..b58871a1 100644 --- a/GFramework.SourceGenerators/Analyzers/PriorityUsageAnalyzer.cs +++ b/GFramework.Core.SourceGenerators/Analyzers/PriorityUsageAnalyzer.cs @@ -1,6 +1,4 @@ -using System.Collections.Immutable; using GFramework.SourceGenerators.Diagnostics; -using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Operations; @@ -111,4 +109,4 @@ public sealed class PriorityUsageAnalyzer : DiagnosticAnalyzer { return type.AllInterfaces.Any(i => SymbolEqualityComparer.Default.Equals(i, interfaceType)); } -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/Architectures/AutoRegisterModuleGenerator.cs b/GFramework.Core.SourceGenerators/Architectures/AutoRegisterModuleGenerator.cs similarity index 100% rename from GFramework.SourceGenerators/Architectures/AutoRegisterModuleGenerator.cs rename to GFramework.Core.SourceGenerators/Architectures/AutoRegisterModuleGenerator.cs diff --git a/GFramework.SourceGenerators/Bases/PriorityGenerator.cs b/GFramework.Core.SourceGenerators/Bases/PriorityGenerator.cs similarity index 97% rename from GFramework.SourceGenerators/Bases/PriorityGenerator.cs rename to GFramework.Core.SourceGenerators/Bases/PriorityGenerator.cs index 62985003..b0331900 100644 --- a/GFramework.SourceGenerators/Bases/PriorityGenerator.cs +++ b/GFramework.Core.SourceGenerators/Bases/PriorityGenerator.cs @@ -1,10 +1,6 @@ -using System.Text; using GFramework.SourceGenerators.Common.Constants; using GFramework.SourceGenerators.Common.Generator; using GFramework.SourceGenerators.Diagnostics; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace GFramework.SourceGenerators.Bases; @@ -150,4 +146,4 @@ public sealed class PriorityGenerator : MetadataAttributeClassGeneratorBase return $"{metadataName}.Priority.g.cs"; } -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/Diagnostics/AutoRegisterModuleDiagnostics.cs b/GFramework.Core.SourceGenerators/Diagnostics/AutoRegisterModuleDiagnostics.cs similarity index 100% rename from GFramework.SourceGenerators/Diagnostics/AutoRegisterModuleDiagnostics.cs rename to GFramework.Core.SourceGenerators/Diagnostics/AutoRegisterModuleDiagnostics.cs diff --git a/GFramework.SourceGenerators/Diagnostics/ContextAwareDiagnostic.cs b/GFramework.Core.SourceGenerators/Diagnostics/ContextAwareDiagnostic.cs similarity index 86% rename from GFramework.SourceGenerators/Diagnostics/ContextAwareDiagnostic.cs rename to GFramework.Core.SourceGenerators/Diagnostics/ContextAwareDiagnostic.cs index 94dbd837..70b06fc8 100644 --- a/GFramework.SourceGenerators/Diagnostics/ContextAwareDiagnostic.cs +++ b/GFramework.Core.SourceGenerators/Diagnostics/ContextAwareDiagnostic.cs @@ -1,6 +1,4 @@ -using Microsoft.CodeAnalysis; - -namespace GFramework.SourceGenerators.Diagnostics; +namespace GFramework.SourceGenerators.Diagnostics; /// /// 提供与上下文感知相关的诊断规则定义 @@ -18,4 +16,4 @@ public static class ContextAwareDiagnostic DiagnosticSeverity.Error, true ); -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/Diagnostics/ContextGetDiagnostics.cs b/GFramework.Core.SourceGenerators/Diagnostics/ContextGetDiagnostics.cs similarity index 99% rename from GFramework.SourceGenerators/Diagnostics/ContextGetDiagnostics.cs rename to GFramework.Core.SourceGenerators/Diagnostics/ContextGetDiagnostics.cs index 1f18ac60..dd9534d4 100644 --- a/GFramework.SourceGenerators/Diagnostics/ContextGetDiagnostics.cs +++ b/GFramework.Core.SourceGenerators/Diagnostics/ContextGetDiagnostics.cs @@ -96,4 +96,4 @@ public static class ContextGetDiagnostics SourceGeneratorsRuleCategory, DiagnosticSeverity.Error, true); -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/Diagnostics/ContextRegistrationDiagnostics.cs b/GFramework.Core.SourceGenerators/Diagnostics/ContextRegistrationDiagnostics.cs similarity index 100% rename from GFramework.SourceGenerators/Diagnostics/ContextRegistrationDiagnostics.cs rename to GFramework.Core.SourceGenerators/Diagnostics/ContextRegistrationDiagnostics.cs diff --git a/GFramework.SourceGenerators/Diagnostics/LoggerDiagnostic.cs b/GFramework.Core.SourceGenerators/Diagnostics/LoggerDiagnostic.cs similarity index 87% rename from GFramework.SourceGenerators/Diagnostics/LoggerDiagnostic.cs rename to GFramework.Core.SourceGenerators/Diagnostics/LoggerDiagnostic.cs index 26d5a78b..0ff2bf90 100644 --- a/GFramework.SourceGenerators/Diagnostics/LoggerDiagnostic.cs +++ b/GFramework.Core.SourceGenerators/Diagnostics/LoggerDiagnostic.cs @@ -1,6 +1,4 @@ -using Microsoft.CodeAnalysis; - -namespace GFramework.SourceGenerators.Diagnostics; +namespace GFramework.SourceGenerators.Diagnostics; /// /// 提供诊断描述符的静态类，用于GFramework日志生成器的编译时检查 @@ -18,4 +16,4 @@ internal static class LoggerDiagnostics "GFramework.Godot.Logging", DiagnosticSeverity.Warning, true); -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/Diagnostics/PriorityDiagnostic.cs b/GFramework.Core.SourceGenerators/Diagnostics/PriorityDiagnostic.cs similarity index 99% rename from GFramework.SourceGenerators/Diagnostics/PriorityDiagnostic.cs rename to GFramework.Core.SourceGenerators/Diagnostics/PriorityDiagnostic.cs index df7d7813..86030071 100644 --- a/GFramework.SourceGenerators/Diagnostics/PriorityDiagnostic.cs +++ b/GFramework.Core.SourceGenerators/Diagnostics/PriorityDiagnostic.cs @@ -1,5 +1,3 @@ -using Microsoft.CodeAnalysis; - namespace GFramework.SourceGenerators.Diagnostics; /// @@ -86,4 +84,4 @@ internal static class PriorityDiagnostic isEnabledByDefault: true, description: "当获取实现了 IPrioritized 接口的服务时，应使用 GetAllByPriority 方法以确保按优先级排序." ); -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/Enums/EnumExtensionsGenerator.cs b/GFramework.Core.SourceGenerators/Enums/EnumExtensionsGenerator.cs similarity index 96% rename from GFramework.SourceGenerators/Enums/EnumExtensionsGenerator.cs rename to GFramework.Core.SourceGenerators/Enums/EnumExtensionsGenerator.cs index 2a5e3040..b04a3640 100644 --- a/GFramework.SourceGenerators/Enums/EnumExtensionsGenerator.cs +++ b/GFramework.Core.SourceGenerators/Enums/EnumExtensionsGenerator.cs @@ -1,9 +1,6 @@ -using System.Text; -using GFramework.SourceGenerators.Common.Constants; +using GFramework.SourceGenerators.Common.Constants; using GFramework.SourceGenerators.Common.Diagnostics; using GFramework.SourceGenerators.Common.Generator; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace GFramework.SourceGenerators.Enums; @@ -110,4 +107,4 @@ public sealed class EnumExtensionsGenerator : AttributeEnumGeneratorBase { return $"{symbol.Name}.EnumExtensions.g.cs"; } -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/GFramework.SourceGenerators.csproj b/GFramework.Core.SourceGenerators/GFramework.Core.SourceGenerators.csproj similarity index 92% rename from GFramework.SourceGenerators/GFramework.SourceGenerators.csproj rename to GFramework.Core.SourceGenerators/GFramework.Core.SourceGenerators.csproj index 57810ee2..72a2c200 100644 --- a/GFramework.SourceGenerators/GFramework.SourceGenerators.csproj +++ b/GFramework.Core.SourceGenerators/GFramework.Core.SourceGenerators.csproj @@ -30,7 +30,7 @@ - + @@ -63,6 +63,6 @@ - + diff --git a/GFramework.Core.SourceGenerators/GeWuYou.GFramework.Core.SourceGenerators.targets b/GFramework.Core.SourceGenerators/GeWuYou.GFramework.Core.SourceGenerators.targets new file mode 100644 index 00000000..4a1d4f8e --- /dev/null +++ b/GFramework.Core.SourceGenerators/GeWuYou.GFramework.Core.SourceGenerators.targets @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/GFramework.SourceGenerators/GlobalUsings.cs b/GFramework.Core.SourceGenerators/GlobalUsings.cs similarity index 97% rename from GFramework.SourceGenerators/GlobalUsings.cs rename to GFramework.Core.SourceGenerators/GlobalUsings.cs index f098c130..a2428fdc 100644 --- a/GFramework.SourceGenerators/GlobalUsings.cs +++ b/GFramework.Core.SourceGenerators/GlobalUsings.cs @@ -24,4 +24,4 @@ global using Microsoft.CodeAnalysis.Text; global using System.Globalization; global using System.IO; global using System.Text; -global using System.Text.Json; \ No newline at end of file +global using System.Text.Json; diff --git a/GFramework.SourceGenerators/Logging/LoggerGenerator.cs b/GFramework.Core.SourceGenerators/Logging/LoggerGenerator.cs similarity index 95% rename from GFramework.SourceGenerators/Logging/LoggerGenerator.cs rename to GFramework.Core.SourceGenerators/Logging/LoggerGenerator.cs index 8f3b789f..e861f0c3 100644 --- a/GFramework.SourceGenerators/Logging/LoggerGenerator.cs +++ b/GFramework.Core.SourceGenerators/Logging/LoggerGenerator.cs @@ -1,10 +1,7 @@ -using System.Text; -using GFramework.SourceGenerators.Abstractions.Logging; +using GFramework.SourceGenerators.Abstractions.Logging; using GFramework.SourceGenerators.Common.Constants; using GFramework.SourceGenerators.Common.Extensions; using GFramework.SourceGenerators.Common.Generator; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace GFramework.SourceGenerators.Logging; @@ -97,4 +94,4 @@ public sealed class LoggerGenerator : TypeAttributeClassGeneratorBase { return $"{symbol.Name}.Logger.g.cs"; } -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/README.md b/GFramework.Core.SourceGenerators/README.md similarity index 100% rename from GFramework.SourceGenerators/README.md rename to GFramework.Core.SourceGenerators/README.md diff --git a/GFramework.SourceGenerators/Rule/ContextAwareGenerator.cs b/GFramework.Core.SourceGenerators/Rule/ContextAwareGenerator.cs similarity index 97% rename from GFramework.SourceGenerators/Rule/ContextAwareGenerator.cs rename to GFramework.Core.SourceGenerators/Rule/ContextAwareGenerator.cs index bd48ab3a..68c2ad45 100644 --- a/GFramework.SourceGenerators/Rule/ContextAwareGenerator.cs +++ b/GFramework.Core.SourceGenerators/Rule/ContextAwareGenerator.cs @@ -1,11 +1,7 @@ -using System.Text; -using GFramework.SourceGenerators.Common.Constants; +using GFramework.SourceGenerators.Common.Constants; using GFramework.SourceGenerators.Common.Diagnostics; using GFramework.SourceGenerators.Common.Generator; using GFramework.SourceGenerators.Diagnostics; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; namespace GFramework.SourceGenerators.Rule; @@ -251,4 +247,4 @@ public sealed class ContextAwareGenerator : MetadataAttributeClassGeneratorBase break; } } -} \ No newline at end of file +} diff --git a/GFramework.SourceGenerators/Rule/ContextGetGenerator.cs b/GFramework.Core.SourceGenerators/Rule/ContextGetGenerator.cs similarity index 99% rename from GFramework.SourceGenerators/Rule/ContextGetGenerator.cs rename to GFramework.Core.SourceGenerators/Rule/ContextGetGenerator.cs index c6261f4c..c3915b00 100644 --- a/GFramework.SourceGenerators/Rule/ContextGetGenerator.cs +++ b/GFramework.Core.SourceGenerators/Rule/ContextGetGenerator.cs @@ -1,4 +1,3 @@ -using System.Text; using GFramework.SourceGenerators.Common.Constants; using GFramework.SourceGenerators.Common.Diagnostics; using GFramework.SourceGenerators.Common.Extensions; @@ -894,4 +893,4 @@ public sealed class ContextGetGenerator : IIncrementalGenerator public List FieldCandidates { get; } = []; public ClassDeclarationSyntax? GetAllDeclaration { get; set; } } -} \ No newline at end of file +} diff --git a/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs b/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs index 493f3590..195a0f3c 100644 --- a/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs +++ b/GFramework.Core.Tests/Architectures/ArchitectureModulesBehaviorTests.cs @@ -78,28 +78,6 @@ public class ArchitectureModulesBehaviorTests await architecture.DestroyAsync(); } - /// - /// 验证兼容别名 RegisterMediatorBehavior 仍会把 CQRS 行为接入请求管道。 - /// - [Test] - public async Task RegisterMediatorBehavior_Should_Apply_Pipeline_Behavior_To_Request() - { - var architecture = new ModuleTestArchitecture(target => - target.RegisterMediatorBehavior>()); - - await architecture.InitializeAsync(); - - var response = await architecture.Context.SendRequestAsync(new ModuleBehaviorRequest()); - - Assert.Multiple(() => - { - Assert.That(response, Is.EqualTo("handled")); - Assert.That(TrackingPipelineBehavior.InvocationCount, Is.EqualTo(1)); - }); - - await architecture.DestroyAsync(); - } - /// /// 用于测试模块行为的最小架构实现。 /// diff --git a/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs b/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs index b224804d..6882ced4 100644 --- a/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs +++ b/GFramework.Core.Tests/Architectures/RegistryInitializationHookBaseTests.cs @@ -206,12 +206,6 @@ public class TestArchitectureWithRegistry : IArchitecture throw new NotImplementedException(); } - [Obsolete("Use RegisterCqrsPipelineBehavior() instead.")] - public void RegisterMediatorBehavior() where TBehavior : class - { - RegisterCqrsPipelineBehavior(); - } - public IArchitectureModule InstallModule(IArchitectureModule module) { throw new NotImplementedException(); @@ -357,12 +351,6 @@ public class TestArchitectureWithoutRegistry : IArchitecture throw new NotImplementedException(); } - [Obsolete("Use RegisterCqrsPipelineBehavior() instead.")] - public void RegisterMediatorBehavior() where TBehavior : class - { - RegisterCqrsPipelineBehavior(); - } - public IArchitectureModule InstallModule(IArchitectureModule module) { throw new NotImplementedException(); diff --git a/GFramework.Core.Tests/Cqrs/MediatorCompatibilityDeprecationTests.cs b/GFramework.Core.Tests/Cqrs/MediatorCompatibilityDeprecationTests.cs deleted file mode 100644 index a6cc927f..00000000 --- a/GFramework.Core.Tests/Cqrs/MediatorCompatibilityDeprecationTests.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System.ComponentModel; -using System.Reflection; -using GFramework.Core.Abstractions.Architectures; -using GFramework.Core.Abstractions.Ioc; -using GFramework.Core.Architectures; -using GFramework.Core.Coroutine.Extensions; -using GFramework.Core.Ioc; - -namespace GFramework.Core.Tests.Cqrs; - -/// -/// 锁定历史 Mediator 兼容入口的正式弃用策略。 -/// 这些测试确保旧 API 不仅保留行为兼容，还会通过编译期提示和 IntelliSense 隐藏引导调用方迁移到新的 CQRS 命名。 -/// -[TestFixture] -public class MediatorCompatibilityDeprecationTests -{ - /// - /// 验证公开兼容方法仍可用，但已被显式标记为未来移除的旧别名。 - /// - [Test] - public void Legacy_Public_Methods_Should_Be_Obsolete_And_Hidden_From_Editor_Browsing() - { - AssertLegacyMethod(typeof(IArchitecture), nameof(IArchitecture.RegisterMediatorBehavior)); - AssertLegacyMethod(typeof(IIocContainer), nameof(IIocContainer.RegisterMediatorBehavior)); - AssertLegacyMethod(typeof(Architecture), nameof(Architecture.RegisterMediatorBehavior)); - AssertLegacyMethod(typeof(MicrosoftDiContainer), nameof(MicrosoftDiContainer.RegisterMediatorBehavior)); - } - - /// - /// 验证历史扩展类型会把迁移目标写入弃用说明，并从 IntelliSense 主路径隐藏。 - /// - [Test] - public void Legacy_Extension_Types_Should_Be_Obsolete_And_Hidden_From_Editor_Browsing() - { - AssertLegacyType( - typeof(ContextAwareMediatorExtensions), - "Use GFramework.Core.Extensions.ContextAwareCqrsExtensions instead."); - AssertLegacyType( - typeof(ContextAwareMediatorCommandExtensions), - "Use GFramework.Cqrs.Extensions.ContextAwareCqrsCommandExtensions instead."); - AssertLegacyType( - typeof(ContextAwareMediatorQueryExtensions), - "Use GFramework.Cqrs.Extensions.ContextAwareCqrsQueryExtensions instead."); - AssertLegacyType( - typeof(MediatorCoroutineExtensions), - "Use GFramework.Core.Coroutine.Extensions.CqrsCoroutineExtensions instead."); - } - - /// - /// 断言方法级兼容 API 具备统一的弃用元数据。 - /// - /// 声明该方法的类型。 - /// 方法名称。 - private static void AssertLegacyMethod(Type declaringType, string methodName) - { - var method = declaringType - .GetMethods(BindingFlags.Public | BindingFlags.Instance) - .Single(candidate => candidate.Name == methodName); - - var obsoleteAttribute = method.GetCustomAttribute(); - var editorBrowsableAttribute = method.GetCustomAttribute(); - - Assert.Multiple(() => - { - Assert.That(obsoleteAttribute, Is.Not.Null); - Assert.That( - obsoleteAttribute!.Message, - Does.Contain("Use RegisterCqrsPipelineBehavior() instead.")); - Assert.That( - obsoleteAttribute.Message, - Does.Contain("removed in a future major version")); - Assert.That(editorBrowsableAttribute, Is.Not.Null); - Assert.That(editorBrowsableAttribute!.State, Is.EqualTo(EditorBrowsableState.Never)); - }); - } - - /// - /// 断言类型级兼容扩展具备统一的弃用元数据。 - /// - /// 兼容扩展类型。 - /// 期望的迁移提示。 - private static void AssertLegacyType(Type type, string expectedReplacementHint) - { - var obsoleteAttribute = type.GetCustomAttribute(); - var editorBrowsableAttribute = type.GetCustomAttribute(); - - Assert.Multiple(() => - { - Assert.That(obsoleteAttribute, Is.Not.Null); - Assert.That(obsoleteAttribute!.Message, Does.Contain(expectedReplacementHint)); - Assert.That( - obsoleteAttribute.Message, - Does.Contain("removed in a future major version")); - Assert.That(editorBrowsableAttribute, Is.Not.Null); - Assert.That(editorBrowsableAttribute!.State, Is.EqualTo(EditorBrowsableState.Never)); - }); - } -} diff --git a/GFramework.Core.Tests/GFramework.Core.Tests.csproj b/GFramework.Core.Tests/GFramework.Core.Tests.csproj index 391b2924..efea29cf 100644 --- a/GFramework.Core.Tests/GFramework.Core.Tests.csproj +++ b/GFramework.Core.Tests/GFramework.Core.Tests.csproj @@ -21,9 +21,11 @@ - - - + + + diff --git a/GFramework.Core/Architectures/Architecture.cs b/GFramework.Core/Architectures/Architecture.cs index 8d2582aa..cf55b192 100644 --- a/GFramework.Core/Architectures/Architecture.cs +++ b/GFramework.Core/Architectures/Architecture.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using System.Reflection; using GFramework.Core.Abstractions.Architectures; using GFramework.Core.Abstractions.Enums; @@ -8,7 +7,6 @@ using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.Environment; -using GFramework.Core.Logging; namespace GFramework.Core.Architectures; @@ -156,20 +154,6 @@ public abstract class Architecture : IArchitecture _modules.RegisterCqrsPipelineBehavior(); } - /// - /// 注册 CQRS 请求管道行为。 - /// 该成员保留旧名称以兼容历史调用点，内部行为与 一致。 - /// 新代码不应继续依赖该别名；兼容层计划在未来的 major 版本中移除。 - /// - /// 行为类型，必须是引用类型 - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete( - "Use RegisterCqrsPipelineBehavior() instead. This compatibility alias will be removed in a future major version.")] - public void RegisterMediatorBehavior() where TBehavior : class - { - RegisterCqrsPipelineBehavior(); - } - /// /// 从指定程序集显式注册 CQRS 处理器。 /// 该入口适用于把拆分到其他模块或扩展包程序集中的 handlers 接入当前架构。 diff --git a/GFramework.Core/Architectures/ArchitectureModules.cs b/GFramework.Core/Architectures/ArchitectureModules.cs index f5d2a55d..082baa1e 100644 --- a/GFramework.Core/Architectures/ArchitectureModules.cs +++ b/GFramework.Core/Architectures/ArchitectureModules.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using System.Reflection; using GFramework.Core.Abstractions.Architectures; using GFramework.Core.Abstractions.Logging; @@ -25,20 +24,6 @@ internal sealed class ArchitectureModules( services.Container.RegisterCqrsPipelineBehavior(); } - /// - /// 注册 CQRS 请求管道行为。 - /// 该成员保留旧名称以兼容历史调用点，内部行为与 一致。 - /// 新代码不应继续依赖该别名；兼容层计划在未来的 major 版本中移除。 - /// - /// 行为类型，必须是引用类型 - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete( - "Use RegisterCqrsPipelineBehavior() instead. This compatibility alias will be removed in a future major version.")] - public void RegisterMediatorBehavior() where TBehavior : class - { - RegisterCqrsPipelineBehavior(); - } - /// /// 从指定程序集显式注册 CQRS 处理器。 /// 该入口用于把默认架构程序集之外的扩展处理器接入当前架构容器。 diff --git a/GFramework.Core/Coroutine/Extensions/MediatorCoroutineExtensions.cs b/GFramework.Core/Coroutine/Extensions/MediatorCoroutineExtensions.cs deleted file mode 100644 index 5086e392..00000000 --- a/GFramework.Core/Coroutine/Extensions/MediatorCoroutineExtensions.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2026 GeWuYou -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System.ComponentModel; -using GFramework.Core.Abstractions.Coroutine; -using GFramework.Core.Abstractions.Rule; -using GFramework.Cqrs.Abstractions.Cqrs; - -namespace GFramework.Core.Coroutine.Extensions; - -/// -/// 提供 CQRS 命令与协程集成的扩展方法。 -/// 该类型保留旧名称以兼容历史调用点；新代码应改用 。 -/// 兼容层计划在未来的 major 版本中移除，因此不会继续承载新能力。 -/// -[EditorBrowsable(EditorBrowsableState.Never)] -[Obsolete( - "Use GFramework.Core.Coroutine.Extensions.CqrsCoroutineExtensions instead. This compatibility alias will be removed in a future major version.")] -public static class MediatorCoroutineExtensions -{ - /// - /// 以协程方式发送无返回值 CQRS 命令并处理可能的异常。 - /// - /// 命令的类型。 - /// 上下文感知对象，用于获取服务 - /// 要发送的命令对象 - /// 发生异常时的回调处理函数 - /// 协程枚举器，用于协程执行 - public static IEnumerator SendCommandCoroutine( - this IContextAware contextAware, - TCommand command, - Action? onError = null) - where TCommand : IRequest - { - return CqrsCoroutineExtensions.SendCommandCoroutine(contextAware, command, onError); - } -} diff --git a/GFramework.Core/Extensions/ContextAwareMediatorCommandExtensions.cs b/GFramework.Core/Extensions/ContextAwareMediatorCommandExtensions.cs deleted file mode 100644 index 24490239..00000000 --- a/GFramework.Core/Extensions/ContextAwareMediatorCommandExtensions.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.ComponentModel; -using GFramework.Core.Abstractions.Rule; -using GFramework.Cqrs.Abstractions.Cqrs.Command; -using GFramework.Cqrs.Extensions; - -namespace GFramework.Core.Extensions; - -/// -/// 提供对 接口的 CQRS 命令扩展方法。 -/// 该类型保留旧名称以兼容历史调用点；新代码应改用 。 -/// 兼容层计划在未来的 major 版本中移除，因此不会继续承载新能力。 -/// -[EditorBrowsable(EditorBrowsableState.Never)] -[Obsolete( - "Use GFramework.Cqrs.Extensions.ContextAwareCqrsCommandExtensions instead. This compatibility alias will be removed in a future major version.")] -public static class ContextAwareMediatorCommandExtensions -{ - /// - /// 发送命令的同步版本（不推荐,仅用于兼容性） - /// - /// 命令响应类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的命令对象 - /// 命令执行结果 - /// 当 contextAware 或 command 为 null 时抛出 - public static TResponse SendCommand(this IContextAware contextAware, - ICommand command) - { - return ContextAwareCqrsCommandExtensions.SendCommand(contextAware, command); - } - - /// - /// 异步发送命令并返回结果 - /// - /// 命令响应类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的命令对象 - /// 取消令牌,用于取消操作 - /// 包含命令执行结果的ValueTask - /// 当 contextAware 或 command 为 null 时抛出 - public static ValueTask SendCommandAsync(this IContextAware contextAware, - ICommand command, CancellationToken cancellationToken = default) - { - return ContextAwareCqrsCommandExtensions.SendCommandAsync( - contextAware, - command, - cancellationToken); - } -} diff --git a/GFramework.Core/Extensions/ContextAwareMediatorExtensions.cs b/GFramework.Core/Extensions/ContextAwareMediatorExtensions.cs deleted file mode 100644 index c7aec1b6..00000000 --- a/GFramework.Core/Extensions/ContextAwareMediatorExtensions.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System.ComponentModel; -using GFramework.Core.Abstractions.Rule; -using GFramework.Cqrs.Abstractions.Cqrs; -using GFramework.Cqrs.Extensions; - -namespace GFramework.Core.Extensions; - -/// -/// 提供对 接口的 CQRS 统一接口扩展方法。 -/// 该类型保留旧名称以兼容历史调用点；新代码应改用 。 -/// 兼容层计划在未来的 major 版本中移除，因此不会继续承载新能力。 -/// -[EditorBrowsable(EditorBrowsableState.Never)] -[Obsolete( - "Use GFramework.Core.Extensions.ContextAwareCqrsExtensions instead. This compatibility alias will be removed in a future major version.")] -public static class ContextAwareMediatorExtensions -{ - /// - /// 发送请求（统一处理 Command/Query） - /// - /// 响应类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的请求 - /// 取消令牌 - /// 请求结果 - /// 当 contextAware 或 request 为 null 时抛出 - public static ValueTask SendRequestAsync(this IContextAware contextAware, - IRequest request, CancellationToken cancellationToken = default) - { - return ContextAwareCqrsExtensions.SendRequestAsync( - contextAware, - request, - cancellationToken); - } - - /// - /// 发送请求（同步版本,不推荐） - /// - /// 响应类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的请求 - /// 请求结果 - /// 当 contextAware 或 request 为 null 时抛出 - public static TResponse SendRequest(this IContextAware contextAware, - IRequest request) - { - return ContextAwareCqrsExtensions.SendRequest(contextAware, request); - } - - /// - /// 发布通知（一对多事件） - /// - /// 通知类型 - /// 实现 IContextAware 接口的对象 - /// 要发布的通知 - /// 取消令牌 - /// 异步任务 - /// 当 contextAware 或 notification 为 null 时抛出 - public static ValueTask PublishAsync(this IContextAware contextAware, - TNotification notification, CancellationToken cancellationToken = default) - where TNotification : INotification - { - return ContextAwareCqrsExtensions.PublishAsync( - contextAware, - notification, - cancellationToken); - } - - /// - /// 创建流式请求（用于大数据集） - /// - /// 响应类型 - /// 实现 IContextAware 接口的对象 - /// 流式请求 - /// 取消令牌 - /// 异步响应流 - /// 当 contextAware 或 request 为 null 时抛出 - public static IAsyncEnumerable CreateStream(this IContextAware contextAware, - IStreamRequest request, CancellationToken cancellationToken = default) - { - return ContextAwareCqrsExtensions.CreateStream( - contextAware, - request, - cancellationToken); - } - - /// - /// 发送命令（无返回值） - /// - /// 命令类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的命令 - /// 取消令牌 - /// 异步任务 - /// 当 contextAware 或 command 为 null 时抛出 - public static ValueTask SendAsync(this IContextAware contextAware, TCommand command, - CancellationToken cancellationToken = default) - where TCommand : IRequest - { - return ContextAwareCqrsExtensions.SendAsync( - contextAware, - command, - cancellationToken); - } - - /// - /// 发送命令（有返回值） - /// - /// 响应类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的命令 - /// 取消令牌 - /// 命令执行结果 - /// 当 contextAware 或 command 为 null 时抛出 - public static ValueTask SendAsync(this IContextAware contextAware, - IRequest command, CancellationToken cancellationToken = default) - { - return ContextAwareCqrsExtensions.SendAsync( - contextAware, - command, - cancellationToken); - } -} diff --git a/GFramework.Core/Extensions/ContextAwareMediatorQueryExtensions.cs b/GFramework.Core/Extensions/ContextAwareMediatorQueryExtensions.cs deleted file mode 100644 index cf0b4513..00000000 --- a/GFramework.Core/Extensions/ContextAwareMediatorQueryExtensions.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.ComponentModel; -using GFramework.Core.Abstractions.Rule; -using GFramework.Cqrs.Abstractions.Cqrs.Query; -using GFramework.Cqrs.Extensions; - -namespace GFramework.Core.Extensions; - -/// -/// 提供对 接口的 CQRS 查询扩展方法。 -/// 该类型保留旧名称以兼容历史调用点；新代码应改用 。 -/// 兼容层计划在未来的 major 版本中移除，因此不会继续承载新能力。 -/// -[EditorBrowsable(EditorBrowsableState.Never)] -[Obsolete( - "Use GFramework.Cqrs.Extensions.ContextAwareCqrsQueryExtensions instead. This compatibility alias will be removed in a future major version.")] -public static class ContextAwareMediatorQueryExtensions -{ - /// - /// 发送查询的同步版本（不推荐,仅用于兼容性） - /// - /// 查询响应类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的查询对象 - /// 查询结果 - /// 当 contextAware 或 query 为 null 时抛出 - public static TResponse SendQuery(this IContextAware contextAware, IQuery query) - { - return ContextAwareCqrsQueryExtensions.SendQuery(contextAware, query); - } - - /// - /// 异步发送查询并返回结果 - /// - /// 查询响应类型 - /// 实现 IContextAware 接口的对象 - /// 要发送的查询对象 - /// 取消令牌,用于取消操作 - /// 包含查询结果的ValueTask - /// 当 contextAware 或 query 为 null 时抛出 - public static ValueTask SendQueryAsync(this IContextAware contextAware, - IQuery query, CancellationToken cancellationToken = default) - { - return ContextAwareCqrsQueryExtensions.SendQueryAsync( - contextAware, - query, - cancellationToken); - } -} diff --git a/GFramework.Core/Ioc/MicrosoftDiContainer.cs b/GFramework.Core/Ioc/MicrosoftDiContainer.cs index d1a0576d..9da7b6bc 100644 --- a/GFramework.Core/Ioc/MicrosoftDiContainer.cs +++ b/GFramework.Core/Ioc/MicrosoftDiContainer.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using System.Reflection; using GFramework.Core.Abstractions.Bases; using GFramework.Core.Abstractions.Ioc; @@ -367,20 +366,6 @@ public class MicrosoftDiContainer(IServiceCollection? serviceCollection = null) } } - /// - /// 注册 CQRS 请求管道行为。 - /// 该成员保留旧名称以兼容历史调用点，内部行为与 一致。 - /// 新代码不应继续依赖该别名；兼容层计划在未来的 major 版本中移除。 - /// - /// 行为类型，必须是引用类型 - [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete( - "Use RegisterCqrsPipelineBehavior() instead. This compatibility alias will be removed in a future major version.")] - public void RegisterMediatorBehavior() where TBehavior : class - { - RegisterCqrsPipelineBehavior(); - } - /// /// 从指定程序集显式注册 CQRS 处理器。 /// diff --git a/GFramework.SourceGenerators/Cqrs/CqrsHandlerRegistryGenerator.cs b/GFramework.Cqrs.SourceGenerators/Cqrs/CqrsHandlerRegistryGenerator.cs similarity index 91% rename from GFramework.SourceGenerators/Cqrs/CqrsHandlerRegistryGenerator.cs rename to GFramework.Cqrs.SourceGenerators/Cqrs/CqrsHandlerRegistryGenerator.cs index 72ce6664..74e1daeb 100644 --- a/GFramework.SourceGenerators/Cqrs/CqrsHandlerRegistryGenerator.cs +++ b/GFramework.Cqrs.SourceGenerators/Cqrs/CqrsHandlerRegistryGenerator.cs @@ -337,10 +337,17 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator return true; } - if (type is INamedTypeSymbol namedType && - SymbolEqualityComparer.Default.Equals(namedType.ContainingAssembly, compilation.Assembly)) + if (type is INamedTypeSymbol namedType) { - runtimeTypeReference = RuntimeTypeReferenceSpec.FromReflectionLookup( + if (SymbolEqualityComparer.Default.Equals(namedType.ContainingAssembly, compilation.Assembly)) + { + runtimeTypeReference = RuntimeTypeReferenceSpec.FromReflectionLookup( + GetReflectionTypeMetadataName(namedType)); + return true; + } + + runtimeTypeReference = RuntimeTypeReferenceSpec.FromExternalReflectionLookup( + namedType.ContainingAssembly.Identity.Name, GetReflectionTypeMetadataName(namedType)); return true; } @@ -388,8 +395,10 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator return true; } - genericTypeDefinitionReference = null; - return false; + genericTypeDefinitionReference = RuntimeTypeReferenceSpec.FromExternalReflectionLookup( + genericTypeDefinition.ContainingAssembly.Identity.Name, + GetReflectionTypeMetadataName(genericTypeDefinition)); + return true; } private static bool CanReferenceFromGeneratedRegistry(Compilation compilation, ITypeSymbol type) @@ -492,6 +501,9 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator !registration.PreciseReflectedRegistrations.IsDefaultOrEmpty); var hasRuntimeInterfaceDiscovery = registrations.Any(static registration => registration.RequiresRuntimeInterfaceDiscovery); + var hasExternalAssemblyTypeLookups = registrations.Any(static registration => + registration.PreciseReflectedRegistrations.Any(static preciseRegistration => + preciseRegistration.ServiceTypeArguments.Any(ContainsExternalAssemblyTypeLookup))); var builder = new StringBuilder(); builder.AppendLine("// "); builder.AppendLine("#nullable enable"); @@ -556,10 +568,13 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator builder.AppendLine(" }"); - if (hasRuntimeInterfaceDiscovery) + if (hasRuntimeInterfaceDiscovery || hasExternalAssemblyTypeLookups) { builder.AppendLine(); - AppendReflectionHelpers(builder); + AppendReflectionHelpers( + builder, + hasRuntimeInterfaceDiscovery, + hasExternalAssemblyTypeLookups); } builder.AppendLine("}"); @@ -910,14 +925,68 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator builder.Append(indent); builder.Append("var "); builder.Append(variableBaseName); - builder.Append(" = registryAssembly.GetType(\""); - builder.Append(EscapeStringLiteral(reflectionTypeMetadataName)); - builder.AppendLine("\", throwOnError: false, ignoreCase: false);"); + if (string.IsNullOrWhiteSpace(runtimeTypeReference.ReflectionAssemblyName)) + { + builder.Append(" = registryAssembly.GetType(\""); + builder.Append(EscapeStringLiteral(reflectionTypeMetadataName)); + builder.AppendLine("\", throwOnError: false, ignoreCase: false);"); + } + else + { + builder.Append(" = ResolveReferencedAssemblyType(\""); + builder.Append(EscapeStringLiteral(runtimeTypeReference.ReflectionAssemblyName!)); + builder.Append("\", \""); + builder.Append(EscapeStringLiteral(reflectionTypeMetadataName)); + builder.AppendLine("\");"); + } + return variableBaseName; } - private static void AppendReflectionHelpers(StringBuilder builder) + private static void AppendReflectionHelpers( + StringBuilder builder, + bool includeRuntimeInterfaceDiscoveryHelpers, + bool includeExternalAssemblyTypeLookupHelpers) { + if (includeExternalAssemblyTypeLookupHelpers) + { + builder.AppendLine( + " private static global::System.Type? ResolveReferencedAssemblyType(string assemblyName, string typeMetadataName)"); + builder.AppendLine(" {"); + builder.AppendLine(" var assembly = ResolveReferencedAssembly(assemblyName);"); + builder.AppendLine( + " return assembly?.GetType(typeMetadataName, throwOnError: false, ignoreCase: false);"); + builder.AppendLine(" }"); + builder.AppendLine(); + builder.AppendLine( + " private static global::System.Reflection.Assembly? ResolveReferencedAssembly(string assemblyName)"); + builder.AppendLine(" {"); + builder.AppendLine( + " foreach (var assembly in global::System.AppDomain.CurrentDomain.GetAssemblies())"); + builder.AppendLine(" {"); + builder.AppendLine( + " if (global::System.StringComparer.Ordinal.Equals(assembly.GetName().Name, assemblyName))"); + builder.AppendLine(" return assembly;"); + builder.AppendLine(" }"); + builder.AppendLine(); + builder.AppendLine(" try"); + builder.AppendLine(" {"); + builder.AppendLine( + " return global::System.Reflection.Assembly.Load(new global::System.Reflection.AssemblyName(assemblyName));"); + builder.AppendLine(" }"); + builder.AppendLine(" catch"); + builder.AppendLine(" {"); + builder.AppendLine(" return null;"); + builder.AppendLine(" }"); + builder.AppendLine(" }"); + } + + if (!includeRuntimeInterfaceDiscoveryHelpers) + return; + + if (includeExternalAssemblyTypeLookupHelpers) + builder.AppendLine(); + // Emit the runtime helper methods only when at least one handler still needs implementation-scoped // interface discovery after all direct / precise registrations have been emitted. builder.AppendLine( @@ -1038,6 +1107,32 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator .Replace("\r", "\\r"); } + private static bool ContainsExternalAssemblyTypeLookup(RuntimeTypeReferenceSpec runtimeTypeReference) + { + if (!string.IsNullOrWhiteSpace(runtimeTypeReference.ReflectionAssemblyName)) + return true; + + if (runtimeTypeReference.ArrayElementTypeReference is not null && + ContainsExternalAssemblyTypeLookup(runtimeTypeReference.ArrayElementTypeReference)) + { + return true; + } + + if (runtimeTypeReference.GenericTypeDefinitionReference is not null && + ContainsExternalAssemblyTypeLookup(runtimeTypeReference.GenericTypeDefinitionReference)) + { + return true; + } + + foreach (var genericTypeArgument in runtimeTypeReference.GenericTypeArguments) + { + if (ContainsExternalAssemblyTypeLookup(genericTypeArgument)) + return true; + } + + return false; + } + private readonly record struct HandlerRegistrationSpec( string HandlerInterfaceDisplayName, string ImplementationTypeDisplayName, @@ -1058,6 +1153,7 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator private sealed record RuntimeTypeReferenceSpec( string? TypeDisplayName, string? ReflectionTypeMetadataName, + string? ReflectionAssemblyName, RuntimeTypeReferenceSpec? ArrayElementTypeReference, int ArrayRank, RuntimeTypeReferenceSpec? GenericTypeDefinitionReference, @@ -1065,19 +1161,28 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator { public static RuntimeTypeReferenceSpec FromDirectReference(string typeDisplayName) { - return new RuntimeTypeReferenceSpec(typeDisplayName, null, null, 0, null, + return new RuntimeTypeReferenceSpec(typeDisplayName, null, null, null, 0, null, ImmutableArray.Empty); } public static RuntimeTypeReferenceSpec FromReflectionLookup(string reflectionTypeMetadataName) { - return new RuntimeTypeReferenceSpec(null, reflectionTypeMetadataName, null, 0, null, + return new RuntimeTypeReferenceSpec(null, reflectionTypeMetadataName, null, null, 0, null, + ImmutableArray.Empty); + } + + public static RuntimeTypeReferenceSpec FromExternalReflectionLookup( + string reflectionAssemblyName, + string reflectionTypeMetadataName) + { + return new RuntimeTypeReferenceSpec(null, reflectionTypeMetadataName, reflectionAssemblyName, null, 0, + null, ImmutableArray.Empty); } public static RuntimeTypeReferenceSpec FromArray(RuntimeTypeReferenceSpec elementTypeReference, int arrayRank) { - return new RuntimeTypeReferenceSpec(null, null, elementTypeReference, arrayRank, null, + return new RuntimeTypeReferenceSpec(null, null, null, elementTypeReference, arrayRank, null, ImmutableArray.Empty); } @@ -1085,7 +1190,7 @@ public sealed class CqrsHandlerRegistryGenerator : IIncrementalGenerator RuntimeTypeReferenceSpec genericTypeDefinitionReference, ImmutableArray genericTypeArguments) { - return new RuntimeTypeReferenceSpec(null, null, null, 0, genericTypeDefinitionReference, + return new RuntimeTypeReferenceSpec(null, null, null, null, 0, genericTypeDefinitionReference, genericTypeArguments); } } diff --git a/GFramework.Cqrs.SourceGenerators/GFramework.Cqrs.SourceGenerators.csproj b/GFramework.Cqrs.SourceGenerators/GFramework.Cqrs.SourceGenerators.csproj new file mode 100644 index 00000000..5f6376c3 --- /dev/null +++ b/GFramework.Cqrs.SourceGenerators/GFramework.Cqrs.SourceGenerators.csproj @@ -0,0 +1,49 @@ + + + + GeWuYou.$(AssemblyName) + netstandard2.0 + true + false + latest + enable + true + Generated + true + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GFramework.Cqrs.SourceGenerators/GlobalUsings.cs b/GFramework.Cqrs.SourceGenerators/GlobalUsings.cs new file mode 100644 index 00000000..f625284e --- /dev/null +++ b/GFramework.Cqrs.SourceGenerators/GlobalUsings.cs @@ -0,0 +1,13 @@ +global using System; +global using System.Collections.Generic; +global using System.Collections.Immutable; +global using System.IO; +global using System.Linq; +global using System.Text; +global using System.Text.Json; +global using System.Threading; +global using System.Threading.Tasks; +global using Microsoft.CodeAnalysis; +global using Microsoft.CodeAnalysis.CSharp; +global using Microsoft.CodeAnalysis.CSharp.Syntax; +global using Microsoft.CodeAnalysis.Text; diff --git a/GFramework.Game.SourceGenerators/AnalyzerReleases.Shipped.md b/GFramework.Game.SourceGenerators/AnalyzerReleases.Shipped.md new file mode 100644 index 00000000..ad6aa830 --- /dev/null +++ b/GFramework.Game.SourceGenerators/AnalyzerReleases.Shipped.md @@ -0,0 +1,2 @@ +; Shipped analyzer release +; Intentionally empty until the split game source-generator package ships a stable analyzer release. diff --git a/GFramework.Game.SourceGenerators/AnalyzerReleases.Unshipped.md b/GFramework.Game.SourceGenerators/AnalyzerReleases.Unshipped.md new file mode 100644 index 00000000..3a2574f9 --- /dev/null +++ b/GFramework.Game.SourceGenerators/AnalyzerReleases.Unshipped.md @@ -0,0 +1,17 @@ +; Unshipped analyzer release +; https://github.com/dotnet/roslyn/blob/main/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md + +### New Rules + + Rule ID | Category | Severity | Notes +---------------------|------------------------------------|----------|------------------------- + GF_ConfigSchema_001 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_002 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_003 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_004 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_005 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_006 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_007 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_008 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_009 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics + GF_ConfigSchema_010 | GFramework.SourceGenerators.Config | Error | ConfigSchemaDiagnostics diff --git a/GFramework.SourceGenerators/Config/SchemaConfigGenerator.cs b/GFramework.Game.SourceGenerators/Config/SchemaConfigGenerator.cs similarity index 99% rename from GFramework.SourceGenerators/Config/SchemaConfigGenerator.cs rename to GFramework.Game.SourceGenerators/Config/SchemaConfigGenerator.cs index 7b449fa9..8eafa13e 100644 --- a/GFramework.SourceGenerators/Config/SchemaConfigGenerator.cs +++ b/GFramework.Game.SourceGenerators/Config/SchemaConfigGenerator.cs @@ -31,7 +31,8 @@ public sealed class SchemaConfigGenerator : IIncrementalGenerator private const string LookupIndexReferencePropertyMessage = "Reference properties are excluded from generated lookup indexes because they already carry cross-table semantics."; - private const string SupportedStringFormatNames = "'date', 'date-time', 'duration', 'email', 'time', 'uri', and 'uuid'"; + private const string SupportedStringFormatNames = + "'date', 'date-time', 'duration', 'email', 'time', 'uri', and 'uuid'"; /// public void Initialize(IncrementalGeneratorInitializationContext context) @@ -3183,7 +3184,8 @@ public sealed class SchemaConfigGenerator : IIncrementalGenerator var targets = dependency.Value .EnumerateArray() - .Where(static item => item.ValueKind == JsonValueKind.String && !string.IsNullOrWhiteSpace(item.GetString())) + .Where(static item => + item.ValueKind == JsonValueKind.String && !string.IsNullOrWhiteSpace(item.GetString())) .Select(static item => item.GetString()!) .Distinct(StringComparer.Ordinal) .ToArray(); diff --git a/GFramework.SourceGenerators/Diagnostics/ConfigSchemaDiagnostics.cs b/GFramework.Game.SourceGenerators/Diagnostics/ConfigSchemaDiagnostics.cs similarity index 100% rename from GFramework.SourceGenerators/Diagnostics/ConfigSchemaDiagnostics.cs rename to GFramework.Game.SourceGenerators/Diagnostics/ConfigSchemaDiagnostics.cs diff --git a/GFramework.Game.SourceGenerators/GFramework.Game.SourceGenerators.csproj b/GFramework.Game.SourceGenerators/GFramework.Game.SourceGenerators.csproj new file mode 100644 index 00000000..e7cc0ae6 --- /dev/null +++ b/GFramework.Game.SourceGenerators/GFramework.Game.SourceGenerators.csproj @@ -0,0 +1,55 @@ + + + + GeWuYou.$(AssemblyName) + netstandard2.0 + true + false + latest + enable + true + Generated + true + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GFramework.SourceGenerators/GeWuYou.GFramework.SourceGenerators.targets b/GFramework.Game.SourceGenerators/GeWuYou.GFramework.Game.SourceGenerators.targets similarity index 57% rename from GFramework.SourceGenerators/GeWuYou.GFramework.SourceGenerators.targets rename to GFramework.Game.SourceGenerators/GeWuYou.GFramework.Game.SourceGenerators.targets index c2c3af2d..5d5b5815 100644 --- a/GFramework.SourceGenerators/GeWuYou.GFramework.SourceGenerators.targets +++ b/GFramework.Game.SourceGenerators/GeWuYou.GFramework.Game.SourceGenerators.targets @@ -1,8 +1,5 @@ - - - - - + @@ -33,8 +23,7 @@ - - - + + diff --git a/GFramework.Game.SourceGenerators/GlobalUsings.cs b/GFramework.Game.SourceGenerators/GlobalUsings.cs new file mode 100644 index 00000000..a864b104 --- /dev/null +++ b/GFramework.Game.SourceGenerators/GlobalUsings.cs @@ -0,0 +1,14 @@ +global using System; +global using System.Collections.Generic; +global using System.Collections.Immutable; +global using System.Globalization; +global using System.IO; +global using System.Linq; +global using System.Text; +global using System.Text.Json; +global using System.Threading; +global using System.Threading.Tasks; +global using Microsoft.CodeAnalysis; +global using Microsoft.CodeAnalysis.CSharp; +global using Microsoft.CodeAnalysis.CSharp.Syntax; +global using Microsoft.CodeAnalysis.Text; diff --git a/GFramework.Game.Tests/GFramework.Game.Tests.csproj b/GFramework.Game.Tests/GFramework.Game.Tests.csproj index f912db4d..b8e4c61f 100644 --- a/GFramework.Game.Tests/GFramework.Game.Tests.csproj +++ b/GFramework.Game.Tests/GFramework.Game.Tests.csproj @@ -20,13 +20,14 @@ - + - + @@ -35,6 +36,6 @@ 通过仓库内的 targets 复用消费者默认约定，确保测试项目与真实消费项目一样 自动拾取 schemas/**/*.schema.json 作为 Source Generator 的 AdditionalFiles。 --> - + diff --git a/GFramework.SourceGenerators.Tests/Cqrs/CqrsHandlerRegistryGeneratorTests.cs b/GFramework.SourceGenerators.Tests/Cqrs/CqrsHandlerRegistryGeneratorTests.cs index 2e321993..4077c980 100644 --- a/GFramework.SourceGenerators.Tests/Cqrs/CqrsHandlerRegistryGeneratorTests.cs +++ b/GFramework.SourceGenerators.Tests/Cqrs/CqrsHandlerRegistryGeneratorTests.cs @@ -827,10 +827,10 @@ public class CqrsHandlerRegistryGeneratorTests /// /// 验证当外部基类暴露的 handler interface 含有生成注册器顶层上下文不可直接引用的 protected 类型时， - /// 生成器会保留已知直注册，并只对剩余未知接口做本地 interface discovery。 + /// 生成器会输出定向程序集查找，而不是继续退回 implementation 级接口发现。 /// [Test] - public void Generates_Partial_Runtime_Interface_Discovery_For_Inaccessible_External_Protected_Types() + public void Generates_Precise_Assembly_Type_Lookups_For_Inaccessible_External_Protected_Types() { const string contractsSource = """ namespace GFramework.Cqrs.Abstractions.Cqrs @@ -931,30 +931,28 @@ public class CqrsHandlerRegistryGeneratorTests Assert.That( generatedSource, Does.Contain( - "var knownServiceTypes0 = new global::System.Collections.Generic.HashSet();")); + "ResolveReferencedAssemblyType(\"Dependency\", \"Dep.VisibilityScope+ProtectedRequest\")")); Assert.That( generatedSource, Does.Contain( - "// Remaining runtime interface discovery target: GFramework.Cqrs.Abstractions.Cqrs.IRequestHandler")); + "ResolveReferencedAssemblyType(\"Dependency\", \"Dep.VisibilityScope+ProtectedResponse\")")); Assert.That( generatedSource, Does.Contain( - "knownServiceTypes0.Add(typeof(global::GFramework.Cqrs.Abstractions.Cqrs.IRequestHandler));")); + "typeof(global::GFramework.Cqrs.Abstractions.Cqrs.IRequestHandler)")); Assert.That( generatedSource, - Does.Contain( - "RegisterRemainingReflectedHandlerInterfaces(services, logger, implementationType0, knownServiceTypes0);")); + Does.Contain("ResolveReferencedAssembly(string assemblyName)")); Assert.That( generatedSource, - Does.Contain("if (knownServiceTypes.Contains(handlerInterface))")); + Does.Not.Contain("knownServiceTypes0")); Assert.That( generatedSource, - Does.Contain( - "Registered CQRS handler TestApp.DerivedHandler as GFramework.Cqrs.Abstractions.Cqrs.IRequestHandler.")); + Does.Not.Contain("RegisterRemainingReflectedHandlerInterfaces")); Assert.That( generatedSource, Does.Not.Contain( - "typeof(global::GFramework.Cqrs.Abstractions.Cqrs.IRequestHandler - + + + diff --git a/GFramework.csproj b/GFramework.csproj index b9c6c7a4..12324d1c 100644 --- a/GFramework.csproj +++ b/GFramework.csproj @@ -29,21 +29,25 @@ - + GFramework.SorceGenerators\logging\README.md - + GFramework.SorceGenerators\README.md - + GFramework.SorceGenerators\AnalyzerReleases.Shipped.md - + GFramework.SorceGenerators\AnalyzerReleases.Unshipped.md + + + + @@ -77,18 +81,22 @@ - + GFramework.SorceGenerators\enums\EnumExtensionsGenerator.cs - + GFramework.SorceGenerators\logging\Diagnostic.cs - + GFramework.SorceGenerators\logging\LoggerGenerator.cs + + + + @@ -120,6 +128,10 @@ + + + + diff --git a/GFramework.sln b/GFramework.sln index bc64ce21..b2fe4c40 100644 --- a/GFramework.sln +++ b/GFramework.sln @@ -2,10 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework", "GFramework.csproj", "{9BEDDD6C-DF8B-4E71-9C75-F44EC669ABBD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.SourceGenerators", "GFramework.SourceGenerators\GFramework.SourceGenerators.csproj", "{E9D51809-0351-4B83-B85B-B5F469AAB3B8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.SourceGenerators.Abstractions", "GFramework.SourceGenerators.Abstractions\GFramework.SourceGenerators.Abstractions.csproj", "{84C5C3C9-5620-4924-BA04-92F813F2B70F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Core", "GFramework.Core\GFramework.Core.csproj", "{A6D5854D-79EA-487A-9ED9-396E6A1F8031}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Godot", "GFramework.Godot\GFramework.Godot.csproj", "{FC56D81A-3A3B-4B49-B318-363DFA0D8206}" @@ -46,6 +42,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Cqrs.Tests", "GF EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Tests.Common", "GFramework.Tests.Common\GFramework.Tests.Common.csproj", "{1100EE3E-A12D-4DE5-ABA8-591D3126570B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Core.SourceGenerators", "GFramework.Core.SourceGenerators\GFramework.Core.SourceGenerators.csproj", "{2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Core.SourceGenerators.Abstractions", "GFramework.Core.SourceGenerators.Abstractions\GFramework.Core.SourceGenerators.Abstractions.csproj", "{8858F489-4EDD-41F1-9A74-1CA1CB287EB4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Cqrs.SourceGenerators", "GFramework.Cqrs.SourceGenerators\GFramework.Cqrs.SourceGenerators.csproj", "{3FDCD803-604F-48D9-B2A8-2EC621E8D598}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFramework.Game.SourceGenerators", "GFramework.Game.SourceGenerators\GFramework.Game.SourceGenerators.csproj", "{9D3AADF0-55E6-4F80-B9C5-875F63E170D8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -68,30 +72,6 @@ Global {9BEDDD6C-DF8B-4E71-9C75-F44EC669ABBD}.Release|x64.Build.0 = Release|Any CPU {9BEDDD6C-DF8B-4E71-9C75-F44EC669ABBD}.Release|x86.ActiveCfg = Release|Any CPU {9BEDDD6C-DF8B-4E71-9C75-F44EC669ABBD}.Release|x86.Build.0 = Release|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Debug|x64.ActiveCfg = Debug|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Debug|x64.Build.0 = Debug|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Debug|x86.ActiveCfg = Debug|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Debug|x86.Build.0 = Debug|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Release|Any CPU.Build.0 = Release|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Release|x64.ActiveCfg = Release|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Release|x64.Build.0 = Release|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Release|x86.ActiveCfg = Release|Any CPU - {E9D51809-0351-4B83-B85B-B5F469AAB3B8}.Release|x86.Build.0 = Release|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Debug|x64.ActiveCfg = Debug|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Debug|x64.Build.0 = Debug|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Debug|x86.ActiveCfg = Debug|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Debug|x86.Build.0 = Debug|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|Any CPU.Build.0 = Release|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|x64.ActiveCfg = Release|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|x64.Build.0 = Release|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|x86.ActiveCfg = Release|Any CPU - {84C5C3C9-5620-4924-BA04-92F813F2B70F}.Release|x86.Build.0 = Release|Any CPU {A6D5854D-79EA-487A-9ED9-396E6A1F8031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6D5854D-79EA-487A-9ED9-396E6A1F8031}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6D5854D-79EA-487A-9ED9-396E6A1F8031}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -332,6 +312,54 @@ Global {1100EE3E-A12D-4DE5-ABA8-591D3126570B}.Release|x64.Build.0 = Release|Any CPU {1100EE3E-A12D-4DE5-ABA8-591D3126570B}.Release|x86.ActiveCfg = Release|Any CPU {1100EE3E-A12D-4DE5-ABA8-591D3126570B}.Release|x86.Build.0 = Release|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Debug|x64.ActiveCfg = Debug|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Debug|x64.Build.0 = Debug|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Debug|x86.ActiveCfg = Debug|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Debug|x86.Build.0 = Debug|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Release|Any CPU.Build.0 = Release|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Release|x64.ActiveCfg = Release|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Release|x64.Build.0 = Release|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Release|x86.ActiveCfg = Release|Any CPU + {2E8A4BB6-DA58-484F-ACC5-A8F2FA885B36}.Release|x86.Build.0 = Release|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Debug|x64.ActiveCfg = Debug|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Debug|x64.Build.0 = Debug|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Debug|x86.ActiveCfg = Debug|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Debug|x86.Build.0 = Debug|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Release|Any CPU.Build.0 = Release|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Release|x64.ActiveCfg = Release|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Release|x64.Build.0 = Release|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Release|x86.ActiveCfg = Release|Any CPU + {8858F489-4EDD-41F1-9A74-1CA1CB287EB4}.Release|x86.Build.0 = Release|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Debug|x64.ActiveCfg = Debug|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Debug|x64.Build.0 = Debug|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Debug|x86.ActiveCfg = Debug|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Debug|x86.Build.0 = Debug|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Release|Any CPU.Build.0 = Release|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Release|x64.ActiveCfg = Release|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Release|x64.Build.0 = Release|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Release|x86.ActiveCfg = Release|Any CPU + {3FDCD803-604F-48D9-B2A8-2EC621E8D598}.Release|x86.Build.0 = Release|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Debug|x64.ActiveCfg = Debug|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Debug|x64.Build.0 = Debug|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Debug|x86.ActiveCfg = Debug|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Debug|x86.Build.0 = Debug|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Release|Any CPU.Build.0 = Release|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Release|x64.ActiveCfg = Release|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Release|x64.Build.0 = Release|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Release|x86.ActiveCfg = Release|Any CPU + {9D3AADF0-55E6-4F80-B9C5-875F63E170D8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/docs/zh-CN/core/cqrs.md b/docs/zh-CN/core/cqrs.md index 9d2410fe..c488ff19 100644 --- a/docs/zh-CN/core/cqrs.md +++ b/docs/zh-CN/core/cqrs.md @@ -246,9 +246,8 @@ public class GameArchitecture : Architecture 优先使用程序集级生成注册器，失败时自动回退到反射扫描；如果同一程序集已经由默认路径或其他模块接入，框架会自动去重，避免重复注册 handler。 -`RegisterCqrsPipelineBehavior()` 是推荐入口；旧的 `RegisterMediatorBehavior()` -仅作为兼容名称保留，当前已标记为 `Obsolete` 并从 IntelliSense 主路径隐藏，计划在未来 major 版本中移除。 -`ContextAwareMediator*Extensions` 与 `MediatorCoroutineExtensions` 也遵循同样的弃用节奏。当前接口支持两种形式： +`RegisterCqrsPipelineBehavior()` 是唯一保留的公开入口；旧的 `Mediator` 兼容别名与扩展已移除，不再继续维护。 +当前接口支持两种形式： - 开放泛型行为，例如 `LoggingBehavior<,>`，用于匹配所有请求 - 封闭行为类型，例如某个只服务于单一请求的 `SpecialBehavior` diff --git a/docs/zh-CN/game/config-system.md b/docs/zh-CN/game/config-system.md index 3ca3776e..5725d2c6 100644 --- a/docs/zh-CN/game/config-system.md +++ b/docs/zh-CN/game/config-system.md @@ -153,26 +153,29 @@ GameProject/ - + - + - + ``` 这段配置的作用： - `GFramework.Game` 提供运行时 `YamlConfigLoader`、`ConfigRegistry`、`GameConfigBootstrap`、`GameConfigModule` 和只读表实现 -- 三个 `ProjectReference(... OutputItemType="Analyzer")` 把生成器接进当前消费者项目 -- `GeWuYou.GFramework.SourceGenerators.targets` 自动把 `schemas/**/*.schema.json` 加入 `AdditionalFiles` +- `GFramework.Core.SourceGenerators.Abstractions` 提供 `Core` 侧 source-generator attributes +- `GFramework.SourceGenerators.Common`、`GFramework.Core.SourceGenerators` 与 `GFramework.Game.SourceGenerators` + 共同把生成器接进当前消费者项目 +- `GeWuYou.GFramework.Game.SourceGenerators.targets` 自动把 `schemas/**/*.schema.json` 加入 `AdditionalFiles` 如果你使用打包后的 NuGet，而不是仓库内项目引用，原则保持不变：