Skip to content

Commit fcc6b59

Browse files
Add napi logging and fix js file system (#9712)
1 parent 69e4161 commit fcc6b59

File tree

7 files changed

+23
-4
lines changed

7 files changed

+23
-4
lines changed

crates/node-bindings/src/core/js_requests/config_request/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::rc::Rc;
33
use napi::Env;
44
use napi::JsObject;
55
use napi_derive::napi;
6-
76
use parcel_core::requests::config_request::run_config_request;
87
use parcel_core::requests::config_request::ConfigRequest;
98
use parcel_core::requests::request_api::js_request_api::JSRequestApi;

crates/node-bindings/src/core/js_requests/entry_request/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::rc::Rc;
33
use napi::Env;
44
use napi::JsObject;
55
use napi_derive::napi;
6-
76
use parcel_core::requests::entry_request::run_entry_request;
87
use parcel_core::requests::entry_request::EntryRequestInput;
98
use parcel_core::requests::entry_request::EntryResult;

crates/parcel_core/src/requests/entry_request/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,10 @@ pub fn run_entry_request(
173173

174174
#[cfg(test)]
175175
mod test {
176-
use super::*;
177176
use parcel_filesystem::in_memory_file_system::InMemoryFileSystem;
178177

178+
use super::*;
179+
179180
#[test]
180181
fn test_merge_results() {
181182
let entry1 = Entry {

crates/parcel_filesystem/src/js_delegate_file_system/mod.rs crates/parcel_filesystem/src/js_delegate_file_system.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl FileSystem for JSDelegateFileSystem {
5353
let result = call_method(
5454
&self.env,
5555
&self.js_delegate,
56-
"canonicalize",
56+
"realpathSync",
5757
&[&js_path.into_unknown()],
5858
)?;
5959
Ok(path_from_js(result)?)

crates/parcel_napi_helpers/src/lib.rs

+20
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use napi::bindgen_prelude::FromNapiValue;
22
use napi::Env;
33
use napi::JsFunction;
44
use napi::JsObject;
5+
use napi::JsUndefined;
56
use napi::JsUnknown;
67
use napi::NapiRaw;
78

@@ -66,3 +67,22 @@ pub fn call_method(
6667
let result = method_fn.call(Some(&js_object), &args)?;
6768
Ok(result)
6869
}
70+
71+
/// Logs napi values using the JavaScript console
72+
///
73+
/// This function can be used to debug what data the pointers actually refer to
74+
///
75+
pub fn console_log<T>(env: Env, args: &[T]) -> napi::Result<JsUndefined>
76+
where
77+
T: NapiRaw,
78+
{
79+
let console_object = env
80+
.get_global()?
81+
.get_named_property::<JsObject>("console")?;
82+
83+
console_object
84+
.get_named_property_unchecked::<JsFunction>("log")?
85+
.call(Some(&console_object), args)?;
86+
87+
env.get_undefined()
88+
}

0 commit comments

Comments
 (0)