Skip to content
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

feat(console): print proxy details #7139

Merged
merged 7 commits into from
Sep 8, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
16 changes: 15 additions & 1 deletion cli/rt/02_console.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,11 @@
level,
inspectOptions,
) {
const proxyDetails = Deno.core.getProxyDetails(value);
if (proxyDetails != null) {
return inspectProxy(proxyDetails, ctx, level, inspectOptions);
uki00a marked this conversation as resolved.
Show resolved Hide resolved
}

switch (typeof value) {
case "string":
return value;
Expand Down Expand Up @@ -643,7 +648,16 @@
return `Promise { ${str} }`;
}

// TODO: Proxy
function inspectProxy(
targetAndHandler,
ctx,
level,
inspectOptions,
) {
return `Proxy ${
inspectArray(targetAndHandler, ctx, level, inspectOptions)
}`;
}

function inspectRawObject(
value,
Expand Down
28 changes: 28 additions & 0 deletions cli/tests/unit/console_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,34 @@ unitTest(async function consoleTestStringifyPromises(): Promise<void> {
assertEquals(strLines[1], " <rejected> Error: Whoops");
});

unitTest(function consoleTestStringifyProxy(): void {
assertEquals(
stringify(new Proxy([1, 2, 3], { get(): void {} })),
"Proxy [ [ 1, 2, 3 ], { get: [Function: get] } ]",
);
assertEquals(
stringify(
new Proxy({ a: 1 }, {
set(): boolean {
return false;
},
}),
),
"Proxy [ { a: 1 }, { set: [Function: set] } ]",
);
assertEquals(
stringify(new Proxy([1, 2, 3, 4, 5, 6, 7], { get(): void {} })),
`Proxy [ [
1, 2, 3, 4,
5, 6, 7
], { get: [Function: get] } ]`,
);
assertEquals(
stringify(new Proxy(function fn() {}, { get(): void {} })),
"Proxy [ [Function: fn], { get: [Function: get] } ]",
);
});

unitTest(function consoleTestWithCustomInspector(): void {
class A {
[customInspect](): string {
Expand Down
61 changes: 60 additions & 1 deletion core/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ lazy_static! {
},
v8::ExternalReference {
function: get_promise_details.map_fn_to(),
}
},
v8::ExternalReference {
function: get_proxy_details.map_fn_to(),
},
]);
}

Expand Down Expand Up @@ -181,6 +184,18 @@ pub fn initialize_context<'s>(
get_promise_details_val.into(),
);

let get_proxy_details_key =
v8::String::new(scope, "getProxyDetails").unwrap();
let get_proxy_details_tmpl =
v8::FunctionTemplate::new(scope, get_proxy_details);
let get_proxy_details_val =
get_proxy_details_tmpl.get_function(scope).unwrap();
core_val.set(
scope,
get_proxy_details_key.into(),
get_proxy_details_val.into(),
);

let shared_key = v8::String::new(scope, "shared").unwrap();
core_val.set_accessor(scope, shared_key.into(), shared_getter);

Expand Down Expand Up @@ -780,6 +795,50 @@ fn get_promise_details(
}
}

// Based on https://github.com/nodejs/node/blob/1e470510ff74391d7d4ec382909ea8960d2d2fbc/src/node_util.cc
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
fn get_proxy_details(
scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
mut rv: v8::ReturnValue,
) {
// Return undefined if it's not a proxy.
let proxy = match v8::Local::<v8::Proxy>::try_from(args.get(0)) {
Ok(val) => val,
Err(_) => {
return;
}
};

let proxy_details = v8::Array::new(scope, 2);
let js_zero = v8::Integer::new(scope, 0);
let js_one = v8::Integer::new(scope, 1);
let target = proxy.get_target(scope);
let handler = proxy.get_handler(scope);
proxy_details.set(scope, js_zero.into(), target);
proxy_details.set(scope, js_one.into(), handler);
rv.set(proxy_details.into());
}

fn throw_type_error<'s>(
scope: &mut v8::HandleScope<'s>,
message: impl AsRef<str>,
Expand Down