Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Ignore events for now. #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Ignore events for now. #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0df8f2e
Ignore events for now.
ejball Jul 4, 2024
86206e7
Publish 2.11.1.
ejball Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<VersionPrefix>2.11.0</VersionPrefix>
<VersionPrefix>2.11.1</VersionPrefix>
<PackageValidationBaselineVersion>2.8.0</PackageValidationBaselineVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
Expand Down
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Facility.CodeGen.Console" Version="2.12.1" />
<PackageVersion Include="Facility.Definition" Version="2.12.1" />
<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.9.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" />
Expand Down
4 changes: 4 additions & 0 deletions ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

These are the NuGet package releases. See also [npm Release Notes](ReleaseNotesNpm.md).

## 2.11.1

* Ignore events for now.

## 2.11.0

* Enable use of external enumerations as URI and header request parameters.
Expand Down
9 changes: 9 additions & 0 deletions conformance/ConformanceApi.fsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"isRoot": true,
"tools": {
"facilityconformance": {
"version": "2.21.0",
"version": "2.29.0",
"commands": [
"FacilityConformance"
]
],
"rollForward": false
}
}
}
11 changes: 11 additions & 0 deletions src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Globalization;
using Facility.Definition;
using Facility.Definition.CodeGen;
using Facility.Definition.Fsd;
using Facility.Definition.Http;

namespace Facility.CodeGen.JavaScript
Expand All @@ -13,8 +14,18 @@ public sealed class JavaScriptGenerator : CodeGenerator
/// <summary>
/// Generates JavaScript/TypeScript.
/// </summary>
/// <param name="parser">The parser.</param>
/// <param name="settings">The settings.</param>
/// <returns>The number of updated files.</returns>
public static int GenerateCSharp(ServiceParser parser, JavaScriptGeneratorSettings settings) =>
FileGenerator.GenerateFiles(parser, new JavaScriptGenerator { GeneratorName = nameof(JavaScriptGenerator) }, settings);

/// <summary>
/// Generates JavaScript/TypeScript.
/// </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 GenerateJavaScript(JavaScriptGeneratorSettings settings) =>
FileGenerator.GenerateFiles(new JavaScriptGenerator { GeneratorName = nameof(JavaScriptGenerator) }, settings);

Expand Down
3 changes: 3 additions & 0 deletions src/fsdgenjs/FsdGenJavaScriptApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Facility.CodeGen.Console;
using Facility.CodeGen.JavaScript;
using Facility.Definition.CodeGen;
using Facility.Definition.Fsd;

namespace fsdgenjs
{
Expand Down Expand Up @@ -30,6 +31,8 @@ public sealed class FsdGenJavaScriptApp : CodeGeneratorApp
" Suffix to append to generated file names before the file extension.",
];

protected override ServiceParser CreateParser() => new FsdParser(new FsdParserSettings { SupportsEvents = true });

protected override CodeGenerator CreateGenerator() => new JavaScriptGenerator();

