Merge a38c2f0 into b5f8e2a

addaleax · May 22, 2019 · ee7eeac · ee7eeac
2 parents b5f8e2a + a38c2f0
commit ee7eeac
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ env:
   - TRAVIS_NODE_VERSION="8.10"
   - TRAVIS_NODE_VERSION="10"
   - TRAVIS_NODE_VERSION="11"
+  - TRAVIS_NODE_VERSION="12"
 os:
   - linux
   - osx

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,6 +2,7 @@
 environment:
   fast_finish: true
   matrix:
+    - nodejs_version: "12"
     - nodejs_version: "11"
     - nodejs_version: "10"
     - nodejs_version: "8"

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "lzmajs": "./bin/lzmajs"
   },
   "dependencies": {
-    "nan": "^2.10.0",
+    "nan": "^2.14.0",
     "node-pre-gyp": "^0.11.0",
     "readable-stream": "^2.3.5",
     "rimraf": "^2.6.1"

diff --git a/src/filter-array.cpp b/src/filter-array.cpp
@@ -17,7 +17,7 @@ FilterArray::FilterArray(Local<Array> arr) : ok_(false) {
 
   for (size_t i = 0; i < len; ++i) {
     Local<Object> entry = Local<Object>::Cast(EmptyToUndefined(Nan::Get(arr, i)));
-    if (entry.IsEmpty() || entry->IsUndefined() || entry->IsNull() || !entry->Has(id_)) {
+    if (entry.IsEmpty() || entry->IsUndefined() || entry->IsNull() || !Nan::Has(entry, id_).ToChecked()) {
       Nan::ThrowTypeError("Filter array needs object entries");
       return;
     }

diff --git a/src/index-parser.cpp b/src/index-parser.cpp
@@ -439,7 +439,7 @@ void IndexParser::Init(Local<Object> exports) {
   Nan::SetPrototypeMethod(tpl, "feed", Feed);
   Nan::SetPrototypeMethod(tpl, "parse", Parse);
 
-  constructor.Reset(tpl->GetFunction());
+  constructor.Reset(Nan::GetFunction(tpl).ToLocalChecked());
   exports->Set(NewString("IndexParser"), Nan::New<Function>(constructor));
 }
 

diff --git a/src/lzma-stream.cpp b/src/lzma-stream.cpp
@@ -175,7 +175,7 @@ NAN_METHOD(LZMAStream::Code) {
 
   self->inbufs.push(LZMA_NATIVE_MOVE(inputData));
 
-  bool async = info[1]->BooleanValue();
+  bool async = Nan::To<bool>(info[1]).ToChecked();
 
   if (async) {
 #ifdef LZMA_ASYNC_AVAILABLE

diff --git a/src/module.cpp b/src/module.cpp
@@ -6,19 +6,19 @@ void moduleInit(Local<Object> exports) {
   LZMAStream::Init(exports);
   IndexParser::Init(exports);
 
-  exports->Set(NewString("versionNumber"),            Nan::New<FunctionTemplate>(lzmaVersionNumber)->GetFunction());
-  exports->Set(NewString("versionString"),            Nan::New<FunctionTemplate>(lzmaVersionString)->GetFunction());
-  exports->Set(NewString("checkIsSupported"),         Nan::New<FunctionTemplate>(lzmaCheckIsSupported)->GetFunction());
-  exports->Set(NewString("checkSize"),                Nan::New<FunctionTemplate>(lzmaCheckSize)->GetFunction());
-  exports->Set(NewString("crc32_"),                   Nan::New<FunctionTemplate>(lzmaCRC32)->GetFunction());
-  exports->Set(NewString("filterEncoderIsSupported"), Nan::New<FunctionTemplate>(lzmaFilterEncoderIsSupported)->GetFunction());
-  exports->Set(NewString("filterDecoderIsSupported"), Nan::New<FunctionTemplate>(lzmaFilterDecoderIsSupported)->GetFunction());
-  exports->Set(NewString("rawEncoderMemusage"),       Nan::New<FunctionTemplate>(lzmaRawEncoderMemusage)->GetFunction());
-  exports->Set(NewString("rawDecoderMemusage"),       Nan::New<FunctionTemplate>(lzmaRawDecoderMemusage)->GetFunction());
-  exports->Set(NewString("mfIsSupported"),            Nan::New<FunctionTemplate>(lzmaMfIsSupported)->GetFunction());
-  exports->Set(NewString("modeIsSupported"),          Nan::New<FunctionTemplate>(lzmaModeIsSupported)->GetFunction());
-  exports->Set(NewString("easyEncoderMemusage"),      Nan::New<FunctionTemplate>(lzmaEasyEncoderMemusage)->GetFunction());
-  exports->Set(NewString("easyDecoderMemusage"),      Nan::New<FunctionTemplate>(lzmaEasyDecoderMemusage)->GetFunction());
+  exports->Set(NewString("versionNumber"),            Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaVersionNumber)).ToLocalChecked());
+  exports->Set(NewString("versionString"),            Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaVersionString)).ToLocalChecked());
+  exports->Set(NewString("checkIsSupported"),         Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaCheckIsSupported)).ToLocalChecked());
+  exports->Set(NewString("checkSize"),                Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaCheckSize)).ToLocalChecked());
+  exports->Set(NewString("crc32_"),                   Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaCRC32)).ToLocalChecked());
+  exports->Set(NewString("filterEncoderIsSupported"), Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaFilterEncoderIsSupported)).ToLocalChecked());
+  exports->Set(NewString("filterDecoderIsSupported"), Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaFilterDecoderIsSupported)).ToLocalChecked());
+  exports->Set(NewString("rawEncoderMemusage"),       Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaRawEncoderMemusage)).ToLocalChecked());
+  exports->Set(NewString("rawDecoderMemusage"),       Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaRawDecoderMemusage)).ToLocalChecked());
+  exports->Set(NewString("mfIsSupported"),            Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaMfIsSupported)).ToLocalChecked());
+  exports->Set(NewString("modeIsSupported"),          Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaModeIsSupported)).ToLocalChecked());
+  exports->Set(NewString("easyEncoderMemusage"),      Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaEasyEncoderMemusage)).ToLocalChecked());
+  exports->Set(NewString("easyDecoderMemusage"),      Nan::GetFunction(Nan::New<FunctionTemplate>(lzmaEasyDecoderMemusage)).ToLocalChecked());
 
   // enum lzma_ret
   exports->Set(NewString("OK"),                Nan::New<Number>(LZMA_OK));

diff --git a/src/mt-options.cpp b/src/mt-options.cpp
@@ -12,7 +12,7 @@ MTOptions::MTOptions(Local<Object> opt) : filters_(NULL), ok_(true) {
   opts_.flags = 0;
   opts_.filters = NULL;
 
-  opts_.block_size = Nan::Get(opt, NewString("blockSize")).ToLocalChecked()->IntegerValue();
+  opts_.block_size = Nan::To<int64_t>(Nan::Get(opt, NewString("blockSize")).ToLocalChecked()).ToChecked();
   opts_.timeout = Nan::To<uint32_t>(Nan::Get(opt, NewString("timeout")).ToLocalChecked())
       .FromMaybe(0);
   opts_.preset = Nan::To<uint32_t>(Nan::Get(opt, NewString("preset")).ToLocalChecked())