add <base> in the DOM tree

krichprollsch · krichprollsch · commit dc23a74e7bf0 · 2025-08-08T18:34:14.000+02:00
diff --git a/src/browser/dump.zig b/src/browser/dump.zig
@@ -23,7 +23,6 @@ const Walker = @import("dom/walker.zig").WalkerChildren;
 
 pub const Opts = struct {
     exclude_scripts: bool = false,
-    include_base: ?[]const u8 = null,
 };
 
 // writer must be a std.io.Writer
@@ -92,14 +91,6 @@ pub fn writeNode(node: *parser.Node, opts: Opts, writer: anytype) anyerror!void
             // void elements can't have any content.
             if (try isVoid(parser.nodeToElement(node))) return;
 
-            // If we wrote the <head> and we want to include a <base>, add it
-            // now.
-            if (opts.include_base != null and tag_type == .head) {
-                try writer.writeAll("<base href=\"");
-                try writer.writeAll(opts.include_base.?);
-                try writer.writeAll("\">");
-            }
-
             if (tag_type == .script) {
                 try writer.writeAll(try parser.nodeTextContent(node) orelse "");
             } else {
diff --git a/src/browser/page.zig b/src/browser/page.zig
@@ -141,16 +141,47 @@ pub const Page = struct {
         repeat_delay.* = 100 * std.time.ns_per_ms;
     }
 
+    pub const DumpOpts = struct {
+        exclude_scripts: bool = false,
+        with_base: bool = false,
+    };
+
     // dump writes the page content into the given file.
-    pub fn dump(self: *const Page, opts: Dump.Opts, out: std.fs.File) !void {
+    pub fn dump(self: *const Page, opts: DumpOpts, out: std.fs.File) !void {
         if (self.raw_data) |raw_data| {
             // raw_data was set if the document was not HTML, dump the data content only.
             return try out.writeAll(raw_data);
         }
 
         // if the page has a pointer to a document, dumps the HTML.
         const doc = parser.documentHTMLToDocument(self.window.document);
-        try Dump.writeHTML(doc, opts, out);
+
+        // if the base si requested, add the base's node in the document's headers.
+        if (opts.with_base) {
+            try self.addDOMTreeBase();
+        }
+
+        try Dump.writeHTML(doc, .{
+            .exclude_scripts = opts.exclude_scripts,
+        }, out);
+    }
+
+    // addDOMTreeBase modifies the page's document to add a <base> tag after
+    // <head>.
+    // If <head> is missing, the function returns silently.
+    fn addDOMTreeBase(self: *const Page) !void {
+        const doc = parser.documentHTMLToDocument(self.window.document);
+        std.debug.assert(doc.is_html);
+
+        // find <head> tag
+        const list = try parser.documentGetElementsByTagName(doc, "head");
+        const head = try parser.nodeListItem(list, 0) orelse return;
+
+        const base = try parser.documentCreateElement(doc, "base");
+        try parser.elementSetAttribute(base, "href", self.url.raw);
+
+        const Node = @import("dom/node.zig").Node;
+        try Node.prepend(head, &[_]Node.NodeOrText{.{ .node = parser.elementToNode(base) }});
     }
 
     pub fn fetchModuleSource(ctx: *anyopaque, src: []const u8) !?[]const u8 {
diff --git a/src/main.zig b/src/main.zig
@@ -136,7 +136,7 @@ fn run(alloc: Allocator) !void {
             if (opts.dump) {
                 try page.dump(.{
                     .exclude_scripts = opts.noscript,
-                    .include_base = if (opts.withbase) page.url.raw else null,
+                    .with_base = opts.withbase,
                 }, std.io.getStdOut());
             }
         },

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ fn run(alloc: Allocator) !void {`
`136`	`136`	`if (opts.dump) {`
`137`	`137`	`try page.dump(.{`
`138`	`138`	`.exclude_scripts = opts.noscript,`
`139`		`- .include_base = if (opts.withbase) page.url.raw else null,`
	`139`	`+ .with_base = opts.withbase,`
`140`	`140`	`}, std.io.getStdOut());`
`141`	`141`	`}`
`142`	`142`	`},`