Skip to content

fix(console): use toString implementation if object has provided one #957

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 26, 2018
Merged

fix(console): use toString implementation if object has provided one #957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions test-app/runtime/src/main/cpp/console/Console.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,21 @@ void Console::sendToDevToolsFrontEnd(v8::Isolate* isolate, const std::string& me
v8_inspector::V8LogAgentImpl::EntryAdded(message, logLevel, ArgConverter::ConvertToString(frame->GetScriptNameOrSourceURL()), frame->GetLineNumber());
}

const v8::Local<v8::String> transformJSObject(v8::Isolate* isolate, v8::Local<v8::Object> object) {
auto objToString = object->ToString(isolate);
v8::Local<v8::String> resultString;

auto hasCustomToStringImplementation = !objToString->SameValue(ArgConverter::ConvertToV8String(isolate, "[object Object]"));

if (hasCustomToStringImplementation) {
resultString = objToString;
} else {
resultString = JsonStringifyObject(isolate, object);
}

return resultString;
}

const std::string buildLogString(const v8::FunctionCallbackInfo<v8::Value>& info, int startingIndex = 0) {
auto isolate = info.GetIsolate();

Expand All @@ -87,7 +102,8 @@ const std::string buildLogString(const v8::FunctionCallbackInfo<v8::Value>& info
info[i]->ToDetailString(isolate->GetCurrentContext()).ToLocal(&argString);
} else if (info[i]->IsObject()) {
v8::Local<v8::Object> obj = info[i].As<v8::Object>();
argString = JsonStringifyObject(isolate, obj);

argString = transformJSObject(isolate, obj);
} else {
info[i]->ToDetailString(isolate->GetCurrentContext()).ToLocal(&argString);
}
Expand Down Expand Up @@ -188,7 +204,9 @@ void Console::dirCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
if (propIsFunction) {
ss << "()";
} else if (propertyValue->IsObject()) {
std::string jsonStringifiedObject = ArgConverter::ConvertToString(JsonStringifyObject(isolate, propertyValue));
auto obj = propertyValue->ToObject(isolate);
auto objString = transformJSObject(isolate, obj);
std::string jsonStringifiedObject = ArgConverter::ConvertToString(objString);
// if object prints out as the error string for circular references, replace with #CR instead for brevity
if (jsonStringifiedObject.find("circular structure") != std::string::npos) {
jsonStringifiedObject = "#CR";
Expand Down