Add missing extension methods, fix cancellation token passing

Author: oroztocil

src/JSInterop/Microsoft.JSInterop/src/Implementation/JSObjectReference.cs

@@ -78,7 +78,7 @@ public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, C
     {
         ThrowIfDisposed();
 
-        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.GetValue, null);
+        return _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.GetValue, cancellationToken, null);
     }
 
     /// <inheritdoc />
@@ -94,7 +94,7 @@ public ValueTask<IJSObjectReference> InvokeConstructorAsync(string identifier, C
     {
         ThrowIfDisposed();
 
-        await _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.SetValue, [value]);
+        await _jsRuntime.InvokeAsync<TValue>(Id, identifier, JSCallType.SetValue, cancellationToken, [value]);
     }
 
     /// <inheritdoc />

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

@@ -167,4 +167,41 @@ public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSObjec
 
         return jsObjectReference.InvokeConstructorAsync(identifier, cancellationToken, args);
     }
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>someScope.someProp</c>.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    public static ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSObjectReference jsObjectReference, string identifier, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsObjectReference.GetValueAsync<TValue>(identifier, cancellationToken);
+    }
+
+    /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="jsObjectReference">The <see cref="IJSObjectReference"/>.</param>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    public static ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSObjectReference jsObjectReference, string identifier, TValue value, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsObjectReference);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsObjectReference.SetValueAsync<TValue>(identifier, value, cancellationToken);
+    }
 }

src/JSInterop/Microsoft.JSInterop/src/JSRuntimeExtensions.cs

@@ -167,4 +167,41 @@ public static ValueTask<IJSObjectReference> InvokeConstructorAsync(this IJSRunti
 
         return jsRuntime.InvokeConstructorAsync(identifier, cancellationToken, args);
     }
+
+    /// <summary>
+    /// Reads the value of the specified JavaScript property asynchronously.
+    /// </summary>
+    /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+    /// <param name="jsRuntime">The <see cref="IJSRuntime"/>.</param>
+    /// <param name="identifier">An identifier for the property to read. For example, the value <c>"someScope.someProp"</c> will read the value of the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+    public static ValueTask<TValue> GetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSRuntime jsRuntime, string identifier, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsRuntime);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsRuntime.GetValueAsync<TValue>(identifier, cancellationToken);
+    }
+
+        /// <summary>
+    /// Updates the value of the specified JavaScript property asynchronously. If the property is not defined on the target object, it will be created.
+    /// </summary>
+    /// <typeparam name="TValue">JSON-serializable argument type.</typeparam>
+    /// <param name="jsRuntime">The <see cref="IJSRuntime"/>.</param>
+    /// <param name="identifier">An identifier for the property to set. For example, the value <c>"someScope.someProp"</c> will update the property <c>window.someScope.someProp</c>.</param>
+    /// <param name="value">JSON-serializable value.</param>
+    /// <param name="timeout">The duration after which to cancel the async operation. Overrides default timeouts (<see cref="JSRuntime.DefaultAsyncTimeout"/>).</param>
+    /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
+    public static ValueTask SetValueAsync<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(this IJSRuntime jsRuntime, string identifier, TValue value, TimeSpan timeout)
+    {
+        ArgumentNullException.ThrowIfNull(jsRuntime);
+
+        using var cancellationTokenSource = timeout == Timeout.InfiniteTimeSpan ? null : new CancellationTokenSource(timeout);
+        var cancellationToken = cancellationTokenSource?.Token ?? CancellationToken.None;
+
+        return jsRuntime.SetValueAsync<TValue>(identifier, value, cancellationToken);
+    }
 }

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

@@ -57,8 +57,12 @@ Microsoft.JSInterop.JSRuntime.SetValueAsync<TValue>(string! identifier, TValue v
 static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, params object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 static Microsoft.JSInterop.JSObjectReferenceExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.TimeSpan timeout, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.GetValueAsync<TValue>(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask<TValue>
+static Microsoft.JSInterop.JSObjectReferenceExtensions.SetValueAsync<TValue>(this Microsoft.JSInterop.IJSObjectReference! jsObjectReference, string! identifier, TValue value, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask
 static Microsoft.JSInterop.JSRuntimeExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, params object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 static Microsoft.JSInterop.JSRuntimeExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.Threading.CancellationToken cancellationToken, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
 static Microsoft.JSInterop.JSRuntimeExtensions.InvokeConstructorAsync(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.TimeSpan timeout, object?[]? args) -> System.Threading.Tasks.ValueTask<Microsoft.JSInterop.IJSObjectReference!>
+static Microsoft.JSInterop.JSRuntimeExtensions.GetValueAsync<TValue>(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask<TValue>
+static Microsoft.JSInterop.JSRuntimeExtensions.SetValueAsync<TValue>(this Microsoft.JSInterop.IJSRuntime! jsRuntime, string! identifier, TValue value, System.TimeSpan timeout) -> System.Threading.Tasks.ValueTask
 virtual Microsoft.JSInterop.JSInProcessRuntime.InvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> string?
 virtual Microsoft.JSInterop.JSRuntime.BeginInvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> void