This page is rendered using a compiled template.
Compiled templates are 3x faster than Pug.js!
Error: {s}
+ \\ + \\ + , .{@errorName(err)}) catch "Internal Server Error"; +} + +// ============================================================================ +// Static Files +// ============================================================================ + +fn serveStatic(_: *App, req: *httpz.Request, res: *httpz.Response) !void { + const path = req.url.path; + + // Strip leading slash and prepend public folder + const rel_path = if (path.len > 0 and path[0] == '/') path[1..] else path; + const full_path = std.fmt.allocPrint(res.arena, "public/{s}", .{rel_path}) catch { + res.status = 500; + res.body = "Internal Server Error"; + return; + }; + + // Read file from disk + const content = std.fs.cwd().readFileAlloc(res.arena, full_path, 10 * 1024 * 1024) catch { + res.status = 404; + res.body = "Not Found"; + return; + }; + + // Set content type based on extension + if (std.mem.endsWith(u8, path, ".css")) { + res.content_type = .CSS; + } else if (std.mem.endsWith(u8, path, ".js")) { + res.content_type = .JS; + } else if (std.mem.endsWith(u8, path, ".html")) { + res.content_type = .HTML; + } + + res.body = content; +} + +// ============================================================================ +// Main +// ============================================================================ + pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{}){}; defer if (gpa.deinit() == .leak) @panic("leak"); const allocator = gpa.allocator(); - var app = App.init(allocator); + var app = try App.init(allocator); + defer app.deinit(); const port = 8081; var server = try httpz.Server(*App).init(allocator, .{ .port = port }, &app); @@ -42,83 +383,37 @@ pub fn main() !void { var router = try server.router(.{}); - router.get("/", index, .{}); - router.get("/users", users, .{}); - router.get("/page-a", pageA, .{}); - router.get("/mixin-test", mixinTest, .{}); + // Pages + router.get("/", home, .{}); + router.get("/products", products, .{}); + router.get("/products/:id", productDetail, .{}); + router.get("/cart", cart, .{}); + router.get("/about", about, .{}); + + // Static files + router.get("/css/*", serveStatic, .{}); std.debug.print( \\ - \\Pugz Demo - ViewEngine Template Rendering - \\========================================== - \\Server running at http://localhost:{d} + \\ ____ ____ _ + \\ | _ \ _ _ __ _ ____ / ___|| |_ ___ _ __ ___ + \\ | |_) | | | |/ _` |_ / \___ \| __/ _ \| '__/ _ \ + \\ | __/| |_| | (_| |/ / ___) | || (_) | | | __/ + \\ |_| \__,_|\__, /___| |____/ \__\___/|_| \___| + \\ |___/ \\ - \\Routes: - \\ GET / - Home page - \\ GET /users - Users list - \\ GET /page-a - Page with data - \\ GET /mixin-test - Mixin test page + \\ Server running at http://localhost:{d} \\ - \\Press Ctrl+C to stop. + \\ Routes: + \\ GET / - Home page + \\ GET /products - Products page + \\ GET /products/:id - Product detail + \\ GET /cart - Shopping cart + \\ GET /about - About page + \\ + \\ Press Ctrl+C to stop. \\ , .{port}); try server.listen(); } - -/// GET / - Home page -fn index(app: *App, _: *httpz.Request, res: *httpz.Response) !void { - const html = app.view.render(res.arena, "index", .{ - .title = "Welcome", - .authenticated = true, - }) catch |err| { - res.status = 500; - res.body = @errorName(err); - return; - }; - - res.content_type = .HTML; - res.body = html; -} - -/// GET /users - Users list -fn users(app: *App, _: *httpz.Request, res: *httpz.Response) !void { - const html = app.view.render(res.arena, "users", .{ - .title = "Users", - }) catch |err| { - res.status = 500; - res.body = @errorName(err); - return; - }; - - res.content_type = .HTML; - res.body = html; -} - -/// GET /page-a - Page with data -fn pageA(app: *App, _: *httpz.Request, res: *httpz.Response) !void { - const html = app.view.render(res.arena, "page-a", .{ - .title = "Page A - Pets", - .items = &[_][]const u8{ "A", "B", "C" }, - .n = 0, - }) catch |err| { - res.status = 500; - res.body = @errorName(err); - return; - }; - - res.content_type = .HTML; - res.body = html; -} - -/// GET /mixin-test - Mixin test page -fn mixinTest(app: *App, _: *httpz.Request, res: *httpz.Response) !void { - const html = app.view.render(res.arena, "mixin-test", .{}) catch |err| { - res.status = 500; - res.body = @errorName(err); - return; - }; - - res.content_type = .HTML; - res.body = html; -} diff --git a/examples/demo/views/404.pug b/examples/demo/views/404.pug deleted file mode 100644 index 35797cd..0000000 --- a/examples/demo/views/404.pug +++ /dev/null @@ -1,2 +0,0 @@ -p - | Route no found diff --git a/examples/demo/views/generated.zig b/examples/demo/views/generated.zig deleted file mode 100644 index d534caa..0000000 --- a/examples/demo/views/generated.zig +++ /dev/null @@ -1,336 +0,0 @@ -//! Auto-generated by pugz.compileTemplates() -//! Do not edit manually - regenerate by running: zig build - -const std = @import("std"); -const Allocator = std.mem.Allocator; -const ArrayList = std.ArrayList(u8); - -// ───────────────────────────────────────────────────────────────────────────── -// Helpers -// ───────────────────────────────────────────────────────────────────────────── - -const esc_lut: [256]?[]const u8 = blk: { - var t: [256]?[]const u8 = .{null} ** 256; - t['&'] = "&"; - t['<'] = "<"; - t['>'] = ">"; - t['"'] = """; - t['\''] = "'"; - break :blk t; -}; - -fn esc(o: *ArrayList, a: Allocator, s: []const u8) Allocator.Error!void { - var i: usize = 0; - for (s, 0..) |c, j| { - if (esc_lut[c]) |e| { - if (j > i) try o.appendSlice(a, s[i..j]); - try o.appendSlice(a, e); - i = j + 1; - } - } - if (i < s.len) try o.appendSlice(a, s[i..]); -} - -fn truthy(v: anytype) bool { - return switch (@typeInfo(@TypeOf(v))) { - .bool => v, - .optional => v != null, - .pointer => |p| if (p.size == .slice) v.len > 0 else true, - .int, .comptime_int => v != 0, - else => true, - }; -} - -var int_buf: [32]u8 = undefined; - -fn strVal(v: anytype) []const u8 { - const T = @TypeOf(v); - switch (@typeInfo(T)) { - .pointer => |p| switch (p.size) { - .slice => return v, - .one => { - // For pointer-to-array, slice it - const child_info = @typeInfo(p.child); - if (child_info == .array) { - const arr_info = child_info.array; - const ptr: [*]const arr_info.child = @ptrCast(v); - return ptr[0..arr_info.len]; - } - return strVal(v.*); - }, - else => @compileError("unsupported pointer type"), - }, - .array => @compileError("arrays must be passed by pointer"), - .int, .comptime_int => return std.fmt.bufPrint(&int_buf, "{d}", .{v}) catch "0", - .optional => return if (v) |val| strVal(val) else "", - else => @compileError("strVal: unsupported type " ++ @typeName(T)), - } -} - -// ───────────────────────────────────────────────────────────────────────────── -// Templates -// ───────────────────────────────────────────────────────────────────────────── - -pub fn index(a: Allocator, d: anytype) Allocator.Error![]u8 { - var o: ArrayList = .empty; - try o.appendSlice(a, "some thing
ballahballah"); - { - const text = "click me "; - const @"type" = "secondary"; - try o.appendSlice(a, "nothing
Route no found
"; -} - -pub fn mixins_alert(a: Allocator, d: anytype) Allocator.Error![]u8 { - _ = .{ a, d }; - return ""; -} - -pub fn mixins_buttons(a: Allocator, d: anytype) Allocator.Error![]u8 { - _ = .{ a, d }; - return ""; -} - -pub fn mixins_cards(a: Allocator, d: anytype) Allocator.Error![]u8 { - _ = .{ a, d }; - return ""; -} - -pub fn mixins_alert_error(a: Allocator, d: anytype) Allocator.Error![]u8 { - _ = .{ a, d }; - return ""; -} - -pub fn mixins_input_text(a: Allocator, d: anytype) Allocator.Error![]u8 { - _ = .{ a, d }; - return ""; -} - -pub fn home(a: Allocator, d: anytype) Allocator.Error![]u8 { - var o: ArrayList = .empty; - try o.appendSlice(a, "This page is rendered using a compiled template.
Compiled templates are 3x faster than Pug.js!
Welcome to the pets page!
Testing button mixin:
"); - { - const text = "Click Me"; - const @"type" = "primary"; - try o.appendSlice(a, "Testing link mixin:
"); - { - const href = "/home"; - const text = "Go Home"; - try o.appendSlice(a, ""); - try esc(&o, a, strVal(text)); - try o.appendSlice(a, ""); - } - try o.appendSlice(a, ""); - _ = d; - return o.items; -} - -pub fn page_b(a: Allocator, d: anytype) Allocator.Error![]u8 { - var o: ArrayList = .empty; - try o.appendSlice(a, "nothing
cheks manually the head section
hello there
"); - try esc(&o, a, strVal(@field(d, "petName"))); - try o.appendSlice(a, "
"); - return o.items; -} - -pub const template_names = [_][]const u8{ - "index", - "sub_layout", - "_404", - "mixins_alert", - "mixins_buttons", - "mixins_cards", - "mixins_alert_error", - "mixins_input_text", - "home", - "page_a", - "mixin_test", - "page_b", - "layout_2", - "layout", - "page_append", - "users", - "page_appen_optional_blk", - "pet", -}; diff --git a/examples/demo/views/home.pug b/examples/demo/views/home.pug deleted file mode 100644 index 542035d..0000000 --- a/examples/demo/views/home.pug +++ /dev/null @@ -1,15 +0,0 @@ -doctype html -html - head - title #{title} - link(rel="stylesheet" href="/style.css") - body - header - h1 #{title} - if authenticated - span.user Welcome back! - main - p This page is rendered using a compiled template. - p Compiled templates are 3x faster than Pug.js! - footer - p © 2024 Pugz Demo diff --git a/examples/demo/views/index.pug b/examples/demo/views/index.pug deleted file mode 100644 index dbe2d49..0000000 --- a/examples/demo/views/index.pug +++ /dev/null @@ -1,15 +0,0 @@ -doctype html -html - head - title hello - body - p some thing - | ballah - | ballah - +btn("click me ", "secondary") - br - a(href='//google.com' target="_blank") Google 1 - br - a(class='button' href='//google.com' target="_blank") Google 2 - br - a(class='button', href='//google.com' target="_blank") Google 3 diff --git a/examples/demo/views/layout-2.pug b/examples/demo/views/layout-2.pug deleted file mode 100644 index c809925..0000000 --- a/examples/demo/views/layout-2.pug +++ /dev/null @@ -1,7 +0,0 @@ -html - head - block head - script(src='/vendor/jquery.js') - script(src='/vendor/caustic.js') - body - block content diff --git a/examples/demo/views/layout.pug b/examples/demo/views/layout.pug deleted file mode 100644 index 871e071..0000000 --- a/examples/demo/views/layout.pug +++ /dev/null @@ -1,10 +0,0 @@ -html - head - title My Site - #{title} - block scripts - script(src='/jquery.js') - body - block content - block foot - #footer - p some footer content diff --git a/examples/demo/views/layouts/base.pug b/examples/demo/views/layouts/base.pug new file mode 100644 index 0000000..db156db --- /dev/null +++ b/examples/demo/views/layouts/base.pug @@ -0,0 +1,28 @@ +doctype html +html(lang="en") + head + meta(charset="UTF-8") + meta(name="viewport" content="width=device-width, initial-scale=1.0") + link(rel="stylesheet" href="/css/style.css") + block title + title Pugz Store + body + header.header + .container + .header-content + a.logo(href="/") Pugz Store + nav.nav + a.nav-link(href="/") Home + a.nav-link(href="/products") Products + a.nav-link(href="/about") About + .header-actions + a.cart-link(href="/cart") + | Cart (#{cartCount}) + + main + block content + + footer.footer + .container + .footer-content + p Built with Pugz - A Pug template engine for Zig diff --git a/examples/demo/views/mixin-test.pug b/examples/demo/views/mixin-test.pug deleted file mode 100644 index 2d0bd9b..0000000 --- a/examples/demo/views/mixin-test.pug +++ /dev/null @@ -1,15 +0,0 @@ -include mixins/buttons.pug - -doctype html -html - head - title Mixin Test - body - h1 Mixin Test Page - - p Testing button mixin: - +btn("Click Me") - +btn("Cancel", "secondary") - - p Testing link mixin: - +btn-link("/home", "Go Home") diff --git a/examples/demo/views/mixins/alert.pug b/examples/demo/views/mixins/alert.pug deleted file mode 100644 index 3d86db2..0000000 --- a/examples/demo/views/mixins/alert.pug +++ /dev/null @@ -1,5 +0,0 @@ -mixin alert(message) - div.alert(role="alert" class!=attributes.class) - svg(xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 shrink-0 stroke-current" fill="none" viewBox="0 0 24 24") - path(stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z") - span= message diff --git a/examples/demo/views/mixins/alert_error.pug b/examples/demo/views/mixins/alert_error.pug deleted file mode 100644 index 60061c5..0000000 --- a/examples/demo/views/mixins/alert_error.pug +++ /dev/null @@ -1,2 +0,0 @@ -mixin alert_error(message) - +alert(message)(class="alert-error") diff --git a/examples/demo/views/mixins/alerts.pug b/examples/demo/views/mixins/alerts.pug new file mode 100644 index 0000000..34b4e4b --- /dev/null +++ b/examples/demo/views/mixins/alerts.pug @@ -0,0 +1,12 @@ +//- Alert/notification mixins + +mixin alert(message, type) + - var alertClass = type ? "alert alert-" + type : "alert alert-info" + .alert(class=alertClass) + p= message + +mixin alert-dismissible(message, type) + - var alertClass = type ? "alert alert-" + type : "alert alert-info" + .alert.alert-dismissible(class=alertClass) + p= message + button.alert-close(type="button" aria-label="Close") x diff --git a/examples/demo/views/mixins/buttons.pug b/examples/demo/views/mixins/buttons.pug index e96740f..9078166 100644 --- a/examples/demo/views/mixins/buttons.pug +++ b/examples/demo/views/mixins/buttons.pug @@ -1,5 +1,15 @@ -mixin btn(text, type="primary") - button(class="btn btn-" + type)= text +//- Button mixins with various styles -mixin btn-link(href, text) - a.btn.btn-link(href=href)= text +mixin btn(text, type) + - var btnClass = type ? "btn btn-" + type : "btn btn-primary" + button(class=btnClass)= text + +mixin btn-link(href, text, type) + - var btnClass = type ? "btn btn-" + type : "btn btn-primary" + a(href=href class=btnClass)= text + +mixin btn-icon(icon, text, type) + - var btnClass = type ? "btn btn-" + type : "btn btn-primary" + button(class=btnClass) + span.icon= icon + span= text diff --git a/examples/demo/views/mixins/cards.pug b/examples/demo/views/mixins/cards.pug deleted file mode 100644 index 9845b64..0000000 --- a/examples/demo/views/mixins/cards.pug +++ /dev/null @@ -1,11 +0,0 @@ -mixin card(title) - .card - .card-header - h3= title - .card-body - block - -mixin card-simple(title, body) - .card - h3= title - p= body diff --git a/examples/demo/views/mixins/cart-item.pug b/examples/demo/views/mixins/cart-item.pug new file mode 100644 index 0000000..9ad530a --- /dev/null +++ b/examples/demo/views/mixins/cart-item.pug @@ -0,0 +1,17 @@ +//- Cart item display + +mixin cart-item(item) + .cart-item + .cart-item-image + img(src=item.image alt=item.name) + .cart-item-details + h4.cart-item-name #{item.name} + p.cart-item-variant #{item.variant} + span.cart-item-price $#{item.price} + .cart-item-quantity + button.qty-btn.qty-minus - + input.qty-input(type="number" value=item.quantity min="1") + button.qty-btn.qty-plus + + .cart-item-total + span $#{item.total} + button.cart-item-remove(aria-label="Remove item") x diff --git a/examples/demo/views/mixins/forms.pug b/examples/demo/views/mixins/forms.pug new file mode 100644 index 0000000..0b7418a --- /dev/null +++ b/examples/demo/views/mixins/forms.pug @@ -0,0 +1,25 @@ +//- Form input mixins + +mixin input(name, label, type, placeholder) + .form-group + label(for=name)= label + input.form-control(type=type id=name name=name placeholder=placeholder) + +mixin input-required(name, label, type, placeholder) + .form-group + label(for=name) + = label + span.required * + input.form-control(type=type id=name name=name placeholder=placeholder required) + +mixin select(name, label, options) + .form-group + label(for=name)= label + select.form-control(id=name name=name) + each opt in options + option(value=opt.value)= opt.label + +mixin textarea(name, label, placeholder, rows) + .form-group + label(for=name)= label + textarea.form-control(id=name name=name placeholder=placeholder rows=rows) diff --git a/examples/demo/views/mixins/input_text.pug b/examples/demo/views/mixins/input_text.pug deleted file mode 100644 index a38ab3a..0000000 --- a/examples/demo/views/mixins/input_text.pug +++ /dev/null @@ -1,4 +0,0 @@ -mixin input_text(name, label, placeholder) - fieldset.fieldset - legend.fieldset-legend= label - input(type="text" name=name class="input" placeholder=placeholder) diff --git a/examples/demo/views/mixins/product-card.pug b/examples/demo/views/mixins/product-card.pug new file mode 100644 index 0000000..c92d349 --- /dev/null +++ b/examples/demo/views/mixins/product-card.pug @@ -0,0 +1,38 @@ +//- Product card mixin - displays a product in grid/list view +//- Parameters: +//- product: { id, name, price, image, rating, category } + +mixin product-card(product) + article.product-card + a.product-image(href="/products/" + product.id) + img(src=product.image alt=product.name) + if product.sale + span.badge.badge-sale Sale + .product-info + span.product-category #{product.category} + h3.product-name + a(href="/products/" + product.id) #{product.name} + .product-rating + +rating(product.rating) + .product-footer + span.product-price $#{product.price} + button.btn.btn-primary.btn-sm(data-product=product.id) Add to Cart + +//- Featured product card with larger display +mixin product-featured(product) + article.product-card.product-featured + .product-image-large + img(src=product.image alt=product.name) + if product.sale + span.badge.badge-sale Sale + .product-details + span.product-category #{product.category} + h2.product-name #{product.name} + p.product-description #{product.description} + .product-rating + +rating(product.rating) + span.review-count (#{product.reviewCount} reviews) + .product-price-large $#{product.price} + .product-actions + button.btn.btn-primary.btn-lg Add to Cart + button.btn.btn-outline Wishlist diff --git a/examples/demo/views/mixins/rating.pug b/examples/demo/views/mixins/rating.pug new file mode 100644 index 0000000..2b221cf --- /dev/null +++ b/examples/demo/views/mixins/rating.pug @@ -0,0 +1,13 @@ +//- Star rating display +//- Parameters: +//- stars: number of stars (1-5) + +mixin rating(stars) + .stars + - var i = 1 + while i <= 5 + if i <= stars + span.star.star-filled + else + span.star.star-empty + - i = i + 1 diff --git a/examples/demo/views/page-a.pug b/examples/demo/views/page-a.pug deleted file mode 100644 index 4d37b66..0000000 --- a/examples/demo/views/page-a.pug +++ /dev/null @@ -1,36 +0,0 @@ -extends layout.pug - -block scripts - script(src='/jquery.js') - script(src='/pets.js') - -block content - h1= title - p Welcome to the pets page! - ul - li Cat - li Dog - ul - each val in items - li= val - input(data-json=` - { - "very-long": "piece of ", - "data": true - } - `) - - br - div(class='div-class', (click)='play()') one - div(class='div-class' '(click)'='play()') two - a(style={color: 'red', background: 'green'}) sdfsdfs - a.button btn - br - - form(method="post") - +input_text("firstName", "First Name", "first name") - br - +input_text("lastName", "Last Name", "last name") - submit sumit - if error - +alert_error(error) diff --git a/examples/demo/views/page-appen-optional-blk.pug b/examples/demo/views/page-appen-optional-blk.pug deleted file mode 100644 index 02efb8f..0000000 --- a/examples/demo/views/page-appen-optional-blk.pug +++ /dev/null @@ -1,5 +0,0 @@ -extends layout - -append head - script(src='/vendor/three.js') - script(src='/game.js') diff --git a/examples/demo/views/page-append.pug b/examples/demo/views/page-append.pug deleted file mode 100644 index 1922415..0000000 --- a/examples/demo/views/page-append.pug +++ /dev/null @@ -1,11 +0,0 @@ -extends layout-2.pug - -block append head - script(src='/vendor/three.js') - script(src='/game.js') - -block content - p - | cheks manually the head section - br - | hello there diff --git a/examples/demo/views/page-b.pug b/examples/demo/views/page-b.pug deleted file mode 100644 index e54b05f..0000000 --- a/examples/demo/views/page-b.pug +++ /dev/null @@ -1,9 +0,0 @@ -extends sub-layout.pug - -block content - .sidebar - block sidebar - p nothing - .primary - block primary - p nothing diff --git a/examples/demo/views/pages/404.pug b/examples/demo/views/pages/404.pug new file mode 100644 index 0000000..c23a91f --- /dev/null +++ b/examples/demo/views/pages/404.pug @@ -0,0 +1,15 @@ +extends layouts/base.pug + +block title + title #{title} | Pugz Store + +block content + section.error-page + .container + .error-content + h1.error-code 404 + h2 Page Not Found + p The page you are looking for does not exist or has been moved. + .error-actions + a.btn.btn-primary(href="/") Go Home + a.btn.btn-outline(href="/products") View Products diff --git a/examples/demo/views/pages/about.pug b/examples/demo/views/pages/about.pug new file mode 100644 index 0000000..f02e18d --- /dev/null +++ b/examples/demo/views/pages/about.pug @@ -0,0 +1,51 @@ +extends layouts/base.pug + +block title + title #{title} | Pugz Store + +block content + section.page-header + .container + h1 About Pugz + p A Pug template engine written in Zig + + section.section + .container + .about-grid + .about-main + h2 What is Pugz? + p Pugz is a high-performance Pug template engine implemented in Zig. It provides both runtime interpretation and build-time compilation for maximum flexibility. + + h3 Key Features + ul.feature-list + li Template inheritance with extends and blocks + li Partial includes for modular templates + li Mixins for reusable components + li Conditionals (if/else/unless) + li Iteration with each loops + li Variable interpolation + li Pretty-printed output + li LRU caching with TTL + + h3 Performance + p Compiled templates run approximately 3x faster than Pug.js, with zero runtime parsing overhead. + + .about-sidebar + .info-card + h3 This Demo Shows + ul + li Template inheritance (extends) + li Named blocks + li Conditional rendering + li Variable interpolation + li Simple iteration + + .info-card + h3 Links + ul + li + a(href="https://github.com/ankitpatial/pugz") GitHub Repository + li + a(href="/products") View Products + li + a(href="/") Back to Home diff --git a/examples/demo/views/pages/cart.pug b/examples/demo/views/pages/cart.pug new file mode 100644 index 0000000..df015e3 --- /dev/null +++ b/examples/demo/views/pages/cart.pug @@ -0,0 +1,47 @@ +extends layouts/base.pug + +block title + title #{title} | Pugz Store + +block content + section.page-header + .container + h1 Shopping Cart + p Review your items before checkout + + section.section + .container + .cart-layout + .cart-main + .cart-items + each item in cartItems + .cart-item + .cart-item-info + h3 #{name} + p.text-muted #{variant} + span.cart-item-price $#{price} + .cart-item-qty + button.qty-btn - + input.qty-input(type="text" value=quantity) + button.qty-btn + + .cart-item-total $#{total} + button.cart-item-remove x + + .cart-actions + a.btn.btn-outline(href="/products") Continue Shopping + + .cart-summary + h3 Order Summary + .summary-row + span Subtotal + span $#{subtotal} + .summary-row + span Shipping + span.text-success Free + .summary-row + span Tax + span $#{tax} + .summary-row.summary-total + span Total + span $#{total} + a.btn.btn-primary.btn-block(href="/checkout") Proceed to Checkout diff --git a/examples/demo/views/pages/checkout.pug b/examples/demo/views/pages/checkout.pug new file mode 100644 index 0000000..bd05e94 --- /dev/null +++ b/examples/demo/views/pages/checkout.pug @@ -0,0 +1,144 @@ +extends layouts/base.pug +include mixins/forms.pug +include mixins/alerts.pug +include mixins/buttons.pug + +block content + h1 Checkout + + if errors + +alert("Please correct the errors below", "error") + + .checkout-layout + form.checkout-form(action="/checkout" method="POST") + //- Shipping Information + section.checkout-section + h2 Shipping Information + + .form-row + +input-required("firstName", "First Name", "text", "John") + +input-required("lastName", "Last Name", "text", "Doe") + + +input-required("email", "Email Address", "email", "john@example.com") + +input-required("phone", "Phone Number", "tel", "+1 (555) 123-4567") + + +input-required("address", "Street Address", "text", "123 Main St") + +input("address2", "Apartment, suite, etc.", "text", "Apt 4B") + + .form-row + +input-required("city", "City", "text", "New York") + .form-group + label(for="state") + | State + span.required * + select.form-control#state(name="state" required) + option(value="") Select State + each state in states + option(value=state.code)= state.name + +input-required("zip", "ZIP Code", "text", "10001") + + .form-group + label(for="country") + | Country + span.required * + select.form-control#country(name="country" required) + option(value="US" selected) United States + option(value="CA") Canada + + //- Shipping Method + section.checkout-section + h2 Shipping Method + + .shipping-options + each method in shippingMethods + label.shipping-option + input(type="radio" name="shipping" value=method.id checked=method.id == "standard") + .shipping-info + span.shipping-name #{method.name} + span.shipping-time #{method.time} + span.shipping-price + if method.price > 0 + | $#{method.price} + else + | Free + + //- Payment Information + section.checkout-section + h2 Payment Information + + .payment-methods-select + label.payment-method + input(type="radio" name="paymentMethod" value="card" checked) + span Credit/Debit Card + label.payment-method + input(type="radio" name="paymentMethod" value="paypal") + span PayPal + + .card-details(id="card-details") + +input-required("cardNumber", "Card Number", "text", "1234 5678 9012 3456") + + .form-row + +input-required("expiry", "Expiration Date", "text", "MM/YY") + +input-required("cvv", "CVV", "text", "123") + + +input-required("cardName", "Name on Card", "text", "John Doe") + + .form-group + label.checkbox-label + input(type="checkbox" name="saveCard") + span Save card for future purchases + + //- Billing Address + section.checkout-section + .form-group + label.checkbox-label + input(type="checkbox" name="sameAsShipping" checked) + span Billing address same as shipping + + .billing-address(id="billing-address" style="display: none") + +input-required("billingAddress", "Street Address", "text", "") + .form-row + +input-required("billingCity", "City", "text", "") + +input-required("billingState", "State", "text", "") + +input-required("billingZip", "ZIP Code", "text", "") + + button.btn.btn-primary.btn-lg(type="submit") Place Order + + //- Order Summary Sidebar + aside.order-summary + h3 Order Summary + + .summary-items + each item in cart.items + .summary-item + img(src=item.image alt=item.name) + .item-info + span.item-name #{item.name} + span.item-qty x#{item.quantity} + span.item-price $#{item.total} + + .summary-details + .summary-row + span Subtotal + span $#{cart.subtotal} + + if cart.discount + .summary-row.discount + span Discount + span -$#{cart.discount} + + .summary-row + span Shipping + span#shipping-cost $#{selectedShipping.price} + + .summary-row + span Tax + span $#{cart.tax} + + .summary-row.total + span Total + span $#{cart.total} + + .secure-checkout + span Secure Checkout + p Your information is protected with 256-bit SSL encryption diff --git a/examples/demo/views/pages/home.pug b/examples/demo/views/pages/home.pug new file mode 100644 index 0000000..fd2f506 --- /dev/null +++ b/examples/demo/views/pages/home.pug @@ -0,0 +1,56 @@ +extends layouts/base.pug + +block title + title #{title} | Pugz Store + +block content + section.hero + .container + h1 Welcome to Pugz Store + p Discover amazing products powered by Zig + .hero-actions + a.btn.btn-primary(href="/products") Shop Now + a.btn.btn-outline(href="/about") Learn More + + section.section + .container + h2 Template Features + .feature-grid + .feature-card + h3 Conditionals + if authenticated + p.text-success You are logged in! + else + p.text-muted Please log in to continue. + + .feature-card + h3 Variables + p Title: #{title} + p Cart Items: #{cartCount} + + .feature-card + h3 Iteration + ul + each item in items + li= item + + .feature-card + h3 Clean Syntax + p Pug templates compile to HTML with minimal overhead. + + section.section.section-alt + .container + h2 Shop by Category + .category-grid + a.category-card(href="/products?cat=electronics") + .category-icon E + h3 Electronics + span 24 products + a.category-card(href="/products?cat=accessories") + .category-icon A + h3 Accessories + span 18 products + a.category-card(href="/products?cat=home") + .category-icon H + h3 Home Office + span 12 products diff --git a/examples/demo/views/pages/product-detail.pug b/examples/demo/views/pages/product-detail.pug new file mode 100644 index 0000000..f8f28ca --- /dev/null +++ b/examples/demo/views/pages/product-detail.pug @@ -0,0 +1,65 @@ +extends layouts/base.pug + +block title + title #{productName} | Pugz Store + +block content + section.page-header + .container + .breadcrumb + a(href="/") Home + span / + a(href="/products") Products + span / + span #{productName} + + section.section + .container + .product-detail + .product-detail-image + .product-image-placeholder + .product-detail-info + span.product-category #{category} + h1 #{productName} + .product-price-large $#{price} + p.product-description #{description} + + .product-actions + .quantity-selector + label Quantity: + button.qty-btn - + input.qty-input(type="text" value="1") + button.qty-btn + + a.btn.btn-primary.btn-lg(href="/cart") Add to Cart + + .product-meta + p SKU: #{sku} + p Category: #{category} + + section.section.section-alt + .container + h2 You May Also Like + .product-grid + .product-card + .product-image + .product-info + span.product-category Electronics + h3.product-name Smart Watch Pro + .product-price $199.99 + a.btn.btn-sm(href="/products/2") View Details + + .product-card + .product-image + .product-info + span.product-category Accessories + h3.product-name Laptop Stand + .product-price $49.99 + a.btn.btn-sm(href="/products/3") View Details + + .product-card + .product-image + .product-info + span.product-category Accessories + h3.product-name USB-C Hub + .product-price $39.99 + a.btn.btn-sm(href="/products/4") View Details diff --git a/examples/demo/views/pages/products.pug b/examples/demo/views/pages/products.pug new file mode 100644 index 0000000..5c5d414 --- /dev/null +++ b/examples/demo/views/pages/products.pug @@ -0,0 +1,79 @@ +extends layouts/base.pug + +block title + title #{title} | Pugz Store + +block content + section.page-header + .container + h1 All Products + p Browse our selection of quality products + + section.section + .container + .products-toolbar + span.results-count #{productCount} products + .sort-options + label Sort by: + select + option(value="featured") Featured + option(value="price-low") Price: Low to High + option(value="price-high") Price: High to Low + + .product-grid + .product-card + .product-image + .product-badge Sale + .product-info + span.product-category Electronics + h3.product-name Wireless Headphones + .product-price $79.99 + a.btn.btn-sm(href="/products/1") View Details + + .product-card + .product-image + .product-info + span.product-category Electronics + h3.product-name Smart Watch Pro + .product-price $199.99 + a.btn.btn-sm(href="/products/2") View Details + + .product-card + .product-image + .product-info + span.product-category Accessories + h3.product-name Laptop Stand + .product-price $49.99 + a.btn.btn-sm(href="/products/3") View Details + + .product-card + .product-image + .product-badge Sale + .product-info + span.product-category Accessories + h3.product-name USB-C Hub + .product-price $39.99 + a.btn.btn-sm(href="/products/4") View Details + + .product-card + .product-image + .product-info + span.product-category Electronics + h3.product-name Mechanical Keyboard + .product-price $129.99 + a.btn.btn-sm(href="/products/5") View Details + + .product-card + .product-image + .product-info + span.product-category Home Office + h3.product-name Desk Lamp + .product-price $34.99 + a.btn.btn-sm(href="/products/6") View Details + + .pagination + a.page-link(href="#") Prev + a.page-link.active(href="#") 1 + a.page-link(href="#") 2 + a.page-link(href="#") 3 + a.page-link(href="#") Next diff --git a/examples/demo/views/partials/footer.pug b/examples/demo/views/partials/footer.pug new file mode 100644 index 0000000..0436aa2 --- /dev/null +++ b/examples/demo/views/partials/footer.pug @@ -0,0 +1,4 @@ +footer.footer + .container + .footer-content + p Built with Pugz - A Pug template engine for Zig diff --git a/examples/demo/views/partials/head.pug b/examples/demo/views/partials/head.pug new file mode 100644 index 0000000..1849047 --- /dev/null +++ b/examples/demo/views/partials/head.pug @@ -0,0 +1,3 @@ +meta(charset="UTF-8") +meta(name="viewport" content="width=device-width, initial-scale=1.0") +link(rel="stylesheet" href="/css/style.css") diff --git a/examples/demo/views/partials/header.pug b/examples/demo/views/partials/header.pug new file mode 100644 index 0000000..5bd1f48 --- /dev/null +++ b/examples/demo/views/partials/header.pug @@ -0,0 +1,11 @@ +header.header + .container + .header-content + a.logo(href="/") Pugz Store + nav.nav + a.nav-link(href="/") Home + a.nav-link(href="/products") Products + a.nav-link(href="/about") About + .header-actions + a.cart-link(href="/cart") + | Cart (#{cartCount}) diff --git a/examples/demo/views/pet.pug b/examples/demo/views/pet.pug deleted file mode 100644 index 3025d57..0000000 --- a/examples/demo/views/pet.pug +++ /dev/null @@ -1 +0,0 @@ -p= petName diff --git a/examples/demo/views/sub-layout.pug b/examples/demo/views/sub-layout.pug deleted file mode 100644 index ecdfcd7..0000000 --- a/examples/demo/views/sub-layout.pug +++ /dev/null @@ -1,9 +0,0 @@ -extends layout.pug - -block content - .sidebar - block sidebar - p nothing - .primary - block primary - p nothing diff --git a/examples/demo/views/users.pug b/examples/demo/views/users.pug deleted file mode 100644 index 0c51337..0000000 --- a/examples/demo/views/users.pug +++ /dev/null @@ -1,11 +0,0 @@ -doctype html -html - head - title Users - body - h1 User List - ul.user-list - each user in users - li.user - strong= user.name - span.email= user.email diff --git a/src/benchmarks/bench.zig b/src/benchmarks/bench.zig index b6fd688..8dd1320 100644 --- a/src/benchmarks/bench.zig +++ b/src/benchmarks/bench.zig @@ -1,8 +1,9 @@ //! Pugz Benchmark - Template Rendering //! -//! This benchmark uses template.zig renderWithData function. +//! This benchmark parses templates ONCE, then renders 2000 times. +//! This matches how Pug.js benchmark works (compile once, render many). //! -//! Run: zig build bench-v1 +//! Run: zig build bench const std = @import("std"); const pugz = @import("pugz"); @@ -59,12 +60,12 @@ pub fn main() !void { std.debug.print("\n", .{}); std.debug.print("╔═══════════════════════════════════════════════════════════════╗\n", .{}); - std.debug.print("║ V1 Template Benchmark ({d} iterations) ║\n", .{iterations}); + std.debug.print("║ Pugz Benchmark ({d} iterations, parse once) ║\n", .{iterations}); std.debug.print("║ Templates: {s}/*.pug ║\n", .{templates_dir}); std.debug.print("╚═══════════════════════════════════════════════════════════════╝\n", .{}); // Load JSON data - std.debug.print("\nLoading JSON data...\n", .{}); + std.debug.print("\nLoading JSON data and parsing templates...\n", .{}); var data_arena = std.heap.ArenaAllocator.init(allocator); defer data_arena.deinit(); @@ -95,7 +96,7 @@ pub fn main() !void { const search = try loadJson(struct { searchRecords: []const SearchRecord }, data_alloc, "search-results.json"); const friends_data = try loadJson(struct { friends: []const Friend }, data_alloc, "friends.json"); - // Load template sources + // Load and PARSE templates ONCE (like Pug.js compiles once) const simple0_tpl = try loadTemplate(data_alloc, "simple-0.pug"); const simple1_tpl = try loadTemplate(data_alloc, "simple-1.pug"); const simple2_tpl = try loadTemplate(data_alloc, "simple-2.pug"); @@ -104,17 +105,26 @@ pub fn main() !void { const search_tpl = try loadTemplate(data_alloc, "search-results.pug"); const friends_tpl = try loadTemplate(data_alloc, "friends.pug"); - std.debug.print("Loaded. Starting benchmark...\n\n", .{}); + // Parse templates once + const simple0_ast = try pugz.template.parse(data_alloc, simple0_tpl); + const simple1_ast = try pugz.template.parse(data_alloc, simple1_tpl); + const simple2_ast = try pugz.template.parse(data_alloc, simple2_tpl); + const if_expr_ast = try pugz.template.parse(data_alloc, if_expr_tpl); + const projects_ast = try pugz.template.parse(data_alloc, projects_tpl); + const search_ast = try pugz.template.parse(data_alloc, search_tpl); + const friends_ast = try pugz.template.parse(data_alloc, friends_tpl); + + std.debug.print("Loaded. Starting benchmark (render only)...\n\n", .{}); var total: f64 = 0; - total += try bench("simple-0", allocator, simple0_tpl, simple0); - total += try bench("simple-1", allocator, simple1_tpl, simple1); - total += try bench("simple-2", allocator, simple2_tpl, simple2); - total += try bench("if-expression", allocator, if_expr_tpl, if_expr); - total += try bench("projects-escaped", allocator, projects_tpl, projects); - total += try bench("search-results", allocator, search_tpl, search); - total += try bench("friends", allocator, friends_tpl, friends_data); + total += try bench("simple-0", allocator, simple0_ast, simple0); + total += try bench("simple-1", allocator, simple1_ast, simple1); + total += try bench("simple-2", allocator, simple2_ast, simple2); + total += try bench("if-expression", allocator, if_expr_ast, if_expr); + total += try bench("projects-escaped", allocator, projects_ast, projects); + total += try bench("search-results", allocator, search_ast, search); + total += try bench("friends", allocator, friends_ast, friends_data); std.debug.print("\n", .{}); std.debug.print(" {s:<20} => {d:>7.1}ms\n", .{ "TOTAL", total }); @@ -136,7 +146,7 @@ fn loadTemplate(alloc: std.mem.Allocator, comptime filename: []const u8) ![]cons fn bench( name: []const u8, allocator: std.mem.Allocator, - template: []const u8, + ast: *pugz.parser.Node, data: anytype, ) !f64 { var arena = std.heap.ArenaAllocator.init(allocator); @@ -145,7 +155,7 @@ fn bench( var timer = try std.time.Timer.start(); for (0..iterations) |_| { _ = arena.reset(.retain_capacity); - _ = pugz.template.renderWithData(arena.allocator(), template, data) catch |err| { + _ = pugz.template.renderAst(arena.allocator(), ast, data) catch |err| { std.debug.print(" {s:<20} => ERROR: {}\n", .{ name, err }); return 0; }; diff --git a/src/lexer.zig b/src/lexer.zig index 68d8f07..31a4523 100644 --- a/src/lexer.zig +++ b/src/lexer.zig @@ -335,6 +335,16 @@ pub const Lexer = struct { const IndentType = enum { tabs, spaces }; + /// Get current indent level (top of stack) - O(1) + inline fn currentIndent(self: *const Lexer) usize { + return self.indent_stack.items[self.indent_stack.items.len - 1]; + } + + /// Get previous indent level (second from top) - O(1) + inline fn previousIndent(self: *const Lexer) usize { + return self.indent_stack.items[self.indent_stack.items.len - 2]; + } + pub fn init(allocator: Allocator, str: []const u8, options: LexerOptions) !Lexer { // Strip UTF-8 BOM if present var input = str; @@ -391,6 +401,16 @@ pub const Lexer = struct { } } + /// Deinit without freeing input_allocated - caller takes ownership of it + /// Returns the input_allocated slice that caller must free + pub fn deinitKeepInput(self: *Lexer) []const u8 { + self.indent_stack.deinit(self.allocator); + self.tokens.deinit(self.allocator); + const input = self.input_allocated; + self.input_allocated = &.{}; // Clear so regular deinit won't double-free + return input; + } + // ======================================================================== // Error handling // ======================================================================== @@ -634,9 +654,9 @@ pub const Lexer = struct { return false; } - // Add outdent tokens for remaining indentation - var i: usize = 0; - while (i < self.indent_stack.items.len and self.indent_stack.items[i] > 0) : (i += 1) { + // Add outdent tokens for remaining indentation (pop from stack end) + while (self.indent_stack.items.len > 1 and self.currentIndent() > 0) { + _ = self.indent_stack.pop(); var outdent_tok = self.tok(.outdent, .none); self.tokEnd(&outdent_tok); self.tokens.append(self.allocator, outdent_tok) catch return false; @@ -2211,34 +2231,34 @@ pub const Lexer = struct { } // Outdent - if (indents < self.indent_stack.items[0]) { + if (indents < self.currentIndent()) { var outdent_count: usize = 0; - while (self.indent_stack.items[0] > indents) { - if (self.indent_stack.items.len > 1 and self.indent_stack.items[1] < indents) { + while (self.currentIndent() > indents) { + if (self.indent_stack.items.len > 1 and self.previousIndent() < indents) { self.setError(.INCONSISTENT_INDENTATION, "Inconsistent indentation"); return false; } outdent_count += 1; - _ = self.indent_stack.orderedRemove(0); + _ = self.indent_stack.pop(); // O(1) instead of O(n) } while (outdent_count > 0) : (outdent_count -= 1) { self.colno = 1; var outdent_token = self.tok(.outdent, .none); - self.colno = self.indent_stack.items[0] + 1; + self.colno = self.currentIndent() + 1; self.tokens.append(self.allocator, outdent_token) catch return false; self.tokEnd(&outdent_token); } - } else if (indents > 0 and indents != self.indent_stack.items[0]) { + } else if (indents > 0 and indents != self.currentIndent()) { // Indent var indent_token = self.tok(.indent, .none); self.colno = 1 + indents; self.tokens.append(self.allocator, indent_token) catch return false; self.tokEnd(&indent_token); - self.indent_stack.insert(self.allocator, 0, indents) catch return false; + self.indent_stack.append(self.allocator, indents) catch return false; // O(1) instead of O(n) } else { // Newline var newline_token = self.tok(.newline, .none); - self.colno = 1 + @min(self.indent_stack.items[0], indents); + self.colno = 1 + @min(self.currentIndent(), indents); self.tokens.append(self.allocator, newline_token) catch return false; self.tokEnd(&newline_token); } @@ -2253,7 +2273,7 @@ pub const Lexer = struct { const captures = self.scanIndentation() orelse return false; const indents = forced_indents orelse captures.indent.len; - if (indents <= self.indent_stack.items[0]) return false; + if (indents <= self.currentIndent()) return false; var start_token = self.tok(.start_pipeless_text, .none); self.tokEnd(&start_token); @@ -2307,7 +2327,7 @@ pub const Lexer = struct { else ""; tokens_list.append(self.allocator, text_content) catch return false; - } else if (line_indent > self.indent_stack.items[0]) { + } else if (line_indent > self.currentIndent()) { // line is indented less than the first line but is still indented // need to retry lexing the text block with new indent level _ = self.tokens.pop(); diff --git a/src/load.zig b/src/load.zig index 48cd449..ddd3c9a 100644 --- a/src/load.zig +++ b/src/load.zig @@ -98,6 +98,7 @@ pub const LoadError = error{ ParseError, WalkError, InvalidUtf8, + PathEscapesRoot, }; // ============================================================================ @@ -121,7 +122,33 @@ pub const LoadResult = struct { // Default Implementations // ============================================================================ +/// Check if path is safe (doesn't escape root via .. or other tricks) +/// Returns false if path would escape the root directory. +pub fn isPathSafe(path: []const u8) bool { + // Reject absolute paths + if (path.len > 0 and path[0] == '/') { + return false; + } + + var depth: i32 = 0; + var iter = mem.splitScalar(u8, path, '/'); + + while (iter.next()) |component| { + if (component.len == 0 or mem.eql(u8, component, ".")) { + continue; + } + if (mem.eql(u8, component, "..")) { + depth -= 1; + if (depth < 0) return false; // Escaped root + } else { + depth += 1; + } + } + return true; +} + /// Default path resolution - handles relative and absolute paths +/// Rejects paths that would escape the base directory. pub fn defaultResolve( filename: []const u8, source: ?[]const u8, @@ -133,6 +160,11 @@ pub fn defaultResolve( return error.InvalidPath; } + // Security: reject paths that escape root + if (!isPathSafe(trimmed)) { + return error.PathEscapesRoot; + } + // Absolute path (starts with /) if (trimmed[0] == '/') { if (options.basedir == null) { @@ -369,10 +401,11 @@ test "pathJoin - absolute paths" { try std.testing.expectEqualStrings("/absolute/path.pug", result); } -test "defaultResolve - missing basedir for absolute path" { +test "defaultResolve - rejects absolute paths as path escape" { const options = LoadOptions{}; const result = defaultResolve("/absolute/path.pug", null, &options); - try std.testing.expectError(error.MissingBasedir, result); + // Absolute paths are rejected as path escape (security boundary) + try std.testing.expectError(error.PathEscapesRoot, result); } test "defaultResolve - missing filename for relative path" { diff --git a/src/root.zig b/src/root.zig index ec6062e..0fae615 100644 --- a/src/root.zig +++ b/src/root.zig @@ -8,6 +8,7 @@ pub const pug = @import("pug.zig"); pub const view_engine = @import("view_engine.zig"); pub const template = @import("template.zig"); +pub const parser = @import("parser.zig"); // Re-export main types pub const ViewEngine = view_engine.ViewEngine; diff --git a/src/runtime.zig b/src/runtime.zig index 9f9d931..ac67d68 100644 --- a/src/runtime.zig +++ b/src/runtime.zig @@ -89,66 +89,60 @@ pub const AttrValue = union(enum) { /// Returns empty string for false/null values. /// For true values, returns terse form " key" or full form " key="key"". pub fn attr(allocator: Allocator, key: []const u8, val: AttrValue, escaped: bool, terse: bool) ![]const u8 { + var result: ArrayListUnmanaged(u8) = .{}; + errdefer result.deinit(allocator); + try appendAttr(allocator, &result, key, val, escaped, terse); + if (result.items.len == 0) { + return ""; + } + return try result.toOwnedSlice(allocator); +} + +/// Append attribute directly to output buffer - avoids intermediate allocations +/// This is the preferred method for rendering attributes in hot paths +pub fn appendAttr(allocator: Allocator, output: *ArrayListUnmanaged(u8), key: []const u8, val: AttrValue, escaped: bool, terse: bool) !void { switch (val) { - .none => return try allocator.dupe(u8, ""), + .none => return, .boolean => |b| { - if (!b) return try allocator.dupe(u8, ""); + if (!b) return; // true value - if (terse) { - var result: ArrayListUnmanaged(u8) = .{}; - errdefer result.deinit(allocator); - try result.append(allocator, ' '); - try result.appendSlice(allocator, key); - return try result.toOwnedSlice(allocator); - } else { - var result: ArrayListUnmanaged(u8) = .{}; - errdefer result.deinit(allocator); - try result.append(allocator, ' '); - try result.appendSlice(allocator, key); - try result.appendSlice(allocator, "=\""); - try result.appendSlice(allocator, key); - try result.append(allocator, '"'); - return try result.toOwnedSlice(allocator); + try output.append(allocator, ' '); + try output.appendSlice(allocator, key); + if (!terse) { + try output.appendSlice(allocator, "=\""); + try output.appendSlice(allocator, key); + try output.append(allocator, '"'); } }, .number => |n| { - var result: ArrayListUnmanaged(u8) = .{}; - errdefer result.deinit(allocator); - try result.append(allocator, ' '); - try result.appendSlice(allocator, key); - try result.appendSlice(allocator, "=\""); + try output.append(allocator, ' '); + try output.appendSlice(allocator, key); + try output.appendSlice(allocator, "=\""); - // Format number + // Format number directly to buffer var buf: [32]u8 = undefined; - const num_str = std.fmt.bufPrint(&buf, "{d}", .{n}) catch return error.FormatError; - try result.appendSlice(allocator, num_str); + const num_str = std.fmt.bufPrint(&buf, "{d}", .{n}) catch return; + try output.appendSlice(allocator, num_str); - try result.append(allocator, '"'); - return try result.toOwnedSlice(allocator); + try output.append(allocator, '"'); }, .string => |s| { - // Empty class or style returns empty + // Skip empty class or style if (s.len == 0 and (mem.eql(u8, key, "class") or mem.eql(u8, key, "style"))) { - return try allocator.dupe(u8, ""); + return; } - var result: ArrayListUnmanaged(u8) = .{}; - errdefer result.deinit(allocator); - - try result.append(allocator, ' '); - try result.appendSlice(allocator, key); - try result.appendSlice(allocator, "=\""); + try output.append(allocator, ' '); + try output.appendSlice(allocator, key); + try output.appendSlice(allocator, "=\""); if (escaped) { - const escaped_val = try escape(allocator, s); - defer allocator.free(escaped_val); - try result.appendSlice(allocator, escaped_val); + try appendEscaped(allocator, output, s); } else { - try result.appendSlice(allocator, s); + try output.appendSlice(allocator, s); } - try result.append(allocator, '"'); - return try result.toOwnedSlice(allocator); + try output.append(allocator, '"'); }, } } diff --git a/src/template.zig b/src/template.zig index a9d2983..b7a50ed 100644 --- a/src/template.zig +++ b/src/template.zig @@ -10,6 +10,8 @@ const pug = @import("pug.zig"); const parser = @import("parser.zig"); const Node = parser.Node; const runtime = @import("runtime.zig"); +const mixin_mod = @import("mixin.zig"); +pub const MixinRegistry = mixin_mod.MixinRegistry; pub const TemplateError = error{ OutOfMemory, @@ -17,10 +19,40 @@ pub const TemplateError = error{ ParserError, }; -/// Render context tracks state like doctype mode +/// Result of parsing - contains AST and the normalized source that AST slices point to +pub const ParseResult = struct { + ast: *Node, + /// Normalized source - AST strings are slices into this, must stay alive while AST is used + normalized_source: []const u8, + + pub fn deinit(self: *ParseResult, allocator: Allocator) void { + self.ast.deinit(allocator); + allocator.destroy(self.ast); + allocator.free(self.normalized_source); + } +}; + +/// Render context tracks state like doctype mode and mixin registry pub const RenderContext = struct { /// true = HTML5 terse mode (default), false = XHTML mode terse: bool = true, + /// Mixin registry for expanding mixin calls (optional) + mixins: ?*const MixinRegistry = null, + /// Current mixin argument bindings (for substitution during mixin expansion) + arg_bindings: ?*const std.StringHashMapUnmanaged([]const u8) = null, + /// Block content passed to current mixin call (for `block` keyword) + mixin_block: ?*Node = null, + /// Enable pretty-printing with indentation and newlines + pretty: bool = false, + /// Current indentation level (for pretty printing) + indent_level: u32 = 0, + + /// Create a child context with incremented indent level + fn indented(self: RenderContext) RenderContext { + var child = self; + child.indent_level += 1; + return child; + } }; /// Render a template with data @@ -36,10 +68,10 @@ pub fn renderWithData(allocator: Allocator, source: []const u8, data: anytype) ! defer stripped.deinit(allocator); // Parse - var parse = pug.parser.Parser.init(allocator, stripped.tokens.items, null, source); - defer parse.deinit(); + var pug_parser = pug.parser.Parser.init(allocator, stripped.tokens.items, null, source); + defer pug_parser.deinit(); - const ast = parse.parse() catch { + const ast = pug_parser.parse() catch { return error.ParserError; }; defer { @@ -47,7 +79,12 @@ pub fn renderWithData(allocator: Allocator, source: []const u8, data: anytype) ! allocator.destroy(ast); } - // Render with data + return renderAst(allocator, ast, data); +} + +/// Render a pre-parsed AST with data. Use this for better performance when +/// rendering the same template multiple times - parse once, render many. +pub fn renderAst(allocator: Allocator, ast: *Node, data: anytype) ![]const u8 { var output = std.ArrayListUnmanaged(u8){}; errdefer output.deinit(allocator); @@ -60,6 +97,78 @@ pub fn renderWithData(allocator: Allocator, source: []const u8, data: anytype) ! return output.toOwnedSlice(allocator); } +/// Render options for AST rendering +pub const RenderOptions = struct { + pretty: bool = false, +}; + +/// Render a pre-parsed AST with data and mixin registry. +/// Use this when templates include mixin definitions from other files. +pub fn renderAstWithMixins(allocator: Allocator, ast: *Node, data: anytype, registry: *const MixinRegistry) ![]const u8 { + return renderAstWithMixinsAndOptions(allocator, ast, data, registry, .{}); +} + +/// Render a pre-parsed AST with data, mixin registry, and render options. +pub fn renderAstWithMixinsAndOptions(allocator: Allocator, ast: *Node, data: anytype, registry: *const MixinRegistry, options: RenderOptions) ![]const u8 { + var output = std.ArrayListUnmanaged(u8){}; + errdefer output.deinit(allocator); + + // Detect doctype to set terse mode + var ctx = RenderContext{ + .mixins = registry, + .pretty = options.pretty, + }; + detectDoctype(ast, &ctx); + + try renderNode(allocator, &output, ast, data, &ctx); + + return output.toOwnedSlice(allocator); +} + +/// Parse template source into AST. Caller owns the returned AST and must call +/// ast.deinit(allocator) and allocator.destroy(ast) when done. +/// WARNING: The returned AST contains slices into a normalized copy of source. +/// This function frees that copy on return, so AST string values become invalid. +/// Use parseWithSource() instead if you need to access AST string values. +pub fn parse(allocator: Allocator, source: []const u8) !*Node { + const result = try parseWithSource(allocator, source); + // Free the normalized source - AST strings will be invalid after this! + // This maintains backwards compatibility but is unsafe for include paths etc. + allocator.free(result.normalized_source); + return result.ast; +} + +/// Parse template source into AST, returning both AST and the normalized source. +/// AST string values are slices into normalized_source, so it must stay alive. +/// Caller must call result.deinit(allocator) when done. +pub fn parseWithSource(allocator: Allocator, source: []const u8) !ParseResult { + // Lex + var lex = pug.lexer.Lexer.init(allocator, source, .{}) catch return error.OutOfMemory; + errdefer lex.deinit(); + + const tokens = lex.getTokens() catch return error.LexerError; + + // Strip comments + var stripped = pug.strip_comments.stripComments(allocator, tokens, .{}) catch return error.OutOfMemory; + defer stripped.deinit(allocator); + + // Parse + var pug_parser = pug.parser.Parser.init(allocator, stripped.tokens.items, null, source); + defer pug_parser.deinit(); + + const ast = pug_parser.parse() catch { + return error.ParserError; + }; + + // Transfer ownership of normalized input from lexer to caller + const normalized = lex.deinitKeepInput(); + + return ParseResult{ + .ast = ast, + .normalized_source = normalized, + }; +} + /// Scan AST for doctype and set terse mode accordingly fn detectDoctype(node: *Node, ctx: *RenderContext) void { if (node.type == .Doctype) { @@ -86,6 +195,23 @@ fn detectDoctype(node: *Node, ctx: *RenderContext) void { } } +// Tags where whitespace is significant - don't add indentation inside these +const whitespace_sensitive_tags = std.StaticStringMap(void).initComptime(.{ + .{ "pre", {} }, + .{ "textarea", {} }, + .{ "script", {} }, + .{ "style", {} }, + .{ "code", {} }, +}); + +/// Write indentation (two spaces per level) +fn writeIndent(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), level: u32) Allocator.Error!void { + var i: u32 = 0; + while (i < level) : (i += 1) { + try output.appendSlice(allocator, " "); + } +} + fn renderNode(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), node: *Node, data: anytype, ctx: *const RenderContext) Allocator.Error!void { switch (node.type) { .Block, .NamedBlock => { @@ -100,11 +226,13 @@ fn renderNode(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), node: * .BlockComment => try renderBlockComment(allocator, output, node, data, ctx), .Doctype => try renderDoctype(allocator, output, node), .Each => try renderEach(allocator, output, node, data, ctx), - .Mixin => { - // Mixin definitions are skipped (only mixin calls render) - if (!node.call) return; - for (node.nodes.items) |child| { - try renderNode(allocator, output, child, data, ctx); + .Mixin => try renderMixin(allocator, output, node, data, ctx), + .MixinBlock => { + // Render the block content passed to the mixin + if (ctx.mixin_block) |block| { + for (block.nodes.items) |child| { + try renderNode(allocator, output, child, data, ctx); + } } }, else => { @@ -117,19 +245,56 @@ fn renderNode(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), node: * fn renderTag(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), tag: *Node, data: anytype, ctx: *const RenderContext) Allocator.Error!void { const name = tag.name orelse "div"; + const is_whitespace_sensitive = whitespace_sensitive_tags.has(name); + + // Check if children are only text/inline content (no block elements) + const has_children = tag.nodes.items.len > 0; + const has_block_children = has_children and hasBlockChildren(tag); + + // Pretty print: add newline and indent before opening tag (except for inline elements) + if (ctx.pretty and !tag.is_inline) { + // Only add newline if we're not at the start of output + if (output.items.len > 0) { + try output.append(allocator, '\n'); + } + try writeIndent(allocator, output, ctx.indent_level); + } try output.appendSlice(allocator, "<"); try output.appendSlice(allocator, name); - // Render attributes using runtime.attr() + // Collect class values separately to merge them into one attribute + var class_parts = std.ArrayListUnmanaged([]const u8){}; + defer class_parts.deinit(allocator); + + // Render attributes directly to output buffer (avoids intermediate allocations) for (tag.attrs.items) |attr| { - const attr_val = try evaluateAttrValue(allocator, attr.val, data); - const attr_str = runtime.attr(allocator, attr.name, attr_val, true, ctx.terse) catch |err| switch (err) { - error.FormatError => return error.OutOfMemory, - error.OutOfMemory => return error.OutOfMemory, - }; - defer allocator.free(attr_str); - try output.appendSlice(allocator, attr_str); + // Substitute mixin arguments in attribute value if we're inside a mixin + const final_val = if (ctx.arg_bindings) |bindings| + substituteArgValue(attr.val, bindings) + else + attr.val; + const attr_val = try evaluateAttrValue(allocator, final_val, data); + + // Collect class attributes for merging + if (std.mem.eql(u8, attr.name, "class")) { + switch (attr_val) { + .string => |s| if (s.len > 0) try class_parts.append(allocator, s), + else => {}, + } + } else { + try runtime.appendAttr(allocator, output, attr.name, attr_val, true, ctx.terse); + } + } + + // Output merged class attribute + if (class_parts.items.len > 0) { + try output.appendSlice(allocator, " class=\""); + for (class_parts.items, 0..) |part, i| { + if (i > 0) try output.append(allocator, ' '); + try output.appendSlice(allocator, part); + } + try output.append(allocator, '"'); } // Self-closing logic differs by mode: @@ -152,24 +317,68 @@ fn renderTag(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), tag: *No try output.appendSlice(allocator, ">"); - // Render text content + // Render text content (with mixin argument substitution if applicable) if (tag.val) |val| { - try processInterpolation(allocator, output, val, false, data); + const final_val = if (ctx.arg_bindings) |bindings| + substituteArgValue(val, bindings) orelse val + else + val; + try processInterpolation(allocator, output, final_val, false, data); } - // Render children - for (tag.nodes.items) |child| { - try renderNode(allocator, output, child, data, ctx); + // Render children with increased indent (unless whitespace-sensitive) + if (has_children) { + const child_ctx = if (ctx.pretty and !is_whitespace_sensitive) + ctx.indented() + else + ctx.*; + for (tag.nodes.items) |child| { + try renderNode(allocator, output, child, data, &child_ctx); + } } // Close tag if (!is_self_closing) { + // Pretty print: add newline and indent before closing tag + // Only if we have block children (not just text/inline content) + if (ctx.pretty and has_block_children and !tag.is_inline and !is_whitespace_sensitive) { + try output.append(allocator, '\n'); + try writeIndent(allocator, output, ctx.indent_level); + } try output.appendSlice(allocator, ""); } } +/// Check if a tag has block-level children (not just text/inline content) +fn hasBlockChildren(tag: *Node) bool { + for (tag.nodes.items) |child| { + switch (child.type) { + // Text and Code are inline + .Text, .Code => continue, + // Tags marked as inline are inline + .Tag, .InterpolatedTag => { + if (!child.is_inline) return true; + }, + // Everything else is considered block + else => return true, + } + } + return false; +} + +/// Substitute a single argument reference in a value (simple case - exact match) +fn substituteArgValue(val: ?[]const u8, bindings: *const std.StringHashMapUnmanaged([]const u8)) ?[]const u8 { + const v = val orelse return null; + // Check if the entire value is a parameter name + if (bindings.get(v)) |replacement| { + return replacement; + } + // For now, return as-is (complex substitution would need allocation) + return v; +} + /// Evaluate attribute value from AST to runtime.AttrValue fn evaluateAttrValue(allocator: Allocator, val: ?[]const u8, data: anytype) !runtime.AttrValue { _ = allocator; @@ -211,6 +420,21 @@ fn renderCode(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), code: * } else { try output.appendSlice(allocator, inner); } + } else if (ctx.arg_bindings) |bindings| { + // Inside a mixin - check argument bindings first + if (bindings.get(val)) |value| { + if (code.must_escape) { + try runtime.appendEscaped(allocator, output, value); + } else { + try output.appendSlice(allocator, value); + } + } else if (getFieldValue(data, val)) |value| { + if (code.must_escape) { + try runtime.appendEscaped(allocator, output, value); + } else { + try output.appendSlice(allocator, value); + } + } } else if (getFieldValue(data, val)) |value| { if (code.must_escape) { try runtime.appendEscaped(allocator, output, value); @@ -226,6 +450,138 @@ fn renderCode(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), code: * } } +/// Render mixin definition or call +fn renderMixin(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), node: *Node, data: anytype, ctx: *const RenderContext) Allocator.Error!void { + // Mixin definitions are skipped (only mixin calls render) + if (!node.call) return; + + const mixin_name = node.name orelse return; + + // Look up mixin definition in registry + const mixin_def = if (ctx.mixins) |registry| registry.get(mixin_name) else null; + + if (mixin_def) |def| { + // Build argument bindings + var bindings = std.StringHashMapUnmanaged([]const u8){}; + defer bindings.deinit(allocator); + + if (def.args) |params| { + if (node.args) |args| { + bindMixinArguments(allocator, params, args, &bindings) catch {}; + } + } + + // Create block node from call's children (if any) for `block` keyword + var call_block: ?*Node = null; + if (node.nodes.items.len > 0) { + call_block = node; + } + + // Render the mixin body with argument bindings + var mixin_ctx = RenderContext{ + .terse = ctx.terse, + .mixins = ctx.mixins, + .arg_bindings = &bindings, + .mixin_block = call_block, + }; + + for (def.nodes.items) |child| { + try renderNode(allocator, output, child, data, &mixin_ctx); + } + } else { + // Mixin not found - render children directly (fallback behavior) + for (node.nodes.items) |child| { + try renderNode(allocator, output, child, data, ctx); + } + } +} + +/// Bind mixin call arguments to parameter names +fn bindMixinArguments( + allocator: Allocator, + params: []const u8, + args: []const u8, + bindings: *std.StringHashMapUnmanaged([]const u8), +) !void { + // Parse parameter names from definition: "text, type" or "text, type='primary'" + var param_names = std.ArrayListUnmanaged([]const u8){}; + defer param_names.deinit(allocator); + + var param_iter = std.mem.splitSequence(u8, params, ","); + while (param_iter.next()) |param_part| { + const trimmed = std.mem.trim(u8, param_part, " \t"); + if (trimmed.len == 0) continue; + + // Handle default values: "type='primary'" -> just get "type" + var param_name = trimmed; + if (std.mem.indexOf(u8, trimmed, "=")) |eq_pos| { + param_name = std.mem.trim(u8, trimmed[0..eq_pos], " \t"); + } + + // Handle rest args: "...items" -> "items" + if (std.mem.startsWith(u8, param_name, "...")) { + param_name = param_name[3..]; + } + + try param_names.append(allocator, param_name); + } + + // Parse argument values from call: "'Click', 'primary'" or "text='Click'" + var arg_values = std.ArrayListUnmanaged([]const u8){}; + defer arg_values.deinit(allocator); + + // Simple argument parsing - split by comma but respect quotes + var in_string = false; + var string_char: u8 = 0; + var paren_depth: usize = 0; + var start: usize = 0; + + for (args, 0..) |c, idx| { + if (!in_string) { + if (c == '"' or c == '\'') { + in_string = true; + string_char = c; + } else if (c == '(') { + paren_depth += 1; + } else if (c == ')') { + if (paren_depth > 0) paren_depth -= 1; + } else if (c == ',' and paren_depth == 0) { + const arg_val = std.mem.trim(u8, args[start..idx], " \t"); + try arg_values.append(allocator, stripQuotes(arg_val)); + start = idx + 1; + } + } else { + if (c == string_char) { + in_string = false; + } + } + } + + // Add last argument + if (start < args.len) { + const arg_val = std.mem.trim(u8, args[start..], " \t"); + if (arg_val.len > 0) { + try arg_values.append(allocator, stripQuotes(arg_val)); + } + } + + // Bind positional arguments + const min_len = @min(param_names.items.len, arg_values.items.len); + for (0..min_len) |i| { + try bindings.put(allocator, param_names.items[i], arg_values.items[i]); + } +} + +fn stripQuotes(val: []const u8) []const u8 { + if (val.len < 2) return val; + const first = val[0]; + const last = val[val.len - 1]; + if ((first == '"' and last == '"') or (first == '\'' and last == '\'')) { + return val[1 .. val.len - 1]; + } + return val; +} + fn renderEach(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), each: *Node, data: anytype, ctx: *const RenderContext) Allocator.Error!void { const collection_name = each.obj orelse return; const item_name = each.val orelse "item"; @@ -242,14 +598,26 @@ fn renderEach(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), each: * const CollType = @TypeOf(collection); const coll_info = @typeInfo(CollType); - if (coll_info == .pointer and coll_info.pointer.size == .slice) { + // Handle both slices ([]T) and pointers to arrays (*[N]T) + const is_slice = coll_info == .pointer and coll_info.pointer.size == .slice; + const is_array_ptr = coll_info == .pointer and coll_info.pointer.size == .one and + @typeInfo(coll_info.pointer.child) == .array; + + if (is_slice or is_array_ptr) { for (collection) |item| { const ItemType = @TypeOf(item); if (ItemType == []const u8) { + // Simple string item - use renderNodeWithItem for (each.nodes.items) |child| { try renderNodeWithItem(allocator, output, child, data, item, ctx); } + } else if (@typeInfo(ItemType) == .@"struct") { + // Struct item - render with item as the data context + for (each.nodes.items) |child| { + try renderNode(allocator, output, child, item, ctx); + } } else { + // Other types - skip for (each.nodes.items) |child| { try renderNode(allocator, output, child, data, ctx); } @@ -297,15 +665,33 @@ fn renderTagWithItem(allocator: Allocator, output: *std.ArrayListUnmanaged(u8), try output.appendSlice(allocator, "<"); try output.appendSlice(allocator, name); - // Render attributes using runtime.attr() + // Collect class values separately to merge them into one attribute + var class_parts = std.ArrayListUnmanaged([]const u8){}; + defer class_parts.deinit(allocator); + + // Render attributes directly to output buffer (avoids intermediate allocations) for (tag.attrs.items) |attr| { const attr_val = try evaluateAttrValue(allocator, attr.val, data); - const attr_str = runtime.attr(allocator, attr.name, attr_val, true, ctx.terse) catch |err| switch (err) { - error.FormatError => return error.OutOfMemory, - error.OutOfMemory => return error.OutOfMemory, - }; - defer allocator.free(attr_str); - try output.appendSlice(allocator, attr_str); + + // Collect class attributes for merging + if (std.mem.eql(u8, attr.name, "class")) { + switch (attr_val) { + .string => |s| if (s.len > 0) try class_parts.append(allocator, s), + else => {}, + } + } else { + try runtime.appendAttr(allocator, output, attr.name, attr_val, true, ctx.terse); + } + } + + // Output merged class attribute + if (class_parts.items.len > 0) { + try output.appendSlice(allocator, " class=\""); + for (class_parts.items, 0..) |part, i| { + if (i > 0) try output.append(allocator, ' '); + try output.appendSlice(allocator, part); + } + try output.append(allocator, '"'); } const is_void = isSelfClosing(name); @@ -681,3 +1067,57 @@ test "nested tags with data" { try std.testing.expectEqualStrings("Hello there!
Content
+ \\Hello
+ \\