Move wrapping logic into JavascriptExternal

Author: spahnke

Source/Noesis.Javascript/JavascriptExternal.cpp

@@ -79,7 +79,7 @@ void GCCallback(const WeakCallbackInfo<JavascriptExternal>& data)
 }
 
 void
-JavascriptExternal::Wrap(Isolate* isolate, Local<Object> object)
+JavascriptExternal::InitializePersistent(Isolate* isolate, Local<Object> object)
 {
     object->SetInternalField(0, External::New(isolate, this));
     mPersistent.Reset(isolate, object);
@@ -88,6 +88,26 @@ JavascriptExternal::Wrap(Isolate* isolate, Local<Object> object)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
+Local<Object>
+JavascriptExternal::ToLocal(Isolate* isolate)
+{
+    if (!mPersistent.IsEmpty())
+        return Local<Object>::New(isolate, mPersistent);
+    
+    auto context = JavascriptContext::GetCurrent();
+
+    EscapableHandleScope scope(isolate);
+
+    Local<FunctionTemplate> templ = context->GetObjectWrapperConstructorTemplate(GetObject()->GetType());
+    Local<ObjectTemplate> instanceTemplate = templ->InstanceTemplate();
+    Local<Object> object = instanceTemplate->NewInstance(isolate->GetCurrentContext()).ToLocalChecked();
+    InitializePersistent(isolate, object);
+
+    return scope.Escape(object);
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 System::Object^
 JavascriptExternal::GetObject()
 {
@@ -376,7 +396,7 @@ void JavascriptExternal::IteratorCallback(const v8::FunctionCallbackInfo<Value>&
 
     auto context = JavascriptContext::GetCurrent();
     auto enumeratorExternal = context->WrapObject(enumerator);
-    enumeratorExternal->Wrap(isolate, iteratorInstance);
+    enumeratorExternal->InitializePersistent(isolate, iteratorInstance);
 
     iArgs.GetReturnValue().Set(iteratorInstance);
 }

Source/Noesis.Javascript/JavascriptExternal.h

@@ -86,7 +86,7 @@ class JavascriptExternal
 
     Local<Function> GetIterator();
 
-    void Wrap(Isolate* isolate, Local<Object> object);
+    Local<Object> ToLocal(Isolate* isolate);
 
 	////////////////////////////////////////////////////////////
 	// Data members
@@ -101,6 +101,8 @@ class JavascriptExternal
 
 	SetParameterOptions mOptions;
 
+    void InitializePersistent(Isolate* isolate, Local<Object> object);
+
     static void IteratorCallback(const v8::FunctionCallbackInfo<Value>& iArgs);
     static void IteratorNextCallback(const v8::FunctionCallbackInfo<Value>& iArgs);
 };

Source/Noesis.Javascript/JavascriptInterop.cpp

@@ -294,19 +294,7 @@ JavascriptInterop::WrapObject(System::Object^ iObject)
     {
         v8::Isolate *isolate = JavascriptContext::GetCurrentIsolate();
         JavascriptExternal *external = context->WrapObject(iObject);
-        if (external->mPersistent.IsEmpty())
-        {
-			Local<FunctionTemplate> templ = context->GetObjectWrapperConstructorTemplate(iObject->GetType());
-			Local<ObjectTemplate> instanceTemplate = templ->InstanceTemplate();
-			Local<Object> object = instanceTemplate->NewInstance(isolate->GetCurrentContext()).ToLocalChecked();
-			external->Wrap(isolate, object);
-
-            return object;
-        }
-        else
-        {
-            return Local<Object>::New(isolate, external->mPersistent);
-        }
+        return external->ToLocal(isolate);
     }
 
 	throw gcnew System::Exception("No context currently active.");