Nested objects work for generated structs now

John Haley · tbranyen · commit b2c19f7f8b1c · 2014-10-23T10:47:33.000-04:00
diff --git a/generate/partials/field_accessors.cc b/generate/partials/field_accessors.cc
@@ -26,7 +26,8 @@ NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) {
   {{ cppClassName }} *wrapper = ObjectWrap::Unwrap<{{ cppClassName }}>(args.This());
 
   {%if field.hasConstructor %}
-  wrapper->{{ field.name }} = value;
+  wrapper->{{ field.name }} = Persistent<Object>::New(value->ToObject());
+  wrapper->raw->{{ field.name }} = *ObjectWrap::Unwrap<{{ field.cppClassName }}>(value->ToObject())->GetValue();
   {%elsif field.cppClassName == 'String' %}
   if (wrapper->GetValue()->{{ field.name }}) {
     //free(wrapper->{{ field.name }});
diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -35,12 +35,19 @@ using namespace std;
   // This is going to cause memory leaks. We'll have to solve that later
   // TODO: Clean up memory better
   free(this->raw);
+
+  {%each fields|fieldsInfo as field %}
+    {%if field.hasConstructor %}
+  {{ field.name }}.Dispose();
+  {{ field.name }}.Clear();
+    {%endif%}
+  {%endeach%}
 }
 
 void {{ cppClassName }}::ConstructFields() {
   {%each fields|fieldsInfo as field %}
     {%if field.hasConstructor %}
-  {{ field.name }} = {{ field.cppClassName }}::New(&this->raw->{{ field.name }});
+  {{ field.name }} = Persistent<Object>::New({{ field.cppClassName }}::New(&this->raw->{{ field.name }})->ToObject());
     {%endif%}
   {%endeach%}
 }
diff --git a/generate/templates/struct_header.h b/generate/templates/struct_header.h
@@ -36,7 +36,7 @@ class {{ cppClassName }} : public ObjectWrap {
     {%each fields as field%}
       {%if not field.ignore%}
         {%if field.hasConstructor %}
-    Handle<Value> {{ field.name }};
+    Persistent<Object> {{ field.name }};
         {%endif%}
     static NAN_GETTER(Get{{ field.cppFunctionName }});
     static NAN_SETTER(Set{{ field.cppFunctionName }});
