Merge pull request #12 from ddunkin/service-name

Fix --service-name

Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>2.6.1</VersionPrefix>
-    <PackageValidationBaselineVersion>2.6.0</PackageValidationBaselineVersion>
+    <VersionPrefix>2.6.2</VersionPrefix>
+    <PackageValidationBaselineVersion>2.6.1</PackageValidationBaselineVersion>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

ReleaseNotes.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.6.2
+
+* Fix `--service-name`.
+
 ## 2.6.1
 
 * Ignore events for now.

src/fsdgenswagger/FsdGenSwaggerApp.cs

@@ -30,17 +30,19 @@ public sealed class FsdGenSwaggerApp : CodeGeneratorApp
 
 	protected override FileGeneratorSettings CreateSettings(ArgsReader args)
 	{
-		var serviceName = args.ReadOption("service-name");
-		if (serviceName != null && ServiceDefinitionUtility.IsValidName(serviceName))
-			throw new ArgsReaderException($"Invalid service name '{serviceName}'.");
+		m_serviceName = args.ReadOption("service-name");
+		if (m_serviceName != null && !ServiceDefinitionUtility.IsValidName(m_serviceName))
+			throw new ArgsReaderException($"Invalid service name '{m_serviceName}'.");
 
 		return new SwaggerGeneratorSettings
 		{
 			GeneratesFsd = args.ReadFlag("fsd"),
 			GeneratesJson = args.ReadFlag("json"),
-			ServiceName = serviceName,
+			ServiceName = m_serviceName,
 		};
 	}
 
-	protected override ServiceParser CreateParser() => new SwaggerParser();
+	protected override ServiceParser CreateParser() => new SwaggerParser { ServiceName = m_serviceName };
+
+	private string? m_serviceName;
 }