util: fix nested proxy inspection

Fixes: #61061
PR-URL: #61077
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>

Author: BridgeAR

lib/internal/util/inspect.js

@@ -1118,17 +1118,29 @@ function formatValue(ctx, value, recurseTimes, typedArray) {
 
 // Memorize the context for custom inspection on proxies.
 constcontext=value;
+letproxies=0;
 // Always check for proxies to prevent side effects and to prevent triggering
 // any proxy handlers.
-constproxy=getProxyDetails(value,!!ctx.showProxy);
+letproxy=getProxyDetails(value,!!ctx.showProxy);
 if(proxy!==undefined){
-if(proxy===null||proxy[0]===null){
-returnctx.stylize('<Revoked Proxy>','special');
-}
 if(ctx.showProxy){
+if(proxy[0]===null){
+returnctx.stylize('<Revoked Proxy>','special');
+}
 returnformatProxy(ctx,proxy,recurseTimes);
 }
-value=proxy;
+do{
+if(proxy===null){
+letformatted=ctx.stylize('<Revoked Proxy>','special');
+for(leti=0;i<proxies;i++){
+formatted=`${ctx.stylize('Proxy(','special')}${formatted}${ctx.stylize(')','special')}`;
+}
+returnformatted;
+}
+value=proxy;
+proxy=getProxyDetails(value,false);
+proxies+=1;
+}while(proxy!==undefined);
 }
 
 // Provide a hook for user-specified inspect functions.
@@ -1144,7 +1156,7 @@ function formatValue(ctx, value, recurseTimes, typedArray) {
 // a counter internally.
 constdepth=ctx.depth===null ? null : ctx.depth-recurseTimes;
 constisCrossContext=
-proxy!==undefined||!FunctionPrototypeSymbolHasInstance(Object,context);
+proxies!==0||!FunctionPrototypeSymbolHasInstance(Object,context);
 constret=FunctionPrototypeCall(
 maybeCustom,
 context,
@@ -1180,10 +1192,12 @@ function formatValue(ctx, value, recurseTimes, typedArray) {
 returnctx.stylize(`[Circular *${index}]`,'special');
 }
 
-constformatted=formatRaw(ctx,value,recurseTimes,typedArray);
+letformatted=formatRaw(ctx,value,recurseTimes,typedArray);
 
-if(proxy!==undefined){
-return`${ctx.stylize('Proxy(','special')}${formatted}${ctx.stylize(')','special')}`;
+if(proxies!==0){
+for(leti=0;i<proxies;i++){
+formatted=`${ctx.stylize('Proxy(','special')}${formatted}${ctx.stylize(')','special')}`;
+}
 }
 
 returnformatted;
@@ -2691,7 +2705,7 @@ function hasBuiltInToString(value) {
 if(proxyTarget===null){
 returntrue;
 }
-value=proxyTarget;
+returnhasBuiltInToString(proxyTarget);
 }
 
 lethasOwnToString=ObjectPrototypeHasOwnProperty;

test/parallel/test-util-inspect-proxy.js

@@ -42,7 +42,11 @@ proxyObj = new Proxy(target, handler);
 util.inspect(proxyObj,opts);
 
 // Make sure inspecting object does not trigger any proxy traps.
-util.format('%s',proxyObj);
+// %i%f%d use Symbol.toPrimitive to convert the value to a string.
+// %j uses JSON.stringify, accessing the value's toJSON and toString method.
+util.format('%s%o%O%c',proxyObj,proxyObj,proxyObj,proxyObj);
+constnestedProxy=newProxy(newProxy({},handler),{});
+util.format('%s%o%O%c',nestedProxy,nestedProxy,nestedProxy,nestedProxy);
 
 // getProxyDetails is an internal method, not intended for public use.
 // This is here to test that the internals are working correctly.
@@ -135,6 +139,10 @@ const expected6 = 'Proxy [\n' +
 ' Proxy [ Proxy [Array], Proxy [Array] ]\n'+
 ' ]\n'+
 ']';
+constexpected2NoShowProxy='Proxy(Proxy({}))';
+constexpected3NoShowProxy='Proxy(Proxy(Proxy({})))';
+constexpected4NoShowProxy='Proxy(Proxy(Proxy(Proxy({}))))';
+constexpected5NoShowProxy='Proxy(Proxy(Proxy(Proxy(Proxy({})))))';
 assert.strictEqual(
 util.inspect(proxy1,{showProxy: 1,depth: null}),
 expected1);
@@ -144,11 +152,11 @@ assert.strictEqual(util.inspect(proxy4, opts), expected4);
 assert.strictEqual(util.inspect(proxy5,opts),expected5);
 assert.strictEqual(util.inspect(proxy6,opts),expected6);
 assert.strictEqual(util.inspect(proxy1),expected0);
-assert.strictEqual(util.inspect(proxy2),expected0);
-assert.strictEqual(util.inspect(proxy3),expected0);
-assert.strictEqual(util.inspect(proxy4),expected0);
-assert.strictEqual(util.inspect(proxy5),expected0);
-assert.strictEqual(util.inspect(proxy6),expected0);
+assert.strictEqual(util.inspect(proxy2),expected2NoShowProxy);
+assert.strictEqual(util.inspect(proxy3),expected3NoShowProxy);
+assert.strictEqual(util.inspect(proxy4),expected2NoShowProxy);
+assert.strictEqual(util.inspect(proxy5),expected4NoShowProxy);
+assert.strictEqual(util.inspect(proxy6),expected5NoShowProxy);
 
 // Just for fun, let's create a Proxy using Arrays.
 constproxy7=newProxy([],[]);
@@ -188,3 +196,24 @@ assert.strictEqual(
 ')\x1B[39m'
 );
 assert.strictEqual(util.format('%s',proxy12),'Proxy([ 1, 2, 3 ])');
+
+{
+// Nested proxies should not trigger any proxy handlers.
+constnestedProxy=newProxy(newProxy(newProxy({},handler),{}),{});
+
+assert.strictEqual(
+util.inspect(nestedProxy,{showProxy: true}),
+'Proxy [ Proxy [ Proxy [ {}, [Object] ], {} ], {} ]'
+);
+assert.strictEqual(util.inspect(nestedProxy,{showProxy: false}),expected3NoShowProxy);
+}
+
+{
+// Nested revoked proxies should work as expected as well as custom inspection functions.
+constrevocable=Proxy.revocable({},handler);
+revocable.revoke();
+constnestedProxy=newProxy(revocable.proxy,{});
+
+assert.strictEqual(util.inspect(nestedProxy,{showProxy: true}),'Proxy [ <Revoked Proxy>, {} ]');
+assert.strictEqual(util.inspect(nestedProxy,{showProxy: false}),'Proxy(<Revoked Proxy>)');
+}