diff --git a/src/bun.js/api/Timer/TimerObjectInternals.zig b/src/bun.js/api/Timer/TimerObjectInternals.zig index 41d1ab69be..bb73b1abb6 100644 --- a/src/bun.js/api/Timer/TimerObjectInternals.zig +++ b/src/bun.js/api/Timer/TimerObjectInternals.zig @@ -286,8 +286,8 @@ pub fn init( } else { TimeoutObject.js.argumentsSetCached(timer, global, arguments); TimeoutObject.js.callbackSetCached(timer, global, callback); - TimeoutObject.js.idleTimeoutSetCached(timer, global, jsc.jsNumber(interval)); - TimeoutObject.js.repeatSetCached(timer, global, if (kind == .setInterval) jsc.jsNumber(interval) else .null); + TimeoutObject.js.idleTimeoutSetCached(timer, global, .jsNumber(interval)); + TimeoutObject.js.repeatSetCached(timer, global, if (kind == .setInterval) .jsNumber(interval) else .null); // this increments the refcount this.reschedule(timer, vm); diff --git a/src/bun.js/api/bun/socket.zig b/src/bun.js/api/bun/socket.zig index 06896e4f8c..28efbef99d 100644 --- a/src/bun.js/api/bun/socket.zig +++ b/src/bun.js/api/bun/socket.zig @@ -2068,8 +2068,8 @@ pub fn jsCreateSocketPair(global: *jsc.JSGlobalObject, _: *jsc.CallFrame) bun.JS _ = bun.FD.fromNative(fds_[1]).updateNonblocking(true); const array = try jsc.JSValue.createEmptyArray(global, 2); - try array.putIndex(global, 0, jsc.jsNumber(fds_[0])); - try array.putIndex(global, 1, jsc.jsNumber(fds_[1])); + try array.putIndex(global, 0, .jsNumber(fds_[0])); + try array.putIndex(global, 1, .jsNumber(fds_[1])); return array; } diff --git a/src/bun.js/api/bun/udp_socket.zig b/src/bun.js/api/bun/udp_socket.zig index 09f2c6c097..82cdaaea4f 100644 --- a/src/bun.js/api/bun/udp_socket.zig +++ b/src/bun.js/api/bun/udp_socket.zig @@ -94,7 +94,7 @@ fn onData(socket: *uws.udp.Socket, buf: *uws.udp.PacketBuffer, packets: c_int) c _ = callback.call(globalThis, udpSocket.thisValue, &.{ udpSocket.thisValue, udpSocket.config.binary_type.toJS(slice, globalThis) catch return, // TODO: properly propagate exception upwards - jsc.jsNumber(port), + .jsNumber(port), hostname_string.transferToJS(globalThis), }) catch |err| { udpSocket.callErrorHandler(.zero, udpSocket.globalThis.takeException(err)); @@ -429,13 +429,13 @@ pub const UDPSocket = struct { } var addr = std.mem.zeroes(std.posix.sockaddr.storage); - if (!try parseAddr(this, globalThis, jsc.jsNumber(0), arguments[0], &addr)) { + if (!try parseAddr(this, globalThis, .jsNumber(0), arguments[0], &addr)) { return globalThis.throwValue(try bun.jsc.Maybe(void).errnoSys(@as(i32, @intCast(@intFromEnum(std.posix.E.INVAL))), .setsockopt).?.toJS(globalThis)); } var interface = std.mem.zeroes(std.posix.sockaddr.storage); - const res = if (arguments.len > 1 and try parseAddr(this, globalThis, jsc.jsNumber(0), arguments[1], &interface)) blk: { + const res = if (arguments.len > 1 and try parseAddr(this, globalThis, .jsNumber(0), arguments[1], &interface)) blk: { if (addr.family != interface.family) { return globalThis.throwInvalidArguments("Family mismatch between address and interface", .{}); } @@ -468,12 +468,12 @@ pub const UDPSocket = struct { } var source_addr: std.posix.sockaddr.storage = undefined; - if (!try parseAddr(this, globalThis, jsc.jsNumber(0), arguments[0], &source_addr)) { + if (!try parseAddr(this, globalThis, .jsNumber(0), arguments[0], &source_addr)) { return globalThis.throwValue(try bun.jsc.Maybe(void).errnoSys(@as(i32, @intCast(@intFromEnum(std.posix.E.INVAL))), .setsockopt).?.toJS(globalThis)); } var group_addr: std.posix.sockaddr.storage = undefined; - if (!try parseAddr(this, globalThis, jsc.jsNumber(0), arguments[1], &group_addr)) { + if (!try parseAddr(this, globalThis, .jsNumber(0), arguments[1], &group_addr)) { return globalThis.throwValue(try bun.jsc.Maybe(void).errnoSys(@as(i32, @intCast(@intFromEnum(std.posix.E.INVAL))), .setsockopt).?.toJS(globalThis)); } @@ -483,7 +483,7 @@ pub const UDPSocket = struct { var interface: std.posix.sockaddr.storage = undefined; - const res = if (arguments.len > 2 and try parseAddr(this, globalThis, jsc.jsNumber(0), arguments[2], &interface)) blk: { + const res = if (arguments.len > 2 and try parseAddr(this, globalThis, .jsNumber(0), arguments[2], &interface)) blk: { if (source_addr.family != interface.family) { return globalThis.throwInvalidArguments("Family mismatch among source, group and interface addresses", .{}); } @@ -517,7 +517,7 @@ pub const UDPSocket = struct { var addr: std.posix.sockaddr.storage = undefined; - if (!try parseAddr(this, globalThis, jsc.jsNumber(0), arguments[0], &addr)) { + if (!try parseAddr(this, globalThis, .jsNumber(0), arguments[0], &addr)) { return .false; } diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig index 2f8c2aff97..ac5d0453a9 100644 --- a/src/bun.js/api/server.zig +++ b/src/bun.js/api/server.zig @@ -755,7 +755,7 @@ pub fn NewServer(protocol_enum: enum { http, https }, development_kind: enum { d if (object.as(NodeHTTPResponse)) |nodeHttpResponse| { if (nodeHttpResponse.flags.ended or nodeHttpResponse.flags.socket_closed) { - return jsc.jsBoolean(false); + return .jsBoolean(false); } var data_value = jsc.JSValue.zero; @@ -832,21 +832,21 @@ pub fn NewServer(protocol_enum: enum { http, https }, development_kind: enum { d } } } - return jsc.jsBoolean(nodeHttpResponse.upgrade(data_value, sec_websocket_protocol, sec_websocket_extensions)); + return .jsBoolean(nodeHttpResponse.upgrade(data_value, sec_websocket_protocol, sec_websocket_extensions)); } var request = object.as(Request) orelse { return globalThis.throwInvalidArguments("upgrade requires a Request object", .{}); }; - var upgrader = request.request_context.get(RequestContext) orelse return jsc.jsBoolean(false); + var upgrader = request.request_context.get(RequestContext) orelse return .jsBoolean(false); if (upgrader.isAbortedOrEnded()) { - return jsc.jsBoolean(false); + return .jsBoolean(false); } if (upgrader.upgrade_context == null or @intFromPtr(upgrader.upgrade_context) == std.math.maxInt(usize)) { - return jsc.jsBoolean(false); + return .jsBoolean(false); } const resp = upgrader.resp.?; @@ -878,7 +878,7 @@ pub fn NewServer(protocol_enum: enum { http, https }, development_kind: enum { d } if (sec_websocket_key_str.len == 0) { - return jsc.jsBoolean(false); + return .jsBoolean(false); } if (sec_websocket_protocol.len > 0) { @@ -1002,7 +1002,7 @@ pub fn NewServer(protocol_enum: enum { http, https }, development_kind: enum { d ctx, ); - return jsc.jsBoolean(true); + return .jsBoolean(true); } pub fn onReloadFromZig(this: *ThisServer, new_config: *ServerConfig, globalThis: *jsc.JSGlobalObject) void { diff --git a/src/bun.js/api/server/NodeHTTPResponse.zig b/src/bun.js/api/server/NodeHTTPResponse.zig index 6d288d7752..58c9769ce0 100644 --- a/src/bun.js/api/server/NodeHTTPResponse.zig +++ b/src/bun.js/api/server/NodeHTTPResponse.zig @@ -955,11 +955,11 @@ pub fn getOnData(_: *NodeHTTPResponse, thisValue: jsc.JSValue, _: *jsc.JSGlobalO } pub fn getHasCustomOnData(this: *NodeHTTPResponse, _: *jsc.JSGlobalObject) jsc.JSValue { - return jsc.jsBoolean(this.flags.hasCustomOnData); + return .jsBoolean(this.flags.hasCustomOnData); } pub fn getUpgraded(this: *NodeHTTPResponse, _: *jsc.JSGlobalObject) jsc.JSValue { - return jsc.jsBoolean(this.flags.upgraded); + return .jsBoolean(this.flags.upgraded); } pub fn setHasCustomOnData(this: *NodeHTTPResponse, _: *jsc.JSGlobalObject, value: JSValue) void { diff --git a/src/bun.js/bindings/JSGlobalObject.zig b/src/bun.js/bindings/JSGlobalObject.zig index dee6115d8f..4c88bc8dee 100644 --- a/src/bun.js/bindings/JSGlobalObject.zig +++ b/src/bun.js/bindings/JSGlobalObject.zig @@ -358,7 +358,7 @@ pub const JSGlobalObject = opaque { const err = createErrorInstance(this, message, args); err.put(this, ZigString.static("code"), ZigString.init(@tagName(opts.code)).toJS(this)); if (opts.name) |name| err.put(this, ZigString.static("name"), ZigString.init(name).toJS(this)); - if (opts.errno) |errno| err.put(this, ZigString.static("errno"), try jsc.toJS(this, i32, errno)); + if (opts.errno) |errno| err.put(this, ZigString.static("errno"), try .fromAny(this, i32, errno)); return this.throwValue(err); } diff --git a/src/bun.js/bindings/JSObject.zig b/src/bun.js/bindings/JSObject.zig index 17d46a704d..9fc09c90c4 100644 --- a/src/bun.js/bindings/JSObject.zig +++ b/src/bun.js/bindings/JSObject.zig @@ -68,7 +68,7 @@ pub const JSObject = opaque { cell.put( global, field.name, - try jsc.toJS(global, @TypeOf(property), property), + try .fromAny(global, @TypeOf(property), property), ); } diff --git a/src/bun.js/bindings/JSValue.zig b/src/bun.js/bindings/JSValue.zig index c3d3ad518a..581ab51224 100644 --- a/src/bun.js/bindings/JSValue.zig +++ b/src/bun.js/bindings/JSValue.zig @@ -2268,7 +2268,7 @@ pub const JSValue = enum(i64) { try array.putIndex( globalObject, @truncate(i), - jsc.jsNumber(item), + .jsNumber(item), ); } return array; diff --git a/src/bun.js/jsc.zig b/src/bun.js/jsc.zig index 2aec948765..8bec34cfdb 100644 --- a/src/bun.js/jsc.zig +++ b/src/bun.js/jsc.zig @@ -152,14 +152,6 @@ pub const WorkTask = EventLoop.WorkTask; /// Deprecated: Use `bun.sys.Maybe` pub const Maybe = bun.sys.Maybe; -/// Deprecated: Use the .fromAny() decl literal -pub const toJS = JSValue.fromAny; -/// Deprecated: Use the .jsBoolean() decl literal -pub const jsBoolean = JSValue.jsBoolean; -/// Deprecated: Use the .jsEmptyString() decl literal -pub const jsEmptyString = JSValue.jsEmptyString; -/// Deprecated: Use the .jsNumber() decl literal -pub const jsNumber = JSValue.jsNumber; /// Deprecated: Avoid using this in new code. pub const C = @import("./javascript_core_c_api.zig"); /// Deprecated: Remove all of these please. @@ -172,8 +164,6 @@ pub const WebCore = bun.webcore; pub const API = bun.api; /// Deprecated: Use `bun.api.node` pub const Node = bun.api.node; -/// Deprecated: use `bun.api.HTMLRewriter` -pub const Cloudflare = bun.api.HTMLRewriter; const log = bun.Output.scoped(.JSC, true); pub inline fn markBinding(src: std.builtin.SourceLocation) void { diff --git a/src/bun.js/jsc/host_fn.zig b/src/bun.js/jsc/host_fn.zig index 6da0e1b003..11b4cb4b4f 100644 --- a/src/bun.js/jsc/host_fn.zig +++ b/src/bun.js/jsc/host_fn.zig @@ -630,7 +630,7 @@ pub fn wrapInstanceMethod( args[i] = try string_value.getZigString(globalThis); }, - ?jsc.Cloudflare.ContentOptions => { + ?bun.api.HTMLRewriter.ContentOptions => { if (iter.nextEat()) |content_arg| { if (try content_arg.get(globalThis, "html")) |html_val| { args[i] = .{ .html = html_val.toBoolean() }; @@ -783,7 +783,7 @@ pub fn wrapStaticMethod( args[i] = try string_value.getZigString(globalThis); }, - ?jsc.Cloudflare.ContentOptions => { + ?bun.api.HTMLRewriter.ContentOptions => { if (iter.nextEat()) |content_arg| { if (try content_arg.get(globalThis, "html")) |html_val| { args[i] = .{ .html = html_val.toBoolean() }; diff --git a/src/bun.js/node/node_assert_binding.zig b/src/bun.js/node/node_assert_binding.zig index 7355decd01..2d7c264dad 100644 --- a/src/bun.js/node/node_assert_binding.zig +++ b/src/bun.js/node/node_assert_binding.zig @@ -56,7 +56,7 @@ fn diffListToJS(global: *jsc.JSGlobalObject, diff_list: StrDiffList) bun.JSError var obj = jsc.JSValue.createEmptyObjectWithNullPrototype(global); if (obj == .zero) return global.throwOutOfMemory(); obj.put(global, bun.String.static("kind"), jsc.JSValue.jsNumber(@as(u32, @intFromEnum(line.kind)))); - obj.put(global, bun.String.static("value"), jsc.toJS(global, []const u8, line.value)); + obj.put(global, bun.String.static("value"), .fromAny(global, []const u8, line.value)); array.putIndex(global, @truncate(i), obj); } return array; diff --git a/src/bun.js/node/node_crypto_binding.zig b/src/bun.js/node/node_crypto_binding.zig index 94a249e077..0092b7794a 100644 --- a/src/bun.js/node/node_crypto_binding.zig +++ b/src/bun.js/node/node_crypto_binding.zig @@ -358,7 +358,7 @@ const random = struct { const offset = try assertOffset( global, - if (offset_value.isUndefined()) jsc.jsNumber(0) else offset_value, + if (offset_value.isUndefined()) .jsNumber(0) else offset_value, element_size, buf.byte_len, ); @@ -466,7 +466,7 @@ pub fn timingSafeEqual(global: *JSGlobalObject, callFrame: *jsc.CallFrame) JSErr return global.ERR(.CRYPTO_TIMING_SAFE_EQUAL_LENGTH, "Input buffers must have the same byte length", .{}).throw(); } - return jsc.jsBoolean(BoringSSL.CRYPTO_memcmp(l.ptr, r.ptr, l.len) == 0); + return .jsBoolean(BoringSSL.CRYPTO_memcmp(l.ptr, r.ptr, l.len) == 0); } pub fn secureHeapUsed(_: *JSGlobalObject, _: *jsc.CallFrame) JSError!JSValue { diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig index 3bdbf8ff6a..2d691dd51a 100644 --- a/src/bun.js/node/node_fs.zig +++ b/src/bun.js/node/node_fs.zig @@ -3286,11 +3286,11 @@ const Return = struct { }, .buffers => { defer bun.default_allocator.free(this.buffers); - return jsc.toJS(globalObject, []Buffer, this.buffers); + return .fromAny(globalObject, []Buffer, this.buffers); }, .files => { // automatically freed - return jsc.toJS(globalObject, []const bun.String, this.files); + return .fromAny(globalObject, []const bun.String, this.files); }, } } diff --git a/src/bun.js/node/node_net_binding.zig b/src/bun.js/node/node_net_binding.zig index 0e5ff8478b..1bb908171b 100644 --- a/src/bun.js/node/node_net_binding.zig +++ b/src/bun.js/node/node_net_binding.zig @@ -8,7 +8,7 @@ pub fn getDefaultAutoSelectFamily(global: *jsc.JSGlobalObject) jsc.JSValue { fn getter(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue { _ = globalThis; _ = callframe; - return jsc.jsBoolean(autoSelectFamilyDefault); + return .jsBoolean(autoSelectFamilyDefault); } }).getter, 0, .{}); } @@ -26,7 +26,7 @@ pub fn setDefaultAutoSelectFamily(global: *jsc.JSGlobalObject) jsc.JSValue { } const value = arg.toBoolean(); autoSelectFamilyDefault = value; - return jsc.jsBoolean(value); + return .jsBoolean(value); } }).setter, 1, .{}); } @@ -45,7 +45,7 @@ pub fn getDefaultAutoSelectFamilyAttemptTimeout(global: *jsc.JSGlobalObject) jsc fn getter(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue { _ = globalThis; _ = callframe; - return jsc.jsNumber(autoSelectFamilyAttemptTimeoutDefault); + return .jsNumber(autoSelectFamilyAttemptTimeoutDefault); } }).getter, 0, .{}); } @@ -61,7 +61,7 @@ pub fn setDefaultAutoSelectFamilyAttemptTimeout(global: *jsc.JSGlobalObject) jsc var value = try validators.validateInt32(globalThis, arg, "value", .{}, 1, null); if (value < 10) value = 10; autoSelectFamilyAttemptTimeoutDefault = @intCast(value); - return jsc.jsNumber(value); + return .jsNumber(value); } }).setter, 1, .{}); } diff --git a/src/bun.js/node/node_zlib_binding.zig b/src/bun.js/node/node_zlib_binding.zig index 2d5d671ed6..c9b4824020 100644 --- a/src/bun.js/node/node_zlib_binding.zig +++ b/src/bun.js/node/node_zlib_binding.zig @@ -259,7 +259,7 @@ pub fn CompressionStream(comptime T: type) type { pub fn emitError(this: *T, globalThis: *jsc.JSGlobalObject, this_value: jsc.JSValue, err_: Error) !void { var msg_str = bun.String.createFormat("{s}", .{std.mem.sliceTo(err_.msg, 0) orelse ""}) catch bun.outOfMemory(); const msg_value = msg_str.transferToJS(globalThis); - const err_value = jsc.jsNumber(err_.err); + const err_value: jsc.JSValue = .jsNumber(err_.err); var code_str = bun.String.createFormat("{s}", .{std.mem.sliceTo(err_.code, 0) orelse ""}) catch bun.outOfMemory(); const code_value = code_str.transferToJS(globalThis); diff --git a/src/bun.js/node/util/parse_args.zig b/src/bun.js/node/util/parse_args.zig index 8dba5ac7e0..cfd8b444b1 100644 --- a/src/bun.js/node/util/parse_args.zig +++ b/src/bun.js/node/util/parse_args.zig @@ -259,7 +259,7 @@ fn storeOption(globalThis: *JSGlobalObject, option_name: ValueRef, option_value: // We store based on the option value rather than option type, // preserving the users intent for author to deal with. - const new_value = if (value.isUndefined()) jsc.jsBoolean(!negative) else value; + const new_value: JSValue = if (value.isUndefined()) .jsBoolean(!negative) else value; const is_multiple = if (option_idx) |idx| options[idx].multiple else false; if (is_multiple) { @@ -660,7 +660,7 @@ pub fn parseArgs(globalThis: *JSGlobalObject, callframe: *jsc.CallFrame) bun.JSE // Phase 0.B: Parse and validate config const config_strict: JSValue = (if (config) |c| try c.getOwn(globalThis, "strict") else null) orelse JSValue.jsBoolean(true); - var config_allow_positionals: JSValue = if (config) |c| try c.getOwn(globalThis, "allowPositionals") orelse jsc.jsBoolean(!config_strict.toBoolean()) else jsc.jsBoolean(!config_strict.toBoolean()); + var config_allow_positionals: JSValue = if (config) |c| try c.getOwn(globalThis, "allowPositionals") orelse .jsBoolean(!config_strict.toBoolean()) else .jsBoolean(!config_strict.toBoolean()); const config_return_tokens: JSValue = (if (config) |c| try c.getOwn(globalThis, "tokens") else null) orelse JSValue.jsBoolean(false); const config_allow_negative: JSValue = if (config) |c| try c.getOwn(globalThis, "allowNegative") orelse .false else .false; const config_options: JSValue = if (config) |c| try c.getOwn(globalThis, "options") orelse .js_undefined else .js_undefined; @@ -668,7 +668,7 @@ pub fn parseArgs(globalThis: *JSGlobalObject, callframe: *jsc.CallFrame) bun.JSE const strict = try validators.validateBoolean(globalThis, config_strict, "strict", .{}); if (config_allow_positionals.isUndefinedOrNull()) { - config_allow_positionals = jsc.jsBoolean(!strict); + config_allow_positionals = .jsBoolean(!strict); } const allow_positionals = try validators.validateBoolean(globalThis, config_allow_positionals, "allowPositionals", .{}); diff --git a/src/bun.js/node/zlib/NativeBrotli.zig b/src/bun.js/node/zlib/NativeBrotli.zig index 60caa6906f..a9ee6786fd 100644 --- a/src/bun.js/node/zlib/NativeBrotli.zig +++ b/src/bun.js/node/zlib/NativeBrotli.zig @@ -80,7 +80,7 @@ pub fn init(this: *@This(), globalThis: *jsc.JSGlobalObject, callframe: *jsc.Cal var err = this.stream.init(); if (err.isError()) { try impl.emitError(this, globalThis, this_value, err); - return jsc.jsBoolean(false); + return .jsBoolean(false); } const params_ = arguments[0].asArrayBuffer(globalThis).?.asU32(); @@ -93,10 +93,10 @@ pub fn init(this: *@This(), globalThis: *jsc.JSGlobalObject, callframe: *jsc.Cal err = this.stream.setParams(@intCast(i), d); if (err.isError()) { // try impl.emitError(this, globalThis, this_value, err); //XXX: onerror isn't set yet - return jsc.jsBoolean(false); + return .jsBoolean(false); } } - return jsc.jsBoolean(true); + return .jsBoolean(true); } pub fn params(this: *@This(), globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue { diff --git a/src/bun.js/webcore/Blob.zig b/src/bun.js/webcore/Blob.zig index afc77c6366..37d6abf530 100644 --- a/src/bun.js/webcore/Blob.zig +++ b/src/bun.js/webcore/Blob.zig @@ -913,7 +913,7 @@ fn writeFileWithEmptySourceToDestination(ctx: *jsc.JSGlobalObject, destination_b pub fn resolve(result: S3.S3UploadResult, opaque_this: *anyopaque) void { const this: *@This() = @ptrCast(@alignCast(opaque_this)); switch (result) { - .success => this.promise.resolve(this.global, jsc.jsNumber(0)), + .success => this.promise.resolve(this.global, .jsNumber(0)), .failure => |err| this.promise.reject(this.global, err.toJS(this.global, this.store.getPath())), } this.deinit(); @@ -1102,7 +1102,7 @@ pub fn writeFileWithSourceDestination(ctx: *jsc.JSGlobalObject, source_blob: *Bl pub fn resolve(result: S3.S3UploadResult, opaque_self: *anyopaque) void { const this: *@This() = @ptrCast(@alignCast(opaque_self)); switch (result) { - .success => this.promise.resolve(this.global, jsc.jsNumber(this.store.data.bytes.len)), + .success => this.promise.resolve(this.global, .jsNumber(this.store.data.bytes.len)), .failure => |err| this.promise.reject(this.global, err.toJS(this.global, this.store.getPath())), } this.deinit(); @@ -3041,13 +3041,13 @@ pub fn getSize(this: *Blob, _: *jsc.JSGlobalObject) JSValue { } this.resolveSize(); if (this.size == Blob.max_size and this.store != null) { - return jsc.jsNumber(std.math.inf(f64)); + return .jsNumber(std.math.inf(f64)); } else if (this.size == 0 and this.store != null) { if (this.store.?.data == .file and (this.store.?.data.file.seekable orelse true) == false and this.store.?.data.file.max_size == Blob.max_size) { - return jsc.jsNumber(std.math.inf(f64)); + return .jsNumber(std.math.inf(f64)); } } } diff --git a/src/bun.js/webcore/ResumableSink.zig b/src/bun.js/webcore/ResumableSink.zig index a5fe0e3339..6c2fc385c1 100644 --- a/src/bun.js/webcore/ResumableSink.zig +++ b/src/bun.js/webcore/ResumableSink.zig @@ -182,7 +182,7 @@ pub fn ResumableSink( log("paused", .{}); this.status = .paused; } - return jsc.jsBoolean(should_continue); + return .jsBoolean(should_continue); } return globalThis.throwInvalidArguments("ResumableSink.write requires a string or buffer", .{}); diff --git a/src/deps/c_ares.zig b/src/deps/c_ares.zig index 7375688ef2..293412a486 100644 --- a/src/deps/c_ares.zig +++ b/src/deps/c_ares.zig @@ -321,7 +321,7 @@ pub const hostent_with_ttls = struct { bun.dns.addressToJS(&std.net.Address.initIp4(addr[0..4].*, 0), globalThis)) catch return globalThis.throwOutOfMemoryValue(); const ttl: ?c_int = if (count < this.ttls.len) this.ttls[count] else null; - const resultObject = try jsc.JSValue.createObject2(globalThis, &addressKey, &ttlKey, addrString, if (ttl) |val| jsc.jsNumber(val) else .js_undefined); + const resultObject = try jsc.JSValue.createObject2(globalThis, &addressKey, &ttlKey, addrString, if (ttl) |val| .jsNumber(val) else .js_undefined); try array.putIndex(globalThis, count, resultObject); } diff --git a/src/s3/client.zig b/src/s3/client.zig index 086f658d1a..5194fdf2bd 100644 --- a/src/s3/client.zig +++ b/src/s3/client.zig @@ -260,10 +260,10 @@ pub fn writableStream( switch (result) { .success => { if (sink.flushPromise.hasValue()) { - sink.flushPromise.resolve(sink.globalThis, jsc.jsNumber(0)); + sink.flushPromise.resolve(sink.globalThis, .jsNumber(0)); } if (sink.endPromise.hasValue()) { - sink.endPromise.resolve(sink.globalThis, jsc.jsNumber(0)); + sink.endPromise.resolve(sink.globalThis, .jsNumber(0)); } }, .failure => |err| { @@ -389,7 +389,7 @@ pub const S3UploadStreamWrapper = struct { switch (result) { .success => { if (self.endPromise.hasValue()) { - self.endPromise.resolve(self.global, jsc.jsNumber(0)); + self.endPromise.resolve(self.global, .jsNumber(0)); self.endPromise = .empty; } }, diff --git a/src/semver/SemverObject.zig b/src/semver/SemverObject.zig index e5ba25d32c..91c7d90ee2 100644 --- a/src/semver/SemverObject.zig +++ b/src/semver/SemverObject.zig @@ -55,8 +55,8 @@ pub fn order( const right = right_string.toSlice(globalThis, allocator); defer right.deinit(); - if (!strings.isAllASCII(left.slice())) return jsc.jsNumber(0); - if (!strings.isAllASCII(right.slice())) return jsc.jsNumber(0); + if (!strings.isAllASCII(left.slice())) return .jsNumber(0); + if (!strings.isAllASCII(right.slice())) return .jsNumber(0); const left_result = Version.parse(SlicedString.init(left.slice(), left.slice())); const right_result = Version.parse(SlicedString.init(right.slice(), right.slice())); @@ -73,9 +73,9 @@ pub fn order( const right_version = right_result.version.max(); return switch (left_version.orderWithoutBuild(right_version, left.slice(), right.slice())) { - .eq => jsc.jsNumber(0), - .gt => jsc.jsNumber(1), - .lt => jsc.jsNumber(-1), + .eq => .jsNumber(0), + .gt => .jsNumber(1), + .lt => .jsNumber(-1), }; } @@ -121,10 +121,10 @@ pub fn satisfies(globalThis: *jsc.JSGlobalObject, callFrame: *jsc.CallFrame) bun const right_version = right_group.getExactVersion(); if (right_version != null) { - return jsc.jsBoolean(left_version.eql(right_version.?)); + return .jsBoolean(left_version.eql(right_version.?)); } - return jsc.jsBoolean(right_group.satisfies(left_version, right.slice(), left.slice())); + return .jsBoolean(right_group.satisfies(left_version, right.slice(), left.slice())); } const std = @import("std"); diff --git a/src/string.zig b/src/string.zig index ac7d0b0eb3..d17ae1e652 100644 --- a/src/string.zig +++ b/src/string.zig @@ -1069,18 +1069,18 @@ pub const String = extern struct { const args = callFrame.arguments_old(1).slice(); if (args.len == 0 or !args.ptr[0].isString()) { - return jsc.jsNumber(@as(i32, 0)); + return .jsNumber(@as(i32, 0)); } const str = try args[0].toBunString(globalObject); defer str.deref(); if (str.isEmpty()) { - return jsc.jsNumber(@as(i32, 0)); + return .jsNumber(@as(i32, 0)); } const width = str.visibleWidth(false); - return jsc.jsNumber(width); + return .jsNumber(width); } /// Reports owned allocation size, not the actual size of the string.