Make API generation non interactive (#5078)

Mpdreamz · Mpdreamz · commit 6b4fab7613b7 · 2020-11-09T14:08:18.000+01:00
(cherry picked from commit 06d9c52) (cherry picked from commit 6a1ca48)
diff --git a/src/ApiGenerator/ApiGenerator.csproj b/src/ApiGenerator/ApiGenerator.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsPackable>false</IsPackable>
     
-    <NoWarn>NU1701</NoWarn>
+    <NoWarn>CS1591;NU1701</NoWarn>
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
   <ItemGroup>
@@ -15,6 +15,8 @@
     <PackageReference Include="CsQuery.Core" Version="2.0.1" />
     <!-- https://github.com/toddams/RazorLight/issues/172 -->
     <PackageReference Include="RazorLight.Unofficial" Version="2.0.0-beta1.3" />
+    <PackageReference Include="Spectre.Console" Version="0.27.1-preview.0.8" />
+    <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.20371.2" />
     <!--<PackageReference Include="RazorLight" Version="2.0.0-beta1" />-->
   </ItemGroup>
   <ItemGroup>
diff --git a/src/ApiGenerator/Configuration/GeneratorLocations.cs b/src/ApiGenerator/Configuration/GeneratorLocations.cs
@@ -11,7 +11,7 @@ public static class GeneratorLocations
 	{
 		// @formatter:off — disable formatter after this line
 		public static string EsNetFolder { get; } = $@"{Root}../../src/Elasticsearch.Net/";
-		public static string LastDownloadedVersionFile { get; } = Path.Combine(Root, "last_downloaded_version.txt");
+		public static string LastDownloadedRef { get; } = Path.Combine(Root, "last_downloaded_version.txt");
 
 		public static string NestFolder { get; } = $@"{Root}../../src/Nest/";
 		public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification/";
diff --git a/src/ApiGenerator/Generator/ApiEndpointFactory.cs b/src/ApiGenerator/Generator/ApiEndpointFactory.cs
@@ -56,7 +56,13 @@ private static void EnforceRequiredOnParts(string jsonFile, UrlInformation url)
 			{
 				var required = url.Paths.All(p => p.Path.Contains($"{{{part.Name}}}"));
 				if (part.Required != required)
-					ApiGenerator.Warnings.Add($"{jsonFile} has part: {part.Name} listed as {part.Required} but should be {required}");
+				{
+					var message = required
+						? "is [b green] required [/] but appears in spec as [b red] optional [/]"
+						: "is [b green] optional [/] but marked as [b red] required [/]  ";
+					// TODO submit PR to fix these, too noisy for now
+					//ApiGenerator.Warnings.Add($"[grey]{jsonFile}[/] part [b white] {part.Name} [/] {message}");
+				}
 				part.Required = required;
 			}
 		}
diff --git a/src/ApiGenerator/Generator/ApiGenerator.cs b/src/ApiGenerator/Generator/ApiGenerator.cs
@@ -6,7 +6,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
+ using System.Threading;
+ using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
 using ApiGenerator.Domain.Specification;
@@ -20,17 +21,17 @@ public class ApiGenerator
 	{
 		public static List<string> Warnings { get; private set; } = new List<string>();
 
-		public static async Task Generate(string downloadBranch, bool lowLevelOnly, RestApiSpec spec)
+		public static async Task Generate(string downloadBranch, bool lowLevelOnly, RestApiSpec spec, CancellationToken token)
 		{
-			static async Task DoGenerate(ICollection<RazorGeneratorBase> generators, RestApiSpec restApiSpec, bool highLevel)
+			static async Task DoGenerate(ICollection<RazorGeneratorBase> generators, RestApiSpec restApiSpec, bool highLevel, CancellationToken token)
 			{
-				var pbarOpts = new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray };
+				var pbarOpts = new ProgressBarOptions { ProgressCharacter = '─', BackgroundColor = ConsoleColor.Yellow };
 				var message = $"Generating {(highLevel ? "high" : "low")} level code";
 				using var pbar = new ProgressBar(generators.Count, message, pbarOpts);
 				foreach (var generator in generators)
 				{
 					pbar.Message = "Generating " + generator.Title;
-					await generator.Generate(restApiSpec, pbar);
+					await generator.Generate(restApiSpec, pbar, token);
 					pbar.Tick("Generated " + generator.Title);
 				}
 			}
@@ -55,23 +56,10 @@ static async Task DoGenerate(ICollection<RazorGeneratorBase> generators, RestApi
 				new RequestsGenerator(),
 			};
 
-			await DoGenerate(lowLevelGenerators, spec, highLevel: false);
+			await DoGenerate(lowLevelGenerators, spec, highLevel: false, token);
 			if (!lowLevelOnly)
-				await DoGenerate(highLevelGenerators, spec, highLevel: true);
+				await DoGenerate(highLevelGenerators, spec, highLevel: true, token);
 
-			// Check if there are any non-Stable endpoints present.
-			foreach (var endpoint in spec.Endpoints)
-			{
-				if (endpoint.Value.Stability != Stability.Stable)
-					Warnings.Add($"Endpoint {endpoint.Value.Name} is not marked as Stable ({endpoint.Value.Stability})");
-			}
-
-			if (Warnings.Count == 0) return;
-
-			Console.ForegroundColor = ConsoleColor.Yellow;
-			foreach (var warning in Warnings.Distinct().OrderBy(w => w))
-				Console.WriteLine(warning);
-			Console.ResetColor();
 		}
 
 		public static RestApiSpec CreateRestApiSpecModel(string downloadBranch, params string[] folders)
@@ -84,7 +72,7 @@ public static RestApiSpec CreateRestApiSpecModel(string downloadBranch, params s
 			var endpoints = new SortedDictionary<string, ApiEndpoint>();
 			var seenFiles = new HashSet<string>();
 			using (var pbar = new ProgressBar(directories.Count, $"Listing {directories.Count} directories",
-				new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray, CollapseWhenFinished = false }))
+				new ProgressBarOptions { ProgressCharacter = '─', BackgroundColor = ConsoleColor.DarkGray, CollapseWhenFinished = false }))
 			{
 				var folderFiles = directories.Select(dir =>
 					Directory.GetFiles(dir)
diff --git a/src/ApiGenerator/Generator/Razor/ApiUrlsLookupsGenerator.cs b/src/ApiGenerator/Generator/Razor/ApiUrlsLookupsGenerator.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -13,12 +14,12 @@ public class ApiUrlsLookupsGenerator : RazorGeneratorBase
 	{
 		public override string Title => "NEST static url lookups";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			var view = ViewLocations.HighLevel("Requests", "ApiUrlsLookup.cshtml");
 			var target = GeneratorLocations.HighLevel("_Generated", "ApiUrlsLookup.generated.cs");
 
-			await DoRazor(spec, view, target);
+			await DoRazor(spec, view, target, null, token);
 		}
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/DescriptorsGenerator.cs b/src/ApiGenerator/Generator/Razor/DescriptorsGenerator.cs
@@ -4,6 +4,7 @@
 
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -15,20 +16,20 @@ public class DescriptorsGenerator : RazorGeneratorBase
 	{
 		public override string Title => "NEST descriptors";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			// Delete existing files
 			foreach (var file in Directory.GetFiles(GeneratorLocations.NestFolder, "Descriptors.*.cs"))
 				File.Delete(file);
 
 			var view = ViewLocations.HighLevel("Descriptors", "RequestDescriptorBase.cshtml");
 			var target = GeneratorLocations.HighLevel("Descriptors.cs");
-			await DoRazor(spec, view, target);
+			await DoRazor(spec, view, target, null, token);
 
 			var dependantView = ViewLocations.HighLevel("Descriptors", "Descriptors.cshtml");
 			string Target(string id) => GeneratorLocations.HighLevel($"Descriptors.{id}.cs");
 			var namespaced = spec.EndpointsPerNamespaceHighLevel.ToList();
-			await DoRazorDependantFiles(progressBar, namespaced, dependantView, kv => kv.Key, id => Target(id));
+			await DoRazorDependantFiles(progressBar, namespaced, dependantView, kv => kv.Key, id => Target(id), token);
 		}
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/EnumsGenerator.cs b/src/ApiGenerator/Generator/Razor/EnumsGenerator.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -13,12 +14,12 @@ public class EnumsGenerator : RazorGeneratorBase
 	{
 		public override string Title => "Elasticsearch.Net enums";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			var view = ViewLocations.LowLevel("Enums.Generated.cshtml");
 			var target = GeneratorLocations.LowLevel("Api", "Enums.Generated.cs");
 
-			await DoRazor(spec, view, target);
+			await DoRazor(spec, view, target, null, token);
 		}
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/HighLevelClientImplementationGenerator.cs b/src/ApiGenerator/Generator/Razor/HighLevelClientImplementationGenerator.cs
@@ -4,6 +4,7 @@
 
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -16,21 +17,21 @@ public class HighLevelClientImplementationGenerator : RazorGeneratorBase
 	{
 		public override string Title => "NEST client implementation";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			// Delete existing files
 			foreach (var file in Directory.GetFiles(GeneratorLocations.NestFolder, "ElasticClient.*.cs"))
 				File.Delete(file);
 
 			var view = ViewLocations.HighLevel("Client", "Implementation", "ElasticClient.cshtml");
 			var target = GeneratorLocations.HighLevel($"ElasticClient.{CsharpNames.RootNamespace}.cs");
-			await DoRazor(spec, view, target);
+			await DoRazor(spec, view, target, null, token);
 
 			string Target(string id) => GeneratorLocations.HighLevel($"ElasticClient.{id}.cs");
 
 			var namespaced = spec.EndpointsPerNamespaceHighLevel.Where(kv => kv.Key != CsharpNames.RootNamespace).ToList();
 			var dependantView = ViewLocations.HighLevel("Client", "Implementation", "ElasticClient.Namespace.cshtml");
-			await DoRazorDependantFiles(progressBar, namespaced, dependantView, kv => kv.Key, id => Target(id));
+			await DoRazorDependantFiles(progressBar, namespaced, dependantView, kv => kv.Key, id => Target(id), token);
 
 		}
 	}
diff --git a/src/ApiGenerator/Generator/Razor/HighLevelClientInterfaceGenerator.cs b/src/ApiGenerator/Generator/Razor/HighLevelClientInterfaceGenerator.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -13,12 +14,12 @@ public class HighLevelClientInterfaceGenerator : RazorGeneratorBase
 	{
 		public override string Title => "NEST client interface";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			var view = ViewLocations.HighLevel("Client", "Interface", "IElasticClient.cshtml");
 			var target = GeneratorLocations.HighLevel("IElasticClient.Generated.cs");
 
-			await DoRazor(spec, view, target);
+			await DoRazor(spec, view, target, null, token);
 		}
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/LowLevelClientImplementationGenerator.cs b/src/ApiGenerator/Generator/Razor/LowLevelClientImplementationGenerator.cs
@@ -4,6 +4,7 @@
 
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -16,20 +17,20 @@ public class LowLevelClientImplementationGenerator : RazorGeneratorBase
 	{
 		public override string Title { get; } = "Elasticsearch.Net client implementation";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			// Delete existing files
 			foreach (var file in Directory.GetFiles(GeneratorLocations.EsNetFolder, "ElasticLowLevelClient.*.cs"))
 				File.Delete(file);
 
 			var view = ViewLocations.LowLevel("Client", "Implementation", "ElasticLowLevelClient.cshtml");
 			var target = GeneratorLocations.LowLevel($"ElasticLowLevelClient.{CsharpNames.RootNamespace}.cs");
-			await DoRazor(spec, view, target);
+			await DoRazor(spec, view, target, null, token);
 
 			var namespaced = spec.EndpointsPerNamespaceLowLevel.Where(kv => kv.Key != CsharpNames.RootNamespace).ToList();
 			var namespacedView = ViewLocations.LowLevel("Client", "Implementation", "ElasticLowLevelClient.Namespace.cshtml");
 			await DoRazorDependantFiles(progressBar, namespaced, namespacedView, kv => kv.Key,
-				id => GeneratorLocations.LowLevel($"ElasticLowLevelClient.{id}.cs"));
+				id => GeneratorLocations.LowLevel($"ElasticLowLevelClient.{id}.cs"), token);
 		}
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/LowLevelClientInterfaceGenerator.cs b/src/ApiGenerator/Generator/Razor/LowLevelClientInterfaceGenerator.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -13,12 +14,12 @@ public class LowLevelClientInterfaceGenerator : RazorGeneratorBase
 	{
 		public override string Title { get; } = "Elasticsearch.Net client interface";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			var view = ViewLocations.LowLevel("Client", "Interface", "IElasticLowLevelClient.cshtml");
 			var target = GeneratorLocations.LowLevel("IElasticLowLevelClient.Generated.cs");
 
-			await DoRazor(spec, view, target);
+			await DoRazor(spec, view, target, null, token);
 		}
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/RazorGeneratorBase.cs b/src/ApiGenerator/Generator/Razor/RazorGeneratorBase.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -24,12 +25,13 @@ public abstract class RazorGeneratorBase
 			.UseMemoryCachingProvider()
 			.Build();
 
