tina4-nodejs 3.13.133 → 3.13.134

package/packages/frond/dist/index.js

@@ -93,60 +93,53 @@ var JSON_UNSAFE_MAP = {
 function jsonSafe(value) {
   return new SafeString(jsonText(value).replace(JSON_UNSAFE_RE, (c) => JSON_UNSAFE_MAP[c]));
 }
-function inspectValue(value, seen = /* @__PURE__ */ new WeakSet(), depth = 0) {
-  if (value === null) return "null";
-  if (value === void 0) return "undefined";
-  if (typeof value === "string") return JSON.stringify(value);
-  if (typeof value === "number" || typeof value === "boolean") return String(value);
-  if (typeof value === "bigint") return `${value.toString()}n`;
-  if (typeof value === "symbol") return value.toString();
-  if (typeof value === "function") {
-    const name = value.name || "(anonymous)";
-    return `[Function: ${name}]`;
+function inspectPrimitive(value) {
+  if (value === null) return { handled: true, output: "null" };
+  if (value === void 0) return { handled: true, output: "undefined" };
+  if (typeof value === "string") return { handled: true, output: JSON.stringify(value) };
+  if (typeof value === "number" || typeof value === "boolean") return { handled: true, output: String(value) };
+  if (typeof value === "bigint") return { handled: true, output: `${value.toString()}n` };
+  if (typeof value === "symbol") return { handled: true, output: value.toString() };
+  if (typeof value === "function") return { handled: true, output: `[Function: ${value.name || "(anonymous)"}]` };
+  return { handled: false, output: "" };
+}
+function inspectCollection(obj, seen, depth) {
+  if (obj instanceof Map) {
+    if (obj.size === 0) return "Map(0) {}";
+    const entries = [...obj].map(([key, value]) => `${inspectValue(key, seen, depth + 1)} => ${inspectValue(value, seen, depth + 1)}`);
+    return `Map(${obj.size}) { ${entries.join(", ")} }`;
+  }
+  if (obj instanceof Set) {
+    if (obj.size === 0) return "Set(0) {}";
+    return `Set(${obj.size}) { ${[...obj].map((value) => inspectValue(value, seen, depth + 1)).join(", ")} }`;
   }
+  if (Array.isArray(obj)) {
+    if (obj.length === 0) return "[]";
+    return `[${obj.map((value) => inspectValue(value, seen, depth + 1)).join(", ")}]`;
+  }
+  return null;
+}
+function inspectObject(obj, seen, depth) {
+  if (obj instanceof Date) return `Date(${obj.toISOString()})`;
+  if (obj instanceof RegExp) return obj.toString();
+  if (obj instanceof Error) return `${obj.constructor.name}(${JSON.stringify(obj.message)})`;
+  const collection = inspectCollection(obj, seen, depth);
+  if (collection !== null) return collection;
+  const keys = Object.keys(obj);
+  const className = obj.constructor && obj.constructor.name !== "Object" ? `${obj.constructor.name} ` : "";
+  if (keys.length === 0) return `${className}{}`;
+  const props = keys.map((key) => `${key}: ${inspectValue(obj[key], seen, depth + 1)}`);
+  return `${className}{ ${props.join(", ")} }`;
+}
+function inspectValue(value, seen = /* @__PURE__ */ new WeakSet(), depth = 0) {
+  const primitive = inspectPrimitive(value);
+  if (primitive.handled) return primitive.output;
   const obj = value;
   if (seen.has(obj)) return "[Circular]";
   seen.add(obj);
   if (depth > 8) return "[...]";
   try {
-    if (obj instanceof Date) {
-      return `Date(${obj.toISOString()})`;
-    }
-    if (obj instanceof RegExp) {
-      return obj.toString();
-    }
-    if (obj instanceof Error) {
-      return `${obj.constructor.name}(${JSON.stringify(obj.message)})`;
-    }
-    if (obj instanceof Map) {
-      if (obj.size === 0) return "Map(0) {}";
-      const entries = [];
-      for (const [k, v] of obj) {
-        entries.push(`${inspectValue(k, seen, depth + 1)} => ${inspectValue(v, seen, depth + 1)}`);
-      }
-      return `Map(${obj.size}) { ${entries.join(", ")} }`;
-    }
-    if (obj instanceof Set) {
-      if (obj.size === 0) return "Set(0) {}";
-      const items = [];
-      for (const v of obj) {
-        items.push(inspectValue(v, seen, depth + 1));
-      }
-      return `Set(${obj.size}) { ${items.join(", ")} }`;
-    }
-    if (Array.isArray(obj)) {
-      if (obj.length === 0) return "[]";
-      const items = obj.map((v) => inspectValue(v, seen, depth + 1));
-      return `[${items.join(", ")}]`;
-    }
-    const keys = Object.keys(obj);
-    const className = obj.constructor && obj.constructor.name !== "Object" ? `${obj.constructor.name} ` : "";
-    if (keys.length === 0) return `${className}{}`;
-    const props = keys.map((k) => {
-      const v = obj[k];
-      return `${k}: ${inspectValue(v, seen, depth + 1)}`;
-    });
-    return `${className}{ ${props.join(", ")} }`;
+    return inspectObject(obj, seen, depth);
   } finally {
     seen.delete(obj);
   }
@@ -172,6 +165,33 @@ var FILTER_WITH_ARGS_RE = /^(\w+)\s*\(([\s\S]*)\)$/;
 var FILTER_COMPARISON_RE = /^(\w+)\s*(!=|==|>=|<=|>|<)\s*(.+)$/;
 var TITLE_WORD_RE = /\b\w/g;
 var STRIP_TAGS_RE = /<[^>]+>/g;
+var FAST_FILTERS = {
+  upper: (value) => String(value).toUpperCase(),
+  lower: (value) => String(value).toLowerCase(),
+  trim: (value) => String(value).trim(),
+  length: (value) => Array.isArray(value) ? value.length : typeof value === "string" ? value.length : typeof value === "object" && value !== null ? Object.keys(value).length : 0,
+  capitalize: (value) => {
+    const s = String(value);
+    return s.charAt(0).toUpperCase() + s.slice(1).toLowerCase();
+  },
+  title: (value) => String(value).replace(TITLE_WORD_RE, (c) => c.toUpperCase()),
+  string: (value) => String(value),
+  int: (value) => value ? parseInt(String(value), 10) || 0 : 0,
+  float: (value) => value ? parseFloat(String(value)) || 0 : 0,
+  abs: (value) => typeof value === "number" ? Math.abs(value) : value,
+  striptags: (value) => String(value).replace(STRIP_TAGS_RE, ""),
+  first: (value) => Array.isArray(value) ? value[0] ?? null : null,
+  last: (value) => Array.isArray(value) ? value[value.length - 1] ?? null : null,
+  keys: (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? Object.keys(value) : [],
+  values: (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? Object.values(value) : [],
+  json_encode: (value) => jsonSafe(value),
+  dump: (value) => renderDump(value),
+  nl2br: (value) => new SafeString(htmlEscape(String(value)).replace(/\n/g, "<br />\n")),
+  unique: (value) => Array.isArray(value) ? [...new Set(value)] : value,
+  sort: (value) => Array.isArray(value) ? [...value].sort() : value,
+  reverse: (value) => Array.isArray(value) ? [...value].reverse() : String(value).split("").reverse().join(""),
+  filter: (value) => Array.isArray(value) ? value.filter(Boolean) : value
+};
 var FORMAT_RE = /%%|%([-+ 0]*)(\d+)?(?:\.(\d+))?([sdifFeEgGxXob])/g;
 var LEADING_WS_RE = /^\s+/;
 var TRAILING_WS_RE = /\s+$/;
@@ -277,153 +297,136 @@ function extendsTarget(source) {
   const match = source.match(EXTENDS_RE);
   return match ? match[1] : "";
 }
-function resolveVar(expr, context) {
-  expr = expr.trim();
-  if (expr.startsWith('"') && expr.endsWith('"') || expr.startsWith("'") && expr.endsWith("'")) {
-    return expr.slice(1, -1);
-  }
-  if (NUMERIC_RE.test(expr)) {
-    return expr.includes(".") ? parseFloat(expr) : parseInt(expr, 10);
-  }
-  if (expr === "true") return true;
-  if (expr === "false") return false;
-  if (expr === "null" || expr === "none" || expr === "None") return null;
-  if (expr.startsWith("[") && expr.endsWith("]")) {
-    const inner = expr.slice(1, -1).trim();
-    if (inner === "") return [];
-    const items = splitArgs(inner);
-    return items.map((item) => evalExpr(item.trim(), context));
-  }
-  let parts;
-  let fromBracket;
+function parsePath(expr) {
   const cachedPath = pathParseCache.get(expr);
-  if (cachedPath) {
-    [parts, fromBracket] = cachedPath;
-  } else {
-    parts = [];
-    fromBracket = [];
-    {
-      let current = "";
-      let depth = 0;
-      let inQuote = null;
-      for (let i = 0; i < expr.length; i++) {
-        const ch = expr[i];
-        if (inQuote) {
-          current += ch;
-          if (ch === inQuote) inQuote = null;
-          continue;
-        }
-        if (ch === '"' || ch === "'") {
-          inQuote = ch;
-          current += ch;
-          continue;
-        }
-        if (ch === "(") {
-          depth++;
-          current += ch;
-          continue;
-        }
-        if (ch === ")") {
-          depth--;
-          current += ch;
-          continue;
-        }
-        if (ch === "." && depth === 0) {
-          if (current) {
-            parts.push(current);
-            fromBracket.push(false);
-          }
-          current = "";
-          continue;
-        }
-        if (ch === "[" && depth === 0) {
-          if (current) {
-            parts.push(current);
-            fromBracket.push(false);
-          }
-          current = "";
-          const end = expr.indexOf("]", i + 1);
-          if (end !== -1) {
-            parts.push(expr.slice(i + 1, end));
-            fromBracket.push(true);
-            i = end;
-          }
-          continue;
-        }
-        current += ch;
-      }
+  if (cachedPath) return cachedPath;
+  const parts = [];
+  const fromBracket = [];
+  let current = "";
+  let depth = 0;
+  let inQuote = null;
+  for (let i = 0; i < expr.length; i++) {
+    const ch = expr[i];
+    if (inQuote) {
+      current += ch;
+      if (ch === inQuote) inQuote = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inQuote = ch;
+      current += ch;
+      continue;
+    }
+    if (ch === "(") {
+      depth++;
+      current += ch;
+      continue;
+    }
+    if (ch === ")") {
+      depth--;
+      current += ch;
+      continue;
+    }
+    if (ch === "." && depth === 0) {
       if (current) {
         parts.push(current);
         fromBracket.push(false);
       }
-    }
-    capCache(pathParseCache, MEMO_CACHE_MAX);
-    pathParseCache.set(expr, [parts, fromBracket]);
-  }
-  let value = context;
-  for (let pi = 0; pi < parts.length; pi++) {
-    const part = parts[pi];
-    const isBracket = fromBracket[pi];
-    if (value === null || value === void 0) return null;
-    const methodMatch = part.match(METHOD_CALL_RE);
-    if (methodMatch) {
-      const methodName = methodMatch[1];
-      const rawArgs = methodMatch[2] || "";
-      if (typeof value === "object" && value !== null && methodName in value) {
-        const fn = value[methodName];
-        if (typeof fn === "function") {
-          if (rawArgs.trim()) {
-            const argParts = splitArgs(rawArgs);
-            const evalArgs = argParts.map((a) => evalExpr(a.trim(), context));
-            value = fn.apply(value, evalArgs);
-          } else {
-            value = fn.call(value);
-          }
-          continue;
-        }
-      }
-      return null;
-    }
-    const isQuotedPart = part.startsWith('"') && part.endsWith('"') || part.startsWith("'") && part.endsWith("'");
-    if (isBracket && part.includes(":") && !isQuotedPart) {
-      const sliceParts = part.split(":", 2);
-      const sStart = sliceParts[0].trim() ? parseInt(String(evalExpr(sliceParts[0].trim(), context)), 10) : void 0;
-      const sEnd = sliceParts[1].trim() ? parseInt(String(evalExpr(sliceParts[1].trim(), context)), 10) : void 0;
-      if (Array.isArray(value)) {
-        value = value.slice(sStart ?? 0, sEnd);
-      } else if (typeof value === "string") {
-        value = value.slice(sStart ?? 0, sEnd);
-      } else {
-        return null;
-      }
+      current = "";
       continue;
     }
-    let key;
-    if (isQuotedPart) {
-      key = part.slice(1, -1);
-    } else {
-      const asNum = parseInt(part, 10);
-      if (!isNaN(asNum) && String(asNum) === part) {
-        key = asNum;
-      } else if (isBracket) {
-        const resolved = evalExpr(part, context);
-        key = resolved !== void 0 ? String(resolved) : part;
-      } else {
-        key = part;
+    if (ch === "[" && depth === 0) {
+      if (current) {
+        parts.push(current);
+        fromBracket.push(false);
       }
-    }
-    if (typeof value === "object" && value !== null) {
-      if (Array.isArray(value) && typeof key === "number") {
-        value = value[key];
-      } else if (key in value) {
-        const v = value[key];
-        value = typeof v === "function" ? v.call(value) : v;
-      } else {
-        return null;
+      current = "";
+      const end = expr.indexOf("]", i + 1);
+      if (end !== -1) {
+        parts.push(expr.slice(i + 1, end));
+        fromBracket.push(true);
+        i = end;
       }
-    } else {
-      return null;
+      continue;
     }
+    current += ch;
+  }
+  if (current) {
+    parts.push(current);
+    fromBracket.push(false);
+  }
+  const parsed = [parts, fromBracket];
+  capCache(pathParseCache, MEMO_CACHE_MAX);
+  pathParseCache.set(expr, parsed);
+  return parsed;
+}
+function resolveMethodPart(value, part, context) {
+  const methodMatch = part.match(METHOD_CALL_RE);
+  if (!methodMatch || typeof value !== "object" || value === null) return { matched: false, value };
+  const methodName = methodMatch[1];
+  const rawArgs = methodMatch[2] || "";
+  const fn = value[methodName];
+  if (typeof fn !== "function") return { matched: false, value };
+  const args = rawArgs.trim() ? splitArgs(rawArgs).map((a) => evalExpr(a.trim(), context)) : [];
+  return { matched: true, value: fn.apply(value, args) };
+}
+function resolvePathKey(part, isBracket, context) {
+  const isQuotedPart = part.startsWith('"') && part.endsWith('"') || part.startsWith("'") && part.endsWith("'");
+  if (isQuotedPart) return part.slice(1, -1);
+  const asNum = parseInt(part, 10);
+  if (!isNaN(asNum) && String(asNum) === part) return asNum;
+  if (isBracket) {
+    const resolved = evalExpr(part, context);
+    return resolved !== void 0 ? String(resolved) : part;
+  }
+  return part;
+}
+function resolvePathPart(value, key) {
+  if (typeof value !== "object" || value === null) return { found: false, value: null };
+  if (Array.isArray(value) && typeof key === "number") return { found: true, value: value[key] };
+  if (!(key in value)) return { found: false, value: null };
+  const member = value[key];
+  return { found: true, value: typeof member === "function" ? member.call(value) : member };
+}
+function resolveLiteral(expr, context) {
+  if (expr.startsWith('"') && expr.endsWith('"') || expr.startsWith("'") && expr.endsWith("'")) {
+    return { handled: true, value: expr.slice(1, -1) };
+  }
+  if (NUMERIC_RE.test(expr)) return { handled: true, value: expr.includes(".") ? parseFloat(expr) : parseInt(expr, 10) };
+  if (expr === "true") return { handled: true, value: true };
+  if (expr === "false") return { handled: true, value: false };
+  if (expr === "null" || expr === "none" || expr === "None") return { handled: true, value: null };
+  if (expr.startsWith("[") && expr.endsWith("]")) {
+    const inner = expr.slice(1, -1).trim();
+    return { handled: true, value: inner === "" ? [] : splitArgs(inner).map((item) => evalExpr(item.trim(), context)) };
+  }
+  return { handled: false, value: void 0 };
+}
+function resolvePathSegment(value, part, isBracket, context) {
+  if (value === null || value === void 0) return { found: false, value: null };
+  const method = resolveMethodPart(value, part, context);
+  if (part.match(METHOD_CALL_RE)) return method.matched ? { found: true, value: method.value } : { found: false, value: null };
+  const isQuotedPart = part.startsWith('"') && part.endsWith('"') || part.startsWith("'") && part.endsWith("'");
+  if (isBracket && part.includes(":") && !isQuotedPart) {
+    const [rawStart, rawEnd] = part.split(":", 2);
+    const start = rawStart.trim() ? parseInt(String(evalExpr(rawStart.trim(), context)), 10) : void 0;
+    const end = rawEnd.trim() ? parseInt(String(evalExpr(rawEnd.trim(), context)), 10) : void 0;
+    if (Array.isArray(value)) return { found: true, value: value.slice(start ?? 0, end) };
+    if (typeof value === "string") return { found: true, value: value.slice(start ?? 0, end) };
+    return { found: false, value: null };
+  }
+  return resolvePathPart(value, resolvePathKey(part, isBracket, context));
+}
+function resolveVar(expr, context) {
+  expr = expr.trim();
+  const literal = resolveLiteral(expr, context);
+  if (literal.handled) return literal.value;
+  const [parts, fromBracket] = parsePath(expr);
+  let value = context;
+  for (let pi = 0; pi < parts.length; pi++) {
+    const result = resolvePathSegment(value, parts[pi], fromBracket[pi], context);
+    if (!result.found) return null;
+    value = result.value;
   }
   return value;
 }
@@ -1096,6 +1099,41 @@ function numberFormat(value, decimals, decimalPoint = ".", thousandsSep = ",") {
   const formatted = intPart.replace(THOUSANDS_RE, thousandsSep);
   return decPart ? `${formatted}${decimalPoint}${decPart}` : formatted;
 }
+function formatInteger(type, arg) {
+  const integer = Math.trunc(Number(arg) || 0);
+  if (type === "d" || type === "i") return String(integer);
+  if (type === "x") return integer.toString(16);
+  if (type === "X") return integer.toString(16).toUpperCase();
+  if (type === "o") return integer.toString(8);
+  return integer.toString(2);
+}
+function formatDecimal(type, precision, arg) {
+  const places = precision !== void 0 ? precision : 6;
+  if (type === "f" || type === "F") return Number(arg).toFixed(places);
+  if (type === "e" || type === "E") {
+    const out = Number(arg).toExponential(places);
+    return type === "E" ? out.toUpperCase() : out;
+  }
+  return String(Number(arg));
+}
+function formatValue(type, precision, arg) {
+  if (type === "s") return String(arg ?? "");
+  if ("dixXob".includes(type)) return formatInteger(type, arg);
+  if ("fFeEgG".includes(type)) return formatDecimal(type, precision, arg);
+  return String(arg ?? "");
+}
+function padFormattedValue(value, flags, width) {
+  if (!width) return value;
+  const targetWidth = parseInt(width, 10);
+  if (value.length >= targetWidth) return value;
+  const padFlags = flags || "";
+  return padFlags.includes("-") ? value.padEnd(targetWidth, " ") : value.padStart(targetWidth, padFlags.includes("0") ? "0" : " ");
+}
+function formatMatch(match, flags, width, prec, type, arg) {
+  if (match === "%%") return "%";
+  const precision = prec !== void 0 ? parseInt(prec, 10) : void 0;
+  return padFormattedValue(formatValue(type, precision, arg), flags, width);
+}
 var BUILTIN_FILTERS = {
   upper: (v) => String(v).toUpperCase(),
   lower: (v) => String(v).toLowerCase(),
@@ -1244,58 +1282,7 @@ var BUILTIN_FILTERS = {
   url_encode: (v) => encodeURIComponent(String(v)),
   format: (v, ...args) => {
     let idx = 0;
-    return String(v).replace(FORMAT_RE, (m, flags, width, prec, type) => {
-      if (m === "%%") return "%";
-      const arg = args[idx++];
-      const p = prec !== void 0 ? parseInt(String(prec), 10) : void 0;
-      let out;
-      switch (type) {
-        case "s":
-          out = String(arg ?? "");
-          break;
-        case "d":
-        case "i":
-          out = String(Math.trunc(Number(arg) || 0));
-          break;
-        case "f":
-        case "F":
-          out = Number(arg).toFixed(p !== void 0 ? p : 6);
-          break;
-        case "e":
-        case "E": {
-          out = Number(arg).toExponential(p !== void 0 ? p : 6);
-          if (type === "E") out = out.toUpperCase();
-          break;
-        }
-        case "g":
-        case "G":
-          out = String(Number(arg));
-          break;
-        case "x":
-          out = Math.trunc(Number(arg) || 0).toString(16);
-          break;
-        case "X":
-          out = Math.trunc(Number(arg) || 0).toString(16).toUpperCase();
-          break;
-        case "o":
-          out = Math.trunc(Number(arg) || 0).toString(8);
-          break;
-        case "b":
-          out = Math.trunc(Number(arg) || 0).toString(2);
-          break;
-        default:
-          out = String(arg ?? "");
-      }
-      if (width) {
-        const w = parseInt(String(width), 10);
-        if (out.length < w) {
-          const f = String(flags || "");
-          if (f.includes("-")) out = out.padEnd(w, " ");
-          else out = out.padStart(w, f.includes("0") ? "0" : " ");
-        }
-      }
-      return out;
-    });
+    return String(v).replace(FORMAT_RE, (m, flags, width, prec, type) => formatMatch(m, flags, width, prec, type, args[idx++]));
   },
   dump: (v) => JSON.stringify(v),
   formToken: (v) => _generateFormToken(v != null ? String(v) : ""),
@@ -1422,6 +1409,7 @@ var Frond = class _Frond {
   _allowedVars;
   fragmentCache;
   _autoEscape;
+  blockHandlers;
   /**
    * Token pre-compilation cache for file templates.
    *
@@ -1452,6 +1440,47 @@ var Frond = class _Frond {
     this._allowedVars = null;
     this.fragmentCache = /* @__PURE__ */ new Map();
     this._autoEscape = true;
+    this.blockHandlers = {
+      if: (tokens, start, _content, context) => {
+        const [output, next] = this.handleIf(tokens, start, context);
+        return { output, next };
+      },
+      for: (tokens, start, _content, context) => {
+        const [output, next] = this.handleFor(tokens, start, context);
+        return { output, next };
+      },
+      set: (tokens, start, content, context) => {
+        if (!content.includes("=")) return { next: this.handleSetBlock(tokens, start, context) };
+        this.handleSet(content, context);
+        return { next: start + 1 };
+      },
+      include: (_tokens, start, content, context) => ({ output: this.handleInclude(content, context), next: start + 1 }),
+      macro: (tokens, start, _content, context) => ({ next: this.handleMacro(tokens, start, context) }),
+      import: (_tokens, start, content, context) => {
+        this.handleImportAs(content, context);
+        return { next: start + 1 };
+      },
+      from: (_tokens, start, content, context) => {
+        this.handleFromImport(content, context);
+        return { next: start + 1 };
+      },
+      cache: (tokens, start, _content, context) => {
+        const [output, next] = this.handleCache(tokens, start, context);
+        return { output, next };
+      },
+      live: (tokens, start, _content, context) => {
+        const [output, next] = this.handleLive(tokens, start, context);
+        return { output, next };
+      },
+      spaceless: (tokens, start, _content, context) => {
+        const [output, next] = this.handleSpaceless(tokens, start, context);
+        return { output, next };
+      },
+      autoescape: (tokens, start, _content, context) => {
+        const [output, next] = this.handleAutoescape(tokens, start, context);
+        return { output, next };
+      }
+    };
     this.globals.formToken = (descriptor) => _generateFormToken(descriptor || "");
     this.globals.form_token = (descriptor) => _generateFormToken(descriptor || "");
     this.globals.formTokenValue = (descriptor) => _generateFormTokenValue(descriptor || "");
@@ -1773,97 +1802,72 @@ var Frond = class _Frond {
     const result = this.substituteBlocks(parentSource, childBlocks, context);
     return this.renderTokens(tokenize(result), context);
   }
+  dispatchBlock(tokens, start, content, tag, context) {
+    if (!this.tagPermitted(tag)) return { next: this.skipDeniedTag(tokens, start, tag, content) };
+    const handler = this.blockHandlers[tag];
+    if (handler) return handler(tokens, start, content, context);
+    if (tag === "block" || tag === "endblock" || tag === "extends") return { next: start + 1 };
+    if (tag !== "" && !TERMINATOR_TAGS.has(tag)) {
+      throw new Error(
+        `Frond: unknown tag "${tag}" -- known tags are: ${[...KNOWN_TAGS].sort().join(", ")}`
+      );
+    }
+    return { next: start + 1 };
+  }
+  renderTextToken(tokens, index, output) {
+    output.push(tokens[index][1]);
+    return index + 1;
+  }
+  renderVarToken(tokens, index, context, output) {
+    const [content, stripB, stripA] = stripTag(tokens[index][1]);
+    if (stripB && output.length > 0) output[output.length - 1] = output[output.length - 1].replace(TRAILING_WS_RE, "");
+    const result = this.evalVar(content, context);
+    output.push(result !== null && result !== void 0 ? String(result) : "");
+    if (stripA && index + 1 < tokens.length && tokens[index + 1][0] === "TEXT") {
+      tokens[index + 1] = ["TEXT", tokens[index + 1][1].replace(LEADING_WS_RE, "")];
+    }
+    return index + 1;
+  }
+  renderBlockToken(tokens, index, context, output) {
+    const [content, stripB, stripA] = stripTag(tokens[index][1]);
+    if (stripB && output.length > 0) output[output.length - 1] = output[output.length - 1].replace(TRAILING_WS_RE, "");
+    const tag = content.split(/\s+/)[0] || "";
+    if (stripA && index + 1 < tokens.length && tokens[index + 1][0] === "TEXT") {
+      tokens[index + 1] = ["TEXT", tokens[index + 1][1].replace(LEADING_WS_RE, "")];
+    }
+    let next;
+    if (tag === "if" && this.tagPermitted(tag)) {
+      const [result, after] = this.handleIf(tokens, index, context);
+      output.push(result);
+      next = after;
+    } else if (tag === "for" && this.tagPermitted(tag)) {
+      const [result, after] = this.handleFor(tokens, index, context);
+      output.push(result);
+      next = after;
+    } else {
+      const block = this.dispatchBlock(tokens, index, content, tag, context);
+      if (block.output !== void 0) output.push(block.output);
+      next = block.next;
+    }
+    if (stripA && next < tokens.length && tokens[next][0] === "TEXT") {
+      tokens[next] = ["TEXT", tokens[next][1].replace(LEADING_WS_RE, "")];
+    }
+    return next;
+  }
   renderTokens(tokens, context) {
     context.__frond_apply_filters__ = this._applyFiltersBound;
     const output = [];
     let i = 0;
     while (i < tokens.length) {
-      const [ttype, raw] = tokens[i];
+      const [ttype] = tokens[i];
       if (ttype === "TEXT") {
-        output.push(raw);
-        i++;
+        i = this.renderTextToken(tokens, i, output);
       } else if (ttype === "COMMENT") {
         i++;
       } else if (ttype === "VAR") {
-        const [content, stripB, stripA] = stripTag(raw);
-        if (stripB && output.length > 0) {
-          output[output.length - 1] = output[output.length - 1].replace(TRAILING_WS_RE, "");
-        }
-        const result = this.evalVar(content, context);
-        output.push(result !== null && result !== void 0 ? String(result) : "");
-        if (stripA && i + 1 < tokens.length && tokens[i + 1][0] === "TEXT") {
-          tokens[i + 1] = ["TEXT", tokens[i + 1][1].replace(LEADING_WS_RE, "")];
-        }
-        i++;
+        i = this.renderVarToken(tokens, i, context, output);
       } else if (ttype === "BLOCK") {
-        const [content, stripB, stripA] = stripTag(raw);
-        if (stripB && output.length > 0) {
-          output[output.length - 1] = output[output.length - 1].replace(TRAILING_WS_RE, "");
-        }
-        const parts = content.split(/\s+/);
-        const tag = parts[0] || "";
-        if (stripA && i + 1 < tokens.length && tokens[i + 1][0] === "TEXT") {
-          tokens[i + 1] = ["TEXT", tokens[i + 1][1].replace(LEADING_WS_RE, "")];
-        }
-        if (!this.tagPermitted(tag)) {
-          i = this.skipDeniedTag(tokens, i, tag, content);
-        } else if (tag === "if") {
-          const [result, skip] = this.handleIf(tokens, i, context);
-          output.push(result);
-          i = skip;
-        } else if (tag === "for") {
-          const [result, skip] = this.handleFor(tokens, i, context);
-          output.push(result);
-          i = skip;
-        } else if (tag === "set") {
-          if (!content.includes("=")) {
-            i = this.handleSetBlock(tokens, i, context);
-          } else {
-            this.handleSet(content, context);
-            i++;
-          }
-        } else if (tag === "include") {
-          const result = this.handleInclude(content, context);
-          output.push(result);
-          i++;
-        } else if (tag === "macro") {
-          const skip = this.handleMacro(tokens, i, context);
-          i = skip;
-        } else if (tag === "import") {
-          this.handleImportAs(content, context);
-          i++;
-        } else if (tag === "from") {
-          this.handleFromImport(content, context);
-          i++;
-        } else if (tag === "cache") {
-          const [result, skip] = this.handleCache(tokens, i, context);
-          output.push(result);
-          i = skip;
-        } else if (tag === "live") {
-          const [result, skip] = this.handleLive(tokens, i, context);
-          output.push(result);
-          i = skip;
-        } else if (tag === "spaceless") {
-          const [result, skip] = this.handleSpaceless(tokens, i, context);
-          output.push(result);
-          i = skip;
-        } else if (tag === "autoescape") {
-          const [result, skip] = this.handleAutoescape(tokens, i, context);
-          output.push(result);
-          i = skip;
-        } else if (tag === "block" || tag === "endblock" || tag === "extends") {
-          i++;
-        } else {
-          i++;
-          if (tag !== "" && !TERMINATOR_TAGS.has(tag)) {
-            throw new Error(
-              `Frond: unknown tag "${tag}" -- known tags are: ${[...KNOWN_TAGS].sort().join(", ")}`
-            );
-          }
-        }
-        if (stripA && i < tokens.length && tokens[i][0] === "TEXT") {
-          tokens[i] = ["TEXT", tokens[i][1].replace(LEADING_WS_RE, "")];
-        }
+        i = this.renderBlockToken(tokens, i, context, output);
       } else {
         i++;
       }
@@ -1894,6 +1898,46 @@ var Frond = class _Frond {
     if (!GATEABLE_TAGS.has(tag)) return true;
     return this._allowedTags.has(tag);
   }
+  applyFilterValue(value, fname, args, context) {
+    const [realFname, tailPath] = splitFilterNameAndPath(fname);
+    if (tailPath) {
+      let applied = false;
+      if (realFname === "first") {
+        value = Array.isArray(value) ? value[0] ?? null : null;
+        applied = true;
+      } else if (realFname === "last") {
+        value = Array.isArray(value) ? value[value.length - 1] ?? null : null;
+        applied = true;
+      } else if (this.filters[realFname]) {
+        value = this.filters[realFname](value, ...args);
+        applied = true;
+      }
+      if (applied) return evalExpr("__frondFilterTmp." + tailPath, { __frondFilterTmp: value });
+    }
+    const fn = this.filters[fname];
+    if (fn) return fn(value, ...args);
+    const comparison = fname.match(FILTER_COMPARISON_RE);
+    if (!comparison) return evalExpr(fname, context);
+    const comparisonFn = this.filters[comparison[1]];
+    if (comparisonFn) value = comparisonFn(value, ...args);
+    const right = evalExpr(comparison[3].trim(), context);
+    switch (comparison[2]) {
+      case "!=":
+        return value !== right;
+      case "==":
+        return value === right;
+      case ">=":
+        return value >= right;
+      case "<=":
+        return value <= right;
+      case ">":
+        return value > right;
+      case "<":
+        return value < right;
+      default:
+        return value;
+    }
+  }
   /**
    * Consume a denied tag WITHOUT running it, returning the index past its body.
    *
@@ -1937,58 +1981,8 @@ var Frond = class _Frond {
     for (const [fname, rawArgs] of filters) {
       const args = rawArgs.map((a) => a instanceof VarRef ? evalExpr(a.name, context) : a);
       if (fname === "raw" || fname === "safe") continue;
-      if (this._sandbox && this._allowedFilters !== null && !this._allowedFilters.has(fname)) continue;
-      const [realFname, tailPath] = splitFilterNameAndPath(fname);
-      if (tailPath) {
-        let applied = false;
-        if (realFname === "first") {
-          value = Array.isArray(value) ? value[0] ?? null : null;
-          applied = true;
-        } else if (realFname === "last") {
-          value = Array.isArray(value) ? value[value.length - 1] ?? null : null;
-          applied = true;
-        } else if (this.filters[realFname]) {
-          value = this.filters[realFname](value, ...args);
-          applied = true;
-        }
-        if (applied) {
-          value = evalExpr("__frondFilterTmp." + tailPath, { __frondFilterTmp: value });
-          continue;
-        }
-      }
-      const fn = this.filters[fname];
-      if (fn) {
-        value = fn(value, ...args);
-      } else {
-        const m = fname.match(FILTER_COMPARISON_RE);
-        if (m) {
-          const fn2 = this.filters[m[1]];
-          if (fn2) value = fn2(value, ...args);
-          const right = evalExpr(m[3].trim(), context);
-          switch (m[2]) {
-            case "!=":
-              value = value !== right;
-              break;
-            case "==":
-              value = value === right;
-              break;
-            case ">=":
-              value = value >= right;
-              break;
-            case "<=":
-              value = value <= right;
-              break;
-            case ">":
-              value = value > right;
-              break;
-            case "<":
-              value = value < right;
-              break;
-          }
-        } else {
-          value = evalExpr(fname, context);
-        }
-      }
+      if (!this.filterPermitted(fname)) continue;
+      value = this.applyFilterValue(value, fname, args, context);
     }
     return value;
   }
@@ -2013,218 +2007,92 @@ var Frond = class _Frond {
     for (const [fname, rawArgs] of filters) {
       const args = rawArgs.map((a) => a instanceof VarRef ? evalExpr(a.name, context) : a);
       if (fname === "raw" || fname === "safe") continue;
-      if (this._sandbox && this._allowedFilters !== null && !this._allowedFilters.has(fname)) continue;
-      const [realFname, tailPath] = splitFilterNameAndPath(fname);
-      if (tailPath) {
-        let applied = false;
-        if (realFname === "first") {
-          value = Array.isArray(value) ? value[0] ?? null : null;
-          applied = true;
-        } else if (realFname === "last") {
-          value = Array.isArray(value) ? value[value.length - 1] ?? null : null;
-          applied = true;
-        } else if (this.filters[realFname]) {
-          value = this.filters[realFname](value, ...args);
-          applied = true;
-        }
-        if (applied) {
-          value = evalExpr(
-            "__frondFilterTmp." + tailPath,
-            { __frondFilterTmp: value }
-          );
-          continue;
-        }
-      }
-      const fn = this.filters[fname];
-      if (fn) {
-        value = fn(value, ...args);
-      } else {
-        const m = fname.match(FILTER_COMPARISON_RE);
-        if (m) {
-          const realFilter = m[1];
-          const op = m[2];
-          const rightExpr = m[3].trim();
-          const fn2 = this.filters[realFilter];
-          if (fn2) {
-            value = fn2(value, ...args);
-          }
-          const right = evalExpr(rightExpr, context);
-          switch (op) {
-            case "!=":
-              value = value !== right;
-              break;
-            case "==":
-              value = value === right;
-              break;
-            case ">=":
-              value = value >= right;
-              break;
-            case "<=":
-              value = value <= right;
-              break;
-            case ">":
-              value = value > right;
-              break;
-            case "<":
-              value = value < right;
-              break;
-          }
-        } else {
-          value = evalExpr(fname, context);
-        }
-      }
+      if (!this.filterPermitted(fname)) continue;
+      value = this.applyFilterValue(value, fname, args, context);
     }
     return value;
   }
-  evalVarInner(expr, context) {
-    const [varName, filters] = parseFilterChain(expr);
-    if (this._sandbox && this._allowedVars !== null) {
-      const rootVar = varName.split(".")[0].split("[")[0].trim();
-      if (rootVar && !this._allowedVars.has(rootVar) && rootVar !== "loop") {
-        return "";
-      }
-    }
-    if (findOutsideQuotes(expr, "~") >= 0) {
-      let concatValue = evalExpr(expr, context);
-      if (concatValue instanceof SafeString) return concatValue.value;
-      if (this._autoEscape && typeof concatValue === "string") {
-        concatValue = htmlEscape(concatValue);
-      }
-      return concatValue;
-    }
-    let value = evalExpr(varName, context);
-    let isSafe = false;
+  /**
+   * Apply the no-argument filters that are common enough to avoid generic
+   * dispatch. Keeping this table separate from evalVarInner makes the
+   * expression pipeline easier to audit without changing filter order.
+   */
+  applyFastFilter(name, value) {
+    const handler = FAST_FILTERS[name];
+    return handler ? { handled: true, value: handler(value) } : { handled: false, value };
+  }
+  applyRenderedFilter(value, fname, args) {
+    const [realFname, tailPath] = splitFilterNameAndPath(fname);
+    if (tailPath) {
+      let applied = false;
+      if (realFname === "first") {
+        value = Array.isArray(value) ? value[0] ?? null : null;
+        applied = true;
+      } else if (realFname === "last") {
+        value = Array.isArray(value) ? value[value.length - 1] ?? null : null;
+        applied = true;
+      } else if (this.filters[realFname]) {
+        value = this.filters[realFname](value, ...args);
+        applied = true;
+      }
+      if (applied) return evalExpr("__frondFilterTmp." + tailPath, { __frondFilterTmp: value });
+    }
+    if (args.length === 0) {
+      const fast = this.applyFastFilter(fname, value);
+      if (fast.handled) return fast.value;
+    }
+    const fn = this.filters[fname];
+    return fn ? fn(value, ...args) : value;
+  }
+  variablePermitted(varName) {
+    if (!this._sandbox || this._allowedVars === null) return true;
+    const rootVar = varName.split(".")[0].split("[")[0].trim();
+    return !rootVar || rootVar === "loop" || this._allowedVars.has(rootVar);
+  }
+  resolveConcatenation(expr, context) {
+    if (findOutsideQuotes(expr, "~") < 0) return { handled: false, value: void 0 };
+    let value = evalExpr(expr, context);
+    if (value instanceof SafeString) return { handled: true, value: value.value };
+    if (this._autoEscape && typeof value === "string") value = htmlEscape(value);
+    return { handled: true, value };
+  }
+  applyRenderedFilters(value, filters, context) {
+    let safe = false;
     for (const [fname, rawArgs] of filters) {
       const args = rawArgs.map((a) => a instanceof VarRef ? evalExpr(a.name, context) : a);
       if (fname === "raw" || fname === "safe") {
-        if (this.filterPermitted(fname)) isSafe = true;
+        if (this.filterPermitted(fname)) safe = true;
         continue;
       }
-      if (fname === "escape" || fname === "e") {
-        if (this.filterPermitted(fname)) isSafe = true;
-      }
-      if (this._sandbox && this._allowedFilters !== null) {
-        if (!this._allowedFilters.has(fname)) {
-          continue;
-        }
-      }
-      const [realFname, tailPath] = splitFilterNameAndPath(fname);
-      if (tailPath) {
-        let applied = false;
-        if (realFname === "first") {
-          value = Array.isArray(value) ? value[0] ?? null : null;
-          applied = true;
-        } else if (realFname === "last") {
-          value = Array.isArray(value) ? value[value.length - 1] ?? null : null;
-          applied = true;
-        } else if (this.filters[realFname]) {
-          value = this.filters[realFname](value, ...args);
-          applied = true;
-        }
-        if (applied) {
-          value = evalExpr(
-            "__frondFilterTmp." + tailPath,
-            { __frondFilterTmp: value }
-          );
-          continue;
-        }
-      }
-      if (args.length === 0) {
-        switch (fname) {
-          case "upper":
-            value = String(value).toUpperCase();
-            continue;
-          case "lower":
-            value = String(value).toLowerCase();
-            continue;
-          case "trim":
-            value = String(value).trim();
-            continue;
-          case "length":
-            if (Array.isArray(value)) {
-              value = value.length;
-            } else if (typeof value === "string") {
-              value = value.length;
-            } else if (typeof value === "object" && value !== null) {
-              value = Object.keys(value).length;
-            } else {
-              value = 0;
-            }
-            continue;
-          case "capitalize": {
-            const s = String(value);
-            value = s.charAt(0).toUpperCase() + s.slice(1).toLowerCase();
-            continue;
-          }
-          case "title":
-            value = String(value).replace(TITLE_WORD_RE, (c) => c.toUpperCase());
-            continue;
-          case "string":
-            value = String(value);
-            continue;
-          case "int":
-            value = value ? parseInt(String(value), 10) || 0 : 0;
-            continue;
-          case "float":
-            value = value ? parseFloat(String(value)) || 0 : 0;
-            continue;
-          case "abs":
-            value = typeof value === "number" ? Math.abs(value) : value;
-            continue;
-          case "striptags":
-            value = String(value).replace(STRIP_TAGS_RE, "");
-            continue;
-          case "first":
-            value = Array.isArray(value) ? value[0] ?? null : null;
-            continue;
-          case "last":
-            value = Array.isArray(value) ? value[value.length - 1] ?? null : null;
-            continue;
-          case "keys":
-            value = typeof value === "object" && value !== null && !Array.isArray(value) ? Object.keys(value) : [];
-            continue;
-          case "values":
-            value = typeof value === "object" && value !== null && !Array.isArray(value) ? Object.values(value) : [];
-            continue;
-          case "json_encode":
-            value = jsonSafe(value);
-            continue;
-          case "dump":
-            value = renderDump(value);
-            continue;
-          case "nl2br":
-            value = new SafeString(htmlEscape(String(value)).replace(/\n/g, "<br />\n"));
-            continue;
-          case "unique":
-            value = Array.isArray(value) ? [...new Set(value)] : value;
-            continue;
-          case "sort":
-            value = Array.isArray(value) ? [...value].sort() : value;
-            continue;
-          case "reverse":
-            value = Array.isArray(value) ? [...value].reverse() : String(value).split("").reverse().join("");
-            continue;
-          case "filter":
-            value = Array.isArray(value) ? value.filter(Boolean) : value;
-            continue;
-        }
-      }
-      const fn = this.filters[fname];
-      if (fn) {
-        value = fn(value, ...args);
-      }
+      if ((fname === "escape" || fname === "e") && this.filterPermitted(fname)) safe = true;
+      if (!this.filterPermitted(fname)) continue;
+      value = this.applyRenderedFilter(value, fname, args);
     }
+    return { value, safe };
+  }
+  evalVarInner(expr, context) {
+    const [varName, filters] = parseFilterChain(expr);
+    if (!this.variablePermitted(varName)) return "";
+    const concatenated = this.resolveConcatenation(expr, context);
+    if (concatenated.handled) return concatenated.value;
+    const applied = this.applyRenderedFilters(evalExpr(varName, context), filters, context);
+    let value = applied.value;
     if (value instanceof SafeString) {
       return value.value;
     }
-    if (!isSafe && this._autoEscape && typeof value === "string") {
+    if (!applied.safe && this._autoEscape && typeof value === "string") {
       value = htmlEscape(value);
     }
     return value;
   }
-  handleIf(tokens, start, context) {
-    const [content] = stripTag(tokens[start][1]);
-    const conditionExpr = content.slice(3).trim();
+  pushIfBranch(branches, condition, branchTokens, stripBefore) {
+    if (stripBefore && branchTokens.length > 0 && branchTokens[branchTokens.length - 1][0] === "TEXT") {
+      const last = branchTokens[branchTokens.length - 1];
+      branchTokens[branchTokens.length - 1] = ["TEXT", last[1].replace(TRAILING_WS_RE, "")];
+    }
+    branches.push([condition, branchTokens]);
+  }
+  collectIfBranches(tokens, start, conditionExpr) {
     const branches = [];
     let currentTokens = [];
     let currentCond = conditionExpr;
@@ -2232,61 +2100,52 @@ var Frond = class _Frond {
     let i = start + 1;
     while (i < tokens.length) {
       const [ttype, raw] = tokens[i];
-      if (ttype === "BLOCK") {
-        const [tagContent, tagStripB, tagStripA] = stripTag(raw);
-        const tag = tagContent.split(/\s+/)[0] || "";
-        if (tag === "if") {
-          depth++;
-          currentTokens.push(tokens[i]);
-        } else if (tag === "endif" && depth > 0) {
-          depth--;
-          currentTokens.push(tokens[i]);
-        } else if (tag === "endif" && depth === 0) {
-          if (tagStripB && currentTokens.length > 0 && currentTokens[currentTokens.length - 1][0] === "TEXT") {
-            currentTokens[currentTokens.length - 1] = ["TEXT", currentTokens[currentTokens.length - 1][1].replace(TRAILING_WS_RE, "")];
-          }
-          branches.push([currentCond, currentTokens]);
-          if (tagStripA && i + 1 < tokens.length && tokens[i + 1][0] === "TEXT") {
-            tokens[i + 1] = ["TEXT", tokens[i + 1][1].replace(LEADING_WS_RE, "")];
-          }
-          i++;
-          break;
-        } else if ((tag === "elseif" || tag === "elif") && depth === 0) {
-          if (tagStripB && currentTokens.length > 0 && currentTokens[currentTokens.length - 1][0] === "TEXT") {
-            currentTokens[currentTokens.length - 1] = ["TEXT", currentTokens[currentTokens.length - 1][1].replace(TRAILING_WS_RE, "")];
-          }
-          branches.push([currentCond, currentTokens]);
-          currentCond = tagContent.slice(tag.length).trim();
-          currentTokens = [];
-        } else if (tag === "else" && depth === 0) {
-          if (tagStripB && currentTokens.length > 0 && currentTokens[currentTokens.length - 1][0] === "TEXT") {
-            currentTokens[currentTokens.length - 1] = ["TEXT", currentTokens[currentTokens.length - 1][1].replace(TRAILING_WS_RE, "")];
-          }
-          branches.push([currentCond, currentTokens]);
-          currentCond = null;
-          currentTokens = [];
-        } else {
-          currentTokens.push(tokens[i]);
+      if (ttype !== "BLOCK") {
+        currentTokens.push(tokens[i]);
+        i++;
+        continue;
+      }
+      const [tagContent, tagStripB, tagStripA] = stripTag(raw);
+      const tag = tagContent.split(/\s+/)[0] || "";
+      if (tag === "if") {
+        depth++;
+        currentTokens.push(tokens[i]);
+      } else if (tag === "endif" && depth > 0) {
+        depth--;
+        currentTokens.push(tokens[i]);
+      } else if (tag === "endif") {
+        this.pushIfBranch(branches, currentCond, currentTokens, tagStripB);
+        if (tagStripA && i + 1 < tokens.length && tokens[i + 1][0] === "TEXT") {
+          tokens[i + 1] = ["TEXT", tokens[i + 1][1].replace(LEADING_WS_RE, "")];
         }
+        return { branches, next: i + 1 };
+      } else if ((tag === "elseif" || tag === "elif") && depth === 0) {
+        this.pushIfBranch(branches, currentCond, currentTokens, tagStripB);
+        currentCond = tagContent.slice(tag.length).trim();
+        currentTokens = [];
+      } else if (tag === "else" && depth === 0) {
+        this.pushIfBranch(branches, currentCond, currentTokens, tagStripB);
+        currentCond = null;
+        currentTokens = [];
       } else {
         currentTokens.push(tokens[i]);
       }
       i++;
     }
+    return { branches, next: i };
+  }
+  handleIf(tokens, start, context) {
+    const [content] = stripTag(tokens[start][1]);
+    const conditionExpr = content.slice(3).trim();
+    const { branches, next } = this.collectIfBranches(tokens, start, conditionExpr);
     for (const [cond, branchTokens] of branches) {
       if (cond === null || evalComparison(cond, context, this.evalVarRaw.bind(this))) {
-        return [this.renderTokens([...branchTokens], context), i];
+        return [this.renderTokens([...branchTokens], context), next];
       }
     }
-    return ["", i];
+    return ["", next];
   }
-  handleFor(tokens, start, context) {
-    const [content] = stripTag(tokens[start][1]);
-    const forMatch = content.match(/^for\s+(\w+)(?:\s*,\s*(\w+))?\s+in\s+(.+)/);
-    if (!forMatch) return ["", start + 1];
-    const var1 = forMatch[1];
-    const var2 = forMatch[2] || null;
-    const iterableExpr = forMatch[3].trim();
+  collectForTokens(tokens, start) {
     const bodyTokens = [];
     const elseTokens = [];
     let inElse = false;
@@ -2294,65 +2153,64 @@ var Frond = class _Frond {
     let ifDepth = 0;
     let i = start + 1;
     while (i < tokens.length) {
-      const [ttype, raw] = tokens[i];
-      if (ttype === "BLOCK") {
-        const [tagContent] = stripTag(raw);
-        const tag = tagContent.split(/\s+/)[0] || "";
-        if (tag === "for") {
-          forDepth++;
-          (inElse ? elseTokens : bodyTokens).push(tokens[i]);
-        } else if (tag === "endfor" && forDepth > 0) {
-          forDepth--;
-          (inElse ? elseTokens : bodyTokens).push(tokens[i]);
-        } else if (tag === "endfor" && forDepth === 0) {
-          i++;
-          break;
-        } else if (tag === "if") {
-          ifDepth++;
-          (inElse ? elseTokens : bodyTokens).push(tokens[i]);
-        } else if (tag === "endif") {
-          ifDepth--;
-          (inElse ? elseTokens : bodyTokens).push(tokens[i]);
-        } else if (tag === "else" && forDepth === 0 && ifDepth === 0) {
-          inElse = true;
-        } else {
-          (inElse ? elseTokens : bodyTokens).push(tokens[i]);
-        }
-      } else {
-        (inElse ? elseTokens : bodyTokens).push(tokens[i]);
+      const token = tokens[i];
+      if (token[0] !== "BLOCK") {
+        (inElse ? elseTokens : bodyTokens).push(token);
+        i++;
+        continue;
       }
-      i++;
-    }
-    const iterable = evalExpr(iterableExpr, context);
-    if (!iterable || Array.isArray(iterable) && iterable.length === 0 || typeof iterable === "object" && !Array.isArray(iterable) && Object.keys(iterable).length === 0) {
-      if (elseTokens.length > 0) {
-        return [this.renderTokens([...elseTokens], context), i];
+      const [tagContent] = stripTag(token[1]);
+      const tag = tagContent.split(/\s+/)[0] || "";
+      if (tag === "for") forDepth++;
+      else if (tag === "endfor" && forDepth > 0) forDepth--;
+      else if (tag === "endfor") return { bodyTokens, elseTokens, next: i + 1 };
+      else if (tag === "if") ifDepth++;
+      else if (tag === "endif") ifDepth--;
+      else if (tag === "else" && forDepth === 0 && ifDepth === 0) {
+        inElse = true;
+        i++;
+        continue;
       }
-      return ["", i];
+      (inElse ? elseTokens : bodyTokens).push(token);
+      i++;
     }
+    return { bodyTokens, elseTokens, next: i };
+  }
+  forItems(iterable) {
+    const isDict = typeof iterable === "object" && iterable !== null && !Array.isArray(iterable);
+    if (isDict) return { items: Object.entries(iterable), isDict: true };
+    return { items: Array.isArray(iterable) ? iterable : [], isDict: false };
+  }
+  handleFor(tokens, start, context) {
+    const [content] = stripTag(tokens[start][1]);
+    const forMatch = content.match(/^for\s+(\w+)(?:\s*,\s*(\w+))?\s+in\s+(.+)/);
+    if (!forMatch) return ["", start + 1];
+    const var1 = forMatch[1];
+    const var2 = forMatch[2] || null;
+    const { bodyTokens, elseTokens, next: i } = this.collectForTokens(tokens, start);
+    const iterable = evalExpr(forMatch[3].trim(), context);
+    const { items, isDict } = this.forItems(iterable);
+    if (items.length === 0) return [elseTokens.length ? this.renderTokens([...elseTokens], context) : "", i];
     const output = [];
-    const isDict = typeof iterable === "object" && !Array.isArray(iterable);
-    const items = isDict ? Object.entries(iterable) : Array.isArray(iterable) ? iterable : [];
-    const total = items.length;
     const loopObj = {
       index: 0,
       index0: 0,
       first: false,
       last: false,
-      length: total,
+      length: items.length,
       revindex: 0,
       revindex0: 0,
       even: false,
       odd: false
     };
-    for (let idx = 0; idx < total; idx++) {
+    for (let idx = 0; idx < items.length; idx++) {
       const item = items[idx];
       loopObj.index = idx + 1;
       loopObj.index0 = idx;
       loopObj.first = idx === 0;
-      loopObj.last = idx === total - 1;
-      loopObj.revindex = total - idx;
-      loopObj.revindex0 = total - idx - 1;
+      loopObj.last = idx === items.length - 1;
+      loopObj.revindex = items.length - idx;
+      loopObj.revindex0 = items.length - idx - 1;
       loopObj.even = (idx + 1) % 2 === 0;
       loopObj.odd = (idx + 1) % 2 !== 0;
       const locals = { loop: loopObj };
@@ -2360,18 +2218,15 @@ var Frond = class _Frond {
         const [key, value] = item;
         locals[var1] = key;
         if (var2) locals[var2] = value;
+      } else if (var2) {
+        locals[var1] = idx;
+        locals[var2] = item;
       } else {
-        if (var2) {
-          locals[var1] = idx;
-          locals[var2] = item;
-        } else {
-          locals[var1] = item;
-        }
+        locals[var1] = item;
       }
       const loopCtx = new Proxy(locals, {
         get(target, prop) {
-          if (prop in target) return target[prop];
-          return context[prop];
+          return prop in target ? target[prop] : context[prop];
         },
         set(target, prop, value) {
           target[prop] = value;
@@ -2500,44 +2355,8 @@ var Frond = class _Frond {
     const alias = m[2];
     const namespace = {};
     const source = this.load(filename);
-    const tokens = tokenize(source);
-    let i = 0;
-    while (i < tokens.length) {
-      const [ttype, raw] = tokens[i];
-      if (ttype === "BLOCK") {
-        const [tagContent] = stripTag(raw);
-        if ((tagContent.split(/\s+/)[0] || "") === "macro") {
-          const macroM = tagContent.match(/^macro\s+(\w+)\s*\(([^)]*)\)/);
-          if (macroM) {
-            const macroName = macroM[1];
-            const params = _Frond.parseMacroParams(macroM[2]);
-            const bodyTokens = [];
-            i++;
-            while (i < tokens.length) {
-              if (tokens[i][0] === "BLOCK" && tokens[i][1].includes("endmacro")) {
-                i++;
-                break;
-              }
-              bodyTokens.push(tokens[i]);
-              i++;
-            }
-            const capturedBody = [...bodyTokens];
-            const capturedParams = [...params];
-            const capturedCtx = { ...context };
-            const engine = this;
-            namespace[macroName] = (...args) => {
-              const macroCtx = { ...capturedCtx };
-              for (let pi = 0; pi < capturedParams.length; pi++) {
-                const [pname, pdefault] = capturedParams[pi];
-                macroCtx[pname] = pi < args.length ? args[pi] : pdefault;
-              }
-              return new SafeString(engine.renderTokens([...capturedBody], macroCtx));
-            };
-            continue;
-          }
-        }
-      }
-      i++;
+    for (const definition of this.collectMacroDefinitions(tokenize(source))) {
+      namespace[definition.name] = this.createMacro(definition, context);
     }
     context[alias] = namespace;
   }
@@ -2547,46 +2366,61 @@ var Frond = class _Frond {
     const filename = m[1];
     const names = m[2].split(",").map((n) => n.trim()).filter(Boolean);
     const source = this.load(filename);
-    const tokens = tokenize(source);
+    for (const definition of this.collectMacroDefinitions(tokenize(source))) {
+      if (names.includes(definition.name)) {
+        context[definition.name] = this.createMacro(definition, context);
+      }
+    }
+  }
+  collectMacroDefinitions(tokens) {
+    const definitions = [];
     let i = 0;
     while (i < tokens.length) {
-      const [ttype, raw] = tokens[i];
-      if (ttype === "BLOCK") {
-        const [tagContent] = stripTag(raw);
-        const tag = tagContent.split(/\s+/)[0] || "";
-        if (tag === "macro") {
-          const macroM = tagContent.match(/^macro\s+(\w+)\s*\(([^)]*)\)/);
-          if (macroM && names.includes(macroM[1])) {
-            const macroName = macroM[1];
-            const paramNames = _Frond.parseMacroParams(macroM[2]);
-            const bodyTokens = [];
-            i++;
-            while (i < tokens.length) {
-              if (tokens[i][0] === "BLOCK" && tokens[i][1].includes("endmacro")) {
-                i++;
-                break;
-              }
-              bodyTokens.push(tokens[i]);
-              i++;
-            }
-            const capturedBody = [...bodyTokens];
-            const capturedParams = [...paramNames];
-            const capturedCtx = { ...context };
-            const engine = this;
-            context[macroName] = (...args) => {
-              const macroCtx = { ...capturedCtx };
-              for (let pi = 0; pi < capturedParams.length; pi++) {
-                const [pname, pdefault] = capturedParams[pi];
-                macroCtx[pname] = pi < args.length ? args[pi] : pdefault;
-              }
-              return new SafeString(engine.renderTokens([...capturedBody], macroCtx));
-            };
-            continue;
-          }
-        }
+      if (tokens[i][0] !== "BLOCK") {
+        i++;
+        continue;
+      }
+      const [tagContent] = stripTag(tokens[i][1]);
+      if ((tagContent.split(/\s+/)[0] || "") !== "macro") {
+        i++;
+        continue;
       }
+      const macroMatch = tagContent.match(/^macro\s+(\w+)\s*\(([^)]*)\)/);
+      if (!macroMatch) {
+        i++;
+        continue;
+      }
+      const bodyTokens = [];
       i++;
+      while (i < tokens.length) {
+        if (tokens[i][0] === "BLOCK" && tokens[i][1].includes("endmacro")) {
+          i++;
+          break;
+        }
+        bodyTokens.push(tokens[i]);
+        i++;
+      }
+      definitions.push({
+        name: macroMatch[1],
+        params: _Frond.parseMacroParams(macroMatch[2]),
+        bodyTokens
+      });
     }
+    return definitions;
+  }
+  createMacro(definition, context) {
+    const capturedBody = [...definition.bodyTokens];
+    const capturedParams = [...definition.params];
+    const capturedCtx = { ...context };
+    const engine = this;
+    return (...args) => {
+      const macroCtx = { ...capturedCtx };
+      for (let pi = 0; pi < capturedParams.length; pi++) {
+        const [pname, pdefault] = capturedParams[pi];
+        macroCtx[pname] = pi < args.length ? args[pi] : pdefault;
+      }
+      return new SafeString(engine.renderTokens([...capturedBody], macroCtx));
+    };
   }
   /**
    * Collect the body tokens of a {% <openTag> %}...{% end<openTag> %} block,
@@ -2676,60 +2510,63 @@ var Frond = class _Frond {
     }
     const name = m[1];
     const rest = (m[2] || "").trim();
+    const options = this.parseLiveOptions(rest);
+    const [bodyTokens, i] = this.collectLiveBody(tokens, start);
+    _Frond.liveFragments.set(name, bodyTokens.map((t) => t[1]).join(""));
+    const attrs = this.liveAttributes(name, options);
+    const firstPaint = this.renderTokens([...bodyTokens], context);
+    return [`<div ${attrs.join(" ")}>${firstPaint}</div>`, i];
+  }
+  parseLiveOptions(rest) {
     const parts = rest.split(/\s+/).filter(Boolean);
     const mode = parts[0] || "";
-    const sm = rest.match(LIVE_SRC_RE);
-    const src = sm ? sm[1] : null;
-    if (src && (src.startsWith("http://") || src.startsWith("https://") || src.startsWith("//"))) {
+    const sourceMatch = rest.match(LIVE_SRC_RE);
+    const src = sourceMatch ? sourceMatch[1] : null;
+    if (src && /^(?:https?:)?\/\//.test(src)) {
       throw new Error("live: src must be a same-origin path, not an absolute URL");
     }
-    let interval = null;
-    let wsPath = null;
     if (mode === "poll") {
       if (!parts[1] || !/^\d+$/.test(parts[1])) {
         throw new Error('live: poll requires seconds, e.g. {% live "x" poll 5 %}');
       }
-      interval = parseInt(parts[1], 10);
-    } else if (mode === "sse") {
-    } else if (mode === "ws") {
-      const wm = rest.match(LIVE_WS_RE);
-      if (!wm) {
-        throw new Error('live: ws requires a path, e.g. {% live "x" ws "/ws/x" %}');
-      }
-      wsPath = wm[1];
-    } else {
-      throw new Error(`live: unknown transport "${mode}" (use poll N, sse, or ws "path")`);
+      return { mode, src, interval: parseInt(parts[1], 10), wsPath: null };
     }
-    const bodyTokens = [];
+    if (mode === "sse") return { mode, src, interval: null, wsPath: null };
+    if (mode === "ws") {
+      const wsMatch = rest.match(LIVE_WS_RE);
+      if (!wsMatch) throw new Error('live: ws requires a path, e.g. {% live "x" ws "/ws/x" %}');
+      return { mode, src, interval: null, wsPath: wsMatch[1] };
+    }
+    throw new Error(`live: unknown transport "${mode}" (use poll N, sse, or ws "path")`);
+  }
+  collectLiveBody(tokens, start) {
+    const body = [];
     let i = start + 1;
     while (i < tokens.length) {
-      if (tokens[i][0] === "BLOCK") {
-        const [tagContent] = stripTag(tokens[i][1]);
-        const tag = tagContent.split(/\s+/)[0] || "";
-        if (tag === "live") throw new Error("live: nested live blocks are not supported");
-        if (tag === "endlive") {
-          i++;
-          break;
-        }
-        bodyTokens.push(tokens[i]);
-      } else {
-        bodyTokens.push(tokens[i]);
+      if (tokens[i][0] !== "BLOCK") {
+        body.push(tokens[i++]);
+        continue;
       }
-      i++;
+      const [tagContent] = stripTag(tokens[i][1]);
+      const tag = tagContent.split(/\s+/)[0] || "";
+      if (tag === "live") throw new Error("live: nested live blocks are not supported");
+      if (tag === "endlive") return [body, i + 1];
+      body.push(tokens[i++]);
     }
-    _Frond.liveFragments.set(name, bodyTokens.map((t) => t[1]).join(""));
-    const endpoint = src || `/__frond/live/${name}`;
+    return [body, i];
+  }
+  liveAttributes(name, options) {
+    const endpoint = options.src || `/__frond/live/${name}`;
     const attrs = [`data-frond-live="${liveAttr(name)}"`, `id="live-${liveAttr(name)}"`];
-    if (mode === "poll") {
-      attrs.push('data-mode="poll"', `data-interval="${interval}"`, `data-src="${liveAttr(endpoint)}"`);
-    } else if (mode === "sse") {
+    if (options.mode === "poll") {
+      attrs.push('data-mode="poll"', `data-interval="${options.interval}"`, `data-src="${liveAttr(endpoint)}"`);
+    } else if (options.mode === "sse") {
       attrs.push('data-mode="sse"', `data-src="${liveAttr(endpoint)}"`);
-    } else if (mode === "ws") {
-      _Frond.liveWsPaths.set(name, wsPath);
-      attrs.push('data-mode="ws"', `data-ws="${liveAttr(wsPath)}"`);
+    } else {
+      _Frond.liveWsPaths.set(name, options.wsPath);
+      attrs.push('data-mode="ws"', `data-ws="${liveAttr(options.wsPath)}"`);
     }
-    const firstPaint = this.renderTokens([...bodyTokens], context);
-    return [`<div ${attrs.join(" ")}>${firstPaint}</div>`, i];
+    return attrs;
   }
   // ── Live-block class API (mirrors Python master + PHP/Ruby facades) ──
   /**