Move napi_wrap into ObjectWrap constructor (#67)

Author: Sampson Gao

napi-inl.h

@@ -2274,7 +2274,17 @@ inline PropertyDescriptor::operator const napi_property_descriptor&() const {
 ////////////////////////////////////////////////////////////////////////////////
 
 template <typename T>
-inline ObjectWrap<T>::ObjectWrap() {
+inline ObjectWrap<T>::ObjectWrap(Napi::CallbackInfo callbackInfo) {
+  napi_env env = callbackInfo.Env();
+  napi_value wrapper = callbackInfo.This();
+  napi_status status;
+  napi_ref ref;
+  T* instance = static_cast<T*>(this);
+  status = napi_wrap(env, wrapper, instance, FinalizeCallback, nullptr, &ref);
+  NAPI_THROW_IF_FAILED(env, status)
+
+  Reference<Object>* instanceRef = instance;
+  *instanceRef = Reference<Object>(env, ref);
 }
 
 template<typename T>
@@ -2468,13 +2478,6 @@ inline napi_value ObjectWrap<T>::ConstructorCallbackWrapper(
     return nullptr;
   });
 
-  napi_ref ref;
-  status = napi_wrap(env, wrapper, instance, FinalizeCallback, nullptr, &ref);
-  if (status != napi_ok) return nullptr;
-
-  Reference<Object>* instanceRef = instance;
-  *instanceRef = Reference<Object>(env, ref);
-
   return wrapper;
 }
 

napi.h

@@ -1274,7 +1274,7 @@ namespace Napi {
   template <typename T>
   class ObjectWrap : public Reference<Object> {
   public:
-    ObjectWrap();
+    ObjectWrap(CallbackInfo callbackInfo);
 
     static T* Unwrap(Object wrapper);