-		protected async Task DoRazor<TModel>(TModel model, string viewLocation, string targetLocation, string cacheNameSuffix = null)
+		protected async Task DoRazor<TModel>(TModel model, string viewLocation, string targetLocation, string cacheNameSuffix, CancellationToken token)
 		{
 			try
 			{
 				var name = GetType().Name + cacheNameSuffix;
-				var sourceFileContents = File.ReadAllText(viewLocation);
+				var sourceFileContents = await File.ReadAllTextAsync(viewLocation, token);
+				token.ThrowIfCancellationRequested();
 				var generated = await Engine.CompileRenderStringAsync(name, sourceFileContents,  model);
 				WriteFormattedCsharpFile(targetLocation, generated);
 			}
@@ -42,15 +44,21 @@ protected async Task DoRazor<TModel>(TModel model, string viewLocation, string t
 
 		protected async Task DoRazorDependantFiles<TModel>(
 			ProgressBar pbar, IReadOnlyCollection<TModel> items, string viewLocation,
-			Func<TModel, string> identifier, Func<string, string> target)
+			Func<TModel, string> identifier, Func<string, string> target,
+			CancellationToken token
+			)
 		{
-			using (var c = pbar.Spawn(items.Count, "Generating namespaces", new ProgressBarOptions { ForegroundColor = ConsoleColor.Yellow }))
+			using (var c = pbar.Spawn(items.Count, "Generating namespaces", new ProgressBarOptions
+			{
+				ProgressCharacter = '─',
+				ForegroundColor = ConsoleColor.Yellow
+			}))
 			{
 				foreach (var item in items)
 				{
 					var id = identifier(item);
 					var targetLocation = target(id);
-					await DoRazor(item, viewLocation, targetLocation, id);
+					await DoRazor(item, viewLocation, targetLocation, id, token);
 					c.Tick($"{Title}: {id}");
 				}
 			}
@@ -65,6 +73,6 @@ protected static void WriteFormattedCsharpFile(string path, string contents)
 		}
 
 		public abstract string Title { get; }
-		public abstract Task Generate(RestApiSpec spec, ProgressBar progressBar);
+		public abstract Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token);
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/RequestParametersGenerator.cs b/src/ApiGenerator/Generator/Razor/RequestParametersGenerator.cs
@@ -4,6 +4,7 @@
 
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using ApiGenerator.Configuration;
 using ApiGenerator.Domain;
