emnapi 1.5.0 → 1.7.0

package/dist/library_napi.js

@@ -983,6 +983,10 @@ var emnapiExternalMemory = {
         emnapiExternalMemory.table = new WeakMap();
         emnapiExternalMemory.wasmMemoryViewTable = new WeakMap();
     },
+    isSharedArrayBuffer: function (value) {
+        return ((typeof SharedArrayBuffer === 'function' && value instanceof SharedArrayBuffer) ||
+            (Object.prototype.toString.call(value) === '[object SharedArrayBuffer]'));
+    },
     isDetachedArrayBuffer: function (arrayBuffer) {
         if (arrayBuffer.byteLength === 0) {
             try {
@@ -1124,7 +1128,7 @@ function _napi_get_arraybuffer_info(env, arraybuffer, data, byte_length) {
     if (!arraybuffer)
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     var handle = emnapiCtx.handleStore.get(arraybuffer);
-    if (!handle.isArrayBuffer()) {
+    if (!handle.isArrayBuffer() && !emnapiExternalMemory.isSharedArrayBuffer(handle.value)) {
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     }
     if (data) {
@@ -2627,7 +2631,7 @@ function emnapiSyncMemory(js_to_wasm, arrayBufferOrView, offset, len) {
     offset = offset !== null && offset !== void 0 ? offset : 0;
     offset = offset >>> 0;
     var view;
-    if (arrayBufferOrView instanceof ArrayBuffer) {
+    if (arrayBufferOrView instanceof ArrayBuffer || emnapiExternalMemory.isSharedArrayBuffer(arrayBufferOrView)) {
         var pointer = emnapiExternalMemory.getArrayBufferPointer(arrayBufferOrView, false).address;
         if (!pointer)
             throw new Error('Unknown ArrayBuffer address');
@@ -2695,7 +2699,7 @@ function _emnapi_sync_memory(env, js_to_wasm, arraybuffer_or_view, offset, len)
         {{{ from64('len') }}};
         var handleId = {{{ makeGetValue('arraybuffer_or_view', 0, '*') }}};
         var handle = envObject.ctx.handleStore.get(handleId);
-        if (!handle.isArrayBuffer() && !handle.isTypedArray() && !handle.isDataView()) {
+        if (!handle.isArrayBuffer() && !handle.isTypedArray() && !handle.isDataView() && !emnapiExternalMemory.isSharedArrayBuffer(handle.value)) {
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
         var ret = emnapiSyncMemory(Boolean(js_to_wasm), handle.value, offset, len);
@@ -2715,7 +2719,7 @@ function emnapiGetMemoryAddress(arrayBufferOrView) {
     var isArrayBuffer = arrayBufferOrView instanceof ArrayBuffer;
     var isDataView = arrayBufferOrView instanceof DataView;
     var isTypedArray = ArrayBuffer.isView(arrayBufferOrView) && !isDataView;
-    if (!isArrayBuffer && !isTypedArray && !isDataView) {
+    if (!isArrayBuffer && !isTypedArray && !isDataView && !emnapiExternalMemory.isSharedArrayBuffer(arrayBufferOrView)) {
         throw new TypeError('emnapiGetMemoryAddress expect ArrayBuffer or ArrayBufferView as first parameter');
     }
     var info;
@@ -2841,10 +2845,10 @@ function _napi_create_array_with_length(env, length, result) {
     {{{ makeSetValue('result', 0, 'value', '*') }}};
     return envObject.clearLastError();
 }
-function emnapiCreateArrayBuffer(byte_length, data) {
+function emnapiCreateArrayBuffer(byte_length, data, shared) {
     {{{ from64('byte_length') }}};
     byte_length = byte_length >>> 0;
-    var arrayBuffer = new ArrayBuffer(byte_length);
+    var arrayBuffer = shared ? new SharedArrayBuffer(byte_length) : new ArrayBuffer(byte_length);
     if (data) {
         {{{ from64('data') }}};
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -2873,7 +2877,37 @@ function _napi_create_arraybuffer(env, byte_length, data, result) {
         if (!result)
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         {{{ from64('result') }}};
-        var arrayBuffer = emnapiCreateArrayBuffer(byte_length, data);
+        var arrayBuffer = emnapiCreateArrayBuffer(byte_length, data, false);
+        value = emnapiCtx.addToCurrentScope(arrayBuffer).id;
+        {{{ makeSetValue('result', 0, 'value', '*') }}};
+        return envObject.getReturnStatus();
+    }
+    catch (err) {
+        envObject.tryCatch.setError(err);
+        return envObject.setLastError(10 /* napi_status.napi_pending_exception */);
+    }
+}
+/**
+ * @__sig ipppp
+ */
+function _node_api_create_sharedarraybuffer(env, byte_length, data, 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 >= 10 ? 23 /* napi_status.napi_cannot_run_js */ : 10 /* napi_status.napi_pending_exception */);
+    envObject.clearLastError();
+    try {
+        if (!result)
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        {{{ from64('result') }}};
+        var arrayBuffer = emnapiCreateArrayBuffer(byte_length, data, true);
         value = emnapiCtx.addToCurrentScope(arrayBuffer).id;
         {{{ makeSetValue('result', 0, 'value', '*') }}};
         return envObject.getReturnStatus();
@@ -3037,6 +3071,55 @@ function _napi_create_object(env, result) {
     {{{ makeSetValue('result', 0, 'value', '*') }}};
     return envObject.clearLastError();
 }
+/**
+ * @__sig ipppppp
+ */
+function _napi_create_object_with_properties(env, prototype_or_null, property_names, property_values, property_count, result) {
+    if (!env)
+        return 1 /* napi_status.napi_invalid_arg */;
+    // @ts-expect-error
+    var envObject = emnapiCtx.envStore.get(env);
+    envObject.checkGCAccess();
+    if (!result)
+        return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    {{{ from64('property_count') }}};
+    property_count = property_count >>> 0;
+    if (property_count > 0) {
+        if (!property_names)
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        if (!property_values)
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    }
+    var v8_prototype_or_null = prototype_or_null
+        ? emnapiCtx.handleStore.get(prototype_or_null).value
+        : null;
+    var properties = {};
+    {{{ from64('property_names') }}};
+    {{{ from64('property_values') }}};
+    for (var i = 0; i < property_count; i++) {
+        var name_value = emnapiCtx.handleStore.get({{{ makeGetValue('property_names', 'i * ' + POINTER_SIZE, '*') }}}).value;
+        if (!(typeof name_value === "string" || typeof name_value === "symbol"))
+            return envObject.setLastError(4 /* napi_status.napi_name_expected */);
+        properties[name_value] = {
+            value: emnapiCtx.handleStore.get({{{ makeGetValue('property_values', 'i * ' + POINTER_SIZE, '*') }}}).value,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        };
+    }
+    var obj;
+    try {
+        obj = Object.defineProperties(Object.create(v8_prototype_or_null), properties);
+    }
+    catch (_) {
+        return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var value = emnapiCtx.addToCurrentScope(obj).id;
+    {{{ from64('result') }}};
+    {{{ makeSetValue('result', 0, 'value', '*') }}};
+    return envObject.clearLastError();
+}
 /**
  * @__sig ippp
  */
@@ -3246,7 +3329,7 @@ function _napi_create_buffer_copy(env, length, data, result_data, result) {
         if (!Buffer) {
             throw emnapiCtx.createNotSupportBufferError('napi_create_buffer_copy', '');
         }
-        var arrayBuffer = emnapiCreateArrayBuffer(length, result_data);
+        var arrayBuffer = emnapiCreateArrayBuffer(length, result_data, false);
         var buffer = Buffer.from(arrayBuffer);
         {{{ from64('data') }}};
         {{{ from64('length') }}};
@@ -6458,6 +6541,27 @@ function _napi_is_arraybuffer(env, value, result) {
     return envObject.clearLastError();
 }
 /** @__sig ippp */
+function _node_api_is_sharedarraybuffer(env, value, result) {
+    if (!env)
+        return 1 /* napi_status.napi_invalid_arg */;
+    // @ts-expect-error
+    var envObject = emnapiCtx.envStore.get(env);
+    envObject.checkGCAccess();
+    if (!value)
+        return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    if (!result)
+        return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    var h = emnapiCtx.handleStore.get(value);
+    {{{ from64('result') }}};
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var r = ((typeof SharedArrayBuffer === 'function' && h.value instanceof SharedArrayBuffer) ||
+        (Object.prototype.toString.call(h.value) === '[object SharedArrayBuffer]'))
+        ? 1
+        : 0;
+    {{{ makeSetValue('result', 0, 'r', 'i8') }}};
+    return envObject.clearLastError();
+}
+/** @__sig ippp */
 function _napi_is_date(env, value, result) {
     if (!env)
         return 1 /* napi_status.napi_invalid_arg */;
@@ -6784,7 +6888,7 @@ function _napi_get_version(env, result) {
     emnapi_is_support_weakref__deps: ["$emnapiCtx"],
     emnapi_is_support_weakref__sig: "i",
     emnapi_sync_memory: _emnapi_sync_memory,
-    emnapi_sync_memory__deps: ["$emnapiCtx", "$emnapiSyncMemory"],
+    emnapi_sync_memory__deps: ["$emnapiCtx", "$emnapiExternalMemory", "$emnapiSyncMemory"],
     emnapi_sync_memory__sig: "ipippp",
     $emnapiTSFN: emnapiTSFN,
     $emnapiTSFN__deps: ["$emnapiCtx", "_emnapi_runtime_keepalive_pop", "$emnapiNodeBinding", "_emnapi_node_emit_async_destroy", "malloc", "free"],
@@ -6900,6 +7004,9 @@ function _napi_get_version(env, result) {
     napi_create_object: _napi_create_object,
     napi_create_object__deps: ["$emnapiCtx"],
     napi_create_object__sig: "ipp",
+    napi_create_object_with_properties: _napi_create_object_with_properties,
+    napi_create_object_with_properties__deps: ["$emnapiCtx"],
+    napi_create_object_with_properties__sig: "ipppppp",
     napi_create_promise: _napi_create_promise,
     napi_create_promise__deps: ["$emnapiCtx"],
     napi_create_promise__sig: "ippp",
@@ -7232,9 +7339,15 @@ function _napi_get_version(env, result) {
     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_sharedarraybuffer: _node_api_create_sharedarraybuffer,
+    node_api_create_sharedarraybuffer__deps: ["$emnapiCtx", "$emnapiCreateArrayBuffer"],
+    node_api_create_sharedarraybuffer__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",
+    node_api_is_sharedarraybuffer: _node_api_is_sharedarraybuffer,
+    node_api_is_sharedarraybuffer__deps: ["$emnapiCtx"],
+    node_api_is_sharedarraybuffer__sig: "ippp",
     node_api_post_finalizer: _node_api_post_finalizer,
     node_api_post_finalizer__deps: ["$emnapiCtx"],
     node_api_post_finalizer__sig: "ipppp",

package/include/node/emnapi.h

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

package/include/node/js_native_api.h

@@ -72,6 +72,17 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_get_boolean(napi_env env,
 // Methods to create Primitive types/Objects
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_object(napi_env env,
                                                       napi_value* result);
+#ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_CREATE_OBJECT_WITH_PROPERTIES
+NAPI_EXTERN napi_status NAPI_CDECL
+napi_create_object_with_properties(napi_env env,
+                                   napi_value prototype_or_null,
+                                   napi_value* property_names,
+                                   napi_value* property_values,
+                                   size_t property_count,
+                                   napi_value* result);
+#endif  // NAPI_EXPERIMENTAL
+
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_array(napi_env env,
                                                      napi_value* result);
 NAPI_EXTERN napi_status NAPI_CDECL
@@ -358,7 +369,7 @@ napi_create_reference(napi_env env,
 
 // Deletes a reference. The referenced value is released, and may
 // be GC'd unless there are other references to it.
-NAPI_EXTERN napi_status NAPI_CDECL napi_delete_reference(napi_env env,
+NAPI_EXTERN napi_status NAPI_CDECL napi_delete_reference(node_api_basic_env env,
                                                          napi_ref ref);
 
 // Increments the reference count, optionally returning the resulting count.
@@ -480,6 +491,14 @@ napi_get_dataview_info(napi_env env,
                        napi_value* arraybuffer,
                        size_t* byte_offset);
 
+#ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_SHAREDARRAYBUFFER
+NAPI_EXTERN napi_status NAPI_CDECL
+node_api_is_sharedarraybuffer(napi_env env, napi_value value, bool* result);
+NAPI_EXTERN napi_status NAPI_CDECL node_api_create_sharedarraybuffer(
+    napi_env env, size_t byte_length, void** data, napi_value* result);
+#endif  // NAPI_EXPERIMENTAL
+
 // version management
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_version(node_api_basic_env env,
                                                     uint32_t* result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "gypfile": false,