Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/Linq2GraphQL.Client/GraphClient.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using Linq2GraphQL.Client.Converters;
using Linq2GraphQL.Client.Schema;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.DependencyInjection;
Expand All @@ -14,6 +13,11 @@ public class GraphClient
private readonly IOptions<GraphClientOptions> options;
private readonly bool includeDeprecated;

public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options, IServiceProvider provider)
: this(httpClient, options, provider, false)
{
}

public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options, IServiceProvider provider, bool includeDeprecated = false)
{
this.options = options;
Expand All @@ -38,7 +42,7 @@ public GraphClient(HttpClient httpClient, IOptions<GraphClientOptions> options,
public SubscriptionProtocol SubscriptionProtocol => options.Value.SubscriptionProtocol;
public HttpClient HttpClient { get; }
public JsonSerializerOptions SerializerOptions { get; }


public Func<GraphClient, Task<GraphQLRequest>> WSConnectionInitPayload => options.Value.WSConnectionInitPayload;
private string GetSubscriptionUrl()
Expand Down Expand Up @@ -85,7 +89,7 @@ public async Task<GraphQLSchema> GetSchemaForSafeModeAsync()
query = Helpers.SchemaQuery;
}

var graphRequest = new GraphQLRequest { Query = query };
var graphRequest = new GraphQLRequest { Query = query };
return await executor.ExecuteRequestAsync("__schema", graphRequest);
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/Linq2GraphQL.Generator/ClientGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public async Task<List<FileEntry>> GenerateAsync(Uri uri, string authToken = nul
query = General.IntrospectionQuery;
}

using var response = await httpClient.PostAsJsonAsync(uri, new { query = query });
using var response = await httpClient.PostAsJsonAsync(uri, new { query = query });
if (!response.IsSuccessStatusCode)
{
throw new Exception(
Expand Down Expand Up @@ -106,7 +106,7 @@ public List<FileEntry> Generate(string schemaJson)

var classInterfacesList = schema.GetClassTypes()?.Where(e => e.HasInterfaces)
?.SelectMany(i => i.Interfaces?.ToDictionary(e => i.Name, e => e.Name))?.ToList() ?? new List<KeyValuePair<string, string>>();

var interfaces = schema.GetInterfaces();
if (interfaces != null)
{
Expand Down
1 change: 1 addition & 0 deletions src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<PackAsTool>true</PackAsTool>
<ToolCommandName>Linq2GraphQL</ToolCommandName>
<TransformOnBuild>true</TransformOnBuild>

<Authors>Joakim Dangården, Magnus Ahlberg</Authors>
<Company>Linq2GraphQL</Company>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ public virtual string TransformText()
#line default
#line hidden
this.Write(";\r\n\r\n /// <summary>\r\n /// ");

#line 13 "C:\Data\Linq2GraphQL.Client-1\src\Linq2GraphQL.Generator\Templates\Scalars\ScalarTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(scalarType.SummaryDescription));
this.Write(this.ToStringHelper.ToStringWithCulture(scalarType.SummaryDescription ?? $"Represents the {scalarType.Name} scalar type"));

#line default
#line hidden
this.Write("\r\n /// </summary>\r\n [JsonConverter(typeof(CustomScalarConverter<");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using System.Text.Json.Serialization;
namespace <#= namespaceName #>;

/// <summary>
/// <#= scalarType.SummaryDescription #>
/// <#= scalarType.SummaryDescription ?? $"Represents the {scalarType.ScalarTypeName} scalar type" #>
/// </summary>
[JsonConverter(typeof(CustomScalarConverter<<#= className #>>))]
public partial class <#= className #> : CustomScalar {}
Loading