Publish JsonRpc package (#385)

* Update publish.yaml * Internalized JsonRpc * Moved IVT to projectfile as per review comment
Draco-lang · Jan 31, 2024 · 3065233 · 3065233
1 parent 7dfb8b8
commit 3065233
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -58,8 +58,8 @@ jobs:
       run: |
         cd src
         $sdkProjects = "Compiler", "Compiler.Toolset", "Sdk", "ProjectTemplates"
-        $langserverProjects = "Compiler", "LanguageServer", "Lsp"
-        $debugadapterProjects = "DebugAdapter", "Dap"
+        $langserverProjects = "Compiler", "LanguageServer", "Lsp", "JsonRpc"
+        $debugadapterProjects = "DebugAdapter", "Dap", "JsonRpc"
         $projects = @()
 
         if ($${{ github.event.inputs.deploy-sdk }}) { $projects += $sdkProjects; }

diff --git a/src/Draco.Compiler/Attributes.cs b/src/Draco.Compiler/Attributes.cs
diff --git a/src/Draco.Compiler/Draco.Compiler.csproj b/src/Draco.Compiler/Draco.Compiler.csproj
@@ -7,6 +7,12 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Draco.Compiler.Tests" />
+    <InternalsVisibleTo Include="Draco.Compiler.Benchmarks" />
+    <InternalsVisibleTo Include="Draco.Compiler.Fuzzer" />
+  </ItemGroup>
+
   <ItemGroup>
     <AdditionalFiles Include="Internal\Syntax\Syntax.xml" />
     <AdditionalFiles Include="Internal\BoundTree\BoundNodes.xml" />

diff --git a/src/Draco.Dap/Adapter/DebugAdapter.cs b/src/Draco.Dap/Adapter/DebugAdapter.cs
@@ -38,7 +38,7 @@ public static IDebugClient Connect(IDuplexPipe stream)
     /// <returns>The task that completes when the communication is over.</returns>
     public static async Task RunAsync(this IDebugClient client, IDebugAdapter adapter)
     {
-        var connection = client.Connection;
+        var connection = ((DebugClientProxy)client).Connection;
 
         // Register adapter methods
         RegisterAdapterRpcMethods(adapter, connection);

diff --git a/src/Draco.Dap/Adapter/IDebugClient.cs b/src/Draco.Dap/Adapter/IDebugClient.cs
@@ -8,7 +8,7 @@ namespace Draco.Dap.Adapter;
 /// <summary>
 /// An interface representing the debug client on the remote.
 /// </summary>
-public interface IDebugClient : IJsonRpcClient
+public interface IDebugClient
 {
     [Event("initialized")]
     public Task Initialized();

diff --git a/src/Draco.JsonRpc/Draco.JsonRpc.csproj b/src/Draco.JsonRpc/Draco.JsonRpc.csproj
@@ -6,6 +6,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Draco.Dap" />
+    <InternalsVisibleTo Include="Draco.Lsp" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
   </ItemGroup>

diff --git a/src/Draco.JsonRpc/IJsonRpcClient.cs b/src/Draco.JsonRpc/IJsonRpcClient.cs
@@ -3,7 +3,7 @@ namespace Draco.JsonRpc;
 /// <summary>
 /// The interface all JSON-RPC clients must implement.
 /// </summary>
-public interface IJsonRpcClient
+internal interface IJsonRpcClient
 {
     /// <summary>
     /// The connection.

diff --git a/src/Draco.JsonRpc/IJsonRpcConnection.cs b/src/Draco.JsonRpc/IJsonRpcConnection.cs
@@ -3,7 +3,7 @@ namespace Draco.JsonRpc;
 /// <summary>
 /// Represents a JSON RPC connection.
 /// </summary>
-public interface IJsonRpcConnection
+internal interface IJsonRpcConnection
 {
     /// <summary>
     /// Registers a message handler.

diff --git a/src/Draco.JsonRpc/IJsonRpcMethodHandler.cs b/src/Draco.JsonRpc/IJsonRpcMethodHandler.cs
@@ -5,7 +5,7 @@ namespace Draco.JsonRpc;
 /// <summary>
 /// A registered JSON RPC method handler.
 /// </summary>
-public interface IJsonRpcMethodHandler
+internal interface IJsonRpcMethodHandler
 {
     /// <summary>
     /// The name of the method this handles.

diff --git a/src/Draco.JsonRpc/JsonRpcClientProxy.cs b/src/Draco.JsonRpc/JsonRpcClientProxy.cs
@@ -6,7 +6,7 @@ namespace Draco.JsonRpc;
 /// <summary>
 /// A proxy type for a JSON-RPC client.
 /// </summary>
-public abstract class JsonRpcClientProxy : DispatchProxy
+internal abstract class JsonRpcClientProxy : DispatchProxy
 {
     /// <summary>
     /// The connection of the client.

diff --git a/src/Draco.JsonRpc/JsonRpcConnection.cs b/src/Draco.JsonRpc/JsonRpcConnection.cs
@@ -13,7 +13,7 @@ namespace Draco.JsonRpc;
 /// </summary>
 /// <typeparam name="TMessage">The message type.</typeparam>
 /// <typeparam name="TError">The error descriptor.</typeparam>
-public abstract class JsonRpcConnection<TMessage, TError> : IJsonRpcConnection
+internal abstract class JsonRpcConnection<TMessage, TError> : IJsonRpcConnection
 {
     protected sealed class JsonRpcResponseException : Exception
     {

diff --git a/src/Draco.JsonRpc/JsonRpcMethodHandler.cs b/src/Draco.JsonRpc/JsonRpcMethodHandler.cs
@@ -5,7 +5,7 @@ namespace Draco.JsonRpc;
 /// <summary>
 /// Utilities for construction <see cref="IJsonRpcMethodHandler"/>s.
 /// </summary>
-public static class JsonRpcMethodHandler
+internal static class JsonRpcMethodHandler
 {
     /// <summary>
     /// Constructs a new <see cref="IJsonRpcMethodHandler"/> from a given <see cref="MethodInfo"/>.

diff --git a/src/Draco.Lsp/Server/ILanguageClient.cs b/src/Draco.Lsp/Server/ILanguageClient.cs
@@ -10,7 +10,7 @@ namespace Draco.Lsp.Server;
 /// <summary>
 /// An interface representing the language client on the remote.
 /// </summary>
-public interface ILanguageClient : IJsonRpcClient
+public interface ILanguageClient
 {
     // Language features
 

diff --git a/src/Draco.Lsp/Server/LanguageServer.cs b/src/Draco.Lsp/Server/LanguageServer.cs
@@ -38,7 +38,7 @@ public static ILanguageClient Connect(IDuplexPipe stream)
     /// <returns>The task that completes when the communication is over.</returns>
     public static async Task RunAsync(this ILanguageClient client, ILanguageServer server)
     {
-        var connection = client.Connection;
+        var connection = ((LanguageClientProxy)client).Connection;
 
         // Register server methods
         RegisterServerRpcMethods(server, connection);