update util.getCallSites() implementation to follow node.js

Author: anonrig

src/node/internal/util.d.ts

@@ -121,6 +121,6 @@ export function isBoxedPrimitive(
 ): value is number | string | boolean | bigint | symbol;
 
 export function getBuiltinModule(id: string): any;
-export function getCallSite(frames: number): Record<string, string>[];
+export function getCallSites(frames: number): Record<string, string>[];
 export function processExitImpl(code: number): void;
 export const processPlatform: string;

src/node/util.ts

@@ -206,8 +206,13 @@ export function deprecate(
   return fn;
 }
 
-export function getCallSite(frames: number = 10) {
-  return utilImpl.getCallSite(frames);
+// We leave this implementation for compat reasons.
+export function getCallSite(frames: number = 10): Record<string, string>[] {
+  return utilImpl.getCallSites(frames);
+}
+
+export function getCallSites(frames: number = 10): Record<string, string>[] {
+  return utilImpl.getCallSites(frames);
 }
 
 export function isDeepStrictEqual(a: unknown, b: unknown): boolean {

src/workerd/api/node/tests/util-nodejs-test.js

@@ -4343,15 +4343,15 @@ export const debuglog = {
   },
 };
 
-export const getCallSiteTest = {
+export const getCallSitesTest = {
   test() {
-    const callSites = util.getCallSite();
+    const callSites = util.getCallSites();
     assert.strictEqual(callSites.length, 1);
     const [stack] = callSites;
     assert.strictEqual(stack.functionName, 'test');
     assert.strictEqual(stack.scriptName, 'worker');
     assert.strictEqual(typeof stack.lineNumber, 'number');
-    assert.strictEqual(typeof stack.column, 'number');
+    assert.strictEqual(typeof stack.columnNumber, 'number');
   },
 };
 

src/workerd/api/node/util.c++

@@ -177,7 +177,7 @@ jsg::Name UtilModule::getResourceTypeInspect(jsg::Lock& js) {
   return js.newApiSymbol("kResourceTypeInspect"_kj);
 }
 
-kj::Array<UtilModule::CallSiteEntry> UtilModule::getCallSite(jsg::Lock& js, int frames) {
+kj::Array<UtilModule::CallSiteEntry> UtilModule::getCallSites(jsg::Lock& js, int frames) {
   JSG_REQUIRE(
       frames >= 1 && frames <= 200, Error, "Frame count should be between 1 and 200 inclusive."_kj);
   auto stack = v8::StackTrace::CurrentStackTrace(js.v8Isolate, frames + 1);
@@ -193,6 +193,7 @@ kj::Array<UtilModule::CallSiteEntry> UtilModule::getCallSite(jsg::Lock& js, int
       .functionName = js.toString(stack_frame->GetFunctionName()),
       .scriptName = js.toString(stack_frame->GetScriptName()),
       .lineNumber = stack_frame->GetLineNumber(),
+      .columnNumber = stack_frame->GetColumn(),
       .column = stack_frame->GetColumn(),
     });
   }

src/workerd/api/node/util.h

@@ -212,11 +212,13 @@ class UtilModule final: public jsg::Object {
     kj::String functionName;
     kj::String scriptName;
     int lineNumber;
+    // We define column and columnNumber at the same time for compat reasons.
+    int columnNumber;
     int column;
 
-    JSG_STRUCT(functionName, scriptName, lineNumber, column);
+    JSG_STRUCT(functionName, scriptName, lineNumber, columnNumber, column);
   };
-  kj::Array<CallSiteEntry> getCallSite(jsg::Lock& js, int frames);
+  kj::Array<CallSiteEntry> getCallSites(jsg::Lock& js, int frames);
 
 #define V(Type) bool is##Type(jsg::JsValue value);
   JS_UTIL_IS_TYPES(V)
@@ -257,7 +259,7 @@ class UtilModule final: public jsg::Object {
     JSG_METHOD(getProxyDetails);
     JSG_METHOD(previewEntries);
     JSG_METHOD(getConstructorName);
-    JSG_METHOD(getCallSite);
+    JSG_METHOD(getCallSites);
 
 #define V(Type) JSG_METHOD(is##Type);
     JS_UTIL_IS_TYPES(V)