Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions generate/templates/manual/clone/clone.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ NAN_METHOD(GitClone::Clone) {
// start convert_from_v8 block
const char *from_url = NULL;

String::Utf8Value url(info[0]->ToString());
Nan::Utf8String url(Nan::To<v8::String>(info[0]).ToLocalChecked());
// malloc with one extra byte so we can add the terminating null character
// C-strings expect:
from_url = (const char *)malloc(url.length() + 1);
Expand All @@ -50,7 +50,7 @@ NAN_METHOD(GitClone::Clone) {
// start convert_from_v8 block
const char *from_local_path = NULL;

String::Utf8Value local_path(info[1]->ToString());
Nan::Utf8String local_path(Nan::To<v8::String>(info[1]).ToLocalChecked());
// malloc with one extra byte so we can add the terminating null character
// C-strings expect:
from_local_path = (const char *)malloc(local_path.length() + 1);
Expand All @@ -67,7 +67,7 @@ NAN_METHOD(GitClone::Clone) {
// start convert_from_v8 block
const git_clone_options *from_options = NULL;
if (info[2]->IsObject()) {
from_options = Nan::ObjectWrap::Unwrap<GitCloneOptions>(info[2]->ToObject())
from_options = Nan::ObjectWrap::Unwrap<GitCloneOptions>(Nan::To<v8::Object>(info[2]).ToLocalChecked())
->GetValue();
} else {
from_options = 0;
Expand All @@ -80,11 +80,11 @@ NAN_METHOD(GitClone::Clone) {
CloneWorker *worker = new CloneWorker(baton, callback);

if (!info[0]->IsUndefined() && !info[0]->IsNull())
worker->SaveToPersistent("url", info[0]->ToObject());
worker->SaveToPersistent("url", Nan::To<v8::Object>(info[0]).ToLocalChecked());
if (!info[1]->IsUndefined() && !info[1]->IsNull())
worker->SaveToPersistent("local_path", info[1]->ToObject());
worker->SaveToPersistent("local_path", Nan::To<v8::Object>(info[1]).ToLocalChecked());
if (!info[2]->IsUndefined() && !info[2]->IsNull())
worker->SaveToPersistent("options", info[2]->ToObject());
worker->SaveToPersistent("options", Nan::To<v8::Object>(info[2]).ToLocalChecked());

AsyncLibgit2QueueWorker(worker);
return;
Expand Down Expand Up @@ -140,9 +140,9 @@ void GitClone::CloneWorker::HandleOKCallback() {
if (baton->error) {
v8::Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
err = Nan::To<v8::Object>(Nan::Error(baton->error->message)).ToLocalChecked();
} else {
err = Nan::Error("Method clone has thrown an error.")->ToObject();
err = Nan::To<v8::Object>(Nan::Error("Method clone has thrown an error.")).ToLocalChecked();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(),
Expand All @@ -168,23 +168,23 @@ void GitClone::CloneWorker::HandleOKCallback() {
continue;
}

v8::Local<v8::Object> nodeObj = node->ToObject();
v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
v8::Local<v8::Value> checkValue = GetPrivate(
nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());

if (!checkValue.IsEmpty() && !checkValue->IsNull() &&
!checkValue->IsUndefined()) {
v8::Local<v8::Value> argv[1] = {checkValue->ToObject()};
v8::Local<v8::Value> argv[1] = {Nan::To<v8::Object>(checkValue).ToLocalChecked()};
callback->Call(1, argv, async_resource);
callbackFired = true;
break;
}

v8::Local<v8::Array> properties = nodeObj->GetPropertyNames();
v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
for (unsigned int propIndex = 0; propIndex < properties->Length();
++propIndex) {
v8::Local<v8::String> propName =
properties->Get(propIndex)->ToString();
Nan::To<v8::String>(properties->Get(propIndex)).ToLocalChecked();
v8::Local<v8::Value> nodeToQueue = nodeObj->Get(propName);
if (!nodeToQueue->IsUndefined()) {
workerArguments.push(nodeToQueue);
Expand All @@ -194,7 +194,7 @@ void GitClone::CloneWorker::HandleOKCallback() {

if (!callbackFired) {
v8::Local<v8::Object> err =
Nan::Error("Method clone has thrown an error.")->ToObject();
Nan::To<v8::Object>(Nan::Error("Method clone has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(),
Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(),
Expand Down
14 changes: 7 additions & 7 deletions generate/templates/manual/commit/extract_signature.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ NAN_METHOD(GitCommit::ExtractSignature)
baton->error = NULL;
baton->signature = GIT_BUF_INIT_CONST(NULL, 0);
baton->signed_data = GIT_BUF_INIT_CONST(NULL, 0);
baton->repo = Nan::ObjectWrap::Unwrap<GitRepository>(info[0]->ToObject())->GetValue();
baton->repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();

// baton->commit_id
if (info[1]->IsString()) {
String::Utf8Value oidString(info[1]->ToString());
Nan::Utf8String oidString(Nan::To<v8::String>(info[1]).ToLocalChecked());
baton->commit_id = (git_oid *)malloc(sizeof(git_oid));
if (git_oid_fromstr(baton->commit_id, (const char *)strdup(*oidString)) != GIT_OK) {
free(baton->commit_id);
Expand All @@ -44,12 +44,12 @@ NAN_METHOD(GitCommit::ExtractSignature)
}
}
} else {
baton->commit_id = Nan::ObjectWrap::Unwrap<GitOid>(info[1]->ToObject())->GetValue();
baton->commit_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[1]).ToLocalChecked())->GetValue();
}

// baton->field
if (info[2]->IsString()) {
String::Utf8Value field(info[2]->ToString());
Nan::Utf8String field(Nan::To<v8::String>(info[2]).ToLocalChecked());
baton->field = (char *)malloc(field.length() + 1);
memcpy((void *)baton->field, *field, field.length());
baton->field[field.length()] = 0;
Expand All @@ -65,8 +65,8 @@ NAN_METHOD(GitCommit::ExtractSignature)
}

ExtractSignatureWorker *worker = new ExtractSignatureWorker(baton, callback);
worker->SaveToPersistent("repo", info[0]->ToObject());
worker->SaveToPersistent("commit_id", info[1]->ToObject());
worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
worker->SaveToPersistent("commit_id", Nan::To<v8::Object>(info[1]).ToLocalChecked());
Nan::AsyncQueueWorker(worker);
return;
}
Expand Down Expand Up @@ -132,7 +132,7 @@ void GitCommit::ExtractSignatureWorker::HandleOKCallback()
}
else if (baton->error_code < 0)
{
Local<v8::Object> err = Nan::Error("Extract Signature has thrown an error.")->ToObject();
Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error("Extract Signature has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(), Nan::New("Commit.extractSignature").ToLocalChecked());
Local<v8::Value> argv[1] = {
Expand Down
40 changes: 20 additions & 20 deletions generate/templates/manual/filter_list/load.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ NAN_METHOD(GitFilterList::Load) {
// start convert_from_v8 block
git_repository *from_repo = NULL;
from_repo =
Nan::ObjectWrap::Unwrap<GitRepository>(info[0]->ToObject())->GetValue();
Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
// end convert_from_v8 block
baton->repo = from_repo;
// start convert_from_v8 block
git_blob *from_blob = NULL;
if (info[1]->IsObject()) {
from_blob =
Nan::ObjectWrap::Unwrap<GitBlob>(info[1]->ToObject())->GetValue();
Nan::ObjectWrap::Unwrap<GitBlob>(Nan::To<v8::Object>(info[1]).ToLocalChecked())->GetValue();
} else {
from_blob = 0;
}
Expand All @@ -63,7 +63,7 @@ NAN_METHOD(GitFilterList::Load) {
// start convert_from_v8 block
const char *from_path = NULL;

String::Utf8Value path(info[2]->ToString());
Nan::Utf8String path(Nan::To<v8::String>(info[2]).ToLocalChecked());
// malloc with one extra byte so we can add the terminating null character
// C-strings expect:
from_path = (const char *)malloc(path.length() + 1);
Expand Down Expand Up @@ -93,15 +93,15 @@ NAN_METHOD(GitFilterList::Load) {
LoadWorker *worker = new LoadWorker(baton, callback);

if (!info[0]->IsUndefined() && !info[0]->IsNull())
worker->SaveToPersistent("repo", info[0]->ToObject());
worker->SaveToPersistent("repo", Nan::To<v8::Object>(info[0]).ToLocalChecked());
if (!info[1]->IsUndefined() && !info[1]->IsNull())
worker->SaveToPersistent("blob", info[1]->ToObject());
worker->SaveToPersistent("blob", Nan::To<v8::Object>(info[1]).ToLocalChecked());
if (!info[2]->IsUndefined() && !info[2]->IsNull())
worker->SaveToPersistent("path", info[2]->ToObject());
worker->SaveToPersistent("path", Nan::To<v8::Object>(info[2]).ToLocalChecked());
if (!info[3]->IsUndefined() && !info[3]->IsNull())
worker->SaveToPersistent("mode", info[3]->ToObject());
worker->SaveToPersistent("mode", Nan::To<v8::Object>(info[3]).ToLocalChecked());
if (!info[4]->IsUndefined() && !info[4]->IsNull())
worker->SaveToPersistent("flags", info[4]->ToObject());
worker->SaveToPersistent("flags", Nan::To<v8::Object>(info[4]).ToLocalChecked());

AsyncLibgit2QueueWorker(worker);
return;
Expand Down Expand Up @@ -134,17 +134,17 @@ void GitFilterList::LoadWorker::HandleOKCallback() {
// GitFilterList baton->filters
v8::Local<v8::Array> owners = Nan::New<Array>(0);
v8::Local<v8::Object> filterRegistry = Nan::New(GitFilterRegistry::persistentHandle);
v8::Local<v8::Array> propertyNames = filterRegistry->GetPropertyNames();
v8::Local<v8::Array> propertyNames = Nan::GetPropertyNames(filterRegistry).ToLocalChecked();

Nan::Set(
owners,
Nan::New<Number>(0),
this->GetFromPersistent("repo")->ToObject()
Nan::To<v8::Object>(this->GetFromPersistent("repo")).ToLocalChecked()
);

for (uint32_t index = 0; index < propertyNames->Length(); ++index) {
v8::Local<v8::String> propertyName = propertyNames->Get(index)->ToString();
String::Utf8Value propertyNameAsUtf8Value(propertyName);
v8::Local<v8::String> propertyName = Nan::To<v8::String>(propertyNames->Get(index)).ToLocalChecked();
Nan::Utf8String propertyNameAsUtf8Value(propertyName);
const char *propertyNameAsCString = *propertyNameAsUtf8Value;

bool isNotMethodOnRegistry = strcmp("register", propertyNameAsCString)
Expand All @@ -158,7 +158,7 @@ void GitFilterList::LoadWorker::HandleOKCallback() {
}
}

to = GitFilterList::New(baton->filters, true, owners->ToObject());
to = GitFilterList::New(baton->filters, true, Nan::To<v8::Object>(owners).ToLocalChecked());
} else {
to = Nan::Null();
}
Expand All @@ -172,9 +172,9 @@ void GitFilterList::LoadWorker::HandleOKCallback() {
if (baton->error) {
v8::Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
err = Nan::To<v8::Object>(Nan::Error(baton->error->message)).ToLocalChecked();
} else {
err = Nan::Error("Method load has thrown an error.")->ToObject();
err = Nan::To<v8::Object>(Nan::Error("Method load has thrown an error.")).ToLocalChecked();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(),
Expand Down Expand Up @@ -202,23 +202,23 @@ void GitFilterList::LoadWorker::HandleOKCallback() {
continue;
}

v8::Local<v8::Object> nodeObj = node->ToObject();
v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
v8::Local<v8::Value> checkValue = GetPrivate(
nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());

if (!checkValue.IsEmpty() && !checkValue->IsNull() &&
!checkValue->IsUndefined()) {
v8::Local<v8::Value> argv[1] = {checkValue->ToObject()};
v8::Local<v8::Value> argv[1] = {Nan::To<v8::Object>(checkValue).ToLocalChecked()};
callback->Call(1, argv, async_resource);
callbackFired = true;
break;
}

v8::Local<v8::Array> properties = nodeObj->GetPropertyNames();
v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
for (unsigned int propIndex = 0; propIndex < properties->Length();
++propIndex) {
v8::Local<v8::String> propName =
properties->Get(propIndex)->ToString();
Nan::To<v8::String>(properties->Get(propIndex)).ToLocalChecked();
v8::Local<v8::Value> nodeToQueue = nodeObj->Get(propName);
if (!nodeToQueue->IsUndefined()) {
workerArguments.push(nodeToQueue);
Expand All @@ -228,7 +228,7 @@ void GitFilterList::LoadWorker::HandleOKCallback() {

if (!callbackFired) {
v8::Local<v8::Object> err =
Nan::Error("Method load has thrown an error.")->ToObject();
Nan::To<v8::Object>(Nan::Error("Method load has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(),
Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(),
Expand Down
6 changes: 3 additions & 3 deletions generate/templates/manual/filter_source/repo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ void GitFilterSource::RepoWorker::HandleOKCallback() {
if (baton->error) {
v8::Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
err = Nan::To<v8::Object>(Nan::Error(baton->error->message)).ToLocalChecked();
} else {
err = Nan::Error("Method repo has thrown an error.")->ToObject();
err = Nan::To<v8::Object>(Nan::Error("Method repo has thrown an error.")).ToLocalChecked();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(),
Expand All @@ -74,7 +74,7 @@ void GitFilterSource::RepoWorker::HandleOKCallback() {
free((void *)baton->error);
} else if (baton->error_code < 0) {
v8::Local<v8::Object> err =
Nan::Error("Method repo has thrown an error.")->ToObject();
Nan::To<v8::Object>(Nan::Error("Method repo has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(),
Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(),
Expand Down
8 changes: 4 additions & 4 deletions generate/templates/manual/patches/convenient_patches.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ NAN_METHOD(GitPatch::ConvenientFromDiff) {
baton->error_code = GIT_OK;
baton->error = NULL;

baton->diff = Nan::ObjectWrap::Unwrap<GitDiff>(info[0]->ToObject())->GetValue();
baton->diff = Nan::ObjectWrap::Unwrap<GitDiff>(Nan::To<v8::Object>(info[0]).ToLocalChecked())->GetValue();
baton->out = new std::vector<PatchData *>;
baton->out->reserve(git_diff_num_deltas(baton->diff));

Expand Down Expand Up @@ -97,9 +97,9 @@ void GitPatch::ConvenientFromDiffWorker::HandleOKCallback() {
if (baton->error) {
Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
err = Nan::To<v8::Object>(Nan::Error(baton->error->message)).ToLocalChecked();
} else {
err = Nan::Error("Method convenientFromDiff has thrown an error.")->ToObject();
err = Nan::To<v8::Object>(Nan::Error("Method convenientFromDiff has thrown an error.")).ToLocalChecked();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(), Nan::New("Patch.convenientFromDiff").ToLocalChecked());
Expand All @@ -118,7 +118,7 @@ void GitPatch::ConvenientFromDiffWorker::HandleOKCallback() {
}

if (baton->error_code < 0) {
Local<v8::Object> err = Nan::Error("method convenientFromDiff has thrown an error.")->ToObject();
Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error("method convenientFromDiff has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(), Nan::New("Patch.convenientFromDiff").ToLocalChecked());
Local<v8::Value> argv[1] = {
Expand Down
2 changes: 1 addition & 1 deletion generate/templates/manual/remote/ls.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void GitRemote::ReferenceListWorker::HandleOKCallback()
}
else if (baton->error_code < 0)
{
Local<v8::Object> err = Nan::Error("Reference List has thrown an error.")->ToObject();
Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error("Reference List has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(), Nan::New("Remote.referenceList").ToLocalChecked());
Local<v8::Value> argv[1] = {
Expand Down
4 changes: 2 additions & 2 deletions generate/templates/manual/repository/get_references.cc
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void GitRepository::GetReferencesWorker::HandleOKCallback()
GitRefs::New(
reference,
true,
GitRepository::New(git_reference_owner(reference), true)->ToObject()
Nan::To<v8::Object>(GitRepository::New(git_reference_owner(reference), true)).ToLocalChecked()
)
);
}
Expand Down Expand Up @@ -118,7 +118,7 @@ void GitRepository::GetReferencesWorker::HandleOKCallback()
}
else if (baton->error_code < 0)
{
Local<v8::Object> err = Nan::Error("Repository getReferences has thrown an error.")->ToObject();
Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error("Repository getReferences has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(), Nan::New("Repository.getReferences").ToLocalChecked());
Local<v8::Value> argv[1] = {
Expand Down
4 changes: 2 additions & 2 deletions generate/templates/manual/repository/get_remotes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void GitRepository::GetRemotesWorker::HandleOKCallback()
GitRemote::New(
remote,
true,
GitRepository::New(git_remote_owner(remote), true)->ToObject()
Nan::To<v8::Object>(GitRepository::New(git_remote_owner(remote), true)).ToLocalChecked()
)
);
}
Expand Down Expand Up @@ -119,7 +119,7 @@ void GitRepository::GetRemotesWorker::HandleOKCallback()
}
else if (baton->error_code < 0)
{
Local<v8::Object> err = Nan::Error("Repository refreshRemotes has thrown an error.")->ToObject();
Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error("Repository refreshRemotes has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(), Nan::New("Repository.refreshRemotes").ToLocalChecked());
Local<v8::Value> argv[1] = {
Expand Down
4 changes: 2 additions & 2 deletions generate/templates/manual/repository/get_submodules.cc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void GitRepository::GetSubmodulesWorker::HandleOKCallback()
GitSubmodule::New(
submodule,
true,
GitRepository::New(git_submodule_owner(submodule), true)->ToObject()
Nan::To<v8::Object>(GitRepository::New(git_submodule_owner(submodule), true)).ToLocalChecked()
)
);
}
Expand Down Expand Up @@ -100,7 +100,7 @@ void GitRepository::GetSubmodulesWorker::HandleOKCallback()
}
else if (baton->error_code < 0)
{
Local<v8::Object> err = Nan::Error("Repository getSubmodules has thrown an error.")->ToObject();
Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error("Repository getSubmodules has thrown an error.")).ToLocalChecked();
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
err->Set(Nan::New("errorFunction").ToLocalChecked(), Nan::New("Repository.getSubmodules").ToLocalChecked());
Local<v8::Value> argv[1] = {
Expand Down
Loading