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

cloudflare · Jan 21, 2025 · 98fbf99 · 98fbf99
1 parent b982f8b
commit 98fbf99
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/workerd/api/node/tests/util-nodejs-test.js b/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');
   },
 };
 

diff --git a/src/workerd/api/node/util.c++ b/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,7 +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(),
-      .column = stack_frame->GetColumn(),
+      .columnNumber = stack_frame->GetColumn(),
     });
   }
 

diff --git a/src/workerd/api/node/util.h b/src/workerd/api/node/util.h
@@ -212,11 +212,11 @@ class UtilModule final: public jsg::Object {
     kj::String functionName;
     kj::String scriptName;
     int lineNumber;
-    int column;
+    int columnNumber;
 
     JSG_STRUCT(functionName, scriptName, lineNumber, 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)