heymb · heymb · Sep 18, 2023 · Sep 18, 2023 · Dec 15, 2023 · Dec 15, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -21,6 +21,9 @@ resharper_string_literal_typo_highlighting = none
 indent_size = 4
 indent_style = tab
 
+[Directory.Packages.props]
+insert_final_newline = false
+
 [dotnet-tools.json]
 insert_final_newline = false
 
@@ -91,6 +94,7 @@ csharp_style_prefer_local_over_anonymous_function = true : suggestion
 csharp_style_prefer_not_pattern = true : suggestion
 csharp_style_prefer_null_check_over_type_check = true : suggestion
 csharp_style_prefer_pattern_matching = true : suggestion
+csharp_style_prefer_primary_constructors = true : suggestion
 csharp_style_prefer_range_operator = true : suggestion
 csharp_style_prefer_switch_expression = true : suggestion
 csharp_style_prefer_tuple_swap = true : warning
@@ -207,6 +211,7 @@ dotnet_diagnostic.IDE0160.severity = suggestion
 dotnet_diagnostic.IDE0161.severity = suggestion
 dotnet_diagnostic.IDE0170.severity = suggestion
 dotnet_diagnostic.IDE0180.severity = warning
+dotnet_diagnostic.IDE0290.severity = suggestion
 dotnet_diagnostic.IDE1005.severity = suggestion
 dotnet_diagnostic.SA0001.severity = none
 dotnet_diagnostic.SA1003.severity = none
@@ -330,6 +335,7 @@ resharper_arrange_missing_parentheses_highlighting = hint
 resharper_arrange_trailing_comma_in_multiline_lists_highlighting = warning
 resharper_comment_typo_highlighting = none
 resharper_compare_of_floats_by_equality_operator_highlighting = suggestion
+resharper_convert_to_primary_constructor_highlighting = hint
 resharper_csharp_align_first_arg_by_paren = false
 resharper_csharp_align_linq_query = false
 resharper_csharp_align_multiline_argument = false
@@ -351,6 +357,7 @@ resharper_csharp_indent_anonymous_method_block = false
 resharper_csharp_indent_nested_for_stmt = true
 resharper_csharp_indent_nested_foreach_stmt = true
 resharper_csharp_indent_nested_while_stmt = true
+resharper_csharp_indent_raw_literal_string = indent
 resharper_csharp_int_align = false
 resharper_csharp_keep_existing_arrangement = true
 resharper_csharp_nested_ternary_style = simple_wrap

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,39 +1,37 @@
 name: Build
+
 on:
-  workflow_dispatch:
   push:
-    paths-ignore:
-    - '*.md'
-    - 'docs/**'
-    branches:
-    - 'master'
-    tags-ignore:
-    - '**'
+    branches: [master]
+    tags-ignore: ['**']
   pull_request:
-    paths-ignore:
-    - '*.md'
-    - 'docs/**'
+  workflow_dispatch:
+
 env:
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_NOLOGO: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
 defaults:
   run:
     shell: pwsh
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+          6.0.x
+          8.0.x
     - name: Check out code
       uses: actions/checkout@v3
       with:
-        fetch-depth: 0
-    - name: Set up .NET 7
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 7.0.x
+        fetch-depth: 0 # required to publish docs
     - name: Restore
       run: .\build.ps1 restore
     - name: Build

diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -0,0 +1,31 @@
+name: Publish Docs
+
+on:
+  workflow_dispatch:
+
+env:
+  DOTNET_NOLOGO: 1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+defaults:
+  run:
+    shell: pwsh
+
+jobs:
+  publish-docs:
+    runs-on: windows-latest
+    steps:
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+          6.0.x
+          8.0.x
+    - name: Check out code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0 # required to publish docs
+    - name: Publish Docs
+      env:
+        BUILD_BOT_PASSWORD: ${{ secrets.BUILD_BOT_PASSWORD }}
+      run: .\build.ps1 publish --no-test --trigger publish-docs
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,16 @@
+.vs/
+.idea/
+artifacts/
 bin/
 obj/
 release/
-.vs/
-.idea/
-Thumbs.db
+
 *.cache
-*.user
-*.userprefs
+*.log
 *.ncrunchproject
 *.ncrunchsolution
+*.user
+launchSettings.json
 nCrunchTemp*
 _ReSharper*
 .DS_Store
-launchSettings.json
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,14 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>2.8.0</VersionPrefix>
-    <LangVersion>11.0</LangVersion>
+    <VersionPrefix>3.0.0</VersionPrefix>
+    <PackageValidationBaselineVersion>2.8.0</PackageValidationBaselineVersion>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>$(NoWarn);1591;1998;NU1507;NU5105</NoWarn>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <NoWarn>$(NoWarn);1591;1998;NU5105</NoWarn>
     <DebugType>embedded</DebugType>
     <GitHubOrganization>FacilityApi</GitHubOrganization>
     <RepositoryName>FacilityJavaScript</RepositoryName>
