Only generate fastify plugin when option is supplied.

- This allows the plugin to live wherever the user wants it to live. - Ideally I would think the express server should be generated the same way but that would be a breaking change, so maybe not needed?
heymb · heymb · Sep 18, 2023 · Sep 18, 2023 · Dec 15, 2023 · Dec 15, 2023
commit 6470f1db36cda44256825c71e2fb197c65775cd7
diff --git a/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs b/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
@@ -48,10 +48,12 @@ public static int GenerateJavaScript(JavaScriptGeneratorSettings settings) =>
 		/// </summary>
 		public override CodeGenOutput GenerateOutput(ServiceInfo service)
 		{
+			if (Fastify)
+				return GenerateFastifyPluginOutput(service);
+
 			var httpServiceInfo = HttpServiceInfo.Create(service);
 
 			var moduleName = ModuleName ?? service.Name;
-			var camelCaseModuleName = CodeGenUtility.ToCamelCase(moduleName);
 			var capModuleName = CodeGenUtility.Capitalize(moduleName);
 			var typesFileName = CodeGenUtility.Uncapitalize(moduleName) + "Types" + (TypeScript ? ".ts" : ".js");
 			var clientFileName = CodeGenUtility.Uncapitalize(moduleName) + (TypeScript ? ".ts" : ".js");
@@ -510,212 +512,219 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)
 				}));
 			}
 
