mirror of
https://github.com/denoland/deno.git
synced 2025-09-29 05:34:49 +00:00
fix(napi): return node globalThis from napi_get_global (#17613)
Fixes https://github.com/denoland/deno/issues/17587
This commit is contained in:
parent
1b46b2f0e4
commit
524bccdf6a
7 changed files with 68 additions and 6 deletions
|
@ -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: {},
|
||||
});
|
||||
}
|
||||
|
|
12
test_napi/env_test.js
Normal file
12
test_napi/env_test.js
Normal file
|
@ -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);
|
||||
});
|
39
test_napi/src/env.rs
Normal file
39
test_napi/src/env.rs
Normal file
|
@ -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()
|
||||
));
|
||||
}
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue