wip

Author: kristoff-it

src/cli/logging.zig

@@ -22,12 +22,12 @@ pub fn logFn(
     comptime format: []const u8,
     args: anytype,
 ) void {
-    // if (scope != .srcset) return;
-    inline for (build_options.enabled_scopes) |es| {
-        if (comptime std.mem.eql(u8, es, @tagName(scope))) {
-            break;
-        }
-    } else return;
+    if (scope != .details) return;
+    // inline for (build_options.enabled_scopes) |es| {
+    //     if (comptime std.mem.eql(u8, es, @tagName(scope))) {
+    //         break;
+    //     }
+    // } else return;
 
     const l = log_file orelse return;
     const scope_prefix = "(" ++ @tagName(scope) ++ "): ";

src/html/Ast.zig

@@ -234,15 +234,19 @@ pub const Error = struct {
     tag: union(enum) {
         token: Tokenizer.TokenError,
         invalid_attr,
-        invalid_attr_nesting: Kind,
+        invalid_attr_nesting: struct {
+            kind: Kind,
+            reason: []const u8 = "",
+        },
         invalid_attr_value: struct {
             reason: []const u8 = "",
         },
         invalid_attr_combination: []const u8, // reason
         missing_required_attr: []const u8,
         missing_attr_value,
         boolean_attr,
-        wrong_position: enum { first, second },
+        wrong_position: enum { first, second, first_or_last },
+        missing_ancestor: Kind,
         missing_child: Kind,
         duplicate_child: struct {
             span: Span, // original child
@@ -278,9 +282,9 @@ pub const Error = struct {
                         "invalid attribute for this element",
                         .{},
                     ),
-                    .invalid_attr_nesting => |kind| w.print(
-                        "invalid attribute for this element when nested under '{t}'",
-                        .{kind},
+                    .invalid_attr_nesting => |nest| w.print(
+                        "invalid attribute for this element when nested under '{t}' {s}",
+                        .{ nest.kind, nest.reason },
                     ),
                     .invalid_attr_value => |iav| {
                         try w.print("invalid value for this attribute", .{});
@@ -293,7 +297,7 @@ pub const Error = struct {
                         .{iac},
                     ),
                     .missing_required_attr => |attr| w.print(
-                        "missing required attribute: {s}",
+                        "missing required attribute(s): {s}",
                         .{attr},
                     ),
                     .missing_attr_value => w.print(
@@ -305,9 +309,13 @@ pub const Error = struct {
                         .{},
                     ),
                     .wrong_position => |p| w.print(
-                        "element in wrong position, should be {t}",
-                        .{p},
+                        "element in wrong position, should be {s}",
+                        .{switch (p) {
+                            .first, .second => @tagName(p),
+                            .first_or_last => "first or last",
+                        }},
                     ),
+                    .missing_ancestor => |e| w.print("missing ancestor: {t}", .{e}),
                     .missing_child => |e| w.print("missing child: {t}", .{e}),
                     .duplicate_child => |dc| {
                         try w.print("duplicate child", .{});
@@ -316,7 +324,7 @@ pub const Error = struct {
                         }
                     },
                     .invalid_nesting => |in| {
-                        try w.print("invalid nesting under {s}", .{
+                        try w.print("invalid nesting under <{s}>", .{
                             in.span.slice(tf.src),
                         });
                         if (in.reason.len > 0) {
@@ -490,21 +498,22 @@ pub fn init(
                             },
                             .html => {
                                 if (kinds.get(name)) |kind| {
-                                    const parent_node = switch (current.direction()) {
-                                        .in => nodes.items[current_idx],
-                                        .after => nodes.items[nodes.items[current_idx].parent_idx],
+                                    const parent_idx = switch (current.direction()) {
+                                        .in => current_idx,
+                                        .after => nodes.items[current_idx].parent_idx,
                                     };
+
                                     const e = elements.get(kind);
                                     const model = try e.validateAttrs(
                                         gpa,
                                         language,
                                         &errors,
                                         &seen_attrs,
+                                        nodes.items,
+                                        parent_idx,
                                         src,
-                                        parent_node.kind,
-                                        parent_node.model.content,
                                         tag.span,
-                                        current_idx,
+                                        @intCast(nodes.items.len),
                                     );
 
                                     break :node .{
@@ -516,7 +525,7 @@ pub fn init(
                                     try errors.append(gpa, .{
                                         .tag = .invalid_html_tag_name,
                                         .main_location = tag.name,
-                                        .node_idx = current_idx + 1,
+                                        .node_idx = @intCast(nodes.items.len),
                                     });
                                 }
 
@@ -1203,7 +1212,7 @@ pub fn validateNesting(
     if (nodes.len < 2 or language == .xml) return;
 
     var node_idx: u32 = 1;
-    while (node_idx != 0 and node_idx < nodes.len - 1) {
+    while (node_idx != 0 and node_idx < nodes.len) {
         const n = nodes[node_idx];
         if (n.kind == .svg or n.kind == .math or n.kind == .___) {
             node_idx = n.next_idx;
@@ -1212,8 +1221,8 @@ pub fn validateNesting(
         defer node_idx += 1;
 
         if (!n.kind.isElement() or n.kind.isVoid()) continue;
-
         const element: Element = elements.get(n.kind);
+
         try element.validateContent(
             gpa,
             nodes,