[mcp] Split MCP project into 3

src/All.slnx

@@ -231,7 +231,9 @@
   </Folder>
   <Folder Name="/HotChocolate/ModelContextProtocol/" />
   <Folder Name="/HotChocolate/ModelContextProtocol/src/">
+    <Project Path="HotChocolate/ModelContextProtocol/src/HotChocolate.Fusion.ModelContextProtocol/HotChocolate.Fusion.ModelContextProtocol.csproj" />
     <Project Path="HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/HotChocolate.ModelContextProtocol.csproj" />
+    <Project Path="HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/HotChocolate.ModelContextProtocol.Core.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/ModelContextProtocol/test/">
     <Project Path="HotChocolate/ModelContextProtocol/test/HotChocolate.ModelContextProtocol.Tests/HotChocolate.ModelContextProtocol.Tests.csproj" />
@@ -366,4 +368,4 @@
   <Folder Name="/StrawberryShake/Tooling/test/">
     <Project Path="StrawberryShake/Tooling/test/Configuration.Tests/StrawberryShake.Tools.Configuration.Tests.csproj" />
   </Folder>
-</Solution>
+</Solution>

src/HotChocolate/ModelContextProtocol/src/HotChocolate.Fusion.ModelContextProtocol/HotChocolate.Fusion.ModelContextProtocol.csproj

@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>HotChocolate.ModelContextProtocol.Fusion</AssemblyName>
+    <RootNamespace>HotChocolate.ModelContextProtocol</RootNamespace>
+  </PropertyGroup>
+
+</Project>

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/InputFieldExtensions.cs → src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/InputValueDefinitionExtensions.cs

@@ -3,9 +3,9 @@
 
 namespace HotChocolate.ModelContextProtocol.Extensions;
 