@@ -20,26 +21,21 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <AnalysisLevel>latest-all</AnalysisLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
     <IsTestProject>false</IsTestProject>
+    <SelfContained>false</SelfContained>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
+    <EnableStrictModeForCompatibleFrameworksInPackageValidation>true</EnableStrictModeForCompatibleFrameworksInPackageValidation>
+    <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
+    <DisablePackageBaselineValidation Condition=" $(PackageValidationBaselineVersion) == $(VersionPrefix) or $(PackageValidationBaselineVersion) == '0.0.0' ">true</DisablePackageBaselineValidation>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(BuildNumber)' != '' ">
     <AssemblyVersion>$(VersionPrefix).$(BuildNumber)</AssemblyVersion>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <FacilityVersion>2.11.0</FacilityVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Faithlife.Analyzers" Version="1.4.0" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
-  </ItemGroup>
-
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,19 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <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" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="XmlDocMarkdown.Core" Version="2.9.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <GlobalPackageReference Include="Faithlife.Analyzers" Version="1.5.0" />
+    <GlobalPackageReference Include="NUnit.Analyzers" Version="4.2.0" />
+    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
+  </ItemGroup>
+</Project>
diff --git a/FacilityJavaScript.sln b/FacilityJavaScript.sln
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		dotnet-tools.json = dotnet-tools.json
 		example\ExampleApi.fsd = example\ExampleApi.fsd
+		Directory.Packages.props = Directory.Packages.props
+		global.json = global.json
 		LICENSE = LICENSE
 		nuget.config = nuget.config
 		ts\package.json = ts\package.json

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2022 Ed Ball
+Copyright 2024 Ed Ball
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -10,3 +10,17 @@ fsdgenjs | A tool that generates JavaScript or TypeScript for a Facility Service
 Facility.CodeGen.JavaScript | A library that generates JavaScript or TypeScript for a Facility Service Definition. | [![NuGet](https://img.shields.io/nuget/v/Facility.CodeGen.JavaScript.svg)](https://www.nuget.org/packages/Facility.CodeGen.JavaScript)
 
 [Documentation](https://facilityapi.github.io/) | [Release Notes](https://github.com/FacilityApi/FacilityJavaScript/blob/master/ReleaseNotes.md) | [Contributing](https://github.com/FacilityApi/FacilityJavaScript/blob/master/CONTRIBUTING.md)
+
+## Conformance
+
+To run conformance tests, first start one of the conformance servers from within the `/conformance` folder:
+
+```
+npm run fastify
+```
+
+Then run the conformance tool against the running service.
+
+```
+npm run test
+```
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,6 +2,31 @@
 
 These are the NuGet package releases. See also [npm Release Notes](ReleaseNotesNpm.md).
 
+## 3.0.0
+
+* Support required fields as not optional in TypeScript.
+
+## 2.11.1
+
+* Ignore events for now.
+
+## 2.11.0
+
+* Enable use of external enumerations as URI and header request parameters.
+
+## 2.10.1
+
+* Fix TypeScript file name references when using `file-name-suffix` generator setting.
+
+## 2.10.0
+
+* Add `file-name-suffix` generator setting.
+* Support generating Fastify plugins.
+
+## 2.9.0
+
+* Generate error sets in TypeScript.
+
 ## 2.8.0
 
 * Support `datetime`.

diff --git a/build.ps1 b/build.ps1
@@ -2,14 +2,9 @@
 $ErrorActionPreference = 'Stop'
 Push-Location $PSScriptRoot
 try {
-  if (-not (Test-Path ./tools/bin/Build) -or
-      (Get-ChildItem ./tools/Build/* | Measure-Object LastWriteTime -Maximum).Maximum -gt
-      (Get-ChildItem ./tools/bin/Build/* | Measure-Object LastWriteTime -Maximum).Maximum) {
-    if (Test-Path ./tools/bin/Build) { Remove-Item ./tools/bin/Build -Recurse }
-    dotnet publish ./tools/Build/Build.csproj --output ./tools/bin/Build --nologo --verbosity quiet
-    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-  }
-  dotnet ./tools/bin/Build/Build.dll $args
+  dotnet publish ./tools/Build/Build.csproj --artifacts-path ./artifacts --nologo --verbosity quiet
+  if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+  dotnet ./artifacts/publish/Build/release/Build.dll $args
   if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 }
 finally {

diff --git a/conformance/.gitignore b/conformance/.gitignore
@@ -0,0 +1,2 @@
+dist/
+node_modules/
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;