Merge pull request #1106 from neon-bindings/hotfix-1-1

Fix pre-napi-5 build

Author: kjvalencik

Cargo.lock

@@ -10,6 +10,10 @@ Our strong commitment to compatibility since the 1.0 release remains unchanged.
 that has not yet stabilized is published under feature flags, so the only breaking changes that we
 expect to publish are those that affect the unstable features, or, as always, safety bugfixes.
 
+## Version 1.1.1
+
+Hotfix for Node-API versions lower than 5 (https://github.com/neon-bindings/neon/pull/1106).
+
 ## Version 1.1.0
 
 ### New Features

RELEASES.md

@@ -1,3 +1,7 @@
 ignore:
   - "bench"
   - "test"
+coverage:
+  status:
+    project: off
+    patch: off

codecov.yml

@@ -1,6 +1,6 @@
 [package]
 name = "neon-macros"
-version = "1.1.0"
+version = "1.1.1"
 authors = ["Dave Herman <[email protected]>"]
 description = "Procedural macros supporting Neon"
 repository = "https://github.com/neon-bindings/neon"

crates/neon-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "neon"
-version = "1.1.0"
+version = "1.1.1"
 authors = ["Dave Herman <[email protected]>"]
 description = "A safe abstraction layer for Node.js."
 readme = "../../README.md"
@@ -31,7 +31,7 @@ linkme = "0.3.33"
 semver = "1.0.20"
 smallvec = "1.11.2"
 once_cell = "1.18.0"
-neon-macros = { version = "=1.1.0", path = "../neon-macros" }
+neon-macros = { version = "=1.1.1", path = "../neon-macros" }
 aquamarine = { version = "0.3.2", optional = true }
 easy-cast = { version = "0.5.2", optional = true }
 doc-comment = { version = "0.3.3", optional = true }

crates/neon/Cargo.toml

@@ -55,7 +55,7 @@ pub trait ContextInternal<'cx>: Sized {
 }
 
 fn default_main(mut cx: ModuleContext) -> NeonResult<()> {
-    #[cfg(feature = "tokio-rt-multi-thread")]
+    #[cfg(all(feature = "napi-6", feature = "tokio-rt-multi-thread"))]
     crate::executor::tokio::init(&mut cx)?;
     crate::registered().export(&mut cx)
 }

crates/neon/src/context/internal.rs

@@ -209,9 +209,9 @@ pub fn registered() -> Exports {
 fn feature_matrix() {
     use std::{env, process::Command};
 
-    const NODE_API_VERSIONS: &[&str] = &[
-        "napi-1", "napi-2", "napi-3", "napi-4", "napi-5", "napi-6", "napi-7", "napi-8",
-    ];
+    // N.B.: Only versions that are used are included in order to keep the set
+    // of permutations as small as possible.
+    const NODE_API_VERSIONS: &[&str] = &["napi-1", "napi-4", "napi-5", "napi-6", "napi-8"];
 
     const FEATURES: &[&str] = &["external-buffers", "futures", "serde", "tokio", "tokio-rt"];
 
@@ -221,7 +221,7 @@ fn feature_matrix() {
         for version in NODE_API_VERSIONS.iter().map(|f| f.to_string()) {
             let features = features.iter().fold(version, |f, s| f + "," + s);
             let status = Command::new(&cargo)
-                .args(["check", "-p", "neon", "--features"])
+                .args(["check", "-p", "neon", "--no-default-features", "--features"])
                 .arg(features)
                 .spawn()
                 .unwrap()

crates/neon/src/lib.rs

@@ -39,7 +39,7 @@ fn global_json_stringify<'cx>(cx: &mut Cx<'cx>) -> JsResult<'cx, JsFunction> {
 // method could cause differences between calls. However, threading a `Root` through
 // would require a significant refactor and "don't do this or things will break" is
 // fairly common in JS.
-fn json_stringify<'cx, C>(cx: &mut Cx<'cx>) -> JsResult<'cx, JsFunction> {
+fn json_stringify<'cx>(cx: &mut Cx<'cx>) -> JsResult<'cx, JsFunction> {
     global_json_stringify(cx)
 }
 

crates/neon/src/types_impl/extract/json.rs

@@ -10,7 +10,7 @@ use crate::{
     object::Object,
     result::{NeonResult, Throw},
     types::{
-        extract::{Date, Error, TryIntoJs},
+        extract::{Error, TryIntoJs},
         Value,
     },
 };
@@ -63,4 +63,7 @@ impl<T> Sealed for Ref<'_, T> {}
 
 impl<T> Sealed for RefMut<'_, T> {}
 
-impl_sealed!(u8, u16, u32, i8, i16, i32, f32, f64, bool, String, Date, Throw, Error,);
+#[cfg(feature = "napi-5")]
+impl Sealed for super::Date {}
+
+impl_sealed!(u8, u16, u32, i8, i16, i32, f32, f64, bool, String, Throw, Error,);

crates/neon/src/types_impl/extract/private.rs

@@ -12,14 +12,14 @@ use crate::{
     result::{NeonResult, Throw},
     sys,
     types::{
-        extract::{Date, TryFromJs, TypeExpected},
+        extract::{TryFromJs, TypeExpected},
         private::ValueInternal,
         JsBoolean, JsNumber, JsString, JsValue, Value,
     },
 };
 
 #[cfg(feature = "napi-5")]
-use crate::types::JsDate;
+use crate::types::{extract::Date, JsDate};
 
 impl<'cx, V> TryFromJs<'cx> for Handle<'cx, V>
 where