.claude/settings.local.json

@@ -0,0 +1,50 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(dotnet clean:*)",
+      "Bash(dotnet run)",
+      "Bash(dotnet add:*)",
+      "Bash(timeout 5 dotnet run:*)",
+      "Bash(dotnet remove:*)",
+      "Bash(netstat:*)",
+      "Bash(findstr:*)",
+      "Bash(cat:*)",
+      "Bash(taskkill:*)",
+      "WebSearch",
+      "Bash(dotnet tool install:*)",
+      "Bash(protogen:*)",
+      "Bash(timeout 15 dotnet run:*)",
+      "Bash(where:*)",
+      "Bash(timeout 30 dotnet run:*)",
+      "Bash(timeout 60 dotnet run:*)",
+      "Bash(timeout 120 dotnet run:*)",
+      "Bash(git add:*)",
+      "Bash(curl:*)",
+      "Bash(timeout 3 cmd:*)",
+      "Bash(timeout:*)",
+      "Bash(tasklist:*)",
+      "Bash(dotnet build:*)",
+      "Bash(dotnet --list-sdks:*)",
+      "Bash(dotnet sln:*)",
+      "Bash(pkill:*)",
+      "Bash(python3:*)",
+      "Bash(grpcurl:*)",
+      "Bash(lsof:*)",
+      "Bash(xargs kill -9)",
+      "Bash(dotnet run:*)",
+      "Bash(find:*)",
+      "Bash(dotnet pack:*)",
+      "Bash(unzip:*)",
+      "WebFetch(domain:andrewlock.net)",
+      "WebFetch(domain:github.com)",
+      "WebFetch(domain:stackoverflow.com)",
+      "WebFetch(domain:www.kenmuse.com)",
+      "WebFetch(domain:blog.rsuter.com)",
+      "WebFetch(domain:natemcmaster.com)",
+      "WebFetch(domain:www.nuget.org)",
+      "Bash(mkdir:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

.editorconfig

@@ -1,96 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.{csproj,props,targets,xml}]
-indent_size = 2
-
-[*.{json,yml,yaml}]
-indent_size = 2
-
-[*.proto]
-indent_size = 2
-
-[*.cs]
-# Namespace
-csharp_style_namespace_declarations = file_scoped:warning
-
-# Braces — Allman style
-csharp_new_line_before_open_brace = all
-
-# Usings
-dotnet_sort_system_directives_first = true
-csharp_using_directive_placement = outside_namespace:warning
-
-# var preferences — use var when type is apparent
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
-
-# Expression bodies — prefer for simple members
-csharp_style_expression_bodied_methods = when_on_single_line:suggestion
-csharp_style_expression_bodied_constructors = false:suggestion
-csharp_style_expression_bodied_operators = when_on_single_line:suggestion
-csharp_style_expression_bodied_properties = true:suggestion
-csharp_style_expression_bodied_accessors = true:suggestion
-csharp_style_expression_bodied_lambdas = true:suggestion
-
-# Pattern matching
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-
-# Null checking
-csharp_style_throw_expression = true:suggestion
-csharp_style_conditional_delegate_call = true:suggestion
-
-# Modifier preferences — exclude interface members (netstandard2.1 compat)
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
-
-# Field naming — _camelCase for private fields
-dotnet_naming_rule.private_fields_should_be_camel_case.severity = warning
-dotnet_naming_rule.private_fields_should_be_camel_case.symbols = private_fields
-dotnet_naming_rule.private_fields_should_be_camel_case.style = camel_case_underscore
-
-dotnet_naming_symbols.private_fields.applicable_kinds = field
-dotnet_naming_symbols.private_fields.applicable_accessibilities = private, protected, private_protected
-dotnet_naming_symbols.private_fields.required_modifiers =
-
-dotnet_naming_style.camel_case_underscore.required_prefix = _
-dotnet_naming_style.camel_case_underscore.capitalization = camel_case
-
-# Constants — PascalCase
-dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants
-dotnet_naming_rule.constants_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_symbols.constants.applicable_kinds = field
-dotnet_naming_symbols.constants.required_modifiers = const
-
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-# Interfaces — I prefix
-dotnet_naming_rule.interfaces_should_begin_with_i.severity = warning
-dotnet_naming_rule.interfaces_should_begin_with_i.symbols = interfaces
-dotnet_naming_rule.interfaces_should_begin_with_i.style = begins_with_i
-
-dotnet_naming_symbols.interfaces.applicable_kinds = interface
-
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
-
-# Async methods — Async suffix
-dotnet_naming_rule.async_methods_should_end_with_async.severity = suggestion
-dotnet_naming_rule.async_methods_should_end_with_async.symbols = async_methods
-dotnet_naming_rule.async_methods_should_end_with_async.style = ends_with_async
-
-dotnet_naming_symbols.async_methods.applicable_kinds = method
-dotnet_naming_symbols.async_methods.required_modifiers = async
-
-dotnet_naming_style.ends_with_async.required_suffix = Async
-dotnet_naming_style.ends_with_async.capitalization = pascal_case

CLAUDE.md

@@ -1,6 +1,6 @@
 # CLAUDE.md
 
-This file provides guidance to AI agents when working with code in this repository.
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
 ## Project Overview
 

README.md

@@ -4,15 +4,6 @@
 
 Our implementation of query and command responsibility segregation (CQRS).
 
