Merge pull request #11 from ejball/events

FacilityApi · Jul 4, 2024 · b949f16 · b949f16
2 parents d88c0d5 + be69d59
commit b949f16
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>2.6.0</VersionPrefix>
-    <PackageValidationBaselineVersion>2.5.0</PackageValidationBaselineVersion>
+    <VersionPrefix>2.6.1</VersionPrefix>
+    <PackageValidationBaselineVersion>2.6.0</PackageValidationBaselineVersion>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,8 +3,8 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Facility.CodeGen.Console" Version="2.13.0" />
-    <PackageVersion Include="Facility.Definition" Version="2.13.0" />
+    <PackageVersion Include="Facility.CodeGen.Console" Version="2.14.0" />
+    <PackageVersion Include="Facility.Definition" Version="2.14.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.6.1
+
+* Ignore events for now.
+
 ## 2.6.0
 
 * Add .NET 8 targets. Update dependencies.

diff --git a/example/ExampleApi.fsd b/example/ExampleApi.fsd
@@ -408,6 +408,15 @@ service ExampleApi
 
 	/// An external enum.
 	extern enum ExternalEnum;
+
+	[http(method: GET)]
+	event fibonacci
+	{
+		count: int32!;
+	}:
+	{
+		value: int32!;
+	}
 }
 
 # ExampleApi

diff --git a/src/Facility.Definition.Swagger/SwaggerParser.cs b/src/Facility.Definition.Swagger/SwaggerParser.cs
@@ -22,7 +22,7 @@ public sealed class SwaggerParser : ServiceParser
 	/// </summary>
 	protected override bool TryParseDefinitionCore(ServiceDefinitionText text, out ServiceInfo? service, out IReadOnlyList<ServiceDefinitionError> errors)
 	{
-		var isFsd = new FsdParser().TryParseDefinition(text, out service, out errors);
+		var isFsd = new FsdParser(new() { SupportsEvents = true }).TryParseDefinition(text, out service, out errors);
 		if (isFsd || text.Name.EndsWith(".fsd", StringComparison.OrdinalIgnoreCase))
 			return isFsd;
 

diff --git a/tests/Facility.Definition.Swagger.UnitTests/TestUtility.cs b/tests/Facility.Definition.Swagger.UnitTests/TestUtility.cs
@@ -6,6 +6,6 @@ internal static class TestUtility
 {
 	public static ServiceInfo ParseTestApi(string text)
 	{
-		return new FsdParser().ParseDefinition(new ServiceDefinitionText("TestApi.fsd", text));
+		return new FsdParser(new() { SupportsEvents = true }).ParseDefinition(new ServiceDefinitionText("TestApi.fsd", text));
 	}
 }