@auto_js/napi_exports 0.0.6 → 0.0.8

package/CMakeLists.txt

@@ -4,8 +4,11 @@ target_compile_features(nodejs PUBLIC cxx_std_23)
 # Set `NAPI_VERSION` macro
 if(NOT DEFINED NAPI_VERSION)
 	message(FATAL_ERROR "Missing 'NAPI_VERSION' cmake variable.")
+elseif(NAPI_VERSION STREQUAL EXPERIMENTAL)
+	target_compile_definitions(nodejs PUBLIC NAPI_EXPERIMENTAL)
+else()
+	target_compile_definitions(nodejs PUBLIC NAPI_VERSION=${NAPI_VERSION})
 endif()
-target_compile_definitions(nodejs PUBLIC NAPI_VERSION=${NAPI_VERSION})
 
 # Architecture, for window linkage
 string(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} NODE_ARCH)
@@ -49,6 +52,7 @@ endif()
 message(STATUS "Using Node.js headers from '${NODE_DIST_DIR}'")
 
 # Configuration
+target_include_directories(nodejs SYSTEM PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
 target_include_directories(nodejs SYSTEM PUBLIC "${NODE_DIST_DIR}/include/node")
 if(WIN32)
 	if(EXISTS "${NODE_DIST_DIR}/win-${NODE_ARCH}/node.lib")
@@ -65,6 +69,7 @@ target_sources(nodejs
 	PUBLIC FILE_SET CXX_MODULES FILES
 		js_native_api_types.cc
 		js_native_api.cc
+		node_api_types.cc
 		node_api.cc
 		nodejs.cc
 		uv.cc

package/js_native_api.cc

@@ -1,5 +1,5 @@
 module;
-#include "version.h"
+#include "napi_js/extern.h"
 // https://nodejs.org/api/n-api.html
 #include <js_native_api.h>
 export module nodejs:js_native_api;
@@ -48,6 +48,7 @@ export using ::napi_get_cb_info;
 export using ::napi_get_dataview_info;
 export using ::napi_get_date_value;
 export using ::napi_get_element;
+export using ::napi_get_global;
 export using ::napi_get_instance_data;
 export using ::napi_get_null;
 export using ::napi_get_property_names;
@@ -92,10 +93,12 @@ export using ::napi_type_tag_object;
 export using ::napi_typeof;
 export using ::napi_unwrap;
 export using ::napi_wrap;
+export using ::node_api_create_external_sharedarraybuffer;
 export using ::node_api_create_property_key_latin1;
 export using ::node_api_create_property_key_utf16;
 export using ::node_api_create_property_key_utf8;
 export using ::node_api_create_syntax_error;
+export using ::node_api_is_sharedarraybuffer;
 export using ::node_api_throw_syntax_error;
 
 // NOLINTEND(misc-unused-using-decls)

package/js_native_api_types.cc

@@ -1,5 +1,5 @@
 module;
-#include "version.h"
+#include "napi_js/version.h"
 #include <js_native_api_types.h>
 export module nodejs:js_native_api_types;
 // NOLINTBEGIN(misc-unused-using-decls)
@@ -20,7 +20,6 @@ export using ::napi_finalize;
 export using ::napi_property_descriptor;
 export using ::napi_type_tag;
 export using ::node_api_basic_finalize;
-export using ::node_api_nogc_finalize;
 
 // napi_key_collection_mode
 export using ::napi_key_collection_mode;

package/napi_js/extern.h

@@ -0,0 +1,10 @@
+#if __linux__
+#define NAPI_EXTERN __attribute__((weak))
+#elif __APPLE__
+#define NAPI_EXTERN __attribute__((weak))
+#elif _WIN64
+#define NAPI_EXTERN __declspec(dllimport) __attribute__((weak))
+#else
+#define NAPI_EXTERN
+#endif
+#define UV_EXTERN NAPI_EXTERN

package/{version.h → napi_js/version.h}

@@ -1,10 +1,14 @@
 #include "node_version.h"
+#ifdef NAPI_VERSION
 static_assert(NAPI_VERSION <= NODE_API_SUPPORTED_VERSION_MAX, "NAPI version mismatch");
+#endif
 
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define NODE_EQ_VERSION_AT_LEAST(major, minor, patch)                 \
 	(((major) == NODE_MAJOR_VERSION && (minor) < NODE_MINOR_VERSION) || \
 	 ((major) == NODE_MAJOR_VERSION && (minor) == NODE_MINOR_VERSION && (patch) <= NODE_PATCH_VERSION))
 
+#ifdef NAPI_VERSION
 static_assert(NAPI_VERSION >= 10);
+#endif
 static_assert(NODE_VERSION_AT_LEAST(23, 6, 0) || NODE_EQ_VERSION_AT_LEAST(22, 14, 0));

package/node_api.cc

@@ -1,13 +1,23 @@
 module;
-#include "version.h"
+#include "napi_js/extern.h"
 #include <node_api.h>
 export module nodejs:node_api;
 // NOLINTBEGIN(misc-unused-using-decls)
 
+// functions
+export using ::napi_acquire_threadsafe_function;
 export using ::napi_add_async_cleanup_hook;
 export using ::napi_add_env_cleanup_hook;
+export using ::napi_add_env_cleanup_hook;
 export using ::napi_async_cleanup_hook_handle;
+export using ::napi_call_threadsafe_function;
+export using ::napi_create_threadsafe_function;
+export using ::napi_get_threadsafe_function_context;
 export using ::napi_get_uv_event_loop;
+export using ::napi_ref_threadsafe_function;
+export using ::napi_release_threadsafe_function;
 export using ::napi_remove_async_cleanup_hook;
+export using ::napi_threadsafe_function_call_js;
+export using ::napi_unref_threadsafe_function;
 
 // NOLINTEND(misc-unused-using-decls)

package/node_api_types.cc

@@ -0,0 +1,20 @@
+module;
+#include <node_api_types.h>
+export module nodejs:node_api_types;
+// NOLINTBEGIN(misc-unused-using-decls)
+
+export using ::napi_async_cleanup_hook;
+export using ::napi_cleanup_hook;
+export using ::napi_threadsafe_function;
+
+// napi_threadsafe_function_release_mode
+export using ::napi_threadsafe_function_release_mode;
+export using ::napi_tsfn_abort;
+export using ::napi_tsfn_release;
+
+// napi_threadsafe_function_call_mode
+export using ::napi_threadsafe_function_call_mode;
+export using ::napi_tsfn_blocking;
+export using ::napi_tsfn_nonblocking;
+
+// NOLINTEND(misc-unused-using-decls)

package/nodejs.cc

@@ -1,5 +1,6 @@
 export module nodejs;
 export import :js_native_api_types;
 export import :js_native_api;
+export import :node_api_types;
 export import :node_api;
 export import :uv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auto_js/napi_exports",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "C++ module exports for nodejs & n-api",
   "author": "https://github.com/laverdet/",
   "homepage": "https://github.com/laverdet/isolated-vm/tree/experimental/packages/third_party/nodejs",

package/uv.cc

@@ -1,5 +1,5 @@
 module;
-#include "version.h"
+#include "napi_js/version.h"
 #include <uv.h>
 export module nodejs:uv;