emnapi 0.43.1 → 0.45.0

package/include/emnapi.h

@@ -5,6 +5,10 @@
 #include "js_native_api_types.h"
 #include "emnapi_common.h"
 
+#define EMNAPI_MAJOR_VERSION 0
+#define EMNAPI_MINOR_VERSION 45
+#define EMNAPI_PATCH_VERSION 0
+
 typedef enum {
   emnapi_runtime,
   emnapi_userland,
@@ -41,17 +45,17 @@ EMNAPI_EXTERN
 napi_status emnapi_get_module_property(napi_env env,
                                        const char* utf8name,
                                        napi_value* result);
+#endif
 
 typedef struct {
   uint32_t major;
   uint32_t minor;
   uint32_t patch;
-} emnapi_emscripten_version;
+} emnapi_runtime_version;
 
 EMNAPI_EXTERN
-napi_status emnapi_get_emscripten_version(napi_env env,
-                                          const emnapi_emscripten_version** version);
-#endif
+napi_status emnapi_get_runtime_version(napi_env env, 
+                                       emnapi_runtime_version* version);
 
 EMNAPI_EXTERN
 napi_status emnapi_create_memory_view(napi_env env,

package/include/emnapi_common.h

@@ -2,23 +2,29 @@
 #define EMNAPI_INCLUDE_COMMON_H_
 
 #ifdef __EMSCRIPTEN__
-#define NAPI_EXTERN __attribute__((__import_module__("env")))
-
 #define EMNAPI_EXTERN __attribute__((__import_module__("env")))
 #else
-#define NAPI_EXTERN __attribute__((__import_module__("napi")))
-
 #define EMNAPI_EXTERN __attribute__((__import_module__("emnapi")))
 #endif
 
 #define EMNAPI_INTERNAL_EXTERN __attribute__((__import_module__("env")))
 
 #ifdef __cplusplus
+#ifndef EXTERN_C_START
 #define EXTERN_C_START extern "C" {
+#endif
+
+#ifndef EXTERN_C_END
 #define EXTERN_C_END }
+#endif
 #else
+#ifndef EXTERN_C_START
 #define EXTERN_C_START
+#endif
+
+#ifndef EXTERN_C_END
 #define EXTERN_C_END
 #endif
+#endif
 
 #endif

package/include/js_native_api.h

@@ -21,15 +21,20 @@
 #endif
 #endif
 
+#ifndef EMNAPI_UNMODIFIED_UPSTREAM
+#if !defined(NAPI_EXTERN) && defined(__EMSCRIPTEN__)
+#define NAPI_EXTERN __attribute__((__import_module__("env")))
+#endif
+#endif
+
 #include "js_native_api_types.h"
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
 // If you need __declspec(dllimport), either include <node_api.h> instead, or
 // define NAPI_EXTERN as __declspec(dllimport) on the compiler's command line.
 #ifndef NAPI_EXTERN
 #ifdef _WIN32
 #define NAPI_EXTERN __declspec(dllexport)
-#elif defined(__wasm32__)
+#elif defined(__wasm__)
 #define NAPI_EXTERN                                                            \
   __attribute__((visibility("default")))                                       \
   __attribute__((__import_module__("napi")))
@@ -37,13 +42,9 @@
 #define NAPI_EXTERN __attribute__((visibility("default")))
 #endif
 #endif
-#else
-#include "emnapi_common.h"
-#endif
 
 #define NAPI_AUTO_LENGTH SIZE_MAX
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
 #ifdef __cplusplus
 #define EXTERN_C_START extern "C" {
 #define EXTERN_C_END }
@@ -51,7 +52,6 @@
 #define EXTERN_C_START
 #define EXTERN_C_END
 #endif
-#endif
 
 EXTERN_C_START
 
@@ -99,6 +99,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_utf16(napi_env env,
                                                             size_t length,
                                                             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,
@@ -116,6 +117,13 @@ node_api_create_external_string_utf16(napi_env env,
                                       napi_value* result,
                                       bool* copied);
 #endif  // NAPI_EXPERIMENTAL
+
+#ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_PROPERTY_KEYS
+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
+
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_symbol(napi_env env,
                                                       napi_value description,
                                                       napi_value* result);
@@ -524,6 +532,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_add_finalizer(napi_env env,
 #endif  // NAPI_VERSION >= 5
 
 #ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
 
 NAPI_EXTERN napi_status NAPI_CDECL
 node_api_post_finalizer(napi_env env,

package/include/node_api.h

@@ -1,16 +1,24 @@
 #ifndef SRC_NODE_API_H_
 #define SRC_NODE_API_H_
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
-#ifdef BUILDING_NODE_EXTENSION
+#ifndef EMNAPI_UNMODIFIED_UPSTREAM
+#ifndef BUILDING_NODE_EXTENSION
+#define BUILDING_NODE_EXTENSION
+#endif
+
+#if !defined(NAPI_EXTERN) && defined(__EMSCRIPTEN__)
+#define NAPI_EXTERN __attribute__((__import_module__("env")))
+#endif
+#endif
+
+#if defined(BUILDING_NODE_EXTENSION) && !defined(NAPI_EXTERN)
 #ifdef _WIN32
 // Building native addon against node
 #define NAPI_EXTERN __declspec(dllimport)
-#elif defined(__wasm32__)
+#elif defined(__wasm__)
 #define NAPI_EXTERN __attribute__((__import_module__("napi")))
 #endif
 #endif
-#endif
 #include "js_native_api.h"
 #include "node_api_types.h"
 
@@ -19,16 +27,13 @@ struct uv_loop_s;  // Forward declaration.
 #ifdef _WIN32
 #define NAPI_MODULE_EXPORT __declspec(dllexport)
 #else
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
-#define NAPI_MODULE_EXPORT __attribute__((visibility("default")))
-#else
 #ifdef __EMSCRIPTEN__
-#define NAPI_MODULE_EXPORT __attribute__((visibility("default"))) __attribute__((used))
+#define NAPI_MODULE_EXPORT                                                     \
+  __attribute__((visibility("default"))) __attribute__((used))
 #else
 #define NAPI_MODULE_EXPORT __attribute__((visibility("default")))
 #endif
 #endif
-#endif
 
 #if defined(__GNUC__)
 #define NAPI_NO_RETURN __attribute__((noreturn))
@@ -59,19 +64,11 @@ typedef struct napi_module {
   NAPI_MODULE_INITIALIZER_X_HELPER(base, version)
 #define NAPI_MODULE_INITIALIZER_X_HELPER(base, version) base##version
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
-#ifdef __wasm32__
-#define NAPI_MODULE_INITIALIZER_BASE napi_register_wasm_v
-#else
-#define NAPI_MODULE_INITIALIZER_BASE napi_register_module_v
-#endif
-#else
 #ifdef __wasm__
 #define NAPI_MODULE_INITIALIZER_BASE napi_register_wasm_v
 #else
 #define NAPI_MODULE_INITIALIZER_BASE napi_register_module_v
 #endif
-#endif
 
 #define NODE_API_MODULE_GET_API_VERSION_BASE node_api_module_get_api_version_v
 
@@ -160,7 +157,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_get_buffer_info(napi_env env,
                                                         napi_value value,
                                                         void** data,
                                                         size_t* length);
-#if !defined(EMNAPI_UNMODIFIED_UPSTREAM) || (defined(EMNAPI_UNMODIFIED_UPSTREAM) && !defined(__wasm32__))
+
 // Methods to manage simple async operations
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_async_work(napi_env env,
@@ -176,7 +173,6 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_queue_async_work(napi_env env,
                                                          napi_async_work work);
 NAPI_EXTERN napi_status NAPI_CDECL napi_cancel_async_work(napi_env env,
                                                           napi_async_work work);
-#endif  // __wasm32__
 
 // version management
 NAPI_EXTERN napi_status NAPI_CDECL
@@ -214,7 +210,6 @@ napi_close_callback_scope(napi_env env, napi_callback_scope scope);
 
 #if NAPI_VERSION >= 4
 
-#if !defined(EMNAPI_UNMODIFIED_UPSTREAM) || (defined(EMNAPI_UNMODIFIED_UPSTREAM) && !defined(__wasm32__))
 // Calling into JS from other threads
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_threadsafe_function(napi_env env,
@@ -248,7 +243,6 @@ napi_unref_threadsafe_function(napi_env env, napi_threadsafe_function func);
 
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_ref_threadsafe_function(napi_env env, napi_threadsafe_function func);
-#endif  // __wasm32__
 
 #endif  // NAPI_VERSION >= 4
 

package/index.js

@@ -9,7 +9,6 @@ const jsLibrary = path.join(__dirname, './dist/library_napi.js')
 const sources = [
   path.join(__dirname, './src/js_native_api.c'),
   path.join(__dirname, './src/node_api.c'),
-  path.join(__dirname, './src/emnapi.c'),
   path.join(__dirname, './src/async_cleanup_hook.c'),
   path.join(__dirname, './src/async_context.c'),
   path.join(__dirname, './src/async_work.c'),

package/lib/wasm32-emscripten.txt

@@ -1,5 +1,5 @@
-emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.36 (518d9fea335f7cd2b5771e43df76e0535c6df5dd)
-clang version 17.0.0 (https://github.com/llvm/llvm-project 5084abbea933b1a510556726a9e226b5ae22f19f)
+emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.44 (bec42dac7873903d09d713963e34020c22a8bd2d)
+clang version 17.0.0 (https://github.com/llvm/llvm-project a8cbd27d1f238e104a5d5ca345d93bc1f4d4ab1f)
 Target: wasm32-unknown-emscripten
 Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/emsdk-cache/emsdk-main/upstream/bin
+InstalledDir: /home/runner/work/_temp/14a1b1b6-9a98-4bac-8f31-5c9ebda805ed/emsdk-main/upstream/bin

package/lib/wasm32-wasi-threads.txt

@@ -1,4 +1,4 @@
-clang version 16.0.0
+clang version 17.0.6
 Target: wasm32-unknown-wasi-threads
 Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-20.0/bin
+InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-21.0/bin

package/lib/wasm32-wasi.txt

@@ -1,4 +1,4 @@
-clang version 16.0.0
+clang version 17.0.6
 Target: wasm32-unknown-wasi
 Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-20.0/bin
+InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-21.0/bin

package/lib/wasm32.txt

@@ -1,4 +1,4 @@
-clang version 16.0.0
+clang version 17.0.6
 Target: wasm32
 Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-20.0/bin
+InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-21.0/bin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "0.43.1",
+  "version": "0.45.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "peerDependencies": {
@@ -12,7 +12,8 @@
     }
   },
   "scripts": {
-    "build": "node ./script/build.js"
+    "build": "node ./script/build.js",
+    "version": "node ./script/version.js"
   },
   "repository": {
     "type": "git",

package/src/async_context.c

@@ -20,8 +20,7 @@ napi_async_init(napi_env env,
                 napi_value async_resource,
                 napi_value async_resource_name,
                 napi_async_context* result) {
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, async_resource_name);
   CHECK_ARG(env, result);
 
@@ -39,8 +38,7 @@ napi_async_init(napi_env env,
 
 napi_status napi_async_destroy(napi_env env,
                                napi_async_context async_context) {
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, async_context);
 
   napi_status status = _emnapi_async_destroy_js(async_context);

package/src/async_work.c

@@ -148,8 +148,7 @@ napi_status napi_create_async_work(napi_env env,
                                    void* data,
                                    napi_async_work* result) {
 #if EMNAPI_HAVE_THREADS
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, execute);
   CHECK_ARG(env, result);
 
@@ -188,8 +187,7 @@ napi_status napi_create_async_work(napi_env env,
 
 napi_status napi_delete_async_work(napi_env env, napi_async_work work) {
 #if EMNAPI_HAVE_THREADS
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, work);
 
   async_work_delete(work);

package/src/emnapi_internal.h

@@ -52,6 +52,12 @@ EXTERN_C_END
 #define CHECK_ARG(env, arg) \
   RETURN_STATUS_IF_FALSE((env), ((arg) != NULL), napi_invalid_arg)
 
+#define CHECK_ENV_NOT_IN_GC(env)                                               \
+  do {                                                                         \
+    CHECK_ENV((env));                                                          \
+    _emnapi_env_check_gc_access((env));                                          \
+  } while (0)
+
 #define CHECK(expr)                                                           \
   do {                                                                        \
     if (!(expr)) {                                                            \

package/src/js_native_api.c

@@ -1,9 +1,5 @@
 #include "emnapi_internal.h"
 
-#ifdef __EMSCRIPTEN__
-#include <emscripten/heap.h>
-#endif
-
 EXTERN_C_START
 
 static const char* emnapi_error_messages[] = {
@@ -67,34 +63,4 @@ napi_status napi_get_last_error_info(
   return napi_ok;
 }
 
-#define PAGESIZE 65536
-
-napi_status napi_adjust_external_memory(napi_env env,
-                                        int64_t change_in_bytes,
-                                        int64_t* adjusted_value) {
-  CHECK_ENV(env);
-  CHECK_ARG(env, adjusted_value);
-
-  if (change_in_bytes < 0) {
-    return napi_set_last_error(env, napi_invalid_arg, 0, NULL);
-  }
-
-  size_t old_size = __builtin_wasm_memory_size(0) << 16;
-  size_t new_size = old_size + (size_t) change_in_bytes;
-#ifdef __EMSCRIPTEN__
-  if (!emscripten_resize_heap(new_size)) {
-    return napi_set_last_error(env, napi_generic_failure, 0, NULL);
-  }
-#else
-  new_size = new_size + (PAGESIZE - new_size % PAGESIZE) % PAGESIZE;
-  if (-1 == __builtin_wasm_memory_grow(0, (new_size - old_size + 65535) >> 16)) {
-    return napi_set_last_error(env, napi_generic_failure, 0, NULL);
-  }
-#endif
-
-  *adjusted_value = (int64_t) (__builtin_wasm_memory_size(0) << 16);
-
-  return napi_clear_last_error(env);
-}
-
 EXTERN_C_END

package/src/threadsafe_function.c

@@ -408,8 +408,7 @@ napi_create_threadsafe_function(napi_env env,
                                 napi_threadsafe_function_call_js call_js_cb,
                                 napi_threadsafe_function* result) {
 #if EMNAPI_HAVE_THREADS
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, async_resource_name);
   RETURN_STATUS_IF_FALSE(env, initial_thread_count > 0, napi_invalid_arg);
   CHECK_ARG(env, result);

package/src/emnapi.c

@@ -1,21 +0,0 @@
-#include "emnapi_internal.h"
-
-EXTERN_C_START
-
-#ifdef __EMSCRIPTEN__
-napi_status
-emnapi_get_emscripten_version(napi_env env,
-                              const emnapi_emscripten_version** version) {
-  CHECK_ENV(env);
-  CHECK_ARG(env, version);
-  static emnapi_emscripten_version emscripten_version = {
-    __EMSCRIPTEN_major__,
-    __EMSCRIPTEN_minor__,
-    __EMSCRIPTEN_tiny__
-  };
-  *version = &emscripten_version;
-  return napi_clear_last_error(env);
-}
-#endif
-
-EXTERN_C_END