Add String/Symbol::New with string view unit tests

Author: cacharle

napi-inl.h

@@ -18,11 +18,9 @@
 #if NAPI_HAS_THREADS
 #include <mutex>
 #endif  // NAPI_HAS_THREADS
+#include <string_view>
 #include <type_traits>
 #include <utility>
-#if __cplusplus >= 201703L
-#include <string_view>
-#endif
 
 #if defined(__clang__) || defined(__GNUC__)
 #define NAPI_NO_SANITIZE_VPTR __attribute__((no_sanitize("vptr")))
@@ -1258,11 +1256,9 @@ inline String String::New(napi_env env, const std::u16string& val) {
   return String::New(env, val.c_str(), val.size());
 }
 
-#if __cplusplus >= 201703L
 inline String String::New(napi_env env, std::string_view val) {
   return String::New(env, val.data(), val.size());
 }
-#endif
 
 inline String String::New(napi_env env, const char* val) {
   // TODO(@gabrielschulhof) Remove if-statement when core's error handling is
@@ -1373,12 +1369,10 @@ inline Symbol Symbol::New(napi_env env, const std::string& description) {
   return Symbol::New(env, descriptionValue);
 }
 
-#if __cplusplus >= 201703L
 inline Symbol Symbol::New(napi_env env, std::string_view description) {
   napi_value descriptionValue = String::New(env, description);
   return Symbol::New(env, descriptionValue);
 }
-#endif
 
 inline Symbol Symbol::New(napi_env env, String description) {
   napi_value descriptionValue = description;

napi.h

@@ -18,10 +18,8 @@
 #include <mutex>
 #endif  // NAPI_HAS_THREADS
 #include <string>
-#include <vector>
-#if __cplusplus >= 201703L
 #include <string_view>
-#endif
+#include <vector>
 
 // VS2015 RTM has bugs with constexpr, so require min of VS2015 Update 3 (known
 // good version)
@@ -721,12 +719,10 @@ class String : public Name {
                     const std::u16string& value  ///< UTF-16 encoded C++ string
   );
 
-#if __cplusplus >= 201703L
   /// Creates a new String value from a UTF-8 encoded C++ string view.
   static String New(napi_env env,           ///< Node-API environment
                     std::string_view value  ///< UTF-8 encoded C++ string view
   );
-#endif
 
   /// Creates a new String value from a UTF-8 encoded C string.
   static String New(
@@ -801,14 +797,12 @@ class Symbol : public Name {
           description  ///< UTF-8 encoded C++ string describing the symbol
   );
 
-#if __cplusplus >= 201703L
   /// Creates a new Symbol value with a description.
   static Symbol New(
       napi_env env,  ///< Node-API environment
       std::string_view
           description  ///< UTF-8 encoded C++ string view describing the symbol
   );
-#endif
 
   /// Creates a new Symbol value with a description.
   static Symbol New(napi_env env,       ///< Node-API environment

test/name.cc

@@ -1,5 +1,7 @@
 #include "napi.h"
 
+#include <string_view>
+
 using namespace Napi;
 
 const char* testValueUtf8 = "123456789";
@@ -43,6 +45,10 @@ Value CreateString(const CallbackInfo& info) {
   }
 }
 
+Value CreateStringFromStringView(const CallbackInfo& info) {
+  return String::New(info.Env(), std::string_view("hello1"));
+}
+
 Value CheckString(const CallbackInfo& info) {
   String value = info[0].As<String>();
   String encoding = info[1].As<String>();
@@ -80,6 +86,10 @@ Value CreateSymbol(const CallbackInfo& info) {
   }
 }
 
+Value CreateSymbolFromStringView(const CallbackInfo& info) {
+  return Symbol::New(info.Env(), std::string_view("hello2"));
+}
+
 Value CheckSymbol(const CallbackInfo& info) {
   return Boolean::New(info.Env(), info[0].Type() == napi_symbol);
 }
@@ -99,11 +109,15 @@ Object InitName(Env env) {
 
   exports["echoString"] = Function::New(env, EchoString);
   exports["createString"] = Function::New(env, CreateString);
+  exports["createStringFromStringView"] =
+      Function::New(env, CreateStringFromStringView);
   exports["nullStringShouldThrow"] = Function::New(env, NullStringShouldThrow);
   exports["nullString16ShouldThrow"] =
       Function::New(env, NullString16ShouldThrow);
   exports["checkString"] = Function::New(env, CheckString);
   exports["createSymbol"] = Function::New(env, CreateSymbol);
+  exports["createSymbolFromStringView"] =
+      Function::New(env, CreateSymbolFromStringView);
   exports["checkSymbol"] = Function::New(env, CheckSymbol);
 
   return exports;

test/name.js

@@ -56,4 +56,9 @@ function test (binding) {
     assert.strictEqual(binding.name.echoString(str, 'utf8'), str);
     assert.strictEqual(binding.name.echoString(str, 'utf16'), str);
   }
+
+  assert.strictEqual(binding.name.createStringFromStringView(), 'hello1');
+  const symFromStringView = binding.name.createSymbolFromStringView();
+  assert.strictEqual(typeof symFromStringView, 'symbol');
+  assert.strictEqual(symFromStringView.description, 'hello2');
 }