Hello World!
+
+
+ some content
+and some more
+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, "Hello
") != null);
+}
diff --git a/src/root.zig b/src/root.zig
index eb40fd9..ec6062e 100644
--- a/src/root.zig
+++ b/src/root.zig
@@ -1,69 +1,23 @@
-//! Pugz - A Pug-like HTML template engine written in Zig.
-//!
-//! Pugz provides a clean, indentation-based syntax for writing HTML templates,
-//! inspired by Pug (formerly Jade). It supports:
-//! - Indentation-based nesting
-//! - Tag, class, and ID shorthand syntax
-//! - Attributes and text interpolation
-//! - Control flow (if/else, each, while)
-//! - Mixins and template inheritance
-//!
-//! ## Quick Start (Server Usage)
-//!
-//! ```zig
-//! const pugz = @import("pugz");
-//!
-//! // Initialize view engine once at startup
-//! var engine = try pugz.ViewEngine.init(allocator, .{
-//! .views_dir = "src/views",
-//! });
-//! defer engine.deinit();
-//!
-//! // Render templates (use arena allocator per request)
-//! var arena = std.heap.ArenaAllocator.init(allocator);
-//! defer arena.deinit();
-//!
-//! const html = try engine.render(arena.allocator(), "pages/home", .{
-//! .title = "Home",
-//! });
-//! ```
+// Pugz - A Pug-like HTML template engine written in Zig
+//
+// Quick Start:
+// const pugz = @import("pugz");
+// const engine = pugz.ViewEngine.init(.{ .views_dir = "views" });
+// const html = try engine.render(allocator, "index", .{ .title = "Home" });
-pub const lexer = @import("lexer.zig");
-pub const ast = @import("ast.zig");
-pub const parser = @import("parser.zig");
-pub const codegen = @import("codegen.zig");
-pub const runtime = @import("runtime.zig");
+pub const pug = @import("pug.zig");
pub const view_engine = @import("view_engine.zig");
-pub const diagnostic = @import("diagnostic.zig");
+pub const template = @import("template.zig");
-// Re-export main types for convenience
-pub const Lexer = lexer.Lexer;
-pub const Token = lexer.Token;
-pub const TokenType = lexer.TokenType;
-
-pub const Parser = parser.Parser;
-pub const Node = ast.Node;
-pub const Document = ast.Document;
-
-pub const CodeGen = codegen.CodeGen;
-pub const generate = codegen.generate;
-
-pub const Runtime = runtime.Runtime;
-pub const Context = runtime.Context;
-pub const Value = runtime.Value;
-pub const render = runtime.render;
-pub const renderWithOptions = runtime.renderWithOptions;
-pub const RenderOptions = runtime.RenderOptions;
-pub const renderTemplate = runtime.renderTemplate;
-
-// High-level API
+// Re-export main types
pub const ViewEngine = view_engine.ViewEngine;
-pub const CompiledTemplate = view_engine.CompiledTemplate;
+pub const compile = pug.compile;
+pub const compileFile = pug.compileFile;
+pub const render = pug.render;
+pub const renderFile = pug.renderFile;
+pub const CompileOptions = pug.CompileOptions;
+pub const CompileResult = pug.CompileResult;
+pub const CompileError = pug.CompileError;
-// Build-time template compilation
-pub const build_templates = @import("build_templates.zig");
-pub const compileTemplates = build_templates.compileTemplates;
-
-test {
- _ = @import("std").testing.refAllDecls(@This());
-}
+// Convenience function for inline templates with data
+pub const renderTemplate = template.renderWithData;
diff --git a/src/run_playground.zig b/src/run_playground.zig
new file mode 100644
index 0000000..0c3e7ef
--- /dev/null
+++ b/src/run_playground.zig
@@ -0,0 +1,118 @@
+// Zig Pugz - Process all .pug files in playground/examples folder
+
+const std = @import("std");
+const pug = @import("pug.zig");
+const fs = std.fs;
+
+pub fn main() !void {
+ var gpa = std.heap.GeneralPurposeAllocator(.{}){};
+ defer _ = gpa.deinit();
+ const allocator = gpa.allocator();
+
+ std.debug.print("=== Zig Pugz Playground ===\n\n", .{});
+
+ // Open the examples directory
+ var dir = fs.cwd().openDir("playground/examples", .{ .iterate = true }) catch {
+ std.debug.print("Error: Could not open playground/examples directory\n", .{});
+ std.debug.print("Run from packages/pugz/ directory\n", .{});
+ return;
+ };
+ defer dir.close();
+
+ // Collect .pug files
+ var files = std.ArrayListUnmanaged([]const u8){};
+ defer {
+ for (files.items) |f| allocator.free(f);
+ files.deinit(allocator);
+ }
+
+ var iter = dir.iterate();
+ while (try iter.next()) |entry| {
+ if (entry.kind == .file and std.mem.endsWith(u8, entry.name, ".pug")) {
+ const name = try allocator.dupe(u8, entry.name);
+ try files.append(allocator, name);
+ }
+ }
+
+ // Sort files
+ std.mem.sort([]const u8, files.items, {}, struct {
+ fn lessThan(_: void, a: []const u8, b: []const u8) bool {
+ return std.mem.lessThan(u8, a, b);
+ }
+ }.lessThan);
+
+ std.debug.print("Found {d} .pug files\n\n", .{files.items.len});
+
+ var passed: usize = 0;
+ var failed: usize = 0;
+ var total_time_ns: u64 = 0;
+
+ for (files.items) |filename| {
+ // Read file
+ const file = dir.openFile(filename, .{}) catch {
+ std.debug.print("x {s}\n -> Could not open file\n\n", .{filename});
+ failed += 1;
+ continue;
+ };
+ defer file.close();
+
+ const source = file.readToEndAlloc(allocator, 1024 * 1024) catch {
+ std.debug.print("x {s}\n -> Could not read file\n\n", .{filename});
+ failed += 1;
+ continue;
+ };
+ defer allocator.free(source);
+
+ // Benchmark
+ const iterations: usize = 100;
+ var success = false;
+ var last_html: ?[]const u8 = null;
+
+ // Warmup
+ for (0..5) |_| {
+ var result = pug.compile(allocator, source, .{}) catch continue;
+ result.deinit(allocator);
+ }
+
+ var timer = try std.time.Timer.start();
+ var i: usize = 0;
+ while (i < iterations) : (i += 1) {
+ var result = pug.compile(allocator, source, .{}) catch break;
+ if (i == iterations - 1) {
+ last_html = result.html;
+ } else {
+ result.deinit(allocator);
+ }
+ success = true;
+ }
+ const elapsed_ns = timer.read();
+
+ if (success and i == iterations) {
+ const time_ms = @as(f64, @floatFromInt(elapsed_ns)) / 1_000_000.0 / @as(f64, @floatFromInt(iterations));
+ std.debug.print("OK {s} ({d:.3} ms)\n", .{ filename, time_ms });
+
+ // Show preview
+ if (last_html) |html| {
+ const max_len = @min(html.len, 200);
+ std.debug.print(" -> {s}{s}\n\n", .{ html[0..max_len], if (html.len > 200) "..." else "" });
+ allocator.free(html);
+ }
+
+ passed += 1;
+ total_time_ns += elapsed_ns;
+ } else {
+ std.debug.print("FAIL {s}\n -> Compilation failed\n\n", .{filename});
+ failed += 1;
+ }
+ }
+
+ std.debug.print("=== Summary ===\n", .{});
+ std.debug.print("Passed: {d}/{d}\n", .{ passed, files.items.len });
+ std.debug.print("Failed: {d}/{d}\n", .{ failed, files.items.len });
+
+ if (passed > 0) {
+ const total_ms = @as(f64, @floatFromInt(total_time_ns)) / 1_000_000.0 / 100.0;
+ std.debug.print("Total time: {d:.3} ms\n", .{total_ms});
+ std.debug.print("Average: {d:.3} ms per file\n", .{total_ms / @as(f64, @floatFromInt(passed))});
+ }
+}
diff --git a/src/runtime.zig b/src/runtime.zig
index be58d0a..9f9d931 100644
--- a/src/runtime.zig
+++ b/src/runtime.zig
@@ -1,2490 +1,1504 @@
-//! Pugz Runtime - Evaluates templates with data context.
-//!
-//! The runtime takes a parsed AST and a data context, then produces
-//! the final HTML output by:
-//! - Substituting variables in interpolations
-//! - Evaluating conditionals
-//! - Iterating over collections
-//! - Calling mixins
-//! - Template inheritance (extends/block)
-//! - Includes
-//!
-//! **Memory Management**: Use an arena allocator for best performance and
-//! automatic cleanup. The runtime allocates intermediate strings during
-//! template processing that are cleaned up when the arena is reset/deinitialized.
-//!
-//! ```zig
-//! var arena = std.heap.ArenaAllocator.init(gpa.allocator());
-//! defer arena.deinit();
-//!
-//! const html = try engine.renderTpl(arena.allocator(), template, data);
-//! // Use html... arena.deinit() frees everything
-//! ```
-
const std = @import("std");
-const ast = @import("ast.zig");
-const Lexer = @import("lexer.zig").Lexer;
-const Parser = @import("parser.zig").Parser;
+const mem = std.mem;
+const Allocator = std.mem.Allocator;
+const ArrayListUnmanaged = std.ArrayListUnmanaged;
-const log = std.log.scoped(.@"pugz/runtime");
+// ============================================================================
+// Pug Runtime - HTML generation utilities
+// ============================================================================
-/// A value in the template context.
-pub const Value = union(enum) {
- /// Null/undefined value.
- null,
- /// Boolean value.
- bool: bool,
- /// Integer value.
- int: i64,
- /// Floating point value.
- float: f64,
- /// String value.
+/// Escape HTML special characters in a string.
+/// Characters escaped: " & < >
+pub fn escape(allocator: Allocator, html: []const u8) ![]const u8 {
+ // Quick check if escaping is needed
+ var needs_escape = false;
+ for (html) |c| {
+ if (c == '"' or c == '&' or c == '<' or c == '>') {
+ needs_escape = true;
+ break;
+ }
+ }
+
+ if (!needs_escape) {
+ return try allocator.dupe(u8, html);
+ }
+
+ var result: ArrayListUnmanaged(u8) = .{};
+ errdefer result.deinit(allocator);
+
+ for (html) |c| {
+ switch (c) {
+ '"' => try result.appendSlice(allocator, """),
+ '&' => try result.appendSlice(allocator, "&"),
+ '<' => try result.appendSlice(allocator, "<"),
+ '>' => try result.appendSlice(allocator, ">"),
+ else => try result.append(allocator, c),
+ }
+ }
+
+ return try result.toOwnedSlice(allocator);
+}
+
+/// Style value types
+pub const StyleValue = union(enum) {
string: []const u8,
- /// Array of values.
- array: []const Value,
- /// Object/map of string keys to values.
- object: std.StringHashMapUnmanaged(Value),
-
- /// Returns the value as a string for output.
- /// For integers, uses pre-computed strings for small values to avoid allocation.
- pub fn toString(self: Value, allocator: std.mem.Allocator) ![]const u8 {
- // Fast path: strings are most common in templates (branch hint)
- if (self == .string) {
- @branchHint(.likely);
- return self.string;
- }
- return switch (self) {
- .string => unreachable, // handled above
- .null => "",
- .bool => |b| if (b) "true" else "false",
- .int => |i| blk: {
- // Fast path for common small integers (0-99)
- if (i >= 0 and i < 100) {
- break :blk small_int_strings[@intCast(i)];
- }
- // Allocate for larger integers
- break :blk try std.fmt.allocPrint(allocator, "{d}", .{i});
- },
- .float => |f| try std.fmt.allocPrint(allocator, "{d}", .{f}),
- .array => "[Array]",
- .object => "[Object]",
- };
- }
-
- /// Pre-computed strings for small integers 0-99 (common in loops)
- const small_int_strings = [_][]const u8{
- "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
- "10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
- "20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
- "30", "31", "32", "33", "34", "35", "36", "37", "38", "39",
- "40", "41", "42", "43", "44", "45", "46", "47", "48", "49",
- "50", "51", "52", "53", "54", "55", "56", "57", "58", "59",
- "60", "61", "62", "63", "64", "65", "66", "67", "68", "69",
- "70", "71", "72", "73", "74", "75", "76", "77", "78", "79",
- "80", "81", "82", "83", "84", "85", "86", "87", "88", "89",
- "90", "91", "92", "93", "94", "95", "96", "97", "98", "99",
- };
-
- /// Returns the value as a boolean for conditionals.
- pub fn isTruthy(self: Value) bool {
- return switch (self) {
- .null => false,
- .bool => |b| b,
- .int => |i| i != 0,
- .float => |f| f != 0.0,
- .string => |s| s.len > 0,
- .array => |a| a.len > 0,
- .object => true,
- };
- }
-
- /// Creates a string value.
- pub fn str(s: []const u8) Value {
- return .{ .string = s };
- }
-
- /// Creates an integer value.
- pub fn integer(i: i64) Value {
- return .{ .int = i };
- }
-
- /// Creates a boolean value.
- pub fn boolean(b: bool) Value {
- return .{ .bool = b };
- }
+ object: []const StyleProperty,
+ none,
};
-/// Runtime errors.
-pub const RuntimeError = error{
- OutOfMemory,
- UndefinedVariable,
- TypeError,
- InvalidExpression,
- ParseError,
- /// Template include/extends depth exceeded maximum (prevents infinite recursion)
- MaxIncludeDepthExceeded,
- /// Template path attempts to escape base directory (security violation)
- PathTraversalDetected,
-};
-
-/// Template rendering context with variable scopes.
-pub const Context = struct {
- allocator: std.mem.Allocator,
- /// Stack of variable scopes (innermost last).
- /// We keep all scopes allocated and track active depth with scope_depth.
- scopes: std.ArrayList(std.StringHashMapUnmanaged(Value)),
- /// Current active scope depth (scopes[0..scope_depth] are active).
- scope_depth: usize,
- /// Mixin definitions available in this context.
- mixins: std.StringHashMapUnmanaged(ast.MixinDef),
-
- pub fn init(allocator: std.mem.Allocator) Context {
- return .{
- .allocator = allocator,
- .scopes = .empty,
- .scope_depth = 0,
- .mixins = .empty,
- };
- }
-
- pub fn deinit(self: *Context) void {
- for (self.scopes.items) |*scope| {
- scope.*.deinit(self.allocator);
- }
- self.scopes.deinit(self.allocator);
- self.mixins.deinit(self.allocator);
- }
-
- /// Pushes a new scope onto the stack.
- /// Reuses previously allocated scopes when possible to avoid allocation overhead.
- pub fn pushScope(self: *Context) !void {
- if (self.scope_depth < self.scopes.items.len) {
- // Reuse existing scope slot (already cleared on pop)
- } else {
- // Need to allocate a new scope
- try self.scopes.append(self.allocator, .empty);
- }
- self.scope_depth += 1;
- }
-
- /// Pops the current scope from the stack.
- /// Clears scope for reuse but does NOT deallocate.
- pub fn popScope(self: *Context) void {
- if (self.scope_depth > 0) {
- self.scope_depth -= 1;
- // Clear the scope so old values don't leak into next use
- self.scopes.items[self.scope_depth].clearRetainingCapacity();
- }
- }
-
- /// Sets a variable in the current scope.
- pub fn set(self: *Context, name: []const u8, value: Value) !void {
- if (self.scope_depth == 0) {
- try self.pushScope();
- }
- const current = &self.scopes.items[self.scope_depth - 1];
- try current.put(self.allocator, name, value);
- }
-
- /// Gets or creates a slot for a variable, returning a pointer to the value.
- /// Use this for loop variables that are updated repeatedly.
- pub fn getOrPutPtr(self: *Context, name: []const u8) !*Value {
- if (self.scope_depth == 0) {
- try self.pushScope();
- }
- const current = &self.scopes.items[self.scope_depth - 1];
- const gop = try current.getOrPut(self.allocator, name);
- if (!gop.found_existing) {
- gop.value_ptr.* = Value.null;
- }
- return gop.value_ptr;
- }
-
- /// Gets a variable, searching from innermost to outermost scope.
- pub fn get(self: *Context, name: []const u8) ?Value {
- // Fast path: most lookups are in the innermost scope
- if (self.scope_depth > 0) {
- @branchHint(.likely);
- if (self.scopes.items[self.scope_depth - 1].get(name)) |value| {
- return value;
- }
- }
- // Search remaining scopes (less common)
- var i = self.scope_depth -| 1;
- while (i > 0) {
- i -= 1;
- if (self.scopes.items[i].get(name)) |value| {
- return value;
- }
- }
- return null;
- }
-
- /// Registers a mixin definition.
- pub fn defineMixin(self: *Context, mixin: ast.MixinDef) !void {
- try self.mixins.put(self.allocator, mixin.name, mixin);
- }
-
- /// Gets a mixin definition by name.
- pub fn getMixin(self: *Context, name: []const u8) ?ast.MixinDef {
- return self.mixins.get(name);
- }
-};
-
-/// File resolver function type for loading templates.
-/// Takes a path and returns the file contents, or null if not found.
-pub const FileResolver = *const fn (allocator: std.mem.Allocator, path: []const u8) ?[]const u8;
-
-/// Block definition collected from child templates.
-const BlockDef = struct {
+pub const StyleProperty = struct {
name: []const u8,
- mode: ast.Block.Mode,
- children: []const ast.Node,
+ value: []const u8,
};
-/// Runtime engine for evaluating templates.
-pub const Runtime = struct {
- allocator: std.mem.Allocator,
- context: *Context,
- output: std.ArrayList(u8),
+/// Convert a style value to a CSS string.
+/// If val is an object, formats as "key:value;key:value;"
+/// If val is a string, returns it as-is.
+pub fn style(allocator: Allocator, val: StyleValue) ![]const u8 {
+ switch (val) {
+ .none => return try allocator.dupe(u8, ""),
+ .string => |s| {
+ if (s.len == 0) return try allocator.dupe(u8, "");
+ return try allocator.dupe(u8, s);
+ },
+ .object => |props| {
+ var result: ArrayListUnmanaged(u8) = .{};
+ errdefer result.deinit(allocator);
+
+ for (props) |prop| {
+ try result.appendSlice(allocator, prop.name);
+ try result.append(allocator, ':');
+ try result.appendSlice(allocator, prop.value);
+ try result.append(allocator, ';');
+ }
+
+ return try result.toOwnedSlice(allocator);
+ },
+ }
+}
+
+/// Attribute value types
+pub const AttrValue = union(enum) {
+ string: []const u8,
+ boolean: bool,
+ number: i64,
+ none, // null/undefined equivalent
+};
+
+/// Render a single HTML attribute.
+/// 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 {
+ switch (val) {
+ .none => return try allocator.dupe(u8, ""),
+ .boolean => |b| {
+ if (!b) return try allocator.dupe(u8, "");
+ // 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);
+ }
+ },
+ .number => |n| {
+ var result: ArrayListUnmanaged(u8) = .{};
+ errdefer result.deinit(allocator);
+ try result.append(allocator, ' ');
+ try result.appendSlice(allocator, key);
+ try result.appendSlice(allocator, "=\"");
+
+ // Format number
+ var buf: [32]u8 = undefined;
+ const num_str = std.fmt.bufPrint(&buf, "{d}", .{n}) catch return error.FormatError;
+ try result.appendSlice(allocator, num_str);
+
+ try result.append(allocator, '"');
+ return try result.toOwnedSlice(allocator);
+ },
+ .string => |s| {
+ // Empty class or style returns empty
+ if (s.len == 0 and (mem.eql(u8, key, "class") or mem.eql(u8, key, "style"))) {
+ return try allocator.dupe(u8, "");
+ }
+
+ var result: ArrayListUnmanaged(u8) = .{};
+ errdefer result.deinit(allocator);
+
+ try result.append(allocator, ' ');
+ try result.appendSlice(allocator, key);
+ try result.appendSlice(allocator, "=\"");
+
+ if (escaped) {
+ const escaped_val = try escape(allocator, s);
+ defer allocator.free(escaped_val);
+ try result.appendSlice(allocator, escaped_val);
+ } else {
+ try result.appendSlice(allocator, s);
+ }
+
+ try result.append(allocator, '"');
+ return try result.toOwnedSlice(allocator);
+ },
+ }
+}
+
+/// Class value types for the classes function
+pub const ClassValue = union(enum) {
+ string: []const u8,
+ array: []const ClassValue,
+ object: []const ClassCondition,
+ none,
+};
+
+pub const ClassCondition = struct {
+ name: []const u8,
+ condition: bool,
+};
+
+/// Process class values into a space-delimited string.
+/// Arrays are flattened, objects include keys with truthy values.
+/// Optimized to minimize allocations by writing directly to result buffer.
+pub fn classes(allocator: Allocator, val: ClassValue, escaping: ?[]const bool) ![]const u8 {
+ var result: ArrayListUnmanaged(u8) = .{};
+ errdefer result.deinit(allocator);
+
+ try classesInternal(allocator, val, escaping, &result, 0);
+
+ if (result.items.len == 0) {
+ result.deinit(allocator);
+ return try allocator.dupe(u8, "");
+ }
+
+ return try result.toOwnedSlice(allocator);
+}
+
+/// Internal recursive helper that writes directly to result buffer (avoids intermediate allocations)
+fn classesInternal(
+ allocator: Allocator,
+ val: ClassValue,
+ escaping: ?[]const bool,
+ result: *ArrayListUnmanaged(u8),
depth: usize,
- options: Options,
- /// File resolver for loading external templates.
- file_resolver: ?FileResolver,
- /// Base directory for resolving relative paths.
- base_dir: []const u8,
- /// Directory containing mixin files for lazy-loading.
- mixins_dir: []const u8,
- /// Block definitions from child template (for inheritance).
- blocks: std.StringHashMapUnmanaged(BlockDef),
- /// Current mixin block content (for `block` keyword inside mixins).
- mixin_block_content: ?[]const ast.Node,
- /// Current mixin attributes (for `attributes` variable inside mixins).
- mixin_attributes: ?[]const ast.Attribute,
- /// Current include/extends depth (for recursion protection).
- include_depth: usize,
+) !void {
+ switch (val) {
+ .none => {},
+ .string => |s| {
+ if (s.len == 0) return;
+ // Add space separator if not first item
+ if (result.items.len > 0) try result.append(allocator, ' ');
+ try result.appendSlice(allocator, s);
+ },
+ .object => |conditions| {
+ for (conditions) |cond| {
+ if (cond.condition and cond.name.len > 0) {
+ if (result.items.len > 0) try result.append(allocator, ' ');
+ try result.appendSlice(allocator, cond.name);
+ }
+ }
+ },
+ .array => |items| {
+ for (items, 0..) |item, i| {
+ // Check if this item needs escaping (only at top level)
+ const should_escape = if (depth == 0) blk: {
+ break :blk if (escaping) |esc| (i < esc.len and esc[i]) else false;
+ } else false;
- pub const Options = struct {
- pretty: bool = true,
- indent_str: []const u8 = " ",
- self_closing: bool = true,
- /// Base directory for resolving template paths.
- base_dir: []const u8 = "",
- /// File resolver for loading templates.
- file_resolver: ?FileResolver = null,
- /// Directory containing mixin files for lazy-loading.
- /// If set, mixins not found in template will be loaded from here.
- mixins_dir: []const u8 = "",
- /// Maximum depth for include/extends to prevent infinite recursion.
- /// Set to 0 to disable the limit (not recommended).
- max_include_depth: usize = 100,
+ if (should_escape) {
+ // Need to escape: collect item first, then escape and append
+ const start_len = result.items.len;
+ const had_content = start_len > 0;
+
+ // Temporarily collect the class string
+ var temp: ArrayListUnmanaged(u8) = .{};
+ defer temp.deinit(allocator);
+ try classesInternal(allocator, item, null, &temp, depth + 1);
+
+ if (temp.items.len > 0) {
+ if (had_content) try result.append(allocator, ' ');
+ // Escape directly into result
+ try appendEscaped(allocator, result, temp.items);
+ }
+ } else {
+ // No escaping: write directly to result
+ try classesInternal(allocator, item, null, result, depth + 1);
+ }
+ }
+ },
+ }
+}
+
+/// Append escaped HTML directly to result buffer (avoids intermediate allocation)
+/// Public for use by codegen and other modules
+pub fn appendEscaped(allocator: Allocator, result: *ArrayListUnmanaged(u8), html: []const u8) !void {
+ for (html) |c| {
+ if (escapeChar(c)) |escaped| {
+ try result.appendSlice(allocator, escaped);
+ } else {
+ try result.append(allocator, c);
+ }
+ }
+}
+
+/// Escape a single character, returning the escape sequence or null if no escaping needed
+pub fn escapeChar(c: u8) ?[]const u8 {
+ return switch (c) {
+ '"' => """,
+ '&' => "&",
+ '<' => "<",
+ '>' => ">",
+ else => null,
};
+}
- /// Error type for runtime operations.
- pub const Error = RuntimeError || std.mem.Allocator.Error || error{TemplateNotFound};
+/// Attribute entry for attrs function
+pub const AttrEntry = struct {
+ key: []const u8,
+ value: AttrValue,
+ is_class: bool = false,
+ is_style: bool = false,
+ class_value: ?ClassValue = null,
+ style_value: ?StyleValue = null,
+};
- pub fn init(allocator: std.mem.Allocator, context: *Context, options: Options) Runtime {
+/// Render multiple attributes.
+/// Class attributes are processed specially and placed first.
+pub fn attrs(allocator: Allocator, entries: []const AttrEntry, terse: bool) ![]const u8 {
+ var result: ArrayListUnmanaged(u8) = .{};
+ errdefer result.deinit(allocator);
+
+ // First pass: find and render class attribute
+ for (entries) |entry| {
+ if (entry.is_class) {
+ if (entry.class_value) |cv| {
+ const class_str = try classes(allocator, cv, null);
+ defer allocator.free(class_str);
+
+ if (class_str.len > 0) {
+ const attr_str = try attr(allocator, "class", .{ .string = class_str }, false, terse);
+ defer allocator.free(attr_str);
+ try result.appendSlice(allocator, attr_str);
+ }
+ }
+ break;
+ }
+ }
+
+ // Second pass: render other attributes
+ for (entries) |entry| {
+ if (entry.is_class) continue;
+
+ if (entry.is_style) {
+ if (entry.style_value) |sv| {
+ const style_str = try style(allocator, sv);
+ defer allocator.free(style_str);
+
+ if (style_str.len > 0) {
+ const attr_str = try attr(allocator, "style", .{ .string = style_str }, false, terse);
+ defer allocator.free(attr_str);
+ try result.appendSlice(allocator, attr_str);
+ }
+ }
+ } else {
+ const attr_str = try attr(allocator, entry.key, entry.value, false, terse);
+ defer allocator.free(attr_str);
+ try result.appendSlice(allocator, attr_str);
+ }
+ }
+
+ return try result.toOwnedSlice(allocator);
+}
+
+/// Merge entry for combining attribute objects
+pub const MergeEntry = struct {
+ key: []const u8,
+ value: MergeValue,
+};
+
+pub const MergeValue = union(enum) {
+ string: []const u8,
+ class_array: []const []const u8,
+ style_object: []const StyleProperty,
+ none,
+};
+
+/// Merge result for a single key
+pub const MergedValue = struct {
+ key: []const u8,
+ value: MergeValue,
+ allocator: Allocator,
+ owned_strings: ArrayListUnmanaged([]const u8),
+
+ pub fn deinit(self: *MergedValue) void {
+ for (self.owned_strings.items) |s| {
+ self.allocator.free(s);
+ }
+ self.owned_strings.deinit(self.allocator);
+ }
+};
+
+/// Ensure style string ends with semicolon
+fn ensureTrailingSemicolon(allocator: Allocator, s: []const u8) ![]const u8 {
+ if (s.len == 0) return try allocator.dupe(u8, "");
+ if (s[s.len - 1] == ';') return try allocator.dupe(u8, s);
+
+ var result: ArrayListUnmanaged(u8) = .{};
+ errdefer result.deinit(allocator);
+ try result.appendSlice(allocator, s);
+ try result.append(allocator, ';');
+ return try result.toOwnedSlice(allocator);
+}
+
+/// Convert style value to string with trailing semicolon
+fn styleToString(allocator: Allocator, val: StyleValue) ![]const u8 {
+ const s = try style(allocator, val);
+ defer allocator.free(s);
+ return try ensureTrailingSemicolon(allocator, s);
+}
+
+// ============================================================================
+// Merge function
+// ============================================================================
+
+/// Merged attributes result with O(1) lookups for class/style
+pub const MergedAttrs = struct {
+ allocator: Allocator,
+ entries: ArrayListUnmanaged(MergedAttrEntry),
+ owned_strings: ArrayListUnmanaged([]const u8),
+ owned_class_arrays: ArrayListUnmanaged([][]const u8),
+ // O(1) index tracking for special keys
+ class_idx: ?usize = null,
+ style_idx: ?usize = null,
+
+ pub fn init(allocator: Allocator) MergedAttrs {
return .{
.allocator = allocator,
- .context = context,
- .output = .empty,
- .depth = 0,
- .options = options,
- .file_resolver = options.file_resolver,
- .base_dir = options.base_dir,
- .mixins_dir = options.mixins_dir,
- .blocks = .empty,
- .mixin_block_content = null,
- .mixin_attributes = null,
- .include_depth = 0,
+ .entries = .{},
+ .owned_strings = .{},
+ .owned_class_arrays = .{},
+ .class_idx = null,
+ .style_idx = null,
};
}
- pub fn deinit(self: *Runtime) void {
- self.output.deinit(self.allocator);
- self.blocks.deinit(self.allocator);
+ pub fn deinit(self: *MergedAttrs) void {
+ for (self.owned_strings.items) |s| {
+ self.allocator.free(s);
+ }
+ self.owned_strings.deinit(self.allocator);
+
+ for (self.owned_class_arrays.items) |arr| {
+ self.allocator.free(arr);
+ }
+ self.owned_class_arrays.deinit(self.allocator);
+
+ self.entries.deinit(self.allocator);
}
- /// Renders the document and returns the HTML output.
- pub fn render(self: *Runtime, doc: ast.Document) Error![]const u8 {
- // Pre-allocate buffer - 256KB handles most large templates without realloc
- try self.output.ensureTotalCapacity(self.allocator, 256 * 1024);
-
- // Handle template inheritance
- if (doc.extends_path) |extends_path| {
- // Collect blocks from child template
- try self.collectBlocks(doc.nodes);
-
- // Load and render parent template
- const parent_doc = try self.loadTemplate(extends_path);
- return self.render(parent_doc);
- }
-
- for (doc.nodes) |node| {
- try self.visitNode(node);
- }
-
- return self.output.items;
- }
-
- /// Collects block definitions from child template nodes.
- fn collectBlocks(self: *Runtime, nodes: []const ast.Node) Error!void {
- for (nodes) |node| {
- switch (node) {
- .block => |blk| {
- try self.blocks.put(self.allocator, blk.name, .{
- .name = blk.name,
- .mode = blk.mode,
- .children = blk.children,
- });
- },
- else => {},
+ pub fn get(self: *const MergedAttrs, key: []const u8) ?MergedAttrValue {
+ // O(1) lookup for class and style
+ if (mem.eql(u8, key, "class")) {
+ if (self.class_idx) |idx| {
+ return self.entries.items[idx].value;
}
- }
- }
-
- /// Loads and parses a template file.
- /// Security: Validates path doesn't escape base_dir and enforces include depth limit.
- fn loadTemplate(self: *Runtime, path: []const u8) Error!ast.Document {
- // Security: Prevent infinite recursion via circular includes/extends
- const max_depth = self.options.max_include_depth;
- if (max_depth > 0 and self.include_depth >= max_depth) {
- log.err("maximum include depth ({d}) exceeded - possible circular reference", .{max_depth});
- return error.MaxIncludeDepthExceeded;
- }
- self.include_depth += 1;
-
- const resolver = self.file_resolver orelse return error.TemplateNotFound;
-
- // Resolve path (add .pug extension if needed)
- var resolved_path: []const u8 = path;
- if (!std.mem.endsWith(u8, path, ".pug")) {
- resolved_path = try std.fmt.allocPrint(self.allocator, "{s}.pug", .{path});
- }
-
- // Security: Reject absolute paths when base_dir is set (prevents /etc/passwd access)
- if (self.base_dir.len > 0 and std.fs.path.isAbsolute(resolved_path)) {
- log.err("absolute paths not allowed in include/extends: {s}", .{resolved_path});
- return error.PathTraversalDetected;
- }
-
- // Security: Check for path traversal attempts (../ sequences)
- if (std.mem.indexOf(u8, resolved_path, "..")) |_| {
- log.err("path traversal detected in include/extends: {s}", .{resolved_path});
- return error.PathTraversalDetected;
- }
-
- // Prepend base directory if path is relative
- var full_path = resolved_path;
- if (self.base_dir.len > 0) {
- full_path = try std.fs.path.join(self.allocator, &.{ self.base_dir, resolved_path });
- }
-
- const source = resolver(self.allocator, full_path) orelse return error.TemplateNotFound;
-
- // Parse the template
- var lexer = Lexer.init(self.allocator, source);
- const tokens = lexer.tokenize() catch return error.TemplateNotFound;
-
- var parser = Parser.init(self.allocator, tokens);
- return parser.parse() catch return error.TemplateNotFound;
- }
-
- /// Renders and returns an owned copy of the output.
- pub fn renderOwned(self: *Runtime, doc: ast.Document) Error![]u8 {
- const result = try self.render(doc);
- return try self.allocator.dupe(u8, result);
- }
-
- fn visitNode(self: *Runtime, node: ast.Node) Error!void {
- switch (node) {
- .doctype => |dt| try self.visitDoctype(dt),
- .element => |elem| try self.visitElement(elem),
- .text => |text| try self.visitText(text),
- .comment => |comment| try self.visitComment(comment),
- .conditional => |cond| try self.visitConditional(cond),
- .each => |each| try self.visitEach(each),
- .@"while" => |whl| try self.visitWhile(whl),
- .case => |c| try self.visitCase(c),
- .mixin_def => |def| try self.context.defineMixin(def),
- .mixin_call => |call| try self.visitMixinCall(call),
- .mixin_block => try self.visitMixinBlock(),
- .code => |code| try self.visitCode(code),
- .raw_text => |raw| try self.visitRawText(raw),
- .block => |blk| try self.visitBlock(blk),
- .include => |inc| try self.visitInclude(inc),
- .extends => {}, // Handled at document level
- .document => |doc| {
- for (doc.nodes) |child| {
- try self.visitNode(child);
- }
- },
- }
- }
-
- /// Renders a node inline (no indentation, no trailing newline).
- /// Used for block expansion (`:` syntax) where children render on same line.
- fn visitNodeInline(self: *Runtime, node: ast.Node) Error!void {
- switch (node) {
- .element => |elem| try self.visitElementInline(elem),
- .text => |text| try self.writeTextSegments(text.segments),
- else => try self.visitNode(node), // Fall back to normal rendering
- }
- }
-
- /// Renders an element inline (no indentation, no trailing newline).
- fn visitElementInline(self: *Runtime, elem: ast.Element) Error!void {
- const has_content = (elem.inline_text != null and elem.inline_text.?.len > 0) or
- elem.buffered_code != null or elem.children.len > 0;
- const is_void = (isVoidElement(elem.tag) or elem.self_closing) and !has_content;
-
- try self.write("<");
- try self.write(elem.tag);
-
- if (elem.id) |id| {
- try self.write(" id=\"");
- try self.writeEscaped(id);
- try self.write("\"");
- }
-
- // Output classes
- if (elem.classes.len > 0) {
- try self.write(" class=\"");
- for (elem.classes, 0..) |class, i| {
- if (i > 0) try self.write(" ");
- try self.writeEscaped(class);
- }
- try self.write("\"");
- }
-
- // Output attributes
- for (elem.attributes) |attr| {
- if (attr.value) |value| {
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- var evaluated: []const u8 = undefined;
- if (value.len >= 2 and (value[0] == '"' or value[0] == '\'' or value[0] == '`')) {
- evaluated = try self.evaluateString(value);
- } else {
- const expr_value = self.evaluateExpression(value);
- evaluated = try expr_value.toString(self.allocator);
- }
- if (attr.escaped) {
- try self.writeEscaped(evaluated);
- } else {
- try self.write(evaluated);
- }
- try self.write("\"");
- } else {
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- try self.write(attr.name);
- try self.write("\"");
- }
- }
-
- if (is_void) {
- try self.write("/>");
- return;
- }
-
- try self.write(">");
-
- // Render inline text
- if (elem.inline_text) |text| {
- try self.writeTextSegments(text);
- }
-
- // Render buffered code
- if (elem.buffered_code) |code| {
- const value = self.evaluateExpression(code.expression);
- const str = try value.toString(self.allocator);
- if (code.escaped) {
- try self.writeTextEscaped(str);
- } else {
- try self.write(str);
- }
- }
-
- // Render children inline
- for (elem.children) |child| {
- try self.visitNodeInline(child);
- }
-
- try self.write("");
- }
-
- /// Doctype shortcuts mapping
- const doctype_shortcuts = std.StaticStringMap([]const u8).initComptime(.{
- .{ "html", "" },
- .{ "xml", "" },
- .{ "transitional", "" },
- .{ "strict", "" },
- .{ "frameset", "" },
- .{ "1.1", "" },
- .{ "basic", "" },
- .{ "mobile", "" },
- .{ "plist", "" },
- });
-
- fn visitDoctype(self: *Runtime, dt: ast.Doctype) Error!void {
- // Look up shortcut or use custom doctype
- if (doctype_shortcuts.get(dt.value)) |output| {
- try self.write(output);
- } else {
- // Custom doctype: output as-is with ");
- }
- try self.writeNewline();
- }
-
- fn visitElement(self: *Runtime, elem: ast.Element) Error!void {
- // Void elements can be self-closed, but only if they have no content
- const has_content = (elem.inline_text != null and elem.inline_text.?.len > 0) or
- elem.buffered_code != null or elem.children.len > 0;
- const is_void = (isVoidElement(elem.tag) or elem.self_closing) and !has_content;
-
- try self.writeIndent();
- try self.write("<");
- try self.write(elem.tag);
-
- if (elem.id) |id| {
- try self.write(" id=\"");
- try self.writeEscaped(id);
- try self.write("\"");
- }
-
- // Collect all classes first: shorthand classes + class attributes (may be arrays)
- // Class attribute must be output before other attributes per Pug convention
- var all_classes = std.ArrayList(u8).empty;
- defer all_classes.deinit(self.allocator);
-
- // Add shorthand classes first (e.g., .bang)
- for (elem.classes, 0..) |class, i| {
- if (i > 0) try all_classes.append(self.allocator, ' ');
- try all_classes.appendSlice(self.allocator, class);
- }
-
- // Collect class values from attributes
- for (elem.attributes) |attr| {
- if (std.mem.eql(u8, attr.name, "class")) {
- if (attr.value) |value| {
- var evaluated: []const u8 = undefined;
-
- if (value.len >= 1 and value[0] == '[') {
- evaluated = try parseArrayToSpaceSeparated(self.allocator, value);
- } else if (value.len >= 1 and value[0] == '{') {
- evaluated = try parseObjectToClassList(self.allocator, value);
- } else {
- const expr_value = self.evaluateExpression(value);
- evaluated = try expr_value.toString(self.allocator);
- }
-
- if (evaluated.len > 0) {
- if (all_classes.items.len > 0) {
- try all_classes.append(self.allocator, ' ');
- }
- try all_classes.appendSlice(self.allocator, evaluated);
- }
- }
- }
- }
-
- // Output combined class attribute immediately after id (before other attributes)
- if (all_classes.items.len > 0) {
- try self.write(" class=\"");
- try self.writeEscaped(all_classes.items);
- try self.write("\"");
- }
-
- // Output other attributes (skip class since already handled)
- for (elem.attributes) |attr| {
- if (std.mem.eql(u8, attr.name, "class")) continue;
-
- if (attr.value) |value| {
- // Handle boolean literals: true -> checked="checked", false -> omit
- if (std.mem.eql(u8, value, "true")) {
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- try self.write(attr.name);
- try self.write("\"");
- } else if (std.mem.eql(u8, value, "false")) {
- continue;
- } else {
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- var evaluated: []const u8 = undefined;
-
- if (value.len >= 2 and (value[0] == '"' or value[0] == '\'' or value[0] == '`')) {
- evaluated = try self.evaluateString(value);
- } else if (value.len >= 1 and (value[0] == '{' or value[0] == '[')) {
- evaluated = value;
- } else {
- const expr_value = self.evaluateExpression(value);
- evaluated = try expr_value.toString(self.allocator);
- }
-
- if (std.mem.eql(u8, attr.name, "style") and evaluated.len > 0 and evaluated[0] == '{') {
- evaluated = try parseObjectToCSS(self.allocator, evaluated);
- }
-
- if (attr.escaped) {
- try self.writeEscaped(evaluated);
- } else {
- try self.write(evaluated);
- }
- try self.write("\"");
- }
- } else {
- // Boolean attribute: checked -> checked="checked"
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- try self.write(attr.name);
- try self.write("\"");
- }
- }
-
- // Output spread attributes: &attributes({'data-foo': 'bar'}) or &attributes(attributes)
- if (elem.spread_attributes) |spread| {
- // First try to evaluate as a variable (for mixin attributes)
- const value = self.evaluateExpression(spread);
- switch (value) {
- .object => |obj| {
- // Render object properties as attributes
- var iter = obj.iterator();
- while (iter.next()) |entry| {
- const attr_value = entry.value_ptr.*;
- const str = try attr_value.toString(self.allocator);
- try self.write(" ");
- try self.write(entry.key_ptr.*);
- try self.write("=\"");
- try self.writeEscaped(str);
- try self.write("\"");
- }
- },
- else => {
- // Fall back to parsing as object literal string
- try self.writeSpreadAttributes(spread);
- },
- }
- }
-
- if (is_void and self.options.self_closing) {
- try self.write("/>");
- try self.writeNewline();
- return;
- }
-
- try self.write(">");
-
- const has_inline = elem.inline_text != null and elem.inline_text.?.len > 0;
- const has_buffered = elem.buffered_code != null;
- const has_children = elem.children.len > 0;
-
- if (has_inline) {
- try self.writeTextSegments(elem.inline_text.?);
- }
-
- if (has_buffered) {
- const code = elem.buffered_code.?;
- const value = self.evaluateExpression(code.expression);
- const str = try value.toString(self.allocator);
- if (code.escaped) {
- try self.writeTextEscaped(str);
- } else {
- try self.write(str);
- }
- }
-
- if (has_children) {
- // Check if single text child - render inline (like blockquote with one piped line)
- const single_text = elem.children.len == 1 and elem.children[0] == .text;
- // Check for whitespace-preserving elements (pre, script, style, textarea)
- const preserve_ws = isWhitespacePreserving(elem.tag);
-
- if (single_text) {
- // Render single text child inline (no newlines/indents)
- try self.writeTextSegments(elem.children[0].text.segments);
- } else if (elem.is_inline and canRenderInlineForParent(elem)) {
- // Block expansion (`:` syntax) - render children inline only in specific cases
- for (elem.children) |child| {
- try self.visitNodeInline(child);
- }
- } else if (preserve_ws) {
- // Whitespace-preserving element - render content without extra formatting
- for (elem.children) |child| {
- switch (child) {
- .raw_text => |raw| {
- // Check if content has multiple lines - if so, add leading newline
- // Single-line content renders inline and stripped:
- // Multi-line content has newline:
- const has_multiple_lines = std.mem.indexOfScalar(u8, raw.content, '\n') != null;
- if (has_multiple_lines and !has_inline and !has_buffered) {
- try self.write("\n");
- try self.writeRawTextPreserved(raw.content);
- } else {
- // Single line - strip leading whitespace
- const stripped = std.mem.trimLeft(u8, raw.content, " \t");
- try self.write(stripped);
- }
- },
- .element => |child_elem| {
- // Nested element in whitespace-preserving context (e.g., pre > code)
- try self.visitElementPreserved(child_elem);
- },
- else => try self.visitNode(child),
- }
- }
- } else {
- if (!has_inline and !has_buffered) try self.writeNewline();
- self.depth += 1;
- for (elem.children) |child| {
- try self.visitNode(child);
- }
- self.depth -= 1;
- if (!has_inline and !has_buffered) try self.writeIndent();
- }
- }
-
- try self.write("");
- try self.writeNewline();
- }
-
- fn visitText(self: *Runtime, text: ast.Text) Error!void {
- try self.writeIndent();
- try self.writeTextSegments(text.segments);
- try self.writeNewline();
- }
-
- /// Writes raw text content as-is.
- fn writeRawTextPreserved(self: *Runtime, content: []const u8) Error!void {
- try self.write(content);
- }
-
- /// Renders an element within a whitespace-preserving context (no indentation/newlines)
- fn visitElementPreserved(self: *Runtime, elem: ast.Element) Error!void {
- try self.write("<");
- try self.write(elem.tag);
-
- // Output classes
- if (elem.classes.len > 0) {
- try self.write(" class=\"");
- for (elem.classes, 0..) |class, i| {
- if (i > 0) try self.write(" ");
- try self.writeEscaped(class);
- }
- try self.write("\"");
- }
-
- // Output attributes
- for (elem.attributes) |attr| {
- if (attr.value) |value| {
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- var evaluated: []const u8 = undefined;
- if (value.len >= 2 and (value[0] == '"' or value[0] == '\'' or value[0] == '`')) {
- evaluated = try self.evaluateString(value);
- } else {
- const expr_value = self.evaluateExpression(value);
- evaluated = try expr_value.toString(self.allocator);
- }
- if (attr.escaped) {
- try self.writeEscaped(evaluated);
- } else {
- try self.write(evaluated);
- }
- try self.write("\"");
- } else {
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- try self.write(attr.name);
- try self.write("\"");
- }
- }
-
- try self.write(">");
-
- // Render children without formatting
- for (elem.children) |child| {
- switch (child) {
- .raw_text => |raw| try self.writeRawTextPreserved(raw.content),
- .text => |text| try self.writeTextSegments(text.segments),
- else => {},
- }
- }
-
- try self.write("");
- }
-
- fn visitComment(self: *Runtime, comment: ast.Comment) Error!void {
- if (!comment.rendered) return;
-
- try self.writeIndent();
- try self.write("");
- } else {
- // Inline comment
- // Content already includes leading space if present (e.g., " foo" from "// foo")
- if (comment.content.len > 0) {
- try self.write(comment.content);
- }
- try self.write("-->");
- }
- try self.writeNewline();
- }
-
- fn visitConditional(self: *Runtime, cond: ast.Conditional) Error!void {
- for (cond.branches) |branch| {
- const should_render = if (branch.condition) |condition| blk: {
- const value = self.evaluateExpression(condition);
- const truthy = value.isTruthy();
- break :blk if (branch.is_unless) !truthy else truthy;
- } else true; // else branch
-
- if (should_render) {
- for (branch.children) |child| {
- try self.visitNode(child);
- }
- return; // Only render first matching branch
- }
- }
- }
-
- fn visitEach(self: *Runtime, each: ast.Each) Error!void {
- const collection = self.evaluateExpression(each.collection);
-
- switch (collection) {
- .array => |items| {
- if (items.len == 0) {
- // Render else branch if collection is empty
- for (each.else_children) |child| {
- try self.visitNode(child);
- }
- return;
- }
-
- // Push scope once before the loop - reuse for all iterations
- try self.context.pushScope();
- defer self.context.popScope();
-
- // Get direct pointers to loop variables - avoids hash lookup per iteration
- const value_ptr = try self.context.getOrPutPtr(each.value_name);
- const index_ptr: ?*Value = if (each.index_name) |idx_name|
- try self.context.getOrPutPtr(idx_name)
- else
- null;
-
- for (items, 0..) |item, index| {
- // Direct pointer update - no hash lookup!
- value_ptr.* = item;
- if (index_ptr) |ptr| {
- ptr.* = Value.integer(@intCast(index));
- }
-
- for (each.children) |child| {
- try self.visitNode(child);
- }
- }
- },
- .object => |obj| {
- if (obj.count() == 0) {
- for (each.else_children) |child| {
- try self.visitNode(child);
- }
- return;
- }
-
- // Push scope once before the loop - reuse for all iterations
- try self.context.pushScope();
- defer self.context.popScope();
-
- // Get direct pointers to loop variables
- const value_ptr = try self.context.getOrPutPtr(each.value_name);
- const index_ptr: ?*Value = if (each.index_name) |idx_name|
- try self.context.getOrPutPtr(idx_name)
- else
- null;
-
- var iter = obj.iterator();
- while (iter.next()) |entry| {
- // Direct pointer update - no hash lookup!
- value_ptr.* = entry.value_ptr.*;
- if (index_ptr) |ptr| {
- ptr.* = Value.str(entry.key_ptr.*);
- }
-
- for (each.children) |child| {
- try self.visitNode(child);
- }
- }
- },
- else => {
- // Not iterable - render else branch
- for (each.else_children) |child| {
- try self.visitNode(child);
- }
- },
- }
- }
-
- fn visitWhile(self: *Runtime, whl: ast.While) Error!void {
- var iterations: usize = 0;
- const max_iterations: usize = 10000; // Safety limit
-
- while (iterations < max_iterations) {
- const condition = self.evaluateExpression(whl.condition);
- if (!condition.isTruthy()) break;
-
- for (whl.children) |child| {
- try self.visitNode(child);
- }
- iterations += 1;
- }
- }
-
- fn visitCase(self: *Runtime, c: ast.Case) Error!void {
- const expr_value = self.evaluateExpression(c.expression);
-
- // Find matching when clause
- var matched = false;
- var fall_through = false;
-
- for (c.whens) |when| {
- // Check if we're falling through from previous match
- if (fall_through) {
- if (when.has_break) {
- // Explicit break - stop here without output
- return;
- }
- if (when.children.len > 0) {
- // Has content - render it
- for (when.children) |child| {
- try self.visitNode(child);
- }
- return;
- }
- // Empty body - continue falling through
- continue;
- }
-
- // Parse when value and compare
- const when_value = self.evaluateExpression(when.value);
-
- if (self.valuesEqual(expr_value, when_value)) {
- matched = true;
-
- if (when.has_break) {
- // Explicit break - output nothing
- return;
- }
-
- if (when.children.len == 0) {
- // Empty body - fall through to next
- fall_through = true;
- continue;
- }
-
- // Render matching case
- for (when.children) |child| {
- try self.visitNode(child);
- }
- return;
- }
- }
-
- // No match - render default if present
- if (!matched or fall_through) {
- for (c.default_children) |child| {
- try self.visitNode(child);
- }
- }
- }
-
- /// Compares two Values for equality.
- fn valuesEqual(self: *Runtime, a: Value, b: Value) bool {
- _ = self;
- return switch (a) {
- .int => |ai| switch (b) {
- .int => |bi| ai == bi,
- .float => |bf| @as(f64, @floatFromInt(ai)) == bf,
- .string => |bs| blk: {
- const parsed = std.fmt.parseInt(i64, bs, 10) catch break :blk false;
- break :blk ai == parsed;
- },
- else => false,
- },
- .float => |af| switch (b) {
- .int => |bi| af == @as(f64, @floatFromInt(bi)),
- .float => |bf| af == bf,
- else => false,
- },
- .string => |as| switch (b) {
- .string => |bs| std.mem.eql(u8, as, bs),
- .int => |bi| blk: {
- const parsed = std.fmt.parseInt(i64, as, 10) catch break :blk false;
- break :blk parsed == bi;
- },
- else => false,
- },
- .bool => |ab| switch (b) {
- .bool => |bb| ab == bb,
- else => false,
- },
- else => false,
- };
- }
-
- fn visitMixinCall(self: *Runtime, call: ast.MixinCall) Error!void {
- // First check if mixin is defined in current context (same template or preloaded)
- var mixin = self.context.getMixin(call.name);
-
- // If not found and mixins_dir is configured, try loading from mixins directory
- if (mixin == null and self.mixins_dir.len > 0) {
- if (self.loadMixinFromDir(call.name)) |loaded_mixin| {
- try self.context.defineMixin(loaded_mixin);
- mixin = loaded_mixin;
- }
- }
-
- // If still not found, log warning and skip this mixin call
- const mixin_def = mixin orelse {
- log.warn("skipping, mixin '{s}' not found", .{call.name});
- return;
- };
-
- try self.context.pushScope();
- defer self.context.popScope();
-
- // Save previous mixin context
- const prev_block_content = self.mixin_block_content;
- const prev_attributes = self.mixin_attributes;
- defer {
- self.mixin_block_content = prev_block_content;
- self.mixin_attributes = prev_attributes;
- }
-
- // Set current mixin's block content and attributes
- // If block content is a single mixin_block node, pass through parent's block content
- // to avoid infinite recursion when nesting mixins with `block` passthrough
- self.mixin_block_content = blk: {
- if (call.block_children.len == 1 and call.block_children[0] == .mixin_block) {
- break :blk prev_block_content;
- }
- break :blk if (call.block_children.len > 0) call.block_children else null;
- };
- self.mixin_attributes = if (call.attributes.len > 0) call.attributes else null;
-
- // Set 'attributes' variable with the passed attributes as an object
- if (call.attributes.len > 0) {
- var attrs_obj = std.StringHashMapUnmanaged(Value).empty;
- for (call.attributes) |attr| {
- if (attr.value) |val| {
- // Strip quotes from attribute value for the object
- const clean_val = try self.evaluateString(val);
- attrs_obj.put(self.allocator, attr.name, Value.str(clean_val)) catch |err| {
- log.warn("skipping attribute, failed to set '{s}': {}", .{ attr.name, err });
- };
- } else {
- attrs_obj.put(self.allocator, attr.name, Value.boolean(true)) catch |err| {
- log.warn("skipping attribute, failed to set '{s}': {}", .{ attr.name, err });
- };
- }
- }
- try self.context.set("attributes", .{ .object = attrs_obj });
- } else {
- try self.context.set("attributes", .{ .object = std.StringHashMapUnmanaged(Value).empty });
- }
-
- // Bind arguments to parameters
- const regular_params = if (mixin_def.has_rest and mixin_def.params.len > 0)
- mixin_def.params.len - 1
- else
- mixin_def.params.len;
-
- // Bind regular parameters
- for (mixin_def.params[0..regular_params], 0..) |param, i| {
- const value = if (i < call.args.len)
- self.evaluateExpression(call.args[i])
- else if (i < mixin_def.defaults.len and mixin_def.defaults[i] != null)
- self.evaluateExpression(mixin_def.defaults[i].?)
- else
- Value.null;
-
- try self.context.set(param, value);
- }
-
- // Bind rest parameter if present
- if (mixin_def.has_rest and mixin_def.params.len > 0) {
- const rest_param = mixin_def.params[mixin_def.params.len - 1];
- const rest_start = regular_params;
-
- if (rest_start < call.args.len) {
- // Collect remaining arguments into an array
- const rest_count = call.args.len - rest_start;
- const rest_array = self.allocator.alloc(Value, rest_count) catch return error.OutOfMemory;
- for (call.args[rest_start..], 0..) |arg, i| {
- rest_array[i] = self.evaluateExpression(arg);
- }
- try self.context.set(rest_param, .{ .array = rest_array });
- } else {
- // No rest arguments, set empty array
- const empty = self.allocator.alloc(Value, 0) catch return error.OutOfMemory;
- try self.context.set(rest_param, .{ .array = empty });
- }
- }
-
- // Render mixin body
- for (mixin_def.children) |child| {
- try self.visitNode(child);
- }
- }
-
- /// Loads a mixin from the mixins directory by name.
- /// Searches for files named {name}.pug or iterates through all .pug files.
- /// Note: The source file memory is intentionally not freed to keep AST slices valid.
- fn loadMixinFromDir(self: *Runtime, name: []const u8) ?ast.MixinDef {
- const resolver = self.file_resolver orelse return null;
-
- // First try: look for a file named {name}.pug
- const specific_path = std.fs.path.join(self.allocator, &.{ self.mixins_dir, name }) catch |err| {
- log.warn("skipping mixin lookup, failed to join path for '{s}': {}", .{ name, err });
return null;
- };
- defer self.allocator.free(specific_path);
-
- const with_ext = std.fmt.allocPrint(self.allocator, "{s}.pug", .{specific_path}) catch |err| {
- log.warn("skipping mixin lookup, failed to allocate path for '{s}': {}", .{ name, err });
- return null;
- };
- defer self.allocator.free(with_ext);
-
- if (resolver(self.allocator, with_ext)) |source| {
- // Note: source is intentionally not freed - AST nodes contain slices into it
- if (self.parseMixinFromSource(source, name)) |mixin_def| {
- return mixin_def;
- }
- // Only free if we didn't find the mixin we wanted
- self.allocator.free(source);
}
-
- // Second try: iterate through all .pug files in mixins directory
- // Use cwd().openDir for relative paths, openDirAbsolute for absolute paths
- var dir = if (std.fs.path.isAbsolute(self.mixins_dir))
- std.fs.openDirAbsolute(self.mixins_dir, .{ .iterate = true }) catch |err| {
- log.warn("skipping mixins directory scan, failed to open '{s}': {}", .{ self.mixins_dir, err });
- return null;
+ if (mem.eql(u8, key, "style")) {
+ if (self.style_idx) |idx| {
+ return self.entries.items[idx].value;
}
- else
- std.fs.cwd().openDir(self.mixins_dir, .{ .iterate = true }) catch |err| {
- log.warn("skipping mixins directory scan, failed to open '{s}': {}", .{ self.mixins_dir, err });
- return null;
- };
- defer dir.close();
-
- var iter = dir.iterate();
- while (iter.next() catch |err| {
- log.warn("skipping mixins directory scan, iteration failed: {}", .{err});
return null;
- }) |entry| {
- if (entry.kind != .file) continue;
- if (!std.mem.endsWith(u8, entry.name, ".pug")) continue;
-
- const file_path = std.fs.path.join(self.allocator, &.{ self.mixins_dir, entry.name }) catch |err| {
- log.warn("skipping mixin file, failed to join path for '{s}': {}", .{ entry.name, err });
- continue;
- };
- defer self.allocator.free(file_path);
-
- if (resolver(self.allocator, file_path)) |source| {
- // Note: source is intentionally not freed - AST nodes contain slices into it
- if (self.parseMixinFromSource(source, name)) |mixin_def| {
- return mixin_def;
- }
- // Only free if we didn't find the mixin we wanted
- self.allocator.free(source);
+ }
+ // Linear search for other keys
+ for (self.entries.items) |entry| {
+ if (mem.eql(u8, entry.key, key)) {
+ return entry.value;
}
}
-
return null;
}
- /// Parses a source file and extracts a mixin definition by name.
- fn parseMixinFromSource(self: *Runtime, source: []const u8, name: []const u8) ?ast.MixinDef {
- var lexer = Lexer.init(self.allocator, source);
- const tokens = lexer.tokenize() catch |err| {
- log.warn("skipping mixin file, tokenize failed for '{s}': {}", .{ name, err });
- return null;
- };
- // Note: lexer is not deinitialized - tokens contain slices into source
-
- var parser = Parser.init(self.allocator, tokens);
- const doc = parser.parse() catch |err| {
- log.warn("skipping mixin file, parse failed for '{s}': {}", .{ name, err });
- return null;
- };
-
- // Find the mixin definition with the matching name
- for (doc.nodes) |node| {
- if (node == .mixin_def) {
- if (std.mem.eql(u8, node.mixin_def.name, name)) {
- return node.mixin_def;
- }
- }
+ /// Find index of a key (O(1) for class/style, O(n) for others)
+ fn findKey(self: *const MergedAttrs, key: []const u8) ?usize {
+ if (mem.eql(u8, key, "class")) return self.class_idx;
+ if (mem.eql(u8, key, "style")) return self.style_idx;
+ for (self.entries.items, 0..) |entry, i| {
+ if (mem.eql(u8, entry.key, key)) return i;
}
-
return null;
}
+};
- /// Renders the mixin block content (for `block` keyword inside mixins).
- fn visitMixinBlock(self: *Runtime) Error!void {
- if (self.mixin_block_content) |block_children| {
- for (block_children) |child| {
- try self.visitNode(child);
- }
- }
+pub const MergedAttrEntry = struct {
+ key: []const u8,
+ value: MergedAttrValue,
+};
+
+pub const MergedAttrValue = union(enum) {
+ string: []const u8,
+ class_array: [][]const u8,
+ none,
+};
+
+/// Merge two attribute objects.
+/// class attributes are combined into arrays.
+/// style attributes are concatenated with semicolons.
+/// Optimized with O(1) lookups for class/style and branch prediction hints.
+pub fn merge(allocator: Allocator, a: []const MergedAttrEntry, b: []const MergedAttrEntry) !MergedAttrs {
+ var result = MergedAttrs.init(allocator);
+ errdefer result.deinit();
+
+ // Pre-allocate capacity to avoid reallocations (cache-friendly)
+ const total_entries = a.len + b.len;
+ if (total_entries > 0) {
+ try result.entries.ensureTotalCapacity(allocator, total_entries);
}
- fn visitCode(self: *Runtime, code: ast.Code) Error!void {
- const value = self.evaluateExpression(code.expression);
- const str = try value.toString(self.allocator);
-
- try self.writeIndent();
- if (code.escaped) {
- try self.writeTextEscaped(str);
- } else {
- try self.write(str);
- }
- try self.writeNewline();
+ // Process first object
+ for (a) |entry| {
+ try mergeEntry(&result, entry);
}
- fn visitRawText(self: *Runtime, raw: ast.RawText) Error!void {
- // Raw text already includes its own indentation, don't add extra
- try self.write(raw.content);
- // Only add newline if content doesn't already end with one
- // This prevents double newlines at end of dot blocks
- if (raw.content.len == 0 or raw.content[raw.content.len - 1] != '\n') {
- try self.writeNewline();
- }
+ // Process second object
+ for (b) |entry| {
+ try mergeEntry(&result, entry);
}
- /// Visits a block node, handling inheritance (replace/append/prepend).
- fn visitBlock(self: *Runtime, blk: ast.Block) Error!void {
- // Check if child template overrides this block
- if (self.blocks.get(blk.name)) |child_block| {
- switch (child_block.mode) {
- .replace => {
- // Child completely replaces parent block
- for (child_block.children) |child| {
- try self.visitNode(child);
- }
- },
- .append => {
- // Parent content first, then child content
- for (blk.children) |child| {
- try self.visitNode(child);
- }
- for (child_block.children) |child| {
- try self.visitNode(child);
- }
- },
- .prepend => {
- // Child content first, then parent content
- for (child_block.children) |child| {
- try self.visitNode(child);
- }
- for (blk.children) |child| {
- try self.visitNode(child);
- }
- },
- }
- } else {
- // No override - render default block content
- for (blk.children) |child| {
- try self.visitNode(child);
- }
- }
+ return result;
+}
+
+/// Fast key classification for branch prediction
+const KeyType = enum { class, style, other };
+
+inline fn classifyKey(key: []const u8) KeyType {
+ // Most common case: short keys that aren't class/style
+ // Use length check first (branch-friendly, avoids string compare)
+ if (key.len == 5) {
+ if (key[0] == 'c' and mem.eql(u8, key, "class")) return .class;
+ if (key[0] == 's' and mem.eql(u8, key, "style")) return .style;
}
+ return .other;
+}
- /// Visits an include node, loading and rendering the included template.
- fn visitInclude(self: *Runtime, inc: ast.Include) Error!void {
- const included_doc = try self.loadTemplate(inc.path);
+fn mergeEntry(result: *MergedAttrs, entry: MergedAttrEntry) !void {
+ const allocator = result.allocator;
- // TODO: Handle filters (inc.filter) like :markdown
+ // Branch prediction: classify key type once
+ const key_type = classifyKey(entry.key);
- // Render included template inline
- for (included_doc.nodes) |node| {
- try self.visitNode(node);
- }
- }
-
- // ─────────────────────────────────────────────────────────────────────────
- // Expression evaluation
- // ─────────────────────────────────────────────────────────────────────────
-
- /// Evaluates a simple expression (variable lookup or literal).
- /// Optimized for common cases: simple variable names without operators.
- fn evaluateExpression(self: *Runtime, expr: []const u8) Value {
- // Fast path: empty expression
- if (expr.len == 0) return Value.null;
-
- const first = expr[0];
-
- // Ultra-fast path: identifier starting with a-z (most common case)
- // Covers: friend, name, friend.name, friend.email, tag, etc.
- if (first >= 'a' and first <= 'z') {
- // Scan for operators - if none found, direct variable lookup
- for (expr) |c| {
- // Check for operators that require complex evaluation
- if (c == '+' or c == '[' or c == '(' or c == '{' or c == ' ' or c == '\t') {
- break;
- }
- } else {
- // No operators found - direct variable lookup (most common path)
- return self.lookupVariable(expr);
- }
- }
-
- // Fast path: check if expression needs trimming
- const last = expr[expr.len - 1];
- const needs_trim = first == ' ' or first == '\t' or last == ' ' or last == '\t';
- const trimmed = if (needs_trim) std.mem.trim(u8, expr, " \t") else expr;
-
- if (trimmed.len == 0) return Value.null;
-
- // Fast path: simple variable lookup (no special chars except dots)
- // Most expressions in templates are just variable names like "name" or "friend.email"
- const first_char = trimmed[0];
- if (first_char != '"' and first_char != '\'' and first_char != '-' and
- (first_char < '0' or first_char > '9'))
- {
- // Quick scan: if no special operators, go straight to variable lookup
- var has_operator = false;
- for (trimmed) |c| {
- if (c == '+' or c == '[' or c == '(' or c == '{') {
- has_operator = true;
- break;
- }
- }
- if (!has_operator) {
- // Check for boolean/null literals
- if (trimmed.len <= 5) {
- if (std.mem.eql(u8, trimmed, "true")) return Value.boolean(true);
- if (std.mem.eql(u8, trimmed, "false")) return Value.boolean(false);
- if (std.mem.eql(u8, trimmed, "null")) return Value.null;
- }
- // Simple variable lookup
- return self.lookupVariable(trimmed);
- }
- }
-
- // Check for string concatenation with + operator
- // e.g., "btn btn-" + type or "hello " + name + "!"
- if (self.findConcatOperator(trimmed)) |op_pos| {
- const left = std.mem.trim(u8, trimmed[0..op_pos], " \t");
- const right = std.mem.trim(u8, trimmed[op_pos + 1 ..], " \t");
-
- const left_val = self.evaluateExpression(left);
- const right_val = self.evaluateExpression(right);
-
- const left_str = left_val.toString(self.allocator) catch return Value.null;
- const right_str = right_val.toString(self.allocator) catch return Value.null;
-
- const result = std.fmt.allocPrint(self.allocator, "{s}{s}", .{ left_str, right_str }) catch return Value.null;
- return Value.str(result);
- }
-
- // Check for string literal
- if (trimmed.len >= 2) {
- if ((first_char == '"' and trimmed[trimmed.len - 1] == '"') or
- (first_char == '\'' and trimmed[trimmed.len - 1] == '\''))
- {
- return Value.str(trimmed[1 .. trimmed.len - 1]);
- }
- }
-
- // Check for numeric literal
- if (std.fmt.parseInt(i64, trimmed, 10)) |i| {
- return Value.integer(i);
- } else |_| {}
-
- // Check for boolean literals (fallback for complex expressions)
- if (std.mem.eql(u8, trimmed, "true")) return Value.boolean(true);
- if (std.mem.eql(u8, trimmed, "false")) return Value.boolean(false);
- if (std.mem.eql(u8, trimmed, "null")) return Value.null;
-
- // Variable lookup (supports dot notation: user.name)
- return self.lookupVariable(trimmed);
- }
-
- /// Finds the position of a + operator that's not inside quotes or brackets.
- /// Returns null if no such operator exists.
- fn findConcatOperator(_: *Runtime, expr: []const u8) ?usize {
- var in_string: u8 = 0; // 0 = not in string, '"' or '\'' = in that type of string
- var bracket_depth: usize = 0;
- var paren_depth: usize = 0;
- var brace_depth: usize = 0;
-
- for (expr, 0..) |c, i| {
- if (in_string != 0) {
- if (c == in_string) {
- in_string = 0;
- } else if (c == '\\' and i + 1 < expr.len) {
- // Skip escaped character - we'll handle it in next iteration
- continue;
- }
- } else {
- switch (c) {
- '"', '\'' => in_string = c,
- '[' => bracket_depth += 1,
- ']' => bracket_depth -|= 1,
- '(' => paren_depth += 1,
- ')' => paren_depth -|= 1,
- '{' => brace_depth += 1,
- '}' => brace_depth -|= 1,
- '+' => {
- if (bracket_depth == 0 and paren_depth == 0 and brace_depth == 0) {
- return i;
- }
- },
- else => {},
- }
- }
- }
-
- return null;
- }
-
- /// Looks up a variable with dot notation support.
- /// Optimized for the common case of single property access (e.g., "friend.name").
- fn lookupVariable(self: *Runtime, path: []const u8) Value {
- // Fast path: find first dot position
- var dot_pos: ?usize = null;
- for (path, 0..) |c, i| {
- if (c == '.') {
- dot_pos = i;
- break;
- }
- }
-
- if (dot_pos == null) {
- // No dots - simple variable lookup
- return self.context.get(path) orelse Value.null;
- }
-
- // Has dots - get base variable first
- const base_name = path[0..dot_pos.?];
- var current = self.context.get(base_name) orelse return Value.null;
-
- // Property access loop - objects are most common
- var pos = dot_pos.? + 1;
- while (pos < path.len) {
- // Find next dot or end
- var end = pos;
- while (end < path.len and path[end] != '.') {
- end += 1;
- }
- const prop = path[pos..end];
-
- // Most values are objects in property chains (branch hint)
- if (current == .object) {
+ switch (key_type) {
+ .class => {
+ // O(1) lookup using cached index
+ if (result.class_idx) |idx| {
@branchHint(.likely);
- current = current.object.get(prop) orelse return Value.null;
+ try mergeClassValue(result, idx, entry.value);
} else {
- return Value.null;
+ @branchHint(.unlikely);
+ try addNewClassEntry(result, entry.value);
}
-
- pos = end + 1;
- }
-
- return current;
- }
-
- /// Evaluates a string value, stripping surrounding quotes and processing escape sequences.
- /// Used for HTML attribute values.
- fn evaluateString(self: *Runtime, str: []const u8) ![]const u8 {
- // Strip surrounding quotes if present (single, double, or backtick)
- if (str.len >= 2) {
- const first = str[0];
- const last = str[str.len - 1];
- if ((first == '"' and last == '"') or
- (first == '\'' and last == '\'') or
- (first == '`' and last == '`'))
- {
- const inner = str[1 .. str.len - 1];
- // Process escape sequences (e.g., \\ -> \, \n -> newline)
- return try self.processEscapeSequences(inner);
- }
- }
- return str;
- }
-
- /// Process JavaScript-style escape sequences in strings
- fn processEscapeSequences(self: *Runtime, str: []const u8) ![]const u8 {
- // Quick check - if no backslashes, return as-is
- if (std.mem.indexOfScalar(u8, str, '\\') == null) {
- return str;
- }
-
- var result = std.ArrayList(u8).empty;
- var i: usize = 0;
- while (i < str.len) {
- if (str[i] == '\\' and i + 1 < str.len) {
- const next = str[i + 1];
- switch (next) {
- '\\' => {
- try result.append(self.allocator, '\\');
- i += 2;
- },
- 'n' => {
- try result.append(self.allocator, '\n');
- i += 2;
- },
- 'r' => {
- try result.append(self.allocator, '\r');
- i += 2;
- },
- 't' => {
- try result.append(self.allocator, '\t');
- i += 2;
- },
- '\'' => {
- try result.append(self.allocator, '\'');
- i += 2;
- },
- '"' => {
- try result.append(self.allocator, '"');
- i += 2;
- },
- else => {
- // Unknown escape - keep the backslash and character
- try result.append(self.allocator, str[i]);
- i += 1;
- },
- }
+ },
+ .style => {
+ // O(1) lookup using cached index
+ if (result.style_idx) |idx| {
+ @branchHint(.likely);
+ try mergeStyleValue(result, idx, entry.value);
} else {
- try result.append(self.allocator, str[i]);
- i += 1;
+ @branchHint(.unlikely);
+ try addNewStyleEntry(result, entry.value);
}
- }
- return result.items;
+ },
+ .other => {
+ // Regular attribute - linear search but rare in typical usage
+ const found_idx = result.findKey(entry.key);
+ if (found_idx) |idx| {
+ result.entries.items[idx].value = entry.value;
+ } else {
+ try result.entries.append(allocator, entry);
+ }
+ },
}
+}
- // ─────────────────────────────────────────────────────────────────────────
- // Output helpers
- // ─────────────────────────────────────────────────────────────────────────
+/// Merge a class value with existing class at index
+fn mergeClassValue(result: *MergedAttrs, idx: usize, value: MergedAttrValue) !void {
+ const allocator = result.allocator;
+ const existing = result.entries.items[idx].value;
- fn writeTextSegments(self: *Runtime, segments: []const ast.TextSegment) Error!void {
- for (segments) |seg| {
- switch (seg) {
- .literal => |lit| try self.writeTextEscaped(lit),
- .interp_escaped => |expr| {
- const value = self.evaluateExpression(expr);
- const str = try value.toString(self.allocator);
- try self.writeTextEscaped(str);
+ switch (value) {
+ .string => |s| {
+ switch (existing) {
+ .class_array => |arr| {
+ const new_arr = try allocator.alloc([]const u8, arr.len + 1);
+ @memcpy(new_arr[0..arr.len], arr);
+ new_arr[arr.len] = s;
+ try result.owned_class_arrays.append(allocator, new_arr);
+ result.entries.items[idx].value = .{ .class_array = new_arr };
},
- .interp_unescaped => |expr| {
- const value = self.evaluateExpression(expr);
- const str = try value.toString(self.allocator);
- try self.write(str);
+ .string => |existing_s| {
+ const new_arr = try allocator.alloc([]const u8, 2);
+ new_arr[0] = existing_s;
+ new_arr[1] = s;
+ try result.owned_class_arrays.append(allocator, new_arr);
+ result.entries.items[idx].value = .{ .class_array = new_arr };
},
- .interp_tag => |inline_tag| {
- try self.writeInlineTag(inline_tag);
+ .none => {
+ const new_arr = try allocator.alloc([]const u8, 1);
+ new_arr[0] = s;
+ try result.owned_class_arrays.append(allocator, new_arr);
+ result.entries.items[idx].value = .{ .class_array = new_arr };
},
}
+ },
+ .class_array => |arr| {
+ switch (existing) {
+ .class_array => |existing_arr| {
+ const new_arr = try allocator.alloc([]const u8, existing_arr.len + arr.len);
+ @memcpy(new_arr[0..existing_arr.len], existing_arr);
+ @memcpy(new_arr[existing_arr.len..], arr);
+ try result.owned_class_arrays.append(allocator, new_arr);
+ result.entries.items[idx].value = .{ .class_array = new_arr };
+ },
+ .string => |existing_s| {
+ const new_arr = try allocator.alloc([]const u8, 1 + arr.len);
+ new_arr[0] = existing_s;
+ @memcpy(new_arr[1..], arr);
+ try result.owned_class_arrays.append(allocator, new_arr);
+ result.entries.items[idx].value = .{ .class_array = new_arr };
+ },
+ .none => {
+ result.entries.items[idx].value = .{ .class_array = arr };
+ },
+ }
+ },
+ .none => {
+ // null class, convert existing to array if string
+ switch (existing) {
+ .string => |existing_s| {
+ const new_arr = try allocator.alloc([]const u8, 1);
+ new_arr[0] = existing_s;
+ try result.owned_class_arrays.append(allocator, new_arr);
+ result.entries.items[idx].value = .{ .class_array = new_arr };
+ },
+ else => {},
+ }
+ },
+ }
+}
+
+/// Add a new class entry (first occurrence)
+fn addNewClassEntry(result: *MergedAttrs, value: MergedAttrValue) !void {
+ const allocator = result.allocator;
+ switch (value) {
+ .string => |s| {
+ const new_arr = try allocator.alloc([]const u8, 1);
+ new_arr[0] = s;
+ try result.owned_class_arrays.append(allocator, new_arr);
+ result.class_idx = result.entries.items.len;
+ try result.entries.append(allocator, .{ .key = "class", .value = .{ .class_array = new_arr } });
+ },
+ .class_array => |arr| {
+ result.class_idx = result.entries.items.len;
+ try result.entries.append(allocator, .{ .key = "class", .value = .{ .class_array = arr } });
+ },
+ .none => {},
+ }
+}
+
+/// Merge a style value with existing style at index
+fn mergeStyleValue(result: *MergedAttrs, idx: usize, value: MergedAttrValue) !void {
+ const allocator = result.allocator;
+ const existing = result.entries.items[idx].value;
+
+ switch (value) {
+ .string => |s| {
+ switch (existing) {
+ .string => |existing_s| {
+ // Concatenate styles with semicolons
+ const s1 = try ensureTrailingSemicolon(allocator, existing_s);
+ defer allocator.free(s1);
+ const s2 = try ensureTrailingSemicolon(allocator, s);
+ defer allocator.free(s2);
+
+ var combined: ArrayListUnmanaged(u8) = .{};
+ errdefer combined.deinit(allocator);
+ try combined.appendSlice(allocator, s1);
+ try combined.appendSlice(allocator, s2);
+ const combined_str = try combined.toOwnedSlice(allocator);
+ try result.owned_strings.append(allocator, combined_str);
+ result.entries.items[idx].value = .{ .string = combined_str };
+ },
+ .none => {
+ const s_with_semi = try ensureTrailingSemicolon(allocator, s);
+ try result.owned_strings.append(allocator, s_with_semi);
+ result.entries.items[idx].value = .{ .string = s_with_semi };
+ },
+ else => {},
+ }
+ },
+ .none => {
+ // null style, ensure existing has trailing semicolon
+ switch (existing) {
+ .string => |existing_s| {
+ const s_with_semi = try ensureTrailingSemicolon(allocator, existing_s);
+ try result.owned_strings.append(allocator, s_with_semi);
+ result.entries.items[idx].value = .{ .string = s_with_semi };
+ },
+ else => {},
+ }
+ },
+ else => {},
+ }
+}
+
+/// Add a new style entry (first occurrence)
+fn addNewStyleEntry(result: *MergedAttrs, value: MergedAttrValue) !void {
+ const allocator = result.allocator;
+ switch (value) {
+ .string => |s| {
+ const s_with_semi = try ensureTrailingSemicolon(allocator, s);
+ try result.owned_strings.append(allocator, s_with_semi);
+ result.style_idx = result.entries.items.len;
+ try result.entries.append(allocator, .{ .key = "style", .value = .{ .string = s_with_semi } });
+ },
+ .none => {},
+ else => {},
+ }
+}
+
+// ============================================================================
+// Rethrow function for error handling
+// ============================================================================
+
+pub const PugError = struct {
+ message: []const u8,
+ filename: ?[]const u8,
+ line: usize,
+ src: ?[]const u8,
+ formatted_message: ?[]const u8,
+ allocator: Allocator,
+
+ pub fn init(allocator: Allocator, err_message: []const u8, filename: ?[]const u8, line: usize, src: ?[]const u8) !PugError {
+ var pug_err = PugError{
+ .message = err_message,
+ .filename = filename,
+ .line = line,
+ .src = src,
+ .formatted_message = null,
+ .allocator = allocator,
+ };
+
+ // Format the error message with context
+ if (src) |s| {
+ pug_err.formatted_message = try formatErrorMessage(allocator, err_message, filename, line, s);
+ }
+
+ return pug_err;
+ }
+
+ pub fn deinit(self: *PugError) void {
+ if (self.formatted_message) |msg| {
+ self.allocator.free(msg);
}
}
- /// Writes an inline tag from tag interpolation: #[em text]
- fn writeInlineTag(self: *Runtime, tag: ast.InlineTag) Error!void {
- try self.write("<");
- try self.write(tag.tag);
-
- // Write ID if present
- if (tag.id) |id| {
- try self.write(" id=\"");
- try self.writeEscaped(id);
- try self.write("\"");
+ pub fn getMessage(self: *const PugError) []const u8 {
+ if (self.formatted_message) |msg| {
+ return msg;
}
-
- // Write classes if present
- if (tag.classes.len > 0) {
- try self.write(" class=\"");
- for (tag.classes, 0..) |class, i| {
- if (i > 0) try self.write(" ");
- try self.writeEscaped(class);
- }
- try self.write("\"");
- }
-
- // Write attributes
- for (tag.attributes) |attr| {
- if (attr.value) |value| {
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- const evaluated = try self.evaluateString(value);
- if (attr.escaped) {
- try self.writeEscaped(evaluated);
- } else {
- try self.write(evaluated);
- }
- try self.write("\"");
- } else {
- // Boolean attribute
- try self.write(" ");
- try self.write(attr.name);
- try self.write("=\"");
- try self.write(attr.name);
- try self.write("\"");
- }
- }
-
- try self.write(">");
-
- // Write text content (may contain nested interpolations)
- try self.writeTextSegments(tag.text_segments);
-
- try self.write("");
+ return self.message;
}
-
- /// Writes spread attributes from an object literal: {'data-foo': 'bar', 'data-baz': 'qux'}
- fn writeSpreadAttributes(self: *Runtime, spread: []const u8) Error!void {
- const trimmed = std.mem.trim(u8, spread, " \t\n\r");
-
- // Must start with { and end with }
- if (trimmed.len < 2 or trimmed[0] != '{' or trimmed[trimmed.len - 1] != '}') {
- return;
- }
-
- const content = std.mem.trim(u8, trimmed[1 .. trimmed.len - 1], " \t\n\r");
- if (content.len == 0) return;
-
- var pos: usize = 0;
- while (pos < content.len) {
- // Skip whitespace
- while (pos < content.len and (content[pos] == ' ' or content[pos] == '\t' or content[pos] == '\n' or content[pos] == '\r')) {
- pos += 1;
- }
- if (pos >= content.len) break;
-
- // Parse property name (may be quoted with ' or ")
- var name_start = pos;
- var name_end = pos;
- if (content[pos] == '\'' or content[pos] == '"') {
- const quote = content[pos];
- pos += 1;
- name_start = pos;
- while (pos < content.len and content[pos] != quote) {
- pos += 1;
- }
- name_end = pos;
- if (pos < content.len) pos += 1; // skip closing quote
- } else {
- // Unquoted name
- while (pos < content.len and content[pos] != ':' and content[pos] != ' ') {
- pos += 1;
- }
- name_end = pos;
- }
- const name = content[name_start..name_end];
-
- // Skip to colon
- while (pos < content.len and content[pos] != ':') {
- pos += 1;
- }
- if (pos >= content.len) break;
- pos += 1; // skip :
-
- // Skip whitespace
- while (pos < content.len and (content[pos] == ' ' or content[pos] == '\t')) {
- pos += 1;
- }
-
- // Parse value (handle quoted strings)
- var value_start = pos;
- var value_end = pos;
- if (pos < content.len and (content[pos] == '\'' or content[pos] == '"')) {
- const quote = content[pos];
- pos += 1;
- value_start = pos;
- while (pos < content.len and content[pos] != quote) {
- pos += 1;
- }
- value_end = pos;
- if (pos < content.len) pos += 1; // skip closing quote
- } else {
- // Unquoted value
- while (pos < content.len and content[pos] != ',' and content[pos] != '}') {
- pos += 1;
- }
- value_end = pos;
- // Trim trailing whitespace
- while (value_end > value_start and (content[value_end - 1] == ' ' or content[value_end - 1] == '\t')) {
- value_end -= 1;
- }
- }
- const value = content[value_start..value_end];
-
- // Write attribute
- if (name.len > 0) {
- try self.write(" ");
- try self.write(name);
- try self.write("=\"");
- try self.writeEscaped(value);
- try self.write("\"");
- }
-
- // Skip comma
- while (pos < content.len and (content[pos] == ' ' or content[pos] == ',' or content[pos] == '\t' or content[pos] == '\n' or content[pos] == '\r')) {
- pos += 1;
- }
- }
- }
-
- fn writeIndent(self: *Runtime) Error!void {
- if (!self.options.pretty) return;
- for (0..self.depth) |_| {
- try self.write(self.options.indent_str);
- }
- }
-
- fn writeNewline(self: *Runtime) Error!void {
- if (!self.options.pretty) return;
- try self.write("\n");
- }
-
- fn write(self: *Runtime, str: []const u8) Error!void {
- // Use addManyAsSlice for potentially faster bulk copy
- const dest = try self.output.addManyAsSlice(self.allocator, str.len);
- @memcpy(dest, str);
- }
-
- fn writeEscaped(self: *Runtime, str: []const u8) Error!void {
- // Fast path: use SIMD-friendly byte scan for escape characters
- // Check if any escaping needed using a simple loop (compiler can vectorize)
- var escape_needed: usize = str.len;
- for (str, 0..) |c, i| {
- // Use a lookup instead of multiple comparisons
- if (escape_table[c]) {
- escape_needed = i;
- break;
- }
- }
-
- // No escaping needed - single fast write
- if (escape_needed == str.len) {
- const dest = try self.output.addManyAsSlice(self.allocator, str.len);
- @memcpy(dest, str);
- return;
- }
-
- // Write prefix that doesn't need escaping
- if (escape_needed > 0) {
- const dest = try self.output.addManyAsSlice(self.allocator, escape_needed);
- @memcpy(dest, str[0..escape_needed]);
- }
-
- // Slow path: escape remaining characters
- var start = escape_needed;
- for (str[escape_needed..], escape_needed..) |c, i| {
- if (escape_table[c]) {
- // Write accumulated non-escaped chars first
- if (i > start) {
- const chunk = str[start..i];
- const dest = try self.output.addManyAsSlice(self.allocator, chunk.len);
- @memcpy(dest, chunk);
- }
- const esc = escape_strings[c];
- const dest = try self.output.addManyAsSlice(self.allocator, esc.len);
- @memcpy(dest, esc);
- start = i + 1;
- }
- }
- // Write remaining non-escaped chars
- if (start < str.len) {
- const chunk = str[start..];
- const dest = try self.output.addManyAsSlice(self.allocator, chunk.len);
- @memcpy(dest, chunk);
- }
- }
-
- /// Writes text content with HTML escaping (no quote escaping needed in text)
- /// Preserves existing HTML entities (e.g., ’ stays as ’)
- fn writeTextEscaped(self: *Runtime, str: []const u8) Error!void {
- var i: usize = 0;
- var start: usize = 0;
-
- while (i < str.len) {
- const c = str[i];
- if (c == '&') {
- // Check if this is an existing HTML entity - don't double-escape
- if (isHtmlEntity(str[i..])) {
- i += 1;
- continue;
- }
- // Not an entity, escape the &
- if (i > start) {
- const chunk = str[start..i];
- const dest = try self.output.addManyAsSlice(self.allocator, chunk.len);
- @memcpy(dest, chunk);
- }
- const esc = "&";
- const dest = try self.output.addManyAsSlice(self.allocator, esc.len);
- @memcpy(dest, esc);
- start = i + 1;
- i += 1;
- } else if (c == '<') {
- if (i > start) {
- const chunk = str[start..i];
- const dest = try self.output.addManyAsSlice(self.allocator, chunk.len);
- @memcpy(dest, chunk);
- }
- const esc = "<";
- const dest = try self.output.addManyAsSlice(self.allocator, esc.len);
- @memcpy(dest, esc);
- start = i + 1;
- i += 1;
- } else if (c == '>') {
- if (i > start) {
- const chunk = str[start..i];
- const dest = try self.output.addManyAsSlice(self.allocator, chunk.len);
- @memcpy(dest, chunk);
- }
- const esc = ">";
- const dest = try self.output.addManyAsSlice(self.allocator, esc.len);
- @memcpy(dest, esc);
- start = i + 1;
- i += 1;
- } else {
- i += 1;
- }
- }
-
- if (start < str.len) {
- const chunk = str[start..];
- const dest = try self.output.addManyAsSlice(self.allocator, chunk.len);
- @memcpy(dest, chunk);
- }
- }
-
- /// Checks if string starts with an HTML entity (&#nnnn; or &#xhhhh; or &name;)
- fn isHtmlEntity(str: []const u8) bool {
- if (str.len < 3 or str[0] != '&') return false;
-
- var i: usize = 1;
- if (str[i] == '#') {
- // Numeric entity: &#nnnn; or &#xhhhh;
- i += 1;
- if (i >= str.len) return false;
-
- if (str[i] == 'x' or str[i] == 'X') {
- // Hex: &#xhhhh;
- i += 1;
- var has_hex = false;
- while (i < str.len and i < 10) : (i += 1) {
- const c = str[i];
- if (c == ';') return has_hex;
- if ((c >= '0' and c <= '9') or (c >= 'a' and c <= 'f') or (c >= 'A' and c <= 'F')) {
- has_hex = true;
- } else {
- return false;
- }
- }
- } else {
- // Decimal: &#nnnn;
- var has_digit = false;
- while (i < str.len and i < 10) : (i += 1) {
- const c = str[i];
- if (c == ';') return has_digit;
- if (c >= '0' and c <= '9') {
- has_digit = true;
- } else {
- return false;
- }
- }
- }
- } else {
- // Named entity: &name;
- var has_alpha = false;
- while (i < str.len and i < 32) : (i += 1) {
- const c = str[i];
- if (c == ';') return has_alpha;
- if ((c >= 'a' and c <= 'z') or (c >= 'A' and c <= 'Z') or (c >= '0' and c <= '9')) {
- has_alpha = true;
- } else {
- return false;
- }
- }
- }
- return false;
- }
-
- /// Lookup table for characters that need HTML escaping (for attributes - includes quotes)
- const escape_table = blk: {
- var table: [256]bool = [_]bool{false} ** 256;
- table['&'] = true;
- table['<'] = true;
- table['>'] = true;
- table['"'] = true;
- table['\''] = true;
- break :blk table;
- };
-
- /// Escape strings for each character (for attributes)
- const escape_strings = blk: {
- var strings: [256][]const u8 = [_][]const u8{""} ** 256;
- strings['&'] = "&";
- strings['<'] = "<";
- strings['>'] = ">";
- strings['"'] = """;
- strings['\''] = "'";
- break :blk strings;
- };
-
- /// Lookup table for text content (no quotes - only &, <, >)
- const text_escape_table = blk: {
- var table: [256]bool = [_]bool{false} ** 256;
- table['&'] = true;
- table['<'] = true;
- table['>'] = true;
- break :blk table;
- };
-
- /// Escape strings for text content
- const text_escape_strings = blk: {
- var strings: [256][]const u8 = [_][]const u8{""} ** 256;
- strings['&'] = "&";
- strings['<'] = "<";
- strings['>'] = ">";
- break :blk strings;
- };
};
-// ─────────────────────────────────────────────────────────────────────────────
-// Helpers
-// ─────────────────────────────────────────────────────────────────────────────
-
-fn isVoidElement(tag: []const u8) bool {
- const void_elements = std.StaticStringMap(void).initComptime(.{
- .{ "area", {} }, .{ "base", {} }, .{ "br", {} },
- .{ "col", {} }, .{ "embed", {} }, .{ "hr", {} },
- .{ "img", {} }, .{ "input", {} }, .{ "link", {} },
- .{ "meta", {} }, .{ "param", {} }, .{ "source", {} },
- .{ "track", {} }, .{ "wbr", {} },
- });
- return void_elements.has(tag);
-}
-
-/// Whitespace-preserving elements - don't add indentation or extra newlines
-fn isWhitespacePreserving(tag: []const u8) bool {
- const ws_elements = std.StaticStringMap(void).initComptime(.{
- .{ "pre", {} },
- .{ "script", {} },
- .{ "style", {} },
- .{ "textarea", {} },
- });
- return ws_elements.has(tag);
-}
-
-/// Checks if children can be rendered inline (for block expansion).
-/// For inline rendering, the direct child element must have NO content at all
-/// (no children, no inline_text, no buffered_code) OR be a void element.
-/// e.g., `a: img` can be inline (img is void element)
-/// `li: a(href='#') foo` - the `a` has inline_text so renders inline
-/// but `li: .foo: #bar baz` cannot (div.foo has child #bar)
-/// Checks if a parent element can render its children inline.
-/// For block expansion (`:` syntax), inline rendering is only allowed when:
-/// - Child has no element children AND
-/// - Child was not created via block expansion (not chained) AND
-/// - Child has no text/buffered content if parent is in a chain (child.is_inline check handles this)
-fn canRenderInlineForParent(parent: ast.Element) bool {
- for (parent.children) |child| {
- switch (child) {
- .element => |elem| {
- // If child has element children, can't render inline
- if (elem.children.len > 0) return false;
- // If child was created via block expansion (chained `:` syntax), can't render inline
- // This handles `li: .foo: #bar` where .foo has is_inline=true
- if (elem.is_inline) return false;
- // If child has content AND parent's child will itself be inline-rendered,
- // we need to check if this is a chain. Since parent.is_inline is true (we're here),
- // check if any child element has text - if the depth > 1, don't render inline.
- // This is approximated by: if child has inline_text AND is followed by `:` somewhere in the chain
- // But we can't easily detect chain depth here.
- // For now, leave as is - the is_inline check above should handle most cases.
- },
- else => {},
- }
- }
- return true;
-}
-
-/// Parses a JS array literal and converts it to space-separated string.
-/// Input: ['foo', 'bar', 'baz']
-/// Output: foo bar baz
-fn parseArrayToSpaceSeparated(allocator: std.mem.Allocator, input: []const u8) ![]const u8 {
- const trimmed = std.mem.trim(u8, input, " \t\n\r");
-
- // Must start with [ and end with ]
- if (trimmed.len < 2 or trimmed[0] != '[' or trimmed[trimmed.len - 1] != ']') {
- return input; // Not an array, return as-is
- }
-
- const content = std.mem.trim(u8, trimmed[1 .. trimmed.len - 1], " \t\n\r");
- if (content.len == 0) return "";
-
- var result = std.ArrayList(u8).empty;
+fn formatErrorMessage(allocator: Allocator, err_message: []const u8, filename: ?[]const u8, line: usize, src: []const u8) ![]const u8 {
+ var result: ArrayListUnmanaged(u8) = .{};
errdefer result.deinit(allocator);
- var pos: usize = 0;
- var first = true;
- while (pos < content.len) {
- // Skip whitespace and commas
- while (pos < content.len and (content[pos] == ' ' or content[pos] == '\t' or content[pos] == ',' or content[pos] == '\n' or content[pos] == '\r')) {
- pos += 1;
- }
- if (pos >= content.len) break;
+ // Add filename and line
+ if (filename) |f| {
+ try result.appendSlice(allocator, f);
+ }
+ try result.append(allocator, ':');
- // Parse value (handle quoted strings)
- var value_start = pos;
- var value_end = pos;
- if (content[pos] == '\'' or content[pos] == '"') {
- const quote = content[pos];
- pos += 1;
- value_start = pos;
- while (pos < content.len and content[pos] != quote) {
- pos += 1;
- }
- value_end = pos;
- if (pos < content.len) pos += 1; // skip closing quote
- } else {
- // Unquoted value
- while (pos < content.len and content[pos] != ',' and content[pos] != ']') {
- pos += 1;
- }
- value_end = pos;
- // Trim trailing whitespace
- while (value_end > value_start and (content[value_end - 1] == ' ' or content[value_end - 1] == '\t')) {
- value_end -= 1;
- }
+ // Format line number
+ var line_buf: [32]u8 = undefined;
+ const line_str = std.fmt.bufPrint(&line_buf, "{d}", .{line}) catch return error.FormatError;
+ try result.appendSlice(allocator, line_str);
+ try result.append(allocator, '\n');
+
+ // Split source into lines and show context
+ var lines_iter = mem.splitSequence(u8, src, "\n");
+ var line_num: usize = 1;
+ while (lines_iter.next()) |src_line| {
+ // Show lines around the error (context window)
+ const start_line = if (line > 3) line - 3 else 1;
+ const end_line = line + 3;
+
+ if (line_num >= start_line and line_num <= end_line) {
+ // Line number prefix
+ var num_buf: [32]u8 = undefined;
+ const num_str = std.fmt.bufPrint(&num_buf, "{d: >4}| ", .{line_num}) catch return error.FormatError;
+ try result.appendSlice(allocator, num_str);
+ try result.appendSlice(allocator, src_line);
+ try result.append(allocator, '\n');
}
- const value = content[value_start..value_end];
- if (value.len > 0) {
- if (!first) {
- try result.append(allocator, ' ');
- }
- try result.appendSlice(allocator, value);
- first = false;
- }
+ line_num += 1;
+
+ if (line_num > end_line) break;
}
- return result.toOwnedSlice(allocator);
+ // Add the original error message
+ try result.appendSlice(allocator, err_message);
+
+ return try result.toOwnedSlice(allocator);
}
-/// Parses a JS object literal and converts it to CSS style string.
-/// Input: {color: 'red', background: 'green'}
-/// Output: color:red;background:green;
-fn parseObjectToCSS(allocator: std.mem.Allocator, input: []const u8) ![]const u8 {
- const trimmed = std.mem.trim(u8, input, " \t\n\r");
-
- // Must start with { and end with }
- if (trimmed.len < 2 or trimmed[0] != '{' or trimmed[trimmed.len - 1] != '}') {
- return input; // Not an object, return as-is
- }
-
- const content = std.mem.trim(u8, trimmed[1 .. trimmed.len - 1], " \t\n\r");
- if (content.len == 0) return "";
-
- var result = std.ArrayList(u8).empty;
- errdefer result.deinit(allocator);
-
- var pos: usize = 0;
- while (pos < content.len) {
- // Skip whitespace
- while (pos < content.len and (content[pos] == ' ' or content[pos] == '\t' or content[pos] == '\n' or content[pos] == '\r')) {
- pos += 1;
- }
- if (pos >= content.len) break;
-
- // Parse property name
- const name_start = pos;
- while (pos < content.len and content[pos] != ':' and content[pos] != ' ') {
- pos += 1;
- }
- const name = content[name_start..pos];
-
- // Skip to colon
- while (pos < content.len and content[pos] != ':') {
- pos += 1;
- }
- if (pos >= content.len) break;
- pos += 1; // skip :
-
- // Skip whitespace
- while (pos < content.len and (content[pos] == ' ' or content[pos] == '\t')) {
- pos += 1;
- }
-
- // Parse value (handle quoted strings)
- var value_start = pos;
- var value_end = pos;
- if (pos < content.len and (content[pos] == '\'' or content[pos] == '"')) {
- const quote = content[pos];
- pos += 1;
- value_start = pos;
- while (pos < content.len and content[pos] != quote) {
- pos += 1;
- }
- value_end = pos;
- if (pos < content.len) pos += 1; // skip closing quote
- } else {
- // Unquoted value
- while (pos < content.len and content[pos] != ',' and content[pos] != '}') {
- pos += 1;
- }
- value_end = pos;
- // Trim trailing whitespace from value
- while (value_end > value_start and (content[value_end - 1] == ' ' or content[value_end - 1] == '\t')) {
- value_end -= 1;
- }
- }
- const value = content[value_start..value_end];
-
- // Append property:value;
- try result.appendSlice(allocator, name);
- try result.append(allocator, ':');
- try result.appendSlice(allocator, value);
- try result.append(allocator, ';');
-
- // Skip comma
- while (pos < content.len and (content[pos] == ' ' or content[pos] == ',' or content[pos] == '\t' or content[pos] == '\n' or content[pos] == '\r')) {
- pos += 1;
- }
- }
-
- return result.toOwnedSlice(allocator);
+/// Rethrow an error with file context.
+/// Creates a PugError with formatted message including source line context.
+pub fn rethrow(allocator: Allocator, err_message: []const u8, filename: ?[]const u8, line: usize, src: ?[]const u8) !PugError {
+ return try PugError.init(allocator, err_message, filename, line, src);
}
-/// Parses a JS object literal for class attribute and returns space-separated class names.
-/// Only includes keys where the value is truthy (true, non-empty string, non-zero number).
-/// Input: {foo: true, bar: false, baz: true}
-/// Output: foo baz
-fn parseObjectToClassList(allocator: std.mem.Allocator, input: []const u8) ![]const u8 {
- const trimmed = std.mem.trim(u8, input, " \t\n\r");
-
- // Must start with { and end with }
- if (trimmed.len < 2 or trimmed[0] != '{' or trimmed[trimmed.len - 1] != '}') {
- return input; // Not an object, return as-is
- }
-
- const content = std.mem.trim(u8, trimmed[1 .. trimmed.len - 1], " \t\n\r");
- if (content.len == 0) return "";
-
- var result = std.ArrayList(u8).empty;
- errdefer result.deinit(allocator);
-
- var pos: usize = 0;
- while (pos < content.len) {
- // Skip whitespace
- while (pos < content.len and (content[pos] == ' ' or content[pos] == '\t' or content[pos] == '\n' or content[pos] == '\r')) {
- pos += 1;
- }
- if (pos >= content.len) break;
-
- // Parse property name (class name)
- const name_start = pos;
- while (pos < content.len and content[pos] != ':' and content[pos] != ' ' and content[pos] != ',') {
- pos += 1;
- }
- const name = content[name_start..pos];
-
- // Skip to colon
- while (pos < content.len and content[pos] != ':') {
- pos += 1;
- }
- if (pos >= content.len) break;
- pos += 1; // skip :
-
- // Skip whitespace
- while (pos < content.len and (content[pos] == ' ' or content[pos] == '\t')) {
- pos += 1;
- }
-
- // Parse value
- var value_start = pos;
- var value_end = pos;
- if (pos < content.len and (content[pos] == '\'' or content[pos] == '"')) {
- const quote = content[pos];
- pos += 1;
- value_start = pos;
- while (pos < content.len and content[pos] != quote) {
- pos += 1;
- }
- value_end = pos;
- if (pos < content.len) pos += 1; // skip closing quote
- } else {
- // Unquoted value (true, false, number, variable)
- while (pos < content.len and content[pos] != ',' and content[pos] != '}' and content[pos] != ' ') {
- pos += 1;
- }
- value_end = pos;
- }
- const value = std.mem.trim(u8, content[value_start..value_end], " \t");
-
- // Check if value is truthy
- const is_truthy = !std.mem.eql(u8, value, "false") and
- !std.mem.eql(u8, value, "null") and
- !std.mem.eql(u8, value, "undefined") and
- !std.mem.eql(u8, value, "0") and
- !std.mem.eql(u8, value, "''") and
- !std.mem.eql(u8, value, "\"\"") and
- value.len > 0;
-
- if (is_truthy and name.len > 0) {
- if (result.items.len > 0) {
- try result.append(allocator, ' ');
- }
- try result.appendSlice(allocator, name);
- }
-
- // Skip comma and whitespace
- while (pos < content.len and (content[pos] == ' ' or content[pos] == ',' or content[pos] == '\t' or content[pos] == '\n' or content[pos] == '\r')) {
- pos += 1;
- }
- }
-
- return result.toOwnedSlice(allocator);
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
-// Convenience function
-// ─────────────────────────────────────────────────────────────────────────────
-
-/// Compiles and renders a template string with the given data context.
-/// This is the simplest API for server use - one function call does everything.
-///
-/// **Recommended:** Use an arena allocator for automatic cleanup:
-/// ```zig
-/// var arena = std.heap.ArenaAllocator.init(base_allocator);
-/// defer arena.deinit(); // Frees all template memory at once
-///
-/// const html = try pugz.renderTemplate(arena.allocator(),
-/// \\html
-/// \\ head
-/// \\ title= title
-/// \\ body
-/// \\ h1 Hello, #{name}!
-/// , .{ .title = "My Page", .name = "World" });
-/// // Use html... arena.deinit() frees everything
-/// ```
-pub fn renderTemplate(allocator: std.mem.Allocator, source: []const u8, data: anytype) ![]u8 {
- // Tokenize
- var lexer = Lexer.init(allocator, source);
- defer lexer.deinit();
- const tokens = lexer.tokenize() catch return error.ParseError;
-
- // Parse
- var parser = Parser.init(allocator, tokens);
- const doc = parser.parse() catch return error.ParseError;
-
- // Render with data
- return render(allocator, doc, data);
-}
-
-/// Renders a pre-parsed document with the given data context.
-/// Use this when you want to parse once and render multiple times with different data.
-/// Options for render function.
-pub const RenderOptions = struct {
- pretty: bool = true,
-};
-
-pub fn render(allocator: std.mem.Allocator, doc: ast.Document, data: anytype) ![]u8 {
- return renderWithOptions(allocator, doc, data, .{});
-}
-
-pub fn renderWithOptions(allocator: std.mem.Allocator, doc: ast.Document, data: anytype, opts: RenderOptions) ![]u8 {
- var ctx = Context.init(allocator);
- defer ctx.deinit();
-
- // Populate context from data struct
- try ctx.pushScope();
- inline for (std.meta.fields(@TypeOf(data))) |field| {
- const value = @field(data, field.name);
- try ctx.set(field.name, toValue(allocator, value));
- }
-
- var runtime = Runtime.init(allocator, &ctx, .{ .pretty = opts.pretty });
- defer runtime.deinit();
-
- return runtime.renderOwned(doc);
-}
-
-/// Converts a Zig value to a runtime Value.
-/// For best performance, use an arena allocator.
-pub fn toValue(allocator: std.mem.Allocator, v: anytype) Value {
- const T = @TypeOf(v);
-
- if (T == Value) return v;
-
- switch (@typeInfo(T)) {
- .bool => return Value.boolean(v),
- .int, .comptime_int => return Value.integer(@intCast(v)),
- .float, .comptime_float => return .{ .float = @floatCast(v) },
- .pointer => |ptr| {
- // Handle *const [N]u8 (string literals)
- if (ptr.size == .one) {
- const child_info = @typeInfo(ptr.child);
- if (child_info == .array and child_info.array.child == u8) {
- return Value.str(v);
- }
- // Handle pointer to array of non-u8 (e.g., *const [3][]const u8)
- if (child_info == .array) {
- const arr = allocator.alloc(Value, child_info.array.len) catch return Value.null;
- for (v, 0..) |item, i| {
- arr[i] = toValue(allocator, item);
- }
- return .{ .array = arr };
- }
- }
- // Handle []const u8 and []u8
- if (ptr.size == .slice and ptr.child == u8) {
- return Value.str(v);
- }
- if (ptr.size == .slice) {
- // Convert slice to array value
- const arr = allocator.alloc(Value, v.len) catch return Value.null;
- for (v, 0..) |item, i| {
- arr[i] = toValue(allocator, item);
- }
- return .{ .array = arr };
- }
- return Value.null;
- },
- .optional => {
- if (v) |inner| {
- return toValue(allocator, inner);
- }
- return Value.null;
- },
- .@"struct" => |info| {
- // Convert struct to object - pre-allocate for known field count
- var obj = std.StringHashMapUnmanaged(Value).empty;
- obj.ensureTotalCapacity(allocator, info.fields.len) catch return Value.null;
- inline for (info.fields) |field| {
- const field_value = @field(v, field.name);
- obj.putAssumeCapacity(field.name, toValue(allocator, field_value));
- }
- return .{ .object = obj };
- },
- else => return Value.null,
- }
-}
-
-// ─────────────────────────────────────────────────────────────────────────────
+// ============================================================================
// Tests
-// ─────────────────────────────────────────────────────────────────────────────
+// ============================================================================
-test "context variable lookup" {
+test "escape - no escaping needed" {
const allocator = std.testing.allocator;
- var ctx = Context.init(allocator);
- defer ctx.deinit();
-
- try ctx.pushScope();
- try ctx.set("name", Value.str("World"));
- try ctx.set("count", Value.integer(42));
-
- try std.testing.expectEqualStrings("World", ctx.get("name").?.string);
- try std.testing.expectEqual(@as(i64, 42), ctx.get("count").?.int);
- try std.testing.expect(ctx.get("undefined") == null);
+ const result = try escape(allocator, "foo");
+ defer allocator.free(result);
+ try std.testing.expectEqualStrings("foo", result);
}
-test "context scoping" {
+test "escape - less than" {
const allocator = std.testing.allocator;
- var ctx = Context.init(allocator);
- defer ctx.deinit();
-
- try ctx.pushScope();
- try ctx.set("x", Value.integer(1));
-
- try ctx.pushScope();
- try ctx.set("x", Value.integer(2));
- try std.testing.expectEqual(@as(i64, 2), ctx.get("x").?.int);
-
- ctx.popScope();
- try std.testing.expectEqual(@as(i64, 1), ctx.get("x").?.int);
+ const result = try escape(allocator, "fooHello, World!
", html); +} + +test "multiple interpolations" { + const allocator = std.testing.allocator; + + const html = try renderWithData(allocator, "p #{greeting}, #{name}!", .{ + .greeting = "Hello", + .name = "World", + }); + defer allocator.free(html); + + try std.testing.expectEqualStrings("Hello, World!
", html); +} + +test "attribute with data" { + const allocator = std.testing.allocator; + + const html = try renderWithData(allocator, "a(href=url) Click", .{ .url = "/home" }); + defer allocator.free(html); + + try std.testing.expectEqualStrings("Click", html); +} + +test "buffered code" { + const allocator = std.testing.allocator; + + const html = try renderWithData(allocator, "p= message", .{ .message = "Hello" }); + defer allocator.free(html); + + try std.testing.expectEqualStrings("Hello
", html); +} + +test "escape html" { + const allocator = std.testing.allocator; + + const html = try renderWithData(allocator, "p #{content}", .{ .content = "bold" }); + defer allocator.free(html); + + try std.testing.expectEqualStrings("<b>bold</b>
", html); +} + +test "no data - static template" { + const allocator = std.testing.allocator; + + const html = try renderWithData(allocator, "p Hello, World!", .{}); + defer allocator.free(html); + + try std.testing.expectEqualStrings("Hello, World!
", html); +} + +test "nested tags with data" { + const allocator = std.testing.allocator; + + const html = try renderWithData(allocator, + \\div + \\ h1 #{title} + \\ p #{body} + , .{ + .title = "Welcome", + .body = "Hello there!", + }); + defer allocator.free(html); + + try std.testing.expectEqualStrings("Welcome
Hello there!
Just some markdown tests.
\\\\nWith new line.
\\\\n\\" + }, + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"script\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"line\\": 5, + \\"filename\\": \\"filters.include.tokens.json\\", + \\"val\\": \\"(function(){}).call(this);\\" + } + ], + \\"line\\": 4, + \\"filename\\": \\"filters.include.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 4, + \\"filename\\": \\"filters.include.tokens.json\\" + }, + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"script\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"line\\": 7, + \\"filename\\": \\"filters.include.tokens.json\\", + \\"val\\": \\"\\" + } + ], + \\"line\\": 6, + \\"filename\\": \\"filters.include.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 6, + \\"filename\\": \\"filters.include.tokens.json\\" + } + ], + \\"line\\": 2, + \\"filename\\": \\"filters.include.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 2, + \\"filename\\": \\"filters.include.tokens.json\\" + } + ], + \\"line\\": 1, + \\"filename\\": \\"filters.include.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 1, + \\"filename\\": \\"filters.include.tokens.json\\" + } + ], + \\"line\\": 0, + \\"filename\\": \\"filters.include.tokens.json\\" +}" +`; + +exports[`cases/filters.inline.input.json 1`] = ` +"{ + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"p\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"val\\": \\"before \\", + \\"line\\": 1, + \\"filename\\": \\"filters.inline.tokens.json\\" + }, + { + \\"type\\": \\"Text\\", + \\"name\\": \\"cdata\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"val\\": \\"inside\\", + \\"line\\": 1, + \\"filename\\": \\"filters.inline.tokens.json\\" + } + ], + \\"line\\": 1, + \\"filename\\": \\"filters.inline.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 1, + \\"filename\\": \\"filters.inline.tokens.json\\", + \\"val\\": \\"\\" + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\" after\\", + \\"line\\": 1, + \\"filename\\": \\"filters.inline.tokens.json\\" + } + ], + \\"line\\": 1, + \\"filename\\": \\"filters.inline.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 1, + \\"filename\\": \\"filters.inline.tokens.json\\" + } + ], + \\"line\\": 0, + \\"filename\\": \\"filters.inline.tokens.json\\" +}" +`; + +exports[`cases/filters.less.input.json 1`] = ` +"{ + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"html\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"head\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"style\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"less\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"val\\": \\"@pad: 15px;\\", + \\"line\\": 5 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 6 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"body {\\", + \\"line\\": 6 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 7 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\" padding: @pad;\\", + \\"line\\": 7 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 8 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"}\\", + \\"line\\": 8 + } + ], + \\"line\\": 4, + \\"filename\\": \\"filters.less.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 4, + \\"filename\\": \\"filters.less.tokens.json\\", + \\"val\\": \\"body {\\\\n padding: 15px;\\\\n}\\\\n\\" + } + ], + \\"line\\": 3, + \\"filename\\": \\"filters.less.tokens.json\\" + }, + \\"attrs\\": [ + { + \\"name\\": \\"type\\", + \\"val\\": \\"\\\\\\"text/css\\\\\\"\\", + \\"mustEscape\\": true + } + ], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 3, + \\"filename\\": \\"filters.less.tokens.json\\" + } + ], + \\"line\\": 2, + \\"filename\\": \\"filters.less.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 2, + \\"filename\\": \\"filters.less.tokens.json\\" + } + ], + \\"line\\": 1, + \\"filename\\": \\"filters.less.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 1, + \\"filename\\": \\"filters.less.tokens.json\\" + } + ], + \\"line\\": 0, + \\"filename\\": \\"filters.less.tokens.json\\" +}" +`; + +exports[`cases/filters.markdown.input.json 1`] = ` +"{ + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"html\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"body\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"markdown-it\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"val\\": \\"This is _some_ awesome **markdown**\\", + \\"line\\": 4 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 5 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"whoop.\\", + \\"line\\": 5 + } + ], + \\"line\\": 3, + \\"filename\\": \\"filters.markdown.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 3, + \\"filename\\": \\"filters.markdown.tokens.json\\", + \\"val\\": \\"This is some awesome markdown\\\\nwhoop.
\\\\n\\" + } + ], + \\"line\\": 2, + \\"filename\\": \\"filters.markdown.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 2, + \\"filename\\": \\"filters.markdown.tokens.json\\" + } + ], + \\"line\\": 1, + \\"filename\\": \\"filters.markdown.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 1, + \\"filename\\": \\"filters.markdown.tokens.json\\" + } + ], + \\"line\\": 0, + \\"filename\\": \\"filters.markdown.tokens.json\\" +}" +`; + +exports[`cases/filters.nested.input.json 1`] = ` +"{ + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"script\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"cdata\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"uglify-js\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"val\\": \\"(function() {\\", + \\"line\\": 3 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 4 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\" console.log('test')\\", + \\"line\\": 4 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 5 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"})()\\", + \\"line\\": 5 + } + ], + \\"line\\": 2, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 2, + \\"filename\\": \\"filters.nested.tokens.json\\", + \\"val\\": \\"!function(){console.log(\\\\\\"test\\\\\\")}();\\" + } + ], + \\"line\\": 2, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 2, + \\"filename\\": \\"filters.nested.tokens.json\\", + \\"val\\": \\"\\" + } + ], + \\"line\\": 1, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 1, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"script\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"cdata\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"uglify-js\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"coffee-script\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"val\\": \\"(->\\", + \\"line\\": 8 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 9 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\" console.log 'test'\\", + \\"line\\": 9 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 10 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\")()\\", + \\"line\\": 10 + } + ], + \\"line\\": 7, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 7, + \\"filename\\": \\"filters.nested.tokens.json\\", + \\"val\\": \\"(function() {\\\\n (function() {\\\\n return console.log('test');\\\\n })();\\\\n\\\\n}).call(this);\\\\n\\" + } + ], + \\"line\\": 7, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 7, + \\"filename\\": \\"filters.nested.tokens.json\\", + \\"val\\": \\"(function(){!function(){console.log(\\\\\\"test\\\\\\")}()}).call(this);\\" + } + ], + \\"line\\": 7, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 7, + \\"filename\\": \\"filters.nested.tokens.json\\", + \\"val\\": \\"\\" + } + ], + \\"line\\": 6, + \\"filename\\": \\"filters.nested.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 6, + \\"filename\\": \\"filters.nested.tokens.json\\" + } + ], + \\"line\\": 0, + \\"filename\\": \\"filters.nested.tokens.json\\" +}" +`; + +exports[`cases/filters.stylus.input.json 1`] = ` +"{ + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"html\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"head\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"style\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"stylus\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"val\\": \\"body\\", + \\"line\\": 5 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\"\\\\n\\", + \\"line\\": 6 + }, + { + \\"type\\": \\"Text\\", + \\"val\\": \\" padding: 50px\\", + \\"line\\": 6 + } + ], + \\"line\\": 4, + \\"filename\\": \\"filters.stylus.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 4, + \\"filename\\": \\"filters.stylus.tokens.json\\", + \\"val\\": \\"body {\\\\n padding: 50px;\\\\n}\\\\n\\" + } + ], + \\"line\\": 3, + \\"filename\\": \\"filters.stylus.tokens.json\\" + }, + \\"attrs\\": [ + { + \\"name\\": \\"type\\", + \\"val\\": \\"\\\\\\"text/css\\\\\\"\\", + \\"mustEscape\\": true + } + ], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 3, + \\"filename\\": \\"filters.stylus.tokens.json\\" + } + ], + \\"line\\": 2, + \\"filename\\": \\"filters.stylus.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 2, + \\"filename\\": \\"filters.stylus.tokens.json\\" + }, + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"body\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [], + \\"line\\": 7, + \\"filename\\": \\"filters.stylus.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 7, + \\"filename\\": \\"filters.stylus.tokens.json\\" + } + ], + \\"line\\": 1, + \\"filename\\": \\"filters.stylus.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 1, + \\"filename\\": \\"filters.stylus.tokens.json\\" + } + ], + \\"line\\": 0, + \\"filename\\": \\"filters.stylus.tokens.json\\" +}" +`; + +exports[`cases/filters-empty.input.json 1`] = ` +"{ + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Code\\", + \\"val\\": \\"var users = [{ name: 'tobi', age: 2 }]\\", + \\"buffer\\": false, + \\"mustEscape\\": false, + \\"isInline\\": false, + \\"line\\": 1, + \\"filename\\": \\"filters-empty.tokens.json\\" + }, + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"fb:users\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Each\\", + \\"obj\\": \\"users\\", + \\"val\\": \\"user\\", + \\"key\\": null, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Tag\\", + \\"name\\": \\"fb:user\\", + \\"selfClosing\\": false, + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [ + { + \\"type\\": \\"Text\\", + \\"name\\": \\"cdata\\", + \\"block\\": { + \\"type\\": \\"Block\\", + \\"nodes\\": [], + \\"line\\": 6, + \\"filename\\": \\"filters-empty.tokens.json\\" + }, + \\"attrs\\": [], + \\"line\\": 6, + \\"filename\\": \\"filters-empty.tokens.json\\", + \\"val\\": \\"\\" + } + ], + \\"line\\": 5, + \\"filename\\": \\"filters-empty.tokens.json\\" + }, + \\"attrs\\": [ + { + \\"name\\": \\"age\\", + \\"val\\": \\"user.age\\", + \\"mustEscape\\": true + } + ], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 5, + \\"filename\\": \\"filters-empty.tokens.json\\" + } + ], + \\"line\\": 5, + \\"filename\\": \\"filters-empty.tokens.json\\" + }, + \\"line\\": 4, + \\"filename\\": \\"filters-empty.tokens.json\\" + } + ], + \\"line\\": 3, + \\"filename\\": \\"filters-empty.tokens.json\\" + }, + \\"attrs\\": [], + \\"attributeBlocks\\": [], + \\"isInline\\": false, + \\"line\\": 3, + \\"filename\\": \\"filters-empty.tokens.json\\" + } + ], + \\"line\\": 0, + \\"filename\\": \\"filters-empty.tokens.json\\" +}" +`; + +exports[`errors/dynamic-option.input.json 1`] = ` +Object { + "code": "PUG:FILTER_OPTION_NOT_CONSTANT", + "line": 2, + "msg": "\\"opt\\" is not constant. All filters are rendered compile-time so filter options must be constants.", +} +`; diff --git a/src/test-data/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap b/src/test-data/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap new file mode 100644 index 0000000..b69c7cb --- /dev/null +++ b/src/test-data/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap @@ -0,0 +1,103 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`per filter options are applied, even to nested filters 1`] = ` +Object { + "filename": ":)
diff --git a/src/test-data/pug-linker/test/cases-src/auxiliary/window.pug b/src/test-data/pug-linker/test/cases-src/auxiliary/window.pug new file mode 100644 index 0000000..7ab7132 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/auxiliary/window.pug @@ -0,0 +1,4 @@ + +.window + a(href='#').close Close + block window-content \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases-src/auxiliary/yield-nested.pug b/src/test-data/pug-linker/test/cases-src/auxiliary/yield-nested.pug new file mode 100644 index 0000000..0771c0a --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/auxiliary/yield-nested.pug @@ -0,0 +1,10 @@ +html + head + title + body + h1 Page + #content + #content-wrapper + yield + #footer + stuff \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases-src/include-extends-from-root.pug b/src/test-data/pug-linker/test/cases-src/include-extends-from-root.pug new file mode 100644 index 0000000..a79a57d --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-extends-from-root.pug @@ -0,0 +1 @@ +include /auxiliary/extends-from-root.pug diff --git a/src/test-data/pug-linker/test/cases-src/include-extends-of-common-template.pug b/src/test-data/pug-linker/test/cases-src/include-extends-of-common-template.pug new file mode 100644 index 0000000..2511f52 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-extends-of-common-template.pug @@ -0,0 +1,2 @@ +include auxiliary/extends-empty-block-1.pug +include auxiliary/extends-empty-block-2.pug diff --git a/src/test-data/pug-linker/test/cases-src/include-extends-relative.pug b/src/test-data/pug-linker/test/cases-src/include-extends-relative.pug new file mode 100644 index 0000000..f1648ff --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-extends-relative.pug @@ -0,0 +1 @@ +include ../cases-src/auxiliary/extends-relative.pug diff --git a/src/test-data/pug-linker/test/cases-src/include-filter-coffee.coffee b/src/test-data/pug-linker/test/cases-src/include-filter-coffee.coffee new file mode 100644 index 0000000..9723cd7 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-filter-coffee.coffee @@ -0,0 +1,2 @@ +math = + square: (value) -> value * value diff --git a/src/test-data/pug-linker/test/cases-src/include-filter-stylus.pug b/src/test-data/pug-linker/test/cases-src/include-filter-stylus.pug new file mode 100644 index 0000000..eefd3c1 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-filter-stylus.pug @@ -0,0 +1,2 @@ +style(type="text/css") + include:stylus some.styl diff --git a/src/test-data/pug-linker/test/cases-src/include-filter.pug b/src/test-data/pug-linker/test/cases-src/include-filter.pug new file mode 100644 index 0000000..e7ea3db --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-filter.pug @@ -0,0 +1,7 @@ +html + body + include:markdown-it some.md + script + include:coffee-script(minify=true) include-filter-coffee.coffee + script + include:coffee-script(minify=false) include-filter-coffee.coffee diff --git a/src/test-data/pug-linker/test/cases-src/include-only-text-body.pug b/src/test-data/pug-linker/test/cases-src/include-only-text-body.pug new file mode 100644 index 0000000..fdb080c --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-only-text-body.pug @@ -0,0 +1,3 @@ +| The message is " +yield +| " diff --git a/src/test-data/pug-linker/test/cases-src/include-only-text.pug b/src/test-data/pug-linker/test/cases-src/include-only-text.pug new file mode 100644 index 0000000..ede4f0f --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-only-text.pug @@ -0,0 +1,5 @@ +html + body + p + include include-only-text-body.pug + em hello world diff --git a/src/test-data/pug-linker/test/cases-src/include-with-text-head.pug b/src/test-data/pug-linker/test/cases-src/include-with-text-head.pug new file mode 100644 index 0000000..4e670c0 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-with-text-head.pug @@ -0,0 +1,3 @@ +head + script(type='text/javascript'). + alert('hello world'); diff --git a/src/test-data/pug-linker/test/cases-src/include-with-text.pug b/src/test-data/pug-linker/test/cases-src/include-with-text.pug new file mode 100644 index 0000000..bc83ea5 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include-with-text.pug @@ -0,0 +1,4 @@ +html + include include-with-text-head.pug + script(src='/caustic.js') + script(src='/app.js') diff --git a/src/test-data/pug-linker/test/cases-src/include.script.pug b/src/test-data/pug-linker/test/cases-src/include.script.pug new file mode 100644 index 0000000..f449144 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include.script.pug @@ -0,0 +1,2 @@ +script#pet-template(type='text/x-template') + include auxiliary/pet.pug diff --git a/src/test-data/pug-linker/test/cases-src/include.yield.nested.pug b/src/test-data/pug-linker/test/cases-src/include.yield.nested.pug new file mode 100644 index 0000000..f4a7d69 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/include.yield.nested.pug @@ -0,0 +1,4 @@ + +include auxiliary/yield-nested.pug + p some content + p and some more diff --git a/src/test-data/pug-linker/test/cases-src/includes-with-ext-js.pug b/src/test-data/pug-linker/test/cases-src/includes-with-ext-js.pug new file mode 100644 index 0000000..65bfa8a --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/includes-with-ext-js.pug @@ -0,0 +1,3 @@ +pre + code + include javascript-new-lines.js diff --git a/src/test-data/pug-linker/test/cases-src/includes.pug b/src/test-data/pug-linker/test/cases-src/includes.pug new file mode 100644 index 0000000..7761ce2 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/includes.pug @@ -0,0 +1,10 @@ + +include auxiliary/mixins.pug + ++foo + +body + include auxiliary/smile.html + include auxiliary/escapes.html + script(type="text/javascript") + include:verbatim auxiliary/includable.js diff --git a/src/test-data/pug-linker/test/cases-src/javascript-new-lines.js b/src/test-data/pug-linker/test/cases-src/javascript-new-lines.js new file mode 100644 index 0000000..bb0c26f --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/javascript-new-lines.js @@ -0,0 +1 @@ +var x = '\n here is some \n new lined text'; diff --git a/src/test-data/pug-linker/test/cases-src/layout.append.pug b/src/test-data/pug-linker/test/cases-src/layout.append.pug new file mode 100644 index 0000000..d771bc9 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/layout.append.pug @@ -0,0 +1,6 @@ + +extends ../fixtures/append/app-layout.pug + +block append head + script(src='foo.js') + script(src='bar.js') diff --git a/src/test-data/pug-linker/test/cases-src/layout.append.without-block.pug b/src/test-data/pug-linker/test/cases-src/layout.append.without-block.pug new file mode 100644 index 0000000..19842fc --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/layout.append.without-block.pug @@ -0,0 +1,6 @@ + +extends ../fixtures/append-without-block/app-layout.pug + +append head + script(src='foo.js') + script(src='bar.js') diff --git a/src/test-data/pug-linker/test/cases-src/layout.multi.append.prepend.block.pug b/src/test-data/pug-linker/test/cases-src/layout.multi.append.prepend.block.pug new file mode 100644 index 0000000..79d15b1 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/layout.multi.append.prepend.block.pug @@ -0,0 +1,19 @@ +extends ../fixtures/multi-append-prepend-block/redefine.pug + +append content + p.first.append Something appended to content + +prepend content + p.first.prepend Something prepended to content + +append content + p.last.append Last append must be most last + +prepend content + p.last.prepend Last prepend must appear at top + +append head + script(src='jquery.js') + +prepend head + script(src='foo.js') diff --git a/src/test-data/pug-linker/test/cases-src/layout.prepend.pug b/src/test-data/pug-linker/test/cases-src/layout.prepend.pug new file mode 100644 index 0000000..4659a11 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/layout.prepend.pug @@ -0,0 +1,6 @@ + +extends ../fixtures/prepend/app-layout.pug + +block prepend head + script(src='foo.js') + script(src='bar.js') diff --git a/src/test-data/pug-linker/test/cases-src/layout.prepend.without-block.pug b/src/test-data/pug-linker/test/cases-src/layout.prepend.without-block.pug new file mode 100644 index 0000000..516d01b --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/layout.prepend.without-block.pug @@ -0,0 +1,6 @@ + +extends ../fixtures/prepend-without-block/app-layout.pug + +prepend head + script(src='foo.js') + script(src='bar.js') diff --git a/src/test-data/pug-linker/test/cases-src/some-included.styl b/src/test-data/pug-linker/test/cases-src/some-included.styl new file mode 100644 index 0000000..7458543 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/some-included.styl @@ -0,0 +1,2 @@ +body + padding 10px diff --git a/src/test-data/pug-linker/test/cases-src/some.md b/src/test-data/pug-linker/test/cases-src/some.md new file mode 100644 index 0000000..8ea3e54 --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/some.md @@ -0,0 +1,3 @@ +Just _some_ markdown **tests**. + +With new line. diff --git a/src/test-data/pug-linker/test/cases-src/some.styl b/src/test-data/pug-linker/test/cases-src/some.styl new file mode 100644 index 0000000..f77222d --- /dev/null +++ b/src/test-data/pug-linker/test/cases-src/some.styl @@ -0,0 +1 @@ +@import "some-included" diff --git a/src/test-data/pug-linker/test/cases/include-extends-from-root.input.json b/src/test-data/pug-linker/test/cases/include-extends-from-root.input.json new file mode 100644 index 0000000..dc58773 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-extends-from-root.input.json @@ -0,0 +1,201 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 1, + "filename": "include-extends-from-root.pug", + "path": "/auxiliary/extends-from-root.pug", + "fullPath": "auxiliary/extends-from-root.pug", + "str": "extends /auxiliary/layout.pug\n\nblock content\n include /auxiliary/include-from-root.pug\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "/auxiliary/layout.pug", + "line": 1, + "filename": "auxiliary/extends-from-root.pug", + "fullPath": "auxiliary/layout.pug", + "str": "html\n head\n title My Application\n block head\n body\n block content", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "head", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "title", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "My Application", + "line": 3, + "filename": "auxiliary/layout.pug" + } + ], + "line": 3, + "filename": "auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "auxiliary/layout.pug" + }, + { + "type": "NamedBlock", + "nodes": [], + "line": 4, + "filename": "auxiliary/layout.pug", + "name": "head", + "mode": "replace" + } + ], + "line": 2, + "filename": "auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "auxiliary/layout.pug" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 6, + "filename": "auxiliary/layout.pug", + "name": "content", + "mode": "replace" + } + ], + "line": 5, + "filename": "auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "auxiliary/layout.pug" + } + ], + "line": 1, + "filename": "auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "auxiliary/layout.pug" + } + ], + "line": 0, + "filename": "auxiliary/layout.pug" + } + }, + "line": 1, + "filename": "auxiliary/extends-from-root.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 4, + "filename": "auxiliary/extends-from-root.pug", + "path": "/auxiliary/include-from-root.pug", + "fullPath": "auxiliary/include-from-root.pug", + "str": "h1 hello", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "h1", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "hello", + "line": 1, + "filename": "auxiliary/include-from-root.pug" + } + ], + "line": 1, + "filename": "auxiliary/include-from-root.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "auxiliary/include-from-root.pug" + } + ], + "line": 0, + "filename": "auxiliary/include-from-root.pug" + } + }, + "line": 4, + "filename": "auxiliary/extends-from-root.pug", + "block": { + "type": "Block", + "nodes": [], + "line": 4, + "filename": "auxiliary/extends-from-root.pug" + } + } + ], + "line": 3, + "filename": "auxiliary/extends-from-root.pug", + "name": "content", + "mode": "replace" + } + ], + "line": 0, + "filename": "auxiliary/extends-from-root.pug" + } + }, + "line": 1, + "filename": "include-extends-from-root.pug", + "block": { + "type": "Block", + "nodes": [], + "line": 1, + "filename": "include-extends-from-root.pug" + } + } + ], + "line": 0, + "filename": "include-extends-from-root.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-extends-of-common-template.input.json b/src/test-data/pug-linker/test/cases/include-extends-of-common-template.input.json new file mode 100644 index 0000000..a20f7f2 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-extends-of-common-template.input.json @@ -0,0 +1,179 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 1, + "filename": "include-extends-of-common-template.pug", + "path": "auxiliary/extends-empty-block-1.pug", + "fullPath": "auxiliary/extends-empty-block-1.pug", + "str": "extends empty-block.pug\n\nblock test\n div test1\n\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "empty-block.pug", + "line": 1, + "filename": "auxiliary/extends-empty-block-1.pug", + "fullPath": "auxiliary/empty-block.pug", + "str": "block test\n\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 1, + "filename": "auxiliary/empty-block.pug", + "name": "test", + "mode": "replace" + } + ], + "line": 0, + "filename": "auxiliary/empty-block.pug" + } + }, + "line": 1, + "filename": "auxiliary/extends-empty-block-1.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "div", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "test1", + "line": 4, + "filename": "auxiliary/extends-empty-block-1.pug" + } + ], + "line": 4, + "filename": "auxiliary/extends-empty-block-1.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "auxiliary/extends-empty-block-1.pug" + } + ], + "line": 3, + "filename": "auxiliary/extends-empty-block-1.pug", + "name": "test", + "mode": "replace" + } + ], + "line": 0, + "filename": "auxiliary/extends-empty-block-1.pug" + } + }, + "line": 1, + "filename": "include-extends-of-common-template.pug", + "block": { + "type": "Block", + "nodes": [], + "line": 1, + "filename": "include-extends-of-common-template.pug" + } + }, + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 2, + "filename": "include-extends-of-common-template.pug", + "path": "auxiliary/extends-empty-block-2.pug", + "fullPath": "auxiliary/extends-empty-block-2.pug", + "str": "extends empty-block.pug\n\nblock test\n div test2\n\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "empty-block.pug", + "line": 1, + "filename": "auxiliary/extends-empty-block-2.pug", + "fullPath": "auxiliary/empty-block.pug", + "str": "block test\n\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 1, + "filename": "auxiliary/empty-block.pug", + "name": "test", + "mode": "replace" + } + ], + "line": 0, + "filename": "auxiliary/empty-block.pug" + } + }, + "line": 1, + "filename": "auxiliary/extends-empty-block-2.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "div", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "test2", + "line": 4, + "filename": "auxiliary/extends-empty-block-2.pug" + } + ], + "line": 4, + "filename": "auxiliary/extends-empty-block-2.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "auxiliary/extends-empty-block-2.pug" + } + ], + "line": 3, + "filename": "auxiliary/extends-empty-block-2.pug", + "name": "test", + "mode": "replace" + } + ], + "line": 0, + "filename": "auxiliary/extends-empty-block-2.pug" + } + }, + "line": 2, + "filename": "include-extends-of-common-template.pug", + "block": { + "type": "Block", + "nodes": [], + "line": 2, + "filename": "include-extends-of-common-template.pug" + } + } + ], + "line": 0, + "filename": "include-extends-of-common-template.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-extends-relative.input.json b/src/test-data/pug-linker/test/cases/include-extends-relative.input.json new file mode 100644 index 0000000..7f3d560 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-extends-relative.input.json @@ -0,0 +1,166 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 1, + "filename": "include-extends-relative.pug", + "path": "../cases-src/auxiliary/extends-relative.pug", + "fullPath": "../cases-src/auxiliary/extends-relative.pug", + "str": "extends ../../cases-src/auxiliary/layout\n\nblock content\n include ../../cases-src/auxiliary/include-from-root\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "../../cases-src/auxiliary/layout", + "line": 1, + "filename": "../cases-src/auxiliary/extends-relative.pug", + "fullPath": "../cases-src/auxiliary/layout.pug", + "str": "html\n head\n title My Application\n block head\n body\n block content", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "head", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "title", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "My Application", + "line": 3, + "filename": "../cases-src/auxiliary/layout.pug" + } + ], + "line": 3, + "filename": "../cases-src/auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "../cases-src/auxiliary/layout.pug" + }, + { + "type": "NamedBlock", + "nodes": [], + "line": 4, + "filename": "../cases-src/auxiliary/layout.pug", + "name": "head", + "mode": "replace" + } + ], + "line": 2, + "filename": "../cases-src/auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "../cases-src/auxiliary/layout.pug" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 6, + "filename": "../cases-src/auxiliary/layout.pug", + "name": "content", + "mode": "replace" + } + ], + "line": 5, + "filename": "../cases-src/auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../cases-src/auxiliary/layout.pug" + } + ], + "line": 1, + "filename": "../cases-src/auxiliary/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "../cases-src/auxiliary/layout.pug" + } + ], + "line": 0, + "filename": "../cases-src/auxiliary/layout.pug" + } + }, + "line": 1, + "filename": "../cases-src/auxiliary/extends-relative.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 4, + "filename": "../cases-src/auxiliary/extends-relative.pug", + "path": "../../cases-src/auxiliary/include-from-root", + "fullPath": "../cases-src/auxiliary/include-from-root.pug", + "str": "h1 hello" + }, + "line": 4, + "filename": "../cases-src/auxiliary/extends-relative.pug", + "filters": [] + } + ], + "line": 3, + "filename": "../cases-src/auxiliary/extends-relative.pug", + "name": "content", + "mode": "replace" + } + ], + "line": 0, + "filename": "../cases-src/auxiliary/extends-relative.pug" + } + }, + "line": 1, + "filename": "include-extends-relative.pug", + "block": { + "type": "Block", + "nodes": [], + "line": 1, + "filename": "include-extends-relative.pug" + } + } + ], + "line": 0, + "filename": "include-extends-relative.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-filter-stylus.input.json b/src/test-data/pug-linker/test/cases/include-filter-stylus.input.json new file mode 100644 index 0000000..3145a07 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-filter-stylus.input.json @@ -0,0 +1,52 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "style", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 2, + "filename": "include-filter-stylus.pug", + "path": "some.styl", + "fullPath": "some.styl", + "str": "@import \"some-included\"\n" + }, + "line": 2, + "filename": "include-filter-stylus.pug", + "filters": [ + { + "type": "IncludeFilter", + "name": "stylus", + "attrs": [], + "line": 2, + "filename": "include-filter-stylus.pug" + } + ] + } + ], + "line": 1, + "filename": "include-filter-stylus.pug" + }, + "attrs": [ + { + "name": "type", + "val": "\"text/css\"", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "include-filter-stylus.pug" + } + ], + "line": 0, + "filename": "include-filter-stylus.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-filter.input.json b/src/test-data/pug-linker/test/cases/include-filter.input.json new file mode 100644 index 0000000..1f5d0c4 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-filter.input.json @@ -0,0 +1,153 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 3, + "filename": "include-filter.pug", + "path": "some.md", + "fullPath": "some.md", + "str": "Just _some_ markdown **tests**.\n\nWith new line.\n" + }, + "line": 3, + "filename": "include-filter.pug", + "filters": [ + { + "type": "IncludeFilter", + "name": "markdown-it", + "attrs": [], + "line": 3, + "filename": "include-filter.pug" + } + ] + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 5, + "filename": "include-filter.pug", + "path": "include-filter-coffee.coffee", + "fullPath": "include-filter-coffee.coffee", + "str": "math =\n square: (value) -> value * value\n" + }, + "line": 5, + "filename": "include-filter.pug", + "filters": [ + { + "type": "IncludeFilter", + "name": "coffee-script", + "attrs": [ + { + "name": "minify", + "val": "true", + "mustEscape": true + } + ], + "line": 5, + "filename": "include-filter.pug" + } + ] + } + ], + "line": 4, + "filename": "include-filter.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "include-filter.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 7, + "filename": "include-filter.pug", + "path": "include-filter-coffee.coffee", + "fullPath": "include-filter-coffee.coffee", + "str": "math =\n square: (value) -> value * value\n" + }, + "line": 7, + "filename": "include-filter.pug", + "filters": [ + { + "type": "IncludeFilter", + "name": "coffee-script", + "attrs": [ + { + "name": "minify", + "val": "false", + "mustEscape": true + } + ], + "line": 7, + "filename": "include-filter.pug" + } + ] + } + ], + "line": 6, + "filename": "include-filter.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "include-filter.pug" + } + ], + "line": 2, + "filename": "include-filter.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "include-filter.pug" + } + ], + "line": 1, + "filename": "include-filter.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "include-filter.pug" + } + ], + "line": 0, + "filename": "include-filter.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-only-text-body.input.json b/src/test-data/pug-linker/test/cases/include-only-text-body.input.json new file mode 100644 index 0000000..82d7656 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-only-text-body.input.json @@ -0,0 +1,24 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "The message is \"", + "line": 1, + "filename": "include-only-text-body.pug" + }, + { + "type": "YieldBlock", + "line": 2, + "filename": "include-only-text-body.pug" + }, + { + "type": "Text", + "val": "\"", + "line": 3, + "filename": "include-only-text-body.pug" + } + ], + "line": 0, + "filename": "include-only-text-body.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-only-text.input.json b/src/test-data/pug-linker/test/cases/include-only-text.input.json new file mode 100644 index 0000000..84d010a --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-only-text.input.json @@ -0,0 +1,125 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 4, + "filename": "include-only-text.pug", + "path": "include-only-text-body.pug", + "fullPath": "include-only-text-body.pug", + "str": "| The message is \"\nyield\n| \"\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "The message is \"", + "line": 1, + "filename": "include-only-text-body.pug" + }, + { + "type": "YieldBlock", + "line": 2, + "filename": "include-only-text-body.pug" + }, + { + "type": "Text", + "val": "\"", + "line": 3, + "filename": "include-only-text-body.pug" + } + ], + "line": 0, + "filename": "include-only-text-body.pug" + } + }, + "line": 4, + "filename": "include-only-text.pug", + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "em", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "hello world", + "line": 5, + "filename": "include-only-text.pug" + } + ], + "line": 5, + "filename": "include-only-text.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": true, + "line": 5, + "filename": "include-only-text.pug" + } + ], + "line": 5, + "filename": "include-only-text.pug" + } + } + ], + "line": 3, + "filename": "include-only-text.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "include-only-text.pug" + } + ], + "line": 2, + "filename": "include-only-text.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "include-only-text.pug" + } + ], + "line": 1, + "filename": "include-only-text.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "include-only-text.pug" + } + ], + "line": 0, + "filename": "include-only-text.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-with-text-head.input.json b/src/test-data/pug-linker/test/cases/include-with-text-head.input.json new file mode 100644 index 0000000..03d7151 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-with-text-head.input.json @@ -0,0 +1,53 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "head", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "alert('hello world');", + "line": 3 + } + ], + "line": 2, + "filename": "include-with-text-head.pug" + }, + "attrs": [ + { + "name": "type", + "val": "'text/javascript'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "include-with-text-head.pug", + "textOnly": true + } + ], + "line": 1, + "filename": "include-with-text-head.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "include-with-text-head.pug" + } + ], + "line": 0, + "filename": "include-with-text-head.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include-with-text.input.json b/src/test-data/pug-linker/test/cases/include-with-text.input.json new file mode 100644 index 0000000..128c078 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include-with-text.input.json @@ -0,0 +1,141 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 2, + "filename": "include-with-text.pug", + "path": "include-with-text-head.pug", + "fullPath": "include-with-text-head.pug", + "str": "head\n script(type='text/javascript').\n alert('hello world');\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "head", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "alert('hello world');", + "line": 3 + } + ], + "line": 2, + "filename": "include-with-text-head.pug" + }, + "attrs": [ + { + "name": "type", + "val": "'text/javascript'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "include-with-text-head.pug", + "textOnly": true + } + ], + "line": 1, + "filename": "include-with-text-head.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "include-with-text-head.pug" + } + ], + "line": 0, + "filename": "include-with-text-head.pug" + } + }, + "line": 2, + "filename": "include-with-text.pug", + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 3, + "filename": "include-with-text.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'/caustic.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "include-with-text.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 4, + "filename": "include-with-text.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'/app.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "include-with-text.pug" + } + ], + "line": 3, + "filename": "include-with-text.pug" + } + } + ], + "line": 1, + "filename": "include-with-text.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "include-with-text.pug" + } + ], + "line": 0, + "filename": "include-with-text.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include.script.input.json b/src/test-data/pug-linker/test/cases/include.script.input.json new file mode 100644 index 0000000..315b120 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include.script.input.json @@ -0,0 +1,130 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 2, + "filename": "include.script.pug", + "path": "auxiliary/pet.pug", + "fullPath": "auxiliary/pet.pug", + "str": ".pet\n h1 {{name}}\n p {{name}} is a {{species}} that is {{age}} old", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "div", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "h1", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "{{name}}", + "line": 2, + "filename": "auxiliary/pet.pug" + } + ], + "line": 2, + "filename": "auxiliary/pet.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "auxiliary/pet.pug" + }, + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "{{name}} is a {{species}} that is {{age}} old", + "line": 3, + "filename": "auxiliary/pet.pug" + } + ], + "line": 3, + "filename": "auxiliary/pet.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "auxiliary/pet.pug" + } + ], + "line": 1, + "filename": "auxiliary/pet.pug" + }, + "attrs": [ + { + "name": "class", + "val": "'pet'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "auxiliary/pet.pug" + } + ], + "line": 0, + "filename": "auxiliary/pet.pug" + } + }, + "line": 2, + "filename": "include.script.pug", + "block": { + "type": "Block", + "nodes": [], + "line": 2, + "filename": "include.script.pug" + } + } + ], + "line": 1, + "filename": "include.script.pug" + }, + "attrs": [ + { + "name": "id", + "val": "'pet-template'", + "mustEscape": false + }, + { + "name": "type", + "val": "'text/x-template'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "include.script.pug" + } + ], + "line": 0, + "filename": "include.script.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/include.yield.nested.input.json b/src/test-data/pug-linker/test/cases/include.yield.nested.input.json new file mode 100644 index 0000000..3c69e4c --- /dev/null +++ b/src/test-data/pug-linker/test/cases/include.yield.nested.input.json @@ -0,0 +1,260 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 2, + "filename": "include.yield.nested.pug", + "path": "auxiliary/yield-nested.pug", + "fullPath": "auxiliary/yield-nested.pug", + "str": "html\n head\n title\n body\n h1 Page\n #content\n #content-wrapper\n yield\n #footer\n stuff", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "head", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "title", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 3, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 2, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "auxiliary/yield-nested.pug" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "h1", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "Page", + "line": 5, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 5, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "auxiliary/yield-nested.pug" + }, + { + "type": "Tag", + "name": "div", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "div", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "YieldBlock", + "line": 8, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 7, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [ + { + "name": "id", + "val": "'content-wrapper'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 7, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 6, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [ + { + "name": "id", + "val": "'content'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "auxiliary/yield-nested.pug" + }, + { + "type": "Tag", + "name": "div", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "stuff", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 10, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 10, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 9, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [ + { + "name": "id", + "val": "'footer'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 9, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 4, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 1, + "filename": "auxiliary/yield-nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "auxiliary/yield-nested.pug" + } + ], + "line": 0, + "filename": "auxiliary/yield-nested.pug" + } + }, + "line": 2, + "filename": "include.yield.nested.pug", + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "some content", + "line": 3, + "filename": "include.yield.nested.pug" + } + ], + "line": 3, + "filename": "include.yield.nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "include.yield.nested.pug" + }, + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "and some more", + "line": 4, + "filename": "include.yield.nested.pug" + } + ], + "line": 4, + "filename": "include.yield.nested.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "include.yield.nested.pug" + } + ], + "line": 3, + "filename": "include.yield.nested.pug" + } + } + ], + "line": 0, + "filename": "include.yield.nested.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/includes-with-ext-js.input.json b/src/test-data/pug-linker/test/cases/includes-with-ext-js.input.json new file mode 100644 index 0000000..cd88d12 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/includes-with-ext-js.input.json @@ -0,0 +1,55 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "pre", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "code", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 3, + "filename": "includes-with-ext-js.pug", + "path": "javascript-new-lines.js", + "fullPath": "javascript-new-lines.js", + "str": "var x = \"\\n here is some \\n new lined text\";\n" + }, + "line": 3, + "filename": "includes-with-ext-js.pug", + "filters": [] + } + ], + "line": 2, + "filename": "includes-with-ext-js.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": true, + "line": 2, + "filename": "includes-with-ext-js.pug" + } + ], + "line": 1, + "filename": "includes-with-ext-js.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 1, + "filename": "includes-with-ext-js.pug" + } + ], + "line": 0, + "filename": "includes-with-ext-js.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/includes.input.json b/src/test-data/pug-linker/test/cases/includes.input.json new file mode 100644 index 0000000..79d5f89 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/includes.input.json @@ -0,0 +1,172 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Include", + "file": { + "type": "FileReference", + "line": 2, + "filename": "includes.pug", + "path": "auxiliary/mixins.pug", + "fullPath": "auxiliary/mixins.pug", + "str": "\nmixin foo()\n p bar", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Mixin", + "name": "foo", + "args": null, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "bar", + "line": 3, + "filename": "auxiliary/mixins.pug" + } + ], + "line": 3, + "filename": "auxiliary/mixins.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 3, + "filename": "auxiliary/mixins.pug" + } + ], + "line": 3, + "filename": "auxiliary/mixins.pug" + }, + "call": false, + "line": 2, + "filename": "auxiliary/mixins.pug" + } + ], + "line": 0, + "filename": "auxiliary/mixins.pug" + } + }, + "line": 2, + "filename": "includes.pug", + "block": { + "type": "Block", + "nodes": [], + "line": 2, + "filename": "includes.pug" + } + }, + { + "type": "Mixin", + "name": "foo", + "args": null, + "block": null, + "call": true, + "attrs": [], + "attributeBlocks": [], + "line": 4, + "filename": "includes.pug" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 7, + "filename": "includes.pug", + "path": "auxiliary/smile.html", + "fullPath": "auxiliary/smile.html", + "str": ":)
\n" + }, + "line": 7, + "filename": "includes.pug", + "filters": [] + }, + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 8, + "filename": "includes.pug", + "path": "auxiliary/escapes.html", + "fullPath": "auxiliary/escapes.html", + "str": "\n" + }, + "line": 8, + "filename": "includes.pug", + "filters": [] + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "RawInclude", + "file": { + "type": "FileReference", + "line": 10, + "filename": "includes.pug", + "path": "auxiliary/includable.js", + "fullPath": "auxiliary/includable.js", + "str": "var STRING_SUBSTITUTIONS = { // table of character substitutions\n '\\t': '\\\\t',\n '\\r': '\\\\r',\n '\\n': '\\\\n',\n '\"' : '\\\\\"',\n '\\\\': '\\\\\\\\'\n};" + }, + "line": 10, + "filename": "includes.pug", + "filters": [ + { + "type": "IncludeFilter", + "name": "verbatim", + "attrs": [], + "line": 10, + "filename": "includes.pug" + } + ] + } + ], + "line": 9, + "filename": "includes.pug" + }, + "attrs": [ + { + "name": "type", + "val": "\"text/javascript\"", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 9, + "filename": "includes.pug" + } + ], + "line": 6, + "filename": "includes.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "includes.pug" + } + ], + "line": 0, + "filename": "includes.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/layout.append.input.json b/src/test-data/pug-linker/test/cases/layout.append.input.json new file mode 100644 index 0000000..2b8879a --- /dev/null +++ b/src/test-data/pug-linker/test/cases/layout.append.input.json @@ -0,0 +1,226 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "../fixtures/append/app-layout.pug", + "line": 2, + "filename": "layout.append.pug", + "fullPath": "../fixtures/append/app-layout.pug", + "str": "\nextends layout\n\nblock append head\n script(src='app.js')", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "layout", + "line": 2, + "filename": "../fixtures/append/app-layout.pug", + "fullPath": "../fixtures/append/layout.pug", + "str": "\nhtml\n block head\n script(src='vendor/jquery.js')\n script(src='vendor/caustic.js')\n body\n block body", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 4, + "filename": "../fixtures/append/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/jquery.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "../fixtures/append/layout.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/append/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/caustic.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/append/layout.pug" + } + ], + "line": 3, + "filename": "../fixtures/append/layout.pug", + "name": "head", + "mode": "replace" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 7, + "filename": "../fixtures/append/layout.pug", + "name": "body", + "mode": "replace" + } + ], + "line": 6, + "filename": "../fixtures/append/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "../fixtures/append/layout.pug" + } + ], + "line": 2, + "filename": "../fixtures/append/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "../fixtures/append/layout.pug" + } + ], + "line": 0, + "filename": "../fixtures/append/layout.pug" + } + }, + "line": 2, + "filename": "../fixtures/append/app-layout.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/append/app-layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'app.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/append/app-layout.pug" + } + ], + "line": 4, + "filename": "../fixtures/append/app-layout.pug", + "name": "head", + "mode": "append" + } + ], + "line": 0, + "filename": "../fixtures/append/app-layout.pug" + } + }, + "line": 2, + "filename": "layout.append.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "layout.append.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'foo.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "layout.append.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 6, + "filename": "layout.append.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'bar.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "layout.append.pug" + } + ], + "line": 4, + "filename": "layout.append.pug", + "name": "head", + "mode": "append" + } + ], + "line": 0, + "filename": "layout.append.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/layout.append.without-block.input.json b/src/test-data/pug-linker/test/cases/layout.append.without-block.input.json new file mode 100644 index 0000000..4fc3d87 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/layout.append.without-block.input.json @@ -0,0 +1,226 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "../fixtures/append-without-block/app-layout.pug", + "line": 2, + "filename": "layout.append.without-block.pug", + "fullPath": "../fixtures/append-without-block/app-layout.pug", + "str": "\nextends layout.pug\n\nappend head\n script(src='app.js')\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "layout.pug", + "line": 2, + "filename": "../fixtures/append-without-block/app-layout.pug", + "fullPath": "../fixtures/append-without-block/layout.pug", + "str": "\nhtml\n block head\n script(src='vendor/jquery.js')\n script(src='vendor/caustic.js')\n body\n block body", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 4, + "filename": "../fixtures/append-without-block/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/jquery.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "../fixtures/append-without-block/layout.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/append-without-block/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/caustic.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/append-without-block/layout.pug" + } + ], + "line": 3, + "filename": "../fixtures/append-without-block/layout.pug", + "name": "head", + "mode": "replace" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 7, + "filename": "../fixtures/append-without-block/layout.pug", + "name": "body", + "mode": "replace" + } + ], + "line": 6, + "filename": "../fixtures/append-without-block/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "../fixtures/append-without-block/layout.pug" + } + ], + "line": 2, + "filename": "../fixtures/append-without-block/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "../fixtures/append-without-block/layout.pug" + } + ], + "line": 0, + "filename": "../fixtures/append-without-block/layout.pug" + } + }, + "line": 2, + "filename": "../fixtures/append-without-block/app-layout.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/append-without-block/app-layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'app.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/append-without-block/app-layout.pug" + } + ], + "line": 4, + "filename": "../fixtures/append-without-block/app-layout.pug", + "name": "head", + "mode": "append" + } + ], + "line": 0, + "filename": "../fixtures/append-without-block/app-layout.pug" + } + }, + "line": 2, + "filename": "layout.append.without-block.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "layout.append.without-block.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'foo.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "layout.append.without-block.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 6, + "filename": "layout.append.without-block.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'bar.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "layout.append.without-block.pug" + } + ], + "line": 4, + "filename": "layout.append.without-block.pug", + "name": "head", + "mode": "append" + } + ], + "line": 0, + "filename": "layout.append.without-block.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/layout.multi.append.prepend.block.input.json b/src/test-data/pug-linker/test/cases/layout.multi.append.prepend.block.input.json new file mode 100644 index 0000000..cdd8d01 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/layout.multi.append.prepend.block.input.json @@ -0,0 +1,365 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "../fixtures/multi-append-prepend-block/redefine.pug", + "line": 1, + "filename": "layout.multi.append.prepend.block.pug", + "fullPath": "../fixtures/multi-append-prepend-block/redefine.pug", + "str": "extends root.pug\n\nblock content\n\t.content\n\t\t| Defined content\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "root.pug", + "line": 1, + "filename": "../fixtures/multi-append-prepend-block/redefine.pug", + "fullPath": "../fixtures/multi-append-prepend-block/root.pug", + "str": "block content\n\t| default content\n\nblock head\n\tscript(src='/app.js')", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Text", + "val": "default content", + "line": 2, + "filename": "../fixtures/multi-append-prepend-block/root.pug" + } + ], + "line": 1, + "filename": "../fixtures/multi-append-prepend-block/root.pug", + "name": "content", + "mode": "replace" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/multi-append-prepend-block/root.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'/app.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/multi-append-prepend-block/root.pug" + } + ], + "line": 4, + "filename": "../fixtures/multi-append-prepend-block/root.pug", + "name": "head", + "mode": "replace" + } + ], + "line": 0, + "filename": "../fixtures/multi-append-prepend-block/root.pug" + } + }, + "line": 1, + "filename": "../fixtures/multi-append-prepend-block/redefine.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "div", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "Defined content", + "line": 5, + "filename": "../fixtures/multi-append-prepend-block/redefine.pug" + } + ], + "line": 4, + "filename": "../fixtures/multi-append-prepend-block/redefine.pug" + }, + "attrs": [ + { + "name": "class", + "val": "'content'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "../fixtures/multi-append-prepend-block/redefine.pug" + } + ], + "line": 3, + "filename": "../fixtures/multi-append-prepend-block/redefine.pug", + "name": "content", + "mode": "replace" + } + ], + "line": 0, + "filename": "../fixtures/multi-append-prepend-block/redefine.pug" + } + }, + "line": 1, + "filename": "layout.multi.append.prepend.block.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "Something appended to content", + "line": 4, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 4, + "filename": "layout.multi.append.prepend.block.pug" + }, + "attrs": [ + { + "name": "class", + "val": "'first'", + "mustEscape": false + }, + { + "name": "class", + "val": "'append'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 3, + "filename": "layout.multi.append.prepend.block.pug", + "name": "content", + "mode": "append" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "Something prepended to content", + "line": 7, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 7, + "filename": "layout.multi.append.prepend.block.pug" + }, + "attrs": [ + { + "name": "class", + "val": "'first'", + "mustEscape": false + }, + { + "name": "class", + "val": "'prepend'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 7, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 6, + "filename": "layout.multi.append.prepend.block.pug", + "name": "content", + "mode": "prepend" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "Last append must be most last", + "line": 10, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 10, + "filename": "layout.multi.append.prepend.block.pug" + }, + "attrs": [ + { + "name": "class", + "val": "'last'", + "mustEscape": false + }, + { + "name": "class", + "val": "'append'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 10, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 9, + "filename": "layout.multi.append.prepend.block.pug", + "name": "content", + "mode": "append" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "p", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "Text", + "val": "Last prepend must appear at top", + "line": 13, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 13, + "filename": "layout.multi.append.prepend.block.pug" + }, + "attrs": [ + { + "name": "class", + "val": "'last'", + "mustEscape": false + }, + { + "name": "class", + "val": "'prepend'", + "mustEscape": false + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 13, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 12, + "filename": "layout.multi.append.prepend.block.pug", + "name": "content", + "mode": "prepend" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 16, + "filename": "layout.multi.append.prepend.block.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'jquery.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 16, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 15, + "filename": "layout.multi.append.prepend.block.pug", + "name": "head", + "mode": "append" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 19, + "filename": "layout.multi.append.prepend.block.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'foo.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 19, + "filename": "layout.multi.append.prepend.block.pug" + } + ], + "line": 18, + "filename": "layout.multi.append.prepend.block.pug", + "name": "head", + "mode": "prepend" + } + ], + "line": 0, + "filename": "layout.multi.append.prepend.block.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/layout.prepend.input.json b/src/test-data/pug-linker/test/cases/layout.prepend.input.json new file mode 100644 index 0000000..44a5cc0 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/layout.prepend.input.json @@ -0,0 +1,226 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "../fixtures/prepend/app-layout.pug", + "line": 2, + "filename": "layout.prepend.pug", + "fullPath": "../fixtures/prepend/app-layout.pug", + "str": "\nextends layout.pug\n\nblock prepend head\n script(src='app.js')\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "layout.pug", + "line": 2, + "filename": "../fixtures/prepend/app-layout.pug", + "fullPath": "../fixtures/prepend/layout.pug", + "str": "\nhtml\n block head\n script(src='vendor/jquery.js')\n script(src='vendor/caustic.js')\n body\n block body", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 4, + "filename": "../fixtures/prepend/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/jquery.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "../fixtures/prepend/layout.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/prepend/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/caustic.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/prepend/layout.pug" + } + ], + "line": 3, + "filename": "../fixtures/prepend/layout.pug", + "name": "head", + "mode": "replace" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 7, + "filename": "../fixtures/prepend/layout.pug", + "name": "body", + "mode": "replace" + } + ], + "line": 6, + "filename": "../fixtures/prepend/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "../fixtures/prepend/layout.pug" + } + ], + "line": 2, + "filename": "../fixtures/prepend/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "../fixtures/prepend/layout.pug" + } + ], + "line": 0, + "filename": "../fixtures/prepend/layout.pug" + } + }, + "line": 2, + "filename": "../fixtures/prepend/app-layout.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/prepend/app-layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'app.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/prepend/app-layout.pug" + } + ], + "line": 4, + "filename": "../fixtures/prepend/app-layout.pug", + "name": "head", + "mode": "prepend" + } + ], + "line": 0, + "filename": "../fixtures/prepend/app-layout.pug" + } + }, + "line": 2, + "filename": "layout.prepend.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "layout.prepend.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'foo.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "layout.prepend.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 6, + "filename": "layout.prepend.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'bar.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "layout.prepend.pug" + } + ], + "line": 4, + "filename": "layout.prepend.pug", + "name": "head", + "mode": "prepend" + } + ], + "line": 0, + "filename": "layout.prepend.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/cases/layout.prepend.without-block.input.json b/src/test-data/pug-linker/test/cases/layout.prepend.without-block.input.json new file mode 100644 index 0000000..d94e193 --- /dev/null +++ b/src/test-data/pug-linker/test/cases/layout.prepend.without-block.input.json @@ -0,0 +1,226 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "../fixtures/prepend-without-block/app-layout.pug", + "line": 2, + "filename": "layout.prepend.without-block.pug", + "fullPath": "../fixtures/prepend-without-block/app-layout.pug", + "str": "\nextends layout.pug\n\nprepend head\n script(src='app.js')\n", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "layout.pug", + "line": 2, + "filename": "../fixtures/prepend-without-block/app-layout.pug", + "fullPath": "../fixtures/prepend-without-block/layout.pug", + "str": "\nhtml\n block head\n script(src='vendor/jquery.js')\n script(src='vendor/caustic.js')\n body\n block body", + "ast": { + "type": "Block", + "nodes": [ + { + "type": "Tag", + "name": "html", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 4, + "filename": "../fixtures/prepend-without-block/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/jquery.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 4, + "filename": "../fixtures/prepend-without-block/layout.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/prepend-without-block/layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'vendor/caustic.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/prepend-without-block/layout.pug" + } + ], + "line": 3, + "filename": "../fixtures/prepend-without-block/layout.pug", + "name": "head", + "mode": "replace" + }, + { + "type": "Tag", + "name": "body", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [ + { + "type": "NamedBlock", + "nodes": [], + "line": 7, + "filename": "../fixtures/prepend-without-block/layout.pug", + "name": "body", + "mode": "replace" + } + ], + "line": 6, + "filename": "../fixtures/prepend-without-block/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "../fixtures/prepend-without-block/layout.pug" + } + ], + "line": 2, + "filename": "../fixtures/prepend-without-block/layout.pug" + }, + "attrs": [], + "attributeBlocks": [], + "isInline": false, + "line": 2, + "filename": "../fixtures/prepend-without-block/layout.pug" + } + ], + "line": 0, + "filename": "../fixtures/prepend-without-block/layout.pug" + } + }, + "line": 2, + "filename": "../fixtures/prepend-without-block/app-layout.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "../fixtures/prepend-without-block/app-layout.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'app.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "../fixtures/prepend-without-block/app-layout.pug" + } + ], + "line": 4, + "filename": "../fixtures/prepend-without-block/app-layout.pug", + "name": "head", + "mode": "prepend" + } + ], + "line": 0, + "filename": "../fixtures/prepend-without-block/app-layout.pug" + } + }, + "line": 2, + "filename": "layout.prepend.without-block.pug" + }, + { + "type": "NamedBlock", + "nodes": [ + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 5, + "filename": "layout.prepend.without-block.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'foo.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 5, + "filename": "layout.prepend.without-block.pug" + }, + { + "type": "Tag", + "name": "script", + "selfClosing": false, + "block": { + "type": "Block", + "nodes": [], + "line": 6, + "filename": "layout.prepend.without-block.pug" + }, + "attrs": [ + { + "name": "src", + "val": "'bar.js'", + "mustEscape": true + } + ], + "attributeBlocks": [], + "isInline": false, + "line": 6, + "filename": "layout.prepend.without-block.pug" + } + ], + "line": 4, + "filename": "layout.prepend.without-block.pug", + "name": "head", + "mode": "prepend" + } + ], + "line": 0, + "filename": "layout.prepend.without-block.pug" +} \ No newline at end of file diff --git a/src/test-data/pug-linker/test/errors-src/child-with-tags.pug b/src/test-data/pug-linker/test/errors-src/child-with-tags.pug new file mode 100644 index 0000000..fb439dd --- /dev/null +++ b/src/test-data/pug-linker/test/errors-src/child-with-tags.pug @@ -0,0 +1,6 @@ +extend ../fixtures/layout + +block body + p Hello world! + +p BAD!!! diff --git a/src/test-data/pug-linker/test/errors-src/extends-not-first.pug b/src/test-data/pug-linker/test/errors-src/extends-not-first.pug new file mode 100644 index 0000000..47249bc --- /dev/null +++ b/src/test-data/pug-linker/test/errors-src/extends-not-first.pug @@ -0,0 +1,4 @@ +block body + p Hey + +extends ../fixtures/layout diff --git a/src/test-data/pug-linker/test/errors-src/unexpected-block.pug b/src/test-data/pug-linker/test/errors-src/unexpected-block.pug new file mode 100644 index 0000000..5d56192 --- /dev/null +++ b/src/test-data/pug-linker/test/errors-src/unexpected-block.pug @@ -0,0 +1,4 @@ +extends ../fixtures/empty.pug + +block foo + div Hello World diff --git a/src/test-data/pug-linker/test/errors/child-with-tags.input.json b/src/test-data/pug-linker/test/errors/child-with-tags.input.json new file mode 100644 index 0000000..8875e2e --- /dev/null +++ b/src/test-data/pug-linker/test/errors/child-with-tags.input.json @@ -0,0 +1,163 @@ +{ + "type": "Block", + "nodes": [ + { + "type": "Extends", + "file": { + "type": "FileReference", + "path": "../fixtures/layout", + "line": 1, + "filename": "child-with-tags.pug", + "fullPath": "../fixtures/layout.pug", + "str": "doctype\n\nhtml\n head\n block head\n:)
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/auxiliary/window.pug b/src/test-data/pug/test/cases/auxiliary/window.pug new file mode 100644 index 0000000..7ab7132 --- /dev/null +++ b/src/test-data/pug/test/cases/auxiliary/window.pug @@ -0,0 +1,4 @@ + +.window + a(href='#').close Close + block window-content \ No newline at end of file diff --git a/src/test-data/pug/test/cases/auxiliary/yield-nested.pug b/src/test-data/pug/test/cases/auxiliary/yield-nested.pug new file mode 100644 index 0000000..0771c0a --- /dev/null +++ b/src/test-data/pug/test/cases/auxiliary/yield-nested.pug @@ -0,0 +1,10 @@ +html + head + title + body + h1 Page + #content + #content-wrapper + yield + #footer + stuff \ No newline at end of file diff --git a/src/test-data/pug/test/cases/basic.html b/src/test-data/pug/test/cases/basic.html new file mode 100644 index 0000000..a01532a --- /dev/null +++ b/src/test-data/pug/test/cases/basic.html @@ -0,0 +1,5 @@ + + +Title
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/basic.pug b/src/test-data/pug/test/cases/basic.pug new file mode 100644 index 0000000..77066d1 --- /dev/null +++ b/src/test-data/pug/test/cases/basic.pug @@ -0,0 +1,3 @@ +html + body + h1 Title \ No newline at end of file diff --git a/src/test-data/pug/test/cases/blanks.html b/src/test-data/pug/test/cases/blanks.html new file mode 100644 index 0000000..d58268c --- /dev/null +++ b/src/test-data/pug/test/cases/blanks.html @@ -0,0 +1,5 @@ +-
+
- foo +
- bar +
- baz +
baz
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/block-expansion.pug b/src/test-data/pug/test/cases/block-expansion.pug new file mode 100644 index 0000000..fb40f9a --- /dev/null +++ b/src/test-data/pug/test/cases/block-expansion.pug @@ -0,0 +1,5 @@ +ul + li: a(href='#') foo + li: a(href='#') bar + +p baz \ No newline at end of file diff --git a/src/test-data/pug/test/cases/block-expansion.shorthands.html b/src/test-data/pug/test/cases/block-expansion.shorthands.html new file mode 100644 index 0000000..96cf0e7 --- /dev/null +++ b/src/test-data/pug/test/cases/block-expansion.shorthands.html @@ -0,0 +1,7 @@ +-
+
-
+ ++baz+
+
Try to define yourself by what you do, and you’ll burnout every time. You are. That is enough. I rest in that.+
Page 2
+ + diff --git a/src/test-data/pug/test/cases/blocks-in-blocks.pug b/src/test-data/pug/test/cases/blocks-in-blocks.pug new file mode 100644 index 0000000..13077d9 --- /dev/null +++ b/src/test-data/pug/test/cases/blocks-in-blocks.pug @@ -0,0 +1,4 @@ +extends ./auxiliary/blocks-in-blocks-layout.pug + +block body + h1 Page 2 diff --git a/src/test-data/pug/test/cases/blocks-in-if.html b/src/test-data/pug/test/cases/blocks-in-if.html new file mode 100644 index 0000000..c3b9107 --- /dev/null +++ b/src/test-data/pug/test/cases/blocks-in-if.html @@ -0,0 +1 @@ +ajax contents
diff --git a/src/test-data/pug/test/cases/blocks-in-if.pug b/src/test-data/pug/test/cases/blocks-in-if.pug new file mode 100644 index 0000000..e0c6361 --- /dev/null +++ b/src/test-data/pug/test/cases/blocks-in-if.pug @@ -0,0 +1,19 @@ +//- see https://github.com/pugjs/pug/issues/1589 + +-var ajax = true + +-if( ajax ) + //- return only contents if ajax requests + block contents + p ajax contents + +-else + //- return all html + doctype html + html + head + meta( charset='utf8' ) + title sample + body + block contents + p all contetns diff --git a/src/test-data/pug/test/cases/case-blocks.html b/src/test-data/pug/test/cases/case-blocks.html new file mode 100644 index 0000000..893b07d --- /dev/null +++ b/src/test-data/pug/test/cases/case-blocks.html @@ -0,0 +1,5 @@ + + +you have a friend
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/case-blocks.pug b/src/test-data/pug/test/cases/case-blocks.pug new file mode 100644 index 0000000..345cd41 --- /dev/null +++ b/src/test-data/pug/test/cases/case-blocks.pug @@ -0,0 +1,10 @@ +html + body + - var friends = 1 + case friends + when 0 + p you have no friends + when 1 + p you have a friend + default + p you have #{friends} friends \ No newline at end of file diff --git a/src/test-data/pug/test/cases/case.html b/src/test-data/pug/test/cases/case.html new file mode 100644 index 0000000..f264fb7 --- /dev/null +++ b/src/test-data/pug/test/cases/case.html @@ -0,0 +1,8 @@ + + + +you have a friend
+you have very few friends
+Friend is a string
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/case.pug b/src/test-data/pug/test/cases/case.pug new file mode 100644 index 0000000..0fbe2ef --- /dev/null +++ b/src/test-data/pug/test/cases/case.pug @@ -0,0 +1,19 @@ +html + body + - var friends = 1 + case friends + when 0: p you have no friends + when 1: p you have a friend + default: p you have #{friends} friends + - var friends = 0 + case friends + when 0 + when 1 + p you have very few friends + default + p you have #{friends} friends + + - var friend = 'Tim:G' + case friend + when 'Tim:G': p Friend is a string + when {tim: 'g'}: p Friend is an object diff --git a/src/test-data/pug/test/cases/classes-empty.html b/src/test-data/pug/test/cases/classes-empty.html new file mode 100644 index 0000000..bcc28a9 --- /dev/null +++ b/src/test-data/pug/test/cases/classes-empty.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/classes-empty.pug b/src/test-data/pug/test/cases/classes-empty.pug new file mode 100644 index 0000000..5e66d84 --- /dev/null +++ b/src/test-data/pug/test/cases/classes-empty.pug @@ -0,0 +1,3 @@ +a(class='') +a(class=null) +a(class=undefined) \ No newline at end of file diff --git a/src/test-data/pug/test/cases/classes.html b/src/test-data/pug/test/cases/classes.html new file mode 100644 index 0000000..07da8c5 --- /dev/null +++ b/src/test-data/pug/test/cases/classes.html @@ -0,0 +1 @@ + diff --git a/src/test-data/pug/test/cases/classes.pug b/src/test-data/pug/test/cases/classes.pug new file mode 100644 index 0000000..67e1a1b --- /dev/null +++ b/src/test-data/pug/test/cases/classes.pug @@ -0,0 +1,11 @@ +a(class=['foo', 'bar', 'baz']) + + + +a.foo(class='bar').baz + + + +a.foo-bar_baz + +a(class={foo: true, bar: false, baz: true}) diff --git a/src/test-data/pug/test/cases/code.conditionals.html b/src/test-data/pug/test/cases/code.conditionals.html new file mode 100644 index 0000000..1370312 --- /dev/null +++ b/src/test-data/pug/test/cases/code.conditionals.html @@ -0,0 +1,11 @@ +foo
+foo
+foo
+bar
+baz
+bar
+yay
+ + + + diff --git a/src/test-data/pug/test/cases/code.conditionals.pug b/src/test-data/pug/test/cases/code.conditionals.pug new file mode 100644 index 0000000..aa4c715 --- /dev/null +++ b/src/test-data/pug/test/cases/code.conditionals.pug @@ -0,0 +1,43 @@ + +- if (true) + p foo +- else + p bar + +- if (true) { + p foo +- } else { + p bar +- } + +if true + p foo + p bar + p baz +else + p bar + +unless true + p foo +else + p bar + +if 'nested' + if 'works' + p yay + +//- allow empty blocks +if false +else + .bar +if true + .bar +else +.bing + +if false + .bing +else if false + .bar +else + .foo \ No newline at end of file diff --git a/src/test-data/pug/test/cases/code.escape.html b/src/test-data/pug/test/cases/code.escape.html new file mode 100644 index 0000000..c0e1758 --- /dev/null +++ b/src/test-data/pug/test/cases/code.escape.html @@ -0,0 +1,2 @@ +<script>
+\ No newline at end of file diff --git a/src/test-data/pug/test/cases/escape-chars.pug b/src/test-data/pug/test/cases/escape-chars.pug new file mode 100644 index 0000000..f7978d6 --- /dev/null +++ b/src/test-data/pug/test/cases/escape-chars.pug @@ -0,0 +1,2 @@ +script. + var re = /\d+/; \ No newline at end of file diff --git a/src/test-data/pug/test/cases/escape-test.html b/src/test-data/pug/test/cases/escape-test.html new file mode 100644 index 0000000..15e72d9 --- /dev/null +++ b/src/test-data/pug/test/cases/escape-test.html @@ -0,0 +1,9 @@ + + +
+BEGINhtml + body + pre + include:custom(opt='val' num=2) filters.include.custom.pug +END+ + diff --git a/src/test-data/pug/test/cases/filters.include.custom.pug b/src/test-data/pug/test/cases/filters.include.custom.pug new file mode 100644 index 0000000..5811147 --- /dev/null +++ b/src/test-data/pug/test/cases/filters.include.custom.pug @@ -0,0 +1,4 @@ +html + body + pre + include:custom(opt='val' num=2) filters.include.custom.pug diff --git a/src/test-data/pug/test/cases/filters.include.html b/src/test-data/pug/test/cases/filters.include.html new file mode 100644 index 0000000..1dc755f --- /dev/null +++ b/src/test-data/pug/test/cases/filters.include.html @@ -0,0 +1,19 @@ + +
Just some markdown tests.
+With new line.
+ + + + + diff --git a/src/test-data/pug/test/cases/filters.include.pug b/src/test-data/pug/test/cases/filters.include.pug new file mode 100644 index 0000000..e7ea3db --- /dev/null +++ b/src/test-data/pug/test/cases/filters.include.pug @@ -0,0 +1,7 @@ +html + body + include:markdown-it some.md + script + include:coffee-script(minify=true) include-filter-coffee.coffee + script + include:coffee-script(minify=false) include-filter-coffee.coffee diff --git a/src/test-data/pug/test/cases/filters.inline.html b/src/test-data/pug/test/cases/filters.inline.html new file mode 100644 index 0000000..e602ebd --- /dev/null +++ b/src/test-data/pug/test/cases/filters.inline.html @@ -0,0 +1,3 @@ + ++ before after
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/filters.inline.pug b/src/test-data/pug/test/cases/filters.inline.pug new file mode 100644 index 0000000..7b57985 --- /dev/null +++ b/src/test-data/pug/test/cases/filters.inline.pug @@ -0,0 +1 @@ +p before #[:cdata inside] after \ No newline at end of file diff --git a/src/test-data/pug/test/cases/filters.less.html b/src/test-data/pug/test/cases/filters.less.html new file mode 100644 index 0000000..5cdb913 --- /dev/null +++ b/src/test-data/pug/test/cases/filters.less.html @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/filters.less.pug b/src/test-data/pug/test/cases/filters.less.pug new file mode 100644 index 0000000..a3df945 --- /dev/null +++ b/src/test-data/pug/test/cases/filters.less.pug @@ -0,0 +1,8 @@ +html + head + style(type="text/css") + :less + @pad: 15px; + body { + padding: @pad; + } diff --git a/src/test-data/pug/test/cases/filters.markdown.html b/src/test-data/pug/test/cases/filters.markdown.html new file mode 100644 index 0000000..aa3d975 --- /dev/null +++ b/src/test-data/pug/test/cases/filters.markdown.html @@ -0,0 +1,5 @@ + +This is some awesome markdown +whoop.
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/filters.markdown.pug b/src/test-data/pug/test/cases/filters.markdown.pug new file mode 100644 index 0000000..30b1e4f --- /dev/null +++ b/src/test-data/pug/test/cases/filters.markdown.pug @@ -0,0 +1,5 @@ +html + body + :markdown + This is _some_ awesome **markdown** + whoop. diff --git a/src/test-data/pug/test/cases/filters.nested.html b/src/test-data/pug/test/cases/filters.nested.html new file mode 100644 index 0000000..a5a2af3 --- /dev/null +++ b/src/test-data/pug/test/cases/filters.nested.html @@ -0,0 +1,2 @@ + + diff --git a/src/test-data/pug/test/cases/filters.nested.pug b/src/test-data/pug/test/cases/filters.nested.pug new file mode 100644 index 0000000..c79ccdd --- /dev/null +++ b/src/test-data/pug/test/cases/filters.nested.pug @@ -0,0 +1,10 @@ +script + :cdata:uglify-js + (function() { + console.log('test') + })() +script + :cdata:uglify-js:coffee-script + (-> + console.log 'test' + )() diff --git a/src/test-data/pug/test/cases/filters.stylus.html b/src/test-data/pug/test/cases/filters.stylus.html new file mode 100644 index 0000000..d131a14 --- /dev/null +++ b/src/test-data/pug/test/cases/filters.stylus.html @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/filters.stylus.pug b/src/test-data/pug/test/cases/filters.stylus.pug new file mode 100644 index 0000000..323d29c --- /dev/null +++ b/src/test-data/pug/test/cases/filters.stylus.pug @@ -0,0 +1,7 @@ +html + head + style(type="text/css") + :stylus + body + padding: 50px + body diff --git a/src/test-data/pug/test/cases/html.html b/src/test-data/pug/test/cases/html.html new file mode 100644 index 0000000..a038efd --- /dev/null +++ b/src/test-data/pug/test/cases/html.html @@ -0,0 +1,9 @@ +-
+
- foo +
- bar +
- baz +
You can embed html as well.
+Even as the body of a block expansion.
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/html.pug b/src/test-data/pug/test/cases/html.pug new file mode 100644 index 0000000..0e5422d --- /dev/null +++ b/src/test-data/pug/test/cases/html.pug @@ -0,0 +1,13 @@ +- var version = 1449104952939 + +-
+
- foo +
- bar +
- baz +
hello
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/include-extends-from-root.pug b/src/test-data/pug/test/cases/include-extends-from-root.pug new file mode 100644 index 0000000..a79a57d --- /dev/null +++ b/src/test-data/pug/test/cases/include-extends-from-root.pug @@ -0,0 +1 @@ +include /auxiliary/extends-from-root.pug diff --git a/src/test-data/pug/test/cases/include-extends-of-common-template.html b/src/test-data/pug/test/cases/include-extends-of-common-template.html new file mode 100644 index 0000000..dd04738 --- /dev/null +++ b/src/test-data/pug/test/cases/include-extends-of-common-template.html @@ -0,0 +1,2 @@ +test1
+test2
diff --git a/src/test-data/pug/test/cases/include-extends-of-common-template.pug b/src/test-data/pug/test/cases/include-extends-of-common-template.pug
new file mode 100644
index 0000000..2511f52
--- /dev/null
+++ b/src/test-data/pug/test/cases/include-extends-of-common-template.pug
@@ -0,0 +1,2 @@
+include auxiliary/extends-empty-block-1.pug
+include auxiliary/extends-empty-block-2.pug
diff --git a/src/test-data/pug/test/cases/include-extends-relative.html b/src/test-data/pug/test/cases/include-extends-relative.html
new file mode 100644
index 0000000..3916f5d
--- /dev/null
+++ b/src/test-data/pug/test/cases/include-extends-relative.html
@@ -0,0 +1,8 @@
+
+
+ hello
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/include-extends-relative.pug b/src/test-data/pug/test/cases/include-extends-relative.pug new file mode 100644 index 0000000..1b5238c --- /dev/null +++ b/src/test-data/pug/test/cases/include-extends-relative.pug @@ -0,0 +1 @@ +include ../cases/auxiliary/extends-relative.pug diff --git a/src/test-data/pug/test/cases/include-filter-coffee.coffee b/src/test-data/pug/test/cases/include-filter-coffee.coffee new file mode 100644 index 0000000..9723cd7 --- /dev/null +++ b/src/test-data/pug/test/cases/include-filter-coffee.coffee @@ -0,0 +1,2 @@ +math = + square: (value) -> value * value diff --git a/src/test-data/pug/test/cases/include-only-text-body.html b/src/test-data/pug/test/cases/include-only-text-body.html new file mode 100644 index 0000000..f86b593 --- /dev/null +++ b/src/test-data/pug/test/cases/include-only-text-body.html @@ -0,0 +1 @@ +The message is "" \ No newline at end of file diff --git a/src/test-data/pug/test/cases/include-only-text-body.pug b/src/test-data/pug/test/cases/include-only-text-body.pug new file mode 100644 index 0000000..fdb080c --- /dev/null +++ b/src/test-data/pug/test/cases/include-only-text-body.pug @@ -0,0 +1,3 @@ +| The message is " +yield +| " diff --git a/src/test-data/pug/test/cases/include-only-text.html b/src/test-data/pug/test/cases/include-only-text.html new file mode 100644 index 0000000..6936ae4 --- /dev/null +++ b/src/test-data/pug/test/cases/include-only-text.html @@ -0,0 +1,5 @@ + + +The message is "hello world"
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/include-only-text.pug b/src/test-data/pug/test/cases/include-only-text.pug new file mode 100644 index 0000000..ede4f0f --- /dev/null +++ b/src/test-data/pug/test/cases/include-only-text.pug @@ -0,0 +1,5 @@ +html + body + p + include include-only-text-body.pug + em hello world diff --git a/src/test-data/pug/test/cases/include-with-text-head.html b/src/test-data/pug/test/cases/include-with-text-head.html new file mode 100644 index 0000000..716f359 --- /dev/null +++ b/src/test-data/pug/test/cases/include-with-text-head.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/include-with-text-head.pug b/src/test-data/pug/test/cases/include-with-text-head.pug new file mode 100644 index 0000000..4e670c0 --- /dev/null +++ b/src/test-data/pug/test/cases/include-with-text-head.pug @@ -0,0 +1,3 @@ +head + script(type='text/javascript'). + alert('hello world'); diff --git a/src/test-data/pug/test/cases/include-with-text.html b/src/test-data/pug/test/cases/include-with-text.html new file mode 100644 index 0000000..78386f7 --- /dev/null +++ b/src/test-data/pug/test/cases/include-with-text.html @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/include-with-text.pug b/src/test-data/pug/test/cases/include-with-text.pug new file mode 100644 index 0000000..bc83ea5 --- /dev/null +++ b/src/test-data/pug/test/cases/include-with-text.pug @@ -0,0 +1,4 @@ +html + include include-with-text-head.pug + script(src='/caustic.js') + script(src='/app.js') diff --git a/src/test-data/pug/test/cases/include.script.html b/src/test-data/pug/test/cases/include.script.html new file mode 100644 index 0000000..cdd37c2 --- /dev/null +++ b/src/test-data/pug/test/cases/include.script.html @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/include.script.pug b/src/test-data/pug/test/cases/include.script.pug new file mode 100644 index 0000000..f449144 --- /dev/null +++ b/src/test-data/pug/test/cases/include.script.pug @@ -0,0 +1,2 @@ +script#pet-template(type='text/x-template') + include auxiliary/pet.pug diff --git a/src/test-data/pug/test/cases/include.yield.nested.html b/src/test-data/pug/test/cases/include.yield.nested.html new file mode 100644 index 0000000..947b615 --- /dev/null +++ b/src/test-data/pug/test/cases/include.yield.nested.html @@ -0,0 +1,17 @@ + + +Page
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/include.yield.nested.pug b/src/test-data/pug/test/cases/include.yield.nested.pug
new file mode 100644
index 0000000..f4a7d69
--- /dev/null
+++ b/src/test-data/pug/test/cases/include.yield.nested.pug
@@ -0,0 +1,4 @@
+
+include auxiliary/yield-nested.pug
+ p some content
+ p and some more
diff --git a/src/test-data/pug/test/cases/includes-with-ext-js.html b/src/test-data/pug/test/cases/includes-with-ext-js.html
new file mode 100644
index 0000000..26c9184
--- /dev/null
+++ b/src/test-data/pug/test/cases/includes-with-ext-js.html
@@ -0,0 +1,2 @@
+var x = '\n here is some \n new lined text';
+bar
+ +:)
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/includes.pug b/src/test-data/pug/test/cases/includes.pug new file mode 100644 index 0000000..7761ce2 --- /dev/null +++ b/src/test-data/pug/test/cases/includes.pug @@ -0,0 +1,10 @@ + +include auxiliary/mixins.pug + ++foo + +body + include auxiliary/smile.html + include auxiliary/escapes.html + script(type="text/javascript") + include:verbatim auxiliary/includable.js diff --git a/src/test-data/pug/test/cases/inheritance.alert-dialog.html b/src/test-data/pug/test/cases/inheritance.alert-dialog.html new file mode 100644 index 0000000..88a5dc6 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.alert-dialog.html @@ -0,0 +1,6 @@ +Close
+
diff --git a/src/test-data/pug/test/cases/inheritance.alert-dialog.pug b/src/test-data/pug/test/cases/inheritance.alert-dialog.pug
new file mode 100644
index 0000000..7afcaf0
--- /dev/null
+++ b/src/test-data/pug/test/cases/inheritance.alert-dialog.pug
@@ -0,0 +1,6 @@
+
+extends auxiliary/dialog.pug
+
+block content
+ h1 Alert!
+ p I'm an alert!
diff --git a/src/test-data/pug/test/cases/inheritance.defaults.html b/src/test-data/pug/test/cases/inheritance.defaults.html
new file mode 100644
index 0000000..e6878d1
--- /dev/null
+++ b/src/test-data/pug/test/cases/inheritance.defaults.html
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/inheritance.defaults.pug b/src/test-data/pug/test/cases/inheritance.defaults.pug
new file mode 100644
index 0000000..aaead83
--- /dev/null
+++ b/src/test-data/pug/test/cases/inheritance.defaults.pug
@@ -0,0 +1,6 @@
+html
+ head
+ block head
+ script(src='jquery.js')
+ script(src='keymaster.js')
+ script(src='caustic.js')
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/inheritance.extend.html b/src/test-data/pug/test/cases/inheritance.extend.html
new file mode 100644
index 0000000..1f4eae4
--- /dev/null
+++ b/src/test-data/pug/test/cases/inheritance.extend.html
@@ -0,0 +1,10 @@
+
+
+
+
+Alert!
+I'm an alert!
+Page
+Some content
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/inheritance.extend.include.html b/src/test-data/pug/test/cases/inheritance.extend.include.html new file mode 100644 index 0000000..66da1cc --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.include.html @@ -0,0 +1,14 @@ + + +Page
+Some content
+ + + diff --git a/src/test-data/pug/test/cases/inheritance.extend.include.pug b/src/test-data/pug/test/cases/inheritance.extend.include.pug new file mode 100644 index 0000000..b67dfc3 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.include.pug @@ -0,0 +1,13 @@ + +extend auxiliary/layout.include.pug + +block head + script(src='jquery.js') + +block content + h2 Page + p Some content + +block window-content + h2 Awesome + p Now we can extend included blocks! diff --git a/src/test-data/pug/test/cases/inheritance.extend.mixins.block.html b/src/test-data/pug/test/cases/inheritance.extend.mixins.block.html new file mode 100644 index 0000000..0ea5d94 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.mixins.block.html @@ -0,0 +1,10 @@ + + +The meaning of life
+Foo bar baz!
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/inheritance.extend.mixins.pug b/src/test-data/pug/test/cases/inheritance.extend.mixins.pug new file mode 100644 index 0000000..ceaa412 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.mixins.pug @@ -0,0 +1,11 @@ + +extend auxiliary/layout.pug + +mixin article(title) + if title + h1= title + block + +block content + +article("The meaning of life") + p Foo bar baz! diff --git a/src/test-data/pug/test/cases/inheritance.extend.pug b/src/test-data/pug/test/cases/inheritance.extend.pug new file mode 100644 index 0000000..4ce3a6f --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.pug @@ -0,0 +1,9 @@ + +extend auxiliary/layout.pug + +block head + script(src='jquery.js') + +block content + h2 Page + p Some content diff --git a/src/test-data/pug/test/cases/inheritance.extend.recursive.html b/src/test-data/pug/test/cases/inheritance.extend.recursive.html new file mode 100644 index 0000000..d5d0522 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.recursive.html @@ -0,0 +1,4 @@ +grand-grandparent
+grandparent
+parent
+child
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/inheritance.extend.recursive.pug b/src/test-data/pug/test/cases/inheritance.extend.recursive.pug new file mode 100644 index 0000000..5842523 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.recursive.pug @@ -0,0 +1,4 @@ +extends /auxiliary/inheritance.extend.recursive-parent.pug + +block parent + h4 child \ No newline at end of file diff --git a/src/test-data/pug/test/cases/inheritance.extend.whitespace.html b/src/test-data/pug/test/cases/inheritance.extend.whitespace.html new file mode 100644 index 0000000..1f4eae4 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.whitespace.html @@ -0,0 +1,10 @@ + + +Page
+Some content
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/inheritance.extend.whitespace.pug b/src/test-data/pug/test/cases/inheritance.extend.whitespace.pug new file mode 100644 index 0000000..25ee9e0 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.extend.whitespace.pug @@ -0,0 +1,13 @@ + +extend auxiliary/layout.pug + +block head + + script(src='jquery.js') + +block content + + + + h2 Page + p Some content diff --git a/src/test-data/pug/test/cases/inheritance.html b/src/test-data/pug/test/cases/inheritance.html new file mode 100644 index 0000000..1f4eae4 --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.html @@ -0,0 +1,10 @@ + + +Page
+Some content
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/inheritance.pug b/src/test-data/pug/test/cases/inheritance.pug new file mode 100644 index 0000000..dd5415d --- /dev/null +++ b/src/test-data/pug/test/cases/inheritance.pug @@ -0,0 +1,9 @@ + +extends auxiliary/layout.pug + +block head + script(src='jquery.js') + +block content + h2 Page + p Some content diff --git a/src/test-data/pug/test/cases/inline-tag.html b/src/test-data/pug/test/cases/inline-tag.html new file mode 100644 index 0000000..7ea3af7 --- /dev/null +++ b/src/test-data/pug/test/cases/inline-tag.html @@ -0,0 +1,21 @@ + +bing foo bong
++ bing + foo + [foo] + + bong + +
++ bing + foo + [foo] + + bong +
++ #[strong escaped] + #[escaped +
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/inline-tag.pug b/src/test-data/pug/test/cases/inline-tag.pug new file mode 100644 index 0000000..df7b549 --- /dev/null +++ b/src/test-data/pug/test/cases/inline-tag.pug @@ -0,0 +1,19 @@ +p bing #[strong foo] bong + +p. + bing + #[strong foo] + #[strong= '[foo]'] + #[- var foo = 'foo]'] + bong + +p + | bing + | #[strong foo] + | #[strong= '[foo]'] + | #[- var foo = 'foo]'] + | bong + +p. + \#[strong escaped] + \#[#[strong escaped] diff --git a/src/test-data/pug/test/cases/intepolated-elements.html b/src/test-data/pug/test/cases/intepolated-elements.html new file mode 100644 index 0000000..721fa02 --- /dev/null +++ b/src/test-data/pug/test/cases/intepolated-elements.html @@ -0,0 +1,4 @@ + + + +Some text with inline link
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/intepolated-elements.pug b/src/test-data/pug/test/cases/intepolated-elements.pug new file mode 100644 index 0000000..5fe8bcf --- /dev/null +++ b/src/test-data/pug/test/cases/intepolated-elements.pug @@ -0,0 +1,3 @@ +p #[a.rho(href='#', class='rho--modifier') with inline link] +p Some text #[a.rho(href='#', class='rho--modifier')] +p Some text #[a.rho(href='#', class='rho--modifier') with inline link] \ No newline at end of file diff --git a/src/test-data/pug/test/cases/interpolated-mixin.html b/src/test-data/pug/test/cases/interpolated-mixin.html new file mode 100644 index 0000000..101aa95 --- /dev/null +++ b/src/test-data/pug/test/cases/interpolated-mixin.html @@ -0,0 +1,3 @@ + +This also works http://www.bing.com so hurrah for Pug +
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/interpolated-mixin.pug b/src/test-data/pug/test/cases/interpolated-mixin.pug new file mode 100644 index 0000000..ae8fc74 --- /dev/null +++ b/src/test-data/pug/test/cases/interpolated-mixin.pug @@ -0,0 +1,4 @@ +mixin linkit(url) + a(href=url)= url + +p This also works #[+linkit('http://www.bing.com')] so hurrah for Pug \ No newline at end of file diff --git a/src/test-data/pug/test/cases/interpolation.escape.html b/src/test-data/pug/test/cases/interpolation.escape.html new file mode 100644 index 0000000..8dd546b --- /dev/null +++ b/src/test-data/pug/test/cases/interpolation.escape.html @@ -0,0 +1,6 @@ +Last prepend must appear at top
+Something prepended to content
+Defined content
+Something appended to content
+Last append must be most last
+ + + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/layout.multi.append.prepend.block.pug b/src/test-data/pug/test/cases/layout.multi.append.prepend.block.pug new file mode 100644 index 0000000..79d15b1 --- /dev/null +++ b/src/test-data/pug/test/cases/layout.multi.append.prepend.block.pug @@ -0,0 +1,19 @@ +extends ../fixtures/multi-append-prepend-block/redefine.pug + +append content + p.first.append Something appended to content + +prepend content + p.first.prepend Something prepended to content + +append content + p.last.append Last append must be most last + +prepend content + p.last.prepend Last prepend must appear at top + +append head + script(src='jquery.js') + +prepend head + script(src='foo.js') diff --git a/src/test-data/pug/test/cases/layout.prepend.html b/src/test-data/pug/test/cases/layout.prepend.html new file mode 100644 index 0000000..8753a42 --- /dev/null +++ b/src/test-data/pug/test/cases/layout.prepend.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/test-data/pug/test/cases/layout.prepend.pug b/src/test-data/pug/test/cases/layout.prepend.pug new file mode 100644 index 0000000..4659a11 --- /dev/null +++ b/src/test-data/pug/test/cases/layout.prepend.pug @@ -0,0 +1,6 @@ + +extends ../fixtures/prepend/app-layout.pug + +block prepend head + script(src='foo.js') + script(src='bar.js') diff --git a/src/test-data/pug/test/cases/layout.prepend.without-block.html b/src/test-data/pug/test/cases/layout.prepend.without-block.html new file mode 100644 index 0000000..8753a42 --- /dev/null +++ b/src/test-data/pug/test/cases/layout.prepend.without-block.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/test-data/pug/test/cases/layout.prepend.without-block.pug b/src/test-data/pug/test/cases/layout.prepend.without-block.pug new file mode 100644 index 0000000..516d01b --- /dev/null +++ b/src/test-data/pug/test/cases/layout.prepend.without-block.pug @@ -0,0 +1,6 @@ + +extends ../fixtures/prepend-without-block/app-layout.pug + +prepend head + script(src='foo.js') + script(src='bar.js') diff --git a/src/test-data/pug/test/cases/mixin-at-end-of-file.html b/src/test-data/pug/test/cases/mixin-at-end-of-file.html new file mode 100644 index 0000000..495ca32 --- /dev/null +++ b/src/test-data/pug/test/cases/mixin-at-end-of-file.html @@ -0,0 +1,3 @@ + diff --git a/src/test-data/pug/test/cases/mixin-at-end-of-file.pug b/src/test-data/pug/test/cases/mixin-at-end-of-file.pug new file mode 100644 index 0000000..3d2faa1 --- /dev/null +++ b/src/test-data/pug/test/cases/mixin-at-end-of-file.pug @@ -0,0 +1,4 @@ +include ./auxiliary/mixin-at-end-of-file.pug + ++slide() + p some awesome content diff --git a/src/test-data/pug/test/cases/mixin-block-with-space.html b/src/test-data/pug/test/cases/mixin-block-with-space.html new file mode 100644 index 0000000..5f1fc02 --- /dev/null +++ b/src/test-data/pug/test/cases/mixin-block-with-space.html @@ -0,0 +1,3 @@ + +This text should appear
+
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/mixin-block-with-space.pug b/src/test-data/pug/test/cases/mixin-block-with-space.pug
new file mode 100644
index 0000000..471aac8
--- /dev/null
+++ b/src/test-data/pug/test/cases/mixin-block-with-space.pug
@@ -0,0 +1,6 @@
+mixin m(id)
+ div
+ block
+
++m()
+ | This text should appear
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/mixin-hoist.html b/src/test-data/pug/test/cases/mixin-hoist.html
new file mode 100644
index 0000000..1755a30
--- /dev/null
+++ b/src/test-data/pug/test/cases/mixin-hoist.html
@@ -0,0 +1,5 @@
+
+
+ Pug
+ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/mixin-hoist.pug b/src/test-data/pug/test/cases/mixin-hoist.pug new file mode 100644 index 0000000..eb2c423 --- /dev/null +++ b/src/test-data/pug/test/cases/mixin-hoist.pug @@ -0,0 +1,7 @@ + +mixin foo() + h1= title + +html + body + +foo diff --git a/src/test-data/pug/test/cases/mixin-via-include.html b/src/test-data/pug/test/cases/mixin-via-include.html new file mode 100644 index 0000000..8124337 --- /dev/null +++ b/src/test-data/pug/test/cases/mixin-via-include.html @@ -0,0 +1 @@ +bar
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/mixin-via-include.pug b/src/test-data/pug/test/cases/mixin-via-include.pug new file mode 100644 index 0000000..bb7b6d2 --- /dev/null +++ b/src/test-data/pug/test/cases/mixin-via-include.pug @@ -0,0 +1,5 @@ +//- regression test for https://github.com/pugjs/pug/issues/1435 + +include ../fixtures/mixin-include.pug + ++bang \ No newline at end of file diff --git a/src/test-data/pug/test/cases/mixin.attrs.html b/src/test-data/pug/test/cases/mixin.attrs.html new file mode 100644 index 0000000..2f2e0ef --- /dev/null +++ b/src/test-data/pug/test/cases/mixin.attrs.html @@ -0,0 +1,32 @@ + +Hello World
+
+
+
+ Section 1
+Some important content.
+
+
+ Section 2
+Even more important content.
+ +
+
+
+
+
+ Section 3
+Last content.
+ +
+
+
+
+work
+
+1
+2
+3
+4
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/mixin.attrs.pug b/src/test-data/pug/test/cases/mixin.attrs.pug new file mode 100644 index 0000000..82a46ff --- /dev/null +++ b/src/test-data/pug/test/cases/mixin.attrs.pug @@ -0,0 +1,59 @@ +mixin centered(title) + div.centered(id=attributes.id) + - if (title) + h1(class=attributes.class)= title + block + - if (attributes.href) + .footer + a(href=attributes.href) Back + +mixin main(title) + div.stretch + +centered(title).highlight&attributes(attributes) + block + +mixin bottom + div.bottom&attributes(attributes) + block + +body + +centered#First Hello World + +centered('Section 1')#Second + p Some important content. + +centered('Section 2')#Third.foo(href='menu.html', class='bar') + p Even more important content. + +main('Section 3')(href='#') + p Last content. + +bottom.foo(class='bar', name='end', id='Last', data-attr='baz') + p Some final words. + +bottom(class=['class1', 'class2']) + +mixin foo + div.thing(attr1='foo', attr2='bar')&attributes(attributes) + +- var val = 'Foo
+I'm article foo
+Something
++ I'm a much longer + text-only article, + but you can still + inline html tags + in me if you want. +
+
+
+
+
+one
+two
+three
+123
+
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/mixin.blocks.pug b/src/test-data/pug/test/cases/mixin.blocks.pug
new file mode 100644
index 0000000..30c9990
--- /dev/null
+++ b/src/test-data/pug/test/cases/mixin.blocks.pug
@@ -0,0 +1,44 @@
+
+
+mixin form(method, action)
+ form(method=method, action=action)
+ - var csrf_token_from_somewhere = 'hey'
+ input(type='hidden', name='_csrf', value=csrf_token_from_somewhere)
+ block
+
+html
+ body
+ +form('GET', '/search')
+ input(type='text', name='query', placeholder='Search')
+ input(type='submit', value='Search')
+
+html
+ body
+ +form('POST', '/search')
+ input(type='text', name='query', placeholder='Search')
+ input(type='submit', value='Search')
+
+html
+ body
+ +form('POST', '/search')
+
+mixin bar()
+ #bar
+ block
+
+mixin foo()
+ #foo
+ +bar
+ block
+
++foo
+ p one
+ p two
+ p three
+
+
+mixin baz
+ #baz
+ block
+
++baz()= '123'
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/mixin.merge.html b/src/test-data/pug/test/cases/mixin.merge.html
new file mode 100644
index 0000000..e513d35
--- /dev/null
+++ b/src/test-data/pug/test/cases/mixin.merge.html
@@ -0,0 +1,34 @@
+
+
+ Two
+Three
+ + +Two
+Three
+ + +Two
+Three
+ + +Two
+Three
+ + +Two
+Three
+ + +Two
+Three
+ + +Two
+Three
+ + +Two
+Three
+ + diff --git a/src/test-data/pug/test/cases/mixin.merge.pug b/src/test-data/pug/test/cases/mixin.merge.pug new file mode 100644 index 0000000..f0d217d --- /dev/null +++ b/src/test-data/pug/test/cases/mixin.merge.pug @@ -0,0 +1,15 @@ +mixin foo + p.bar&attributes(attributes) One + p.baz.quux&attributes(attributes) Two + p&attributes(attributes) Three + p.bar&attributes(attributes)(class="baz") Four + +body + +foo.hello + +foo#world + +foo.hello#world + +foo.hello.world + +foo(class="hello") + +foo.hello(class="world") + +foo + +foo&attributes({class: "hello"}) \ No newline at end of file diff --git a/src/test-data/pug/test/cases/mixins-unused.html b/src/test-data/pug/test/cases/mixins-unused.html new file mode 100644 index 0000000..5db7bc1 --- /dev/null +++ b/src/test-data/pug/test/cases/mixins-unused.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/mixins-unused.pug b/src/test-data/pug/test/cases/mixins-unused.pug new file mode 100644 index 0000000..b0af6cc --- /dev/null +++ b/src/test-data/pug/test/cases/mixins-unused.pug @@ -0,0 +1,3 @@ +mixin never-called + .wtf This isn't something we ever want to output +body \ No newline at end of file diff --git a/src/test-data/pug/test/cases/mixins.html b/src/test-data/pug/test/cases/mixins.html new file mode 100644 index 0000000..a75b175 --- /dev/null +++ b/src/test-data/pug/test/cases/mixins.html @@ -0,0 +1,23 @@ + +
+
+
+ Tobi
+-
+
- foo +
- bar +
- baz +
-
+
- foo +
- bar +
- baz +
This is interpolated
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/mixins.pug b/src/test-data/pug/test/cases/mixins.pug
new file mode 100644
index 0000000..4e45671
--- /dev/null
+++ b/src/test-data/pug/test/cases/mixins.pug
@@ -0,0 +1,32 @@
+mixin comment(title, str)
+ .comment
+ h2= title
+ p.body= str
+
+
+mixin comment (title, str)
+ .comment
+ h2= title
+ p.body= str
+
+#user
+ h1 Tobi
+ .comments
+ +comment('This',
+ (('is regular, javascript')))
+
+mixin list
+ ul
+ li foo
+ li bar
+ li baz
+
+body
+ +list()
+ + list()
+
+mixin foobar(str)
+ div#interpolation= str + 'interpolated'
+
+- var suffix = "bar"
++#{'foo' + suffix}('This is ')
diff --git a/src/test-data/pug/test/cases/mixins.rest-args.html b/src/test-data/pug/test/cases/mixins.rest-args.html
new file mode 100644
index 0000000..5b37365
--- /dev/null
+++ b/src/test-data/pug/test/cases/mixins.rest-args.html
@@ -0,0 +1,6 @@
+-
+
- 1 +
- 2 +
- 3 +
- 4 +
-
+
- a +
- b +
-
+
-
+
- c +
- d +
+ - e +
code sample
+Heading
diff --git a/src/test-data/pug/test/cases/pipeless-filters.pug b/src/test-data/pug/test/cases/pipeless-filters.pug new file mode 100644 index 0000000..b24c25a --- /dev/null +++ b/src/test-data/pug/test/cases/pipeless-filters.pug @@ -0,0 +1,4 @@ +:markdown-it + code sample + + # Heading diff --git a/src/test-data/pug/test/cases/pipeless-tag.html b/src/test-data/pug/test/cases/pipeless-tag.html new file mode 100644 index 0000000..f6f8935 --- /dev/null +++ b/src/test-data/pug/test/cases/pipeless-tag.html @@ -0,0 +1,3 @@ + +what +is going on\ No newline at end of file diff --git a/src/test-data/pug/test/cases/pipeless-tag.pug b/src/test-data/pug/test/cases/pipeless-tag.pug new file mode 100644 index 0000000..d521da4 --- /dev/null +++ b/src/test-data/pug/test/cases/pipeless-tag.pug @@ -0,0 +1,3 @@ +pre. + what + is #{'going'} #[| #{'on'}] diff --git a/src/test-data/pug/test/cases/pre.html b/src/test-data/pug/test/cases/pre.html new file mode 100644 index 0000000..33bab4e --- /dev/null +++ b/src/test-data/pug/test/cases/pre.html @@ -0,0 +1,7 @@ +
foo +bar +baz ++
foo
+bar
+baz"foo"
+'foo'
\ No newline at end of file diff --git a/src/test-data/pug/test/cases/quotes.pug b/src/test-data/pug/test/cases/quotes.pug new file mode 100644 index 0000000..499c835 --- /dev/null +++ b/src/test-data/pug/test/cases/quotes.pug @@ -0,0 +1,2 @@ +p "foo" +p 'foo' \ No newline at end of file diff --git a/src/test-data/pug/test/cases/regression.1794.html b/src/test-data/pug/test/cases/regression.1794.html new file mode 100644 index 0000000..b322cca --- /dev/null +++ b/src/test-data/pug/test/cases/regression.1794.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/regression.1794.pug b/src/test-data/pug/test/cases/regression.1794.pug new file mode 100644 index 0000000..fb33c31 --- /dev/null +++ b/src/test-data/pug/test/cases/regression.1794.pug @@ -0,0 +1,4 @@ +extends ./auxiliary/1794-extends.pug + +block content + include ./auxiliary/1794-include.pug \ No newline at end of file diff --git a/src/test-data/pug/test/cases/regression.784.html b/src/test-data/pug/test/cases/regression.784.html new file mode 100644 index 0000000..933e986 --- /dev/null +++ b/src/test-data/pug/test/cases/regression.784.html @@ -0,0 +1 @@ +google.com
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/regression.784.pug b/src/test-data/pug/test/cases/regression.784.pug
new file mode 100644
index 0000000..bab7540
--- /dev/null
+++ b/src/test-data/pug/test/cases/regression.784.pug
@@ -0,0 +1,2 @@
+- var url = 'http://www.google.com'
+.url #{url.replace('http://', '').replace(/^www\./, '')}
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/script.whitespace.html b/src/test-data/pug/test/cases/script.whitespace.html
new file mode 100644
index 0000000..45b7ced
--- /dev/null
+++ b/src/test-data/pug/test/cases/script.whitespace.html
@@ -0,0 +1,7 @@
+
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/script.whitespace.pug b/src/test-data/pug/test/cases/script.whitespace.pug
new file mode 100644
index 0000000..e0afc3a
--- /dev/null
+++ b/src/test-data/pug/test/cases/script.whitespace.pug
@@ -0,0 +1,6 @@
+script.
+ if (foo) {
+
+ bar();
+
+ }
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/scripts.html b/src/test-data/pug/test/cases/scripts.html
new file mode 100644
index 0000000..e3dc48b
--- /dev/null
+++ b/src/test-data/pug/test/cases/scripts.html
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/scripts.non-js.html b/src/test-data/pug/test/cases/scripts.non-js.html
new file mode 100644
index 0000000..9daff38
--- /dev/null
+++ b/src/test-data/pug/test/cases/scripts.non-js.html
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/scripts.non-js.pug b/src/test-data/pug/test/cases/scripts.non-js.pug
new file mode 100644
index 0000000..9f9a408
--- /dev/null
+++ b/src/test-data/pug/test/cases/scripts.non-js.pug
@@ -0,0 +1,9 @@
+script#user-template(type='text/template')
+ #user
+ h1 <%= user.name %>
+ p <%= user.description %>
+
+script#user-template(type='text/template').
+ if (foo) {
+ bar();
+ }
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/scripts.pug b/src/test-data/pug/test/cases/scripts.pug
new file mode 100644
index 0000000..d28887f
--- /dev/null
+++ b/src/test-data/pug/test/cases/scripts.pug
@@ -0,0 +1,8 @@
+script.
+ if (foo) {
+ bar();
+ }
+script!= 'foo()'
+script foo()
+script
+div
\ No newline at end of file
diff --git a/src/test-data/pug/test/cases/self-closing-html.html b/src/test-data/pug/test/cases/self-closing-html.html
new file mode 100644
index 0000000..02a38d0
--- /dev/null
+++ b/src/test-data/pug/test/cases/self-closing-html.html
@@ -0,0 +1,4 @@
+
+
+ + diff --git a/src/test-data/pug/test/cases/self-closing-html.pug b/src/test-data/pug/test/cases/self-closing-html.pug new file mode 100644 index 0000000..094e42a --- /dev/null +++ b/src/test-data/pug/test/cases/self-closing-html.pug @@ -0,0 +1,4 @@ +doctype html +html + body + br/ diff --git a/src/test-data/pug/test/cases/single-period.html b/src/test-data/pug/test/cases/single-period.html new file mode 100644 index 0000000..430944c --- /dev/null +++ b/src/test-data/pug/test/cases/single-period.html @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/src/test-data/pug/test/cases/single-period.pug b/src/test-data/pug/test/cases/single-period.pug new file mode 100644 index 0000000..f3d734c --- /dev/null +++ b/src/test-data/pug/test/cases/single-period.pug @@ -0,0 +1 @@ +span . \ No newline at end of file diff --git a/src/test-data/pug/test/cases/some-included.styl b/src/test-data/pug/test/cases/some-included.styl new file mode 100644 index 0000000..7458543 --- /dev/null +++ b/src/test-data/pug/test/cases/some-included.styl @@ -0,0 +1,2 @@ +body + padding 10px diff --git a/src/test-data/pug/test/cases/some.md b/src/test-data/pug/test/cases/some.md new file mode 100644 index 0000000..8ea3e54 --- /dev/null +++ b/src/test-data/pug/test/cases/some.md @@ -0,0 +1,3 @@ +Just _some_ markdown **tests**. + +With new line. diff --git a/src/test-data/pug/test/cases/some.styl b/src/test-data/pug/test/cases/some.styl new file mode 100644 index 0000000..f77222d --- /dev/null +++ b/src/test-data/pug/test/cases/some.styl @@ -0,0 +1 @@ +@import "some-included" diff --git a/src/test-data/pug/test/cases/source.html b/src/test-data/pug/test/cases/source.html new file mode 100644 index 0000000..1881c0f --- /dev/null +++ b/src/test-data/pug/test/cases/source.html @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/source.pug b/src/test-data/pug/test/cases/source.pug new file mode 100644 index 0000000..db22b80 --- /dev/null +++ b/src/test-data/pug/test/cases/source.pug @@ -0,0 +1,4 @@ +html + audio(preload='auto', autobuffer, controls) + source(src='foo') + source(src='bar') \ No newline at end of file diff --git a/src/test-data/pug/test/cases/styles.html b/src/test-data/pug/test/cases/styles.html new file mode 100644 index 0000000..251556e --- /dev/null +++ b/src/test-data/pug/test/cases/styles.html @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/src/test-data/pug/test/cases/styles.pug b/src/test-data/pug/test/cases/styles.pug new file mode 100644 index 0000000..9618353 --- /dev/null +++ b/src/test-data/pug/test/cases/styles.pug @@ -0,0 +1,19 @@ +html + head + style. + body { + padding: 50px; + } + body + div(style='color:red;background:green') + div(style={color: 'red', background: 'green'}) + div&attributes({style: 'color:red;background:green'}) + div&attributes({style: {color: 'red', background: 'green'}}) + mixin div() + div&attributes(attributes) + +div(style='color:red;background:green') + +div(style={color: 'red', background: 'green'}) + - var bg = 'green'; + div(style={color: 'red', background: bg}) + div&attributes({style: {color: 'red', background: bg}}) + +div(style={color: 'red', background: bg}) diff --git a/src/test-data/pug/test/cases/tag.interpolation.html b/src/test-data/pug/test/cases/tag.interpolation.html new file mode 100644 index 0000000..9f2816c --- /dev/null +++ b/src/test-data/pug/test/cases/tag.interpolation.html @@ -0,0 +1,9 @@ +
value
+value
+here +-
+
Contact +
+ Contact +
+
+ foo + bar + + + baz +
++ foo + + + bar + baz + +
foo + + +bar +baz + +foo + bar + baz +.+
foo + bar + baz +. +foo + bar + baz +. diff --git a/src/test-data/pug/test/cases/text.pug b/src/test-data/pug/test/cases/text.pug new file mode 100644 index 0000000..abb0e0b --- /dev/null +++ b/src/test-data/pug/test/cases/text.pug @@ -0,0 +1,46 @@ +option(value='') -- (selected) -- + +p + +p. + +p + | foo + | bar + | + | + | baz + +p. + foo + + + bar + baz + +. + +. + foo + + + bar + baz + +pre + | foo + | bar + | baz + | . + +pre. + foo + bar + baz + . + +. + foo + bar + baz + . diff --git a/src/test-data/pug/test/cases/utf8bom.html b/src/test-data/pug/test/cases/utf8bom.html new file mode 100644 index 0000000..e3e18f0 --- /dev/null +++ b/src/test-data/pug/test/cases/utf8bom.html @@ -0,0 +1 @@ +
"foo"
diff --git a/src/test-data/pug/test/cases/utf8bom.pug b/src/test-data/pug/test/cases/utf8bom.pug new file mode 100644 index 0000000..9a32814 --- /dev/null +++ b/src/test-data/pug/test/cases/utf8bom.pug @@ -0,0 +1 @@ +p "foo" diff --git a/src/test-data/pug/test/cases/vars.html b/src/test-data/pug/test/cases/vars.html new file mode 100644 index 0000000..e9b7590 --- /dev/null +++ b/src/test-data/pug/test/cases/vars.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/test-data/pug/test/cases/vars.pug b/src/test-data/pug/test/cases/vars.pug new file mode 100644 index 0000000..46451a9 --- /dev/null +++ b/src/test-data/pug/test/cases/vars.pug @@ -0,0 +1,3 @@ +- var foo = 'bar' +- var list = [1,2,3] +a(class=list, id=foo) \ No newline at end of file diff --git a/src/test-data/pug/test/cases/while.html b/src/test-data/pug/test/cases/while.html new file mode 100644 index 0000000..dff7ff6 --- /dev/null +++ b/src/test-data/pug/test/cases/while.html @@ -0,0 +1,11 @@ +-
+
- 2 +
- 3 +
- 4 +
- 5 +
- 6 +
- 7 +
- 8 +
- 9 +
- 10 +
Hello World
"`;
+
+exports[`layout with duplicate block 2`] = `"Hello World
"`;
diff --git a/src/test-data/pug/test/duplicate-block/index.pug b/src/test-data/pug/test/duplicate-block/index.pug
new file mode 100644
index 0000000..87a454b
--- /dev/null
+++ b/src/test-data/pug/test/duplicate-block/index.pug
@@ -0,0 +1,4 @@
+extends ./layout-with-duplicate-block.pug
+
+block content
+ div Hello World
diff --git a/src/test-data/pug/test/duplicate-block/index.test.js b/src/test-data/pug/test/duplicate-block/index.test.js
new file mode 100644
index 0000000..d77631f
--- /dev/null
+++ b/src/test-data/pug/test/duplicate-block/index.test.js
@@ -0,0 +1,10 @@
+const pug = require('../../');
+
+test('layout with duplicate block', () => {
+ const outputWithAjax = pug.renderFile(__dirname + '/index.pug', {ajax: true});
+ const outputWithoutAjax = pug.renderFile(__dirname + '/index.pug', {
+ ajax: false,
+ });
+ expect(outputWithAjax).toMatchSnapshot();
+ expect(outputWithoutAjax).toMatchSnapshot();
+});
diff --git a/src/test-data/pug/test/duplicate-block/layout-with-duplicate-block.pug b/src/test-data/pug/test/duplicate-block/layout-with-duplicate-block.pug
new file mode 100644
index 0000000..41f1160
--- /dev/null
+++ b/src/test-data/pug/test/duplicate-block/layout-with-duplicate-block.pug
@@ -0,0 +1,8 @@
+if ajax
+ block content
+else
+ doctype html
+ html
+ head
+ body
+ block content
diff --git a/src/test-data/pug/test/eachOf/__snapshots__/index.test.js.snap b/src/test-data/pug/test/eachOf/__snapshots__/index.test.js.snap
new file mode 100644
index 0000000..b898335
--- /dev/null
+++ b/src/test-data/pug/test/eachOf/__snapshots__/index.test.js.snap
@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Proper Usage Brackets 1`] = `"Hello World!
\ No newline at end of file diff --git a/src/test-data/pug/test/markdown-it/index.test.js b/src/test-data/pug/test/markdown-it/index.test.js new file mode 100644 index 0000000..00bef9f --- /dev/null +++ b/src/test-data/pug/test/markdown-it/index.test.js @@ -0,0 +1,13 @@ +const pug = require('../../'); + +test('inline and include markdow-it should match ', () => { + const outputMarkdownInline = pug.renderFile( + __dirname + '/layout-markdown-inline.pug' + ); + + const outputMarkdownIncludes = pug.renderFile( + __dirname + '/layout-markdown-include.pug' + ); + + expect(outputMarkdownIncludes).toEqual(outputMarkdownInline); +}); diff --git a/src/test-data/pug/test/markdown-it/layout-markdown-include.pug b/src/test-data/pug/test/markdown-it/layout-markdown-include.pug new file mode 100644 index 0000000..6a776da --- /dev/null +++ b/src/test-data/pug/test/markdown-it/layout-markdown-include.pug @@ -0,0 +1 @@ +include:markdown-it(html=true) comment.md \ No newline at end of file diff --git a/src/test-data/pug/test/markdown-it/layout-markdown-inline.pug b/src/test-data/pug/test/markdown-it/layout-markdown-inline.pug new file mode 100644 index 0000000..ee46c9c --- /dev/null +++ b/src/test-data/pug/test/markdown-it/layout-markdown-inline.pug @@ -0,0 +1,2 @@ +:markdown-it(html=true) +Hello World!
\ No newline at end of file diff --git a/src/test-data/pug/test/output-es2015/attr.html b/src/test-data/pug/test/output-es2015/attr.html new file mode 100644 index 0000000..63a82c0 --- /dev/null +++ b/src/test-data/pug/test/output-es2015/attr.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/test-data/pug/test/plugins.test.js b/src/test-data/pug/test/plugins.test.js new file mode 100644 index 0000000..21447bc --- /dev/null +++ b/src/test-data/pug/test/plugins.test.js @@ -0,0 +1,18 @@ +const pug = require('../'); + +test('#3295 - lexer plugins should be used in tag interpolation', () => { + const lex = { + advance(lexer) { + if ('~' === lexer.input.charAt(0)) { + lexer.tokens.push(lexer.tok('text', 'twiddle-dee-dee')); + lexer.consume(1); + lexer.incrementColumn(1); + return true; + } + }, + }; + const input = 'p Look at #[~]'; + const expected = 'Look at twiddle-dee-dee
'; + const output = pug.render(input, {plugins: [{lex}]}); + expect(output).toEqual(expected); +}); diff --git a/src/test-data/pug/test/pug.test.js b/src/test-data/pug/test/pug.test.js new file mode 100644 index 0000000..f688949 --- /dev/null +++ b/src/test-data/pug/test/pug.test.js @@ -0,0 +1,1510 @@ +'use strict'; + +var assert = require('assert'); +var fs = require('fs'); +var path = require('path'); +var pug = require('../'); + +var perfTest = fs.readFileSync(__dirname + '/fixtures/perf.pug', 'utf8'); + +try { + fs.mkdirSync(__dirname + '/temp'); +} catch (ex) { + if (ex.code !== 'EEXIST') { + throw ex; + } +} + +describe('pug', function() { + describe('unit tests with .render()', function() { + it('should support doctypes', function() { + assert.equal( + '', + pug.render('doctype xml') + ); + assert.equal('', pug.render('doctype html')); + assert.equal('', pug.render('doctype foo bar baz')); + assert.equal('', pug.render('doctype html')); + assert.equal('', pug.render('doctype', {doctype: 'html'})); + assert.equal( + '', + pug.render('doctype html', {doctype: 'xml'}) + ); + assert.equal('', pug.render('html')); + assert.equal( + '', + pug.render('html', {doctype: 'html'}) + ); + assert.equal( + '', + pug.render('doctype html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN') + ); + }); + + it('should support Buffers', function() { + assert.equal('foo
', pug.render(Buffer.from('p foo'))); + }); + + it('should support line endings', function() { + var src = ['p', 'div', 'img']; + + var html = ['', '', ''foo'
", pug.render("p 'foo'")); + assert.equal("'foo'
", pug.render("p\n | 'foo'")); + assert.equal( + '', + pug.render("- var path = 'foo';\na(href='/' + path)") + ); + }); + + it('should support block-expansion', function() { + assert.equal( + '',
+ pug.render('.foo: .bar baz')
+ );
+ });
+
+ it('should support tags', function() {
+ var str = ['p', 'div', 'img', 'br/'].join('\n');
+
+ var html = ['', '', '
'].join(''); + + assert.equal(html, pug.render(str), 'Test basic tags'); + assert.equal( + '
- ',
+ '
- a ', + '
- b ', + '
- c
- d
',
+ '- e ', + '
- ',
+ '
- one ', + '
- three ', + '
- two',
+ '
- ',
+ '
- a ', + '
- b ', + '
- c
- d
',
+ '- e ', + '
- ',
+ '
- a ', + '
- b ', + '
- c
- d
',
+ '- e ', + '
- ',
+ '
- a ', + '
- b ', + '
- c
- d
',
+ '- e ', + '
foo\n\nbar
', pug.render('p.\n foo\n\n bar')); + assert.equal( + 'foo\n\n\n\nbar
', + pug.render('p.\n foo\n\n\n\n bar') + ); + assert.equal( + 'foo\n bar\nfoo
', + pug.render('p.\n foo\n bar\n foo') + ); + assert.equal( + '', + pug.render('script.\n s.parentNode.insertBefore(g,s)\n') + ); + assert.equal( + '', + pug.render('script.\n s.parentNode.insertBefore(g,s)') + ); + }); + + it('should support tag text', function() { + assert.equal('some random text
', pug.render('p some random text')); + assert.equal( + 'clickGoogle.
', + pug.render('p\n | click\n a Google\n | .') + ); + assert.equal('(parens)
', pug.render('p (parens)')); + assert.equal( + '(parens)
', + pug.render('p(foo="bar") (parens)') + ); + assert.equal( + '', + pug.render('option(value="") -- (optional) foo --') + ); + }); + + it('should support tag text block', function() { + assert.equal( + 'foo \nbar \nbaz
', + pug.render('p\n | foo \n | bar \n | baz') + ); + assert.equal( + '', + pug.render('label\n | Password:\n input') + ); + assert.equal( + '', + pug.render('label Password:\n input') + ); + }); + + it('should support tag text interpolation', function() { + assert.equal( + 'yo, pug is cool', + pug.render('| yo, #{name} is cool\n', {name: 'pug'}) + ); + assert.equal( + 'yo, pug is cool
', + pug.render('p yo, #{name} is cool', {name: 'pug'}) + ); + assert.equal( + 'yo, pug is cool', + pug.render('| yo, #{name || "pug"} is cool', {name: null}) + ); + assert.equal( + "yo, 'pug' is cool", + pug.render('| yo, #{name || "\'pug\'"} is cool', {name: null}) + ); + assert.equal( + 'foo <script> bar', + pug.render('| foo #{code} bar', {code: '', + '', + '', + ].join(''); + + assert.equal(html, pug.render(str)); + }); + + it('should support comments', function() { + // Regular + var str = ['//foo', 'p bar'].join('\n'); + + var html = ['', 'bar
'].join(''); + + assert.equal(html, pug.render(str)); + + // Between tags + + var str = ['p foo', '// bar ', 'p baz'].join('\n'); + + var html = ['foo
', '', 'baz
'].join(''); + + assert.equal(html, pug.render(str)); + + // Quotes + + var str = "", + js = "// script(src: '/js/validate.js') "; + assert.equal(str, pug.render(js)); + }); + + it('should support unbuffered comments', function() { + var str = ['//- foo', 'p bar'].join('\n'); + + var html = ['bar
'].join(''); + + assert.equal(html, pug.render(str)); + + var str = ['p foo', '//- bar ', 'p baz'].join('\n'); + + var html = ['foo
', 'baz
'].join(''); + + assert.equal(html, pug.render(str)); + }); + + it('should support literal html', function() { + assert.equal( + '', + pug.render('') + ); + }); + + it('should support code', function() { + assert.equal('test', pug.render('!= "test"')); + assert.equal('test', pug.render('= "test"')); + assert.equal('test', pug.render('- var foo = "test"\n=foo')); + assert.equal( + 'footestbar', + pug.render('- var foo = "test"\n| foo\nem= foo\n| bar') + ); + assert.equal( + 'testsomething
', + pug.render('!= "test"\nh2 something') + ); + + var str = ['- var foo = "foo\u2028bar
', pug.render('p foo\u2028bar')); + assert.equal('foo\u2029bar
', pug.render('p foo\u2029bar')); + }); + + it('should display error line number correctly up to token level', function() { + var str = [ + 'p.', + ' Lorem ipsum dolor sit amet, consectetur', + ' adipisicing elit, sed do eiusmod tempor', + ' incididunt ut labore et dolore magna aliqua.', + 'p.', + ' Ut enim ad minim veniam, quis nostrud', + ' exercitation ullamco laboris nisi ut aliquip', + ' ex ea commodo consequat.', + 'p.', + ' Duis aute irure dolor in reprehenderit', + ' in voluptate velit esse cillum dolore eu', + ' fugiat nulla pariatur.', + 'a(href="#" Next', + ].join('\n'); + var errorLocation = function(str) { + try { + pug.render(str); + } catch (err) { + return err.message.split('\n')[0]; + } + }; + assert.equal(errorLocation(str), 'Pug:13:16'); + }); + }); + + describe('.compileFile()', function() { + it('does not produce warnings for issue-1593', function() { + pug.compileFile(__dirname + '/fixtures/issue-1593/index.pug'); + }); + it('should support caching (pass 1)', function() { + fs.writeFileSync(__dirname + '/temp/input-compileFile.pug', '.foo bar'); + var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug', { + cache: true, + }); + var expected = 'bar
';
+ assert(fn() === expected);
+ });
+ it('should support caching (pass 2)', function() {
+ // Poison the input file
+ fs.writeFileSync(
+ __dirname + '/temp/input-compileFile.pug',
+ '.big fat hen'
+ );
+ var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug', {
+ cache: true,
+ });
+ var expected = 'bar
';
+ assert(fn() === expected);
+ });
+ });
+
+ describe('.render()', function() {
+ it('should support .pug.render(str, fn)', function() {
+ pug.render('p foo bar', function(err, str) {
+ assert.ok(!err);
+ assert.equal('foo bar
', str); + }); + }); + + it('should support .pug.render(str, options, fn)', function() { + pug.render('p #{foo}', {foo: 'bar'}, function(err, str) { + assert.ok(!err); + assert.equal('bar
', str); + }); + }); + + it('should support .pug.render(str, options, fn) cache', function() { + pug.render('p bar', {cache: true}, function(err, str) { + assert.ok( + /the "filename" option is required for caching/.test(err.message) + ); + }); + + pug.render('p foo bar', {cache: true, filename: 'test'}, function( + err, + str + ) { + assert.ok(!err); + assert.equal('foo bar
', str); + }); + }); + }); + + describe('.compile()', function() { + it('should support .compile()', function() { + var fn = pug.compile('p foo'); + assert.equal('foo
', fn()); + }); + + it('should support .compile() locals', function() { + var fn = pug.compile('p= foo'); + assert.equal('bar
', fn({foo: 'bar'})); + }); + + it("should support .compile() locals in 'self' hash", function() { + var fn = pug.compile('p= self.foo', {self: true}); + assert.equal('bar
', fn({foo: 'bar'})); + }); + + it('should support .compile() no debug', function() { + var fn = pug.compile('p foo\np #{bar}', {compileDebug: false}); + assert.equal('foo
baz
', fn({bar: 'baz'})); + }); + + it('should support .compile() no debug and global helpers', function() { + var fn = pug.compile('p foo\np #{bar}', { + compileDebug: false, + helpers: 'global', + }); + assert.equal('foo
baz
', fn({bar: 'baz'})); + }); + + it('should be reasonably fast', function() { + pug.compile(perfTest, {}); + }); + it('allows trailing space (see #1586)', function() { + var res = pug.render('ul \n li An Item'); + assert.equal('- An Item
bar
', actual);
+ done();
+ }
+ );
+ });
+ it('should support caching (pass 2)', function(done) {
+ // Poison the input file
+ fs.writeFileSync(
+ __dirname + '/temp/input-renderFile.pug',
+ '.big fat hen'
+ );
+ pug.renderFile(
+ __dirname + '/temp/input-renderFile.pug',
+ {cache: true},
+ function(err, actual) {
+ if (err) return done(err);
+ assert.equal('bar
', actual);
+ done();
+ }
+ );
+ });
+ });
+
+ describe('.compileFileClient(path, options)', function() {
+ it('returns a string form of a function called `template`', function() {
+ var src = pug.compileFileClient(__dirname + '/cases/basic.pug');
+ var expected = fs
+ .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+ .replace(/\s/g, '');
+ var fn = Function('pug', src + '\nreturn template;')(pug.runtime);
+ var actual = fn({name: 'foo'}).replace(/\s/g, '');
+ assert(actual === expected);
+ });
+ it('accepts the `name` option to rename the resulting function', function() {
+ var src = pug.compileFileClient(__dirname + '/cases/basic.pug', {
+ name: 'myTemplateName',
+ });
+ var expected = fs
+ .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+ .replace(/\s/g, '');
+ var fn = Function('pug', src + '\nreturn myTemplateName;')(pug.runtime);
+ var actual = fn({name: 'foo'}).replace(/\s/g, '');
+ assert(actual === expected);
+ });
+ it('should support caching (pass 1)', function() {
+ fs.writeFileSync(
+ __dirname + '/temp/input-compileFileClient.pug',
+ '.foo bar'
+ );
+ var src = pug.compileFileClient(
+ __dirname + '/temp/input-compileFileClient.pug',
+ {name: 'myTemplateName', cache: true}
+ );
+ var expected = 'bar
';
+ var fn = Function('pug', src + '\nreturn myTemplateName;')(pug.runtime);
+ assert(fn() === expected);
+ });
+ it('should support caching (pass 2)', function() {
+ // Poison the input file
+ fs.writeFileSync(
+ __dirname + '/temp/input-compileFileClient.pug',
+ '.big fat hen'
+ );
+ var src = pug.compileFileClient(
+ __dirname + '/temp/input-compileFileClient.pug',
+ {name: 'myTemplateName', cache: true}
+ );
+ var expected = 'bar
';
+ var fn = Function('pug', src + '\nreturn myTemplateName;')(pug.runtime);
+ assert(fn() === expected);
+ });
+ });
+
+ describe('.runtime', function() {
+ describe('.merge', function() {
+ it('merges two attribute objects, giving precedensce to the second object', function() {
+ assert.deepEqual(
+ pug.runtime.merge({}, {class: ['foo', 'bar'], foo: 'bar'}),
+ {class: ['foo', 'bar'], foo: 'bar'}
+ );
+ assert.deepEqual(
+ pug.runtime.merge(
+ {class: ['foo'], foo: 'baz'},
+ {class: ['bar'], foo: 'bar'}
+ ),
+ {class: ['foo', 'bar'], foo: 'bar'}
+ );
+ assert.deepEqual(
+ pug.runtime.merge({class: ['foo', 'bar'], foo: 'bar'}, {}),
+ {class: ['foo', 'bar'], foo: 'bar'}
+ );
+ });
+ });
+ describe('.attrs', function() {
+ it('Renders the given attributes object', function() {
+ assert.equal(pug.runtime.attrs({}), '');
+ assert.equal(pug.runtime.attrs({class: []}), '');
+ assert.equal(pug.runtime.attrs({class: ['foo']}), ' class="foo"');
+ assert.equal(
+ pug.runtime.attrs({class: ['foo'], id: 'bar'}),
+ ' class="foo" id="bar"'
+ );
+ });
+ });
+ });
+
+ describe('filter indentation', function() {
+ it('is maintained', function() {
+ var filters = {
+ indents: function(str) {
+ return str
+ .split(/\n/)
+ .map(function(line) {
+ return line.match(/^ */)[0].length;
+ })
+ .join(',');
+ },
+ };
+
+ var indents = [
+ ':indents',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ' x',
+ ].join('\n');
+
+ assert.equal(
+ pug.render(indents, {filters: filters}),
+ '0,1,2,3,0,4,4,3,3,4,2,0,2,0,1'
+ );
+ });
+ });
+
+ describe('.compile().dependencies', function() {
+ it('should list the filename of the template referenced by extends', function() {
+ var filename = __dirname + '/dependencies/extends1.pug';
+ var str = fs.readFileSync(filename, 'utf8');
+ var info = pug.compile(str, {filename: filename});
+ assert.deepEqual(
+ [path.resolve(__dirname + '/dependencies/dependency1.pug')],
+ info.dependencies
+ );
+ });
+ it('should list the filename of the template referenced by an include', function() {
+ var filename = __dirname + '/dependencies/include1.pug';
+ var str = fs.readFileSync(filename, 'utf8');
+ var info = pug.compile(str, {filename: filename});
+ assert.deepEqual(
+ [path.resolve(__dirname + '/dependencies/dependency1.pug')],
+ info.dependencies
+ );
+ });
+ it('should list the dependencies of extends dependencies', function() {
+ var filename = __dirname + '/dependencies/extends2.pug';
+ var str = fs.readFileSync(filename, 'utf8');
+ var info = pug.compile(str, {filename: filename});
+ assert.deepEqual(
+ [
+ path.resolve(__dirname + '/dependencies/dependency2.pug'),
+ path.resolve(__dirname + '/dependencies/dependency3.pug'),
+ ],
+ info.dependencies
+ );
+ });
+ it('should list the dependencies of include dependencies', function() {
+ var filename = __dirname + '/dependencies/include2.pug';
+ var str = fs.readFileSync(filename, 'utf8');
+ var info = pug.compile(str, {filename: filename});
+ assert.deepEqual(
+ [
+ path.resolve(__dirname + '/dependencies/dependency2.pug'),
+ path.resolve(__dirname + '/dependencies/dependency3.pug'),
+ ],
+ info.dependencies
+ );
+ });
+ });
+
+ describe('.name', function() {
+ it('should have a name attribute', function() {
+ assert.strictEqual(pug.name, 'Pug');
+ });
+ });
+});
diff --git a/src/test-data/pug/test/regression-2436/__snapshots__/index.test.js.snap b/src/test-data/pug/test/regression-2436/__snapshots__/index.test.js.snap
new file mode 100644
index 0000000..142ec67
--- /dev/null
+++ b/src/test-data/pug/test/regression-2436/__snapshots__/index.test.js.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`#2436 - block with a same name extends from different layout in nesting 1`] = `
+"
+layout
+Main A
+other layout
+Other A
" +`; + +exports[`#2436 - block with a same name extends from the same layout in nesting 1`] = ` +" +layout
+Main A
+layout
+Other A
" +`; diff --git a/src/test-data/pug/test/regression-2436/index.test.js b/src/test-data/pug/test/regression-2436/index.test.js new file mode 100644 index 0000000..d9647b8 --- /dev/null +++ b/src/test-data/pug/test/regression-2436/index.test.js @@ -0,0 +1,11 @@ +const pug = require('../../'); + +test('#2436 - block with a same name extends from the same layout in nesting', () => { + const output = pug.renderFile(__dirname + '/issue1.pug', {pretty: true}); + expect(output).toMatchSnapshot(); +}); + +test('#2436 - block with a same name extends from different layout in nesting', () => { + const output = pug.renderFile(__dirname + '/issue2.pug', {pretty: true}); + expect(output).toMatchSnapshot(); +}); diff --git a/src/test-data/pug/test/regression-2436/issue1.pug b/src/test-data/pug/test/regression-2436/issue1.pug new file mode 100644 index 0000000..f521c6e --- /dev/null +++ b/src/test-data/pug/test/regression-2436/issue1.pug @@ -0,0 +1,7 @@ +extends layout.pug + +block a + p Main A + +block b + include other1.pug diff --git a/src/test-data/pug/test/regression-2436/issue2.pug b/src/test-data/pug/test/regression-2436/issue2.pug new file mode 100644 index 0000000..7acba59 --- /dev/null +++ b/src/test-data/pug/test/regression-2436/issue2.pug @@ -0,0 +1,7 @@ +extends layout.pug + +block a + p Main A + +block b + include other2.pug diff --git a/src/test-data/pug/test/regression-2436/layout.pug b/src/test-data/pug/test/regression-2436/layout.pug new file mode 100644 index 0000000..71ad7eb --- /dev/null +++ b/src/test-data/pug/test/regression-2436/layout.pug @@ -0,0 +1,6 @@ +h1 layout + +block a + p block in layout + +block b diff --git a/src/test-data/pug/test/regression-2436/other1.pug b/src/test-data/pug/test/regression-2436/other1.pug new file mode 100644 index 0000000..206cb4f --- /dev/null +++ b/src/test-data/pug/test/regression-2436/other1.pug @@ -0,0 +1,4 @@ +extends layout.pug + +block a + p Other A diff --git a/src/test-data/pug/test/regression-2436/other2.pug b/src/test-data/pug/test/regression-2436/other2.pug new file mode 100644 index 0000000..6329aeb --- /dev/null +++ b/src/test-data/pug/test/regression-2436/other2.pug @@ -0,0 +1,4 @@ +extends other_layout.pug + +block a + p Other A diff --git a/src/test-data/pug/test/regression-2436/other_layout.pug b/src/test-data/pug/test/regression-2436/other_layout.pug new file mode 100644 index 0000000..edda161 --- /dev/null +++ b/src/test-data/pug/test/regression-2436/other_layout.pug @@ -0,0 +1,4 @@ +h1 other layout + +block a + p block in other layout diff --git a/src/test-data/pug/test/run-es2015.test.js b/src/test-data/pug/test/run-es2015.test.js new file mode 100644 index 0000000..0ee3d35 --- /dev/null +++ b/src/test-data/pug/test/run-es2015.test.js @@ -0,0 +1,21 @@ +'use strict'; + +const fs = require('fs'); +const assert = require('assert'); +const mkdirp = require('mkdirp').sync; +const runUtils = require('./run-utils'); +const pug = require('../'); + +var cases = runUtils.findCases(__dirname + '/cases'); +var es2015 = runUtils.findCases(__dirname + '/cases-es2015'); + +mkdirp(__dirname + '/output-es2015'); + +describe('test cases for ECMAScript 2015', function() { + try { + eval('``'); + es2015.forEach(runUtils.testSingle.bind(null, it, '-es2015')); + } catch (ex) { + es2015.forEach(runUtils.testSingle.bind(null, it.skip, '-es2015')); + } +}); diff --git a/src/test-data/pug/test/run-syntax-errors.test.js b/src/test-data/pug/test/run-syntax-errors.test.js new file mode 100644 index 0000000..379750c --- /dev/null +++ b/src/test-data/pug/test/run-syntax-errors.test.js @@ -0,0 +1,43 @@ +const assert = require('assert'); +const fs = require('fs'); +const runUtils = require('./run-utils'); +const pug = require('../'); + +const anti = runUtils.findCases(__dirname + '/anti-cases'); + +describe('certain syntax is not allowed and will throw a compile time error', function() { + anti.forEach(function(test) { + var name = test.replace(/[-.]/g, ' '); + it(name, function() { + var path = __dirname.replace(/\\/g, '/') + '/anti-cases/' + test + '.pug'; + var str = fs.readFileSync(path, 'utf8'); + try { + var fn = pug.compile(str, { + filename: path, + pretty: true, + basedir: __dirname + '/anti-cases', + filters: runUtils.filters, + }); + } catch (ex) { + if (!ex.code) { + throw ex; + } + assert(ex instanceof Error, 'Should throw a real Error'); + assert( + ex.code.indexOf('PUG:') === 0, + 'It should have a code of "PUG:SOMETHING"' + ); + assert( + ex.message.replace(/\\/g, '/').indexOf(path) === 0, + 'it should start with the path' + ); + assert( + /:\d+$/m.test(ex.message.replace(/\\/g, '/')), + 'it should include a line number.' + ); + return; + } + throw new Error(test + ' should have thrown an error'); + }); + }); +}); diff --git a/src/test-data/pug/test/run-utils.js b/src/test-data/pug/test/run-utils.js new file mode 100644 index 0000000..2d1eccf --- /dev/null +++ b/src/test-data/pug/test/run-utils.js @@ -0,0 +1,154 @@ +var fs = require('fs'); +var assert = require('assert'); +var pug = require('../'); +var uglify = require('uglify-js'); +var mkdirp = require('mkdirp').sync; + +var filters = { + custom: function(str, options) { + assert(options.opt === 'val'); + assert(options.num === 2); + return 'BEGIN' + str + 'END'; + }, +}; + +// test cases + +function writeFileSync(filename, data) { + try { + if (fs.readFileSync(filename, 'utf8') === data.toString('utf8')) { + return; + } + } catch (ex) { + if (ex.code !== 'ENOENT') { + throw ex; + } + } + fs.writeFileSync(filename, data); +} + +function findCases(dir) { + return fs + .readdirSync(dir) + .filter(function(file) { + return ~file.indexOf('.pug'); + }) + .map(function(file) { + return file.replace('.pug', ''); + }); +} + +function testSingle(it, suffix, test) { + var name = test.replace(/[-.]/g, ' '); + it(name, function() { + var path = __dirname + '/cases' + suffix + '/' + test + '.pug'; + var str = fs.readFileSync(path, 'utf8'); + var fn = pug.compile(str, { + filename: path, + pretty: true, + basedir: __dirname + '/cases' + suffix, + filters: filters, + filterAliases: {markdown: 'markdown-it'}, + }); + var actual = fn({title: 'Pug'}); + + writeFileSync( + __dirname + '/output' + suffix + '/' + test + '.html', + actual + ); + + var html = fs + .readFileSync( + __dirname + '/cases' + suffix + '/' + test + '.html', + 'utf8' + ) + .trim() + .replace(/\r/g, ''); + var clientCode = uglify.minify( + pug.compileClient(str, { + filename: path, + pretty: true, + compileDebug: false, + basedir: __dirname + '/cases' + suffix, + filters: filters, + filterAliases: {markdown: 'markdown-it'}, + }), + { + output: {beautify: true}, + mangle: false, + compress: false, + fromString: true, + } + ).code; + var clientCodeDebug = uglify.minify( + pug.compileClient(str, { + filename: path, + pretty: true, + compileDebug: true, + basedir: __dirname + '/cases' + suffix, + filters: filters, + filterAliases: {markdown: 'markdown-it'}, + }), + { + output: {beautify: true}, + mangle: false, + compress: false, + fromString: true, + } + ).code; + writeFileSync( + __dirname + '/output' + suffix + '/' + test + '.js', + uglify.minify( + pug.compileClient(str, { + filename: path, + pretty: false, + compileDebug: false, + basedir: __dirname + '/cases' + suffix, + filters: filters, + filterAliases: {markdown: 'markdown-it'}, + }), + { + output: {beautify: true}, + mangle: false, + compress: false, + fromString: true, + } + ).code + ); + if (/filter/.test(test)) { + actual = actual.replace(/\n| /g, ''); + html = html.replace(/\n| /g, ''); + } + if (/mixins-unused/.test(test)) { + assert( + /never-called/.test(str), + 'never-called is in the pug file for mixins-unused' + ); + assert( + !/never-called/.test(clientCode), + 'never-called should be removed from the code' + ); + } + expect(actual.trim()).toEqual(html); + actual = Function('pug', clientCode + '\nreturn template;')()({ + title: 'Pug', + }); + if (/filter/.test(test)) { + actual = actual.replace(/\n| /g, ''); + } + expect(actual.trim()).toEqual(html); + actual = Function('pug', clientCodeDebug + '\nreturn template;')()({ + title: 'Pug', + }); + if (/filter/.test(test)) { + actual = actual.replace(/\n| /g, ''); + } + expect(actual.trim()).toEqual(html); + }); +} + +module.exports = { + filters, + findCases, + testSingle, +}; diff --git a/src/test-data/pug/test/run.test.js b/src/test-data/pug/test/run.test.js new file mode 100644 index 0000000..b5c0270 --- /dev/null +++ b/src/test-data/pug/test/run.test.js @@ -0,0 +1,20 @@ +'use strict'; + +// even and odd tests are arbitrarily split because jest is faster that way + +const fs = require('fs'); +const assert = require('assert'); +const mkdirp = require('mkdirp').sync; +const runUtils = require('./run-utils'); +const pug = require('../'); + +var cases = runUtils.findCases(__dirname + '/cases'); +var es2015 = runUtils.findCases(__dirname + '/cases-es2015'); + +mkdirp(__dirname + '/output'); + +describe('test cases', function() { + cases.forEach((test, i) => { + runUtils.testSingle(it, '', test); + }); +}); diff --git a/src/test-data/pug/test/shadowed-block/__snapshots__/index.test.js.snap b/src/test-data/pug/test/shadowed-block/__snapshots__/index.test.js.snap new file mode 100644 index 0000000..43a917e --- /dev/null +++ b/src/test-data/pug/test/shadowed-block/__snapshots__/index.test.js.snap @@ -0,0 +1,5 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`layout with shadowed block 1`] = `""`; + +exports[`layout with shadowed block 2`] = `""`; diff --git a/src/test-data/pug/test/shadowed-block/base.pug b/src/test-data/pug/test/shadowed-block/base.pug new file mode 100644 index 0000000..7148cac --- /dev/null +++ b/src/test-data/pug/test/shadowed-block/base.pug @@ -0,0 +1,4 @@ +block root + // base.pug: root + block shadowed + // base.pug: shadowed diff --git a/src/test-data/pug/test/shadowed-block/index.pug b/src/test-data/pug/test/shadowed-block/index.pug new file mode 100644 index 0000000..dabca48 --- /dev/null +++ b/src/test-data/pug/test/shadowed-block/index.pug @@ -0,0 +1,4 @@ +extends ./layout.pug + +block shadowed + // index.pug: shadowed diff --git a/src/test-data/pug/test/shadowed-block/index.test.js b/src/test-data/pug/test/shadowed-block/index.test.js new file mode 100644 index 0000000..97999a8 --- /dev/null +++ b/src/test-data/pug/test/shadowed-block/index.test.js @@ -0,0 +1,10 @@ +const pug = require('../../'); + +test('layout with shadowed block', () => { + const outputWithAjax = pug.renderFile(__dirname + '/index.pug', {ajax: true}); + const outputWithoutAjax = pug.renderFile(__dirname + '/index.pug', { + ajax: false, + }); + expect(outputWithAjax).toMatchSnapshot(); + expect(outputWithoutAjax).toMatchSnapshot(); +}); diff --git a/src/test-data/pug/test/shadowed-block/layout.pug b/src/test-data/pug/test/shadowed-block/layout.pug new file mode 100644 index 0000000..fa27d25 --- /dev/null +++ b/src/test-data/pug/test/shadowed-block/layout.pug @@ -0,0 +1,6 @@ +extends ./base.pug + +block root + // layout.pug: root + block shadowed + // layout.pug: shadowed diff --git a/src/test-data/pug/test/temp/input-compileFile.pug b/src/test-data/pug/test/temp/input-compileFile.pug new file mode 100644 index 0000000..7a3caea --- /dev/null +++ b/src/test-data/pug/test/temp/input-compileFile.pug @@ -0,0 +1 @@ +.big fat hen \ No newline at end of file diff --git a/src/test-data/pug/test/temp/input-compileFileClient.pug b/src/test-data/pug/test/temp/input-compileFileClient.pug new file mode 100644 index 0000000..7a3caea --- /dev/null +++ b/src/test-data/pug/test/temp/input-compileFileClient.pug @@ -0,0 +1 @@ +.big fat hen \ No newline at end of file diff --git a/src/test-data/pug/test/temp/input-renderFile.pug b/src/test-data/pug/test/temp/input-renderFile.pug new file mode 100644 index 0000000..7a3caea --- /dev/null +++ b/src/test-data/pug/test/temp/input-renderFile.pug @@ -0,0 +1 @@ +.big fat hen \ No newline at end of file diff --git a/src/tests/check_list/source.html b/src/tests/check_list/source.html index 1881c0f..4248ef7 100644 --- a/src/tests/check_list/source.html +++ b/src/tests/check_list/source.html @@ -1,6 +1,6 @@ -
This
+is regular, javascript
+