Add and use WriteImports method.

ejball · ejball · commit 6a6a3b7b0dce · 2019-03-07T13:36:10.000-08:00
diff --git a/example/js/exampleApiServer.js b/example/js/exampleApiServer.js
@@ -3,7 +3,6 @@
 
 import * as bodyParser from 'body-parser';
 import * as express from 'express';
-import { } from 'facility-core';
 
 const standardErrorCodes = {
   'NotModified': 304,
diff --git a/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs b/src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
@@ -50,7 +50,7 @@ protected override CodeGenOutput GenerateOutputCore(ServiceInfo service)
 					code.WriteLine($"// DO NOT EDIT: generated by {GeneratorName}");
 
 					code.WriteLine();
-					code.WriteLine("import { IServiceResult, IServiceError } from 'facility-core';");
+					WriteImports(code, new[] { "IServiceResult", "IServiceError" }, "facility-core");
 
 					code.WriteLine();
 					WriteJsDoc(code, service);
@@ -93,7 +93,6 @@ protected override CodeGenOutput GenerateOutputCore(ServiceInfo service)
 				}));
 			}
 
-
 			namedTexts.Add(CreateFile(clientFileName, code =>
 			{
 				code.WriteLine($"// DO NOT EDIT: generated by {GeneratorName}");
@@ -102,10 +101,14 @@ protected override CodeGenOutput GenerateOutputCore(ServiceInfo service)
 					code.WriteLine("'use strict';");
 
 				code.WriteLine();
-				code.WriteLine("import { HttpClientUtility" + IfTypeScript(", IServiceResult, IServiceError, IHttpClientOptions") + " } from 'facility-core';");
+				var facilityImports = new List<string> { "HttpClientUtility" };
+				if (TypeScript)
+					facilityImports.AddRange(new[] { "IServiceResult", "IServiceError", "IHttpClientOptions" });
+				WriteImports(code, facilityImports, "facility-core");
+
 				if (TypeScript)
 				{
-					code.WriteLine($"import {{ {string.Join(", ", typeNames)} }} from './{Uncapitalize(moduleName)}Types';");
+					WriteImports(code, typeNames, $"./{Uncapitalize(moduleName)}Types");
 					code.WriteLine($"export * from './{Uncapitalize(moduleName)}Types';");
 				}
 
@@ -300,10 +303,13 @@ protected override CodeGenOutput GenerateOutputCore(ServiceInfo service)
 					code.WriteLine();
 					code.WriteLine("import * as bodyParser from 'body-parser';");
 					code.WriteLine("import * as express from 'express';");
-					code.WriteLine("import {" + IfTypeScript(" IServiceResult, IServiceError") + " } from 'facility-core';");
+					var facilityImports = new List<string>();
+					if (TypeScript)
+						facilityImports.AddRange(new[] { "IServiceResult", "IServiceError" });
+					WriteImports(code, facilityImports, "facility-core");
 					if (TypeScript)
 					{
-						code.WriteLine($"import {{ {string.Join(", ", typeNames)} }} from './{Uncapitalize(moduleName)}Types';");
+						WriteImports(code, typeNames, $"./{Uncapitalize(moduleName)}Types");
 						code.WriteLine($"export * from './{Uncapitalize(moduleName)}Types';");
 					}
 
@@ -608,6 +614,12 @@ private static void WriteJsDoc(CodeWriter code, IReadOnlyList<string> lines)
 			}
 		}
 
+		private static void WriteImports(CodeWriter code, IReadOnlyList<string> imports, string from)
+		{
+			if (imports.Count != 0)
+				code.WriteLine($"import {{ {string.Join(", ", imports)} }} from '{from}';");
+		}
+
 		private static string Uncapitalize(string value)
 		{
 			return value.Length == 0 ? "" : value.Substring(0, 1).ToLowerInvariant() + value.Substring(1);
