Merge branch 'feature/merge-prop' into feature/defer-prop

# Conflicts:
#	InertiaCore/Inertia.cs
#	InertiaCore/Response.cs
#	InertiaCore/ResponseFactory.cs

Author: adrum

.github/workflows/dotnet.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: | 
+        dotnet-version: |
           6.0.x
           7.0.x
           8.0.x

InertiaCore/Extensions/InertiaExtensions.cs

@@ -8,31 +8,6 @@ namespace InertiaCore.Extensions;
 
 internal static class InertiaExtensions
 {
-    internal static Dictionary<string, object?> OnlyProps(this ActionContext context, Dictionary<string, object?> props)
-    {
-        var onlyKeys = context.HttpContext.Request.Headers[InertiaHeader.PartialOnly]
-            .ToString().Split(',')
-            .Select(k => k.Trim())
-            .Where(k => !string.IsNullOrEmpty(k))
-            .ToList();
-
-        return props.Where(kv => onlyKeys.Contains(kv.Key, StringComparer.OrdinalIgnoreCase))
-            .ToDictionary(kv => kv.Key, kv => kv.Value);
-    }
-
-    internal static Dictionary<string, object?> ExceptProps(this ActionContext context,
-        Dictionary<string, object?> props)
-    {
-        var exceptKeys = context.HttpContext.Request.Headers[InertiaHeader.PartialExcept]
-            .ToString().Split(',')
-            .Select(k => k.Trim())
-            .Where(k => !string.IsNullOrEmpty(k))
-            .ToList();
-
-        return props.Where(kv => exceptKeys.Contains(kv.Key, StringComparer.OrdinalIgnoreCase) == false)
-            .ToDictionary(kv => kv.Key, kv => kv.Value);
-    }
-
     internal static bool IsInertiaPartialComponent(this ActionContext context, string component) =>
         context.HttpContext.Request.Headers[InertiaHeader.PartialComponent] == component;
 
@@ -55,4 +30,23 @@ internal static bool Override<TKey, TValue>(this IDictionary<TKey, TValue> dicti
 
         return true;
     }
+
+    internal static Task<object?> ResolveAsync(this Func<object?> func)
+    {
+        var rt = func.Method.ReturnType;
+
+        if (!rt.IsGenericType || rt.GetGenericTypeDefinition() != typeof(Task<>))
+            return Task.Run(func.Invoke);
+
+        var task = func.DynamicInvoke() as Task;
+        return task!.ResolveResult();
+    }
+
+    internal static async Task<object?> ResolveResult(this Task task)
+    {
+        await task.ConfigureAwait(false);
+        var result = task.GetType().GetProperty("Result");
+
+        return result?.GetValue(task);
+    }
 }

InertiaCore/Inertia.cs

@@ -29,10 +29,6 @@ public static class Inertia
 
     public static void Share(IDictionary<string, object?> data) => _factory.Share(data);
 
-    public static LazyProp Lazy(Func<object?> callback) => _factory.Lazy(callback);
-
-    public static LazyProp Lazy(Func<Task<object?>> callback) => _factory.Lazy(callback);
-
     public static AlwaysProp Always(object? value) => _factory.Always(value);
 
     public static AlwaysProp Always(Func<object?> callback) => _factory.Always(callback);
@@ -43,13 +39,17 @@ public static class Inertia
 
     public static DeferProp Defer(Func<Task<object?>> callback, string group = "default") => _factory.Defer(callback, group);
 
-    public static MergeProp Merge(object? value) => _factory.Merge(value);
-
-    public static MergeProp Merge(Func<object?> callback) => _factory.Merge(callback);
+    public static LazyProp Lazy(Func<object?> callback) => _factory.Lazy(callback);
 
-    public static MergeProp Merge(Func<Task<object?>> callback) => _factory.Merge(callback);
+    public static LazyProp Lazy(Func<Task<object?>> callback) => _factory.Lazy(callback);
 
     public static OptionalProp Optional(Func<object?> callback) => _factory.Optional(callback);
 
     public static OptionalProp Optional(Func<Task<object?>> callback) => _factory.Optional(callback);
+
+    public static MergeProp Merge(object? value) => _factory.Merge(value);
+
+    public static MergeProp Merge(Func<object?> callback) => _factory.Merge(callback);
+
+    public static MergeProp Merge(Func<Task<object?>> callback) => _factory.Merge(callback);
 }

InertiaCore/Props/InvokableProp.cs

@@ -1,3 +1,5 @@
+using InertiaCore.Extensions;
+
 namespace InertiaCore.Props;
 
 public class InvokableProp
@@ -10,9 +12,9 @@ public class InvokableProp
     {
         return _value switch
         {
-            Func<Task<object?>> asyncCallable => asyncCallable.Invoke(),
-            Func<object?> callable => Task.Run(() => callable.Invoke()),
-            Task<object?> value => value,
+            Func<object?> f => f.ResolveAsync(),
+            Task t => t.ResolveResult(),
+            InvokableProp p => p.Invoke(),
             _ => Task.FromResult(_value)
         };
     }