improve service generator

src/Blockfrost.Api/Extensions/BlockfrostServiceExtensions.Configure.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Linq;
 using System.Net;

src/Blockfrost.Api/Extensions/BlockfrostServiceExtensions.Services.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Net.Http;
 using Blockfrost.Api.Options;
@@ -986,7 +986,6 @@ public static IServiceCollection AddCardanoServices(this IServiceCollection serv
             //    var options = provider.GetService<IOptions<BlockfrostOptions>>();
             //    return new BlockfrostAuthorizationHandler(options.Value[projectName].ApiKey);
             //});
-
             _ = services.AddHealthService(projectName);
             _ = services.AddMetricsService(projectName);
 
@@ -1021,7 +1020,6 @@ public static IServiceCollection AddCardanoServices(this IServiceCollection serv
             services.ConfigureBlockfrost(network, apiKey, projectName, connectionLimit);
 
             _ = services.AddBasicBlockfrostService(projectName, connectionLimit);
-
             _ = services.AddHealthService(projectName, connectionLimit);
             _ = services.AddMetricsService(projectName, connectionLimit);
 
@@ -1228,4 +1226,3 @@ private static TService ServiceFactory<TService>(object migration, HttpClient cl
         }
     }
 }
-

src/Blockfrost.Api/Extensions/BlockfrostServiceExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Blockfrost.Api.Options;
 using Microsoft.Extensions.Configuration;
@@ -22,6 +22,13 @@ public static IServiceCollection AddBlockfrost(this IServiceCollection services)
             return services.AddBlockfrost(config["BFCLI_NETWORK"], config["BFCLI_API_KEY"]);
         }
 