-			if (Fastify)
+			return new CodeGenOutput(namedTexts, new List<CodeGenPattern>());
+		}
+
+		/// <summary>
+		/// Applies generator-specific settings.
+		/// </summary>
+		public override void ApplySettings(FileGeneratorSettings settings)
+		{
+			var ourSettings = (JavaScriptGeneratorSettings) settings;
+			ModuleName = ourSettings.ModuleName;
+			TypeScript = ourSettings.TypeScript;
+			Express = ourSettings.Express;
+			Fastify = ourSettings.Fastify;
+			DisableESLint = ourSettings.DisableESLint;
+		}
+
+		/// <summary>
+		/// Supports writing output to a single file.
+		/// </summary>
+		public override bool SupportsSingleOutput => true;
+
+		private CodeGenOutput GenerateFastifyPluginOutput(ServiceInfo service)
+		{
+			var httpServiceInfo = HttpServiceInfo.Create(service);
+			var moduleName = ModuleName ?? service.Name;
+			var capModuleName = CodeGenUtility.Capitalize(moduleName);
+			var camelCaseModuleName = CodeGenUtility.ToCamelCase(moduleName);
+			var pluginFileName = CodeGenUtility.Uncapitalize(moduleName) + "Plugin" + (TypeScript ? ".ts" : ".js");
+
+			var file = CreateFile(pluginFileName, code =>
 			{
-				var pluginFileName = CodeGenUtility.Uncapitalize(moduleName) + "Plugin" + (TypeScript ? ".ts" : ".js");
-				namedTexts.Add(CreateFile("fastify/" + pluginFileName, code =>
-				{
-					WriteFileHeader(code);
+				WriteFileHeader(code);
 
-					if (!TypeScript)
-						code.WriteLine("'use strict';");
+				if (!TypeScript)
+					code.WriteLine("'use strict';");
 
-					code.WriteLine();
+				code.WriteLine();
 
-					var fastifyImports = new List<string>();
-					if (TypeScript)
-						fastifyImports.Add("FastifyPluginAsync");
-					WriteImports(code, fastifyImports, "fastify");
+				var fastifyImports = new List<string>();
+				if (TypeScript)
+					fastifyImports.Add("FastifyPluginAsync");
+				WriteImports(code, fastifyImports, "fastify");
 
-					var facilityImports = new List<string>();
-					if (TypeScript)
-					{
-						facilityImports.Add("IServiceResult");
-						facilityImports.Add("IServiceError");
-					}
-					WriteImports(code, facilityImports, "facility-core");
+				var facilityImports = new List<string>();
+				if (TypeScript)
+				{
+					facilityImports.Add("IServiceResult");
+					facilityImports.Add("IServiceError");
+				}
+				WriteImports(code, facilityImports, "facility-core");
 
-					code.WriteLine();
-					WriteStandardErrorCodesVariable("standardErrorCodes", code, httpServiceInfo.ErrorSets);
+				code.WriteLine();
+				WriteStandardErrorCodesVariable("standardErrorCodes", code, httpServiceInfo.ErrorSets);
 
-					code.WriteLine();
-					WriteParseBooleanFunction("parseBoolean", code);
+				code.WriteLine();
+				WriteParseBooleanFunction("parseBoolean", code);
 
-					if (TypeScript)
+				if (TypeScript)
+				{
+					code.WriteLine();
+					using (code.Block($"export type {capModuleName}PluginOptions = {{", "}"))
 					{
-						code.WriteLine();
-						using (code.Block($"export type {capModuleName}PluginOptions = {{", "}"))
-						{
-							code.WriteLine($"api: I{capModuleName};");
-						}
+						code.WriteLine($"api: I{capModuleName};");
 					}
+				}
 
-					code.WriteLine();
-					using (code.Block($"export const {camelCaseModuleName}Plugin" + IfTypeScript($": FastifyPluginAsync<{capModuleName}PluginOptions>") + " = async (fastify, opts) => {", "}"))
+				code.WriteLine();
+				using (code.Block($"export const {camelCaseModuleName}Plugin" + IfTypeScript($": FastifyPluginAsync<{capModuleName}PluginOptions>") + " = async (fastify, opts) => {", "}"))
+				{
+					code.WriteLine("const { api } = opts;");
+
+					foreach (var httpMethodInfo in httpServiceInfo.Methods)
 					{
-						code.WriteLine("const { api } = opts;");
+						var methodName = httpMethodInfo.ServiceMethod.Name;
+						var capMethodName = CodeGenUtility.Capitalize(methodName);
+						var fastifyPath = httpMethodInfo.Path;
+						foreach (var httpPathField in httpMethodInfo.PathFields)
+							fastifyPath = ReplaceOrdinal(fastifyPath, "{" + httpPathField.Name + "}", $":{httpPathField.Name}");
 
-						foreach (var httpMethodInfo in httpServiceInfo.Methods)
+						code.WriteLine();
+						using (code.Block("fastify.route({", "});"))
 						{
-							var methodName = httpMethodInfo.ServiceMethod.Name;
-							var capMethodName = CodeGenUtility.Capitalize(methodName);
-							var fastifyPath = httpMethodInfo.Path;
-							foreach (var httpPathField in httpMethodInfo.PathFields)
-								fastifyPath = ReplaceOrdinal(fastifyPath, "{" + httpPathField.Name + "}", $":{httpPathField.Name}");
-
-							code.WriteLine();
-							using (code.Block("fastify.route({", "});"))
+							code.WriteLine($"url: '{fastifyPath}',");
+							code.WriteLine($"method: '{httpMethodInfo.Method.ToUpperInvariant()}',");
+							using (code.Block("handler: async function (req, res) {", "}"))
 							{
-								code.WriteLine($"url: '{fastifyPath}',");
-								code.WriteLine($"method: '{httpMethodInfo.Method.ToUpperInvariant()}',");
-								using (code.Block("handler: async function (req, res) {", "}"))
+								code.WriteLine("const request" + IfTypeScript($": I{capMethodName}Request") + " = {};");
+								if (httpMethodInfo.PathFields.Count != 0)
 								{
-									code.WriteLine("const request" + IfTypeScript($": I{capMethodName}Request") + " = {};");
-									if (httpMethodInfo.PathFields.Count != 0)
+									code.WriteLine();
+									code.WriteLine($"const params = req.params{IfTypeScript(" as Record<string, string>")};");
+									foreach (var pathParam in httpMethodInfo.PathFields)
 									{
-										code.WriteLine();
-										code.WriteLine($"const params = req.params{IfTypeScript(" as Record<string, string>")};");
-										foreach (var pathParam in httpMethodInfo.PathFields)
-										{
-											code.WriteLine($"if (typeof params['{pathParam.Name}'] === 'string') request.{pathParam.ServiceField.Name} = {ParseFieldValue(pathParam.ServiceField, service, $"params['{pathParam.Name}']")};");
-										}
-									}
-
-									if (httpMethodInfo.QueryFields.Count != 0)
-									{
-										code.WriteLine();
-										code.WriteLine($"const query = req.query{IfTypeScript(" as Record<string, string>")};");
-										foreach (var queryParam in httpMethodInfo.QueryFields)
-										{
-											code.WriteLine($"if (typeof query['{queryParam.Name}'] === 'string') request.{queryParam.ServiceField.Name} = {ParseFieldValue(queryParam.ServiceField, service, $"query['{queryParam.Name}']")};");
-										}
+										code.WriteLine($"if (typeof params['{pathParam.Name}'] === 'string') request.{pathParam.ServiceField.Name} = {ParseFieldValue(pathParam.ServiceField, service, $"params['{pathParam.Name}']")};");
 									}
+								}
 
-									if (httpMethodInfo.RequestHeaderFields.Count != 0)
+								if (httpMethodInfo.QueryFields.Count != 0)
+								{
+									code.WriteLine();
+									code.WriteLine($"const query = req.query{IfTypeScript(" as Record<string, string>")};");
+									foreach (var queryParam in httpMethodInfo.QueryFields)
 									{
-										code.WriteLine();
-										code.WriteLine($"const headers = req.headers{IfTypeScript(" as Record<string, string>")};");
-										foreach (var header in httpMethodInfo.RequestHeaderFields)
-										{
-											string lowerHeaderName = header.Name.ToLowerInvariant();
-											code.WriteLine($"if (typeof headers['{lowerHeaderName}'] === 'string') request.{header.ServiceField.Name} = {ParseFieldValue(header.ServiceField, service, $"headers['{lowerHeaderName}']")};");
-										}
+										code.WriteLine($"if (typeof query['{queryParam.Name}'] === 'string') request.{queryParam.ServiceField.Name} = {ParseFieldValue(queryParam.ServiceField, service, $"query['{queryParam.Name}']")};");
 									}
+								}
 
-									if (httpMethodInfo.RequestBodyField != null)
-									{
-										code.WriteLine();
-										code.WriteLine($"request.{httpMethodInfo.RequestBodyField.ServiceField.Name} = req.body{IfTypeScript(" as never")};");
-									}
-									else if (httpMethodInfo.RequestNormalFields.Count != 0)
+								if (httpMethodInfo.RequestHeaderFields.Count != 0)
+								{
+									code.WriteLine();
+									code.WriteLine($"const headers = req.headers{IfTypeScript(" as Record<string, string>")};");
+									foreach (var header in httpMethodInfo.RequestHeaderFields)
 									{
-										code.WriteLine();
-										code.WriteLine($"const body = req.body{IfTypeScript(" as Record<string, never>")};");
-										foreach (var field in httpMethodInfo.RequestNormalFields)
-											code.WriteLine($"request.{field.ServiceField.Name} = body.{field.ServiceField.Name};");
+										string lowerHeaderName = header.Name.ToLowerInvariant();
+										code.WriteLine($"if (typeof headers['{lowerHeaderName}'] === 'string') request.{header.ServiceField.Name} = {ParseFieldValue(header.ServiceField, service, $"headers['{lowerHeaderName}']")};");
 									}
+								}
 
+								if (httpMethodInfo.RequestBodyField != null)
+								{
 									code.WriteLine();
-									code.WriteLine($"const result = await api.{methodName}(request);");
-
+									code.WriteLine($"request.{httpMethodInfo.RequestBodyField.ServiceField.Name} = req.body{IfTypeScript(" as never")};");
+								}
+								else if (httpMethodInfo.RequestNormalFields.Count != 0)
+								{
 									code.WriteLine();
-									using (code.Block("if (result.error) {", "}"))
+									code.WriteLine($"const body = req.body{IfTypeScript(" as Record<string, never>")};");
+									foreach (var field in httpMethodInfo.RequestNormalFields)
+										code.WriteLine($"request.{field.ServiceField.Name} = body.{field.ServiceField.Name};");
+								}
+
+								code.WriteLine();
+								code.WriteLine($"const result = await api.{methodName}(request);");
+
+								code.WriteLine();
+								using (code.Block("if (result.error) {", "}"))
+								{
+									code.WriteLine("const status = result.error.code && standardErrorCodes[result.error.code];");
+									code.WriteLine("res.status(status || 500).send(result.error);");
+									code.WriteLine("return;");
+								}
+
+								code.WriteLine();
+								using (code.Block("if (result.value) {", "}"))
+								{
+									if (httpMethodInfo.ResponseHeaderFields.Count != 0)
 									{
-										code.WriteLine("const status = result.error.code && standardErrorCodes[result.error.code];");
-										code.WriteLine("res.status(status || 500).send(result.error);");
-										code.WriteLine("return;");
+										code.WriteLineSkipOnce();
+										foreach (var field in httpMethodInfo.ResponseHeaderFields)
+											code.WriteLine($"if (result.value.{field.ServiceField.Name} != null) res.header('{field.Name}', result.value.{field.ServiceField.Name});");
 									}
 
-									code.WriteLine();
-									using (code.Block("if (result.value) {", "}"))
+									var handledResponses = httpMethodInfo.ValidResponses.ToList();
+									foreach (var validResponse in httpMethodInfo.ValidResponses.Where(x => x.BodyField is not null))
 									{
-										if (httpMethodInfo.ResponseHeaderFields.Count != 0)
-										{
-											code.WriteLineSkipOnce();
-											foreach (var field in httpMethodInfo.ResponseHeaderFields)
-												code.WriteLine($"if (result.value.{field.ServiceField.Name} != null) res.header('{field.Name}', result.value.{field.ServiceField.Name});");
-										}
+										handledResponses.Remove(validResponse);
+										var bodyField = validResponse.BodyField!;
+										var statusCode = (int) validResponse.StatusCode;
 
-										var handledResponses = httpMethodInfo.ValidResponses.ToList();
-										foreach (var validResponse in httpMethodInfo.ValidResponses.Where(x => x.BodyField is not null))
+										code.WriteLineSkipOnce();
+										using (code.Block($"if (result.value.{bodyField.ServiceField.Name}) {{", "}"))
 										{
-											handledResponses.Remove(validResponse);
-											var bodyField = validResponse.BodyField!;
-											var statusCode = (int) validResponse.StatusCode;
-
-											code.WriteLineSkipOnce();
-											using (code.Block($"if (result.value.{bodyField.ServiceField.Name}) {{", "}"))
-											{
-												var bodyFieldType = service.GetFieldType(bodyField.ServiceField)!;
-												if (bodyFieldType.Kind == ServiceTypeKind.Boolean)
-												{
-													code.WriteLine($"res.status({statusCode});");
-													code.WriteLine("return;");
-												}
-												else
-												{
-													code.WriteLine($"res.status({statusCode}).send(result.value.{bodyField.ServiceField.Name});");
-													code.WriteLine("return;");
-												}
-											}
-										}
-
-										if (handledResponses.Count == 1)
-										{
-											var lastValidResponse = handledResponses[0];
-											var statusCode = (int) lastValidResponse.StatusCode;
-
-											if (lastValidResponse.NormalFields?.Count > 0)
+											var bodyFieldType = service.GetFieldType(bodyField.ServiceField)!;
+											if (bodyFieldType.Kind == ServiceTypeKind.Boolean)
 											{
-												code.WriteLineSkipOnce();
-												code.WriteLine($"res.status({statusCode}).send(result.value);");
+												code.WriteLine($"res.status({statusCode});");
+												code.WriteLine("return;");
 											}
 											else
 											{
-												code.WriteLineSkipOnce();
-												code.WriteLine($"res.status({statusCode});");
+												code.WriteLine($"res.status({statusCode}).send(result.value.{bodyField.ServiceField.Name});");
+												code.WriteLine("return;");
 											}
-											code.WriteLine("return;");
 										}
-										else if (handledResponses.Count > 1)
+									}
+
+									if (handledResponses.Count == 1)
+									{
+										var lastValidResponse = handledResponses[0];
+										var statusCode = (int) lastValidResponse.StatusCode;
+
+										if (lastValidResponse.NormalFields?.Count > 0)
 										{
-											throw new InvalidOperationException("More than one response is left.");
+											code.WriteLineSkipOnce();
+											code.WriteLine($"res.status({statusCode}).send(result.value);");
 										}
+										else
+										{
+											code.WriteLineSkipOnce();
+											code.WriteLine($"res.status({statusCode});");
+										}
+										code.WriteLine("return;");
+									}
+									else if (handledResponses.Count > 1)
+									{
+										throw new InvalidOperationException("More than one response is left.");
 									}
-
-									code.WriteLine();
-									code.WriteLine("throw new Error('Result must have an error or value.');");
 								}
+
+								code.WriteLine();
+								code.WriteLine("throw new Error('Result must have an error or value.');");
 							}
 						}
 					}
+				}
 
-					if (TypeScript)
-						WriteTypes(code, httpServiceInfo);
-				}));
-			}
-
-			return new CodeGenOutput(namedTexts, new List<CodeGenPattern>());
-		}
+				if (TypeScript)
+					WriteTypes(code, httpServiceInfo);
+			});
 
-		/// <summary>
-		/// Applies generator-specific settings.
-		/// </summary>
-		public override void ApplySettings(FileGeneratorSettings settings)
-		{
-			var ourSettings = (JavaScriptGeneratorSettings) settings;
-			ModuleName = ourSettings.ModuleName;
-			TypeScript = ourSettings.TypeScript;
-			Express = ourSettings.Express;
-			Fastify = ourSettings.Fastify;
-			DisableESLint = ourSettings.DisableESLint;
+			return new CodeGenOutput(file);
 		}
 
-		/// <summary>
-		/// Supports writing output to a single file.
-		/// </summary>
-		public override bool SupportsSingleOutput => true;
-
 		private void WriteFileHeader(CodeWriter code)
 		{
 			code.WriteLine($"// DO NOT EDIT: generated by {GeneratorName}");