Add missing extension overloads, clean up code

Author: oroztocil

src/Components/Endpoints/src/DependencyInjection/UnsupportedJavaScriptRuntime.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop;
 
 namespace Microsoft.AspNetCore.Components.Endpoints;
@@ -22,15 +21,15 @@ public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, object?[]
     public ValueTask<IJSObjectReference> InvokeNewAsync(string identifier, CancellationToken cancellationToken, object?[]? args)
         => throw new InvalidOperationException(Message);
 
-    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier)
+    public ValueTask<TValue> GetValueAsync<TValue>(string identifier)
         => throw new InvalidOperationException(Message);
 
-    public ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier, CancellationToken cancellationToken)
+    public ValueTask<TValue> GetValueAsync<TValue>(string identifier, CancellationToken cancellationToken)
         => throw new InvalidOperationException(Message);
 
-    public ValueTask SetValueAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier, TValue value)
+    public ValueTask SetValueAsync<TValue>(string identifier, TValue value)
         => throw new InvalidOperationException(Message);
 
-    public ValueTask SetValueAsync<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(string identifier, TValue value, CancellationToken cancellationToken)
+    public ValueTask SetValueAsync<TValue>(string identifier, TValue value, CancellationToken cancellationToken)
         => throw new InvalidOperationException(Message);
 }

src/Components/test/testassets/BasicTestApp/DotNetToJSInterop.razor

@@ -133,14 +133,14 @@
     private async Task GetObjectModelWithInvoke()
     {
         var model = await JSRuntime.InvokeAsync<TestObjectModel>("getTestObject");
-        TestObjectDisplay = $"Serialized state: {model.Num} | {model.Text} | {model.GetOnlyProperty}";
+        TestObjectDisplay = $"State loaded from model with Invoke: {model.Num} | {model.Text} | {model.GetOnlyProperty}";
     }
 
     private async Task GetObjectModelWithGetValue()
     {
         var objectRef = await JSRuntime.GetValueAsync<IJSObjectReference>("testObject");
         var model = await objectRef.GetValueAsync<TestObjectModel>();
-        TestObjectDisplay = $"Serialized state via reference: {model.Num} | {model.Text} | {model.GetOnlyProperty}";
+        TestObjectDisplay = $"State loaded from reference with GetValue: {model.Num} | {model.Text} | {model.GetOnlyProperty}";
     }
 
     private async Task GetObjectPropertiesWithGetValue()
@@ -149,7 +149,7 @@
         var numValue = await objectRef.GetValueAsync<int>("num");
         var textValue = await objectRef.GetValueAsync<string>("text");
         var getOnlyProperty = await objectRef.GetValueAsync<int>("getOnlyProperty");
-        TestObjectDisplay = $"State via reference from function: {numValue} | {textValue} | {getOnlyProperty}";
+        TestObjectDisplay = $"State loaded from properties with GetValue: {numValue} | {textValue} | {getOnlyProperty}";
     }
 
     private async Task CreateInstanceByConstructorFunction()

src/JSInterop/Microsoft.JSInterop/src/JSObjectReferenceExtensions.cs

@@ -117,4 +117,54 @@ public static async ValueTask InvokeVoidAsync(this IJSObjectReference jsObjectRe
 
         await jsObjectReference.InvokeAsync<IJSVoidResult>(identifier, cancellationToken, args);
     }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c>.</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeNewAsync(this IJSObjectReference jsObjectReference, string identifier, params object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        return jsObjectReference.InvokeNewAsync(identifier, args);
+    }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c>.</param>
+    /// <param name="cancellationToken">
+    /// A cancellation token to signal the cancellation of the operation. Specifying this parameter will override any default cancellations such as due to timeouts
+    /// (<see cref="JSRuntime.DefaultAsyncTimeout"/>) from being applied.
+    /// </param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeNewAsync(this IJSObjectReference jsObjectReference, string identifier, CancellationToken cancellationToken, object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        return jsObjectReference.InvokeNewAsync(identifier, cancellationToken, args);
+    }
+
+    /// <summary>
+    /// Invokes the specified JavaScript constructor function asynchronously. The function is invoked with the <c>new</c> operator.
+    /// </summary>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the constructor function to invoke. For example, the value <c>"someScope.SomeClass"</c> will invoke the constructor <c>someScope.SomeClass</c>.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <param name="args">JSON-serializable arguments.</param>
+    /// <returns>An <see cref="IJSObjectReference"/> instance that represents the created JS object.</returns>
+    public static ValueTask<IJSObjectReference> InvokeNewAsync(this IJSObjectReference jsObjectReference, string identifier, TimeSpan timeout, object?[]? args)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsObjectReference.InvokeNewAsync(identifier, cancellationToken, args);
+    }
 }

src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs

@@ -188,15 +188,17 @@ private void CleanupTasksAndRegistrations(long taskId)
     /// <param name="argsJson">A JSON representation of the arguments.</param>
     protected virtual void BeginInvokeJS(long taskId, string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson)
     {
-        BeginInvokeJS(new JSInvocationInfo
+        var invocationInfo = new JSInvocationInfo
         {
             AsyncHandle = taskId,
             TargetInstanceId = 0,
             Identifier = identifier,
             CallType = JSCallType.FunctionCall,
             ResultType = JSCallResultType.Default,
             ArgsJson = argsJson,
-        });
+        };
+
+        BeginInvokeJS(invocationInfo);
     }
 
     /// <summary>

src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Unshipped.txt

@@ -61,6 +61,9 @@ Microsoft.JSInterop.JSRuntime.InvokeNewAsync(string! identifier, object?[]? args
 Microsoft.JSInterop.JSRuntime.InvokeNewAsync(string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 Microsoft.JSInterop.JSRuntime.SetValueAsync<TValue>(string! identifier, TValue value) -> System.Threading.Tasks.ValueTask
 Microsoft.JSInterop.JSRuntime.SetValueAsync<TValue>(string! identifier, TValue value, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.ValueTask
+static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeNewAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, params object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeNewAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeNewAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.TimeSpan timeout, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 static Microsoft.JSInterop.JSRuntimeExtensions.InvokeNewAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, params object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 static Microsoft.JSInterop.JSRuntimeExtensions.InvokeNewAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 static Microsoft.JSInterop.JSRuntimeExtensions.InvokeNewAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.TimeSpan timeout, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>