fix: more node-api fixes

cli/napi/js_native_api.rs

@@ -1177,27 +1177,57 @@ fn napi_create_string_utf16(
 #[napi_sym]
 fn node_api_create_external_string_latin1(
  env_ptr: *mut Env,
- _string: *const c_char,
- _length: usize,
- _nogc_finalize_callback: napi_finalize,
- _finalize_hint: *mut c_void,
- _result: *mut napi_value,
- _copied: *mut bool,
+ string: *const c_char,
+ length: usize,
+ nogc_finalize_callback: Option<napi_finalize>,
+ finalize_hint: *mut c_void,
+ result: *mut napi_value,
+ copied: *mut bool,
 ) -> napi_status {
- return napi_set_last_error(env_ptr, napi_generic_failure);
+ let status =
+ unsafe { napi_create_string_latin1(env_ptr, string, length, result) };
+
+ if status == napi_ok {
+ unsafe {
+ *copied = true;
+ }
+
+ if let Some(finalize) = nogc_finalize_callback {
+ unsafe {
+ finalize(env_ptr as napi_env, string as *mut c_void, finalize_hint);
+ }
+ }
+ }
+
+ status
 }
 
 #[napi_sym]
 fn node_api_create_external_string_utf16(
  env_ptr: *mut Env,
- _string: *const u16,
- _length: usize,
- _nogc_finalize_callback: napi_finalize,
- _finalize_hint: *mut c_void,
- _result: *mut napi_value,
- _copied: *mut bool,
+ string: *const u16,
+ length: usize,
+ nogc_finalize_callback: Option<napi_finalize>,
+ finalize_hint: *mut c_void,
+ result: *mut napi_value,
+ copied: *mut bool,
 ) -> napi_status {
- return napi_set_last_error(env_ptr, napi_generic_failure);
+ let status =
+ unsafe { napi_create_string_utf16(env_ptr, string, length, result) };
+
+ if status == napi_ok {
+ unsafe {
+ *copied = true;
+ }
+
+ if let Some(finalize) = nogc_finalize_callback {
+ unsafe {
+ finalize(env_ptr as napi_env, string as *mut c_void, finalize_hint);
+ }
+ }
+ }
+
+ status
 }
 
 #[napi_sym]
@@ -2790,8 +2820,8 @@ fn napi_instanceof(
  unsafe {
  napi_throw_type_error(
  env,
- "ERR_NAPI_CONS_FUNCTION\0".as_ptr() as _,
- "Constructor must be a function\0".as_ptr() as _,
+ c"ERR_NAPI_CONS_FUNCTION".as_ptr(),
+ c"Constructor must be a function".as_ptr(),
  );
  }
  return napi_function_expected;
@@ -3144,8 +3174,8 @@ fn napi_create_dataview<'s>(
  unsafe {
  return napi_throw_range_error(
  env,
- "ERR_NAPI_INVALID_DATAVIEW_ARGS\0".as_ptr() as _,
- "byte_offset + byte_length should be less than or equal to the size in bytes of the array passed in\0".as_ptr() as _,
+ c"ERR_NAPI_INVALID_DATAVIEW_ARGS".as_ptr(),
+ c"byte_offset + byte_length should be less than or equal to the size in bytes of the array passed in".as_ptr(),
  );
  }
  }

cli/napi/node_api.rs

@@ -426,22 +426,14 @@ fn napi_get_buffer_info(
  let env = check_env!(env);
  check_arg!(env, value);
 
+ // NB: Any TypedArray instance seems to be accepted by this function
+ // in Node.js.
  let Some(ta) =
  value.and_then(|v| v8::Local::<v8::TypedArray>::try_from(v).ok())
  else {
  return napi_set_last_error(env, napi_invalid_arg);
  };
 
- let buffer_constructor =
- v8::Local::new(&mut env.scope(), &env.buffer_constructor);
-
- if !ta
- .instance_of(&mut env.scope(), buffer_constructor.into())
- .unwrap_or(false)
- {
- return napi_set_last_error(env, napi_invalid_arg);
- }
-
  if !data.is_null() {
  unsafe {
  *data = ta.data();

ext/napi/lib.rs

@@ -9,6 +9,7 @@ use core::ptr::NonNull;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
 use deno_core::op2;
+use deno_core::url::Url;
 use deno_core::ExternalOpsTracker;
 use deno_core::OpState;
 use deno_core::V8CrossThreadTaskSpawner;
@@ -528,7 +529,10 @@ where
  let type_tag = v8::Private::new(scope, Some(type_tag_name));
  let type_tag = v8::Global::new(scope, type_tag);
 
- let env_shared = EnvShared::new(napi_wrap, type_tag, path.clone());
+ let url_filename =
+ Url::from_file_path(&path).map_err(|_| type_error("Invalid path"))?;
+ let env_shared =
+ EnvShared::new(napi_wrap, type_tag, format!("{url_filename}\0"));
 
  let ctx = scope.get_current_context();
  let mut env = Env::new(

ext/node/polyfills/process.ts

@@ -403,7 +403,9 @@ Process.prototype.chdir = chdir;
 
 /** https://nodejs.org/api/process.html#processconfig */
 Process.prototype.config = {
- target_defaults: {},
+ target_defaults: {
+ default_configuration: "Release",
+ },
  variables: {},
 };