JSObjectReference API review follow-up (#25476)

MackinnonBuck · web-flow · commit 2a0b7dc43e71 · 2020-09-02T15:09:26.000-07:00
* API review changes.

* Fixed JSObjectReferenceJsonConverter

* CR feedback

* Update JSObjectReferenceExtensions.cs
diff --git a/src/Components/WebAssembly/JSInterop/src/Microsoft.JSInterop.WebAssembly.csproj b/src/Components/WebAssembly/JSInterop/src/Microsoft.JSInterop.WebAssembly.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -12,4 +12,8 @@
     <Reference Include="Microsoft.JSInterop" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedSourceRoot)JSInterop\*.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
@@ -78,7 +78,7 @@ TResult IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string id
             var callInfo = new JSCallInfo
             {
                 FunctionIdentifier = identifier,
-                ResultType = ResultTypeFromGeneric<TResult>()
+                ResultType = JSCallResultTypeHelper.FromGeneric<TResult>()
             };
 
             var result = InternalCalls.InvokeJS<T0, T1, T2, TResult>(out var exception, ref callInfo, arg0, arg1, arg2);
diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
@@ -137,7 +137,7 @@
             ReturnValues["returnArray"] = string.Join(",", ((IJSInProcessRuntime)JSRuntime).Invoke<Segment[]>("returnArray").Select(x => x.Source).ToArray());
         }
 
-        var jsObjectReference = await JSRuntime.InvokeAsync<JSObjectReference>("returnJSObjectReference");
+        var jsObjectReference = await JSRuntime.InvokeAsync<IJSObjectReference>("returnJSObjectReference");
         ReturnValues["jsObjectReference.identity"] = await jsObjectReference.InvokeAsync<string>("identity", "Invoked from JSObjectReference");
         ReturnValues["jsObjectReference.nested.add"] = (await jsObjectReference.InvokeAsync<int>("nested.add", 2, 3)).ToString();
         ReturnValues["addViaJSObjectReference"] = (await JSRuntime.InvokeAsync<int>("addViaJSObjectReference", jsObjectReference, 2, 3)).ToString();
@@ -151,7 +151,7 @@
             JSObjectReferenceInvokeNonFunctionException = e;
         }
 
-        var module = await JSRuntime.InvokeAsync<JSObjectReference>("import", "./js/testmodule.js");
+        var module = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/testmodule.js");
         ReturnValues["jsObjectReferenceModule"] = await module.InvokeAsync<string>("identity", "Returned from module!");
 
         if (shouldSupportSyncInterop)
@@ -192,7 +192,7 @@
     {
         var inProcRuntime = ((IJSInProcessRuntime)JSRuntime);
 
-        var jsInProcObjectReference = inProcRuntime.Invoke<JSInProcessObjectReference>("returnJSObjectReference");
+        var jsInProcObjectReference = inProcRuntime.Invoke<IJSInProcessObjectReference>("returnJSObjectReference");
         ReturnValues["jsInProcessObjectReference.identity"] = jsInProcObjectReference.Invoke<string>("identity", "Invoked from JSInProcessObjectReference");
     }
 
diff --git a/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs b/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs
@@ -415,20 +415,20 @@ public static int ExtractNonSerializedValue(DotNetObjectReference<TestDTO> objec
         }
 
         [JSInvokable]
-        public static JSObjectReference RoundTripJSObjectReference(JSObjectReference jsObjectReference)
+        public static IJSObjectReference RoundTripJSObjectReference(IJSObjectReference jsObjectReference)
         {
             return jsObjectReference;
         }
 
         [JSInvokable]
-        public static async Task<JSObjectReference> RoundTripJSObjectReferenceAsync(JSObjectReference jSObjectReference)
+        public static async Task<IJSObjectReference> RoundTripJSObjectReferenceAsync(IJSObjectReference jSObjectReference)
         {
             await Task.Yield();
             return jSObjectReference;
         }
 
         [JSInvokable]
