remove unnecessary defines

Author: KevinEady

napi-inl.h

@@ -35,7 +35,7 @@ namespace details {
 constexpr int napi_no_external_buffers_allowed = 22;
 
 template <typename FreeType>
-inline void default_finalizer(NODE_ADDON_API_NOGC_ENV /*env*/,
+inline void default_finalizer(node_api_nogc_env /*env*/,
                               void* data,
                               void* /*hint*/) {
   delete static_cast<FreeType*>(data);
@@ -46,7 +46,7 @@ inline void default_finalizer(NODE_ADDON_API_NOGC_ENV /*env*/,
 // TODO: Replace this code with `napi_add_finalizer()` whenever it becomes
 // available on all supported versions of Node.js.
 template <typename FreeType,
-          NODE_ADDON_API_NOGC_FINALIZER finalizer = default_finalizer<FreeType>>
+          node_api_nogc_finalize finalizer = default_finalizer<FreeType>>
 inline napi_status AttachData(napi_env env,
                               napi_value obj,
                               FreeType* data,
@@ -195,7 +195,7 @@ struct FinalizeData {
             typename =
                 std::enable_if_t<std::is_invocable_v<F, node_api_nogc_env, T*>>>
 #endif
-  static inline void Wrapper(NODE_ADDON_API_NOGC_ENV env,
+  static inline void Wrapper(node_api_nogc_env env,
                              void* data,
                              void* finalizeHint) NAPI_NOEXCEPT {
     WrapVoidCallback([&] {
@@ -210,13 +210,13 @@ struct FinalizeData {
             typename = std::enable_if_t<
                 !std::is_invocable_v<F, node_api_nogc_env, T*>>,
             typename = void>
-  static inline void Wrapper(NODE_ADDON_API_NOGC_ENV env,
+  static inline void Wrapper(node_api_nogc_env env,
                              void* data,
                              void* finalizeHint) NAPI_NOEXCEPT {
     napi_status status =
         node_api_post_finalizer(env, WrapperGC, data, finalizeHint);
     NAPI_FATAL_IF_FAILED(
-        status, "PostFinalizerWrapper", "node_api_post_finalizer failed");
+        status, "FinalizeData::Wrapper", "node_api_post_finalizer failed");
   }
 #endif
 
@@ -225,7 +225,7 @@ struct FinalizeData {
             typename = std::enable_if_t<
                 std::is_invocable_v<F, node_api_nogc_env, T*, Hint*>>>
 #endif
-  static inline void WrapperWithHint(NODE_ADDON_API_NOGC_ENV env,
+  static inline void WrapperWithHint(node_api_nogc_env env,
                                      void* data,
                                      void* finalizeHint) NAPI_NOEXCEPT {
     WrapVoidCallback([&] {
@@ -240,13 +240,13 @@ struct FinalizeData {
             typename = std::enable_if_t<
                 !std::is_invocable_v<F, node_api_nogc_env, T*, Hint*>>,
             typename = void>
-  static inline void WrapperWithHint(NODE_ADDON_API_NOGC_ENV env,
+  static inline void WrapperWithHint(node_api_nogc_env env,
                                      void* data,
                                      void* finalizeHint) NAPI_NOEXCEPT {
     napi_status status =
         node_api_post_finalizer(env, WrapperGCWithHint, data, finalizeHint);
     NAPI_FATAL_IF_FAILED(
-        status, "PostFinalizerWrapper", "node_api_post_finalizer failed");
+        status, "FinalizeData::Wrapper", "node_api_post_finalizer failed");
   }
 #endif
 
@@ -566,9 +566,9 @@ inline Maybe<T> Just(const T& t) {
 // NogcEnv / Env class
 ////////////////////////////////////////////////////////////////////////////////
 
-inline NogcEnv::NogcEnv(NODE_ADDON_API_NOGC_ENV env) : _env(env) {}
+inline NogcEnv::NogcEnv(node_api_nogc_env env) : _env(env) {}
 
-inline NogcEnv::operator NODE_ADDON_API_NOGC_ENV() const {
+inline NogcEnv::operator node_api_nogc_env() const {
   return _env;
 }
 
@@ -668,7 +668,7 @@ inline void NogcEnv::SetInstanceData(T* data) const {
 
 template <typename DataType,
           typename HintType,
-          Napi::NogcEnv::FinalizerWithHint<DataType, HintType> fini>
+          Napi::NogcEnv::GcFinalizerWithHint<DataType, HintType> fini>
 inline void NogcEnv::SetInstanceData(DataType* data, HintType* hint) const {
   napi_status status = napi_set_instance_data(
       _env,
@@ -5008,7 +5008,7 @@ inline napi_value ObjectWrap<T>::StaticSetterCallbackWrapper(
 }
 
 template <typename T>
-inline void ObjectWrap<T>::FinalizeCallback(NODE_ADDON_API_NOGC_ENV env,
+inline void ObjectWrap<T>::FinalizeCallback(node_api_nogc_env env,
                                             void* data,
                                             void* /*hint*/) {
   T* instance = static_cast<T*>(data);

napi.h

@@ -300,14 +300,6 @@ template <typename T>
 using MaybeOrValue = T;
 #endif
 
-#if defined(NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER)
-#define NODE_ADDON_API_NOGC_ENV node_api_nogc_env
-#define NODE_ADDON_API_NOGC_FINALIZER node_api_nogc_finalize
-#else
-#define NODE_ADDON_API_NOGC_ENV napi_env
-#define NODE_ADDON_API_NOGC_FINALIZER napi_finalize
-#endif
-
 /// Environment for Node-API values and operations.
 ///
 /// All Node-API values and operations must be associated with an environment.
@@ -323,16 +315,16 @@ using MaybeOrValue = T;
 /// corresponds to an Isolate.
 class NogcEnv {
  protected:
-  NODE_ADDON_API_NOGC_ENV _env;
+  node_api_nogc_env _env;
 #if NAPI_VERSION > 5
   template <typename T>
   static void DefaultGcFini(Env, T* data);
   template <typename DataType, typename HintType>
   static void DefaultGcFiniWithHint(Env, DataType* data, HintType* hint);
 #endif  // NAPI_VERSION > 5
  public:
-  NogcEnv(NODE_ADDON_API_NOGC_ENV env);
-  operator NODE_ADDON_API_NOGC_ENV() const;
+  NogcEnv(node_api_nogc_env env);
+  operator node_api_nogc_env() const;
 
   // Without these operator overloads, the error:
   //
@@ -368,10 +360,10 @@ class NogcEnv {
   void SetInstanceData(T* data) const;
 
   template <typename DataType, typename HintType>
-  using FinalizerWithHint = void (*)(Env, DataType*, HintType*);
+  using GcFinalizerWithHint = void (*)(Env, DataType*, HintType*);
   template <typename DataType,
             typename HintType,
-            FinalizerWithHint<DataType, HintType> fini =
+            GcFinalizerWithHint<DataType, HintType> fini =
                 NogcEnv::DefaultGcFiniWithHint<DataType, HintType>>
   void SetInstanceData(DataType* data, HintType* hint) const;
 #endif  // NAPI_VERSION > 5
@@ -2471,9 +2463,7 @@ class ObjectWrap : public InstanceWrap<T>, public Reference<Object> {
                                                 napi_callback_info info);
   static napi_value StaticSetterCallbackWrapper(napi_env env,
                                                 napi_callback_info info);
-  static void FinalizeCallback(NODE_ADDON_API_NOGC_ENV env,
-                               void* data,
-                               void* hint);
+  static void FinalizeCallback(node_api_nogc_env env, void* data, void* hint);
 
   static void PostFinalizeCallback(napi_env env, void* data, void* hint);