Skip to content

Return *Document instead of tagged union in parseFromString #1340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karlseguin merged 1 commit into from
Jan 8, 2026
Merged

Return *Document instead of tagged union in parseFromString #1340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/browser/webapi/DOMParser.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const Parser = @import("../parser/Parser.zig");

const HTMLDocument = @import("HTMLDocument.zig");
const XMLDocument = @import("XMLDocument.zig");
const Document = @import("Document.zig");
const ProcessingInstruction = @import("../webapi/cdata/ProcessingInstruction.zig");

const DOMParser = @This();
Expand All @@ -33,26 +34,21 @@ pub fn init() DOMParser {
return .{};
}

pub const HTMLDocumentOrXMLDocument = union(enum) {
html_document: *HTMLDocument,
xml_document: *XMLDocument,
};

pub fn parseFromString(
_: *const DOMParser,
html: []const u8,
mime_type: []const u8,
page: *Page,
) !HTMLDocumentOrXMLDocument {
const maybe_target_mime = std.meta.stringToEnum(enum {
) !*Document {
const target_mime = std.meta.stringToEnum(enum {
@"text/html",
@"text/xml",
@"application/xml",
@"application/xhtml+xml",
@"image/svg+xml",
}, mime_type);
}, mime_type) orelse return error.NotSupported;

if (maybe_target_mime) |target_mime| switch (target_mime) {
return switch (target_mime) {
.@"text/html" => {
// Create a new HTMLDocument
const doc = try page._factory.document(HTMLDocument{
Expand All @@ -72,7 +68,7 @@ pub fn parseFromString(
return pe.err;
}

return .{ .html_document = doc };
return doc.asDocument();
},
else => {
// Create a new XMLDocument.
Expand Down Expand Up @@ -100,11 +96,9 @@ pub fn parseFromString(
_ = doc_node.removeChild(first_child, page) catch unreachable;
}

return .{ .xml_document = doc };
return doc.asDocument();
},
};

return error.NotSupported;
}

pub const JsApi = struct {
Expand Down
Loading