Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>

<PropertyGroup>
<VersionPrefix>3.9.2</VersionPrefix>
<PackageValidationBaselineVersion>3.9.1</PackageValidationBaselineVersion>
<VersionPrefix>3.9.3</VersionPrefix>
<PackageValidationBaselineVersion>3.9.2</PackageValidationBaselineVersion>
<NoWarn>$(NoWarn);1591;1998;NU1507;NU5105</NoWarn>
<GitHubOrganization>FacilityApi</GitHubOrganization>
<RepositoryName>FacilityJavaScript</RepositoryName>
Expand Down
4 changes: 4 additions & 0 deletions ReleaseNotes.md
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).

## 3.9.3

* Fix an extra blank line at the end of generated TypeScript types files.

## 3.9.2

* Update dependencies.
Expand Down
1 change: 0 additions & 1 deletion conformance/src/conformanceApiTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -553,4 +553,3 @@ export enum ApiErrors {
/** I'm "too" 😄! */
TooHappy = 'TooHappy',
}

1 change: 0 additions & 1 deletion example/ts/src/exampleApiTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,4 +355,3 @@ export enum ExampleApiErrors {
/** The user is not an administrator. */
NotAdmin = 'NotAdmin',
}

1 change: 0 additions & 1 deletion src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)
WriteImports(code, import.Select(x => $"{x.Name}{(x.Name != x.Alias ? $" as {x.Alias}" : "")}").ToArray(), import.Key);

typeNames.AddRange(WriteTypes(code, httpServiceInfo));
code.WriteLine();
}));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,25 @@ public void GenerateExampleApiTypeScript_DataPropertiesRequired()
Assert.That(typesFile.Text, Does.Contain("}"));
}

[Test]
public void GenerateExampleApiTypeScript_TypesFileDoesNotEndWithBlankLine()
{
const string definition = "service TestApi { }";
var parser = CreateParser();
var service = parser.ParseDefinition(new ServiceDefinitionText("TestApi.fsd", definition));
var generator = new JavaScriptGenerator
{
GeneratorName = "JavaScriptGeneratorTests",
TypeScript = true,
NewLine = "\n",
};
var result = generator.GenerateOutput(service);

var typesFile = result.Files.Single(f => f.Name == "testApiTypes.ts");
Assert.That(typesFile.Text, Does.EndWith("\n"));
Assert.That(typesFile.Text, Does.Not.EndWith("\n\n"));
}

[TestCase("", true)]
[TestCase("", false)]
[TestCase("suffix", true)]
Expand Down