aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/javascript/jsc/bindings/bindings.zig27
-rw-r--r--src/javascript/jsc/bindings/exports.zig25
-rw-r--r--src/string_immutable.zig49
3 files changed, 90 insertions, 11 deletions
diff --git a/src/javascript/jsc/bindings/bindings.zig b/src/javascript/jsc/bindings/bindings.zig
index 0eaf2a277..8116a6ffd 100644
--- a/src/javascript/jsc/bindings/bindings.zig
+++ b/src/javascript/jsc/bindings/bindings.zig
@@ -152,6 +152,15 @@ pub const ZigString = extern struct {
return ZigString{ .ptr = slice_.ptr, .len = slice_.len };
}
+ pub fn toBase64DataURL(this: ZigString, allocator: std.mem.Allocator) ![]const u8 {
+ const slice_ = this.slice();
+ const size = std.base64.standard.Encoder.calcSize(slice_.len);
+ var buf = try allocator.alloc(u8, size + "data:;base64,".len);
+ var encoded = std.base64.url_safe.Encoder.encode(buf["data:;base64,".len..], slice_);
+ buf[0.."data:;base64,".len].* = "data:;base64,".*;
+ return buf[0 .. "data:;base64,".len + encoded.len];
+ }
+
pub fn detectEncoding(this: *ZigString) void {
for (this.slice()) |char| {
if (char > 127) {
@@ -1928,6 +1937,24 @@ pub const JSValue = enum(i64) {
});
}
+ pub fn toFmt(
+ this: JSValue,
+ global: *JSGlobalObject,
+ formatter: *Exports.ZigConsoleClient.Formatter,
+ ) Exports.ZigConsoleClient.Formatter.ZigFormatter {
+ formatter.remaining_values = &[_]JSValue{};
+ if (formatter.map_node) |node| {
+ node.release();
+ formatter.map_node = null;
+ }
+
+ return Exports.ZigConsoleClient.Formatter.ZigFormatter{
+ .formatter = formatter,
+ .value = this,
+ .global = global,
+ };
+ }
+
pub fn asObject(this: JSValue) JSObject {
return cppFn("asObject", .{
this,
diff --git a/src/javascript/jsc/bindings/exports.zig b/src/javascript/jsc/bindings/exports.zig
index ebf6ce47f..de20758b1 100644
--- a/src/javascript/jsc/bindings/exports.zig
+++ b/src/javascript/jsc/bindings/exports.zig
@@ -943,11 +943,34 @@ pub const ZigConsoleClient = struct {
}
pub const Formatter = struct {
- remaining_values: []JSValue,
+ remaining_values: []JSValue = &[_]JSValue{},
map: Visited.Map = undefined,
map_node: ?*Visited.Pool.Node = null,
hide_native: bool = false,
+ pub const ZigFormatter = struct {
+ formatter: *Formatter,
+ global: *JSGlobalObject,
+ value: JSValue,
+
+ pub const WriteError = error{UhOh};
+ pub fn format(self: ZigFormatter, comptime _: []const u8, _: std.fmt.FormatOptions, writer: anytype) !void {
+ self.formatter.remaining_values = &[_]JSValue{self.value};
+ defer {
+ self.formatter.remaining_values = &[_]JSValue{};
+ }
+
+ self.formatter.format(
+ Tag.get(self.value, self.global),
+ @TypeOf(writer),
+ writer,
+ self.value,
+ self.global,
+ false,
+ );
+ }
+ };
+
// For detecting circular references
pub const Visited = struct {
const ObjectPool = @import("../../../pool.zig").ObjectPool;
diff --git a/src/string_immutable.zig b/src/string_immutable.zig
index 207b6634d..3a555d670 100644
--- a/src/string_immutable.zig
+++ b/src/string_immutable.zig
@@ -208,6 +208,31 @@ test "eqlComptimeCheckLen" {
}
}
+test "eqlComptimeUTF16" {
+ try std.testing.expectEqual(eqlComptimeUTF16(std.unicode.utf8ToUtf16LeStringLiteral("bun-darwin-aarch64.zip"), "bun-darwin-aarch64.zip"), true);
+ const sizes = [_]u16{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 23, 22, 24 };
+ inline for (sizes) |size| {
+ var buf: [size]u16 = undefined;
+ std.mem.set(u16, &buf, @as(u8, 'a'));
+ var buf_copy: [size]u16 = undefined;
+ std.mem.set(u16, &buf_copy, @as(u8, 'a'));
+
+ var bad: [size]u16 = undefined;
+ std.mem.set(u16, &bad, @as(u16, 'b'));
+ try std.testing.expectEqual(std.mem.eql(u16, &buf, &buf_copy), eqlComptimeUTF16(&buf, comptime &brk: {
+ var buf_copy_: [size]u8 = undefined;
+ std.mem.set(u8, &buf_copy_, @as(u8, 'a'));
+ break :brk buf_copy_;
+ }));
+
+ try std.testing.expectEqual(std.mem.eql(u16, &buf, &bad), eqlComptimeUTF16(&bad, comptime &brk: {
+ var buf_copy_: [size]u8 = undefined;
+ std.mem.set(u8, &buf_copy_, @as(u8, 'a'));
+ break :brk buf_copy_;
+ }));
+ }
+}
+
test "copyLowercase" {
{
var in = "Hello, World!";
@@ -315,7 +340,7 @@ pub fn quotedAlloc(allocator: std.mem.Allocator, self: string) !string {
pub fn eqlAnyComptime(self: string, comptime list: []const string) bool {
inline for (list) |item| {
- if (eqlComptimeCheckLen(self, item, true)) return true;
+ if (eqlComptimeCheckLenWithType(u8, self, item, true)) return true;
}
return false;
@@ -353,14 +378,18 @@ pub inline fn eqlInsensitive(self: string, other: anytype) bool {
}
pub fn eqlComptime(self: string, comptime alt: anytype) bool {
- return eqlComptimeCheckLen(self, alt, true);
+ return eqlComptimeCheckLenWithType(u8, self, alt, true);
+}
+
+pub fn eqlComptimeUTF16(self: []const u16, comptime alt: []const u8) bool {
+ return eqlComptimeCheckLenWithType(u16, self, comptime std.unicode.utf8ToUtf16LeStringLiteral(alt), true);
}
pub fn eqlComptimeIgnoreLen(self: string, comptime alt: anytype) bool {
- return eqlComptimeCheckLen(self, alt, false);
+ return eqlComptimeCheckLenWithType(u8, self, alt, false);
}
-inline fn eqlComptimeCheckLen(a: string, comptime b: anytype, comptime check_len: bool) bool {
+inline fn eqlComptimeCheckLenWithType(comptime Type: type, a: []const Type, comptime b: anytype, comptime check_len: bool) bool {
@setEvalBranchQuota(9999);
if (comptime check_len) {
if (comptime b.len == 0) {
@@ -375,11 +404,13 @@ inline fn eqlComptimeCheckLen(a: string, comptime b: anytype, comptime check_len
const len = comptime b.len;
comptime var dword_length = b.len >> 3;
+ const slice = comptime if (@typeInfo(@TypeOf(b)) != .Pointer) b else std.mem.span(b);
+ const divisor = comptime @sizeOf(Type);
+
comptime var b_ptr: usize = 0;
inline while (dword_length > 0) : (dword_length -= 1) {
- const slice = comptime if (@typeInfo(@TypeOf(b)) != .Pointer) b else std.mem.span(b);
- if (@bitCast(usize, a[b_ptr..][0..@sizeOf(usize)].*) != comptime @bitCast(usize, (slice[b_ptr..])[0..@sizeOf(usize)].*))
+ if (@bitCast(usize, a[b_ptr..][0 .. @sizeOf(usize) / divisor].*) != comptime @bitCast(usize, (slice[b_ptr..])[0 .. @sizeOf(usize) / divisor].*))
return false;
comptime b_ptr += @sizeOf(usize);
if (comptime b_ptr == b.len) return true;
@@ -387,8 +418,7 @@ inline fn eqlComptimeCheckLen(a: string, comptime b: anytype, comptime check_len
if (comptime @sizeOf(usize) == 8) {
if (comptime (len & 4) != 0) {
- const slice = comptime if (@typeInfo(@TypeOf(b)) != .Pointer) b else std.mem.span(b);
- if (@bitCast(u32, a[b_ptr..][0..@sizeOf(u32)].*) != comptime @bitCast(u32, (slice[b_ptr..])[0..@sizeOf(u32)].*))
+ if (@bitCast(u32, a[b_ptr..][0 .. @sizeOf(u32) / divisor].*) != comptime @bitCast(u32, (slice[b_ptr..])[0 .. @sizeOf(u32) / divisor].*))
return false;
comptime b_ptr += @sizeOf(u32);
@@ -398,8 +428,7 @@ inline fn eqlComptimeCheckLen(a: string, comptime b: anytype, comptime check_len
}
if (comptime (len & 2) != 0) {
- const slice = comptime if (@typeInfo(@TypeOf(b)) != .Pointer) b else std.mem.span(b);
- if (@bitCast(u16, a[b_ptr..][0..@sizeOf(u16)].*) != comptime @bitCast(u16, slice[b_ptr .. b_ptr + @sizeOf(u16)].*))
+ if (@bitCast(u16, a[b_ptr..][0 .. @sizeOf(u16) / divisor].*) != comptime @bitCast(u16, slice[b_ptr .. b_ptr + (@sizeOf(u16) / divisor)].*))
return false;
comptime b_ptr += @sizeOf(u16);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-30 03:49:12 +0000