emnapi 0.44.0 → 0.45.0

package/include/emnapi.h

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

package/include/js_native_api.h

@@ -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/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.44.0",
+  "version": "0.45.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "peerDependencies": {

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/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);