naskya/napi-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(napi): noop feature

Browse source
This commit is contained in:
LongYinan 2023-04-11 11:44:10 +08:00
parent f4d9e09917
commit 070230079d
No known key found for this signature in database
GPG key ID: C3666B7FC82ADAD7
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/napi/Cargo.toml
View file

@ -53,7 +53,7 @@ tokio_test_util = ["tokio/test-util"]
tokio_time = ["tokio/time"] tokio_time = ["tokio/time"]
[dependencies] [dependencies]
ctor = "0.1" ctor = "0.2"
once_cell = "1.16" once_cell = "1.16"
bitflags = "2" bitflags = "2"

17
crates/napi/src/bindgen_runtime/module_register.rs
View file

@ -1,6 +1,6 @@
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::ffi::CStr; use std::ffi::CStr;
#[cfg(all(feature = "napi4", not(target_arch = "wasm32")))] #[cfg(all(feature = "napi4", not(target_arch = "wasm32"), not(feature = "noop")))]
use std::hash::Hash; use std::hash::Hash;
#[cfg(all(feature = "napi4", not(target_arch = "wasm32")))] #[cfg(all(feature = "napi4", not(target_arch = "wasm32")))]
use std::ops::Deref; use std::ops::Deref;
@ -10,10 +10,9 @@ use std::thread::ThreadId;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use crate::{ use crate::{check_status, sys, Env, JsFunction, Property, Result, Value, ValueType};
check_status, check_status_or_throw, sys, Env, JsError, JsFunction, Property, Result, Value, #[cfg(not(feature = "noop"))]
ValueType, use crate::{check_status_or_throw, JsError};
};
pub type ExportRegisterCallback = unsafe fn(sys::napi_env) -> Result<sys::napi_value>; pub type ExportRegisterCallback = unsafe fn(sys::napi_env) -> Result<sys::napi_value>;
pub type ModuleExportsCallback = pub type ModuleExportsCallback =
@ -37,6 +36,7 @@ impl<T> Default for PersistedPerInstanceVec<T> {
} }
impl<T> PersistedPerInstanceVec<T> { impl<T> PersistedPerInstanceVec<T> {
#[cfg(not(feature = "noop"))]
#[allow(clippy::mut_from_ref)] #[allow(clippy::mut_from_ref)]
fn borrow_mut<F>(&self, f: F) fn borrow_mut<F>(&self, f: F)
where where
@ -81,6 +81,7 @@ pub(crate) struct PersistedPerInstanceHashSet<T: 'static> {
inner: *mut HashSet<T>, inner: *mut HashSet<T>,
} }
#[cfg(not(feature = "noop"))]
#[cfg(all(feature = "napi4", not(target_arch = "wasm32")))] #[cfg(all(feature = "napi4", not(target_arch = "wasm32")))]
impl<T: 'static + PartialEq + Eq + Hash> PersistedPerInstanceHashSet<T> { impl<T: 'static + PartialEq + Eq + Hash> PersistedPerInstanceHashSet<T> {
pub(crate) fn insert(&self, item: T) { pub(crate) fn insert(&self, item: T) {
@ -118,6 +119,7 @@ unsafe impl<T: Sync> Sync for PersistedPerInstanceHashSet<T> {}
pub(crate) struct PersistedPerInstanceHashMap<K, V>(*mut HashMap<K, V>); pub(crate) struct PersistedPerInstanceHashMap<K, V>(*mut HashMap<K, V>);
impl<K, V> PersistedPerInstanceHashMap<K, V> { impl<K, V> PersistedPerInstanceHashMap<K, V> {
#[cfg(not(feature = "noop"))]
pub(crate) fn from_hashmap(hashmap: HashMap<K, V>) -> Self { pub(crate) fn from_hashmap(hashmap: HashMap<K, V>) -> Self {
Self(Box::into_raw(Box::new(hashmap))) Self(Box::into_raw(Box::new(hashmap)))
} }
@ -155,7 +157,9 @@ type RegisteredClassesMap = PersistedPerInstanceHashMap<ThreadId, RegisteredClas
static MODULE_REGISTER_CALLBACK: Lazy<ModuleRegisterCallback> = Lazy::new(Default::default); static MODULE_REGISTER_CALLBACK: Lazy<ModuleRegisterCallback> = Lazy::new(Default::default);
static MODULE_CLASS_PROPERTIES: Lazy<ModuleClassProperty> = Lazy::new(Default::default); static MODULE_CLASS_PROPERTIES: Lazy<ModuleClassProperty> = Lazy::new(Default::default);
#[cfg(not(feature = "noop"))]
static IS_FIRST_MODULE: AtomicBool = AtomicBool::new(true); static IS_FIRST_MODULE: AtomicBool = AtomicBool::new(true);
#[cfg(not(feature = "noop"))]
static FIRST_MODULE_REGISTERED: AtomicBool = AtomicBool::new(false); static FIRST_MODULE_REGISTERED: AtomicBool = AtomicBool::new(false);
static REGISTERED_CLASSES: Lazy<RegisteredClassesMap> = Lazy::new(Default::default); static REGISTERED_CLASSES: Lazy<RegisteredClassesMap> = Lazy::new(Default::default);
static FN_REGISTER_MAP: Lazy<FnRegisterMap> = Lazy::new(Default::default); static FN_REGISTER_MAP: Lazy<FnRegisterMap> = Lazy::new(Default::default);
@ -177,11 +181,12 @@ pub(crate) static THREADS_CAN_ACCESS_ENV: once_cell::sync::OnceCell<
type RegisteredClasses = type RegisteredClasses =
PersistedPerInstanceHashMap</* export name */ String, /* constructor */ sys::napi_ref>; PersistedPerInstanceHashMap</* export name */ String, /* constructor */ sys::napi_ref>;
#[cfg(feature = "compat-mode")] #[cfg(all(feature = "compat-mode", not(feature = "noop")))]
// compatibility for #[module_exports] // compatibility for #[module_exports]
static MODULE_EXPORTS: Lazy<PersistedPerInstanceVec<ModuleExportsCallback>> = static MODULE_EXPORTS: Lazy<PersistedPerInstanceVec<ModuleExportsCallback>> =
Lazy::new(Default::default); Lazy::new(Default::default);
#[cfg(not(feature = "noop"))]
#[inline] #[inline]
fn wait_first_thread_registered() { fn wait_first_thread_registered() {
while !FIRST_MODULE_REGISTERED.load(Ordering::SeqCst) { while !FIRST_MODULE_REGISTERED.load(Ordering::SeqCst) {

2
crates/napi/src/lib.rs
View file

@ -151,7 +151,7 @@ macro_rules! assert_type_of {
pub use crate::bindgen_runtime::ctor as module_init; pub use crate::bindgen_runtime::ctor as module_init;
pub mod bindgen_prelude { pub mod bindgen_prelude {
#[cfg(feature = "compat-mode")] #[cfg(all(feature = "compat-mode", not(feature = "noop")))]
pub use crate::bindgen_runtime::register_module_exports; pub use crate::bindgen_runtime::register_module_exports;
#[cfg(feature = "tokio_rt")] #[cfg(feature = "tokio_rt")]
pub use crate::tokio_runtime::*; pub use crate::tokio_runtime::*;