emnapi 1.2.0 → 1.3.1

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/README.md

@@ -45,6 +45,7 @@ You will need to install:
 - npm `>= v8`
 - Emscripten `>= v3.1.9` / wasi-sdk / LLVM clang with wasm support
 - (Optional) CMake `>= v3.13`
+- (Optional) node-gyp `>= v10.2.0`
 - (Optional) ninja
 - (Optional) make
 - (Optional) [node-addon-api](https://github.com/nodejs/node-addon-api) `>= 6.1.0`
@@ -68,6 +69,9 @@ emcc -v
 
 cmake --version
 
+# if you use node-gyp
+node-gyp --version
+
 # if you use ninja
 ninja --version
 
@@ -629,15 +633,9 @@ Output code can run in recent version modern browsers and Node.js latest LTS. IE
 
 ### Using node-gyp (Experimental)
 
-Currently node-gyp works on Linux only and don't support static library linking in cross-compiling.
-There are related PRs to try to make node-gyp work fine.
-
-- https://github.com/nodejs/gyp-next/pull/222
-- https://github.com/nodejs/gyp-next/pull/240
-- https://github.com/nodejs/node-gyp/pull/2974
+Require node-gyp `>= 10.2.0`
 
-If you experienced issues on Windows or macOS, please check the PRs for upstream changes detail and see
-[emnapi-node-gyp-test](https://github.com/toyobayashi/emnapi-node-gyp-test) for examples.
+See [emnapi-node-gyp-test](https://github.com/toyobayashi/emnapi-node-gyp-test) for examples.
 
 - Variables
 
@@ -685,19 +683,10 @@ declare var emnapi_manual_linking: 0 | 1
         ["OS == 'emscripten'", {
           "product_extension": "js", # required
 
-          # Windows and Linux
           "cflags": [],
           "cflags_c": [],
           "cflags_cc": [],
-          "ldflags": [],
-
-          # macOS uses following config
-          'xcode_settings': {
-            "WARNING_CFLAGS": [], # cflags
-            "OTHER_CFLAGS": [], # cflags_c
-            "OTHER_CPLUSPLUSFLAGS": [], # cflags_cc
-            "OTHER_LDFLAGS": [] # ldflags
-          }
+          "ldflags": []
         }],
         ["OS == 'wasi'", {
           # ...

package/common.gypi

@@ -312,6 +312,7 @@
               'src/uv/uv-common.c',
               'src/uv/threadpool.c',
               'src/uv/unix/loop.c',
+              'src/uv/unix/posix-hrtime.c',
               'src/uv/unix/thread.c',
               'src/uv/unix/async.c',
               'src/uv/unix/core.c',

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 };
@@ -1237,6 +1237,9 @@ function _napi_get_buffer_info(env, buffer, data, length) {
     var handle = emnapiCtx.handleStore.get(buffer);
     if (!handle.isBuffer(emnapiCtx.feature.Buffer))
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    if (handle.isDataView()) {
+        return _napi_get_dataview_info(env, buffer, length, data, 0, 0);
+    }
     return _napi_get_typedarray_info(env, buffer, 0, length, data, 0, 0);
 }
 /**
@@ -1867,6 +1870,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 +2143,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 +2199,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 +2424,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 +2485,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 +2887,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 +2945,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
             });
         }
@@ -3020,10 +3038,10 @@ function _napi_create_typedarray(env, type, length, arraybuffer, byte_offset, re
         if (!result)
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         var handle = emnapiCtx.handleStore.get(arraybuffer);
-        var buffer = handle.value;
-        if (!(buffer instanceof ArrayBuffer)) {
+        if (!handle.isArrayBuffer()) {
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
+        var buffer = handle.value;
         {{{ from64('byte_offset') }}};
         {{{ from64('length') }}};
         var createTypedArray = function (envObject, Type, size_of_element, buffer, byte_offset, length) {
@@ -3051,7 +3069,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 +3156,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);
@@ -3199,6 +3217,68 @@ function _napi_create_buffer_copy(env, length, data, result_data, result) {
 function _napi_create_external_buffer(env, length, data, finalize_cb, finalize_hint, result) {
     return _emnapi_create_memory_view(env, -2 /* emnapi_memory_view_type.emnapi_buffer */, data, length, finalize_cb, finalize_hint, result);
 }
+/**
+ * @__sig ippppp
+ */
+function _node_api_create_buffer_from_arraybuffer(env, arraybuffer, byte_offset, byte_length, result) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var value;
+    if (!env)
+        return 1 /* napi_status.napi_invalid_arg */;
+    // @ts-expect-error
+    var envObject = emnapiCtx.envStore.get(env);
+    envObject.checkGCAccess();
+    if (!envObject.tryCatch.isEmpty())
+        return envObject.setLastError(10 /* napi_status.napi_pending_exception */);
+    if (!envObject.canCallIntoJs())
+        return envObject.setLastError(envObject.moduleApiVersion === 2147483647 /* Version.NAPI_VERSION_EXPERIMENTAL */ ? 23 /* napi_status.napi_cannot_run_js */ : 10 /* napi_status.napi_pending_exception */);
+    envObject.clearLastError();
+    try {
+        if (!arraybuffer)
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        if (!result)
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        {{{ from64('byte_offset') }}};
+        {{{ from64('byte_length') }}};
+        byte_offset = byte_offset >>> 0;
+        byte_length = byte_length >>> 0;
+        var handle = emnapiCtx.handleStore.get(arraybuffer);
+        if (!handle.isArrayBuffer()) {
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        }
+        var buffer = handle.value;
+        if ((byte_length + byte_offset) > buffer.byteLength) {
+            var err = new RangeError('The byte offset + length is out of range');
+            err.code = 'ERR_OUT_OF_RANGE';
+            throw err;
+        }
+        var Buffer = emnapiCtx.feature.Buffer;
+        if (!Buffer) {
+            throw emnapiCtx.createNotSupportBufferError('node_api_create_buffer_from_arraybuffer', '');
+        }
+        var out = Buffer.from(buffer, byte_offset, byte_length);
+        if (buffer === wasmMemory.buffer) {
+            if (!emnapiExternalMemory.wasmMemoryViewTable.has(out)) {
+                emnapiExternalMemory.wasmMemoryViewTable.set(out, {
+                    Ctor: Buffer,
+                    address: byte_offset,
+                    length: byte_length,
+                    ownership: 1 /* ReferenceOwnership.kUserland */,
+                    runtimeAllocated: 0
+                });
+            }
+        }
+        {{{ from64('result') }}};
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        value = emnapiCtx.addToCurrentScope(out).id;
+        {{{ makeSetValue('result', 0, 'value', '*') }}};
+        return envObject.getReturnStatus();
+    }
+    catch (err) {
+        envObject.tryCatch.setError(err);
+        return envObject.setLastError(10 /* napi_status.napi_pending_exception */);
+    }
+}
 /**
  * @__sig ippppp
  */
@@ -3225,10 +3305,10 @@ function _napi_create_dataview(env, byte_length, arraybuffer, byte_offset, resul
         byte_length = byte_length >>> 0;
         byte_offset = byte_offset >>> 0;
         var handle = emnapiCtx.handleStore.get(arraybuffer);
-        var buffer = handle.value;
-        if (!(buffer instanceof ArrayBuffer)) {
+        if (!handle.isArrayBuffer()) {
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
+        var buffer = handle.value;
         if ((byte_length + byte_offset) > buffer.byteLength) {
             var err = new RangeError('byte_offset + byte_length should be less than or equal to the size in bytes of the array passed in');
             err.code = 'ERR_NAPI_INVALID_DATAVIEW_ARGS';
@@ -3241,7 +3321,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 +4112,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 +4156,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 +4181,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 +5991,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 +6017,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_', '*') }}};
@@ -6834,18 +6914,18 @@ function _napi_get_version(env, result) {
     napi_get_boolean: _napi_get_boolean,
     napi_get_boolean__deps: ["$emnapiCtx"],
     napi_get_boolean__sig: "ipip",
+    napi_get_dataview_info: _napi_get_dataview_info,
+    napi_get_dataview_info__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
+    napi_get_dataview_info__sig: "ipppppp",
     napi_get_typedarray_info: _napi_get_typedarray_info,
     napi_get_typedarray_info__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
     napi_get_typedarray_info__sig: "ippppppp",
     napi_get_buffer_info: _napi_get_buffer_info,
-    napi_get_buffer_info__deps: ["$emnapiCtx", "napi_get_typedarray_info"],
+    napi_get_buffer_info__deps: ["$emnapiCtx", "napi_get_dataview_info", "napi_get_typedarray_info"],
     napi_get_buffer_info__sig: "ipppp",
     napi_get_cb_info: _napi_get_cb_info,
     napi_get_cb_info__deps: ["$emnapiCtx"],
     napi_get_cb_info__sig: "ipppppp",
-    napi_get_dataview_info: _napi_get_dataview_info,
-    napi_get_dataview_info__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
-    napi_get_dataview_info__sig: "ipppppp",
     napi_get_date_value: _napi_get_date_value,
     napi_get_date_value__deps: ["$emnapiCtx"],
     napi_get_date_value__sig: "ippp",
@@ -7068,15 +7148,24 @@ function _napi_get_version(env, result) {
     napi_wrap: _napi_wrap,
     napi_wrap__deps: ["$emnapiWrap"],
     napi_wrap__sig: "ipppppp",
+    node_api_create_buffer_from_arraybuffer: _node_api_create_buffer_from_arraybuffer,
+    node_api_create_buffer_from_arraybuffer__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
+    node_api_create_buffer_from_arraybuffer__sig: "ippppp",
     node_api_create_external_string_latin1: _node_api_create_external_string_latin1,
     node_api_create_external_string_latin1__deps: ["$emnapiString", "napi_create_string_latin1"],
     node_api_create_external_string_latin1__sig: "ippppppp",
     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',
@@ -99,6 +102,7 @@
         'src/uv/uv-common.c',
         'src/uv/threadpool.c',
         'src/uv/unix/loop.c',
+        'src/uv/unix/posix-hrtime.c',
         'src/uv/unix/thread.c',
         'src/uv/unix/async.c',
         'src/uv/unix/core.c',

package/include/node/emnapi.h

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