From 21ff1c7c83a4ca8f6169fb780c29cfb06fcf15df Mon Sep 17 00:00:00 2001 From: noxe Date: Mon, 25 Oct 2021 13:47:07 +0200 Subject: [PATCH] return enumerable if it is assignable from the desiredtype (#1669) Co-authored-by: Martin --- .../Services/EnumerableResultConverter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scripting/Elsa.Scripting.JavaScript/Services/EnumerableResultConverter.cs b/src/scripting/Elsa.Scripting.JavaScript/Services/EnumerableResultConverter.cs index 644d49100..713a02c51 100644 --- a/src/scripting/Elsa.Scripting.JavaScript/Services/EnumerableResultConverter.cs +++ b/src/scripting/Elsa.Scripting.JavaScript/Services/EnumerableResultConverter.cs @@ -9,7 +9,7 @@ namespace Elsa.Scripting.JavaScript.Services public class EnumerableResultConverter : IConvertsJintEvaluationResult, IConvertsEnumerableToObject { private readonly IConvertsJintEvaluationResult? _wrapped; - + public EnumerableResultConverter(IConvertsJintEvaluationResult? wrapped) => _wrapped = wrapped; public object? ConvertToDesiredType(object? evaluationResult, Type desiredType) @@ -25,6 +25,7 @@ namespace Elsa.Scripting.JavaScript.Services if (enumerable is string) return enumerable; if (enumerable is JObject) return enumerable; if (enumerable is byte[]) return enumerable; + if (enumerable != null && desiredType != null && desiredType.IsAssignableFrom(enumerable.GetType())) return enumerable; var destinationType = GetDestinationType(desiredType); var json = JsonConvert.SerializeObject(enumerable);