mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slight improvement to non-ascii file path handling

Browse Source
This commit is contained in:
Jarred Sumner
2022-02-03 01:01:27 -08:00
parent a52a948a70
commit b2a69a35b8
4 changed files with 79 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
.vscode/launch.json generated vendored
View File

@@ -6,7 +6,7 @@
"request": "launch",
"name": "HTTP bench",
"program": "${workspaceFolder}/misctools/http_bench",
"args": ["https://example.com", "--count=80"],
"args": ["https://twitter.com", "--count=100"],
"cwd": "${workspaceFolder}",
"console": "internalConsole"
},
@@ -19,6 +19,33 @@
"cwd": "${workspaceFolder}",
"console": "internalConsole"
},
{
"type": "lldb",
"request": "launch",
"name": "fetch debug #2",
"program": "${workspaceFolder}/misctools/fetch",
"args": ["https://twitter.com", "--verbose"],
"cwd": "${workspaceFolder}",
"console": "internalConsole"
},
{
"type": "lldb",
"request": "launch",
"name": "fetch debug #13w",
"program": "${workspaceFolder}/misctools/fetch",
"args": ["http://127.0.0.1:8080/next.json", "--quiet", "--verbose"],
"cwd": "${workspaceFolder}",
"console": "internalConsole"
},
{
"type": "lldb",
"request": "launch",
"name": "fetch debug #12w",
"program": "${workspaceFolder}/misctools/fetch",
"args": ["https://registry.npmjs.org/next", "--quiet", "--verbose"],
"cwd": "${workspaceFolder}",
"console": "internalConsole"
},
{
"type": "lldb",
"request": "launch",
@@ -78,7 +105,7 @@
"request": "launch",
"name": "bun run debug",
"program": "bun-debug",
"args": ["run", "./integration/bunjs-only-snippets/some-fs.js"],
"args": ["run", "/tmp/bar.js"],
// "args": ["--version"],
"cwd": "${workspaceFolder}",
"console": "internalConsole"
@@ -245,7 +272,7 @@
"--disable-bun.js",
"--disable-hmr"
],
"cwd": "/Users/jarred/Build/big-app/apps/dazzle",
"cwd": "/Users/jarred/Build/lattice/apps/dazzle",
"console": "internalConsole"
},
{
@@ -254,7 +281,7 @@
"name": "Dazzle bun",
"program": "bun-debug",
"args": ["bun", "--use=next"],
"cwd": "/Users/jarred/Build/big-app/apps/dazzle",
"cwd": "/Users/jarred/Build/lattice/apps/dazzle",
"console": "internalConsole",
"env": { "GOMAXPROCS": "1" }
},

15
src/javascript/jsc/bindings/bindings.zig
View File

