Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: prefer `js.Nullable` for various `Node` functions

nikneym8b26522b70c0
diff --git a/src/browser/tests/node/node.html b/src/browser/tests/node/node.html
index 0daac22e5..a5bb67938 100644
--- a/src/browser/tests/node/node.html
+++ b/src/browser/tests/node/node.html
@@ -165,7 +165,9 @@
testing.expectEqual(false, p1.isSameNode(text));
testing.expectEqual(true, p1.isSameNode($('#p1')));
testing.expectEqual(false, p1.isSameNode(document.createElement('p')));
- testing.expectEqual(false, p1.isSameNode());
+ // `Node?` is nullable but still required: an explicit null is fine, omitting
+ // the argument entirely is a TypeError.
+ testing.expectError('TypeError', () => p1.isSameNode());
testing.expectEqual(false, p1.isSameNode(null));
</script>
diff --git a/src/browser/webapi/Node.zig b/src/browser/webapi/Node.zig
index d87bb4959..bea219001 100644
--- a/src/browser/webapi/Node.zig
+++ b/src/browser/webapi/Node.zig
@@ -1843,8 +1843,14 @@ pub const JsApi = struct {
pub const isConnected = bridge.accessor(Node.isConnected, null, .{});
pub const ownerDocument = bridge.accessor(Node.ownerDocument, null, .{});
pub const hasChildNodes = bridge.function(Node.hasChildNodes, .{});
- pub const isSameNode = bridge.function(Node.isSameNode, .{});
- pub const contains = bridge.function(Node.contains, .{});
+ pub const isSameNode = bridge.function(_isSameNode, .{});
+ fn _isSameNode(self: *const Node, other: js.Nullable(*Node)) bool {
+ return self.isSameNode(other.value);
+ }
+ pub const contains = bridge.function(_contains, .{});
+ fn _contains(self: *const Node, other: js.Nullable(*const Node)) bool {
+ return self.contains(other.value);
+ }
pub const removeChild = bridge.function(Node.removeChild, .{ .ce_reactions = true });
pub const nodeValue = bridge.accessor(Node.getNodeValue, Node.setNodeValue, .{ .ce_reactions = true });
pub const insertBefore = bridge.function(_insertBefore, .{ .ce_reactions = true });
@@ -1862,9 +1868,18 @@ pub const JsApi = struct {
return self.getRootNode(opts orelse .{});
}
pub const isEqualNode = bridge.function(Node.isEqualNode, .{});
- pub const lookupNamespaceURI = bridge.function(Node.lookupNamespaceURI, .{});
- pub const lookupPrefix = bridge.function(Node.lookupPrefix, .{});
- pub const isDefaultNamespace = bridge.function(Node.isDefaultNamespace, .{});
+ pub const lookupNamespaceURI = bridge.function(_lookupNamespaceURI, .{});
+ fn _lookupNamespaceURI(self: *Node, prefix: js.Nullable([]const u8), frame: *Frame) ?[]const u8 {
+ return self.lookupNamespaceURI(prefix.value, frame);
+ }
+ pub const lookupPrefix = bridge.function(_lookupPrefix, .{});
+ fn _lookupPrefix(self: *Node, namespace: js.Nullable([]const u8), frame: *Frame) ?[]const u8 {
+ return self.lookupPrefix(namespace.value, frame);
+ }
+ pub const isDefaultNamespace = bridge.function(_isDefaultNamespace, .{});
+ fn _isDefaultNamespace(self: *Node, namespace: js.Nullable([]const u8), frame: *Frame) bool {
+ return self.isDefaultNamespace(namespace.value, frame);
+ }
pub const baseURI = bridge.accessor(_baseURI, null, .{});
fn _baseURI(self: *Node, frame: *const Frame) []const u8 {