Remove JSNativeApi.cs (#187)

Author: vmoroz

bench/Benchmarks.cs

@@ -51,6 +51,7 @@ public static void Main(string[] args)
         "libnode" + GetSharedLibraryExtension());
 
     private napi_env _env;
+    private JSValue _jsString;
     private JSFunction _jsFunction;
     private JSFunction _jsFunctionWithArgs;
     private JSFunction _jsFunctionWithCallback;
@@ -95,13 +96,14 @@ protected void Setup()
 
         // Create some JS values that will be used by the benchmarks.
 
-        _jsFunction = (JSFunction)JSNativeApi.RunScript("function jsFunction() { }; jsFunction");
-        _jsFunctionWithArgs = (JSFunction)JSNativeApi.RunScript(
+        _jsString = JSValue.RunScript("'Hello Node-API .Net!'");
+        _jsFunction = (JSFunction)JSValue.RunScript("function jsFunction() { }; jsFunction");
+        _jsFunctionWithArgs = (JSFunction)JSValue.RunScript(
             "function jsFunctionWithArgs(a, b, c) { }; jsFunctionWithArgs");
-        _jsFunctionWithCallback = (JSFunction)JSNativeApi.RunScript(
+        _jsFunctionWithCallback = (JSFunction)JSValue.RunScript(
             "function jsFunctionWithCallback(cb, ...args) { cb(...args); }; " +
             "jsFunctionWithCallback");
-        _jsInstance = (JSObject)JSNativeApi.RunScript(
+        _jsInstance = (JSObject)JSValue.RunScript(
             "const jsInstance = { method: (...args) => {} }; jsInstance");
 
         _dotnetFunction = (JSFunction)JSValue.CreateFunction(
@@ -125,15 +127,15 @@ protected void Setup()
             (x, value) => x.Property = (string)value);
         classBuilder.AddMethod("method", (x) => (args) => DotnetClass.Method());
         _dotnetClass = (JSObject)classBuilder.DefineClass();
-        _dotnetInstance = (JSObject)JSNativeApi.CallAsConstructor(_dotnetClass);
+        _dotnetInstance = (JSObject)((JSValue)_dotnetClass).CallAsConstructor();
 
-        _jsFunctionCreateInstance = (JSFunction)JSNativeApi.RunScript(
+        _jsFunctionCreateInstance = (JSFunction)JSValue.RunScript(
             "function jsFunctionCreateInstance(Class) { new Class() }; " +
             "jsFunctionCreateInstance");
-        _jsFunctionCallMethod = (JSFunction)JSNativeApi.RunScript(
+        _jsFunctionCallMethod = (JSFunction)JSValue.RunScript(
             "function jsFunctionCallMethod(instance) { instance.method(); }; " +
             "jsFunctionCallMethod");
-        _jsFunctionCallMethodWithArgs = (JSFunction)JSNativeApi.RunScript(
+        _jsFunctionCallMethodWithArgs = (JSFunction)JSValue.RunScript(
             "function jsFunctionCallMethodWithArgs(instance, ...args) " +
             "{ instance.method(...args); }; " +
             "jsFunctionCallMethodWithArgs");
@@ -145,6 +147,18 @@ protected void Setup()
 
     // Benchmarks in the base class run in both CLR and AOT environments.
 
+    [Benchmark]
+    public void JSValueToString()
+    {
+        _jsString.GetValueStringUtf16();
+    }
+
+    [Benchmark]
+    public void JSValueToStringAsCharArray()
+    {
+        _ = new string(_jsString.GetValueStringUtf16AsCharArray());
+    }
+
     [Benchmark]
     public void CallJSFunction()
     {
@@ -229,13 +243,13 @@ public class Clr : Benchmarks
             JSObject hostModule = new();
             _ = new ManagedHost(hostModule);
             _jsHost = hostModule;
-            _jsFunctionCallMethodDynamic = (JSFunction)JSNativeApi.RunScript(
+            _jsFunctionCallMethodDynamic = (JSFunction)JSValue.RunScript(
                 "function jsFunctionCallMethodDynamic(dotnet) " +
                 "{ dotnet.System.Object.ReferenceEquals(null, null); }; " +
                 "jsFunctionCallMethodDynamic");
 
             // Implement IFormatProvider in JS and pass it to a .NET method.
-            _jsFunctionCallMethodDynamicInterface = (JSFunction)JSNativeApi.RunScript(
+            _jsFunctionCallMethodDynamicInterface = (JSFunction)JSValue.RunScript(
                 "function jsFunctionCallMethodDynamicInterface(dotnet)  {" +
                 "    const formatProvider = { GetFormat: (type) => null };" +
                 "    dotnet.System.String.Format(formatProvider, '', null, null);" +

src/NodeApi.DotNetHost/JSMarshaller.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;

src/NodeApi.DotNetHost/JSMarshallerDelegates.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -409,7 +408,7 @@ public JSValue LoadModule(JSCallbackArgs args)
 
         if (exports.IsObject())
         {
-            exportsRef = JSNativeApi.CreateReference(exports);
+            exportsRef = new JSReference(exports);
             _loadedModules.Add(assemblyFilePath, exportsRef);
         }
 

src/NodeApi.DotNetHost/ManagedHost.cs

@@ -8,7 +8,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 using Microsoft.JavaScript.NodeApi.Interop;
 
 using static Microsoft.JavaScript.NodeApi.DotNetHost.ManagedHost;

src/NodeApi.DotNetHost/TypeExporter.cs

@@ -7,7 +7,6 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;

src/NodeApi.Generator/TypeDefinitionsGenerator.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Threading;
 
 namespace Microsoft.JavaScript.NodeApi.Interop;
 

src/NodeApi/Interop/JSAsyncScope.cs

@@ -87,7 +87,7 @@ public JSValue DefineClass(JSValue? baseClass = null)
         }
         else
         {
-            classObject = JSNativeApi.DefineClass(
+            classObject = JSValue.DefineClass(
                 ClassName,
                 new JSCallbackDescriptor(
                     ClassName,
@@ -181,7 +181,7 @@ public JSValue DefineInterface()
 
         AddTypeToString();
 
-        JSValue obj = JSNativeApi.DefineClass(
+        JSValue obj = JSValue.DefineClass(
             ClassName,
             new JSCallbackDescriptor(ClassName, (args) =>
             {

src/NodeApi/Interop/JSClassBuilderOfT.cs

@@ -10,7 +10,6 @@
 using System.Threading;
 using Microsoft.JavaScript.NodeApi.Runtime;
 using static Microsoft.JavaScript.NodeApi.Interop.JSCollectionProxies;
-using static Microsoft.JavaScript.NodeApi.JSNativeApi;
 using static Microsoft.JavaScript.NodeApi.Runtime.JSRuntime;
 
 namespace Microsoft.JavaScript.NodeApi.Interop;
@@ -20,7 +19,7 @@ namespace Microsoft.JavaScript.NodeApi.Interop;
 /// </summary>
 /// <remarks>
 /// A <see cref="JSRuntimeContext"/> instance is constructed when the .NET Node API managed host is
-/// loaded, and disposed when the host is unloaded. (For AOT there is no "host" compnoent, so each
+/// loaded, and disposed when the host is unloaded. (For AOT there is no "host" component, so each
 /// AOT module has a context that matches the module lifetime.) The context tracks several kinds
 /// of JS references used internally by this assembly, so that the references can be re-used for
 /// the lifetime of the host and disposed when the context is disposed.
@@ -124,7 +123,7 @@ public static explicit operator napi_env(JSRuntimeContext context)
     }
 
     public static explicit operator JSRuntimeContext(napi_env env)
-        => GetInstanceData(env) as JSRuntimeContext
+        => JSValue.GetInstanceData(env) as JSRuntimeContext
            ?? throw new InvalidCastException("Context is not found in napi_env instance data.");
 
     public bool IsDisposed { get; private set; }
@@ -149,7 +148,7 @@ internal JSRuntimeContext(
 
         _env = env;
         Runtime = runtime;
-        SetInstanceData(env, this);
+        JSValue.SetInstanceData(env, this);
         SynchronizationContext = synchronizationContext ?? JSSynchronizationContext.Create();
     }
 
@@ -260,7 +259,7 @@ internal JSValue InitializeObjectWrapper(JSValue wrapper, JSValue externalInstan
         // The reference returned by Wrap() is weak (refcount=0), which is good:
         // if the JS object is released then the reference will fail to resolve, and
         // GetOrCreateObjectWrapper() will create a new JS wrapper if requested.
-        JSNativeApi.Wrap(wrapper, obj, out JSReference wrapperWeakRef);
+        wrapper.Wrap(obj, out JSReference wrapperWeakRef);
 
         _objectMap.AddOrUpdate(
             obj,
@@ -558,7 +557,7 @@ public JSValue CreateStruct<T>() where T : struct
             throw new InvalidOperationException("Failed to resolve struct constructor reference.");
         }
 
-        return JSNativeApi.CallAsConstructor(constructorFunction.Value);
+        return constructorFunction.Value.CallAsConstructor();
     }
 
     /// <summary>

src/NodeApi/Interop/JSRuntimeContext.cs

@@ -100,7 +100,7 @@ public JSValue DefineStruct()
         AddTypeToString();
 
         // Note this does not use Wrap() because structs are passed by value.
-        JSValue classObject = JSNativeApi.DefineClass(
+        JSValue classObject = JSValue.DefineClass(
             StructName,
             new JSCallbackDescriptor(StructName, (args) => args.ThisArg),
             Properties.ToArray());