Merge pull request #18 from ejball/events

FacilityApi · Jul 4, 2024 · d5fdab0 · d5fdab0
2 parents 4d0ac01 + 18e8066
commit d5fdab0
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>0.14.0</VersionPrefix>
-    <PackageValidationBaselineVersion>0.13.0</PackageValidationBaselineVersion>
+    <VersionPrefix>0.14.1</VersionPrefix>
+    <PackageValidationBaselineVersion>0.14.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="NUnit" Version="4.1.0" />

diff --git a/FacilityPython.sln b/FacilityPython.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\build.yaml = .github\workflows\build.yaml
 		Directory.Build.props = Directory.Build.props
 		Directory.Packages.props = Directory.Packages.props
+		dotnet-tools.json = dotnet-tools.json
 		global.json = global.json
 		LICENSE = LICENSE
 		nuget.config = nuget.config

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

diff --git a/conformance/ConformanceApi.fsd b/conformance/ConformanceApi.fsd
@@ -253,6 +253,15 @@ service ConformanceApi
 		[http(from: body, type: "application/x-output")] content: bytes;
 	}
 
+	[http(method: GET)]
+	event fibonacci
+	{
+		count: int32!;
+	}:
+	{
+		value: int32!;
+	}
+
 	data Any
 	{
 		string: string;

diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "facilityconformance": {
-      "version": "2.22.0",
+      "version": "2.29.0",
       "commands": [
         "FacilityConformance"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/src/Facility.CodeGen.Python/PythonGenerator.cs b/src/Facility.CodeGen.Python/PythonGenerator.cs
@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using Facility.Definition;
 using Facility.Definition.CodeGen;
+using Facility.Definition.Fsd;
 using Facility.Definition.Http;
 
 namespace Facility.CodeGen.Python
@@ -13,8 +14,18 @@ public sealed class PythonGenerator : CodeGenerator
 		/// <summary>
 		/// Generates Python.
 		/// </summary>
+		/// <param name="parser">The parser.</param>
 		/// <param name="settings">The settings.</param>
 		/// <returns>The number of updated files.</returns>
+		public static int GeneratePython(ServiceParser parser, PythonGeneratorSettings settings) =>
+			FileGenerator.GenerateFiles(parser, new PythonGenerator { GeneratorName = nameof(PythonGenerator) }, settings);
+
+		/// <summary>
+		/// Generates Python.
+		/// </summary>
+		/// <param name="settings">The settings.</param>
+		/// <returns>The number of updated files.</returns>
+		[Obsolete("Use the overload that takes a parser.")]
 		public static int GeneratePython(PythonGeneratorSettings settings) =>
 			FileGenerator.GenerateFiles(new PythonGenerator { GeneratorName = nameof(PythonGenerator) }, settings);
 

diff --git a/src/fsdgenpython/FsdGenPythonApp.cs b/src/fsdgenpython/FsdGenPythonApp.cs
@@ -2,6 +2,7 @@
 using Facility.CodeGen.Console;
 using Facility.CodeGen.Python;
 using Facility.Definition.CodeGen;
+using Facility.Definition.Fsd;
 
 namespace fsdgenpython
 {
@@ -19,6 +20,8 @@ public static int Main(string[] args)
 
 		protected override IReadOnlyList<string> ExtraUsage => [];
 
+		protected override ServiceParser CreateParser() => new FsdParser(new FsdParserSettings { SupportsEvents = true });
+
 		protected override CodeGenerator CreateGenerator() => new PythonGenerator();
 
 		protected override FileGeneratorSettings CreateSettings(ArgsReader args) =>

diff --git a/tests/Facility.CodeGen.Python.UnitTests/PythonGeneratorTests.cs b/tests/Facility.CodeGen.Python.UnitTests/PythonGeneratorTests.cs
@@ -12,7 +12,7 @@ public void GenerateExampleApiSuccess()
 		{
 			ServiceInfo service;
 			const string fileName = "Facility.CodeGen.Python.UnitTests.ConformanceApi.fsd";
-			var parser = new FsdParser();
+			var parser = new FsdParser(new FsdParserSettings { SupportsEvents = true });
 			var stream = GetType().GetTypeInfo().Assembly.GetManifestResourceStream(fileName);
 			Assert.That(stream, Is.Not.Null);
 			using (var reader = new StreamReader(stream!))