Merge pull request #1115 from lightpanda-io/nikneym/url-changes

Small URL & Location changes

src/browser/html/elements.zig

@@ -281,7 +281,7 @@ pub const HTMLAnchorElement = struct {
     // TODO return a disposable string
     pub fn get_protocol(self: *parser.Anchor, page: *Page) ![]const u8 {
         var u = try url(self, page);
-        return u.get_protocol(page);
+        return u.get_protocol();
     }
 
     pub fn set_protocol(self: *parser.Anchor, v: []const u8, page: *Page) !void {

src/browser/html/location.zig

@@ -41,8 +41,8 @@ pub const Location = struct {
         return page.navigateFromWebAPI(href, .{ .reason = .script });
     }
 
-    pub fn get_protocol(self: *Location, page: *Page) ![]const u8 {
+    pub fn get_protocol(self: *Location) []const u8 {
-        return self.url.get_protocol(page);
+        return self.url.get_protocol();
     }
 
     pub fn get_host(self: *Location, page: *Page) ![]const u8 {

src/browser/url/url.zig

@@ -164,8 +164,11 @@ pub const URL = struct {
         return aw.written();
     }
 
-    pub fn get_protocol(self: *URL, page: *Page) ![]const u8 {
+    pub fn get_protocol(self: *const URL) []const u8 {
-        return try std.mem.concat(page.arena, u8, &[_][]const u8{ self.uri.scheme, ":" });
+        // std.Uri keeps a pointer to "https", "http" (scheme part) so we know
+        // its followed by ':'.
+        const scheme = self.uri.scheme;
+        return scheme.ptr[0 .. scheme.len + 1];
     }
 
     pub fn get_username(self: *URL) []const u8 {

src/tests/url/url.html

@@ -76,3 +76,8 @@
   testing.expectEqual("", sk.hostname);
   testing.expectEqual("sveltekit-internal://", sk.href);
 </script>
+
+<script id=invalidUrl>
+  let u = new URL("://foo.bar/path?query#fragment");
+  testing.expectEqual(":", u.protocol);
+</script>