Add napi logging and fix js file system (#9712)

parcel-bundler · May 10, 2024 · fcc6b59 · fcc6b59
1 parent 69e4161
commit fcc6b59
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/crates/node-bindings/src/core/js_requests/config_request/mod.rs b/crates/node-bindings/src/core/js_requests/config_request/mod.rs
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use napi::Env;
 use napi::JsObject;
 use napi_derive::napi;
-
 use parcel_core::requests::config_request::run_config_request;
 use parcel_core::requests::config_request::ConfigRequest;
 use parcel_core::requests::request_api::js_request_api::JSRequestApi;

diff --git a/crates/node-bindings/src/core/js_requests/entry_request/mod.rs b/crates/node-bindings/src/core/js_requests/entry_request/mod.rs
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use napi::Env;
 use napi::JsObject;
 use napi_derive::napi;
-
 use parcel_core::requests::entry_request::run_entry_request;
 use parcel_core::requests::entry_request::EntryRequestInput;
 use parcel_core::requests::entry_request::EntryResult;

diff --git a/crates/parcel_core/src/requests/entry_request/mod.rs b/crates/parcel_core/src/requests/entry_request/mod.rs
@@ -173,9 +173,10 @@ pub fn run_entry_request(
 
 #[cfg(test)]
 mod test {
-  use super::*;
   use parcel_filesystem::in_memory_file_system::InMemoryFileSystem;
 
+  use super::*;
+
   #[test]
   fn test_merge_results() {
     let entry1 = Entry {

diff --git a/...lesystem/src/in_memory_file_system/mod.rs → ...l_filesystem/src/in_memory_file_system.rs b/...lesystem/src/in_memory_file_system/mod.rs → ...l_filesystem/src/in_memory_file_system.rs
diff --git a/...system/src/js_delegate_file_system/mod.rs → ...filesystem/src/js_delegate_file_system.rs b/...system/src/js_delegate_file_system/mod.rs → ...filesystem/src/js_delegate_file_system.rs
@@ -53,7 +53,7 @@ impl FileSystem for JSDelegateFileSystem {
       let result = call_method(
         &self.env,
         &self.js_delegate,
-        "canonicalize",
+        "realpathSync",
         &[&js_path.into_unknown()],
       )?;
       Ok(path_from_js(result)?)

diff --git a/...rcel_filesystem/src/os_file_system/mod.rs → ...s/parcel_filesystem/src/os_file_system.rs b/...rcel_filesystem/src/os_file_system/mod.rs → ...s/parcel_filesystem/src/os_file_system.rs
diff --git a/crates/parcel_napi_helpers/src/lib.rs b/crates/parcel_napi_helpers/src/lib.rs
@@ -2,6 +2,7 @@ use napi::bindgen_prelude::FromNapiValue;
 use napi::Env;
 use napi::JsFunction;
 use napi::JsObject;
+use napi::JsUndefined;
 use napi::JsUnknown;
 use napi::NapiRaw;
 
@@ -66,3 +67,22 @@ pub fn call_method(
   let result = method_fn.call(Some(&js_object), &args)?;
   Ok(result)
 }
+
+/// Logs napi values using the JavaScript console
+///
+/// This function can be used to debug what data the pointers actually refer to
+///
+pub fn console_log<T>(env: Env, args: &[T]) -> napi::Result<JsUndefined>
+where
+  T: NapiRaw,
+{
+  let console_object = env
+    .get_global()?
+    .get_named_property::<JsObject>("console")?;
+
+  console_object
+    .get_named_property_unchecked::<JsFunction>("log")?
+    .call(Some(&console_object), args)?;
+
+  env.get_undefined()
+}