-        public static string InvokeDisposedJSObjectReferenceException(JSInProcessObjectReference jsObjectReference)
+        public static string InvokeDisposedJSObjectReferenceException(IJSInProcessObjectReference jsObjectReference)
         {
             try
             {
@@ -442,7 +442,7 @@ public static string InvokeDisposedJSObjectReferenceException(JSInProcessObjectR
         }
 
         [JSInvokable]
-        public static async Task<string> InvokeDisposedJSObjectReferenceExceptionAsync(JSObjectReference jsObjectReference)
+        public static async Task<string> InvokeDisposedJSObjectReferenceExceptionAsync(IJSObjectReference jsObjectReference)
         {
             try
             {
diff --git a/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/IJSInProcessObjectReference.cs
@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.JSInterop
+{
+    /// <summary>
+    /// Represents a reference to a JavaScript object whose functions can be invoked synchronously.
+    /// </summary>
+    public interface IJSInProcessObjectReference : IJSObjectReference
+    {
+        /// <summary>
+        /// Invokes the specified JavaScript function synchronously.
+        /// </summary>
+        /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</param>
+        /// <param name="args">JSON-serializable arguments.</param>
+        /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+        TValue Invoke<TValue>(string identifier, params object?[]? args);
+    }
+}
diff --git a/src/JSInterop/Microsoft.JSInterop/src/IJSObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/IJSObjectReference.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.JSInterop
+{
+    /// <summary>
+    /// Represents a reference to a JavaScript object.
+    /// </summary>
+    public interface IJSObjectReference : IAsyncDisposable
+    {
+        /// <summary>
+        /// Invokes the specified JavaScript function asynchronously.
+        /// <para>
+        /// <see cref="JSRuntime"/> will apply timeouts to this operation based on the value configured in <see cref="JSRuntime.DefaultAsyncTimeout"/>. To dispatch a call with a different, or no timeout,
+        /// consider using <see cref="InvokeAsync{TValue}(string, CancellationToken, object[])" />.
+        /// </para>
+        /// </summary>
+        /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</param>
+        /// <param name="args">JSON-serializable arguments.</param>
+        /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+        ValueTask<TValue> InvokeAsync<TValue>(string identifier, object?[]? args);
+
+        /// <summary>
+        /// Invokes the specified JavaScript function asynchronously.
+        /// </summary>
+        /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
+        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</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 instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
+        ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object?[]? args);
+    }
+}
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSObjectReferenceJsonConverter.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSObjectReferenceJsonConverter.cs
@@ -7,17 +7,21 @@
 
 namespace Microsoft.JSInterop.Infrastructure
 {
-    internal sealed class JSObjectReferenceJsonConverter<TJSObjectReference>
-        : JsonConverter<TJSObjectReference> where TJSObjectReference : JSObjectReference
+    internal sealed class JSObjectReferenceJsonConverter<TInterface, TImplementation> : JsonConverter<TInterface>
+        where TInterface : class, IJSObjectReference
+        where TImplementation : JSObjectReference, TInterface
     {
-        private readonly Func<long, TJSObjectReference> _jsObjectReferenceFactory;
+        private readonly Func<long, TImplementation> _jsObjectReferenceFactory;
 
-        public JSObjectReferenceJsonConverter(Func<long, TJSObjectReference> jsObjectReferenceFactory)
+        public JSObjectReferenceJsonConverter(Func<long, TImplementation> jsObjectReferenceFactory)
         {
             _jsObjectReferenceFactory = jsObjectReferenceFactory;
         }
 
-        public override TJSObjectReference? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override bool CanConvert(Type typeToConvert)
+            => typeToConvert == typeof(TInterface) || typeToConvert == typeof(TImplementation);
+
+        public override TInterface? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             long id = -1;
 
@@ -49,10 +53,10 @@ public JSObjectReferenceJsonConverter(Func<long, TJSObjectReference> jsObjectRef
             return _jsObjectReferenceFactory(id);
         }
 
-        public override void Write(Utf8JsonWriter writer, TJSObjectReference value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options)
         {
             writer.WriteStartObject();
-            writer.WriteNumber(JSObjectReference.IdKey, value.Id);
+            writer.WriteNumber(JSObjectReference.IdKey, ((TImplementation)value).Id);
             writer.WriteEndObject();
         }
     }
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSInProcessObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/JSInProcessObjectReference.cs
@@ -5,10 +5,7 @@
 
 namespace Microsoft.JSInterop
 {
-    /// <summary>
-    /// Represents a reference to a JavaScript object whose functions can be invoked synchronously.
-    /// </summary>
-    public class JSInProcessObjectReference : JSObjectReference
+    internal class JSInProcessObjectReference : JSObjectReference, IJSInProcessObjectReference
     {
         private readonly JSInProcessRuntime _jsRuntime;
 
@@ -17,15 +14,8 @@ internal JSInProcessObjectReference(JSInProcessRuntime jsRuntime, long id) : bas
             _jsRuntime = jsRuntime;
         }
 
-        /// <summary>
-        /// Invokes the specified JavaScript function synchronously.
-        /// </summary>
-        /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
-        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</param>
-        /// <param name="args">JSON-serializable arguments.</param>
-        /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
         [return: MaybeNull]
-        public TValue Invoke<TValue>(string identifier, params object[] args)
+        public TValue Invoke<TValue>(string identifier, params object?[]? args)
         {
             ThrowIfDisposed();
 
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSInProcessObjectReferenceExtensions.cs b/src/JSInterop/Microsoft.JSInterop/src/JSInProcessObjectReferenceExtensions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.JSInterop
+{
+    public static class JSInProcessObjectReferenceExtensions
+    {
+        /// <summary>
+        /// Invokes the specified JavaScript function synchronously.
+        /// </summary>
+        /// <param name="jsObjectReference">The <see cref="IJSInProcessObjectReference"/>.</param>
+        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</param>
+        /// <param name="args">JSON-serializable arguments.</param>
+        public static void InvokeVoid(this IJSInProcessObjectReference jsObjectReference, string identifier, params object?[] args)
+        {
+            if (jsObjectReference == null)
+            {
+                throw new ArgumentNullException(nameof(jsObjectReference));
+            }
+
+            jsObjectReference.Invoke<object>(identifier, args);
+        }
+    }
+}
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs
@@ -17,7 +17,7 @@ public abstract class JSInProcessRuntime : JSRuntime, IJSInProcessRuntime
         /// </summary>
         protected JSInProcessRuntime()
         {
-            JsonSerializerOptions.Converters.Add(new JSObjectReferenceJsonConverter<JSInProcessObjectReference>(
+            JsonSerializerOptions.Converters.Add(new JSObjectReferenceJsonConverter<IJSInProcessObjectReference, JSInProcessObjectReference>(
                 id => new JSInProcessObjectReference(this, id)));
         }
 
@@ -27,7 +27,7 @@ internal TValue Invoke<TValue>(string identifier, long targetInstanceId, params
             var resultJson = InvokeJS(
                 identifier,
                 JsonSerializer.Serialize(args, JsonSerializerOptions),
-                ResultTypeFromGeneric<TValue>(),
+                JSCallResultTypeHelper.FromGeneric<TValue>(),
                 targetInstanceId);
 
             if (resultJson is null)
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSObjectReference.cs b/src/JSInterop/Microsoft.JSInterop/src/JSObjectReference.cs
@@ -8,77 +8,37 @@
 
 namespace Microsoft.JSInterop
 {
-    /// <summary>
-    /// Represents a reference to a JavaScript object.
-    /// </summary>
-    public class JSObjectReference : IAsyncDisposable
+    internal class JSObjectReference : IJSObjectReference
     {
-        internal static readonly JsonEncodedText IdKey = JsonEncodedText.Encode("__jsObjectId");
+        public static readonly JsonEncodedText IdKey = JsonEncodedText.Encode("__jsObjectId");
 
         private readonly JSRuntime _jsRuntime;
 
         private bool _disposed;
 
-        internal long Id { get; }
+        public long Id { get; }
 
-        internal JSObjectReference(JSRuntime jsRuntime, long id)
+        public JSObjectReference(JSRuntime jsRuntime, long id)
         {
             _jsRuntime = jsRuntime;
 
             Id = id;
         }
 
-        /// <summary>
-        /// Invokes the specified JavaScript function asynchronously.
-        /// </summary>
-        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</param>
-        /// <param name="args">JSON-serializable arguments.</param>
-        /// <returns>A <see cref="ValueTask"/> that represents the asynchronous invocation operation.</returns>
-        public async ValueTask InvokeVoidAsync(string identifier, params object[] args)
-        {
-            await InvokeAsync<object>(identifier, args);
-        }
-
-        /// <summary>
-        /// Invokes the specified JavaScript function asynchronously.
-        /// <para>
-        /// <see cref="JSRuntime"/> will apply timeouts to this operation based on the value configured in <see cref="JSRuntime.DefaultAsyncTimeout"/>. To dispatch a call with a different, or no timeout,
-        /// consider using <see cref="InvokeAsync{TValue}(string, CancellationToken, object[])" />.
-        /// </para>
-        /// </summary>
-        /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
-        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</param>
-        /// <param name="args">JSON-serializable arguments.</param>
-        /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
-        public ValueTask<TValue> InvokeAsync<TValue>(string identifier, params object[] args)
+        public ValueTask<TValue> InvokeAsync<TValue>(string identifier, object?[]? args)
         {
             ThrowIfDisposed();
 
             return _jsRuntime.InvokeAsync<TValue>(Id, identifier, args);
         }
 
-        /// <summary>
-        /// Invokes the specified JavaScript function asynchronously.
-        /// </summary>
-        /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>
-        /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</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 instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>
-        public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, params object[] args)
+        public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object?[]? args)
         {
             ThrowIfDisposed();
 
             return _jsRuntime.InvokeAsync<TValue>(Id, identifier, cancellationToken, args);
         }
 
-        /// <summary>
-        /// Disposes the <see cref="JSObjectReference"/>, freeing its resources and disabling it from further use.
-        /// </summary>
-        /// <returns>A <see cref="ValueTask"/> representing the completion of the operation.</returns>
         public async ValueTask DisposeAsync()
         {
             if (!_disposed)
@@ -89,9 +49,6 @@ public async ValueTask DisposeAsync()
             }
         }
 
-        /// <summary>
-        /// Throws an exception if this instance has been disposed.
-        /// </summary>
         protected void ThrowIfDisposed()
         {
             if (_disposed)
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSObjectReferenceExtensions.cs b/src/JSInterop/Microsoft.JSInterop/src/JSObjectReferenceExtensions.cs
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj
diff --git a/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/JSObjectReferenceJsonConverterTest.cs b/src/JSInterop/Microsoft.JSInterop/test/Infrastructure/JSObjectReferenceJsonConverterTest.cs
diff --git a/src/Shared/JSInterop/JSCallResultTypeHelper.cs b/src/Shared/JSInterop/JSCallResultTypeHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ TResult IJSUnmarshalledRuntime.InvokeUnmarshalled<T0, T1, T2, TResult>(string id`
`78`	`78`	`var callInfo = new JSCallInfo`
`79`	`79`	`{`
`80`	`80`	`FunctionIdentifier = identifier,`
`81`		`- ResultType = ResultTypeFromGeneric<TResult>()`
	`81`	`+ ResultType = JSCallResultTypeHelper.FromGeneric<TResult>()`
`82`	`82`	`};`
`83`	`83`
`84`	`84`	`var result = InternalCalls.InvokeJS<T0, T1, T2, TResult>(out var exception, ref callInfo, arg0, arg1, arg2);`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@`
`137`	`137`	`ReturnValues["returnArray"] = string.Join(",", ((IJSInProcessRuntime)JSRuntime).Invoke<Segment[]>("returnArray").Select(x => x.Source).ToArray());`
`138`	`138`	`}`
`139`	`139`
`140`		`- var jsObjectReference = await JSRuntime.InvokeAsync<JSObjectReference>("returnJSObjectReference");`
	`140`	`+ var jsObjectReference = await JSRuntime.InvokeAsync<IJSObjectReference>("returnJSObjectReference");`
`141`	`141`	`ReturnValues["jsObjectReference.identity"] = await jsObjectReference.InvokeAsync<string>("identity", "Invoked from JSObjectReference");`
`142`	`142`	`ReturnValues["jsObjectReference.nested.add"] = (await jsObjectReference.InvokeAsync<int>("nested.add", 2, 3)).ToString();`
`143`	`143`	`ReturnValues["addViaJSObjectReference"] = (await JSRuntime.InvokeAsync<int>("addViaJSObjectReference", jsObjectReference, 2, 3)).ToString();`
`@@ -151,7 +151,7 @@`
`151`	`151`	`JSObjectReferenceInvokeNonFunctionException = e;`
`152`	`152`	`}`
`153`	`153`
`154`		`- var module = await JSRuntime.InvokeAsync<JSObjectReference>("import", "./js/testmodule.js");`
	`154`	`+ var module = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/testmodule.js");`
`155`	`155`	`ReturnValues["jsObjectReferenceModule"] = await module.InvokeAsync<string>("identity", "Returned from module!");`
`156`	`156`
`157`	`157`	`if (shouldSupportSyncInterop)`
`@@ -192,7 +192,7 @@`
`192`	`192`	`{`
`193`	`193`	`var inProcRuntime = ((IJSInProcessRuntime)JSRuntime);`
`194`	`194`
`195`		`- var jsInProcObjectReference = inProcRuntime.Invoke<JSInProcessObjectReference>("returnJSObjectReference");`
	`195`	`+ var jsInProcObjectReference = inProcRuntime.Invoke<IJSInProcessObjectReference>("returnJSObjectReference");`
`196`	`196`	`ReturnValues["jsInProcessObjectReference.identity"] = jsInProcObjectReference.Invoke<string>("identity", "Invoked from JSInProcessObjectReference");`
`197`	`197`	`}`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -415,20 +415,20 @@ public static int ExtractNonSerializedValue(DotNetObjectReference<TestDTO> objec`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`[JSInvokable]`
`418`		`- public static JSObjectReference RoundTripJSObjectReference(JSObjectReference jsObjectReference)`
	`418`	`+ public static IJSObjectReference RoundTripJSObjectReference(IJSObjectReference jsObjectReference)`
`419`	`419`	`{`
`420`	`420`	`return jsObjectReference;`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`[JSInvokable]`
`424`		`- public static async Task<JSObjectReference> RoundTripJSObjectReferenceAsync(JSObjectReference jSObjectReference)`
	`424`	`+ public static async Task<IJSObjectReference> RoundTripJSObjectReferenceAsync(IJSObjectReference jSObjectReference)`
`425`	`425`	`{`
`426`	`426`	`await Task.Yield();`
`427`	`427`	`return jSObjectReference;`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`[JSInvokable]`
`431`		`- public static string InvokeDisposedJSObjectReferenceException(JSInProcessObjectReference jsObjectReference)`
	`431`	`+ public static string InvokeDisposedJSObjectReferenceException(IJSInProcessObjectReference jsObjectReference)`
`432`	`432`	`{`
`433`	`433`	`try`
`434`	`434`	`{`
`@@ -442,7 +442,7 @@ public static string InvokeDisposedJSObjectReferenceException(JSInProcessObjectR`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`[JSInvokable]`
`445`		`- public static async Task<string> InvokeDisposedJSObjectReferenceExceptionAsync(JSObjectReference jsObjectReference)`
	`445`	`+ public static async Task<string> InvokeDisposedJSObjectReferenceExceptionAsync(IJSObjectReference jsObjectReference)`
`446`	`446`	`{`
`447`	`447`	`try`
`448`	`448`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,21 @@`
`7`	`7`
`8`	`8`	`namespace Microsoft.JSInterop.Infrastructure`
`9`	`9`	`{`
`10`		`- internal sealed class JSObjectReferenceJsonConverter<TJSObjectReference>`
`11`		`- : JsonConverter<TJSObjectReference> where TJSObjectReference : JSObjectReference`
	`10`	`+ internal sealed class JSObjectReferenceJsonConverter<TInterface, TImplementation> : JsonConverter<TInterface>`
	`11`	`+ where TInterface : class, IJSObjectReference`
	`12`	`+ where TImplementation : JSObjectReference, TInterface`
`12`	`13`	`{`
`13`		`- private readonly Func<long, TJSObjectReference> _jsObjectReferenceFactory;`
	`14`	`+ private readonly Func<long, TImplementation> _jsObjectReferenceFactory;`
`14`	`15`
`15`		`- public JSObjectReferenceJsonConverter(Func<long, TJSObjectReference> jsObjectReferenceFactory)`
	`16`	`+ public JSObjectReferenceJsonConverter(Func<long, TImplementation> jsObjectReferenceFactory)`
`16`	`17`	`{`
`17`	`18`	`_jsObjectReferenceFactory = jsObjectReferenceFactory;`
`18`	`19`	`}`
`19`	`20`
`20`		`- public override TJSObjectReference? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
	`21`	`+ public override bool CanConvert(Type typeToConvert)`
	`22`	`+ => typeToConvert == typeof(TInterface) \|\| typeToConvert == typeof(TImplementation);`
	`23`	`+`
	`24`	`+ public override TInterface? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`21`	`25`	`{`
`22`	`26`	`long id = -1;`
`23`	`27`
`@@ -49,10 +53,10 @@ public JSObjectReferenceJsonConverter(Func<long, TJSObjectReference> jsObjectRef`
`49`	`53`	`return _jsObjectReferenceFactory(id);`
`50`	`54`	`}`
`51`	`55`
`52`		`- public override void Write(Utf8JsonWriter writer, TJSObjectReference value, JsonSerializerOptions options)`
	`56`	`+ public override void Write(Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options)`
`53`	`57`	`{`
`54`	`58`	`writer.WriteStartObject();`
`55`		`- writer.WriteNumber(JSObjectReference.IdKey, value.Id);`
	`59`	`+ writer.WriteNumber(JSObjectReference.IdKey, ((TImplementation)value).Id);`
`56`	`60`	`writer.WriteEndObject();`
`57`	`61`	`}`
`58`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.JSInterop`
`7`	`7`	`{`
`8`		`- /// <summary>`
`9`		`- /// Represents a reference to a JavaScript object whose functions can be invoked synchronously.`
`10`		`- /// </summary>`
`11`		`- public class JSInProcessObjectReference : JSObjectReference`
	`8`	`+ internal class JSInProcessObjectReference : JSObjectReference, IJSInProcessObjectReference`
`12`	`9`	`{`
`13`	`10`	`private readonly JSInProcessRuntime _jsRuntime;`
`14`	`11`
`@@ -17,15 +14,8 @@ internal JSInProcessObjectReference(JSInProcessRuntime jsRuntime, long id) : bas`
`17`	`14`	`_jsRuntime = jsRuntime;`
`18`	`15`	`}`
`19`	`16`
`20`		`- /// <summary>`
`21`		`- /// Invokes the specified JavaScript function synchronously.`
`22`		`- /// </summary>`
`23`		`- /// <typeparam name="TValue">The JSON-serializable return type.</typeparam>`
`24`		`- /// <param name="identifier">An identifier for the function to invoke. For example, the value <c>"someScope.someFunction"</c> will invoke the function <c>someScope.someFunction</c> on the target instance.</param>`
`25`		`- /// <param name="args">JSON-serializable arguments.</param>`
`26`		`- /// <returns>An instance of <typeparamref name="TValue"/> obtained by JSON-deserializing the return value.</returns>`
`27`	`17`	`[return: MaybeNull]`
`28`		`- public TValue Invoke<TValue>(string identifier, params object[] args)`
	`18`	`+ public TValue Invoke<TValue>(string identifier, params object?[]? args)`
`29`	`19`	`{`
`30`	`20`	`ThrowIfDisposed();`
`31`	`21`