refactor(element): supports more type in root append

3 files changed, 10 insertions, 4 deletions

diff --git a/src/eval/Root.zig b/src/eval/Root.zig
index 1f2b61b..048dd3b 100644
--- a/src/eval/Root.zig
+++ b/src/eval/Root.zig
@@ -31,7 +31,13 @@ pub fn allocator(self: *Self) Allocator {
     return self.arena.allocator();
 }
 
-pub fn append(self: *Self, el: Element) void {
+pub fn append(self: *Self, raw: anytype) void {
+    const el: Element = blk: {
+        const T = @TypeOf(raw);
+        if (T == Element) break :blk raw;
+        if (std.meta.hasMethod(T, "element")) break :blk raw.element();
+        @compileError("cannot convert " ++ @typeName(T) ++ " into " ++ @typeName(Element));
+    };
     self.content.append(&el.node().node);
 }
 
diff --git a/src/eval/html/Element.zig b/src/eval/html/Element.zig
index c6197b8..52ee58d 100644
--- a/src/eval/html/Element.zig
+++ b/src/eval/html/Element.zig
@@ -16,8 +16,8 @@ pub fn Wrapper(comptime V: type) type {
         if (!@hasField(V, "node")) @compileError("missing field 'node' for " ++ @typeName(V));
         const nd = @FieldType(V, "node");
         if (nd != Node) @compileError("invalid node's type: " ++ @typeName(nd) ++ ", want " ++ @typeName(Node));
-        if (!@hasDecl(V, "element")) @compileError("missing declaration 'element' for " ++ @typeName(V));
-        if (!@hasDecl(V, "render")) @compileError("missing declaration 'render' for " ++ @typeName(V));
+        if (!std.meta.hasMethod(V, "element")) @compileError("missing declaration 'element' for " ++ @typeName(V));
+        if (!std.meta.hasMethod(V, "render")) @compileError("missing declaration 'render' for " ++ @typeName(V));
     }
     return struct {
         ptr: *V,
diff --git a/src/eval/html/Root.zig b/src/eval/html/Root.zig
index acfe82e..6c4c37a 100644
--- a/src/eval/html/Root.zig
+++ b/src/eval/html/Root.zig
@@ -39,7 +39,7 @@ pub fn append(self: *Self, raw: anytype) Error!void {
     const el: Element = blk: {
         const T = @TypeOf(raw);
         if (T == Element) break :blk raw;
-        if (@hasDecl(T, "html")) break :blk try raw.html(self.allocator());
+        if (std.meta.hasMethod(T, "html")) break :blk try raw.html(self.allocator());
         @compileError("cannot convert " ++ @typeName(T) ++ " into " ++ @typeName(Element));
     };
     self.content.append(&el.node().node);