fixup!

Author: legendecas

napi-inl.h

@@ -4771,7 +4771,7 @@ inline ClassPropertyDescriptor<T> InstanceWrap<T>::InstanceAccessor(
   napi_property_descriptor desc = napi_property_descriptor();
   desc.utf8name = utf8name;
   desc.getter = details::TemplatedInstanceCallback<T, getter>;
-  desc.setter = This::WrapSetter(This::SetterTag<setter>());
+  desc.setter = setter == nullptr ? nullptr : &This::WrappedMethod<setter>;
   desc.data = data;
   desc.attributes = attributes;
   return desc;
@@ -4785,7 +4785,7 @@ inline ClassPropertyDescriptor<T> InstanceWrap<T>::InstanceAccessor(
   napi_property_descriptor desc = napi_property_descriptor();
   desc.name = name;
   desc.getter = details::TemplatedInstanceCallback<T, getter>;
-  desc.setter = This::WrapSetter(This::SetterTag<setter>());
+  desc.setter = setter == nullptr ? nullptr : &This::WrappedMethod<setter>;
   desc.data = data;
   desc.attributes = attributes;
   return desc;
@@ -5204,7 +5204,7 @@ inline ClassPropertyDescriptor<T> ObjectWrap<T>::StaticAccessor(
   napi_property_descriptor desc = napi_property_descriptor();
   desc.utf8name = utf8name;
   desc.getter = details::TemplatedCallback<getter>;
-  desc.setter = This::WrapStaticSetter(This::StaticSetterTag<setter>());
+  desc.setter = setter == nullptr ? nullptr : &This::WrappedMethod<setter>;
   desc.data = data;
   desc.attributes =
       static_cast<napi_property_attributes>(attributes | napi_static);
@@ -5219,7 +5219,7 @@ inline ClassPropertyDescriptor<T> ObjectWrap<T>::StaticAccessor(
   napi_property_descriptor desc = napi_property_descriptor();
   desc.name = name;
   desc.getter = details::TemplatedCallback<getter>;
-  desc.setter = This::WrapStaticSetter(This::StaticSetterTag<setter>());
+  desc.setter = setter == nullptr ? nullptr : &This::WrappedMethod<setter>;
   desc.data = data;
   desc.attributes =
       static_cast<napi_property_attributes>(attributes | napi_static);

napi.h

@@ -2468,17 +2468,6 @@ class InstanceWrap {
   template <InstanceSetterCallback method>
   static napi_value WrappedMethod(napi_env env,
                                   napi_callback_info info) NAPI_NOEXCEPT;
-
-  template <InstanceSetterCallback setter>
-  struct SetterTag {};
-
-  template <InstanceSetterCallback setter>
-  static napi_callback WrapSetter(SetterTag<setter>) NAPI_NOEXCEPT {
-    return &This::WrappedMethod<setter>;
-  }
-  static napi_callback WrapSetter(SetterTag<nullptr>) NAPI_NOEXCEPT {
-    return nullptr;
-  }
 };
 
 /// Base class to be extended by C++ classes exposed to JavaScript; each C++
@@ -2645,18 +2634,6 @@ class ObjectWrap : public InstanceWrap<T>, public Reference<Object> {
   static napi_value WrappedMethod(napi_env env,
                                   napi_callback_info info) NAPI_NOEXCEPT;
 
-  template <StaticSetterCallback setter>
-  struct StaticSetterTag {};
-
-  template <StaticSetterCallback setter>
-  static napi_callback WrapStaticSetter(StaticSetterTag<setter>) NAPI_NOEXCEPT {
-    return &This::WrappedMethod<setter>;
-  }
-  static napi_callback WrapStaticSetter(StaticSetterTag<nullptr>)
-      NAPI_NOEXCEPT {
-    return nullptr;
-  }
-
   bool _construction_failed = true;
   bool _finalized = false;
 };

package.json

@@ -424,7 +424,7 @@
     "eslint": "^9.13.0",
     "fs-extra": "^11.1.1",
     "neostandard": "^0.12.0",
-    "node-gyp": "^12.4.0",
+    "node-gyp": "^13.0.0",
     "pre-commit": "^1.2.2",
     "semver": "^7.6.0"
   },