From 524bccdf6aa20ee4ba76dc7291d77b4c98fa7e28 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Wed, 1 Feb 2023 06:41:04 -0800 Subject: fix(napi): return node globalThis from napi_get_global (#17613) Fixes https://github.com/denoland/deno/issues/17587 --- test_napi/src/env.rs | 39 +++++++++++++++++++++++++++++++++++++++ test_napi/src/lib.rs | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 test_napi/src/env.rs (limited to 'test_napi/src') diff --git a/test_napi/src/env.rs b/test_napi/src/env.rs new file mode 100644 index 000000000..620aeec29 --- /dev/null +++ b/test_napi/src/env.rs @@ -0,0 +1,39 @@ +// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. + +use crate::assert_napi_ok; +use crate::napi_get_callback_info; +use crate::napi_new_property; +use napi_sys::*; + +extern "C" fn get_node_global( + env: napi_env, + info: napi_callback_info, +) -> napi_value { + let (_, argc, _) = napi_get_callback_info!(env, info, 0); + assert_eq!(argc, 0); + + let mut result: napi_value = std::ptr::null_mut(); + assert_napi_ok!(napi_get_global(env, &mut result)); + + let mut r1: napi_value = std::ptr::null_mut(); + assert_napi_ok!(napi_get_named_property( + env, + result, + "Buffer\0".as_ptr() as _, + &mut r1 + )); + + result +} + +pub fn init(env: napi_env, exports: napi_value) { + let properties = + &[napi_new_property!(env, "testNodeGlobal", get_node_global)]; + + assert_napi_ok!(napi_define_properties( + env, + exports, + properties.len(), + properties.as_ptr() + )); +} diff --git a/test_napi/src/lib.rs b/test_napi/src/lib.rs index 71258ee7f..ed0afb741 100644 --- a/test_napi/src/lib.rs +++ b/test_napi/src/lib.rs @@ -12,6 +12,7 @@ pub mod r#async; pub mod callback; pub mod coerce; pub mod date; +pub mod env; pub mod error; pub mod mem; pub mod numbers; @@ -143,6 +144,7 @@ unsafe extern "C" fn napi_register_module_v1( typedarray::init(env, exports); arraybuffer::init(env, exports); array::init(env, exports); + env::init(env, exports); error::init(env, exports); primitives::init(env, exports); properties::init(env, exports); -- cgit v1.2.3