-
-
Notifications
You must be signed in to change notification settings - Fork 33k
module: add findNearestPackageJSON
utility
#55173
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
JakobJingleheimer
wants to merge
2
commits into
nodejs:main
from
JakobJingleheimer:feat/module-utils-findPJSON
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -313,8 +313,9 @@ const BindingData::PackageConfig* BindingData::TraverseParent( | |
return nullptr; | ||
} | ||
|
||
void BindingData::GetNearestParentPackageJSON( | ||
const v8::FunctionCallbackInfo<v8::Value>& args) { | ||
void BindingData::FindNearestParentPackageJSON( | ||
const v8::FunctionCallbackInfo<v8::Value>& args | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change seems to be unrelated There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Technically yes, this un-mangling is not required to make the change work. |
||
) { | ||
CHECK_GE(args.Length(), 1); | ||
CHECK(args[0]->IsString()); | ||
|
||
|
@@ -331,41 +332,32 @@ void BindingData::GetNearestParentPackageJSON( | |
path_value_str.push_back(kPathSeparator); | ||
} | ||
|
||
auto package_json = | ||
TraverseParent(realm, std::filesystem::path(path_value_str)); | ||
args.GetReturnValue().Set(path_value_str); | ||
} | ||
|
||
void BindingData::GetNearestParentPackageJSON( | ||
const v8::FunctionCallbackInfo<v8::Value>& args | ||
) { | ||
auto path = FindNearestParentPackageJSON(args); | ||
|
||
auto package_json = TraverseParent(realm, std::filesystem::path(path_value_str)); | ||
|
||
if (package_json != nullptr) { | ||
args.GetReturnValue().Set(package_json->Serialize(realm)); | ||
} | ||
} | ||
|
||
void BindingData::GetNearestParentPackageJSONType( | ||
const FunctionCallbackInfo<Value>& args) { | ||
CHECK_GE(args.Length(), 1); | ||
CHECK(args[0]->IsString()); | ||
|
||
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); | ||
|
||
std::string path_value_str = path_value.ToString(); | ||
if (slashCheck) { | ||
path_value_str.push_back(kPathSeparator); | ||
} | ||
|
||
auto package_json = | ||
TraverseParent(realm, std::filesystem::path(path_value_str)); | ||
const FunctionCallbackInfo<Value>& args | ||
) { | ||
auto package_json = GetNearestParentPackageJSON(args); | ||
|
||
if (package_json == nullptr) { | ||
return; | ||
} | ||
|
||
Local<Value> value = | ||
ToV8Value(realm->context(), package_json->type).ToLocalChecked(); | ||
Local<Value> value = ToV8Value(realm->context(), package_json->type).ToLocalChecked(); | ||
|
||
args.GetReturnValue().Set(value); | ||
} | ||
|
||
|
@@ -497,6 +489,7 @@ void BindingData::CreatePerIsolateProperties(IsolateData* isolate_data, | |
SetMethod(isolate, target, "getPackageScopeConfig", GetPackageScopeConfig); | ||
SetMethod(isolate, target, "enableCompileCache", EnableCompileCache); | ||
SetMethod(isolate, target, "getCompileCacheDir", GetCompileCacheDir); | ||
SetMethod(isolate, target, "findNearestPackageJSON", FindNearestParentPackageJSON); | ||
SetMethod(isolate, target, "flushCompileCache", FlushCompileCache); | ||
} | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: Do we need to also make sure this returns a
UNC
path on Windows? UNC path (the result oftoNamespacedPath()
is required if the path is extremely long. windows weirdly throws an error if long path feature is not enabled)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regarding your question: i have no idea. It sounds like you answered it yourself though (and the answer is "yes").