From c74c6a5ccf8a9c4b3775c7c8950dd16282f41c39 Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Thu, 5 Sep 2019 09:33:47 -0700
Subject: [PATCH] n-api: mark version 5 N-APIs as stable

PR-URL: https://github.com/nodejs/node/pull/29401
Backport-PR-URL: https://github.com/nodejs/node/pull/29458
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
---
 doc/api/n-api.md                             |  8 -------
 src/node_api.h                               | 22 +++++++++++++-------
 src/node_version.h                           |  2 +-
 test/addons-napi/test_date/test_date.c       |  2 --
 test/addons-napi/test_general/test.js        |  2 +-
 test/addons-napi/test_general/test_general.c |  1 -
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index 69c7969ddb1c14..1596a4274764be 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -1476,8 +1476,6 @@ added: REPLACEME
 napiVersion: 4
 -->
 
-> Stability: 1 - Experimental
-
 ```C
 napi_status napi_create_date(napi_env env,
                              double time,
@@ -2121,8 +2119,6 @@ added: REPLACEME
 napiVersion: 4
 -->
 
-> Stability: 1 - Experimental
-
 ```C
 napi_status napi_get_date_value(napi_env env,
                                 napi_value value,
@@ -2730,8 +2726,6 @@ added: REPLACEME
 napiVersion: 4
 -->
 
-> Stability: 1 - Experimental
-
 ```C
 napi_status napi_is_date(napi_env env, napi_value value, bool* result)
 ```
@@ -3823,8 +3817,6 @@ JavaScript object becomes garbage-collected.
 
 ### napi_add_finalizer
 
-> Stability: 1 - Experimental
-
 <!-- YAML
 added: v8.0.0
 napiVersion: 1
diff --git a/src/node_api.h b/src/node_api.h
index f00e66ac15d712..740e26e5d2b8a3 100644
--- a/src/node_api.h
+++ b/src/node_api.h
@@ -10,7 +10,7 @@
 #define NAPI_VERSION 2147483647
 #else
 // The baseline version for N-API
-#define NAPI_VERSION 4
+#define NAPI_VERSION 5
 #endif
 #endif
 
@@ -674,7 +674,7 @@ napi_ref_threadsafe_function(napi_env env, napi_threadsafe_function func);
 
 #endif  // NAPI_VERSION >= 4
 
-#ifdef NAPI_EXPERIMENTAL
+#if NAPI_VERSION >= 5
 
 // Dates
 NAPI_EXTERN napi_status napi_create_date(napi_env env,
@@ -689,6 +689,18 @@ NAPI_EXTERN napi_status napi_get_date_value(napi_env env,
                                             napi_value value,
                                             double* result);
 
+// Add finalizer for pointer
+NAPI_EXTERN napi_status napi_add_finalizer(napi_env env,
+                                           napi_value js_object,
+                                           void* native_object,
+                                           napi_finalize finalize_cb,
+                                           void* finalize_hint,
+                                           napi_ref* result);
+
+#endif  // NAPI_VERSION >= 5
+
+#ifdef NAPI_EXPERIMENTAL
+
 // BigInt
 NAPI_EXTERN napi_status napi_create_bigint_int64(napi_env env,
                                                  int64_t value,
@@ -714,12 +726,6 @@ NAPI_EXTERN napi_status napi_get_value_bigint_words(napi_env env,
                                                     int* sign_bit,
                                                     size_t* word_count,
                                                     uint64_t* words);
-NAPI_EXTERN napi_status napi_add_finalizer(napi_env env,
-                                           napi_value js_object,
-                                           void* native_object,
-                                           napi_finalize finalize_cb,
-                                           void* finalize_hint,
-                                           napi_ref* result);
 #endif  // NAPI_EXPERIMENTAL
 
 EXTERN_C_END
diff --git a/src/node_version.h b/src/node_version.h
index 94c0c4c1087449..98aa9871cdafab 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -114,6 +114,6 @@
 #define NODE_MODULE_VERSION 64
 
 // the NAPI_VERSION provided by this version of the runtime
-#define NAPI_VERSION  4
+#define NAPI_VERSION  5
 
 #endif  // SRC_NODE_VERSION_H_
diff --git a/test/addons-napi/test_date/test_date.c b/test/addons-napi/test_date/test_date.c
index 8cc1c23affb472..72db9986001c1f 100644
--- a/test/addons-napi/test_date/test_date.c
+++ b/test/addons-napi/test_date/test_date.c
@@ -1,5 +1,3 @@
-#define NAPI_EXPERIMENTAL
-
 #include <node_api.h>
 #include "../common.h"
 
diff --git a/test/addons-napi/test_general/test.js b/test/addons-napi/test_general/test.js
index 04334e050fb9ab..3ed1f5199dd0c6 100644
--- a/test/addons-napi/test_general/test.js
+++ b/test/addons-napi/test_general/test.js
@@ -34,7 +34,7 @@ assert.notStrictEqual(test_general.testGetPrototype(baseObject),
 
 // test version management functions
 // expected version is currently 4
-assert.strictEqual(test_general.testGetVersion(), 4);
+assert.strictEqual(test_general.testGetVersion(), 5);
 
 const [ major, minor, patch, release ] = test_general.testGetNodeVersion();
 assert.strictEqual(process.version.split('-')[0],
diff --git a/test/addons-napi/test_general/test_general.c b/test/addons-napi/test_general/test_general.c
index 498aec4983c0c8..7ffce22505b8ae 100644
--- a/test/addons-napi/test_general/test_general.c
+++ b/test/addons-napi/test_general/test_general.c
@@ -1,4 +1,3 @@
-#define NAPI_EXPERIMENTAL
 #include <node_api.h>
 #include <stdlib.h>
 #include "../common.h"