Skip to content

Commit 15be423

Browse files
mookumsmookums
committed
handling relative base URLs
1 parent f10bee8 commit 15be423

File tree

2 files changed

+72
-69
lines changed

2 files changed

+72
-69
lines changed

‎src/browser/browser.zig‎

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -205,44 +205,6 @@ pub const Session = struct {
205205
}
206206
};
207207

208-
// Properly stitches two URLs together.
209-
//
210-
// For URLs with a path, it will replace the last entry with the src.
211-
// For URLs without a path, it will add src as the path.
212-
fn stitchUrl(allocator: std.mem.Allocator, src: []const u8, base: []const u8) ![]const u8 {
213-
// Traversing until the path
214-
var slash_iter = std.mem.splitScalar(u8, base, '/');
215-
_ = slash_iter.next();
216-
_ = slash_iter.next();
217-
_ = slash_iter.next();
218-
219-
if (slash_iter.index) |path_index| {
220-
// Remove final slash from pathless base slice.
221-
const pathless_base = base[0 .. path_index - 1];
222-
const path = slash_iter.rest();
223-
224-
if (path.len > 0) {
225-
var split_halves = std.mem.splitBackwardsScalar(u8, path, '/');
226-
_ = split_halves.first();
227-
const stripped_path = split_halves.rest();
228-
229-
if (stripped_path.len > 0) {
230-
// Multi path entry
231-
return try std.fmt.allocPrint(allocator, "{s}/{s}/{s}", .{ pathless_base, stripped_path, src });
232-
} else {
233-
// Single path entry
234-
return try std.fmt.allocPrint(allocator, "{s}/{s}", .{ pathless_base, src });
235-
}
236-
} else {
237-
// Slash at the end case
238-
return try std.fmt.allocPrint(allocator, "{s}/{s}", .{ pathless_base, src });
239-
}
240-
} else {
241-
// No path case
242-
return try std.fmt.allocPrint(allocator, "{s}/{s}", .{ base, src });
243-
}
244-
}
245-
246208
// Page navigates to an url.
247209
// You can navigates multiple urls with the same page, but you have to call
248210
// end() to stop the previous navigation before starting a new one.
@@ -637,7 +599,7 @@ pub const Page = struct {
637599

638600
// if a base path is given, we resolve src using base.
639601
if (base) |_base| {
640-
res_src = try stitchUrl(arena, src, _base);
602+
res_src = try URL.stitch(arena, src, _base);
641603
}
642604

643605
var origin_url = &self.url;
@@ -934,33 +896,3 @@ test "Browser" {
934896
.{ "new Intl.DateTimeFormat()", "[object Intl.DateTimeFormat]" },
935897
}, .{});
936898
}
937-
938-
test "Stitching Base & Src URLs (Basic)" {
939-
const allocator = testing.allocator;
940-
941-
const base = "https://www.google.com/xyz/abc/123";
942-
const src = "something.js";
943-
const result = try stitchUrl(allocator, src, base);
944-
defer allocator.free(result);
945-
try testing.expectString("https://www.google.com/xyz/abc/something.js", result);
946-
}
947-
948-
test "Stitching Base & Src URLs (Just Ending Slash)" {
949-
const allocator = testing.allocator;
950-
951-
const base = "https://www.google.com/";
952-
const src = "something.js";
953-
const result = try stitchUrl(allocator, src, base);
954-
defer allocator.free(result);
955-
try testing.expectString("https://www.google.com/something.js", result);
956-
}
957-
958-
test "Stitching Base & Src URLs (No Ending Slash)" {
959-
const allocator = testing.allocator;
960-
961-
const base = "https://www.google.com";
962-
const src = "something.js";
963-
const result = try stitchUrl(allocator, src, base);
964-
defer allocator.free(result);
965-
try testing.expectString("https://www.google.com/something.js", result);
966-
}

‎src/url.zig‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,35 @@ pub const URL = struct {
8181
pub fn toWebApi(self: *const URL, allocator: Allocator) !WebApiURL {
8282
return WebApiURL.init(allocator, self.uri);
8383
}
84+
85+
/// Properly stitches two URL fragments together.
86+
///
87+
/// For URLs with a path, it will replace the last entry with the src.
88+
/// For URLs without a path, it will add src as the path.
89+
pub fn stitch(allocator: std.mem.Allocator, src: []const u8, base: []const u8) ![]const u8 {
90+
if (base.len == 0) {
91+
return src;
92+
}
93+
94+
const protocol_end: usize = blk: {
95+
if (std.mem.indexOf(u8, base, "://")) |protocol_index| {
96+
break :blk protocol_index + 3;
97+
} else {
98+
break :blk 0;
99+
}
100+
};
101+
102+
if (std.mem.lastIndexOfScalar(u8, base[protocol_end..], '/')) |index| {
103+
const last_slash_pos = index + protocol_end;
104+
if (last_slash_pos == base.len - 1) {
105+
return std.fmt.allocPrint(allocator, "{s}{s}", .{ base, src });
106+
} else {
107+
return std.fmt.allocPrint(allocator, "{s}/{s}", .{ base[0..last_slash_pos], src });
108+
}
109+
} else {
110+
return std.fmt.allocPrint(allocator, "{s}/{s}", .{ base, src });
111+
}
112+
}
84113
};
85114

86115
test "Url resolve size" {
@@ -98,3 +127,45 @@ test "Url resolve size" {
98127
try std.testing.expectEqual(out_url.raw[25], '/');
99128
try std.testing.expectEqualStrings(out_url.raw[26..], &url_string);
100129
}
130+
131+
const testing = @import("testing.zig");
132+
133+
test "URL: Stitching Base & Src URLs (Basic)" {
134+
const allocator = testing.allocator;
135+
136+
const base = "https://www.google.com/xyz/abc/123";
137+
const src = "something.js";
138+
const result = try URL.stitch(allocator, src, base);
139+
defer allocator.free(result);
140+
try testing.expectString("https://www.google.com/xyz/abc/something.js", result);
141+
}
142+
143+
test "URL: Stitching Base & Src URLs (Just Ending Slash)" {
144+
const allocator = testing.allocator;
145+
146+
const base = "https://www.google.com/";
147+
const src = "something.js";
148+
const result = try URL.stitch(allocator, src, base);
149+
defer allocator.free(result);
150+
try testing.expectString("https://www.google.com/something.js", result);
151+
}
152+
153+
test "URL: Stitching Base & Src URLs (No Ending Slash)" {
154+
const allocator = testing.allocator;
155+
156+
const base = "https://www.google.com";
157+
const src = "something.js";
158+
const result = try URL.stitch(allocator, src, base);
159+
defer allocator.free(result);
160+
try testing.expectString("https://www.google.com/something.js", result);
161+
}
162+
163+
test "URL: Stiching Base & Src URLs (Both Local)" {
164+
const allocator = testing.allocator;
165+
166+
const base = "./abcdef/123.js";
167+
const src = "something.js";
168+
const result = try URL.stitch(allocator, src, base);
169+
defer allocator.free(result);
170+
try testing.expectString("./abcdef/something.js", result);
171+
}

0 commit comments

Comments
 (0)