emnapi 0.36.3 → 0.37.0

package/dist/library_napi.js

@@ -212,9 +212,13 @@ function _emnapi_create_memory_view(env, typedarray_type, external_data, byte_le
             case -1 /* emnapi_memory_view_type.emnapi_data_view */:
                 viewDescriptor_1 = { Ctor: DataView, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
                 break;
-            case -2 /* emnapi_memory_view_type.emnapi_buffer */:
+            case -2 /* emnapi_memory_view_type.emnapi_buffer */: {
+                if (!emnapiCtx.feature.Buffer) {
+                    throw emnapiCtx.createNotSupportBufferError("emnapi_create_memory_view", "");
+                }
                 viewDescriptor_1 = { Ctor: emnapiCtx.feature.Buffer, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
                 break;
+            }
             default: return envObject_1.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
         var Ctor_1 = viewDescriptor_1.Ctor;
@@ -1380,7 +1384,7 @@ var emnapiExternalMemory = {
         if (!shouldCopy) {
             return info;
         }
-        var pointer = {{{ makeMalloc('$emnapiExternalMemory.getArrayBufferPointer', 'arrayBuffer.byteLength') }}};
+        var pointer = _malloc({{{ to64('arrayBuffer.byteLength') }}});
         if (!pointer)
             throw new Error('Out of memory');
         new Uint8Array(wasmMemory.buffer).set(new Uint8Array(arrayBuffer), pointer);
@@ -2752,7 +2756,7 @@ var emnapiTSFN = {
     },
     initQueue: function (func) {
         var size = 2 * {{{ POINTER_SIZE }}};
-        var queue = {{{ makeMalloc('emnapiTSFN.initQueue', 'size') }}};
+        var queue = _malloc({{{ to64('size') }}});
         if (!queue)
             return false;
         new Uint8Array(wasmMemory.buffer, queue, size).fill(0);
@@ -2771,7 +2775,7 @@ var emnapiTSFN = {
         var tail = emnapiTSFN.loadSizeTypeValue(queue + {{{ POINTER_SIZE }}}, false);
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         var size = 2 * {{{ POINTER_SIZE }}};
-        var node = {{{ makeMalloc('emnapiTSFN.pushQueue', 'size') }}};
+        var node = _malloc({{{ to64('size') }}});
         if (!node)
             throw new Error('OOM');
         emnapiTSFN.storeSizeTypeValue(node, data, false);
@@ -3361,7 +3365,7 @@ function _napi_create_threadsafe_function(env, func, async_resource, async_resou
     var resource_name = envObject.ensureHandleId(asyncResourceName);
     // tsfn create
     var sizeofTSFN = emnapiTSFN.offset.end;
-    var tsfn = {{{ makeMalloc('napi_create_threadsafe_function', 'sizeofTSFN') }}};
+    var tsfn = _malloc({{{ to64('sizeofTSFN') }}});
     if (!tsfn)
         return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
     new Uint8Array(wasmMemory.buffer).subarray(tsfn, tsfn + sizeofTSFN).fill(0);
@@ -3488,6 +3492,8 @@ function _napi_ref_threadsafe_function(env, func) {
 emnapiDefineVar('$emnapiTSFN', emnapiTSFN, [
     '$emnapiInit',
     '$PThread',
+    'malloc',
+    'free',
     '_emnapi_node_emit_async_init',
     '_emnapi_node_emit_async_destroy',
     '_emnapi_runtime_keepalive_pop',
@@ -5429,8 +5435,11 @@ function napi_create_buffer(env, size, data, result
     try {
         if (result == 0)
             return envObject_56.setLastError(1 /* napi_status.napi_invalid_arg */);
-        {{{ from64("result") }}};
         var Buffer_1 = emnapiCtx.feature.Buffer;
+        if (!Buffer_1) {
+            throw emnapiCtx.createNotSupportBufferError("napi_create_buffer", "");
+        }
+        {{{ from64("result") }}};
         var buffer_2 = void 0;
         {{{ from64("size") }}};
         size = size >>> 0;
@@ -5440,7 +5449,7 @@ function napi_create_buffer(env, size, data, result
             {{{ makeSetValue("result", 0, "value", "*") }}};
         }
         else {
-            pointer = {{{ makeMalloc("napi_create_buffer", "size") }}};
+            pointer = _malloc({{{ to64("size") }}});
             if (!pointer)
                 throw new Error("Out of memory");
             new Uint8Array(wasmMemory.buffer).subarray(pointer, pointer + size).fill(0);
@@ -5483,8 +5492,8 @@ function napi_create_buffer_copy(env, length, data, result_data, result
     try {
         if (result == 0)
             return envObject_57.setLastError(1 /* napi_status.napi_invalid_arg */);
-        var arrayBuffer_3 = emnapiCreateArrayBuffer(length, result_data);
         var Buffer_2 = emnapiCtx.feature.Buffer;
+        var arrayBuffer_3 = emnapiCreateArrayBuffer(length, result_data);
         var buffer_4 = Buffer_2.from(arrayBuffer_3);
         {{{ from64("data") }}};
         {{{ from64("length") }}};

package/include/emnapi_common.h

@@ -2,11 +2,9 @@
 #define EMNAPI_INCLUDE_COMMON_H_
 
 #ifdef __EMSCRIPTEN__
-#define NAPI_EXTERN __attribute__((visibility("default")))                \
-                    __attribute__((__import_module__("env")))
+#define NAPI_EXTERN __attribute__((__import_module__("env")))
 
-#define EMNAPI_EXTERN __attribute__((visibility("default")))              \
-                      __attribute__((__import_module__("env")))
+#define EMNAPI_EXTERN __attribute__((__import_module__("env")))
 #else
 #define NAPI_EXTERN __attribute__((__import_module__("napi")))