From a3ee0bb29107076adfd79ebc3c74f83a9dcbcd45 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Thu, 24 Feb 2022 01:46:18 -0800 Subject: [PATCH] fix test failure in path.resolve --- src/javascript/jsc/node/types.zig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/javascript/jsc/node/types.zig b/src/javascript/jsc/node/types.zig index e5d9053639..1174257aba 100644 --- a/src/javascript/jsc/node/types.zig +++ b/src/javascript/jsc/node/types.zig @@ -2310,12 +2310,16 @@ pub const Path = struct { parts[i] = args_ptr[i].toSlice(globalThis, arena_allocator).slice(); } - var out = if (!isWindows) + var out: JSC.ZigString = if (!isWindows) JSC.ZigString.init(PathHandler.joinAbsStringBuf(Fs.FileSystem.instance.top_level_dir, &out_buf, parts, .posix)) else JSC.ZigString.init(PathHandler.joinAbsStringBuf(Fs.FileSystem.instance.top_level_dir, &out_buf, parts, .windows)); - if (arena.state.buffer_list.first != null) out.setOutputEncoding(); + out.len = strings.withoutTrailingSlash(out.slice()).len; + + if (arena.state.buffer_list.first != null) + out.setOutputEncoding(); + return out.toValueGC(globalThis); }