use node_api prefix instead of napi for new code

Author: vmoroz

src/api/environment.cc

@@ -885,7 +885,7 @@ void AddLinkedBinding(Environment* env,
             module,
             context,
             reinterpret_cast<napi_addon_register_func>(priv),
-            NAPI_DEFAULT_MODULE_API_VERSION);
+            NODE_API_DEFAULT_MODULE_API_VERSION);
       },
       name,
       reinterpret_cast<void*>(fn),

src/js_native_api_v8.h

@@ -57,7 +57,7 @@ struct napi_env__ {
         context_persistent(isolate, context),
         module_api_version(module_api_version != 0
                                ? module_api_version
-                               : NAPI_DEFAULT_MODULE_API_VERSION) {
+                               : NODE_API_DEFAULT_MODULE_API_VERSION) {
     napi_clear_last_error(this);
   }
 
@@ -153,7 +153,7 @@ struct napi_env__ {
   int open_callback_scopes = 0;
   int refs = 1;
   void* instance_data = nullptr;
-  int32_t module_api_version = NAPI_DEFAULT_MODULE_API_VERSION;
+  int32_t module_api_version = NODE_API_DEFAULT_MODULE_API_VERSION;
 
  protected:
   // Should not be deleted directly. Delete with `napi_env__::DeleteMe()`

src/node_api.cc

@@ -630,7 +630,7 @@ static void napi_module_register_cb(v8::Local<v8::Object> exports,
                                  module,
                                  context,
                                  napi_mod->nm_register_func,
-                                 NAPI_DEFAULT_MODULE_API_VERSION);
+                                 NODE_API_DEFAULT_MODULE_API_VERSION);
 }
 
 void napi_module_register_by_symbol(v8::Local<v8::Object> exports,

src/node_api.h

@@ -30,7 +30,7 @@ struct uv_loop_s;  // Forward declaration.
 
 typedef napi_value(NAPI_CDECL* napi_addon_register_func)(napi_env env,
                                                          napi_value exports);
-typedef int32_t(NAPI_CDECL* napi_addon_get_api_version_func)();
+typedef int32_t(NAPI_CDECL* node_api_addon_get_api_version_func)();
 
 // Used by deprecated registration method napi_module_register.
 typedef struct napi_module {
@@ -55,18 +55,18 @@ typedef struct napi_module {
 #define NAPI_MODULE_INITIALIZER_BASE napi_register_module_v
 #endif
 
-#define NAPI_MODULE_GET_API_VERSION_BASE napi_module_get_api_version_v
+#define NODE_API_MODULE_GET_API_VERSION_BASE node_api_module_get_api_version_v
 
 #define NAPI_MODULE_INITIALIZER                                                \
   NAPI_MODULE_INITIALIZER_X(NAPI_MODULE_INITIALIZER_BASE, NAPI_MODULE_VERSION)
 
-#define NAPI_MODULE_GET_API_VERSION                                            \
-  NAPI_MODULE_INITIALIZER_X(NAPI_MODULE_GET_API_VERSION_BASE,                  \
+#define NODE_API_MODULE_GET_API_VERSION                                        \
+  NAPI_MODULE_INITIALIZER_X(NODE_API_MODULE_GET_API_VERSION_BASE,              \
                             NAPI_MODULE_VERSION)
 
 #define NAPI_MODULE_INIT()                                                     \
   EXTERN_C_START                                                               \
-  NAPI_MODULE_EXPORT int32_t NAPI_MODULE_GET_API_VERSION() {                   \
+  NAPI_MODULE_EXPORT int32_t NODE_API_MODULE_GET_API_VERSION() {               \
     return NAPI_VERSION;                                                       \
   }                                                                            \
   NAPI_MODULE_EXPORT napi_value NAPI_MODULE_INITIALIZER(napi_env env,          \

src/node_binding.cc

@@ -408,10 +408,10 @@ inline napi_addon_register_func GetNapiInitializerCallback(DLib* dlib) {
       dlib->GetSymbolAddress(name));
 }
 
-inline napi_addon_get_api_version_func GetNapiAddonGetApiVersionCallback(
+inline node_api_addon_get_api_version_func GetNapiAddonGetApiVersionCallback(
     DLib* dlib) {
-  return reinterpret_cast<napi_addon_get_api_version_func>(
-      dlib->GetSymbolAddress(STRINGIFY(NAPI_MODULE_GET_API_VERSION)));
+  return reinterpret_cast<node_api_addon_get_api_version_func>(
+      dlib->GetSymbolAddress(STRINGIFY(NODE_API_MODULE_GET_API_VERSION)));
 }
 
 // DLOpen is process.dlopen(module, filename, flags).

src/node_version.h

@@ -97,6 +97,6 @@
 
 // The NAPI_VERSION used by default by Node API modules if it is not explicitly
 // specified. It must be always 8.
-#define NAPI_DEFAULT_MODULE_API_VERSION 8
+#define NODE_API_DEFAULT_MODULE_API_VERSION 8
 
 #endif  // SRC_NODE_VERSION_H_