Updates to make example run/pass

mhdawson · mhdawson · commit c84a42d5413c · 2016-06-21T16:55:59.000-04:00
- Example now runs and returns the same
  value as the nan verion.
- Object lifespan is not yet handled correctly
  as we don't pass in the required contructor.
  This will be the next step along with testing
  to validate things get cleaned up as expected
diff --git a/6_object_wrap/abi/addon.js b/6_object_wrap/abi/addon.js
@@ -1,10 +1,6 @@
 var addon = require('bindings')('addon');
-var util = require('util');
 
 var obj = new addon.MyObject(10);
-
-console.log(obj);
-
 console.log( obj.plusOne() ); // 11
 console.log( obj.plusOne() ); // 12
 console.log( obj.plusOne() ); // 13
diff --git a/6_object_wrap/abi/myobject.cc b/6_object_wrap/abi/myobject.cc
@@ -9,23 +9,7 @@ MyObject::~MyObject() {
 }
 
 void MyObject::Init(node::js::value env, node::js::value exports) {
-/*
-  Nan::HandleScope scope;
-
-  // Prepare constructor template
-  v8::Local<v8::FunctionTemplate> tpl = Nan::New<v8::FunctionTemplate>(New);
-  tpl->SetClassName(Nan::New("MyObject").ToLocalChecked());
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
-
-  // Prototype
-  Nan::SetPrototypeMethod(tpl, "value", GetValue);
-  Nan::SetPrototypeMethod(tpl, "plusOne", PlusOne);
-  Nan::SetPrototypeMethod(tpl, "multiply", Multiply);
-
-  constructor.Reset(tpl->GetFunction());
-  exports->Set(Nan::New("MyObject").ToLocalChecked(), tpl->GetFunction());
-*/
-  node::js::value function = node::js::CreateFunction(env, New);
+  node::js::value function = node::js::CreateConstructorForWrap(env, New);
   node::js::SetFunctionName(env, function, node::js::CreateString(env, "MyObject"));
   node::js::value prototype =
     node::js::GetProperty(env, function, node::js::PropertyName(env, "prototype"));
@@ -64,53 +48,43 @@ void MyObject::New(node::js::value env, node::js::FunctionCallbackInfo info) {
 */
 
   // assumes its a constructor call
-  node::js::value args[1];
-  node::js::GetCallbackArgs(info, args, 1);
-  double value = 0;
-  if (node::js::GetUndefined(env) != args[0]) {
-    value = node::js::GetNumberFromValue(args[0]);
+  if (node::js::IsContructCall(env, info)) {
+    node::js::value args[1];
+    node::js::GetCallbackArgs(info, args, 1);
+    double value = 0;
+    if (node::js::GetUndefined(env) != args[0]) {
+      value = node::js::GetNumberFromValue(args[0]);
+    }
+    MyObject* obj = new MyObject(value);
+    node::js::value jsobj = node::js::GetCallbackObject(env, info);
+    node::js::Wrap(env, jsobj, (void*) obj, nullptr);
+    node::js::SetReturnValue(env, info, jsobj);
+  } else {
+    node::js::value args[1];
+    node::js::GetCallbackArgs(info, args, 1);
+    const int argc = 1;
+    node::js::value argv[argc] = { args[0] };
+    node::js::value cons = node::js::GetPersistentValue(env, constructor);
+    node::js::SetReturnValue(env, info, node::js::NewInstance(env, cons, argc, argv));
   }
-  MyObject* obj = new MyObject(value);
-  node::js::value jsobj = node::js::GetCallbackObject(env, info);
-  node::js::Wrap(env, jsobj, (void*) obj);
-//  node::js::SetReturnValue(env, info, jsobj);
 }
 
 void MyObject::GetValue(node::js::value env, node::js::FunctionCallbackInfo info) {
-/*
-  MyObject* obj = ObjectWrap::Unwrap<MyObject>(info.Holder());
-  info.GetReturnValue().Set(Nan::New(obj->value_));
-*/
   MyObject* obj = (MyObject*) node::js::Unwrap(env, node::js::GetCallbackObject(env, info));
-  node::js::SetReturnValue(env, info, node::js::CreateNumber(env, 0));
+  node::js::SetReturnValue(env, info, node::js::CreateNumber(env, obj->value_));
 }
 
 void MyObject::PlusOne(node::js::value env, node::js::FunctionCallbackInfo info) {
-/*
-  MyObject* obj = ObjectWrap::Unwrap<MyObject>(info.Holder());
-  obj->value_ += 1;
-  info.GetReturnValue().Set(Nan::New(obj->value_));
-*/
   MyObject* obj = (MyObject*) node::js::Unwrap(env, node::js::GetCallbackObject(env, info));
-  node::js::SetReturnValue(env, info, node::js::CreateNumber(env, 0));
+  obj->value_ += 1;
+  node::js::SetReturnValue(env, info, node::js::CreateNumber(env, obj->value_));
 }
 
 void MyObject::Multiply(node::js::value env, node::js::FunctionCallbackInfo info) {
-/*
-  MyObject* obj = ObjectWrap::Unwrap<MyObject>(info.Holder());
-  double multiple = info[0]->IsUndefined() ? 1 : info[0]->NumberValue();
-
-  v8::Local<v8::Function> cons = Nan::New<v8::Function>(constructor);
-
-  const int argc = 1;
-  v8::Local<v8::Value> argv[argc] = { Nan::New(obj->value_ * multiple) };
-
-  info.GetReturnValue().Set(cons->NewInstance(argc, argv));
-*/
   node::js::value args[1];
   node::js::GetCallbackArgs(info, args, 1);
 
-  double multiple = 0;
+  double multiple = 1;
   if (node::js::GetUndefined(env) != args[0]) {
     multiple = node::js::GetNumberFromValue(args[0]);
   }
@@ -119,6 +93,6 @@ void MyObject::Multiply(node::js::value env, node::js::FunctionCallbackInfo info
 
   node::js::value cons = node::js::GetPersistentValue(env, constructor);
   const int argc = 1;
-  node::js::value argv[argc] = { node::js::CreateNumber(env, 1 * multiple) };
+  node::js::value argv[argc] = { node::js::CreateNumber(env, obj->value_ * multiple) };
   node::js::SetReturnValue(env, info, node::js::NewInstance(env, cons, argc, argv));
 }
