Skip to content

Avoid creating empty ArrayValue instances #781

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 3 commits into from
Apr 21, 2025
+22 −3
Merged

Avoid creating empty ArrayValue instances #781

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96f0058
Avoid creating empty ArrayValue instances
lahma Apr 21, 2025
4a236f8
Update Fluid/Values/FluidValue.cs
lahma Apr 21, 2025
8b20402
Update Fluid/Values/FluidValue.cs
lahma Apr 21, 2025
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
25 changes: 22 additions & 3 deletions Fluid/Values/FluidValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,9 @@ public static FluidValue Create(object value, TemplateOptions options)
return new DictionaryValue(new DictionaryDictionaryFluidIndexable(otherDictionary, options));

case FluidValue[] array:
return new ArrayValue(array);
return array.Length > 0
? new ArrayValue(array)
: ArrayValue.Empty;
}

// Check if it's a more specific IDictionary<string, V>, e.g. JObject
Expand Down Expand Up @@ -249,12 +251,22 @@ public static FluidValue Create(object value, TemplateOptions options)
switch (value)
{
case IReadOnlyList<FluidValue> list:
if (list.Count == 0)
{
return ArrayValue.Empty;
}

return new ArrayValue(list);

case IEnumerable<FluidValue> enumerable:
return new ArrayValue(enumerable.ToArray());

case IList list:
if (list.Count == 0)
{
return ArrayValue.Empty;
}

var values = new FluidValue[list.Count];
for (var i = 0; i < values.Length; i++)
{
Expand All @@ -264,20 +276,27 @@ public static FluidValue Create(object value, TemplateOptions options)
return new ArrayValue(values);

case IEnumerable enumerable:
var fluidValues = new List<FluidValue>();
List<FluidValue> fluidValues = null;
foreach (var item in enumerable)
{
fluidValues ??= [];
fluidValues.Add(Create(item, options));
}
return new ArrayValue(fluidValues);

return fluidValues != null
? new ArrayValue(fluidValues)
: ArrayValue.Empty;
}

return new ObjectValue(value);

case TypeCode.DateTime:
return new DateTimeValue((DateTime)value);

case TypeCode.Char:
case TypeCode.String:
return new StringValue(Convert.ToString(value, options.CultureInfo));

default:
throw new InvalidOperationException();
}
Expand Down