From cb293661e118f66c798e9a5d9315408e871fce3d Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 17 Mar 2020 09:48:00 -0700
Subject: [PATCH] Make extensions

Make WebAssemblyJSRuntime interop-specific overloads extension methods
---
 .../JSInterop/src/WebAssemblyJSRuntime.cs     | 37 ----------
 .../src/WebAssemblyJSRuntimeExtensions.cs     | 70 +++++++++++++++++++
 .../src/Rendering/WebAssemblyRenderer.cs      |  1 +
 3 files changed, 71 insertions(+), 37 deletions(-)
 create mode 100644 src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntimeExtensions.cs

diff --git a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
index 435c49afb2..783dbb1082 100644
--- a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
+++ b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
@@ -42,41 +42,6 @@ namespace Microsoft.JSInterop.WebAssembly
             BeginInvokeJS(0, "DotNet.jsCallDispatcher.endInvokeDotNetFromJS", args);
         }
 
-        #region Custom WebAssemblyJSRuntime methods
-
-        /// <summary>
-        /// Invokes the JavaScript function registered with the specified identifier.
-        /// </summary>
-        /// <typeparam name="TResult">The .NET type corresponding to the function's return value type.</typeparam>
-        /// <param name="identifier">The identifier used when registering the target function.</param>
-        /// <returns>The result of the function invocation.</returns>
-        public TResult InvokeUnmarshalled<TResult>(string identifier)
-            => InvokeUnmarshalled<object, object, object, TResult>(identifier, null, null, null);
-
-        /// <summary>
-        /// Invokes the JavaScript function registered with the specified identifier.
-        /// </summary>
-        /// <typeparam name="T0">The type of the first argument.</typeparam>
-        /// <typeparam name="TResult">The .NET type corresponding to the function's return value type.</typeparam>
-        /// <param name="identifier">The identifier used when registering the target function.</param>
-        /// <param name="arg0">The first argument.</param>
-        /// <returns>The result of the function invocation.</returns>
-        public TResult InvokeUnmarshalled<T0, TResult>(string identifier, T0 arg0)
-            => InvokeUnmarshalled<T0, object, object, TResult>(identifier, arg0, null, null);
-
-        /// <summary>
-        /// Invokes the JavaScript function registered with the specified identifier.
-        /// </summary>
-        /// <typeparam name="T0">The type of the first argument.</typeparam>
-        /// <typeparam name="T1">The type of the second argument.</typeparam>
-        /// <typeparam name="TResult">The .NET type corresponding to the function's return value type.</typeparam>
-        /// <param name="identifier">The identifier used when registering the target function.</param>
-        /// <param name="arg0">The first argument.</param>
-        /// <param name="arg1">The second argument.</param>
-        /// <returns>The result of the function invocation.</returns>
-        public TResult InvokeUnmarshalled<T0, T1, TResult>(string identifier, T0 arg0, T1 arg1)
-            => InvokeUnmarshalled<T0, T1, object, TResult>(identifier, arg0, arg1, null);
-
         /// <summary>
         /// Invokes the JavaScript function registered with the specified identifier.
         /// </summary>
@@ -96,7 +61,5 @@ namespace Microsoft.JSInterop.WebAssembly
                 ? throw new JSException(exception)
                 : result;
         }
-
-        #endregion
     }
 }
diff --git a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntimeExtensions.cs b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntimeExtensions.cs
new file mode 100644
index 0000000000..4ba4de1266
--- /dev/null
+++ b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntimeExtensions.cs
@@ -0,0 +1,70 @@
+// 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.WebAssembly
+{
+    /// <summary>
+    /// Extension methods for <see cref="WebAssemblyJSRuntime"/>.
+    /// </summary>
+    public static class WebAssemblyJSRuntimeExtensions
+    {
+        /// <summary>
+        /// Invokes the JavaScript function registered with the specified identifier.
+        /// </summary>
+        /// <typeparam name="TResult">The .NET type corresponding to the function's return value type.</typeparam>
+        /// <param name="jsRuntime">The <see cref="WebAssemblyJSRuntime"/>.</param>
+        /// <param name="identifier">The identifier used when registering the target function.</param>
+        /// <returns>The result of the function invocation.</returns>
+        public static TResult InvokeUnmarshalled<TResult>(this WebAssemblyJSRuntime jsRuntime, string identifier)
+        {
+            if (jsRuntime is null)
+            {
+                throw new ArgumentNullException(nameof(jsRuntime));
+            }
+
+            return jsRuntime.InvokeUnmarshalled<object, object, object, TResult>(identifier, null, null, null);
+        }
+
+        /// <summary>
+        /// Invokes the JavaScript function registered with the specified identifier.
+        /// </summary>
+        /// <typeparam name="T0">The type of the first argument.</typeparam>
+        /// <typeparam name="TResult">The .NET type corresponding to the function's return value type.</typeparam>
+        /// <param name="jsRuntime">The <see cref="WebAssemblyJSRuntime"/>.</param>
+        /// <param name="identifier">The identifier used when registering the target function.</param>
+        /// <param name="arg0">The first argument.</param>
+        /// <returns>The result of the function invocation.</returns>
+        public static TResult InvokeUnmarshalled<T0, TResult>(this WebAssemblyJSRuntime jsRuntime, string identifier, T0 arg0)
+        {
+            if (jsRuntime is null)
+            {
+                throw new ArgumentNullException(nameof(jsRuntime));
+            }
+
+            return jsRuntime.InvokeUnmarshalled<T0, object, object, TResult>(identifier, arg0, null, null);
+        }
+
+        /// <summary>
+        /// Invokes the JavaScript function registered with the specified identifier.
+        /// </summary>
+        /// <typeparam name="T0">The type of the first argument.</typeparam>
+        /// <typeparam name="T1">The type of the second argument.</typeparam>
+        /// <typeparam name="TResult">The .NET type corresponding to the function's return value type.</typeparam>
+        /// <param name="jsRuntime">The <see cref="WebAssemblyJSRuntime"/>.</param>
+        /// <param name="identifier">The identifier used when registering the target function.</param>
+        /// <param name="arg0">The first argument.</param>
+        /// <param name="arg1">The second argument.</param>
+        /// <returns>The result of the function invocation.</returns>
+        public static TResult InvokeUnmarshalled<T0, T1, TResult>(this WebAssemblyJSRuntime jsRuntime, string identifier, T0 arg0, T1 arg1)
+        {
+            if (jsRuntime is null)
+            {
+                throw new ArgumentNullException(nameof(jsRuntime));
+            }
+
+            return jsRuntime.InvokeUnmarshalled<T0, T1, object, TResult>(identifier, arg0, arg1, null);
+        }
+    }
+}
diff --git a/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs b/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs
index 8615b05847..d9e81acf15 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs
+++ b/src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.WebAssembly.Services;
 using Microsoft.Extensions.Logging;
+using Microsoft.JSInterop.WebAssembly;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Rendering
 {