emnapi 1.7.0 → 1.7.1

package/CMakeLists.txt

@@ -134,6 +134,15 @@ endif()
 if(NAPI_VERSION)
   add_compile_definitions("NAPI_VERSION=${NAPI_VERSION}")
 endif()
+if(NAPI_EXPERIMENTAL)
+  add_compile_definitions("NAPI_EXPERIMENTAL=${NAPI_EXPERIMENTAL}")
+endif()
+if(NODE_API_EXPERIMENTAL_NO_WARNING)
+  add_compile_definitions("NODE_API_EXPERIMENTAL_NO_WARNING=${NODE_API_EXPERIMENTAL_NO_WARNING}")
+endif()
+if(NODE_WANT_INTERNALS)
+  add_compile_definitions("NODE_WANT_INTERNALS=${NODE_WANT_INTERNALS}")
+endif()
 
 add_library(${EMNAPI_TARGET_NAME} STATIC ${EMNAPI_SRC} ${UV_SRC})
 target_include_directories(${EMNAPI_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})

package/dist/library_napi.js

@@ -53,11 +53,11 @@ function emnapiInit(options) {
     var scope = emnapiCtx.openScope(envObject);
     try {
         envObject.callIntoModule(function (_envObject) {
-            var exports = emnapiModule.exports;
+            var exports$1 = emnapiModule.exports;
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            var exportsHandle = scope.add(exports);
+            var exportsHandle = scope.add(exports$1);
             var napiValue = _napi_register_wasm_v1({{{ to64('_envObject.id') }}}, {{{ to64('exportsHandle.id') }}});
-            emnapiModule.exports = (!napiValue) ? exports : emnapiCtx.handleStore.get(napiValue).value;
+            emnapiModule.exports = (!napiValue) ? exports$1 : emnapiCtx.handleStore.get(napiValue).value;
         });
     }
     catch (err) {
@@ -3416,8 +3416,6 @@ function _node_api_create_buffer_from_arraybuffer(env, arraybuffer, byte_offset,
  * @__sig ippppp
  */
 function _napi_create_dataview(env, byte_length, arraybuffer, byte_offset, result) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var value;
     if (!env)
         return 1 /* napi_status.napi_invalid_arg */;
     // @ts-expect-error
@@ -3437,33 +3435,37 @@ function _napi_create_dataview(env, byte_length, arraybuffer, byte_offset, resul
         {{{ from64('byte_offset') }}};
         byte_length = byte_length >>> 0;
         byte_offset = byte_offset >>> 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('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';
-            throw err;
-        }
-        var dataview = new DataView(buffer, byte_offset, byte_length);
-        if (buffer === wasmMemory.buffer) {
-            if (!emnapiExternalMemory.wasmMemoryViewTable.has(dataview)) {
-                emnapiExternalMemory.wasmMemoryViewTable.set(dataview, {
-                    Ctor: DataView,
-                    address: byte_offset,
-                    length: byte_length,
-                    ownership: 1 /* ReferenceOwnership.kUserland */,
-                    runtimeAllocated: 0
-                });
+        var value = emnapiCtx.handleStore.get(arraybuffer).value;
+        var createDataview = function (buffer) {
+            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';
+                throw err;
+            }
+            var dataview = new DataView(buffer, byte_offset, byte_length);
+            if (buffer === wasmMemory.buffer) {
+                if (!emnapiExternalMemory.wasmMemoryViewTable.has(dataview)) {
+                    emnapiExternalMemory.wasmMemoryViewTable.set(dataview, {
+                        Ctor: DataView,
+                        address: byte_offset,
+                        length: byte_length,
+                        ownership: 1 /* ReferenceOwnership.kUserland */,
+                        runtimeAllocated: 0
+                    });
+                }
             }
+            {{{ from64('result') }}};
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            var v = emnapiCtx.addToCurrentScope(dataview).id;
+            {{{ makeSetValue('result', 0, 'v', '*') }}};
+            return envObject.getReturnStatus();
+        };
+        if (value instanceof ArrayBuffer || emnapiExternalMemory.isSharedArrayBuffer(value)) {
+            return createDataview(value);
+        }
+        else {
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
-        {{{ from64('result') }}};
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        value = emnapiCtx.addToCurrentScope(dataview).id;
-        {{{ makeSetValue('result', 0, 'value', '*') }}};
-        return envObject.getReturnStatus();
     }
     catch (err) {
         envObject.tryCatch.setError(err);

package/include/node/emnapi.h

@@ -7,7 +7,7 @@
 
 #define EMNAPI_MAJOR_VERSION 1
 #define EMNAPI_MINOR_VERSION 7
-#define EMNAPI_PATCH_VERSION 0
+#define EMNAPI_PATCH_VERSION 1
 
 typedef enum {
   emnapi_runtime,

package/include/node/js_native_api.h

@@ -5,22 +5,6 @@
 #include <stdbool.h>  // NOLINT(modernize-deprecated-headers)
 #include <stddef.h>   // NOLINT(modernize-deprecated-headers)
 
-// Use INT_MAX, this should only be consumed by the pre-processor anyway.
-#define NAPI_VERSION_EXPERIMENTAL 2147483647
-#ifndef NAPI_VERSION
-#ifdef NAPI_EXPERIMENTAL
-#define NAPI_VERSION NAPI_VERSION_EXPERIMENTAL
-#else
-// The baseline version for N-API.
-// The NAPI_VERSION controls which version will be used by default when
-// compilling a native addon. If the addon developer specifically wants to use
-// functions available in a new version of N-API that is not yet ported in all
-// LTS versions, they can set NAPI_VERSION knowing that they have specifically
-// depended on that version.
-#define NAPI_VERSION 8
-#endif
-#endif
-
 #ifndef EMNAPI_UNMODIFIED_UPSTREAM
 #if !defined(NAPI_EXTERN) && defined(__EMSCRIPTEN__)
 #define NAPI_EXTERN __attribute__((__import_module__("env")))

package/include/node/js_native_api_types.h

@@ -1,6 +1,34 @@
 #ifndef SRC_JS_NATIVE_API_TYPES_H_
 #define SRC_JS_NATIVE_API_TYPES_H_
 
+// Use INT_MAX, this should only be consumed by the pre-processor anyway.
+#define NAPI_VERSION_EXPERIMENTAL 2147483647
+#ifndef NAPI_VERSION
+#ifdef NAPI_EXPERIMENTAL
+#define NAPI_VERSION NAPI_VERSION_EXPERIMENTAL
+#else
+// The baseline version for N-API.
+// The NAPI_VERSION controls which version will be used by default when
+// compilling a native addon. If the addon developer specifically wants to use
+// functions available in a new version of N-API that is not yet ported in all
+// LTS versions, they can set NAPI_VERSION knowing that they have specifically
+// depended on that version.
+#define NAPI_VERSION 8
+#endif
+#endif
+
+#if defined(NAPI_EXPERIMENTAL) &&                                              \
+    !defined(NODE_API_EXPERIMENTAL_NO_WARNING) &&                              \
+    !defined(NODE_WANT_INTERNALS)
+#ifdef _MSC_VER
+#pragma message("NAPI_EXPERIMENTAL is enabled. "                               \
+                "Experimental features may be unstable.")
+#else
+#warning "NAPI_EXPERIMENTAL is enabled. " \
+       "Experimental features may be unstable."
+#endif
+#endif
+
 // This file needs to be compatible with C compilers.
 // This is a public include file, and these includes have essentially
 // became part of it's API.

package/include/node/node_api.h

@@ -43,10 +43,6 @@ struct uv_loop_s;  // Forward declaration.
 #define NAPI_NO_RETURN
 #endif
 
-typedef napi_value(NAPI_CDECL* napi_addon_register_func)(napi_env env,
-                                                         napi_value exports);
-typedef int32_t(NAPI_CDECL* node_api_addon_get_api_version_func)(void);
-
 // Used by deprecated registration method napi_module_register.
 typedef struct napi_module {
   int nm_version;

package/include/node/node_api_types.h

@@ -3,6 +3,10 @@
 
 #include "js_native_api_types.h"
 
+typedef napi_value(NAPI_CDECL* napi_addon_register_func)(napi_env env,
+                                                         napi_value exports);
+typedef int32_t(NAPI_CDECL* node_api_addon_get_api_version_func)(void);
+
 typedef struct napi_callback_scope__* napi_callback_scope;
 typedef struct napi_async_context__* napi_async_context;
 typedef struct napi_async_work__* napi_async_work;

package/package.json

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