Fix mixin expansion in conditionals and include resolution in extends
- mixin.zig: expandNode and expandNodeWithArgs now recurse into node.consequent and node.alternate for Conditional nodes - view_engine.zig: process includes and collect mixins from child template before extracting blocks in processExtends This fixes mixin calls inside if/else blocks not being rendered in compiled templates.
This commit is contained in:
@@ -130,6 +130,8 @@ fn expandNode(
|
||||
const new_node = allocator.create(Node) catch return error.OutOfMemory;
|
||||
new_node.* = node.*;
|
||||
new_node.nodes = .{};
|
||||
new_node.consequent = null;
|
||||
new_node.alternate = null;
|
||||
|
||||
// Clone and expand children
|
||||
for (node.nodes.items) |child| {
|
||||
@@ -137,6 +139,14 @@ fn expandNode(
|
||||
new_node.nodes.append(allocator, expanded_child) catch return error.OutOfMemory;
|
||||
}
|
||||
|
||||
// Handle Conditional nodes which store children in consequent/alternate
|
||||
if (node.consequent) |cons| {
|
||||
new_node.consequent = try expandNode(allocator, cons, registry, caller_block);
|
||||
}
|
||||
if (node.alternate) |alt| {
|
||||
new_node.alternate = try expandNode(allocator, alt, registry, caller_block);
|
||||
}
|
||||
|
||||
return new_node;
|
||||
}
|
||||
|
||||
@@ -239,6 +249,8 @@ fn expandNodeWithArgs(
|
||||
new_node.* = node.*;
|
||||
new_node.nodes = .{};
|
||||
new_node.attrs = .{};
|
||||
new_node.consequent = null;
|
||||
new_node.alternate = null;
|
||||
|
||||
// Substitute argument references in text/val
|
||||
if (node.val) |val| {
|
||||
@@ -260,6 +272,14 @@ fn expandNodeWithArgs(
|
||||
new_node.nodes.append(allocator, expanded) catch return error.OutOfMemory;
|
||||
}
|
||||
|
||||
// Handle Conditional nodes which store children in consequent/alternate
|
||||
if (node.consequent) |cons| {
|
||||
new_node.consequent = try expandNodeWithArgs(allocator, cons, registry, caller_block, arg_bindings);
|
||||
}
|
||||
if (node.alternate) |alt| {
|
||||
new_node.alternate = try expandNodeWithArgs(allocator, alt, registry, caller_block, arg_bindings);
|
||||
}
|
||||
|
||||
return new_node;
|
||||
}
|
||||
|
||||
|
||||
@@ -207,6 +207,13 @@ pub const ViewEngine = struct {
|
||||
const parent_path = if (first_node.file) |file| file.path else null;
|
||||
if (parent_path == null) return ast;
|
||||
|
||||
// Process includes in child template BEFORE extracting blocks
|
||||
// This ensures mixin definitions from included files are available
|
||||
try self.processIncludes(allocator, ast, current_dir, registry);
|
||||
|
||||
// Collect mixins from child template (including from processed includes)
|
||||
mixin.collectMixins(allocator, ast, registry) catch {};
|
||||
|
||||
// Collect named blocks from child template (excluding the extends node)
|
||||
var child_blocks = std.StringHashMap(*Node).init(allocator);
|
||||
defer child_blocks.deinit();
|
||||
|
||||
Reference in New Issue
Block a user