emnapi 1.2.0 → 1.3.0

package/CMakeLists.txt

@@ -33,6 +33,7 @@ set(UV_SRC
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/uv-common.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/threadpool.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/loop.c"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/posix-hrtime.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/thread.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/async.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/core.c"
@@ -139,7 +140,10 @@ endif()
 
 add_library(${EMNAPI_BASIC_TARGET_NAME} STATIC ${ENAPI_BASIC_SRC})
 target_include_directories(${EMNAPI_BASIC_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
-target_compile_definitions(${EMNAPI_BASIC_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
+target_compile_definitions(${EMNAPI_BASIC_TARGET_NAME}
+  PUBLIC ${EMNAPI_DEFINES}
+  PRIVATE "EMNAPI_DISABLE_UV"
+)
 if(IS_EMSCRIPTEN)
   set_target_properties(${EMNAPI_BASIC_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
   target_link_options(${EMNAPI_BASIC_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
@@ -159,7 +163,10 @@ if(EMNAPI_BUILD_BASIC_MT)
   )
   target_compile_options(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC "-matomics" "-mbulk-memory")
   target_include_directories(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
-  target_compile_definitions(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
+  target_compile_definitions(${EMNAPI_BASIC_MT_TARGET_NAME}
+    PUBLIC ${EMNAPI_DEFINES}
+    PRIVATE "EMNAPI_DISABLE_UV"
+  )
 
   if(IS_EMSCRIPTEN)
     set_target_properties(${EMNAPI_BASIC_MT_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
@@ -175,7 +182,10 @@ endif()
 
 if(EMNAPI_BUILD_MT)
   add_library(${EMNAPI_MT_TARGET_NAME} STATIC ${EMNAPI_SRC} ${UV_SRC})
-  target_compile_options(${EMNAPI_MT_TARGET_NAME} PRIVATE ${EMNAPI_MT_CFLAGS})
+  target_compile_options(${EMNAPI_MT_TARGET_NAME}
+    PUBLIC "-matomics" "-mbulk-memory"
+    PRIVATE ${EMNAPI_MT_CFLAGS}
+  )
   target_include_directories(${EMNAPI_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
   target_compile_definitions(${EMNAPI_MT_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
   if(IS_EMSCRIPTEN)

package/dist/library_napi.js

@@ -958,7 +958,7 @@ var emnapiExternalMemory = {
         var _a;
         var info = {
             address: 0,
-            ownership: 0 /* Ownership.kRuntime */,
+            ownership: 0 /* ReferenceOwnership.kRuntime */,
             runtimeAllocated: 0
         };
         if (arrayBuffer === wasmMemory.buffer) {
@@ -971,7 +971,7 @@ var emnapiExternalMemory = {
                 cachedInfo.address = 0;
                 return cachedInfo;
             }
-            if (shouldCopy && cachedInfo.ownership === 0 /* Ownership.kRuntime */ && cachedInfo.runtimeAllocated === 1) {
+            if (shouldCopy && cachedInfo.ownership === 0 /* ReferenceOwnership.kRuntime */ && cachedInfo.runtimeAllocated === 1) {
                 new Uint8Array(wasmMemory.buffer).set(new Uint8Array(arrayBuffer), cachedInfo.address);
             }
             return cachedInfo;
@@ -987,7 +987,7 @@ var emnapiExternalMemory = {
             throw new Error('Out of memory');
         new Uint8Array(wasmMemory.buffer).set(new Uint8Array(arrayBuffer), pointer);
         info.address = pointer;
-        info.ownership = emnapiExternalMemory.registry ? 0 /* Ownership.kRuntime */ : 1 /* Ownership.kUserland */;
+        info.ownership = emnapiExternalMemory.registry ? 0 /* ReferenceOwnership.kRuntime */ : 1 /* ReferenceOwnership.kUserland */;
         info.runtimeAllocated = 1;
         emnapiExternalMemory.table.set(arrayBuffer, info);
         (_a = emnapiExternalMemory.registry) === null || _a === void 0 ? void 0 : _a.register(arrayBuffer, pointer);
@@ -1000,7 +1000,7 @@ var emnapiExternalMemory = {
                     Ctor: view.constructor,
                     address: view.byteOffset,
                     length: view instanceof DataView ? view.byteLength : view.length,
-                    ownership: 1 /* Ownership.kUserland */,
+                    ownership: 1 /* ReferenceOwnership.kUserland */,
                     runtimeAllocated: 0
                 });
             }
@@ -1031,7 +1031,7 @@ var emnapiExternalMemory = {
                 var _a = emnapiExternalMemory.wasmMemoryViewTable.get(view), address_1 = _a.address, ownership_1 = _a.ownership, runtimeAllocated_1 = _a.runtimeAllocated;
                 return { address: address_1, ownership: ownership_1, runtimeAllocated: runtimeAllocated_1, view: view };
             }
-            return { address: view.byteOffset, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0, view: view };
+            return { address: view.byteOffset, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0, view: view };
         }
         var _b = emnapiExternalMemory.getArrayBufferPointer(view.buffer, shouldCopy), address = _b.address, ownership = _b.ownership, runtimeAllocated = _b.runtimeAllocated;
         return { address: address === 0 ? 0 : (address + view.byteOffset), ownership: ownership, runtimeAllocated: runtimeAllocated, view: view };
@@ -1867,6 +1867,18 @@ function _node_api_create_external_string_latin1(env, str, length, finalize_call
 function _node_api_create_external_string_utf16(env, str, length, finalize_callback, finalize_hint, result, copied) {
     return emnapiString.newExternalString(env, str, length, finalize_callback, finalize_hint, result, copied, _napi_create_string_utf16, undefined);
 }
+/**
+ * @__sig ipppp
+ */
+function _node_api_create_property_key_latin1(env, str, length, result) {
+    return _napi_create_string_latin1(env, str, length, result);
+}
+/**
+ * @__sig ipppp
+ */
+function _node_api_create_property_key_utf8(env, str, length, result) {
+    return _napi_create_string_utf8(env, str, length, result);
+}
 /**
  * @__sig ipppp
  */
@@ -2128,13 +2140,16 @@ function emnapiWrap(env, js_object, native_object, finalize_cb, finalize_hint, r
         if (result) {
             if (!finalize_cb)
                 return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
-            reference = emnapiCtx.createReference(envObject, handle.id, 0, 1 /* Ownership.kUserland */, finalize_cb, native_object, finalize_hint);
+            reference = emnapiCtx.createReferenceWithFinalizer(envObject, handle.id, 0, 1 /* ReferenceOwnership.kUserland */, finalize_cb, native_object, finalize_hint);
             {{{ from64('result') }}};
             referenceId = reference.id;
             {{{ makeSetValue('result', 0, 'referenceId', '*') }}};
         }
+        else if (finalize_cb) {
+            reference = emnapiCtx.createReferenceWithFinalizer(envObject, handle.id, 0, 0 /* ReferenceOwnership.kRuntime */, finalize_cb, native_object, finalize_hint);
+        }
         else {
-            reference = emnapiCtx.createReference(envObject, handle.id, 0, 0 /* Ownership.kRuntime */, finalize_cb, native_object, !finalize_cb ? finalize_cb : finalize_hint);
+            reference = emnapiCtx.createReferenceWithData(envObject, handle.id, 0, 0 /* ReferenceOwnership.kRuntime */, native_object);
         }
         envObject.getObjectBinding(handle.value).wrapped = reference.id;
         return envObject.getReturnStatus();
@@ -2181,7 +2196,7 @@ function emnapiUnwrap(env, js_object, result, action) {
         }
         if (action === 1 /* UnwrapAction.RemoveWrap */) {
             binding.wrapped = 0;
-            if (ref.ownership() === 1 /* Ownership.kUserland */) {
+            if (ref.ownership() === 1 /* ReferenceOwnership.kUserland */) {
                 // When the wrap is been removed, the finalizer should be reset.
                 ref.resetFinalizer();
             }
@@ -2406,11 +2421,11 @@ function _napi_add_finalizer(env, js_object, finalize_data, finalize_cb, finaliz
         return envObject.setLastError(handleResult.status);
     }
     var handle = handleResult.handle;
-    var ownership = !result ? 0 /* Ownership.kRuntime */ : 1 /* Ownership.kUserland */;
+    var ownership = !result ? 0 /* ReferenceOwnership.kRuntime */ : 1 /* ReferenceOwnership.kUserland */;
     {{{ from64('finalize_data') }}};
     {{{ from64('finalize_cb') }}};
     {{{ from64('finalize_hint') }}};
-    var reference = emnapiCtx.createReference(envObject, handle.id, 0, ownership, finalize_cb, finalize_data, finalize_hint);
+    var reference = emnapiCtx.createReferenceWithFinalizer(envObject, handle.id, 0, ownership, finalize_cb, finalize_data, finalize_hint);
     if (result) {
         {{{ from64('result') }}};
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -2467,46 +2482,46 @@ function _emnapi_create_memory_view(env, typedarray_type, external_data, byte_le
         var viewDescriptor = void 0;
         switch (typedarray_type) {
             case 0 /* emnapi_memory_view_type.emnapi_int8_array */:
-                viewDescriptor = { Ctor: Int8Array, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Int8Array, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 1 /* emnapi_memory_view_type.emnapi_uint8_array */:
-                viewDescriptor = { Ctor: Uint8Array, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint8Array, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 2 /* emnapi_memory_view_type.emnapi_uint8_clamped_array */:
-                viewDescriptor = { Ctor: Uint8ClampedArray, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint8ClampedArray, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 3 /* emnapi_memory_view_type.emnapi_int16_array */:
-                viewDescriptor = { Ctor: Int16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Int16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 4 /* emnapi_memory_view_type.emnapi_uint16_array */:
-                viewDescriptor = { Ctor: Uint16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 5 /* emnapi_memory_view_type.emnapi_int32_array */:
-                viewDescriptor = { Ctor: Int32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Int32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 6 /* emnapi_memory_view_type.emnapi_uint32_array */:
-                viewDescriptor = { Ctor: Uint32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 7 /* emnapi_memory_view_type.emnapi_float32_array */:
-                viewDescriptor = { Ctor: Float32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Float32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 8 /* emnapi_memory_view_type.emnapi_float64_array */:
-                viewDescriptor = { Ctor: Float64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Float64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 9 /* emnapi_memory_view_type.emnapi_bigint64_array */:
-                viewDescriptor = { Ctor: BigInt64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: BigInt64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 10 /* emnapi_memory_view_type.emnapi_biguint64_array */:
-                viewDescriptor = { Ctor: BigUint64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: BigUint64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case -1 /* emnapi_memory_view_type.emnapi_data_view */:
-                viewDescriptor = { Ctor: DataView, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: DataView, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case -2 /* emnapi_memory_view_type.emnapi_buffer */: {
                 if (!emnapiCtx.feature.Buffer) {
                     throw emnapiCtx.createNotSupportBufferError('emnapi_create_memory_view', '');
                 }
-                viewDescriptor = { Ctor: emnapiCtx.feature.Buffer, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: emnapiCtx.feature.Buffer, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             }
             default: return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
@@ -2869,7 +2884,7 @@ function _napi_create_external(env, data, finalize_cb, finalize_hint, result) {
         }
         var externalHandle = emnapiCtx.getCurrentScope().addExternal(envObject, data);
         if (finalize_cb) {
-            emnapiCtx.createReference(envObject, externalHandle.id, 0, 0 /* Ownership.kRuntime */, finalize_cb, data, finalize_hint);
+            emnapiCtx.createReferenceWithFinalizer(envObject, externalHandle.id, 0, 0 /* ReferenceOwnership.kRuntime */, finalize_cb, data, finalize_hint);
         }
         {{{ from64('result') }}};
         value = externalHandle.id;
@@ -2927,7 +2942,7 @@ function _napi_create_external_arraybuffer(env, external_data, byte_length, fina
             u8arr.set(new Uint8Array(wasmMemory.buffer).subarray(external_data, external_data + byte_length));
             emnapiExternalMemory.table.set(arrayBuffer, {
                 address: external_data,
-                ownership: 1 /* Ownership.kUserland */,
+                ownership: 1 /* ReferenceOwnership.kUserland */,
                 runtimeAllocated: 0
             });
         }
@@ -3051,7 +3066,7 @@ function _napi_create_typedarray(env, type, length, arraybuffer, byte_offset, re
                         Ctor: Type,
                         address: byte_offset,
                         length: length,
-                        ownership: 1 /* Ownership.kUserland */,
+                        ownership: 1 /* ReferenceOwnership.kUserland */,
                         runtimeAllocated: 0
                     });
                 }
@@ -3138,7 +3153,7 @@ function _napi_create_buffer(env, size, data, result) {
                 Ctor: Buffer,
                 address: pointer,
                 length: size,
-                ownership: emnapiExternalMemory.registry ? 0 /* Ownership.kRuntime */ : 1 /* Ownership.kUserland */,
+                ownership: emnapiExternalMemory.registry ? 0 /* ReferenceOwnership.kRuntime */ : 1 /* ReferenceOwnership.kUserland */,
                 runtimeAllocated: 1
             };
             emnapiExternalMemory.wasmMemoryViewTable.set(buffer_1, viewDescriptor);
@@ -3241,7 +3256,7 @@ function _napi_create_dataview(env, byte_length, arraybuffer, byte_offset, resul
                     Ctor: DataView,
                     address: byte_offset,
                     length: byte_length,
-                    ownership: 1 /* Ownership.kUserland */,
+                    ownership: 1 /* ReferenceOwnership.kUserland */,
                     runtimeAllocated: 0
                 });
             }
@@ -4032,7 +4047,7 @@ function _napi_create_reference(env, value, initial_refcount, result) {
         }
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var ref = emnapiCtx.createReference(envObject, handle.id, initial_refcount >>> 0, 1 /* Ownership.kUserland */);
+    var ref = emnapiCtx.createReference(envObject, handle.id, initial_refcount >>> 0, 1 /* ReferenceOwnership.kUserland */);
     {{{ from64('result') }}};
     {{{ makeSetValue('result', 0, 'ref.id', '*') }}};
     return envObject.clearLastError();
@@ -4076,7 +4091,7 @@ function _napi_reference_unref(env, ref, result) {
     if (!ref)
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     var reference = emnapiCtx.refStore.get(ref);
-    var refcount = reference.refCount();
+    var refcount = reference.refcount();
     if (refcount === 0) {
         return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
     }
@@ -4101,7 +4116,7 @@ function _napi_get_reference_value(env, ref, result) {
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     var reference = emnapiCtx.refStore.get(ref);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var handleId = reference.get();
+    var handleId = reference.get(envObject);
     {{{ from64('result') }}};
     {{{ makeSetValue('result', 0, 'handleId', '*') }}};
     return envObject.clearLastError();
@@ -5911,7 +5926,7 @@ function _napi_create_threadsafe_function(env, func, async_resource, async_resou
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        ref = emnapiCtx.createReference(envObject, func, 1, 1 /* Ownership.kUserland */).id;
+        ref = emnapiCtx.createReference(envObject, func, 1, 1 /* ReferenceOwnership.kUserland */).id;
     }
     var asyncResourceObject;
     if (async_resource) {
@@ -5937,7 +5952,7 @@ function _napi_create_threadsafe_function(env, func, async_resource, async_resou
     if (!tsfn)
         return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
     new Uint8Array(wasmMemory.buffer).subarray(tsfn, tsfn + sizeofTSFN).fill(0);
-    var resourceRef = emnapiCtx.createReference(envObject, resource, 1, 1 /* Ownership.kUserland */);
+    var resourceRef = emnapiCtx.createReference(envObject, resource, 1, 1 /* ReferenceOwnership.kUserland */);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var resource_ = resourceRef.id;
     {{{ makeSetValue('tsfn', 0, 'resource_', '*') }}};
@@ -7074,9 +7089,15 @@ function _napi_get_version(env, result) {
     node_api_create_external_string_utf16: _node_api_create_external_string_utf16,
     node_api_create_external_string_utf16__deps: ["$emnapiString", "napi_create_string_utf16"],
     node_api_create_external_string_utf16__sig: "ippppppp",
+    node_api_create_property_key_latin1: _node_api_create_property_key_latin1,
+    node_api_create_property_key_latin1__deps: ["napi_create_string_latin1"],
+    node_api_create_property_key_latin1__sig: "ipppp",
     node_api_create_property_key_utf16: _node_api_create_property_key_utf16,
     node_api_create_property_key_utf16__deps: ["napi_create_string_utf16"],
     node_api_create_property_key_utf16__sig: "ipppp",
+    node_api_create_property_key_utf8: _node_api_create_property_key_utf8,
+    node_api_create_property_key_utf8__deps: ["napi_create_string_utf8"],
+    node_api_create_property_key_utf8__sig: "ipppp",
     node_api_create_syntax_error: _node_api_create_syntax_error,
     node_api_create_syntax_error__deps: ["$emnapiCtx"],
     node_api_create_syntax_error__sig: "ipppp",

package/emnapi.gyp

@@ -47,6 +47,9 @@
     {
       'target_name': 'emnapi_basic',
       'type': 'static_library',
+      'defines': [
+        'EMNAPI_DISABLE_UV'
+      ],
       'sources': [
         'src/js_native_api.c',
         'src/node_api.c',

package/include/node/emnapi.h

@@ -6,7 +6,7 @@
 #include "emnapi_common.h"
 
 #define EMNAPI_MAJOR_VERSION 1
-#define EMNAPI_MINOR_VERSION 2
+#define EMNAPI_MINOR_VERSION 3
 #define EMNAPI_PATCH_VERSION 0
 
 typedef enum {

package/include/node/js_native_api.h

@@ -56,7 +56,7 @@
 EXTERN_C_START
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_last_error_info(
-    node_api_nogc_env env, const napi_extended_error_info** result);
+    node_api_basic_env env, const napi_extended_error_info** result);
 
 // Getters for defined singletons
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_undefined(napi_env env,
@@ -100,19 +100,19 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_utf16(napi_env env,
                                                             napi_value* result);
 #ifdef NAPI_EXPERIMENTAL
 #define NODE_API_EXPERIMENTAL_HAS_EXTERNAL_STRINGS
-NAPI_EXTERN napi_status NAPI_CDECL
-node_api_create_external_string_latin1(napi_env env,
-                                       char* str,
-                                       size_t length,
-                                       node_api_nogc_finalize finalize_callback,
-                                       void* finalize_hint,
-                                       napi_value* result,
-                                       bool* copied);
+NAPI_EXTERN napi_status NAPI_CDECL node_api_create_external_string_latin1(
+    napi_env env,
+    char* str,
+    size_t length,
+    node_api_basic_finalize finalize_callback,
+    void* finalize_hint,
+    napi_value* result,
+    bool* copied);
 NAPI_EXTERN napi_status NAPI_CDECL
 node_api_create_external_string_utf16(napi_env env,
                                       char16_t* str,
                                       size_t length,
-                                      node_api_nogc_finalize finalize_callback,
+                                      node_api_basic_finalize finalize_callback,
                                       void* finalize_hint,
                                       napi_value* result,
                                       bool* copied);
@@ -120,6 +120,10 @@ node_api_create_external_string_utf16(napi_env env,
 
 #ifdef NAPI_EXPERIMENTAL
 #define NODE_API_EXPERIMENTAL_HAS_PROPERTY_KEYS
+NAPI_EXTERN napi_status NAPI_CDECL node_api_create_property_key_latin1(
+    napi_env env, const char* str, size_t length, napi_value* result);
+NAPI_EXTERN napi_status NAPI_CDECL node_api_create_property_key_utf8(
+    napi_env env, const char* str, size_t length, napi_value* result);
 NAPI_EXTERN napi_status NAPI_CDECL node_api_create_property_key_utf16(
     napi_env env, const char16_t* str, size_t length, napi_value* result);
 #endif  // NAPI_EXPERIMENTAL
@@ -324,12 +328,13 @@ napi_define_class(napi_env env,
                   napi_value* result);
 
 // Methods to work with external data objects
-NAPI_EXTERN napi_status NAPI_CDECL napi_wrap(napi_env env,
-                                             napi_value js_object,
-                                             void* native_object,
-                                             node_api_nogc_finalize finalize_cb,
-                                             void* finalize_hint,
-                                             napi_ref* result);
+NAPI_EXTERN napi_status NAPI_CDECL
+napi_wrap(napi_env env,
+          napi_value js_object,
+          void* native_object,
+          node_api_basic_finalize finalize_cb,
+          void* finalize_hint,
+          napi_ref* result);
 NAPI_EXTERN napi_status NAPI_CDECL napi_unwrap(napi_env env,
                                                napi_value js_object,
                                                void** result);
@@ -339,7 +344,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_remove_wrap(napi_env env,
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_external(napi_env env,
                      void* data,
-                     node_api_nogc_finalize finalize_cb,
+                     node_api_basic_finalize finalize_cb,
                      void* finalize_hint,
                      napi_value* result);
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_value_external(napi_env env,
@@ -438,7 +443,7 @@ NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_external_arraybuffer(napi_env env,
                                  void* external_data,
                                  size_t byte_length,
-                                 node_api_nogc_finalize finalize_cb,
+                                 node_api_basic_finalize finalize_cb,
                                  void* finalize_hint,
                                  napi_value* result);
 #endif  // NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
@@ -480,7 +485,7 @@ napi_get_dataview_info(napi_env env,
                        size_t* byte_offset);
 
 // version management
-NAPI_EXTERN napi_status NAPI_CDECL napi_get_version(node_api_nogc_env env,
+NAPI_EXTERN napi_status NAPI_CDECL napi_get_version(node_api_basic_env env,
                                                     uint32_t* result);
 
 // Promises
@@ -504,7 +509,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_run_script(napi_env env,
 
 // Memory management
 NAPI_EXTERN napi_status NAPI_CDECL napi_adjust_external_memory(
-    node_api_nogc_env env, int64_t change_in_bytes, int64_t* adjusted_value);
+    node_api_basic_env env, int64_t change_in_bytes, int64_t* adjusted_value);
 
 #if NAPI_VERSION >= 5
 
@@ -526,7 +531,7 @@ NAPI_EXTERN napi_status NAPI_CDECL
 napi_add_finalizer(napi_env env,
                    napi_value js_object,
                    void* finalize_data,
-                   node_api_nogc_finalize finalize_cb,
+                   node_api_basic_finalize finalize_cb,
                    void* finalize_hint,
                    napi_ref* result);
 
@@ -536,7 +541,7 @@ napi_add_finalizer(napi_env env,
 #define NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
 
 NAPI_EXTERN napi_status NAPI_CDECL
-node_api_post_finalizer(node_api_nogc_env env,
+node_api_post_finalizer(node_api_basic_env env,
                         napi_finalize finalize_cb,
                         void* finalize_data,
                         void* finalize_hint);
@@ -581,13 +586,13 @@ napi_get_all_property_names(napi_env env,
 
 // Instance data
 NAPI_EXTERN napi_status NAPI_CDECL
-napi_set_instance_data(node_api_nogc_env env,
+napi_set_instance_data(node_api_basic_env env,
                        void* data,
                        napi_finalize finalize_cb,
                        void* finalize_hint);
 
-NAPI_EXTERN napi_status NAPI_CDECL napi_get_instance_data(node_api_nogc_env env,
-                                                          void** data);
+NAPI_EXTERN napi_status NAPI_CDECL
+napi_get_instance_data(node_api_basic_env env, void** data);
 #endif  // NAPI_VERSION >= 6
 
 #if NAPI_VERSION >= 7

package/include/node/js_native_api_types.h

@@ -27,7 +27,7 @@ typedef struct napi_env__* napi_env;
 // meaning that they do not affect the state of the JS engine, and can
 // therefore be called synchronously from a finalizer that itself runs
 // synchronously during GC. Such APIs can receive either a `napi_env` or a
-// `node_api_nogc_env` as their first parameter, because we should be able to
+// `node_api_basic_env` as their first parameter, because we should be able to
 // also call them during normal, non-garbage-collecting operations, whereas
 // APIs that affect the state of the JS engine can only receive a `napi_env` as
 // their first parameter, because we must not call them during GC. In lieu of
@@ -37,19 +37,21 @@ typedef struct napi_env__* napi_env;
 // expecting a non-const value.
 //
 // In conjunction with appropriate CFLAGS to warn us if we're passing a const
-// (nogc) environment into an API that expects a non-const environment, and the
-// definition of nogc finalizer function pointer types below, which receive a
-// nogc environment as their first parameter, and can thus only call nogc APIs
-// (unless the user explicitly casts the environment), we achieve the ability
-// to ensure at compile time that we do not call APIs that affect the state of
-// the JS engine from a synchronous (nogc) finalizer.
+// (basic) environment into an API that expects a non-const environment, and
+// the definition of basic finalizer function pointer types below, which
+// receive a basic environment as their first parameter, and can thus only call
+// basic APIs (unless the user explicitly casts the environment), we achieve
+// the ability to ensure at compile time that we do not call APIs that affect
+// the state of the JS engine from a synchronous (basic) finalizer.
 #if !defined(NAPI_EXPERIMENTAL) ||                                             \
     (defined(NAPI_EXPERIMENTAL) &&                                             \
-     defined(NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT))
+     (defined(NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT) ||                       \
+      defined(NODE_API_EXPERIMENTAL_BASIC_ENV_OPT_OUT)))
 typedef struct napi_env__* node_api_nogc_env;
 #else
 typedef const struct napi_env__* node_api_nogc_env;
 #endif
+typedef node_api_nogc_env node_api_basic_env;
 
 typedef struct napi_value__* napi_value;
 typedef struct napi_ref__* napi_ref;
@@ -147,13 +149,15 @@ typedef void(NAPI_CDECL* napi_finalize)(napi_env env,
 
 #if !defined(NAPI_EXPERIMENTAL) ||                                             \
     (defined(NAPI_EXPERIMENTAL) &&                                             \
-     defined(NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT))
+     (defined(NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT) ||                       \
+      defined(NODE_API_EXPERIMENTAL_BASIC_ENV_OPT_OUT)))
 typedef napi_finalize node_api_nogc_finalize;
 #else
 typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
                                                  void* finalize_data,
                                                  void* finalize_hint);
 #endif
+typedef node_api_nogc_finalize node_api_basic_finalize;
 
 typedef struct {
   // One of utf8name or name should be NULL.

package/include/node/node_api.h

@@ -141,7 +141,7 @@ NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_external_buffer(napi_env env,
                             size_t length,
                             void* data,
-                            node_api_nogc_finalize finalize_cb,
+                            node_api_basic_finalize finalize_cb,
                             void* finalize_hint,
                             napi_value* result);
 #endif  // NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
@@ -169,20 +169,20 @@ napi_create_async_work(napi_env env,
                        napi_async_work* result);
 NAPI_EXTERN napi_status NAPI_CDECL napi_delete_async_work(napi_env env,
                                                           napi_async_work work);
-NAPI_EXTERN napi_status NAPI_CDECL napi_queue_async_work(node_api_nogc_env env,
+NAPI_EXTERN napi_status NAPI_CDECL napi_queue_async_work(node_api_basic_env env,
                                                          napi_async_work work);
-NAPI_EXTERN napi_status NAPI_CDECL napi_cancel_async_work(node_api_nogc_env env,
-                                                          napi_async_work work);
+NAPI_EXTERN napi_status NAPI_CDECL
+napi_cancel_async_work(node_api_basic_env env, napi_async_work work);
 
 // version management
-NAPI_EXTERN napi_status NAPI_CDECL
-napi_get_node_version(node_api_nogc_env env, const napi_node_version** version);
+NAPI_EXTERN napi_status NAPI_CDECL napi_get_node_version(
+    node_api_basic_env env, const napi_node_version** version);
 
 #if NAPI_VERSION >= 2
 
 // Return the current libuv event loop for a given environment
 NAPI_EXTERN napi_status NAPI_CDECL
-napi_get_uv_event_loop(node_api_nogc_env env, struct uv_loop_s** loop);
+napi_get_uv_event_loop(node_api_basic_env env, struct uv_loop_s** loop);
 
 #endif  // NAPI_VERSION >= 2
 
@@ -192,10 +192,10 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_fatal_exception(napi_env env,
                                                         napi_value err);
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_add_env_cleanup_hook(
-    node_api_nogc_env env, napi_cleanup_hook fun, void* arg);
+    node_api_basic_env env, napi_cleanup_hook fun, void* arg);
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_remove_env_cleanup_hook(
-    node_api_nogc_env env, napi_cleanup_hook fun, void* arg);
+    node_api_basic_env env, napi_cleanup_hook fun, void* arg);
 
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_open_callback_scope(napi_env env,
@@ -239,17 +239,17 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_release_threadsafe_function(
     napi_threadsafe_function func, napi_threadsafe_function_release_mode mode);
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_unref_threadsafe_function(
-    node_api_nogc_env env, napi_threadsafe_function func);
+    node_api_basic_env env, napi_threadsafe_function func);
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_ref_threadsafe_function(
-    node_api_nogc_env env, napi_threadsafe_function func);
+    node_api_basic_env env, napi_threadsafe_function func);
 
 #endif  // NAPI_VERSION >= 4
 
 #if NAPI_VERSION >= 8
 
 NAPI_EXTERN napi_status NAPI_CDECL
-napi_add_async_cleanup_hook(node_api_nogc_env env,
+napi_add_async_cleanup_hook(node_api_basic_env env,
                             napi_async_cleanup_hook hook,
                             void* arg,
                             napi_async_cleanup_hook_handle* remove_handle);
@@ -262,7 +262,7 @@ napi_remove_async_cleanup_hook(napi_async_cleanup_hook_handle remove_handle);
 #if NAPI_VERSION >= 9
 
 NAPI_EXTERN napi_status NAPI_CDECL
-node_api_get_module_file_name(node_api_nogc_env env, const char** result);
+node_api_get_module_file_name(node_api_basic_env env, const char** result);
 
 #endif  // NAPI_VERSION >= 9
 

package/include/node/uv/threadpool.h

@@ -33,7 +33,7 @@ struct uv__work {
   void (*work)(struct uv__work *w);
   void (*done)(struct uv__work *w, int status);
   struct uv_loop_s* loop;
-  void* wq[2];
+  struct uv__queue wq;
 };
 
 #endif

package/include/node/uv/unix.h

@@ -18,4 +18,8 @@ typedef pthread_cond_t uv_cond_t;
 
 #endif
 
+#define UV_HANDLE_PRIVATE_FIELDS                                              \
+  uv_handle_t* next_closing;                                                  \
+  unsigned int flags;                                                         \
+
 #endif /* UV_UNIX_H */