[wasm] Redesign of JS objects marshaling and lifecycle

src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs

@@ -2,11 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 
 using JSObject = System.Runtime.InteropServices.JavaScript.JSObject;
 using JSException = System.Runtime.InteropServices.JavaScript.JSException;
@@ -34,11 +30,9 @@ internal static partial class Runtime
         internal static extern object GetGlobalObject(string? globalName, out int exceptionalResult);
 
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        internal static extern object ReleaseHandle(int jsHandle, out int exceptionalResult);
+        internal static extern object ReleaseCSOwnedObject(int jsHandle);
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        internal static extern object BindCoreObject(int jsHandle, int gcHandle, out int exceptionalResult);
-        [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        internal static extern object New(string className, object[] parms, out int exceptionalResult);
+        internal static extern object CreateCSOwnedObject(string className, object[] parms, out int exceptionalResult);
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         internal static extern object TypedArrayToArray(int jsHandle, out int exceptionalResult);
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -75,32 +69,16 @@ public static string InvokeJS(string str)
             return res as System.Runtime.InteropServices.JavaScript.Function;
         }
 
-        public static int New<T>(params object[] parms)
-        {
-            object res = New(typeof(T).Name, parms, out int exception);
-            if (exception != 0)
-                throw new JSException((string)res);
-            return (int)res;
-        }
-
-        public static int New(string hostClassName, params object[] parms)
-        {
-            object res = New(hostClassName, parms, out int exception);
-            if (exception != 0)
-                throw new JSException((string)res);
-            return (int)res;
-        }
-
         public static object GetGlobalObject(string? str = null)
         {
             int exception;
-            object globalHandle = Runtime.GetGlobalObject(str, out exception);
+            object jsObj = GetGlobalObject(str, out exception);
 
             if (exception != 0)
                 throw new JSException($"Error obtaining a handle to global {str}");
 
-            ReleaseInFlight(globalHandle);
-            return globalHandle;
+            ReleaseInFlight(jsObj);
+            return jsObj;
         }
 
         [MethodImplAttribute(MethodImplOptions.NoInlining)]
@@ -125,7 +103,7 @@ public static unsafe void DumpAotProfileData(ref byte buf, int len, string extra
             }
         }
 
