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
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

<ItemGroup>
<None Update="Templates\*.liquid" CopyToOutputDirectory="PreserveNewest" />
<None Update="Templates2\*.liquid" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
31 changes: 31 additions & 0 deletions src/NJsonSchema.CodeGeneration.Tests/TemplateFactoryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,35 @@ public void Can_customize_liquid_parser()

Assert.Equal("WELCOME TO THE LIQUID TAG", templateResult);
}

[Theory]
[InlineData("Templates", "sample-1", "sample-1-in-templates")]
[InlineData("Templates", "sample-2", "sample-2-in-templates")]
[InlineData("Templates2", "sample-2", "sample-2-in-templates-2")]
[InlineData("Templates2", "sample-3", "sample-3-in-templates-2")]
[InlineData("Templates2;Templates", "sample-1", "sample-1-in-templates")]
[InlineData("Templates2;Templates", "sample-2", "sample-2-in-templates-2")]
[InlineData("Templates2;Templates", "sample-3", "sample-3-in-templates-2")]
[InlineData("Templates;Templates2", "sample-1", "sample-1-in-templates")]
[InlineData("Templates;Templates2", "sample-2", "sample-2-in-templates")]
[InlineData("Templates;Templates2", "sample-3", "sample-3-in-templates-2")]
public void Can_override_templates(string templateDirectory, string templateName, string expectedResult)
{
var generatorSettings = new CSharpGeneratorSettings
{
TemplateDirectory = templateDirectory,
};

var factory = new DefaultTemplateFactory(generatorSettings, [typeof(CSharpGeneratorSettings).Assembly])
{
FluidParser = new LiquidParser(new FluidParserOptions { AllowLiquidTag = true }),
};
generatorSettings.TemplateFactory = factory;

var template = factory.CreateTemplate("csharp", templateName, new { });

var templateResult = template.Render();

Assert.Equal(expectedResult, templateResult);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% if true %}
sample-1-in-templates
{% endif %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% if true %}
sample-2-in-templates
{% endif %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% if true %}
sample-2-in-templates-2
{% endif %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% if true %}
sample-3-in-templates-2
{% endif %}
9 changes: 6 additions & 3 deletions src/NJsonSchema.CodeGeneration/DefaultTemplateFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,13 @@ private string GetLiquidTemplate(string language, string template, string templa
{
if (!template.EndsWith('!') && !string.IsNullOrEmpty(templateDirectory))
{
var templateFilePath = Path.Combine(templateDirectory, template + ".liquid");
if (File.Exists(templateFilePath))
foreach (var directory in templateDirectory.Split([';'], StringSplitOptions.RemoveEmptyEntries))
{
return File.ReadAllText(templateFilePath);
var templateFilePath = Path.Combine(directory, template + ".liquid");
if (File.Exists(templateFilePath))
{
return File.ReadAllText(templateFilePath);
}
}
}

Expand Down