Merge remote-tracking branch 'upstream/master' into contexted-tsfn-api

Author: KevinEady

README.md

@@ -42,6 +42,7 @@ to ideas specified in the **ECMA262 Language Specification**.
 - **[Examples](#examples)**
 - **[Tests](#tests)**
 - **[More resource and info about native Addons](#resources)**
+- **[Badges](#badges)**
 - **[Code of Conduct](CODE_OF_CONDUCT.md)**
 - **[Contributors](#contributors)**
 - **[License](#license)**
@@ -185,6 +186,24 @@ such packages with `node-addon-api` to provide more visibility to the community.
 
 Quick links to NPM searches: [keywords:node-addon-api](https://www.npmjs.com/search?q=keywords%3Anode-addon-api).
 
+<a name="badges"></a>
+
+### **Badges**
+
+The use of badges is recommended to indicate the minimum version of N-API
+required for the module. This helps to determine which Node.js major versions are
+supported. Addon maintainers can consult the [N-API support matrix][] to determine
+which Node.js versions provide a given N-API version. The following badges are
+available:
+
+![N-API v1 Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/N-API%20v1%20Badge.svg)
+![N-API v2 Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/N-API%20v2%20Badge.svg)
+![N-API v3 Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/N-API%20v3%20Badge.svg)
+![N-API v4 Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/N-API%20v4%20Badge.svg)
+![N-API v5 Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/N-API%20v5%20Badge.svg)
+![N-API v6 Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/N-API%20v6%20Badge.svg)
+![N-API Experimental Version Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/N-API%20Experimental%20Version%20Badge.svg)
+
 ## **Contributing**
 
 We love contributions from the community to **node-addon-api**!
@@ -220,3 +239,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more details on our philosophy around
 Licensed under [MIT](./LICENSE.md)
 
 [ABI stability guide]: https://nodejs.org/en/docs/guides/abi-stability/
+[N-API support matrix]: https://nodejs.org/dist/latest/docs/api/n-api.html#n_api_n_api_version_matrix

doc/async_worker_variants.md

@@ -399,7 +399,7 @@ class EchoWorker : public AsyncProgressQueueWorker<uint32_t> {
     void Execute(const ExecutionProgress& progress) {
         // Need to simulate cpu heavy task
         for (uint32_t i = 0; i < 100; ++i) {
-          progress.Send(&i, 1)
+          progress.Send(&i, 1);
           std::this_thread::sleep_for(std::chrono::seconds(1));
         }
     }

doc/bigint.md

@@ -48,7 +48,7 @@ Returns a new empty JavaScript `Napi::BigInt`.
 ### Int64Value
 
 ```cpp
-int64_t Napi::BitInt::Int64Value(bool* lossless) const;
+int64_t Napi::BigInt::Int64Value(bool* lossless) const;
 ```
 
  - `[out] lossless`: Indicates whether the `BigInt` value was converted losslessly.

doc/object_lifetime_management.md

@@ -69,7 +69,7 @@ for (int i = 0; i < LOOP_MAX; i++) {
   Napi::HandleScope scope(info.Env());
   std::string name = std::string("inner-scope") + std::to_string(i);
   Napi::Value newValue = Napi::String::New(info.Env(), name.c_str());
-  // do something with neValue
+  // do something with newValue
 };
 ```
 

napi-inl.h

@@ -4972,7 +4972,7 @@ inline void AsyncProgressWorker<T>::SendProgress_(const T* data, size_t count) {
 
 template<class T>
 inline void AsyncProgressWorker<T>::Signal() const {
-  this->NonBlockingCall(nullptr);
+  this->NonBlockingCall(static_cast<T*>(nullptr));
 }
 
 template<class T>