From 6fd0043f6bf766cc488a88339059e8879fa07161 Mon Sep 17 00:00:00 2001 From: dave caruso Date: Thu, 17 Aug 2023 20:56:52 -0700 Subject: Add `util.inspect.custom` support to `util.inspect/Bun.inspect/console.log` (#4194) * start work on util.inspect.custom * asdf * finish util inspect custom inspect * inspect * fix tests * revert * tidy * revert * oops * test * fix issues --- src/bun.js/bindings/bindings.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'src/bun.js/bindings/bindings.cpp') diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp index e1d6ba526..5e5f43c99 100644 --- a/src/bun.js/bindings/bindings.cpp +++ b/src/bun.js/bindings/bindings.cpp @@ -3957,6 +3957,7 @@ enum class BuiltinNamesMap : uint8_t { data, toString, redirect, + inspectCustom, }; static JSC::Identifier builtinNameMap(JSC::JSGlobalObject* globalObject, unsigned char name) @@ -3988,7 +3989,46 @@ static JSC::Identifier builtinNameMap(JSC::JSGlobalObject* globalObject, unsigne case BuiltinNamesMap::redirect: { return clientData->builtinNames().redirectPublicName(); } + case BuiltinNamesMap::inspectCustom: { + return Identifier::fromUid(vm.symbolRegistry().symbolForKey("nodejs.util.inspect.custom"_s)); } + } +} + +extern "C" EncodedJSValue JSC__JSValue__callCustomInspectFunction( + JSC::JSGlobalObject* lexicalGlobalObject, + JSC__JSValue encodedFunctionValue, + JSC__JSValue encodedThisValue, + unsigned depth, + unsigned max_depth, + bool colors) +{ + auto* globalObject = jsCast(lexicalGlobalObject); + JSValue functionToCall = JSValue::decode(encodedFunctionValue); + JSValue thisValue = JSValue::decode(encodedThisValue); + JSC::VM& vm = globalObject->vm(); + auto scope = DECLARE_THROW_SCOPE(vm); + + JSFunction* inspectFn = globalObject->utilInspectFunction(); + JSFunction* stylizeFn = colors ? globalObject->utilInspectStylizeColorFunction() : globalObject->utilInspectStylizeNoColorFunction(); + + JSObject* options = JSC::constructEmptyObject(globalObject); + options->putDirect(vm, Identifier::fromString(vm, "stylize"_s), stylizeFn); + options->putDirect(vm, Identifier::fromString(vm, "depth"_s), jsNumber(max_depth)); + options->putDirect(vm, Identifier::fromString(vm, "colors"_s), jsBoolean(colors)); + + auto callData = JSC::getCallData(functionToCall); + MarkedArgumentBuffer arguments; + arguments.append(jsNumber(depth)); + arguments.append(options); + arguments.append(inspectFn); + + auto inspectRet = JSC::call(globalObject, functionToCall, callData, thisValue, arguments); + if (auto exe = scope.exception()) { + scope.clearException(); + return JSValue::encode(exe); + } + RELEASE_AND_RETURN(scope, JSValue::encode(inspectRet)); } JSC__JSValue JSC__JSValue__fastGetDirect_(JSC__JSValue JSValue0, JSC__JSGlobalObject* globalObject, unsigned char arg2) -- cgit v1.2.3