summaryrefslogtreecommitdiff
path: root/test_napi
diff options
context:
space:
mode:
authorDivy Srivastava <dj.srivastava23@gmail.com>2023-02-01 06:41:04 -0800
committerGitHub <noreply@github.com>2023-02-01 15:41:04 +0100
commit524bccdf6aa20ee4ba76dc7291d77b4c98fa7e28 (patch)
treea312f7fadf6a086f37bcc5326b42efbe114617be /test_napi
parent1b46b2f0e47b93635b8f225f43bb82fd79dd31dc (diff)
fix(napi): return node globalThis from napi_get_global (#17613)
Fixes https://github.com/denoland/deno/issues/17587
Diffstat (limited to 'test_napi')
-rw-r--r--test_napi/common.js6
-rw-r--r--test_napi/env_test.js12
-rw-r--r--test_napi/src/env.rs39
-rw-r--r--test_napi/src/lib.rs2
4 files changed, 58 insertions, 1 deletions
diff --git a/test_napi/common.js b/test_napi/common.js
index 915a43818..09378918f 100644
--- a/test_napi/common.js
+++ b/test_napi/common.js
@@ -17,5 +17,9 @@ const [libPrefix, libSuffix] = {
export function loadTestLibrary() {
const specifier = `${targetDir}/${libPrefix}test_napi.${libSuffix}`;
- return Deno[Deno.internal].core.ops.op_napi_open(specifier); // Internal, used in ext/node
+
+ // Internal, used in ext/node
+ return Deno[Deno.internal].core.ops.op_napi_open(specifier, {
+ Buffer: {},
+ });
}
diff --git a/test_napi/env_test.js b/test_napi/env_test.js
new file mode 100644
index 000000000..8ec12a534
--- /dev/null
+++ b/test_napi/env_test.js
@@ -0,0 +1,12 @@
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+
+import { assert, loadTestLibrary } from "./common.js";
+
+const env = loadTestLibrary();
+
+Deno.test("napi get global", function () {
+ const g = env.testNodeGlobal();
+ // Note: global is a mock object in the tests.
+ // See common.js
+ assert(g.Buffer);
+});
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);