-## Where This Fits
-
-This is a backend framework of the [Svrnty Agent System](../README.md).
-
-**Layer**: Framework
-**Depends on**: Nothing (standalone .NET framework)
-**Depended on by**: a-gent-app (backend services), flutter_cqrs_datasource (client)
-**Git**: [git.openharbor.io/svrnty/dotnet-cqrs](https://git.openharbor.io/svrnty/dotnet-cqrs)
-
 ## Getting Started
 
 > Install nuget package to your awesome project.

Svrnty.CQRS.Abstractions/Attributes/CommandNameAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Svrnty.CQRS.Abstractions.Attributes;
 

Svrnty.CQRS.Abstractions/Attributes/QueryNameAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Svrnty.CQRS.Abstractions.Attributes;
 

Svrnty.CQRS.Abstractions/Discovery/CommandMeta.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using Svrnty.CQRS.Abstractions.Attributes;
 

Svrnty.CQRS.Abstractions/Discovery/ICommandMeta.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Svrnty.CQRS.Abstractions.Discovery;
 

Svrnty.CQRS.Abstractions/Discovery/IQueryDiscovery.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Svrnty.CQRS.Abstractions.Discovery;

Svrnty.CQRS.Abstractions/Discovery/IQueryMeta.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Svrnty.CQRS.Abstractions.Discovery;
 
@@ -10,4 +10,4 @@ public interface IQueryMeta
     Type QueryResultType { get; }
     string Category { get; }
     string LowerCamelCaseName { get; }
-}
+}

Svrnty.CQRS.Abstractions/Discovery/QueryMeta.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using Svrnty.CQRS.Abstractions.Attributes;
 

Svrnty.CQRS.Abstractions/ICommandHandler.cs

@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Svrnty.CQRS.Abstractions;
@@ -13,4 +13,4 @@ public interface ICommandHandler<in TCommand, TCommandResult>
     where TCommand : class
 {
     Task<TCommandResult> HandleAsync(TCommand command, CancellationToken cancellationToken = default);
-}
+}

Svrnty.CQRS.Abstractions/IQueryHandler.cs

@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Svrnty.CQRS.Abstractions;
@@ -7,4 +7,4 @@ public interface IQueryHandler<in TQuery, TQueryResult>
     where TQuery : class
 {
     Task<TQueryResult> HandleAsync(TQuery query, CancellationToken cancellationToken = default);
-}
+}

Svrnty.CQRS.Abstractions/Security/AuthorizationResult.cs

@@ -1,8 +1,8 @@
-namespace Svrnty.CQRS.Abstractions.Security;
+namespace Svrnty.CQRS.Abstractions.Security;
 
 public enum AuthorizationResult
 {
     Unauthorized,
     Forbidden,
     Allowed
-}
+}

Svrnty.CQRS.Abstractions/Security/ICommandAuthorizationService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -7,4 +7,4 @@ namespace Svrnty.CQRS.Abstractions.Security;
 public interface ICommandAuthorizationService
 {
     Task<AuthorizationResult> IsAllowedAsync(Type commandType, CancellationToken cancellationToken = default);
-}
+}

Svrnty.CQRS.Abstractions/Security/IQueryAuthorizationService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -7,4 +7,4 @@ namespace Svrnty.CQRS.Abstractions.Security;
 public interface IQueryAuthorizationService
 {
     Task<AuthorizationResult> IsAllowedAsync(Type queryType, CancellationToken cancellationToken = default);
-}
+}

Svrnty.CQRS.Abstractions/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 using Svrnty.CQRS.Abstractions.Discovery;
 
@@ -47,4 +47,4 @@ public static class ServiceCollectionExtensions
 
         return services;
     }
-}
+}

Svrnty.CQRS.DynamicQuery.Abstractions/DynamicQueryInterceptorProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Svrnty.CQRS.DynamicQuery.Abstractions;

Svrnty.CQRS.DynamicQuery.Abstractions/IAlterQueryableService.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -13,4 +13,4 @@ public interface IAlterQueryableService<TSource, TDestination, in TParams>
     where TParams : class
 {
     Task<IQueryable<TSource>> AlterQueryableAsync(IQueryable<TSource> query, IDynamicQueryParams<TParams> dynamicQuery, CancellationToken cancellationToken = default);
-}
+}

Svrnty.CQRS.DynamicQuery.Abstractions/IDynamicQuery.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using PoweredSoft.DynamicQuery.Core;
 
 namespace Svrnty.CQRS.DynamicQuery.Abstractions;
@@ -15,7 +15,7 @@ public interface IDynamicQuery<TSource, TDestination, out TParams> : IDynamicQue
     where TDestination : class
     where TParams : class
 {
-
+    
 }
 
 public interface IDynamicQuery
@@ -26,4 +26,4 @@ public interface IDynamicQuery
     List<IAggregate> GetAggregates();
     int? GetPage();
     int? GetPageSize();
-}
+}

Svrnty.CQRS.DynamicQuery.Abstractions/IDynamicQueryInterceptorProvider.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Svrnty.CQRS.DynamicQuery.Abstractions;
-
+    
 public interface IDynamicQueryInterceptorProvider<TSource, TDestination>
 {
     IEnumerable<Type> GetInterceptorsTypes();
-}
+}

Svrnty.CQRS.DynamicQuery.Abstractions/IDynamicQueryParams.cs

@@ -1,4 +1,4 @@
-namespace Svrnty.CQRS.DynamicQuery.Abstractions;
+namespace Svrnty.CQRS.DynamicQuery.Abstractions;
 
 public interface IDynamicQueryParams<out TParams>
     where TParams : class

