From 8435f781ee891f7100badd5b07075a74b28bf1b3 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Thu, 14 Dec 2023 11:01:39 +0100 Subject: [PATCH] dom: implement NodeList --- src/dom/dom.zig | 2 ++ src/dom/node.zig | 10 ++++++++++ src/dom/nodelist.zig | 32 ++++++++++++++++++++++++++++++++ src/netsurf.zig | 7 +++++++ 4 files changed, 51 insertions(+) create mode 100644 src/dom/nodelist.zig diff --git a/src/dom/dom.zig b/src/dom/dom.zig index 9c5c269f8..25fdbb175 100644 --- a/src/dom/dom.zig +++ b/src/dom/dom.zig @@ -5,6 +5,7 @@ const EventTarget = @import("event_target.zig").EventTarget; const DOMImplementation = @import("implementation.zig").DOMImplementation; const NamedNodeMap = @import("namednodemap.zig").NamedNodeMap; const DOMTokenList = @import("token_list.zig").DOMTokenList; +const NodeList = @import("nodelist.zig").NodeList; const Nod = @import("node.zig"); pub const Interfaces = generate.Tuple(.{ @@ -13,6 +14,7 @@ pub const Interfaces = generate.Tuple(.{ DOMImplementation, NamedNodeMap, DOMTokenList, + NodeList, Nod.Node, Nod.Interfaces, }); diff --git a/src/dom/node.zig b/src/dom/node.zig index 86b3dae5d..29c802393 100644 --- a/src/dom/node.zig +++ b/src/dom/node.zig @@ -193,6 +193,10 @@ pub const Node = struct { return try parser.nodeHasChildNodes(self); } + pub fn get_childNodes(self: *parser.Node) !*parser.NodeList { + return try parser.nodeGetChildNodes(self); + } + pub fn _insertBefore(self: *parser.Node, new_node: *parser.Node, ref_node: *parser.Node) !*parser.Node { return try parser.nodeInsertBefore(self, new_node, ref_node); } @@ -393,6 +397,12 @@ pub fn testExecFn( }; try checkCases(js_env, &node_has_child_nodes); + var node_child_nodes = [_]Case{ + .{ .src = "link.childNodes.length", .ex = "1" }, + .{ .src = "text.childNodes.length", .ex = "0" }, + }; + try checkCases(js_env, &node_child_nodes); + var node_insert_before = [_]Case{ .{ .src = "let insertBefore = document.createElement('a')", .ex = "undefined" }, .{ .src = "link.insertBefore(insertBefore, text) !== undefined", .ex = "true" }, diff --git a/src/dom/nodelist.zig b/src/dom/nodelist.zig new file mode 100644 index 000000000..4d6ff51b5 --- /dev/null +++ b/src/dom/nodelist.zig @@ -0,0 +1,32 @@ +const std = @import("std"); + +const parser = @import("../netsurf.zig"); + +const jsruntime = @import("jsruntime"); + +const NodeUnion = @import("node.zig").Union; +const Node = @import("node.zig").Node; + +const DOMException = @import("exceptions.zig").DOMException; + +// WEB IDL https://dom.spec.whatwg.org/#nodelist +pub const NodeList = struct { + pub const Self = parser.NodeList; + pub const mem_guarantied = true; + + pub const Exception = DOMException; + + pub fn get_length(self: *parser.NodeList) !u32 { + return try parser.nodeListLength(self); + } + + pub fn _item(self: *parser.NodeList, index: u32) !?NodeUnion { + const n = try parser.nodeListItem(self, index); + if (n == null) return null; + return try Node.toInterface(n.?); + } + + // TODO _symbol_iterator + + // TODO implement postAttach +}; diff --git a/src/netsurf.zig b/src/netsurf.zig index 2455b35a1..30fd09ce3 100644 --- a/src/netsurf.zig +++ b/src/netsurf.zig @@ -647,6 +647,13 @@ pub fn nodeHasChildNodes(node: *Node) !bool { return res; } +pub fn nodeGetChildNodes(node: *Node) !*NodeList { + var res: ?*NodeList = undefined; + const err = nodeVtable(node).dom_node_get_child_nodes.?(node, &res); + try DOMErr(err); + return res.?; +} + pub fn nodeInsertBefore(node: *Node, new_node: *Node, ref_node: *Node) !*Node { var res: ?*Node = undefined; const err = nodeVtable(node).dom_node_insert_before.?(node, new_node, ref_node, &res);