mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-14 04:49:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update query_string_map.zig

Browse Source
This commit is contained in:
Jarred Sumner
2021-09-22 16:19:25 -07:00
parent e00c1e99d6
commit f12dd51c00
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/query_string_map.zig
View File

@@ -158,11 +158,17 @@ pub const URL = struct {
try writer.print("{s}/{s}", .{ this.origin, normalized_path });
}
pub fn joinAlloc(this: *const URL, allocator: *std.mem.Allocator, prefix: string, dirname: string, basename: string, extname: string) !string {
var out: [2048]u8 = undefined;
const normalized_path = joinNormalize(&out, prefix, dirname, basename, extname);
pub fn joinAlloc(this: *const URL, allocator: *std.mem.Allocator, prefix: string, dirname: string, basename: string, extname: string, absolute_path: string) !string {
const has_uplevels = std.mem.indexOf(u8, dirname, "../") != null;
return try std.fmt.allocPrint(allocator, "{s}/{s}", .{ this.origin, normalized_path });
if (has_uplevels) {
return try std.fmt.allocPrint(allocator, "{s}/abs:{s}", .{ this.origin, absolute_path });
} else {
var out: [2048]u8 = undefined;
const normalized_path = joinNormalize(&out, prefix, dirname, basename, extname);
return try std.fmt.allocPrint(allocator, "{s}/{s}", .{ this.origin, normalized_path });
}
}
pub fn parse(base_: string) URL {
@@ -1330,11 +1336,11 @@ test "URL - joinAlloc" {
var url = URL.parse("http://localhost:3000");
var absolute_url = try url.joinAlloc(default_allocator, "/_next/", "src/components", "button", ".js");
try expectString("http://localhost:3000/_next/src/components/button.js", absolute_url);
try expectString("http://localhost:3000/_next/src/components/button.js", absolute_url, "");
absolute_url = try url.joinAlloc(default_allocator, "compiled-", "src/components", "button", ".js");
try expectString("http://localhost:3000/compiled-src/components/button.js", absolute_url);
try expectString("http://localhost:3000/compiled-src/components/button.js", absolute_url, "");
absolute_url = try url.joinAlloc(default_allocator, "compiled-", "", "button", ".js");
try expectString("http://localhost:3000/compiled-button.js", absolute_url);
try expectString("http://localhost:3000/compiled-button.js", absolute_url, "");
}