Svrnty.CQRS.DynamicQuery.Abstractions/IQueryableProvider.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -7,4 +7,4 @@ namespace Svrnty.CQRS.DynamicQuery.Abstractions;
 public interface IQueryableProvider<TSource>
 {
     Task<IQueryable<TSource>> GetQueryableAsync(object query, CancellationToken cancellationToken = default);
-}
+}

Svrnty.CQRS.DynamicQuery.MinimalApi/EndpointRouteBuilderExtensions.cs

@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
-using PoweredSoft.DynamicQuery.Core;
 using Svrnty.CQRS.Abstractions;
 using Svrnty.CQRS.Abstractions.Attributes;
 using Svrnty.CQRS.Abstractions.Discovery;
@@ -15,6 +14,7 @@ using Svrnty.CQRS.Abstractions.Security;
 using Svrnty.CQRS.DynamicQuery;
 using Svrnty.CQRS.DynamicQuery.Abstractions;
 using Svrnty.CQRS.DynamicQuery.Discover;
+using PoweredSoft.DynamicQuery.Core;
 
 namespace Svrnty.CQRS.DynamicQuery.MinimalApi;
 

Svrnty.CQRS.DynamicQuery/Discover/DynamicQueryMeta.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Pluralize.NET;
 using Svrnty.CQRS.Abstractions.Discovery;
 