protected override FileGeneratorSettings CreateSettings(ArgsReader args) =>
Expand Down
32 changes: 17 additions & 15 deletions tests/Facility.CodeGen.JavaScript.UnitTests/JavaScriptGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public void GenerateExampleApiSuccess(bool typeScript)
{
ServiceInfo service;
const string fileName = "Facility.CodeGen.JavaScript.UnitTests.ExampleApi.fsd";
var parser = new FsdParser();
var parser = CreateParser();
var stream = GetType().GetTypeInfo().Assembly.GetManifestResourceStream(fileName)!;
Assert.That(stream, Is.Not.Null);
using (var reader = new StreamReader(stream))
Expand All @@ -35,7 +35,7 @@ public void GenerateExampleApiTypeScript_IncludesEnums()
{
ServiceInfo service;
const string fileName = "Facility.CodeGen.JavaScript.UnitTests.ExampleApi.fsd";
var parser = new FsdParser();
var parser = CreateParser();
var stream = GetType().GetTypeInfo().Assembly.GetManifestResourceStream(fileName)!;
Assert.That(stream, Is.Not.Null);
using (var reader = new StreamReader(stream))
Expand Down Expand Up @@ -87,7 +87,7 @@ public void GenerateExampleApiTypeScript_DoesntRequireJsonWhenNoResponseBodyExpe
{
ServiceInfo service;
const string fileName = "Facility.CodeGen.JavaScript.UnitTests.ExampleApi.fsd";
var parser = new FsdParser();
var parser = CreateParser();
var stream = GetType().GetTypeInfo().Assembly.GetManifestResourceStream(fileName)!;
Assert.That(stream, Is.Not.Null);
using (var reader = new StreamReader(stream))
Expand Down Expand Up @@ -129,7 +129,7 @@ public void GenerateExampleApiTypeScript_DoesntRequireJsonWhenNoResponseBodyExpe
public void GenerateExampleApiTypeScript_ExternDataWithNameAndModuel()
{
const string definition = "[csharp] service TestApi { [js(name: \"SomeExternalDto\", module: \"extern-dto-module\")] extern data Thing; data Test { thing: Thing; } }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true };
var result = generator.GenerateOutput(service);
Expand Down Expand Up @@ -160,7 +160,7 @@ public void GenerateExampleApiTypeScript_ExternDataWithoutModule()
public void GenerateExampleApiTypeScript_ExternDataWithoutName()
{
const string definition = "[csharp] service TestApi { [js(module: \"extern-dto-module\")] extern data Thing; data Test { thing: Thing; } }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true };
var result = generator.GenerateOutput(service);
Expand All @@ -175,7 +175,7 @@ public void GenerateExampleApiTypeScript_ExternDataWithoutName()
public void GenerateExampleApiTypeScript_ExternDataNameSameAsAlias()
{
const string definition = "[csharp] service TestApi { [js(name: \"IThing\", module: \"extern-dto-module\")] extern data Thing; data Test { thing: Thing; } }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true };
var result = generator.GenerateOutput(service);
Expand All @@ -190,7 +190,7 @@ public void GenerateExampleApiTypeScript_ExternDataNameSameAsAlias()
public void GenerateExampleApiTypeScript_ExternEnumWithNameAndModule()
{
const string definition = "[csharp] service TestApi { [js(name: \"SomeExternalEnum\", module: \"extern-enum-module\")] extern enum Thing; data Test { thing: Thing; } }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true };
var result = generator.GenerateOutput(service);
Expand All @@ -205,7 +205,7 @@ public void GenerateExampleApiTypeScript_ExternEnumWithNameAndModule()
public void GenerateExampleApiTypeScript_ExternEnumAsUriParam()
{
const string definition = "[csharp] service TestApi { [js(name: \"SomeExternalEnum\", module: \"extern-enum-module\")] extern enum Thing; [http(method: GET, path: \"/myMethod\")] method myMethod { e: Thing; }: {} }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true, Express = true };
var result = generator.GenerateOutput(service);
Expand All @@ -223,7 +223,7 @@ public void GenerateExampleApiTypeScript_ExternEnumAsUriParam()
public void GenerateExampleApiTypeScript_ExternEnumAsHeader()
{
const string definition = "[csharp] service TestApi { [js(name: \"SomeExternalEnum\", module: \"extern-enum-module\")] extern enum Thing; [http(method: GET, path: \"/myMethod\")] method myMethod { [http(from: header, name: \"Thing-Header\")] e: Thing; }: {} }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true, Express = true };
var result = generator.GenerateOutput(service);
Expand Down Expand Up @@ -257,7 +257,7 @@ public void GenerateExampleApiTypeScript_ExternEnumWithoutModule()
public void GenerateExampleApiTypeScript_ExternEnumWithoutName()
{
const string definition = "[csharp] service TestApi { [js(module: \"extern-enum-module\")] extern enum Thing; data Test { thing: Thing; } }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true };
var result = generator.GenerateOutput(service);
Expand All @@ -272,7 +272,7 @@ public void GenerateExampleApiTypeScript_ExternEnumWithoutName()
public void GenerateExampleApiTypeScript_ExternEnumNameIsSameAsAlias()
{
const string definition = "[csharp] service TestApi { [js(name: \"Thing\", module: \"extern-enum-module\")] extern enum Thing; data Test { thing: Thing; } }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true };
var result = generator.GenerateOutput(service);
Expand All @@ -288,7 +288,7 @@ public void GenerateExampleApiTypeScript_IncludesErrorSets()
{
ServiceInfo service;
const string fileName = "Facility.CodeGen.JavaScript.UnitTests.ExampleApi.fsd";
var parser = new FsdParser();
var parser = CreateParser();
var stream = GetType().GetTypeInfo().Assembly.GetManifestResourceStream(fileName)!;
Assert.That(stream, Is.Not.Null);
using (var reader = new StreamReader(stream))
Expand Down Expand Up @@ -323,7 +323,7 @@ export enum ExampleApiErrors {
public void GenerateWithCustomFileNameSuffix(string suffix, bool isTypeScript)
{
const string definition = "service TestApi { }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = isTypeScript, Express = true, FileNameSuffix = suffix };
var result = generator.GenerateOutput(service);
Expand All @@ -342,7 +342,7 @@ public void GenerateWithCustomFileNameSuffix(string suffix, bool isTypeScript)
public void GenerateWithCustomFileNameSuffix_TypeScriptFileNameReferencesCorrect()
{
const string definition = "service TestApi { }";
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true, Express = true, FileNameSuffix = ".g" };
var result = generator.GenerateOutput(service);
Expand All @@ -357,11 +357,13 @@ public void GenerateWithCustomFileNameSuffix_TypeScriptFileNameReferencesCorrect

private void ThrowsServiceDefinitionException(string definition, string message)
{
var parser = new FsdParser();
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator { GeneratorName = "JavaScriptGeneratorTests", TypeScript = true };
Action action = () => generator.GenerateOutput(service);
action.Should().Throw<ServiceDefinitionException>().WithMessage(message);
}

private static FsdParser CreateParser() => new FsdParser(new FsdParserSettings { SupportsEvents = true });
}
}
Loading