Update API

Author: vmoroz

.ado/publish.yml

@@ -259,6 +259,7 @@ extends:
                 - script: >
                     dotnet test -f ${{ MatrixEntry.DotNetVersion }}
                     --configuration Release
+                    --property:ParallelizeTestCollections=false
                     --logger trx
                     --results-directory "$(Build.StagingDirectory)/test/${{ MatrixEntry.DotNetVersion }}-Release"
                   displayName: Run tests

.github/workflows/build.yml

@@ -77,6 +77,7 @@ jobs:
       run: >
         dotnet test -f ${{ matrix.dotnet-version }}
         --configuration ${{ matrix.configuration }}
+        --property:ParallelizeTestCollections=false
         --logger trx
         --results-directory "out/test/${{matrix.dotnet-version}}-node${{matrix.node-version}}-${{matrix.configuration}}"
       continue-on-error: true

bench/Benchmarks.cs

@@ -50,8 +50,8 @@ public static void Main(string[] args)
         GetCurrentPlatformRuntimeIdentifier(),
         "libnode" + GetSharedLibraryExtension());
 
-    private NodejsEmbeddingRuntime? _runtime;
-    private NodejsEmbeddingNodeApiScope? _nodeApiScope;
+    private NodeEmbeddingRuntime? _runtime;
+    private NodeEmbeddingNodeApiScope? _nodeApiScope;
     private JSValue _jsString;
     private JSFunction _jsFunction;
     private JSFunction _jsFunctionWithArgs;