@@ -7,7 +7,7 @@ namespace Svrnty.CQRS.DynamicQuery.Discover;
 public class DynamicQueryMeta(Type queryType, Type serviceType, Type queryResultType)
   : QueryMeta(queryType, serviceType, queryResultType)
 {
-    public Type SourceType => QueryType.GetGenericArguments()[0];
+  public Type SourceType => QueryType.GetGenericArguments()[0];
     public Type DestinationType => QueryType.GetGenericArguments()[1];
     public override string Category => "DynamicQuery";
     public override string Name

Svrnty.CQRS.DynamicQuery/DynamicQuery.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using Svrnty.CQRS.DynamicQuery.Abstractions;
 using PoweredSoft.DynamicQuery;
 using PoweredSoft.DynamicQuery.Core;
-using Svrnty.CQRS.DynamicQuery.Abstractions;
 
 namespace Svrnty.CQRS.DynamicQuery;
 

Svrnty.CQRS.DynamicQuery/DynamicQueryAggregate.cs

@@ -1,6 +1,6 @@
-using System;
 using PoweredSoft.DynamicQuery;
 using PoweredSoft.DynamicQuery.Core;
+using System;
 
 namespace Svrnty.CQRS.DynamicQuery;
 

Svrnty.CQRS.DynamicQuery/DynamicQueryHandler.cs

@@ -1,23 +1,23 @@
+using Svrnty.CQRS.DynamicQuery.Abstractions;
+using PoweredSoft.DynamicQuery.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using PoweredSoft.DynamicQuery.Core;
-using Svrnty.CQRS.DynamicQuery.Abstractions;
 
 namespace Svrnty.CQRS.DynamicQuery;
 
 public class DynamicQueryHandler<TSource, TDestination>
-    : DynamicQueryHandlerBase<TSource, TDestination>,
+    : DynamicQueryHandlerBase<TSource, TDestination>, 
     Svrnty.CQRS.Abstractions.IQueryHandler<IDynamicQuery<TSource, TDestination>, IQueryExecutionResult<TDestination>>
     where TSource : class
     where TDestination : class
 {
-    public DynamicQueryHandler(IQueryHandlerAsync queryHandlerAsync,
+    public DynamicQueryHandler(IQueryHandlerAsync queryHandlerAsync, 
         IEnumerable<IQueryableProvider<TSource>> queryableProviders,
-        IEnumerable<IAlterQueryableService<TSource, TDestination>> alterQueryableServices,
-        IEnumerable<IDynamicQueryInterceptorProvider<TSource, TDestination>> dynamicQueryInterceptorProviders,
+        IEnumerable<IAlterQueryableService<TSource, TDestination>> alterQueryableServices, 
+        IEnumerable<IDynamicQueryInterceptorProvider<TSource, TDestination>> dynamicQueryInterceptorProviders, 
         IServiceProvider serviceProvider) : base(queryHandlerAsync, queryableProviders, alterQueryableServices, dynamicQueryInterceptorProviders, serviceProvider)
     {
     }
@@ -29,7 +29,7 @@ public class DynamicQueryHandler<TSource, TDestination>
 }
 
 public class DynamicQueryHandler<TSource, TDestination, TParams>
-    : DynamicQueryHandlerBase<TSource, TDestination>,
+    : DynamicQueryHandlerBase<TSource, TDestination>, 
     Svrnty.CQRS.Abstractions.IQueryHandler<IDynamicQuery<TSource, TDestination, TParams>, IQueryExecutionResult<TDestination>>
     where TSource : class
     where TDestination : class
@@ -37,10 +37,10 @@ public class DynamicQueryHandler<TSource, TDestination, TParams>
 {
     private readonly IEnumerable<IAlterQueryableService<TSource, TDestination, TParams>> alterQueryableServicesWithParams;
 
-    public DynamicQueryHandler(IQueryHandlerAsync queryHandlerAsync,
+    public DynamicQueryHandler(IQueryHandlerAsync queryHandlerAsync, 
         IEnumerable<IQueryableProvider<TSource>> queryableProviders,
         IEnumerable<IAlterQueryableService<TSource, TDestination>> alterQueryableServices,
-        IEnumerable<IAlterQueryableService<TSource, TDestination, TParams>> alterQueryableServicesWithParams,
+        IEnumerable<IAlterQueryableService<TSource, TDestination, TParams>> alterQueryableServicesWithParams, 
         IEnumerable<IDynamicQueryInterceptorProvider<TSource, TDestination>> dynamicQueryInterceptorProviders,
         IServiceProvider serviceProvider) : base(queryHandlerAsync, queryableProviders, alterQueryableServices, dynamicQueryInterceptorProviders, serviceProvider)
     {
@@ -49,7 +49,7 @@ public class DynamicQueryHandler<TSource, TDestination, TParams>
 
     protected override async Task<IQueryable<TSource>> AlterSourceAsync(IQueryable<TSource> source, IDynamicQuery query, CancellationToken cancellationToken)
     {
-        source = await base.AlterSourceAsync(source, query, cancellationToken);
+        source =  await base.AlterSourceAsync(source, query, cancellationToken);
 
         if (query is IDynamicQueryParams<TParams> withParams)
         {

Svrnty.CQRS.DynamicQuery/DynamicQueryHandlerBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
@@ -6,9 +6,9 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using Svrnty.CQRS.DynamicQuery.Abstractions;
 using PoweredSoft.DynamicQuery;
 using PoweredSoft.DynamicQuery.Core;
-using Svrnty.CQRS.DynamicQuery.Abstractions;
 
 namespace Svrnty.CQRS.DynamicQuery;
 

Svrnty.CQRS.DynamicQuery/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using PoweredSoft.Data.Core;
@@ -91,10 +91,10 @@ public static class ServiceCollectionExtensions
         where TParams : class
         => AddDynamicQueryWithParams<TSourceAndDestination, TSourceAndDestination, TParams>(services, name: name);
 
-    public static IServiceCollection AddDynamicQueryWithParams<TSource, TDestination, TParams>(this IServiceCollection services, string name = null)
-    where TSource : class
-    where TDestination : class
-    where TParams : class
+        public static IServiceCollection AddDynamicQueryWithParams<TSource, TDestination, TParams>(this IServiceCollection services, string name = null)
+        where TSource : class
+        where TDestination : class
+        where TParams : class
     {
         // add query handler.
         services.AddTransient<IQueryHandler<IDynamicQuery<TSource, TDestination, TParams>, IQueryExecutionResult<TDestination>>, DynamicQueryHandler<TSource, TDestination, TParams>>();
@@ -133,7 +133,7 @@ public static class ServiceCollectionExtensions
         where TParams : class
         where TService : class, IAlterQueryableService<TSourceAndTDestination, TSourceAndTDestination, TParams>
     {
-        return services.AddTransient<IAlterQueryableService<TSourceAndTDestination, TSourceAndTDestination, TParams>, TService>();
+        return services.AddTransient<IAlterQueryableService< TSourceAndTDestination, TSourceAndTDestination, TParams>, TService>();
     }
 
     public static IServiceCollection AddAlterQueryableWithParams<TSource, TDestination, TParams, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TService>

Svrnty.CQRS.FluentValidation/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using FluentValidation;
 using Microsoft.Extensions.DependencyInjection;
 using Svrnty.CQRS.Abstractions;
@@ -39,7 +39,7 @@ public static class ServiceCollectionExtensions
     {
         services.AddQuery<TQuery, TQueryResult, TQueryHandler>()
                 .AddFluentValidator<TQuery, TValidator>();
-
+        
         return services;
     }
-}
+}

Svrnty.CQRS.Grpc.Generators/Helpers/ProtoTypeMapper.cs

@@ -1,101 +1,102 @@
 using System.Collections.Generic;
 
-namespace Svrnty.CQRS.Grpc.Generators.Helpers;
-
-internal static class ProtoTypeMapper
+namespace Svrnty.CQRS.Grpc.Generators.Helpers
 {
-    private static readonly Dictionary<string, string> TypeMap = new Dictionary<string, string>
+    internal static class ProtoTypeMapper
     {
-        // Primitives
-        { "System.String", "string" },
-        { "System.Boolean", "bool" },
-        { "System.Int32", "int32" },
-        { "System.Int64", "int64" },
-        { "System.UInt32", "uint32" },
-        { "System.UInt64", "uint64" },
-        { "System.Single", "float" },
-        { "System.Double", "double" },
-        { "System.Byte", "uint32" },
-        { "System.SByte", "int32" },
-        { "System.Int16", "int32" },
-        { "System.UInt16", "uint32" },
-        { "System.Decimal", "string" }, // Decimal as string to preserve precision
-        { "System.DateTime", "int64" }, // Unix timestamp
-        { "System.DateTimeOffset", "int64" }, // Unix timestamp
-        { "System.Guid", "string" },
-        { "System.TimeSpan", "int64" }, // Ticks
-
-        // Nullable variants
-        { "System.Boolean?", "bool" },
-        { "System.Int32?", "int32" },
-        { "System.Int64?", "int64" },
-        { "System.UInt32?", "uint32" },
-        { "System.UInt64?", "uint64" },
-        { "System.Single?", "float" },
-        { "System.Double?", "double" },
-        { "System.Byte?", "uint32" },
-        { "System.SByte?", "int32" },
-        { "System.Int16?", "int32" },
-        { "System.UInt16?", "uint32" },
-        { "System.Decimal?", "string" },
-        { "System.DateTime?", "int64" },
-        { "System.DateTimeOffset?", "int64" },
-        { "System.Guid?", "string" },
-        { "System.TimeSpan?", "int64" },
-    };
-
-    public static string MapToProtoType(string csharpType, out bool isRepeated, out bool isOptional)
-    {
-        isRepeated = false;
-        isOptional = false;
-
-        // Handle byte[] as bytes proto type (NOT repeated uint32)
-        if (csharpType == "System.Byte[]" || csharpType == "byte[]" || csharpType == "Byte[]")
+        private static readonly Dictionary<string, string> TypeMap = new Dictionary<string, string>
         {
-            return "bytes";
-        }
+            // Primitives
+            { "System.String", "string" },
+            { "System.Boolean", "bool" },
+            { "System.Int32", "int32" },
+            { "System.Int64", "int64" },
+            { "System.UInt32", "uint32" },
+            { "System.UInt64", "uint64" },
+            { "System.Single", "float" },
+            { "System.Double", "double" },
+            { "System.Byte", "uint32" },
+            { "System.SByte", "int32" },
+            { "System.Int16", "int32" },
+            { "System.UInt16", "uint32" },
+            { "System.Decimal", "string" }, // Decimal as string to preserve precision
+            { "System.DateTime", "int64" }, // Unix timestamp
+            { "System.DateTimeOffset", "int64" }, // Unix timestamp
+            { "System.Guid", "string" },
+            { "System.TimeSpan", "int64" }, // Ticks
 
-        // Handle arrays
-        if (csharpType.EndsWith("[]"))
+            // Nullable variants
+            { "System.Boolean?", "bool" },
+            { "System.Int32?", "int32" },
+            { "System.Int64?", "int64" },
+            { "System.UInt32?", "uint32" },
+            { "System.UInt64?", "uint64" },
+            { "System.Single?", "float" },
+            { "System.Double?", "double" },
+            { "System.Byte?", "uint32" },
+            { "System.SByte?", "int32" },
+            { "System.Int16?", "int32" },
+            { "System.UInt16?", "uint32" },
+            { "System.Decimal?", "string" },
+            { "System.DateTime?", "int64" },
+            { "System.DateTimeOffset?", "int64" },
+            { "System.Guid?", "string" },
+            { "System.TimeSpan?", "int64" },
+        };
+
+        public static string MapToProtoType(string csharpType, out bool isRepeated, out bool isOptional)
         {
-            isRepeated = true;
-            var elementType = csharpType.Substring(0, csharpType.Length - 2);
-            return MapToProtoType(elementType, out _, out _);
-        }
+            isRepeated = false;
+            isOptional = false;
 
-        // Handle generic collections
-        if (csharpType.StartsWith("System.Collections.Generic.List<") ||
-            csharpType.StartsWith("System.Collections.Generic.IList<") ||
-            csharpType.StartsWith("System.Collections.Generic.IEnumerable<") ||
-            csharpType.StartsWith("System.Collections.Generic.ICollection<"))
-        {
-            isRepeated = true;
-            var startIndex = csharpType.IndexOf('<') + 1;
-            var endIndex = csharpType.LastIndexOf('>');
-            var elementType = csharpType.Substring(startIndex, endIndex - startIndex);
-            return MapToProtoType(elementType, out _, out _);
-        }
+            // Handle byte[] as bytes proto type (NOT repeated uint32)
+            if (csharpType == "System.Byte[]" || csharpType == "byte[]" || csharpType == "Byte[]")
+            {
+                return "bytes";
+            }
 
-        // Handle nullable value types
-        if (csharpType.EndsWith("?"))
-        {
-            isOptional = true;
-        }
+            // Handle arrays
+            if (csharpType.EndsWith("[]"))
+            {
+                isRepeated = true;
+                var elementType = csharpType.Substring(0, csharpType.Length - 2);
+                return MapToProtoType(elementType, out _, out _);
+            }
 
-        // Check if it's a known primitive type
-        if (TypeMap.TryGetValue(csharpType, out var protoType))
-        {
-            return protoType;
-        }
+            // Handle generic collections
+            if (csharpType.StartsWith("System.Collections.Generic.List<") ||
+                csharpType.StartsWith("System.Collections.Generic.IList<") ||
+                csharpType.StartsWith("System.Collections.Generic.IEnumerable<") ||
+                csharpType.StartsWith("System.Collections.Generic.ICollection<"))
+            {
+                isRepeated = true;
+                var startIndex = csharpType.IndexOf('<') + 1;
+                var endIndex = csharpType.LastIndexOf('>');
+                var elementType = csharpType.Substring(startIndex, endIndex - startIndex);
+                return MapToProtoType(elementType, out _, out _);
+            }
 
-        // For unknown types, assume it's a custom message type
-        // Extract just the type name without namespace
-        var lastDot = csharpType.LastIndexOf('.');
-        if (lastDot >= 0)
-        {
-            return csharpType.Substring(lastDot + 1).Replace("?", "");
-        }
+            // Handle nullable value types
+            if (csharpType.EndsWith("?"))
+            {
+                isOptional = true;
+            }
 
-        return csharpType.Replace("?", "");
+            // Check if it's a known primitive type
+            if (TypeMap.TryGetValue(csharpType, out var protoType))
+            {
+                return protoType;
+            }
+
+            // For unknown types, assume it's a custom message type
+            // Extract just the type name without namespace
+            var lastDot = csharpType.LastIndexOf('.');
+            if (lastDot >= 0)
+            {
+                return csharpType.Substring(lastDot + 1).Replace("?", "");
+            }
+
+            return csharpType.Replace("?", "");
+        }
     }
 }

Svrnty.CQRS.Grpc.Generators/Models/CommandInfo.cs

@@ -1,82 +1,83 @@
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 
-namespace Svrnty.CQRS.Grpc.Generators.Models;
-
-public class CommandInfo
+namespace Svrnty.CQRS.Grpc.Generators.Models
 {
-    public string Name { get; set; }
-    public string FullyQualifiedName { get; set; }
-    public string Namespace { get; set; }
-    public List<PropertyInfo> Properties { get; set; }
-    public string? ResultType { get; set; }
-    public string? ResultFullyQualifiedName { get; set; }
-    public bool HasResult => ResultType != null;
-    public string HandlerInterfaceName { get; set; }
-    public List<PropertyInfo> ResultProperties { get; set; }
-    public bool IsResultPrimitiveType { get; set; }
-
-    public CommandInfo()
+    public class CommandInfo
     {
-        Name = string.Empty;
-        FullyQualifiedName = string.Empty;
-        Namespace = string.Empty;
-        Properties = new List<PropertyInfo>();
-        HandlerInterfaceName = string.Empty;
-        ResultProperties = new List<PropertyInfo>();
-        IsResultPrimitiveType = false;
-    }
-}
-
-public class PropertyInfo
-{
-    public string Name { get; set; }
-    public string Type { get; set; }
-    public string FullyQualifiedType { get; set; }
-    public string ProtoType { get; set; }
-    public int FieldNumber { get; set; }
-    public bool IsComplexType { get; set; }
-    public List<PropertyInfo> NestedProperties { get; set; }
-
-    // Type conversion metadata
-    public bool IsEnum { get; set; }
-    public bool IsList { get; set; }
-    public bool IsNullable { get; set; }
-    public bool IsDecimal { get; set; }
-    public bool IsDateTime { get; set; }
-    public bool IsDateTimeOffset { get; set; }
-    public bool IsGuid { get; set; }
-    public bool IsJsonElement { get; set; }
-    public bool IsBinaryType { get; set; }  // Stream, byte[], MemoryStream
-    public bool IsStream { get; set; }      // Specifically Stream types (not byte[])
-    public bool IsReadOnly { get; set; }    // Read-only/computed properties should be skipped
-    public bool IsValueTypeCollection { get; set; }  // Value types that implement IList<T> (like NpgsqlPolygon)
-    public string? ElementType { get; set; }
-    public bool IsElementComplexType { get; set; }
-    public bool IsElementGuid { get; set; }
-    public List<PropertyInfo>? ElementNestedProperties { get; set; }
-
-    public PropertyInfo()
-    {
-        Name = string.Empty;
-        Type = string.Empty;
-        FullyQualifiedType = string.Empty;
-        ProtoType = string.Empty;
-        IsComplexType = false;
-        NestedProperties = new List<PropertyInfo>();
-        IsEnum = false;
-        IsList = false;
-        IsNullable = false;
-        IsDecimal = false;
-        IsDateTime = false;
-        IsDateTimeOffset = false;
-        IsGuid = false;
-        IsJsonElement = false;
-        IsBinaryType = false;
-        IsStream = false;
-        IsReadOnly = false;
-        IsValueTypeCollection = false;
-        IsElementComplexType = false;
-        IsElementGuid = false;
+        public string Name { get; set; }
+        public string FullyQualifiedName { get; set; }
+        public string Namespace { get; set; }
+        public List<PropertyInfo> Properties { get; set; }
+        public string? ResultType { get; set; }
+        public string? ResultFullyQualifiedName { get; set; }
+        public bool HasResult => ResultType != null;
+        public string HandlerInterfaceName { get; set; }
+        public List<PropertyInfo> ResultProperties { get; set; }
+        public bool IsResultPrimitiveType { get; set; }
+
+        public CommandInfo()
+        {
+            Name = string.Empty;
+            FullyQualifiedName = string.Empty;
+            Namespace = string.Empty;
+            Properties = new List<PropertyInfo>();
+            HandlerInterfaceName = string.Empty;
+            ResultProperties = new List<PropertyInfo>();
+            IsResultPrimitiveType = false;
+        }
+    }
+
+    public class PropertyInfo
+    {
+        public string Name { get; set; }
+        public string Type { get; set; }
+        public string FullyQualifiedType { get; set; }
+        public string ProtoType { get; set; }
+        public int FieldNumber { get; set; }
+        public bool IsComplexType { get; set; }
+        public List<PropertyInfo> NestedProperties { get; set; }
+
+        // Type conversion metadata
+        public bool IsEnum { get; set; }
+        public bool IsList { get; set; }
+        public bool IsNullable { get; set; }
+        public bool IsDecimal { get; set; }
+        public bool IsDateTime { get; set; }
+        public bool IsDateTimeOffset { get; set; }
+        public bool IsGuid { get; set; }
+        public bool IsJsonElement { get; set; }
+        public bool IsBinaryType { get; set; }  // Stream, byte[], MemoryStream
+        public bool IsStream { get; set; }      // Specifically Stream types (not byte[])
+        public bool IsReadOnly { get; set; }    // Read-only/computed properties should be skipped
+        public bool IsValueTypeCollection { get; set; }  // Value types that implement IList<T> (like NpgsqlPolygon)
+        public string? ElementType { get; set; }
+        public bool IsElementComplexType { get; set; }
+        public bool IsElementGuid { get; set; }
+        public List<PropertyInfo>? ElementNestedProperties { get; set; }
+
+        public PropertyInfo()
+        {
+            Name = string.Empty;
+            Type = string.Empty;
+            FullyQualifiedType = string.Empty;
+            ProtoType = string.Empty;
+            IsComplexType = false;
+            NestedProperties = new List<PropertyInfo>();
+            IsEnum = false;
+            IsList = false;
+            IsNullable = false;
+            IsDecimal = false;
+            IsDateTime = false;
+            IsDateTimeOffset = false;
+            IsGuid = false;
+            IsJsonElement = false;
+            IsBinaryType = false;
+            IsStream = false;
+            IsReadOnly = false;
+            IsValueTypeCollection = false;
+            IsElementComplexType = false;
+            IsElementGuid = false;
+        }
     }
 }

Svrnty.CQRS.Grpc.Generators/Models/DynamicQueryInfo.cs

@@ -1,27 +1,28 @@
-namespace Svrnty.CQRS.Grpc.Generators.Models;
-
-public class DynamicQueryInfo
+namespace Svrnty.CQRS.Grpc.Generators.Models
 {
-    public string Name { get; set; }
-    public string SourceType { get; set; }
-    public string SourceTypeFullyQualified { get; set; }
-    public string DestinationType { get; set; }
-    public string DestinationTypeFullyQualified { get; set; }
-    public string? ParamsType { get; set; }
-    public string? ParamsTypeFullyQualified { get; set; }
-    public string HandlerInterfaceName { get; set; }
-    public string QueryInterfaceName { get; set; }
-    public bool HasParams { get; set; }
-
-    public DynamicQueryInfo()
+    public class DynamicQueryInfo
     {
-        Name = string.Empty;
-        SourceType = string.Empty;
-        SourceTypeFullyQualified = string.Empty;
-        DestinationType = string.Empty;
-        DestinationTypeFullyQualified = string.Empty;
-        HandlerInterfaceName = string.Empty;
-        QueryInterfaceName = string.Empty;
-        HasParams = false;
+        public string Name { get; set; }
+        public string SourceType { get; set; }
+        public string SourceTypeFullyQualified { get; set; }
+        public string DestinationType { get; set; }
+        public string DestinationTypeFullyQualified { get; set; }
+        public string? ParamsType { get; set; }
+        public string? ParamsTypeFullyQualified { get; set; }
+        public string HandlerInterfaceName { get; set; }
+        public string QueryInterfaceName { get; set; }
+        public bool HasParams { get; set; }
+
+        public DynamicQueryInfo()
+        {
+            Name = string.Empty;
+            SourceType = string.Empty;
+            SourceTypeFullyQualified = string.Empty;
+            DestinationType = string.Empty;
+            DestinationTypeFullyQualified = string.Empty;
+            HandlerInterfaceName = string.Empty;
+            QueryInterfaceName = string.Empty;
+            HasParams = false;
+        }
     }
 }

Svrnty.CQRS.Grpc.Generators/Models/NotificationInfo.cs

@@ -1,49 +1,50 @@
 using System.Collections.Generic;
 
-namespace Svrnty.CQRS.Grpc.Generators.Models;
-
-/// <summary>
-/// Represents a discovered streaming notification type for proto/gRPC generation.
-/// </summary>
-public class NotificationInfo
+namespace Svrnty.CQRS.Grpc.Generators.Models
 {
     /// <summary>
-    /// The notification type name (e.g., "InventoryChangeNotification").
+    /// Represents a discovered streaming notification type for proto/gRPC generation.
     /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// The fully qualified type name including namespace.
-    /// </summary>
-    public string FullyQualifiedName { get; set; }
-
-    /// <summary>
-    /// The namespace of the notification type.
-    /// </summary>
-    public string Namespace { get; set; }
-
-    /// <summary>
-    /// The property name used as the subscription key (from [StreamingNotification] attribute).
-    /// </summary>
-    public string SubscriptionKeyProperty { get; set; }
-
-    /// <summary>
-    /// The subscription key property info.
-    /// </summary>
-    public PropertyInfo SubscriptionKeyInfo { get; set; }
-
-    /// <summary>
-    /// All properties of the notification type.
-    /// </summary>
-    public List<PropertyInfo> Properties { get; set; }
-
-    public NotificationInfo()
+    public class NotificationInfo
     {
-        Name = string.Empty;
-        FullyQualifiedName = string.Empty;
-        Namespace = string.Empty;
-        SubscriptionKeyProperty = string.Empty;
-        SubscriptionKeyInfo = new PropertyInfo();
-        Properties = new List<PropertyInfo>();
+        /// <summary>
+        /// The notification type name (e.g., "InventoryChangeNotification").
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The fully qualified type name including namespace.
+        /// </summary>
+        public string FullyQualifiedName { get; set; }
+
+        /// <summary>
+        /// The namespace of the notification type.
+        /// </summary>
+        public string Namespace { get; set; }
+
+        /// <summary>
+        /// The property name used as the subscription key (from [StreamingNotification] attribute).
+        /// </summary>
+        public string SubscriptionKeyProperty { get; set; }
+
+        /// <summary>
+        /// The subscription key property info.
+        /// </summary>
+        public PropertyInfo SubscriptionKeyInfo { get; set; }
+
+        /// <summary>
+        /// All properties of the notification type.
+        /// </summary>
+        public List<PropertyInfo> Properties { get; set; }
+
+        public NotificationInfo()
+        {
+            Name = string.Empty;
+            FullyQualifiedName = string.Empty;
+            Namespace = string.Empty;
+            SubscriptionKeyProperty = string.Empty;
+            SubscriptionKeyInfo = new PropertyInfo();
+            Properties = new List<PropertyInfo>();
+        }
     }
 }

Svrnty.CQRS.Grpc.Generators/Models/QueryInfo.cs

@@ -1,29 +1,30 @@
 using System.Collections.Generic;
 
-namespace Svrnty.CQRS.Grpc.Generators.Models;
-
-public class QueryInfo
+namespace Svrnty.CQRS.Grpc.Generators.Models
 {
-    public string Name { get; set; }
-    public string FullyQualifiedName { get; set; }
-    public string Namespace { get; set; }
-    public List<PropertyInfo> Properties { get; set; }
-    public string ResultType { get; set; }
-    public string ResultFullyQualifiedName { get; set; }
-    public string HandlerInterfaceName { get; set; }
-    public List<PropertyInfo> ResultProperties { get; set; }
-    public bool IsResultPrimitiveType { get; set; }
-
-    public QueryInfo()
+    public class QueryInfo
     {
-        Name = string.Empty;
-        FullyQualifiedName = string.Empty;
-        Namespace = string.Empty;
-        Properties = new List<PropertyInfo>();
-        ResultType = string.Empty;
-        ResultFullyQualifiedName = string.Empty;
-        HandlerInterfaceName = string.Empty;
-        ResultProperties = new List<PropertyInfo>();
-        IsResultPrimitiveType = false;
+        public string Name { get; set; }
+        public string FullyQualifiedName { get; set; }
+        public string Namespace { get; set; }
+        public List<PropertyInfo> Properties { get; set; }
+        public string ResultType { get; set; }
+        public string ResultFullyQualifiedName { get; set; }
+        public string HandlerInterfaceName { get; set; }
+        public List<PropertyInfo> ResultProperties { get; set; }
+        public bool IsResultPrimitiveType { get; set; }
+
+        public QueryInfo()
+        {
+            Name = string.Empty;
+            FullyQualifiedName = string.Empty;
+            Namespace = string.Empty;
+            Properties = new List<PropertyInfo>();
+            ResultType = string.Empty;
+            ResultFullyQualifiedName = string.Empty;
+            HandlerInterfaceName = string.Empty;
+            ResultProperties = new List<PropertyInfo>();
+            IsResultPrimitiveType = false;
+        }
     }
 }

Svrnty.CQRS.MinimalApi/WebApplicationExtensions.cs

@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Svrnty.CQRS.Configuration;
 
-namespace Svrnty.CQRS;
+namespace Svrnty.CQRS.MinimalApi;
 
 public static class WebApplicationExtensions
 {

Svrnty.CQRS/Configuration/CqrsBuilder.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 using Svrnty.CQRS.Abstractions;
 using Svrnty.CQRS.Discovery;
@@ -44,7 +43,7 @@ public class CqrsBuilder
     /// <summary>
     /// Adds a command handler to the CQRS pipeline
     /// </summary>
-    public CqrsBuilder AddCommand<TCommand, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCommandHandler>()
+    public CqrsBuilder AddCommand<TCommand, TCommandHandler>()
         where TCommand : class
         where TCommandHandler : class, ICommandHandler<TCommand>
     {
@@ -55,7 +54,7 @@ public class CqrsBuilder
     /// <summary>
     /// Adds a command handler with result to the CQRS pipeline
     /// </summary>
-    public CqrsBuilder AddCommand<TCommand, TResult, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TCommandHandler>()
+    public CqrsBuilder AddCommand<TCommand, TResult, TCommandHandler>()
         where TCommand : class
         where TCommandHandler : class, ICommandHandler<TCommand, TResult>
     {

Svrnty.CQRS/Discovery/CommandDiscovery.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Svrnty.CQRS.Abstractions.Discovery;

Svrnty.CQRS/Discovery/QueryDiscovery.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Svrnty.CQRS.Abstractions.Discovery;

Svrnty.CQRS/Svrnty.CQRS.csproj

@@ -26,10 +26,6 @@
     <None Include="..\README.md" Pack="true" PackagePath="" CopyToOutputDirectory="Always" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Svrnty.CQRS.Abstractions\Svrnty.CQRS.Abstractions.csproj" />
   </ItemGroup>

Svrnty.Sample/Program.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Svrnty.CQRS;
-using Svrnty.CQRS.Abstractions;
-using Svrnty.CQRS.DynamicQuery;
 using Svrnty.CQRS.FluentValidation;
 using Svrnty.CQRS.Grpc;
-using Svrnty.CQRS.MinimalApi;
 using Svrnty.Sample;
+using Svrnty.CQRS.MinimalApi;
+using Svrnty.CQRS.DynamicQuery;
+using Svrnty.CQRS.Abstractions;
 
 var builder = WebApplication.CreateBuilder(args);
 

Svrnty.Sample/SimpleAsyncQueryableService.cs

@@ -1,5 +1,5 @@
-using System.Linq.Expressions;
 using PoweredSoft.Data.Core;
+using System.Linq.Expressions;
 
 namespace Svrnty.Sample;