-internal static class InputFieldExtensions
+internal static class InputValueDefinitionExtensions
 {
-    public static JsonSchema ToJsonSchema(this InputField inputField)
+    public static JsonSchema ToJsonSchema(this IInputValueDefinition inputField)
     {
         var type = inputField.Type;
         var schemaBuilder = type.ToJsonSchemaBuilder(isOneOf: inputField.DeclaringType.IsOneOf);

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/TypeExtensions.cs → src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/TypeExtensions.cs

@@ -49,7 +49,7 @@ public static JsonSchemaBuilder ToJsonSchemaBuilder(this IType type, bool isOneO
 
         switch (type.NullableType())
         {
-            case EnumType enumType:
+            case IEnumTypeDefinition enumType:
                 // Enum values.
                 List<JsonValue?> enumValues = [];
 
@@ -66,7 +66,7 @@ public static JsonSchemaBuilder ToJsonSchemaBuilder(this IType type, bool isOneO
                 schemaBuilder.Enum(enumValues);
                 break;
 
-            case InputObjectType inputObjectType:
+            case IInputObjectTypeDefinition inputObjectType:
                 // Object properties.
                 var objectProperties = new Dictionary<string, JsonSchema>();
                 var requiredObjectProperties = new List<string>();
@@ -123,11 +123,12 @@ private static SchemaValueType GetJsonSchemaValueType(this IType type)
     {
         return type switch
         {
-            EnumType => SchemaValueType.String,
-            InputObjectType or InterfaceType or ObjectType or UnionType => SchemaValueType.Object,
+            IEnumTypeDefinition => SchemaValueType.String,
+            IInputObjectTypeDefinition or IInterfaceTypeDefinition or IObjectTypeDefinition or IUnionTypeDefinition
+                => SchemaValueType.Object,
             ListType => SchemaValueType.Array,
             NonNullType => GetJsonSchemaValueType(type.NullableType()),
-            ScalarType => type switch
+            IScalarTypeDefinition => type switch
             {
                 AnyType or JsonType =>
                     SchemaValueType.Object

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/ValueNodeExtensions.cs → src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/Extensions/ValueNodeExtensions.cs

@@ -17,19 +17,19 @@
             EnumValueNode enumValueNode => JsonValue.Create(enumValueNode.Value),
             FloatValueNode floatValueNode => nullableType switch
             {
                 DecimalType => JsonValue.Create(floatValueNode.ToDecimal()),
                 FloatType => JsonValue.Create(floatValueNode.ToDouble()),
                 // TODO: Treating all unknown scalar types as strings is a temporary solution.
                 _ => JsonValue.Create(floatValueNode.Value)
             },
             IntValueNode intValueNode => nullableType switch
             {
                 ByteType => JsonValue.Create(intValueNode.ToByte()),
                 DecimalType => JsonValue.Create(intValueNode.ToDecimal()),
                 FloatType => JsonValue.Create(intValueNode.ToDouble()),
                 IntType => JsonValue.Create(intValueNode.ToInt32()),
                 LongType => JsonValue.Create(intValueNode.ToInt64()),
                 ShortType => JsonValue.Create(intValueNode.ToInt16()),
                 // TODO: Treating all unknown scalar types as strings is a temporary solution.
                 _ => JsonValue.Create(intValueNode.Value)
             },
@@ -63,9 +63,9 @@
 
         foreach (var field in valueNode.Fields)
         {
-            var graphQLFieldType = objectType is InputObjectType inputObjectType
+            var graphQLFieldType = objectType is IInputObjectTypeDefinition inputObjectType
                 ? inputObjectType.Fields[field.Name.Value].Type
                 : new AnyType(); // Types like JsonType or AnyType have no schema.
 
             jsonObject.Add(field.Name.Value, field.Value.ToJsonNode(graphQLFieldType));
         }

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol.Core/HotChocolate.ModelContextProtocol.Core.csproj

@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>HotChocolate.ModelContextProtocol.Core</AssemblyName>
+    <RootNamespace>HotChocolate.ModelContextProtocol</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="HotChocolate.ModelContextProtocol" />
+    <InternalsVisibleTo Include="HotChocolate.ModelContextProtocol.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CaseConverter" />
+    <PackageReference Include="ChilliCream.ModelContextProtocol.AspNetCore" />
+    <PackageReference Include="JsonSchema.Net" />
+    <PackageReference Include="System.Reactive" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\src\Execution.Abstractions\HotChocolate.Execution.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\Core\src\Types.Abstractions\HotChocolate.Types.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\Core\src\Validation\HotChocolate.Validation.csproj" />
+    <ProjectReference Include="..\..\..\Language\src\Language\HotChocolate.Language.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\ModelContextProtocolResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ModelContextProtocolResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\ModelContextProtocolResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ModelContextProtocolResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsAttribute.cs

@@ -1,9 +1,8 @@
 using System.Reflection;
-using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
 
-namespace HotChocolate.ModelContextProtocol.Attributes;
+namespace HotChocolate.ModelContextProtocol.Directives;
 
 /// <summary>
 /// Additional properties describing a Tool to clients.

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Directives/McpToolAnnotationsDirectiveType.cs

@@ -1,7 +1,6 @@
-using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.Types;
 
-namespace HotChocolate.ModelContextProtocol.Types;
+namespace HotChocolate.ModelContextProtocol.Directives;
 
 /// <summary>
 /// Additional properties describing a Tool to clients.

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/RequestExecutorBuilderExtensions.cs

@@ -2,10 +2,10 @@
 using HotChocolate.Execution;
 using HotChocolate.Execution.Configuration;
 using HotChocolate.ModelContextProtocol.Diagnostics;
+using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.ModelContextProtocol.Handlers;
 using HotChocolate.ModelContextProtocol.Proxies;
 using HotChocolate.ModelContextProtocol.Storage;
-using HotChocolate.ModelContextProtocol.Types;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/Extensions/SchemaBuilderExtensions.cs

@@ -1,13 +1,13 @@
-using HotChocolate.ModelContextProtocol.Types;
-
-namespace HotChocolate.ModelContextProtocol.Extensions;
-
-public static class SchemaBuilderExtensions
-{
-    public static ISchemaBuilder AddMcp(this ISchemaBuilder builder)
-    {
-        builder.AddDirectiveType<McpToolAnnotationsDirectiveType>();
-
-        return builder;
-    }
-}
+using HotChocolate.ModelContextProtocol.Directives;
+
+namespace HotChocolate.ModelContextProtocol.Extensions;
+
+public static class SchemaBuilderExtensions
+{
+    public static ISchemaBuilder AddMcp(this ISchemaBuilder builder)
+    {
+        builder.AddDirectiveType<McpToolAnnotationsDirectiveType>();
+
+        return builder;
+    }
+}

src/HotChocolate/ModelContextProtocol/src/HotChocolate.ModelContextProtocol/HotChocolate.ModelContextProtocol.csproj

@@ -5,35 +5,10 @@
     <RootNamespace>HotChocolate.ModelContextProtocol</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="HotChocolate.ModelContextProtocol.Tests" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CaseConverter" />
-    <PackageReference Include="ChilliCream.ModelContextProtocol.AspNetCore" />
-    <PackageReference Include="JsonSchema.Net" />
-    <PackageReference Include="System.Reactive" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\Core\src\Execution\HotChocolate.Execution.csproj" />
-    <ProjectReference Include="..\..\..\Language\src\Language\HotChocolate.Language.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\ModelContextProtocolResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ModelContextProtocolResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\ModelContextProtocolResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModelContextProtocolResources.resx</DependentUpon>
-    </Compile>
+    <ProjectReference Include="..\..\..\Core\src\Types\HotChocolate.Types.csproj" />
+    <ProjectReference Include="..\HotChocolate.ModelContextProtocol.Core\HotChocolate.ModelContextProtocol.Core.csproj" />
   </ItemGroup>
 
 </Project>

src/HotChocolate/ModelContextProtocol/test/HotChocolate.ModelContextProtocol.Tests/TestSchema.cs

@@ -4,7 +4,7 @@
 using System.Text.Json;
 using HotChocolate.Authorization;
 using HotChocolate.Language;
-using HotChocolate.ModelContextProtocol.Attributes;
+using HotChocolate.ModelContextProtocol.Directives;
 using HotChocolate.Types;
 
 namespace HotChocolate.ModelContextProtocol;