Skip to content

Improve json filter #430

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
sebastienros merged 6 commits into from
Jan 2, 2022
Merged

Improve json filter #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e64ad4
Improve json filter
Soar360 Dec 15, 2021
90ce9d6
Improve json filter
Soar360 Dec 16, 2021
1fca9c2
JsonShouldWriteNullIfDictionaryNotReturnFluidIndexable
Soar360 Dec 17, 2021
4b67604
format codes
Soar360 Dec 17, 2021
12fa101
fix unit tests
Soar360 Dec 17, 2021
f3823cd
Merge branch 'main' into improve_json_filter
sebastienros Jan 2, 2022
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
29 changes: 27 additions & 2 deletions Fluid.Tests/MiscFiltersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ public async Task JsonShouldHandleCircularReferences()

var result = await MiscFilters.Json(input, new FilterArguments(), new TemplateContext(to));

Assert.Equal("{\"Name\":\"Object1\",\"NodeRef\":{\"Name\":\"Child1\",\"NodeRef\":\"circular reference detected.\"}}", result.ToStringValue());
Assert.Equal("{\"Name\":\"Object1\",\"NodeRef\":{\"Name\":\"Child1\",\"NodeRef\":\"Circular reference has been detected.\"}}", result.ToStringValue());
}

[Fact]
Expand All @@ -617,7 +617,7 @@ public async Task JsonShouldHandleCircularReferencesOnSiblingPropertiesSeparatel

var result = await MiscFilters.Json(input, new FilterArguments(), new TemplateContext(to));

Assert.Equal("{\"Name\":\"MultipleNode1\",\"Node1\":{\"Name\":\"Object1\",\"NodeRef\":{\"Name\":\"Child1\",\"NodeRef\":\"circular reference detected.\"}},\"Node2\":{\"Name\":\"Object1\",\"NodeRef\":{\"Name\":\"Child1\",\"NodeRef\":\"circular reference detected.\"}}}", result.ToStringValue());
Assert.Equal("{\"Name\":\"MultipleNode1\",\"Node1\":{\"Name\":\"Object1\",\"NodeRef\":{\"Name\":\"Child1\",\"NodeRef\":\"Circular reference has been detected.\"}},\"Node2\":{\"Name\":\"Object1\",\"NodeRef\":{\"Name\":\"Child1\",\"NodeRef\":\"Circular reference has been detected.\"}}}", result.ToStringValue());
}

[Fact]
Expand All @@ -632,6 +632,22 @@ public async Task JsonShouldIgnoreStaticMembers()
Assert.Equal("{\"Id\":100}", result.ToStringValue());
}

[Fact]
public async Task JsonShouldWriteNullIfDictionaryNotReturnFluidIndexable()
{
var model = new
{
Id = 1,
WithoutIndexable = new DictionaryWithoutIndexableTestObjects(new { }),
Bool = true
};
var options = new TemplateOptions();
options.MemberAccessStrategy.Register(model.GetType());
var input = FluidValue.Create(model, options);
var result = await MiscFilters.Json(input, new FilterArguments(), new TemplateContext(options));
Assert.Equal("{\"Id\":1,\"WithoutIndexable\":null,\"Bool\":true}", result.ToStringValue());
}

[Theory]
[InlineData("", "", "", "0")]
[InlineData(123456, "", "", "123456")]
Expand Down Expand Up @@ -785,5 +801,14 @@ private class JsonWithStaticMember
public static int StaticMember { get; set; } = 1;
public int Id { get; set; }
}

private class DictionaryWithoutIndexableTestObjects : ObjectValueBase
{
public override FluidValues Type => FluidValues.Dictionary;
public DictionaryWithoutIndexableTestObjects(object value) : base(value)
{

}
}
}
}
39 changes: 16 additions & 23 deletions Fluid/Filters/MiscFilters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@ private static async ValueTask WriteJson(Utf8JsonWriter writer, FluidValue input
{
await WriteJson(writer, item, ctx);
}

writer.WriteEndArray();
break;
case FluidValues.Boolean:
Expand Down Expand Up @@ -594,7 +593,10 @@ private static async ValueTask WriteJson(Utf8JsonWriter writer, FluidValue input

writer.WriteEndObject();
}

else
{
writer.WriteNullValue();
}
break;
case FluidValues.Object:
var obj = input.ToObjectValue();
Expand All @@ -609,32 +611,20 @@ private static async ValueTask WriteJson(Utf8JsonWriter writer, FluidValue input
foreach (var property in properties)
{
var name = conv(property);
var access = strategy.GetAccessor(type, name);
if (access == null)
var fluidValue = await input.GetValueAsync(name, ctx);
if (fluidValue.IsNil())
{
continue;
}

object value;
if (access is IAsyncMemberAccessor asyncMemberAccessor)
{
value = await asyncMemberAccessor.GetAsync(obj, name, ctx);
}
else
{
value = access.Get(obj, name, ctx);
}

stack ??= new HashSet<object>();
if (stack.Contains(value))
if (fluidValue is ObjectValue)
{
value = "circular reference detected.";
}

var fluidValue = FluidValue.Create(value, ctx.Options);
if (fluidValue.IsNil())
{
continue;
var value = fluidValue.ToObjectValue();
if (stack.Contains(value))
{
fluidValue = StringValue.Create("Circular reference has been detected.");
}
}

writer.WritePropertyName(name);
Expand All @@ -645,7 +635,10 @@ private static async ValueTask WriteJson(Utf8JsonWriter writer, FluidValue input

writer.WriteEndObject();
}

else
{
writer.WriteNullValue();
}
break;
case FluidValues.DateTime:
var objValue = input.ToObjectValue();
Expand Down