feedback and incorporate changes to path handling from rebase

Author: michaelsmithxyz

src/node_modules.cc

@@ -334,32 +334,32 @@ const BindingData::PackageConfig* BindingData::TraverseParent(
   return nullptr;
 }
 
-void BindingData::GetNearestParentPackageJSON(
-    const v8::FunctionCallbackInfo<v8::Value>& args) {
-  CHECK_GE(args.Length(), 1);
-  CHECK(args[0]->IsString());
-
-  Realm* realm = Realm::GetCurrent(args);
-  BufferValue path_value(realm->isolate(), args[0]);
+const std::filesystem::path BindingData::NormalizePath(
+    Realm* realm, BufferValue* path_value) {
   // Check if the path has a trailing slash. If so, add it after
   // ToNamespacedPath() as it will be deleted by ToNamespacedPath()
-  bool slashCheck = path_value.ToStringView().ends_with(kPathSeparator);
+  bool slashCheck = path_value->ToStringView().ends_with(kPathSeparator);
 
-  ToNamespacedPath(realm->env(), &path_value);
+  ToNamespacedPath(realm->env(), path_value);
+
+  auto path = path_value->ToPath();
 
-  std::string path_value_str = path_value.ToString();
   if (slashCheck) {
-    path_value_str.push_back(kPathSeparator);
+    path /= "";
   }
 
-  std::filesystem::path path;
+  return path;
+}
 
-#ifdef _WIN32
-  std::wstring wide_path = ConvertToWideString(path_value_str, GetACP());
-  path = std::filesystem::path(wide_path);
-#else
-  path = std::filesystem::path(path_value_str);
-#endif
+void BindingData::GetNearestParentPackageJSON(
+    const v8::FunctionCallbackInfo<v8::Value>& args) {
+  CHECK_GE(args.Length(), 1);
+  CHECK(args[0]->IsString());
+
+  Realm* realm = Realm::GetCurrent(args);
+  BufferValue path_value(realm->isolate(), args[0]);
+
+  auto path = NormalizePath(realm, &path_value);
 
   auto package_json = TraverseParent(realm, path);
 
@@ -375,17 +375,8 @@ void BindingData::GetNearestParentPackageJSONType(
 
   Realm* realm = Realm::GetCurrent(args);
   BufferValue path_value(realm->isolate(), args[0]);
-  // Check if the path has a trailing slash. If so, add it after
-  // ToNamespacedPath() as it will be deleted by ToNamespacedPath()
-  bool slashCheck = path_value.ToStringView().ends_with(kPathSeparator);
-
-  ToNamespacedPath(realm->env(), &path_value);
-
-  auto path = path_value.ToPath();
 
-  if (slashCheck) {
-    path /= "";
-  }
+  auto path = NormalizePath(realm, &path_value);
 
   auto package_json = TraverseParent(realm, path);
 

src/node_modules.h

@@ -83,6 +83,8 @@ class BindingData : public SnapshotableObject {
   std::unordered_map<std::string, std::optional<PackageConfig> >
       package_configs_;
   simdjson::ondemand::parser json_parser;
+  static const std::filesystem::path NormalizePath(Realm* realm,
+                                                   BufferValue* path_value);
   // returns null on error
   static const PackageConfig* GetPackageJSON(
       Realm* realm,