@@ -161,6 +161,15 @@ pub const ZigString = extern struct {
}
}
pub fn markUTF8(this: *ZigString) void {
this.ptr = @intToPtr([*]const u8, @ptrToInt(this.ptr) | (1 << 61));
}
pub fn setOutputEncoding(this: *ZigString) void {
if (!this.is16Bit()) this.detectEncoding();
if (this.is16Bit()) this.markUTF8();
}
pub inline fn isGloballyAllocated(this: ZigString) bool {
return (@ptrToInt(this.ptr) & (1 << 62)) != 0;
}
@@ -249,6 +258,12 @@ pub const ZigString = extern struct {
return shim.cppFn("toValueGC", .{ this, global });
}
pub fn withEncoding(this: *const ZigString) ZigString {
var out = this.*;
out.setOutputEncoding();
return out;
}
pub fn toJSStringRef(this: *const ZigString) C_API.JSStringRef {
if (comptime @hasDecl(@import("root"), "bindgen")) {
return undefined;

10
src/javascript/jsc/bindings/helpers.h
View File

@@ -73,7 +73,8 @@ namespace Zig {
static const unsigned char *untag(const unsigned char *ptr) {
return reinterpret_cast<const unsigned char *>(
((reinterpret_cast<uintptr_t>(ptr) & ~(static_cast<uint64_t>(1) << 63) &
~(static_cast<uint64_t>(1) << 62))));
~(static_cast<uint64_t>(1) << 62)) &
~(static_cast<uint64_t>(1) << 61)));
}
static const JSC::Identifier toIdentifier(ZigString str, JSC::JSGlobalObject *global) {
@@ -86,12 +87,18 @@ static bool isTaggedUTF16Ptr(const unsigned char *ptr) {
return (reinterpret_cast<uintptr_t>(ptr) & (static_cast<uint64_t>(1) << 63)) != 0;
}
// Do we need to upcase the string?
static bool isTaggedUTF8Ptr(const unsigned char *ptr) {
return (reinterpret_cast<uintptr_t>(ptr) & (static_cast<uint64_t>(1) << 61)) != 0;
}
static bool isTaggedExternalPtr(const unsigned char *ptr) {
return (reinterpret_cast<uintptr_t>(ptr) & (static_cast<uint64_t>(1) << 62)) != 0;
}
static const WTF::String toString(ZigString str) {
if (str.len == 0 || str.ptr == nullptr) { return WTF::String(); }
if (UNLIKELY(isTaggedUTF8Ptr(str.ptr))) { return WTF::String::fromUTF8(untag(str.ptr), str.len); }
return !isTaggedUTF16Ptr(str.ptr)
? WTF::String(WTF::StringImpl::createWithoutCopying(untag(str.ptr), str.len))
@@ -101,6 +108,7 @@ static const WTF::String toString(ZigString str) {
static const WTF::String toStringCopy(ZigString str) {
if (str.len == 0 || str.ptr == nullptr) { return WTF::String(); }
if (UNLIKELY(isTaggedUTF8Ptr(str.ptr))) { return WTF::String::fromUTF8(untag(str.ptr), str.len); }
return !isTaggedUTF16Ptr(str.ptr) ? WTF::String(WTF::StringImpl::create(untag(str.ptr), str.len))
: WTF::String(WTF::StringImpl::create(

37
src/javascript/jsc/node/types.zig
View File

@@ -2097,7 +2097,8 @@ pub const Path = struct {
}
const out = std.fmt.allocPrint(allocator, "{s}{s}", .{ name_, ext }) catch unreachable;
defer allocator.free(out);
return JSC.ZigString.init(out).toValueGC(globalThis);
return JSC.ZigString.init(out).withEncoding().toValueGC(globalThis);
}
if (insert_separator) {
@@ -2105,7 +2106,7 @@ pub const Path = struct {
if (name_with_ext.isEmpty()) {
const out = std.fmt.allocPrint(allocator, "{}{s}{}{}", .{ dir, separator, name_, ext }) catch unreachable;
defer allocator.free(out);
return JSC.ZigString.init(out).toValueGC(globalThis);
return JSC.ZigString.init(out).withEncoding().toValueGC(globalThis);
}
{
@@ -2115,14 +2116,14 @@ pub const Path = struct {
name_with_ext,
}) catch unreachable;
defer allocator.free(out);
return JSC.ZigString.init(out).toValueGC(globalThis);
return JSC.ZigString.init(out).withEncoding().toValueGC(globalThis);
}
}
if (name_with_ext.isEmpty()) {
const out = std.fmt.allocPrint(allocator, "{}{}{}", .{ dir, name_, ext }) catch unreachable;
defer allocator.free(out);
return JSC.ZigString.init(out).toValueGC(globalThis);
return JSC.ZigString.init(out).withEncoding().toValueGC(globalThis);
}
{
@@ -2131,7 +2132,7 @@ pub const Path = struct {
name_with_ext,
}) catch unreachable;
defer allocator.free(out);
return JSC.ZigString.init(out).toValueGC(globalThis);
return JSC.ZigString.init(out).withEncoding().toValueGC(globalThis);
}
}
pub fn isAbsolute(globalThis: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(.C) JSC.JSValue {
@@ -2180,11 +2181,13 @@ pub const Path = struct {
defer arena.deinit();
var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
var to_join = allocator.alloc(string, args_len) catch unreachable;
var possibly_utf16 = false;
for (args_ptr[0..args_len]) |arg, i| {
const zig_str: JSC.ZigString = arg.getZigString(globalThis);
if (zig_str.is16Bit()) {
// TODO: remove this string conversion
to_join[i] = zig_str.toSlice(arena_allocator).slice();
possibly_utf16 = true;
} else {
to_join[i] = zig_str.slice();
}
@@ -2196,7 +2199,10 @@ pub const Path = struct {
PathHandler.joinStringBuf(&buf, to_join, .windows);
var out_str = JSC.ZigString.init(out);
out_str.detectEncoding();
if (possibly_utf16) {
out_str.setOutputEncoding();
}
return out_str.toValueGC(globalThis);
}
pub fn normalize(globalThis: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(.C) JSC.JSValue {
@@ -2217,7 +2223,7 @@ pub const Path = struct {
PathHandler.normalizeBuf(str, &buf, .windows);
var out_str = JSC.ZigString.init(out);
out_str.detectEncoding();
if (str_slice.allocated) out_str.setOutputEncoding();
return out_str.toValueGC(globalThis);
}
pub fn parse(globalThis: *JSC.JSGlobalObject, isWindows: bool, args_ptr: [*]JSC.JSValue, args_len: u16) callconv(.C) JSC.JSValue {
@@ -2242,6 +2248,11 @@ pub const Path = struct {
var base = JSC.ZigString.init(path_name.base);
var name_ = JSC.ZigString.init(path_name.filename);
var ext = JSC.ZigString.init(path_name.ext);
dir.setOutputEncoding();
root.setOutputEncoding();
base.setOutputEncoding();
name_.setOutputEncoding();
ext.setOutputEncoding();
var entries = [10]JSC.ZigString{
JSC.ZigString.init("dir"),
JSC.ZigString.init("root"),
@@ -2280,7 +2291,7 @@ pub const Path = struct {
PathHandler.relativePlatform(from, to, .windows, true);
var out_str = JSC.ZigString.init(out);
out_str.detectEncoding();
if (from_slice.allocated or to_slice.allocated) out_str.setOutputEncoding();
return out_str.toValueGC(globalThis);
}
@@ -2307,8 +2318,8 @@ pub const Path = struct {
parts[i] = args_ptr[0].toSlice(globalThis, arena_allocator).slice();
}
var out = JSC.ZigString.init(PathHandler.joinStringBuf(&out_buf, parts, .posix));
out.detectEncoding();
var out = JSC.ZigString.init(PathHandler.joinAbsStringBuf(Fs.FileSystem.instance.top_level_dir, &out_buf, parts, .posix));
if (arena.state.buffer_list.first != null) out.setOutputEncoding();
return out.toValueGC(globalThis);
}
@@ -2392,7 +2403,7 @@ pub const Process = struct {
if (args_iterator.nextPosix()) |arg0| {
var argv0 = JSC.ZigString.init(std.mem.span(arg0));
argv0.detectEncoding();
argv0.setOutputEncoding();
// https://github.com/yargs/yargs/blob/adb0d11e02c613af3d9427b3028cc192703a3869/lib/utils/process-argv.ts#L1
args_list.appendAssumeCapacity(argv0);
}
@@ -2401,7 +2412,7 @@ pub const Process = struct {
if (JSC.VirtualMachine.vm.argv.len > skip) {
for (JSC.VirtualMachine.vm.argv[skip..]) |arg| {
var str = JSC.ZigString.init(arg);
str.detectEncoding();
str.setOutputEncoding();
args_list.appendAssumeCapacity(str);
}
}
@@ -2417,7 +2428,7 @@ pub const Process = struct {
},
.result => |result| {
var zig_str = JSC.ZigString.init(result);
zig_str.detectEncoding();
zig_str.setOutputEncoding();
const value = zig_str.toValueGC(globalObject);