Replace napi_is_construct_call with napi_get_new_target

sampsongao · Aug 21, 2017 · 9338267 · 9338267
1 parent a203738
commit 9338267
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/sass_types/boolean.cpp b/src/sass_types/boolean.cpp
@@ -63,9 +63,10 @@ namespace SassTypes
   }
 
   napi_value Boolean::New(napi_env env, napi_callback_info info) {
-    bool r;
-    CHECK_NAPI_RESULT(napi_is_construct_call(env, info, &r));
+    napi_value new_target;
+    CHECK_NAPI_RESULT(napi_is_construct_call(env, info, &new_target));
 
+    bool r = (new_target != nullptr);
     if (r) {
       if (constructor_locked) {
         CHECK_NAPI_RESULT(napi_throw_type_error(env, nullptr, "Cannot instantiate SassBoolean"));

diff --git a/src/sass_types/null.cpp b/src/sass_types/null.cpp
@@ -55,9 +55,10 @@ namespace SassTypes
   }
 
   napi_value Null::New(napi_env env, napi_callback_info info) {
-    bool r;
-    CHECK_NAPI_RESULT(napi_is_construct_call(env, info, &r));
+    napi_value new_target;
+    CHECK_NAPI_RESULT(napi_is_construct_call(env, info, &new_target));
 
+    bool r = (new_target != nullptr);
     if (r) {
       if (constructor_locked) {
         CHECK_NAPI_RESULT(napi_throw_type_error(env, nullptr, "Cannot instantiate SassNull"));

diff --git a/src/sass_types/sass_value_wrapper.h b/src/sass_types/sass_value_wrapper.h
@@ -261,9 +261,10 @@ namespace SassTypes
     std::vector<napi_value> argv(argc);
     CHECK_NAPI_RESULT(napi_get_cb_info(env, info, &argc, argv.data(), nullptr, nullptr));
 
-    bool r;
-    CHECK_NAPI_RESULT(napi_is_construct_call(env, info, &r));
+    napi_value new_target;
+    CHECK_NAPI_RESULT(napi_is_construct_call(env, info, &new_target));
 
+    bool r = (new_target != nullptr);
     if (r) {
       Sass_Value* value;
       if (T::construct(env, argv, &value) != NULL) {