-        public static void ReleaseInFlight(object? obj)
+        internal static void ReleaseInFlight(object? obj)
         {
             JSObject? jsObj = obj as JSObject;
             jsObj?.ReleaseInFlight();

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System.Private.Runtime.InteropServices.JavaScript.csproj

@@ -8,6 +8,8 @@
   <ItemGroup Condition="'$(TargetsBrowser)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Browser\Interop.Runtime.cs" Link="Common\Interop\Browser\Interop.Runtime.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\Runtime.cs" />
+    <Compile Include="System\Runtime\InteropServices\JavaScript\Runtime.CS.Owned.cs" />
+    <Compile Include="System\Runtime\InteropServices\JavaScript\Runtime.JS.Owned.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\JSException.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\JSObject.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\DataView.cs" />
@@ -28,7 +30,7 @@
     <Compile Include="System\Runtime\InteropServices\JavaScript\CoreObject.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\HostObject.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\Function.cs" />
-    <Compile Include="System\Runtime\InteropServices\JavaScript\AnyRef.cs" />
+    <Compile Include="System\Runtime\InteropServices\JavaScript\JSObject.References.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Array.cs

@@ -14,15 +14,14 @@ public class Array : CoreObject
         /// Initializes a new instance of the Array class.
         /// </summary>
         /// <param name="_params">Parameters.</param>
-        public Array(params object[] _params) : base(Interop.Runtime.New<Array>(_params))
+        public Array(params object[] _params) : base(nameof(Array), _params)
         { }
 
         /// <summary>
         /// Initializes a new instance of the Array/> class.
         /// </summary>
         /// <param name="jsHandle">Js handle.</param>
-        /// <param name="ownsHandle">Whether or not the handle is owned by the clr or not.</param>
-        internal Array(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
+        internal Array(IntPtr jsHandle) : base(jsHandle)
         { }
 
         /// <summary>
@@ -82,6 +81,8 @@ public object this[int i]
         {
             get
             {
+                AssertNotDisposed();
+
                 object indexValue = Interop.Runtime.GetByIndex(JSHandle, i, out int exception);
 
                 if (exception != 0)
@@ -91,6 +92,8 @@ public object this[int i]
             }
             set
             {
+                AssertNotDisposed();
+
                 object res = Interop.Runtime.SetByIndex(JSHandle, i, value, out int exception);
 
                 if (exception != 0)

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/ArrayBuffer.cs

@@ -10,22 +10,21 @@ public class ArrayBuffer : CoreObject
         /// <summary>
         /// Initializes a new instance of the JavaScript Core ArrayBuffer class.
         /// </summary>
-        public ArrayBuffer() : base(Interop.Runtime.New<ArrayBuffer>())
+        public ArrayBuffer() : base(nameof(ArrayBuffer))
         { }
 
         /// <summary>
         /// Initializes a new instance of the JavaScript Core ArrayBuffer class.
         /// </summary>
         /// <param name="length">Length.</param>
-        public ArrayBuffer(int length) : base(Interop.Runtime.New<ArrayBuffer>(length))
+        public ArrayBuffer(int length) : base(nameof(ArrayBuffer), length)
         { }
 
         /// <summary>
         /// Initializes a new instance of the JavaScript Core ArrayBuffer class.
         /// </summary>
         /// <param name="jsHandle">Js handle.</param>
-        /// <param name="ownsHandle">Whether or not the handle is owned by the clr or not.</param>
-        internal ArrayBuffer(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
+        internal ArrayBuffer(IntPtr jsHandle) : base(jsHandle)
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/CoreObject.cs

@@ -18,14 +18,12 @@ namespace System.Runtime.InteropServices.JavaScript
     /// </remarks>
     public abstract class CoreObject : JSObject
     {
-        protected CoreObject(int jsHandle) : base(jsHandle, true)
+        internal CoreObject(IntPtr jsHandle) : base(jsHandle)
         {
-            object result = Interop.Runtime.BindCoreObject(jsHandle, GCHandleValue, out int exception);
-            if (exception != 0)
-                throw new JSException(SR.Format(SR.CoreObjectErrorBinding, result));
         }
 
-        internal CoreObject(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
-        { }
+        protected CoreObject(string typeName, params object[] _params) : base(typeName, _params)
+        {
+        }
     }
 }

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/DataView.cs

@@ -15,15 +15,15 @@ public class DataView : CoreObject
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">ArrayBuffer to use as the storage backing the new DataView object.</param>
-        public DataView(ArrayBuffer buffer) : base(Runtime.New<DataView>(buffer))
+        public DataView(ArrayBuffer buffer) : base(nameof(DataView), buffer)
         { }
 
         /// <summary>
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">ArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
-        public DataView(ArrayBuffer buffer, int byteOffset) : base(Runtime.New<DataView>(buffer, byteOffset))
+        public DataView(ArrayBuffer buffer, int byteOffset) : base(nameof(DataView), buffer, byteOffset)
         { }
 
         /// <summary>
@@ -32,22 +32,22 @@ public DataView(ArrayBuffer buffer, int byteOffset) : base(Runtime.New<DataView>
         /// <param name="buffer">ArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
         /// <param name="byteLength">The number of elements in the byte array. If unspecified, the view's length will match the buffer's length.</param>
-        public DataView(ArrayBuffer buffer, int byteOffset, int byteLength) : base(Runtime.New<DataView>(buffer, byteOffset, byteLength))
+        public DataView(ArrayBuffer buffer, int byteOffset, int byteLength) : base(nameof(DataView), buffer, byteOffset, byteLength)
         { }
 
         /// <summary>
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">SharedArrayBuffer to use as the storage backing the new DataView object.</param>
-        public DataView(SharedArrayBuffer buffer) : base(Runtime.New<DataView>(buffer))
+        public DataView(SharedArrayBuffer buffer) : base(nameof(DataView), buffer)
         { }
 
         /// <summary>
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">SharedArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
-        public DataView(SharedArrayBuffer buffer, int byteOffset) : base(Runtime.New<DataView>(buffer, byteOffset))
+        public DataView(SharedArrayBuffer buffer, int byteOffset) : base(nameof(DataView), buffer, byteOffset)
         { }
 
         /// <summary>
@@ -56,15 +56,14 @@ public DataView(SharedArrayBuffer buffer, int byteOffset) : base(Runtime.New<Dat
         /// <param name="buffer">SharedArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
         /// <param name="byteLength">The number of elements in the byte array. If unspecified, the view's length will match the buffer's length.</param>
-        public DataView(SharedArrayBuffer buffer, int byteOffset, int byteLength) : base(Runtime.New<DataView>(buffer, byteOffset, byteLength))
+        public DataView(SharedArrayBuffer buffer, int byteOffset, int byteLength) : base(nameof(DataView), buffer, byteOffset, byteLength)
         { }
 
         /// <summary>
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="jsHandle">Js handle.</param>
-        /// <param name="ownsHandle">Managed owned</param>
-        internal DataView(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
+        internal DataView(IntPtr jsHandle) : base(jsHandle)
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Float32Array.cs

@@ -23,7 +23,7 @@ public Float32Array(SharedArrayBuffer buffer, int byteOffset) : base(buffer, byt
 
         public Float32Array(SharedArrayBuffer buffer, int byteOffset, int length) : base(buffer, byteOffset, length) { }
 
-        internal Float32Array(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
+        internal Float32Array(IntPtr jsHandle) : base(jsHandle)
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Float64Array.cs

@@ -23,7 +23,7 @@ public Float64Array(SharedArrayBuffer buffer, int byteOffset) : base(buffer, byt
 
         public Float64Array(SharedArrayBuffer buffer, int byteOffset, int length) : base(buffer, byteOffset, length) { }
 
-        internal Float64Array(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
+        internal Float64Array(IntPtr jsHandle) : base(jsHandle)
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Function.cs

@@ -16,10 +16,10 @@ namespace System.Runtime.InteropServices.JavaScript
     /// </remarks>
     public class Function : CoreObject
     {
-        public Function(params object[] args) : base(Interop.Runtime.New<Function>(args))
+        public Function(params object[] args) : base(nameof(Function), args)
         { }
 
-        internal Function(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
+        internal Function(IntPtr jsHandle) : base(jsHandle)
         { }
 
         /// <summary>
@@ -28,28 +28,34 @@ internal Function(IntPtr jsHandle, bool ownsHandle) : base(jsHandle, ownsHandle)
         /// <returns>The apply.</returns>
         /// <param name="thisArg">This argument.</param>
         /// <param name="argsArray">Arguments.</param>
-        public object Apply(object? thisArg = null, object[]? argsArray = null) => Invoke("apply", thisArg, argsArray);
+        public object Apply(object? thisArg, object[]? argsArray = null) => Invoke("apply", thisArg, argsArray);
 
         /// <summary>
         /// Creates a new Function that, when called, has its this keyword set to the provided value, with a given sequence of arguments preceding any provided when the new function is called.
         /// </summary>
         /// <returns>The bind.</returns>
         /// <param name="thisArg">This argument.</param>
         /// <param name="argsArray">Arguments.</param>
-        public Function Bind(object? thisArg = null, object[]? argsArray = null) => (Function)Invoke("bind", thisArg, argsArray);
+        public Function Bind(object? thisArg, object[]? argsArray = null) => (Function)Invoke("bind", thisArg, argsArray);
 
         /// <summary>
         /// Calls a function with a given `this` value and arguments provided individually.
         /// </summary>
         /// <returns>The result of calling the function with the specified `this` value and arguments.</returns>
         /// <param name="thisArg">Optional (null value). The value of this provided for the call to a function. Note that this may not be the actual value seen by the method: if the method is a function in non-strict mode, null and undefined will be replaced with the global object and primitive values will be converted to objects.</param>
         /// <param name="argsArray">Optional. Arguments for the function.</param>
-        public object Call(object? thisArg = null, params object[] argsArray)
+        public object Call(object? thisArg, params object[] argsArray)
         {
             object?[] argsList = new object[argsArray.Length + 1];
             argsList[0] = thisArg;
             System.Array.Copy(argsArray, 0, argsList, 1, argsArray.Length);
             return Invoke("call", argsList);
         }
+
+        /// <summary>
+        /// Calls a function with a null `this` value.
+        /// </summary>
+        /// <returns>The result of calling the function.</returns>
+        public object Call() => Call(null);
     }
 }