Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fix types file references when using file-name-suffix option . #63

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
victorbush merged 1 commit into from
May 21, 2024
Merged

Fix types file references when using file-name-suffix option . #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions 11 src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)

var moduleName = ModuleName ?? service.Name;
var capModuleName = CodeGenUtility.Capitalize(moduleName);
var typesFileName = CodeGenUtility.Uncapitalize(moduleName) + "Types" + (FileNameSuffix ?? "") + (TypeScript ? ".ts" : ".js");
var typesFileNameNoExt = CodeGenUtility.Uncapitalize(moduleName) + "Types" + (FileNameSuffix ?? "");
var typesFileName = typesFileNameNoExt + (TypeScript ? ".ts" : ".js");
var clientFileName = CodeGenUtility.Uncapitalize(moduleName) + (FileNameSuffix ?? "") + (TypeScript ? ".ts" : ".js");
var serverFileName = CodeGenUtility.Uncapitalize(moduleName) + "Server" + (FileNameSuffix ?? "") + (TypeScript ? ".ts" : ".js");

Expand Down Expand Up @@ -144,8 +145,8 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)

if (TypeScript)
{
WriteImports(code, typeNames, $"./{CodeGenUtility.Uncapitalize(moduleName)}Types");
code.WriteLine($"export * from './{CodeGenUtility.Uncapitalize(moduleName)}Types';");
WriteImports(code, typeNames, $"./{typesFileNameNoExt}");
code.WriteLine($"export * from './{typesFileNameNoExt}';");
}

code.WriteLine();
Expand Down Expand Up @@ -385,8 +386,8 @@ public override CodeGenOutput GenerateOutput(ServiceInfo service)
WriteImports(code, facilityImports, "facility-core");
if (TypeScript)
{
WriteImports(code, typeNames, $"./{CodeGenUtility.Uncapitalize(moduleName)}Types");
code.WriteLine($"export * from './{CodeGenUtility.Uncapitalize(moduleName)}Types';");
WriteImports(code, typeNames, $"./{typesFileNameNoExt}");
code.WriteLine($"export * from './{typesFileNameNoExt}';");
}

code.WriteLine();
Expand Down
18 changes: 17 additions & 1 deletion 18 tests/Facility.CodeGen.JavaScript.UnitTests/JavaScriptGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,29 @@ public void GenerateWithCustomFileNameSuffix(string suffix, bool isTypeScript)
Assert.That(result.Files, Has.Count.EqualTo(isTypeScript ? 3 : 2));
var fullSuffix = suffix + (isTypeScript ? ".ts" : ".js");
Assert.That(result.Files, Has.One.Matches<CodeGenFile>(f => f.Name == $"testApi{fullSuffix}"));
Assert.That(result.Files, Has.One.Matches<CodeGenFile>(f => f.Name == $"testApi{fullSuffix}"));
Assert.That(result.Files, Has.One.Matches<CodeGenFile>(f => f.Name == $"testApiServer{fullSuffix}"));

if (isTypeScript)
Assert.That(result.Files.SingleOrDefault(f => f.Name == $"testApiTypes{fullSuffix}"), Is.Not.Null);
}

[Test]
public void GenerateWithCustomFileNameSuffix_TypeScriptFileNameReferencesCorrect()
{
const string definition = "service TestApi { }";
var parser = new FsdParser();
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);
Assert.That(result, Is.Not.Null);

var clientFile = result.Files.Single(x => x.Name == "testApi.g.ts");
Assert.That(clientFile.Text, Does.Contain("export * from './testApiTypes.g';"));

var serverFile = result.Files.Single(x => x.Name == "testApiServer.g.ts");
Assert.That(serverFile.Text, Does.Contain("export * from './testApiTypes.g';"));
}

private void ThrowsServiceDefinitionException(string definition, string message)
{
var parser = new FsdParser();
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.