emnapi 0.36.3 → 0.38.0

package/include/js_native_api_types.h

@@ -8,7 +8,15 @@
 #include <stdint.h>  // NOLINT(modernize-deprecated-headers)
 
 #if !defined __cplusplus || (defined(_MSC_VER) && _MSC_VER < 1900)
-    typedef uint16_t char16_t;
+typedef uint16_t char16_t;
+#endif
+
+#ifndef NAPI_CDECL
+#ifdef _WIN32
+#define NAPI_CDECL __cdecl
+#else
+#define NAPI_CDECL
+#endif
 #endif
 
 // JSVM API types are all opaque pointers for ABI stability
@@ -101,11 +109,11 @@ typedef enum {
 //   * the definition of `napi_status` in doc/api/n-api.md to reflect the newly
 //     added value(s).
 
-typedef napi_value (*napi_callback)(napi_env env,
-                                    napi_callback_info info);
-typedef void (*napi_finalize)(napi_env env,
-                              void* finalize_data,
-                              void* finalize_hint);
+typedef napi_value(NAPI_CDECL* napi_callback)(napi_env env,
+                                              napi_callback_info info);
+typedef void(NAPI_CDECL* napi_finalize)(napi_env env,
+                                        void* finalize_data,
+                                        void* finalize_hint);
 
 typedef struct {
   // One of utf8name or name should be NULL.

package/include/node_api.h

@@ -1,90 +1,121 @@
 #ifndef SRC_NODE_API_H_
 #define SRC_NODE_API_H_
 
-#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-#include <stdlib.h>
+#ifdef EMNAPI_UNMODIFIED_UPSTREAM
+#ifdef BUILDING_NODE_EXTENSION
+#ifdef _WIN32
+// Building native addon against node
+#define NAPI_EXTERN __declspec(dllimport)
+#elif defined(__wasm32__)
+#define NAPI_EXTERN __attribute__((__import_module__("napi")))
+#endif
+#endif
 #endif
 #include "js_native_api.h"
 #include "node_api_types.h"
 
-struct uv_loop_s;
+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__((used))
+#define NAPI_MODULE_EXPORT __attribute__((visibility("default"))) __attribute__((used))
 #else
 #define NAPI_MODULE_EXPORT __attribute__((visibility("default")))
 #endif
+#endif
+#endif
 
-#define NAPI_NO_RETURN __attribute__((__noreturn__))
+#if defined(__GNUC__)
+#define NAPI_NO_RETURN __attribute__((noreturn))
+#elif defined(_WIN32)
+#define NAPI_NO_RETURN __declspec(noreturn)
+#else
+#define NAPI_NO_RETURN
+#endif
 
-typedef napi_value (*napi_addon_register_func)(napi_env env,
-                                               napi_value exports);
+typedef napi_value(NAPI_CDECL* napi_addon_register_func)(napi_env env,
+                                                         napi_value exports);
 
-#define NAPI_MODULE_VERSION  1
+// Used by deprecated registration method napi_module_register.
+typedef struct napi_module {
+  int nm_version;
+  unsigned int nm_flags;
+  const char* nm_filename;
+  napi_addon_register_func nm_register_func;
+  const char* nm_modname;
+  void* nm_priv;
+  void* reserved[4];
+} napi_module;
+
+#define NAPI_MODULE_VERSION 1
 
 #define NAPI_MODULE_INITIALIZER_X(base, version)                               \
   NAPI_MODULE_INITIALIZER_X_HELPER(base, version)
 #define NAPI_MODULE_INITIALIZER_X_HELPER(base, version) base##version
 
-#define NAPI_WASM_INITIALIZER                                                  \
-  NAPI_MODULE_INITIALIZER_X(napi_register_wasm_v, NAPI_MODULE_VERSION)
-#define NAPI_MODULE(modname, regfunc)                                          \
-  EXTERN_C_START                                                               \
-  NAPI_MODULE_EXPORT napi_value NAPI_WASM_INITIALIZER(napi_env env,            \
-                                                      napi_value exports) {    \
-    return regfunc(env, exports);                                              \
-  }                                                                            \
-  EXTERN_C_END
-
+#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 NAPI_MODULE_INITIALIZER                                                \
+  NAPI_MODULE_INITIALIZER_X(NAPI_MODULE_INITIALIZER_BASE, NAPI_MODULE_VERSION)
 
-#define NAPI_MODULE_INITIALIZER                                       \
-  NAPI_MODULE_INITIALIZER_X(NAPI_MODULE_INITIALIZER_BASE,             \
-      NAPI_MODULE_VERSION)
+#define NAPI_MODULE_INIT()                                                     \
+  EXTERN_C_START                                                               \
+  NAPI_MODULE_EXPORT napi_value NAPI_MODULE_INITIALIZER(napi_env env,          \
+                                                        napi_value exports);   \
+  EXTERN_C_END                                                                 \
+  napi_value NAPI_MODULE_INITIALIZER(napi_env env, napi_value exports)
 
-#define NAPI_MODULE_INIT()                                            \
-  EXTERN_C_START                                                      \
-  NAPI_MODULE_EXPORT napi_value                                       \
-  NAPI_MODULE_INITIALIZER(napi_env env, napi_value exports);          \
-  EXTERN_C_END                                                        \
-  NAPI_MODULE(NODE_GYP_MODULE_NAME, NAPI_MODULE_INITIALIZER)          \
-  napi_value NAPI_MODULE_INITIALIZER(napi_env env,                    \
-                                     napi_value exports)
+#define NAPI_MODULE(modname, regfunc)                                          \
+  NAPI_MODULE_INIT() { return regfunc(env, exports); }
 
+// Deprecated. Use NAPI_MODULE.
+#define NAPI_MODULE_X(modname, regfunc, priv, flags)                           \
+  NAPI_MODULE(modname, regfunc)
 
 EXTERN_C_START
 
-NAPI_EXTERN
-napi_status napi_create_async_work(napi_env env,
-                                   napi_value async_resource,
-                                   napi_value async_resource_name,
-                                   napi_async_execute_callback execute,
-                                   napi_async_complete_callback complete,
-                                   void* data,
-                                   napi_async_work* result);
-NAPI_EXTERN napi_status napi_delete_async_work(napi_env env,
-                                               napi_async_work work);
-NAPI_EXTERN napi_status napi_queue_async_work(napi_env env,
-                                              napi_async_work work);
-NAPI_EXTERN napi_status napi_cancel_async_work(napi_env env,
-                                               napi_async_work work);
-
-NAPI_EXTERN NAPI_NO_RETURN void napi_fatal_error(const char* location,
-                                                 size_t location_len,
-                                                 const char* message,
-                                                 size_t message_len);
+// Deprecated. Replaced by symbol-based registration defined by NAPI_MODULE
+// and NAPI_MODULE_INIT macros.
+#if defined(__cplusplus) && __cplusplus >= 201402L
+[[deprecated]]
+#endif
+NAPI_EXTERN void NAPI_CDECL
+napi_module_register(napi_module* mod);
+
+NAPI_EXTERN NAPI_NO_RETURN void NAPI_CDECL
+napi_fatal_error(const char* location,
+                 size_t location_len,
+                 const char* message,
+                 size_t message_len);
 
 // Methods for custom handling of async operations
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_async_init(napi_env env,
                 napi_value async_resource,
                 napi_value async_resource_name,
                 napi_async_context* result);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_async_destroy(napi_env env, napi_async_context async_context);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_make_callback(napi_env env,
                    napi_async_context async_context,
                    napi_value recv,
@@ -94,14 +125,12 @@ napi_make_callback(napi_env env,
                    napi_value* result);
 
 // Methods to provide node::Buffer functionality with napi types
-NAPI_EXTERN napi_status
-napi_create_buffer(napi_env env,
-                   size_t length,
-                   void** data,
-                   napi_value* result);
-
+NAPI_EXTERN napi_status NAPI_CDECL napi_create_buffer(napi_env env,
+                                                      size_t length,
+                                                      void** data,
+                                                      napi_value* result);
 #ifndef NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_external_buffer(napi_env env,
                             size_t length,
                             void* data,
@@ -109,62 +138,75 @@ napi_create_external_buffer(napi_env env,
                             void* finalize_hint,
                             napi_value* result);
 #endif  // NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
-
-NAPI_EXTERN napi_status
-napi_create_buffer_copy(napi_env env,
-                        size_t length,
-                        const void* data,
-                        void** result_data,
-                        napi_value* result);
-
-NAPI_EXTERN napi_status
-napi_is_buffer(napi_env env,
-               napi_value value,
-               bool* result);
-
-NAPI_EXTERN napi_status
-napi_get_buffer_info(napi_env env,
-                     napi_value value,
-                     void** data,
-                     size_t* length);
-
-NAPI_EXTERN
-napi_status napi_get_node_version(napi_env env,
-                                  const napi_node_version** version);
+NAPI_EXTERN napi_status NAPI_CDECL napi_create_buffer_copy(napi_env env,
+                                                           size_t length,
+                                                           const void* data,
+                                                           void** result_data,
+                                                           napi_value* result);
+NAPI_EXTERN napi_status NAPI_CDECL napi_is_buffer(napi_env env,
+                                                  napi_value value,
+                                                  bool* result);
+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,
+                       napi_value async_resource,
+                       napi_value async_resource_name,
+                       napi_async_execute_callback execute,
+                       napi_async_complete_callback complete,
+                       void* data,
+                       napi_async_work* result);
+NAPI_EXTERN napi_status NAPI_CDECL napi_delete_async_work(napi_env env,
+                                                          napi_async_work work);
+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
+napi_get_node_version(napi_env env, const napi_node_version** version);
 
 #if NAPI_VERSION >= 2
 
-NAPI_EXTERN napi_status napi_get_uv_event_loop(napi_env env,
-                                               struct uv_loop_s** loop);
+// Return the current libuv event loop for a given environment
+NAPI_EXTERN napi_status NAPI_CDECL
+napi_get_uv_event_loop(napi_env env, struct uv_loop_s** loop);
 
 #endif  // NAPI_VERSION >= 2
 
 #if NAPI_VERSION >= 3
 
-NAPI_EXTERN napi_status napi_fatal_exception(napi_env env,
-                                             napi_value err);
+NAPI_EXTERN napi_status NAPI_CDECL napi_fatal_exception(napi_env env,
+                                                        napi_value err);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_add_env_cleanup_hook(napi_env env, napi_cleanup_hook fun, void* arg);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_remove_env_cleanup_hook(napi_env env, napi_cleanup_hook fun, void* arg);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_open_callback_scope(napi_env env,
                          napi_value resource_object,
                          napi_async_context context,
                          napi_callback_scope* result);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_close_callback_scope(napi_env env, napi_callback_scope scope);
 
 #endif  // NAPI_VERSION >= 3
 
 #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_EXTERN napi_status NAPI_CDECL
 napi_create_threadsafe_function(napi_env env,
                                 napi_value func,
                                 napi_value async_resource,
@@ -177,50 +219,49 @@ napi_create_threadsafe_function(napi_env env,
                                 napi_threadsafe_function_call_js call_js_cb,
                                 napi_threadsafe_function* result);
 
-NAPI_EXTERN napi_status
-napi_get_threadsafe_function_context(napi_threadsafe_function func,
-                                     void** result);
+NAPI_EXTERN napi_status NAPI_CDECL napi_get_threadsafe_function_context(
+    napi_threadsafe_function func, void** result);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_call_threadsafe_function(napi_threadsafe_function func,
                               void* data,
                               napi_threadsafe_function_call_mode is_blocking);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_acquire_threadsafe_function(napi_threadsafe_function func);
 
-NAPI_EXTERN napi_status
-napi_release_threadsafe_function(napi_threadsafe_function func,
-                                 napi_threadsafe_function_release_mode mode);
+NAPI_EXTERN napi_status NAPI_CDECL napi_release_threadsafe_function(
+    napi_threadsafe_function func, napi_threadsafe_function_release_mode mode);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_unref_threadsafe_function(napi_env env, napi_threadsafe_function func);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_ref_threadsafe_function(napi_env env, napi_threadsafe_function func);
+#endif  // __wasm32__
 
-#endif
+#endif  // NAPI_VERSION >= 4
 
 #if NAPI_VERSION >= 8
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_add_async_cleanup_hook(napi_env env,
                             napi_async_cleanup_hook hook,
                             void* arg,
                             napi_async_cleanup_hook_handle* remove_handle);
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 napi_remove_async_cleanup_hook(napi_async_cleanup_hook_handle remove_handle);
 
 #endif  // NAPI_VERSION >= 8
 
 #ifdef NAPI_EXPERIMENTAL
 
-NAPI_EXTERN napi_status
+NAPI_EXTERN napi_status NAPI_CDECL
 node_api_get_module_file_name(napi_env env, const char** result);
 
 #endif  // NAPI_EXPERIMENTAL
 
 EXTERN_C_END
 
-#endif
+#endif  // SRC_NODE_API_H_

package/include/node_api_types.h

@@ -8,7 +8,7 @@ typedef struct napi_async_context__* napi_async_context;
 typedef struct napi_async_work__* napi_async_work;
 
 #if NAPI_VERSION >= 3
-typedef void(*napi_cleanup_hook)(void* arg);
+typedef void(NAPI_CDECL* napi_cleanup_hook)(void* arg);
 #endif  // NAPI_VERSION >= 3
 
 #if NAPI_VERSION >= 4
@@ -27,17 +27,13 @@ typedef enum {
 } napi_threadsafe_function_call_mode;
 #endif  // NAPI_VERSION >= 4
 
-typedef void (*napi_async_execute_callback)(napi_env env,
-                                            void* data);
-typedef void (*napi_async_complete_callback)(napi_env env,
-                                             napi_status status,
-                                             void* data);
-
+typedef void(NAPI_CDECL* napi_async_execute_callback)(napi_env env, void* data);
+typedef void(NAPI_CDECL* napi_async_complete_callback)(napi_env env,
+                                                       napi_status status,
+                                                       void* data);
 #if NAPI_VERSION >= 4
-typedef void (*napi_threadsafe_function_call_js)(napi_env env,
-                                                 napi_value js_callback,
-                                                 void* context,
-                                                 void* data);
+typedef void(NAPI_CDECL* napi_threadsafe_function_call_js)(
+    napi_env env, napi_value js_callback, void* context, void* data);
 #endif  // NAPI_VERSION >= 4
 
 typedef struct {
@@ -49,7 +45,7 @@ typedef struct {
 
 #if NAPI_VERSION >= 8
 typedef struct napi_async_cleanup_hook_handle__* napi_async_cleanup_hook_handle;
-typedef void(*napi_async_cleanup_hook)(
+typedef void(NAPI_CDECL* napi_async_cleanup_hook)(
     napi_async_cleanup_hook_handle handle, void* data);
 #endif  // NAPI_VERSION >= 8
 

package/lib/wasm32-emscripten.txt

@@ -1,5 +1,5 @@
-emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.34 (57b21b8fdcbe3ebb523178b79465254668eab408)
-clang version 17.0.0 (https://github.com/llvm/llvm-project a031f72187ce495b9faa4ccf99b1e901a3872f4b)
+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)
 Target: wasm32-unknown-emscripten
 Thread model: posix
 InstalledDir: /home/runner/work/emnapi/emnapi/emsdk-cache/emsdk-main/upstream/bin

package/package.json

@@ -1,8 +1,16 @@
 {
   "name": "emnapi",
-  "version": "0.36.3",
+  "version": "0.38.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
+  "peerDependencies": {
+    "node-addon-api": ">= 6.1.0"
+  },
+  "peerDependenciesMeta": {
+    "node-addon-api": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "ts-macros": "2.0.1"
   },

package/include/napi-inl.deprecated.h

@@ -1,186 +0,0 @@
-#ifndef SRC_NAPI_INL_DEPRECATED_H_
-#define SRC_NAPI_INL_DEPRECATED_H_
-
-////////////////////////////////////////////////////////////////////////////////
-// PropertyDescriptor class
-////////////////////////////////////////////////////////////////////////////////
-
-template <typename Getter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    const char* utf8name,
-    Getter getter,
-    napi_property_attributes attributes,
-    void* /*data*/) {
-  using CbData = details::CallbackData<Getter, Napi::Value>;
-  // TODO: Delete when the function is destroyed
-  auto callbackData = new CbData({getter, nullptr});
-
-  return PropertyDescriptor({utf8name,
-                             nullptr,
-                             nullptr,
-                             CbData::Wrapper,
-                             nullptr,
-                             nullptr,
-                             attributes,
-                             callbackData});
-}
-
-template <typename Getter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    const std::string& utf8name,
-    Getter getter,
-    napi_property_attributes attributes,
-    void* data) {
-  return Accessor(utf8name.c_str(), getter, attributes, data);
-}
-
-template <typename Getter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    napi_value name,
-    Getter getter,
-    napi_property_attributes attributes,
-    void* /*data*/) {
-  using CbData = details::CallbackData<Getter, Napi::Value>;
-  // TODO: Delete when the function is destroyed
-  auto callbackData = new CbData({getter, nullptr});
-
-  return PropertyDescriptor({nullptr,
-                             name,
-                             nullptr,
-                             CbData::Wrapper,
-                             nullptr,
-                             nullptr,
-                             attributes,
-                             callbackData});
-}
-
-template <typename Getter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    Name name, Getter getter, napi_property_attributes attributes, void* data) {
-  napi_value nameValue = name;
-  return PropertyDescriptor::Accessor(nameValue, getter, attributes, data);
-}
-
-template <typename Getter, typename Setter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    const char* utf8name,
-    Getter getter,
-    Setter setter,
-    napi_property_attributes attributes,
-    void* /*data*/) {
-  using CbData = details::AccessorCallbackData<Getter, Setter>;
-  // TODO: Delete when the function is destroyed
-  auto callbackData = new CbData({getter, setter, nullptr});
-
-  return PropertyDescriptor({utf8name,
-                             nullptr,
-                             nullptr,
-                             CbData::GetterWrapper,
-                             CbData::SetterWrapper,
-                             nullptr,
-                             attributes,
-                             callbackData});
-}
-
-template <typename Getter, typename Setter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    const std::string& utf8name,
-    Getter getter,
-    Setter setter,
-    napi_property_attributes attributes,
-    void* data) {
-  return Accessor(utf8name.c_str(), getter, setter, attributes, data);
-}
-
-template <typename Getter, typename Setter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    napi_value name,
-    Getter getter,
-    Setter setter,
-    napi_property_attributes attributes,
-    void* /*data*/) {
-  using CbData = details::AccessorCallbackData<Getter, Setter>;
-  // TODO: Delete when the function is destroyed
-  auto callbackData = new CbData({getter, setter, nullptr});
-
-  return PropertyDescriptor({nullptr,
-                             name,
-                             nullptr,
-                             CbData::GetterWrapper,
-                             CbData::SetterWrapper,
-                             nullptr,
-                             attributes,
-                             callbackData});
-}
-
-template <typename Getter, typename Setter>
-inline PropertyDescriptor PropertyDescriptor::Accessor(
-    Name name,
-    Getter getter,
-    Setter setter,
-    napi_property_attributes attributes,
-    void* data) {
-  napi_value nameValue = name;
-  return PropertyDescriptor::Accessor(
-      nameValue, getter, setter, attributes, data);
-}
-
-template <typename Callable>
-inline PropertyDescriptor PropertyDescriptor::Function(
-    const char* utf8name,
-    Callable cb,
-    napi_property_attributes attributes,
-    void* /*data*/) {
-  using ReturnType = decltype(cb(CallbackInfo(nullptr, nullptr)));
-  using CbData = details::CallbackData<Callable, ReturnType>;
-  // TODO: Delete when the function is destroyed
-  auto callbackData = new CbData({cb, nullptr});
-
-  return PropertyDescriptor({utf8name,
-                             nullptr,
-                             CbData::Wrapper,
-                             nullptr,
-                             nullptr,
-                             nullptr,
-                             attributes,
-                             callbackData});
-}
-
-template <typename Callable>
-inline PropertyDescriptor PropertyDescriptor::Function(
-    const std::string& utf8name,
-    Callable cb,
-    napi_property_attributes attributes,
-    void* data) {
-  return Function(utf8name.c_str(), cb, attributes, data);
-}
-
-template <typename Callable>
-inline PropertyDescriptor PropertyDescriptor::Function(
-    napi_value name,
-    Callable cb,
-    napi_property_attributes attributes,
-    void* /*data*/) {
-  using ReturnType = decltype(cb(CallbackInfo(nullptr, nullptr)));
-  using CbData = details::CallbackData<Callable, ReturnType>;
-  // TODO: Delete when the function is destroyed
-  auto callbackData = new CbData({cb, nullptr});
-
-  return PropertyDescriptor({nullptr,
-                             name,
-                             CbData::Wrapper,
-                             nullptr,
-                             nullptr,
-                             nullptr,
-                             attributes,
-                             callbackData});
-}
-
-template <typename Callable>
-inline PropertyDescriptor PropertyDescriptor::Function(
-    Name name, Callable cb, napi_property_attributes attributes, void* data) {
-  napi_value nameValue = name;
-  return PropertyDescriptor::Function(nameValue, cb, attributes, data);
-}
-
-#endif  // !SRC_NAPI_INL_DEPRECATED_H_