@@ -86,9 +86,9 @@ public static void Method() { }
     /// </summary>
     protected void Setup()
     {
-        NodejsEmbeddingPlatform platform = new(
+        NodeEmbeddingPlatform platform = new(
             LibnodePath,
-            new NodejsEmbeddingPlatformSettings { Args = s_settings });
+            new NodeEmbeddingPlatformSettings { Args = s_settings });
 
         // This setup avoids using NodejsEmbeddingThreadRuntime so benchmarks can run on
         // the same thread. NodejsEmbeddingThreadRuntime creates a separate thread that would slow

examples/jsdom/Program.cs

@@ -11,8 +11,13 @@ public static void Main()
     {
         string appDir = Path.GetDirectoryName(typeof(Program).Assembly.Location)!;
         string libnodePath = Path.Combine(appDir, "libnode.dll");
-        using  NodejsPlatform nodejsPlatform = new(libnodePath);
-        using NodejsEnvironment nodejs = nodejsPlatform.CreateEnvironment(appDir);
+        using NodeEmbeddingPlatform nodejsPlatform = new(libnodePath, null);
+        using NodeEmbeddingThreadRuntime nodejs = nodejsPlatform.CreateThreadRuntime(appDir,
+            new NodeEmbeddingRuntimeSettings
+            {
+                MainScript =
+                    "globalThis.require = require('module').createRequire(process.execPath);\n"
+            });
         if (Debugger.IsAttached)
         {
             int pid = Process.GetCurrentProcess().Id;
@@ -25,7 +30,7 @@ public static void Main()
         Console.WriteLine(content);
     }
 
-    private static string GetContent(NodejsEnvironment nodejs, string html)
+    private static string GetContent(NodeEmbeddingThreadRuntime nodejs, string html)
     {
         JSValue jsdomClass = nodejs.Import(module: "jsdom", property: "JSDOM");
         JSValue dom = jsdomClass.CallAsConstructor(html);

examples/winui-fluid/App.xaml.cs

@@ -26,9 +26,12 @@ public App()
 
         string appDir = Path.GetDirectoryName(typeof(App).Assembly.Location)!;
         string libnodePath = Path.Combine(appDir, "libnode.dll");
-        NodejsPlatform nodejsPlatform = new(libnodePath);
-
-        Nodejs = nodejsPlatform.CreateEnvironment(appDir);
+        NodeEmbeddingPlatform nodejsPlatform = new(libnodePath, null);
+        Nodejs = nodejsPlatform.CreateThreadRuntime(appDir, new NodeEmbeddingRuntimeSettings
+        {
+            MainScript =
+                    "globalThis.require = require('module').createRequire(process.execPath);\n"
+        });
         if (Debugger.IsAttached)
         {
             int pid = Process.GetCurrentProcess().Id;
@@ -60,5 +63,5 @@ private void OnMainWindowClosed(object sender, WindowEventArgs args)
 
     public static new App Current => (App)Application.Current;
 
-    public NodejsEnvironment Nodejs { get; }
+    public NodeEmbeddingThreadRuntime Nodejs { get; }
 }

examples/winui-fluid/CollabEditBox.xaml.cs

@@ -28,7 +28,7 @@ public sealed partial class CollabEditBox : UserControl
     private const string FluidServiceUri = "http://localhost:7070/";
 
     private readonly SynchronizationContext uiSyncContext;
-    private readonly NodejsEnvironment nodejs;
+    private readonly NodeEmbeddingThreadRuntime nodejs;
     private readonly JSMarshaller marshaller;
 
     private ITinyliciousClient fluidClient = null!;

src/NodeApi.DotNetHost/JSRuntimeContextExtensions.cs

@@ -54,7 +54,7 @@ public static T Import<T>(
     /// <exception cref="ArgumentNullException">Both <paramref cref="module" /> and
     /// <paramref cref="property" /> are null.</exception>
     public static T Import<T>(
-        this NodejsEmbeddingThreadRuntime nodejs,
+        this NodeEmbeddingThreadRuntime nodejs,
         string? module,
         string? property,
         bool esModule,

src/NodeApi/Interop/EmptyAttributes.cs

@@ -55,6 +55,23 @@ public CallerArgumentExpressionAttribute(string parameterName)
 
         public string ParameterName { get; }
     }
+
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Field | AttributeTargets.Property
+        | AttributeTargets.Struct, AllowMultiple = false, Inherited = false)]
+    public sealed class RequiredMemberAttribute : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+    public sealed class CompilerFeatureRequiredAttribute : Attribute
+    {
+        public CompilerFeatureRequiredAttribute (string featureName)
+        {
+            FeatureName = featureName;
+        }
+
+        public string FeatureName { get; }
+    }
 }
 
 namespace System.Diagnostics

src/NodeApi/NodeApiStatusExtensions.cs

@@ -4,7 +4,9 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
+using Microsoft.JavaScript.NodeApi.Runtime;
 using static Microsoft.JavaScript.NodeApi.Runtime.JSRuntime;
+using static Microsoft.JavaScript.NodeApi.Runtime.NodejsRuntime;
 
 namespace Microsoft.JavaScript.NodeApi;
 
@@ -61,28 +63,17 @@ public static T ThrowIfFailed<T>(this napi_status status,
     }
 
     [StackTraceHidden]
-    public static void ThrowIfFailed([DoesNotReturnIf(true)] this node_embedding_status status,
+    public static void ThrowIfFailed([DoesNotReturnIf(true)] this NodeEmbeddingStatus status,
                                      [CallerMemberName] string memberName = "",
                                      [CallerFilePath] string sourceFilePath = "",
                                      [CallerLineNumber] int sourceLineNumber = 0)
     {
-        if (status == node_embedding_status.ok)
+        if (status == NodeEmbeddingStatus.OK)
             return;
-
-        throw new JSException($"Error in {memberName} at {sourceFilePath}:{sourceLineNumber}");
-    }
-
-    // Throw if status is not napi_ok. Otherwise, return the provided value.
-    // This function helps writing compact wrappers for the interop calls.
-    [StackTraceHidden]
-    public static T ThrowIfFailed<T>(this node_embedding_status status,
-                                     T value,
-                                     [CallerMemberName] string memberName = "",
-                                     [CallerFilePath] string sourceFilePath = "",
-                                     [CallerLineNumber] int sourceLineNumber = 0)
-    {
-        status.ThrowIfFailed(memberName, sourceFilePath, sourceLineNumber);
-        return value;
+        throw new JSException($"""
+            Error in {memberName} at {sourceFilePath}:{sourceLineNumber}
+            {NodeEmbedding.JSRuntime.EmbeddingGetLastErrorMessage()}
+            """);
     }
 }