@@ -15,7 +16,7 @@ public class RequestParametersGenerator : RazorGeneratorBase
 	{
 		public override string Title { get; } = "Elasticsearch.Net request parameters";
 
-		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
+		public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
 		{
 			// Delete existing files
 			foreach (var file in Directory.GetFiles(GeneratorLocations.EsNetFolder, "RequestParameters.*.cs"))
@@ -25,7 +26,7 @@ public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)
 			string Target(string id) => GeneratorLocations.LowLevel("Api", "RequestParameters", $"RequestParameters.{id}.cs");
 
 			var namespaced = spec.EndpointsPerNamespaceLowLevel.ToList();
-			await DoRazorDependantFiles(progressBar, namespaced, view, kv => kv.Key, id => Target(id));
+			await DoRazorDependantFiles(progressBar, namespaced, view, kv => kv.Key, id => Target(id), token);
 		}
 	}
 }
diff --git a/src/ApiGenerator/Generator/Razor/RequestsGenerator.cs b/src/ApiGenerator/Generator/Razor/RequestsGenerator.cs
diff --git a/src/ApiGenerator/Program.cs b/src/ApiGenerator/Program.cs
diff --git a/src/ApiGenerator/RestSpecDownloader.cs b/src/ApiGenerator/RestSpecDownloader.cs
diff --git a/src/ApiGenerator/RestSpecification/Core/root.html b/src/ApiGenerator/RestSpecification/Core/root.html
diff --git a/src/ApiGenerator/RestSpecification/XPack/root.html b/src/ApiGenerator/RestSpecification/XPack/root.html

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public static class GeneratorLocations`
`11`	`11`	`{`
`12`	`12`	`// @formatter:off — disable formatter after this line`
`13`	`13`	`public static string EsNetFolder { get; } = $@"{Root}../../src/Elasticsearch.Net/";`
`14`		`- public static string LastDownloadedVersionFile { get; } = Path.Combine(Root, "last_downloaded_version.txt");`
	`14`	`+ public static string LastDownloadedRef { get; } = Path.Combine(Root, "last_downloaded_version.txt");`
`15`	`15`
`16`	`16`	`public static string NestFolder { get; } = $@"{Root}../../src/Nest/";`
`17`	`17`	`public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification/";`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,13 @@ private static void EnforceRequiredOnParts(string jsonFile, UrlInformation url)`
`56`	`56`	`{`
`57`	`57`	`var required = url.Paths.All(p => p.Path.Contains($"{{{part.Name}}}"));`
`58`	`58`	`if (part.Required != required)`
`59`		`- ApiGenerator.Warnings.Add($"{jsonFile} has part: {part.Name} listed as {part.Required} but should be {required}");`
	`59`	`+ {`
	`60`	`+ var message = required`
	`61`	`+ ? "is [b green] required [/] but appears in spec as [b red] optional [/]"`
	`62`	`+ : "is [b green] optional [/] but marked as [b red] required [/] ";`
	`63`	`+ // TODO submit PR to fix these, too noisy for now`
	`64`	`+ //ApiGenerator.Warnings.Add($"[grey]{jsonFile}[/] part [b white] {part.Name} [/] {message}");`
	`65`	`+ }`
`60`	`66`	`part.Required = required;`
`61`	`67`	`}`
`62`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.`
`3`	`3`	`// See the LICENSE file in the project root for more information`
`4`	`4`
	`5`	`+using System.Threading;`
`5`	`6`	`using System.Threading.Tasks;`
`6`	`7`	`using ApiGenerator.Configuration;`
`7`	`8`	`using ApiGenerator.Domain;`
`@@ -13,12 +14,12 @@ public class ApiUrlsLookupsGenerator : RazorGeneratorBase`
`13`	`14`	`{`
`14`	`15`	`public override string Title => "NEST static url lookups";`
`15`	`16`
`16`		`- public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)`
	`17`	`+ public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)`
`17`	`18`	`{`
`18`	`19`	`var view = ViewLocations.HighLevel("Requests", "ApiUrlsLookup.cshtml");`
`19`	`20`	`var target = GeneratorLocations.HighLevel("_Generated", "ApiUrlsLookup.generated.cs");`
`20`	`21`
`21`		`- await DoRazor(spec, view, target);`
	`22`	`+ await DoRazor(spec, view, target, null, token);`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Linq;`
	`7`	`+using System.Threading;`
`7`	`8`	`using System.Threading.Tasks;`
`8`	`9`	`using ApiGenerator.Configuration;`
`9`	`10`	`using ApiGenerator.Domain;`
`@@ -15,20 +16,20 @@ public class DescriptorsGenerator : RazorGeneratorBase`
`15`	`16`	`{`
`16`	`17`	`public override string Title => "NEST descriptors";`
`17`	`18`
`18`		`- public override async Task Generate(RestApiSpec spec, ProgressBar progressBar)`
	`19`	`+ public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)`
`19`	`20`	`{`
`20`	`21`	`// Delete existing files`
`21`	`22`	`foreach (var file in Directory.GetFiles(GeneratorLocations.NestFolder, "Descriptors.*.cs"))`
`22`	`23`	`File.Delete(file);`
`23`	`24`
`24`	`25`	`var view = ViewLocations.HighLevel("Descriptors", "RequestDescriptorBase.cshtml");`
`25`	`26`	`var target = GeneratorLocations.HighLevel("Descriptors.cs");`
`26`		`- await DoRazor(spec, view, target);`
	`27`	`+ await DoRazor(spec, view, target, null, token);`
`27`	`28`
`28`	`29`	`var dependantView = ViewLocations.HighLevel("Descriptors", "Descriptors.cshtml");`
`29`	`30`	`string Target(string id) => GeneratorLocations.HighLevel($"Descriptors.{id}.cs");`
`30`	`31`	`var namespaced = spec.EndpointsPerNamespaceHighLevel.ToList();`
`31`		`- await DoRazorDependantFiles(progressBar, namespaced, dependantView, kv => kv.Key, id => Target(id));`
	`32`	`+ await DoRazorDependantFiles(progressBar, namespaced, dependantView, kv => kv.Key, id => Target(id), token);`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`	`}`