diff --git a/src/bun.js/node/node_cluster_binding.zig b/src/bun.js/node/node_cluster_binding.zig index db4c30f6c4..e206f83a25 100644 --- a/src/bun.js/node/node_cluster_binding.zig +++ b/src/bun.js/node/node_cluster_binding.zig @@ -70,10 +70,10 @@ pub fn sendHelperChild(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFram pub fn onInternalMessageChild(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue { log("onInternalMessageChild", .{}); - const arguments = callframe.arguments_old(2).ptr; + const arg0, const arg1 = callframe.argumentsAsArray(2); // TODO: we should not create two jsc.Strong.Optional here. If absolutely necessary, a single Array. should be all we use. - child_singleton.worker = .create(arguments[0], globalThis); - child_singleton.cb = .create(arguments[1], globalThis); + child_singleton.worker = .create(arg0, globalThis); + child_singleton.cb = .create(arg1, globalThis); try child_singleton.flush(globalThis); return .js_undefined; } diff --git a/src/bun.js/node/node_fs_binding.zig b/src/bun.js/node/node_fs_binding.zig index 57c85544a9..2140296095 100644 --- a/src/bun.js/node/node_fs_binding.zig +++ b/src/bun.js/node/node_fs_binding.zig @@ -210,7 +210,7 @@ pub fn createBinding(globalObject: *jsc.JSGlobalObject) jsc.JSValue { } pub fn createMemfdForTesting(globalObject: *jsc.JSGlobalObject, callFrame: *jsc.CallFrame) bun.JSError!jsc.JSValue { - const arguments = callFrame.arguments_old(1); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return .js_undefined; @@ -220,7 +220,7 @@ pub fn createMemfdForTesting(globalObject: *jsc.JSGlobalObject, callFrame: *jsc. return globalObject.throw("memfd_create is not implemented on this platform", .{}); } - const size = arguments.ptr[0].toInt64(); + const size = arguments[0].toInt64(); switch (bun.sys.memfd_create("my_memfd", std.os.linux.MFD.CLOEXEC)) { .result => |fd| { _ = bun.sys.ftruncate(fd, size); diff --git a/src/bun.js/node/node_net_binding.zig b/src/bun.js/node/node_net_binding.zig index 1bb908171b..da3246e113 100644 --- a/src/bun.js/node/node_net_binding.zig +++ b/src/bun.js/node/node_net_binding.zig @@ -16,11 +16,11 @@ pub fn getDefaultAutoSelectFamily(global: *jsc.JSGlobalObject) jsc.JSValue { pub fn setDefaultAutoSelectFamily(global: *jsc.JSGlobalObject) jsc.JSValue { return jsc.JSFunction.create(global, "setDefaultAutoSelectFamily", (struct { fn setter(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue { - const arguments = callframe.arguments_old(1); + const arguments = callframe.arguments(); if (arguments.len < 1) { return globalThis.throw("missing argument", .{}); } - const arg = arguments.slice()[0]; + const arg = arguments[0]; if (!arg.isBoolean()) { return globalThis.throwInvalidArguments("autoSelectFamilyDefault", .{}); } @@ -53,11 +53,11 @@ pub fn getDefaultAutoSelectFamilyAttemptTimeout(global: *jsc.JSGlobalObject) jsc pub fn setDefaultAutoSelectFamilyAttemptTimeout(global: *jsc.JSGlobalObject) jsc.JSValue { return jsc.JSFunction.create(global, "setDefaultAutoSelectFamilyAttemptTimeout", (struct { fn setter(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue { - const arguments = callframe.arguments_old(1); + const arguments = callframe.arguments(); if (arguments.len < 1) { return globalThis.throw("missing argument", .{}); } - const arg = arguments.slice()[0]; + const arg = arguments[0]; var value = try validators.validateInt32(globalThis, arg, "value", .{}, 1, null); if (value < 10) value = 10; autoSelectFamilyAttemptTimeoutDefault = @intCast(value); diff --git a/src/bun.js/node/node_zlib_binding.zig b/src/bun.js/node/node_zlib_binding.zig index c9b4824020..1dc6ca9635 100644 --- a/src/bun.js/node/node_zlib_binding.zig +++ b/src/bun.js/node/node_zlib_binding.zig @@ -1,10 +1,10 @@ const debug = bun.Output.scoped(.zlib, true); pub fn crc32(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue { - const arguments = callframe.arguments_old(2).ptr; + const dataArg, const valueArg = callframe.argumentsAsArray(2); const data: ZigString.Slice = blk: { - const data: jsc.JSValue = arguments[0]; + const data: jsc.JSValue = dataArg; if (data == .zero) { return globalThis.throwInvalidArgumentTypeValue("data", "string or an instance of Buffer, TypedArray, or DataView", .js_undefined); @@ -22,7 +22,7 @@ pub fn crc32(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSE defer data.deinit(); const value: u32 = blk: { - const value: jsc.JSValue = arguments[1]; + const value: jsc.JSValue = valueArg; if (value == .zero) { break :blk 0; } diff --git a/src/bun.js/test/expect.zig b/src/bun.js/test/expect.zig index 13d1a2891d..def8597653 100644 --- a/src/bun.js/test/expect.zig +++ b/src/bun.js/test/expect.zig @@ -394,8 +394,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); var _msg: ZigString = ZigString.Empty; @@ -439,8 +438,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); var _msg: ZigString = ZigString.Empty; @@ -480,8 +478,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callframe.this(); - const arguments_ = callframe.arguments_old(2); - const arguments = arguments_.slice(); + const arguments = callframe.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBe() takes 1 argument", .{}); @@ -543,8 +540,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callframe.this(); - const arguments_ = callframe.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callframe.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toHaveLength() takes 1 argument", .{}); @@ -610,8 +606,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeOneOf() takes 1 argument", .{}); @@ -693,8 +688,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toContain() takes 1 argument", .{}); @@ -788,8 +782,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toContainKey() takes 1 argument", .{}); @@ -837,8 +830,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toContainKeys() takes 1 argument", .{}); @@ -903,8 +895,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalObject); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalObject.throwInvalidArguments("toContainAllKeys() takes 1 argument", .{}); @@ -968,8 +959,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toContainAnyKeys() takes 1 argument", .{}); @@ -1029,8 +1019,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalObject); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalObject.throwInvalidArguments("toContainValue() takes 1 argument", .{}); @@ -1084,8 +1073,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalObject); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalObject.throwInvalidArguments("toContainValues() takes 1 argument", .{}); @@ -1148,8 +1136,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalObject); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalObject.throwInvalidArguments("toContainAllValues() takes 1 argument", .{}); @@ -1218,8 +1205,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalObject); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalObject.throwInvalidArguments("toContainAnyValues() takes 1 argument", .{}); @@ -1282,8 +1268,7 @@ pub const Expect = struct { ) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toContainEqual() takes 1 argument", .{}); @@ -1564,8 +1549,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toEqual() requires 1 argument", .{}); @@ -1603,8 +1587,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toStrictEqual() requires 1 argument", .{}); @@ -1637,8 +1620,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(2); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toHaveProperty() requires at least 1 argument", .{}); @@ -1779,8 +1761,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeGreaterThan() requires 1 argument", .{}); @@ -1839,8 +1820,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeGreaterThanOrEqual() requires 1 argument", .{}); @@ -1899,8 +1879,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeLessThan() requires 1 argument", .{}); @@ -1959,8 +1938,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeLessThanOrEqual() requires 1 argument", .{}); @@ -2019,8 +1997,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const thisArguments = callFrame.arguments_old(2); - const arguments = thisArguments.ptr[0..thisArguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeCloseTo() requires at least 1 argument. Expected value must be a number", .{}); @@ -2508,8 +2485,7 @@ pub const Expect = struct { pub fn toThrowErrorMatchingSnapshot(this: *Expect, globalThis: *JSGlobalObject, callFrame: *CallFrame) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(2); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); incrementExpectCallCounter(); @@ -2562,8 +2538,7 @@ pub const Expect = struct { pub fn toThrowErrorMatchingInlineSnapshot(this: *Expect, globalThis: *JSGlobalObject, callFrame: *CallFrame) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(2); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); incrementExpectCallCounter(); @@ -2603,8 +2578,7 @@ pub const Expect = struct { pub fn toMatchInlineSnapshot(this: *Expect, globalThis: *JSGlobalObject, callFrame: *CallFrame) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(2); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); incrementExpectCallCounter(); @@ -2823,8 +2797,7 @@ pub const Expect = struct { pub fn toMatchSnapshot(this: *Expect, globalThis: *JSGlobalObject, callFrame: *CallFrame) bun.JSError!JSValue { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(2); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); incrementExpectCallCounter(); @@ -3102,8 +3075,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeArrayOfSize() requires 1 argument", .{}); @@ -3169,8 +3141,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeTypeOf() requires 1 argument", .{}); @@ -3467,8 +3438,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(2); - const arguments = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeWithin() requires 2 arguments", .{}); @@ -3526,8 +3496,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toEqualIgnoringWhitespace() requires 1 argument", .{}); @@ -3736,8 +3705,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toInclude() requires 1 argument", .{}); @@ -3790,8 +3758,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(2); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 2) { return globalThis.throwInvalidArguments("toIncludeRepeated() requires 2 arguments", .{}); @@ -3892,8 +3859,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toSatisfy() requires 1 argument", .{}); @@ -3944,8 +3910,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toStartWith() requires 1 argument", .{}); @@ -3998,8 +3963,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toEndWith() requires 1 argument", .{}); @@ -4052,8 +4016,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toBeInstanceOf() requires 1 argument", .{}); @@ -4098,8 +4061,7 @@ pub const Expect = struct { defer this.postMatch(globalThis); const thisValue = callFrame.this(); - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("toMatch() requires 1 argument", .{}); @@ -4217,8 +4179,7 @@ pub const Expect = struct { jsc.markBinding(@src()); const thisValue = callframe.this(); - const arguments_ = callframe.arguments_old(1); - const arguments: []const JSValue = arguments_.slice(); + const arguments = callframe.arguments(); defer this.postMatch(globalThis); const value: JSValue = try this.getValue(globalThis, thisValue, "toHaveBeenCalledTimes", "expected"); @@ -4889,8 +4850,7 @@ pub const Expect = struct { pub fn assertions(globalThis: *JSGlobalObject, callFrame: *CallFrame) bun.JSError!JSValue { defer globalThis.bunVM().autoGarbageCollect(); - const arguments_ = callFrame.arguments_old(1); - const arguments = arguments_.slice(); + const arguments = callFrame.arguments(); if (arguments.len < 1) { return globalThis.throwInvalidArguments("expect.assertions() takes 1 argument", .{}); @@ -4939,7 +4899,7 @@ pub const Expect = struct { } pub fn doUnreachable(globalThis: *JSGlobalObject, callframe: *CallFrame) bun.JSError!JSValue { - const arg = callframe.arguments_old(1).ptr[0]; + const arg = callframe.argumentsAsArray(1)[0]; if (arg.isEmptyOrUndefinedOrNull()) { const error_value = bun.String.init("reached unreachable code").toErrorInstance(globalThis); @@ -5247,8 +5207,7 @@ pub const ExpectAny = struct { } pub fn call(globalThis: *JSGlobalObject, callFrame: *CallFrame) bun.JSError!JSValue { - const _arguments = callFrame.arguments_old(1); - const arguments: []const JSValue = _arguments.ptr[0.._arguments.len]; + const arguments = callFrame.arguments(); if (arguments.len == 0) { return globalThis.throw("any() expects to be passed a constructor function. Please pass one or use anything() to match any object.", .{}); @@ -5507,12 +5466,11 @@ pub const ExpectMatcherContext = struct { } pub fn equals(_: *ExpectMatcherContext, globalThis: *JSGlobalObject, callframe: *CallFrame) bun.JSError!JSValue { - var arguments = callframe.arguments_old(3); + const arguments = callframe.arguments(); if (arguments.len < 2) { return globalThis.throw("expect.extends matcher: this.util.equals expects at least 2 arguments", .{}); } - const args = arguments.slice(); - return JSValue.jsBoolean(try args[0].jestDeepEquals(args[1], globalThis)); + return JSValue.jsBoolean(try arguments[0].jestDeepEquals(arguments[1], globalThis)); } }; diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig index a23a4ca1bc..7722e74680 100644 --- a/src/bun.js/test/jest.zig +++ b/src/bun.js/test/jest.zig @@ -320,12 +320,12 @@ pub const Jest = struct { return globalThis.throw("Cannot use " ++ name ++ "() outside of the test runner. Run \"bun test\" to run tests.", .{}); }; - const arguments = callframe.arguments_old(2); + const arguments = callframe.arguments(); if (arguments.len < 1) { return globalThis.throwNotEnoughArguments("callback", 1, arguments.len); } - const function = arguments.ptr[0]; + const function = arguments[0]; if (function.isEmptyOrUndefinedOrNull() or !function.isCallable()) { return globalThis.throwInvalidArgumentType(name, "callback", "function"); } @@ -638,10 +638,9 @@ pub const TestScope = struct { pub fn onReject(globalThis: *JSGlobalObject, callframe: *CallFrame) bun.JSError!JSValue { debug("onReject", .{}); - const arguments = callframe.arguments_old(2); - const err = arguments.ptr[0]; + const err, const taskJsvalue = callframe.argumentsAsArray(2); _ = globalThis.bunVM().uncaughtException(globalThis, err, true); - var task: *TestRunnerTask = arguments.ptr[1].asPromisePtr(TestRunnerTask); + var task: *TestRunnerTask = taskJsvalue.asPromisePtr(TestRunnerTask); task.handleResult(.{ .fail = expect.active_test_expectation_counter.actual }, .promise); globalThis.bunVM().autoGarbageCollect(); return .js_undefined; @@ -650,8 +649,8 @@ pub const TestScope = struct { pub fn onResolve(globalThis: *JSGlobalObject, callframe: *CallFrame) bun.JSError!JSValue { debug("onResolve", .{}); - const arguments = callframe.arguments_old(2); - var task: *TestRunnerTask = arguments.ptr[1].asPromisePtr(TestRunnerTask); + _, const taskJsvalue = callframe.argumentsAsArray(2); + var task: *TestRunnerTask = taskJsvalue.asPromisePtr(TestRunnerTask); task.handleResult(.{ .pass = expect.active_test_expectation_counter.actual }, .promise); globalThis.bunVM().autoGarbageCollect(); return .js_undefined; @@ -663,7 +662,7 @@ pub const TestScope = struct { callframe: *CallFrame, ) bun.JSError!JSValue { const function = callframe.callee(); - const args = callframe.arguments_old(1); + const args = callframe.arguments(); defer globalThis.bunVM().autoGarbageCollect(); if (jsc.host_fn.getFunctionData(function)) |data| { @@ -677,7 +676,7 @@ pub const TestScope = struct { jsc.host_fn.setFunctionData(function, null); if (args.len > 0) { - const err = args.ptr[0]; + const err = args[0]; if (err.isEmptyOrUndefinedOrNull()) { debug("done()", .{}); task.handleResult(no_err_result, .callback); @@ -922,12 +921,12 @@ pub const DescribeScope = struct { fn createCallback(comptime hook: LifecycleHook) CallbackFn { return struct { pub fn run(globalThis: *JSGlobalObject, callframe: *CallFrame) bun.JSError!jsc.JSValue { - const arguments = callframe.arguments_old(2); + const arguments = callframe.arguments(); if (arguments.len < 1) { return globalThis.throwNotEnoughArguments("callback", 1, arguments.len); } - const cb = arguments.ptr[0]; + const cb = arguments[0]; if (!cb.isObject() or !cb.isCallable()) { return globalThis.throwInvalidArgumentType(@tagName(hook), "callback", "function"); } @@ -944,14 +943,14 @@ pub const DescribeScope = struct { callframe: *CallFrame, ) bun.JSError!JSValue { const function = callframe.callee(); - const args = callframe.arguments_old(1); + const args = callframe.arguments(); defer ctx.bunVM().autoGarbageCollect(); if (jsc.host_fn.getFunctionData(function)) |data| { var scope = bun.cast(*DescribeScope, data); jsc.host_fn.setFunctionData(function, null); if (args.len > 0) { - const err = args.ptr[0]; + const err = args[0]; if (!err.isEmptyOrUndefinedOrNull()) { _ = ctx.bunVM().uncaughtException(ctx.bunVM().global, err, true); } @@ -1802,8 +1801,7 @@ inline fn createScope( comptime tag: Tag, ) bun.JSError!JSValue { const this = callframe.this(); - const arguments = callframe.arguments_old(3); - const args = arguments.slice(); + const args = callframe.arguments(); if (args.len == 0) { return globalThis.throwPretty("{s} expects a description or function", .{signature}); @@ -1997,8 +1995,7 @@ inline fn createIfScope( comptime Scope: type, comptime tag: Tag, ) bun.JSError!JSValue { - const arguments = callframe.arguments_old(1); - const args = arguments.slice(); + const args = callframe.arguments(); if (args.len == 0) { return globalThis.throwPretty("{s} expects a condition", .{signature});