+        /// <summary>
+        /// Adds Blockfrost Services to the service collection and configures the specified projectName using the provided configuration
+        /// </summary>
+        /// <param name="services">The IServiceCollection</param>
+        /// <param name="projectName">The project name to use from the config</param>
+        /// <param name="configuration">The configuration</param>
+        /// <returns></returns>
         public static IServiceCollection AddBlockfrost(this IServiceCollection services, string projectName, IConfiguration configuration)
         {
             _ = services.ConfigureBlockfrost(projectName, configuration);
@@ -31,6 +38,13 @@ public static IServiceCollection AddBlockfrost(this IServiceCollection services,
             return services;
         }
 
+        /// <summary>
+        /// Adds Blockfrost Services to the service collection and configures the services for the project from the provided configuration
+        /// </summary>
+        /// <param name="services">The IServiceCollection</param>
+        /// <param name="projectName">The project name to use from the config</param>
+        /// <param name="configuration">The configuration</param>
+        /// <returns></returns>
         public static IServiceCollection AddBlockfrost(this IServiceCollection services, IConfiguration config)
         {
             var blockfrostConfig = config.GetSection("Blockfrost");
@@ -51,10 +65,12 @@ public static IServiceCollection AddBlockfrost(this IServiceCollection services,
                 return services.AddBlockfrost(project.Name, config);
             }
         }
+
         /// <summary>
-        /// Adds Blockfrost Services to the service collection
+        /// Adds Blockfrost Services to the service collection and configures the services using the provided project
         /// </summary>
         /// <param name="services">The IServiceCollection</param>
+        /// <param name="project">The project to use</param>
         /// <returns></returns>
         public static IServiceCollection AddBlockfrost(this IServiceCollection services, BlockfrostProject project)
         {

src/Blockfrost.Api/Extensions/StringBuilderExtensions.cs

@@ -18,7 +18,7 @@ public static StringBuilder SetRouteParameter(this StringBuilder builder, string
         public static StringBuilder AppendQueryParameter(this StringBuilder builder, string name, object value)
         {
             return name == null
-                ? throw new System.ArgumentNullException(nameof(name))
+                ? throw new System.ArgumentNullException(nameof(name)) 
                 : builder
                 .Append(System.Uri.EscapeDataString(name))
                 .Append('=')

src/Blockfrost.Api/Services/ABlockfrostService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
@@ -19,9 +19,9 @@ public partial class ABlockfrostService : IBlockfrostService
         private JsonSerializerOptions TextJsonSerializerSettings => _options.Value;
 
         protected HttpClient HttpClient { get; set; }
-
+        
         public string Name { get; set; }
-
+        
         public string Network { get; set; }
 
         public string BaseUrl

src/Blockfrost.Api/Services/IBlockfrostService.cs

@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Blockfrost.Api
 {
     /// <summary>

tools/Blockfrost.Api.Generate/templates_simple/ABlockfrostService.hbr

@@ -336,7 +336,10 @@ namespace Blockfrost.Api
 
         private JsonSerializerOptions CreateSerializerOptions()
         {
-            var options = new JsonSerializerOptions();
+            var options = new JsonSerializerOptions
+            {
+                AllowTrailingCommas = true,
+            };
             UpdateJsonSerializerOptions(options);
             return options;
         }

tools/Blockfrost.Api.Generate/templates_simple/BlockfrostServiceExtensions.Configure.hbr

@@ -30,10 +30,9 @@ namespace Blockfrost.Api.Extensions
 
                 var project = blockfrostSection.Get<BlockfrostProject>();
 
-                if (project == null)
+                if (string.IsNullOrEmpty(project.Name))
                 {
-                    // try dictionary
-                    project = blockfrostSection.GetSection($"{projectName}").Get<BlockfrostProject>();
+                    project = blockfrostSection.GetProject(projectName);
                 }
 
                 if (!projectName.Equals(project.Name, StringComparison.Ordinal))

tools/Blockfrost.Api.Generate/templates_simple/BlockfrostServiceExtensions.Services.hbr

@@ -128,8 +128,6 @@ namespace Blockfrost.Api.Extensions
         /// Adds Blockfrost Services to the service collection
         /// </summary>
         /// <param name="services">The IServiceCollection</param>
-        /// <param name="network">The network the services will use</param>
-        /// <param name="apiKey">The ApiKey used to authenticate</param>
         /// <returns></returns>
         public static IServiceCollection AddCardanoServices(this IServiceCollection services, string projectName)
         {

tools/Blockfrost.Api.Generate/templates_simple/BlockfrostServiceExtensions.hbr

@@ -23,11 +23,11 @@ namespace Blockfrost.Api.Extensions
         }
 
         /// <summary>
-        /// Adds Blockfrost Services to the service collection
+        /// Adds Blockfrost Services to the service collection and configures the specified projectName using the provided configuration
         /// </summary>
         /// <param name="services">The IServiceCollection</param>
-        /// <param name="network">The network the services will use</param>
-        /// <param name="apiKey">The ApiKey used to authenticate</param>
+        /// <param name="projectName">The project name to use from the config</param>
+        /// <param name="configuration">The configuration</param>
         /// <returns></returns>
         public static IServiceCollection AddBlockfrost(this IServiceCollection services, string projectName, IConfiguration configuration)
         {
@@ -38,6 +38,13 @@ namespace Blockfrost.Api.Extensions
             return services;
         }
 
+        /// <summary>
+        /// Adds Blockfrost Services to the service collection and configures the services for the project from the provided configuration
+        /// </summary>
+        /// <param name="services">The IServiceCollection</param>
+        /// <param name="projectName">The project name to use from the config</param>
+        /// <param name="configuration">The configuration</param>
+        /// <returns></returns>
         public static IServiceCollection AddBlockfrost(this IServiceCollection services, IConfiguration config)
         {
             var blockfrostConfig = config.GetSection("Blockfrost");
@@ -58,12 +65,12 @@ namespace Blockfrost.Api.Extensions
                 return services.AddBlockfrost(project.Name, config);
             }
         }
+
         /// <summary>
-        /// Adds Blockfrost Services to the service collection
+        /// Adds Blockfrost Services to the service collection and configures the services using the provided project
         /// </summary>
         /// <param name="services">The IServiceCollection</param>
-        /// <param name="network">The network the services will use</param>
-        /// <param name="apiKey">The ApiKey used to authenticate</param>
+        /// <param name="project">The project to use</param>
         /// <returns></returns>
         public static IServiceCollection AddBlockfrost(this IServiceCollection services, BlockfrostProject project)
         {

tools/Blockfrost.Api.Generate/templates_simple/IBlockfrostService.hbr

@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Blockfrost.Api
 {
     /// <summary>