Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit c19c2bc

Browse files
authored
Fix build error node 12.14.1 (#138)
* Update API usage * Bump node version
1 parent a03caf3 commit c19c2bc

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ env:
3030
global:
3131
- CC=clang CXX=clang++ npm_config_clang=1
3232
matrix:
33-
- NODE_VERSION=8.9.3
3433
- NODE_VERSION=10
35-
- NODE_VERSION=12
34+
- NODE_VERSION=12.14.1

appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
environment:
22
matrix:
3-
- nodejs_version: '10'
4-
- nodejs_version: '10'
3+
- nodejs_version: '12.14.1'
54
SPELLCHECKER_PREFER_HUNSPELL: true
6-
- nodejs_version: '8'
5+
- nodejs_version: '10'
76

87
install:
98
- ps: Install-Product node $env:nodejs_version

src/main.cc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,15 @@ class Spellchecker : public Nan::ObjectWrap {
129129
std::vector<MisspelledRange> misspelled_ranges = that->impl->CheckSpelling(text.data(), text.size());
130130

131131
std::vector<MisspelledRange>::const_iterator iter = misspelled_ranges.begin();
132+
v8::Local<v8::Context> context = Nan::GetCurrentContext();
132133
for (; iter != misspelled_ranges.end(); ++iter) {
133134
size_t index = iter - misspelled_ranges.begin();
134135
uint32_t start = iter->start, end = iter->end;
135136

136137
Local<Object> misspelled_range = Nan::New<Object>();
137-
misspelled_range->Set(Nan::New("start").ToLocalChecked(), Nan::New<Integer>(start));
138-
misspelled_range->Set(Nan::New("end").ToLocalChecked(), Nan::New<Integer>(end));
139-
result->Set(index, misspelled_range);
138+
misspelled_range->Set(context, Nan::New("start").ToLocalChecked(), Nan::New<Integer>(start));
139+
misspelled_range->Set(context, Nan::New("end").ToLocalChecked(), Nan::New<Integer>(end));
140+
result->Set(context, index, misspelled_range);
140141
}
141142
}
142143

@@ -217,10 +218,11 @@ class Spellchecker : public Nan::ObjectWrap {
217218
std::vector<std::string> dictionaries =
218219
that->impl->GetAvailableDictionaries(path);
219220

221+
v8::Local<v8::Context> context = Nan::GetCurrentContext();
220222
Local<Array> result = Nan::New<Array>(dictionaries.size());
221223
for (size_t i = 0; i < dictionaries.size(); ++i) {
222224
const std::string& dict = dictionaries[i];
223-
result->Set(i, Nan::New(dict.data(), dict.size()).ToLocalChecked());
225+
result->Set(context, i, Nan::New(dict.data(), dict.size()).ToLocalChecked());
224226
}
225227

226228
info.GetReturnValue().Set(result);
@@ -242,11 +244,12 @@ class Spellchecker : public Nan::ObjectWrap {
242244
that->impl->GetCorrectionsForMisspelling(word);
243245

244246
Local<Array> result = Nan::New<Array>(corrections.size());
247+
v8::Local<v8::Context> context = Nan::GetCurrentContext();
245248
for (size_t i = 0; i < corrections.size(); ++i) {
246249
const std::string& word = corrections[i];
247250

248251
Nan::MaybeLocal<String> val = Nan::New<String>(word.data(), word.size());
249-
result->Set(i, val.ToLocalChecked());
252+
result->Set(context, i, val.ToLocalChecked());
250253
}
251254

252255
info.GetReturnValue().Set(result);
@@ -286,7 +289,7 @@ class Spellchecker : public Nan::ObjectWrap {
286289

287290
Isolate* isolate = exports->GetIsolate();
288291
Local<Context> context = isolate->GetCurrentContext();
289-
exports->Set(Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked());
292+
Nan::Set(exports, Nan::New("Spellchecker").ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked());
290293
}
291294
};
292295

src/worker.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ void CheckSpellingWorker::Execute() {
2929
void CheckSpellingWorker::HandleOKCallback() {
3030
Nan::HandleScope scope;
3131

32+
v8::Local<v8::Context> context = Nan::GetCurrentContext();
3233
Local<Array> result = Nan::New<Array>();
3334
for (auto iter = misspelled_ranges.begin(); iter != misspelled_ranges.end(); ++iter) {
3435
size_t index = iter - misspelled_ranges.begin();
3536
uint32_t start = iter->start, end = iter->end;
3637

3738
Local<Object> misspelled_range = Nan::New<Object>();
38-
misspelled_range->Set(Nan::New("start").ToLocalChecked(), Nan::New<Integer>(start));
39-
misspelled_range->Set(Nan::New("end").ToLocalChecked(), Nan::New<Integer>(end));
40-
result->Set(index, misspelled_range);
39+
misspelled_range->Set(context, Nan::New("start").ToLocalChecked(), Nan::New<Integer>(start));
40+
misspelled_range->Set(context, Nan::New("end").ToLocalChecked(), Nan::New<Integer>(end));
41+
result->Set(context, index, misspelled_range);
4142
}
4243

4344
Local<Value> argv[] = { Nan::Null(), result };

0 commit comments

Comments
 (0)