tina4-nodejs 3.10.17 → 3.10.19

package/CLAUDE.md

@@ -1,10 +1,10 @@
-# CLAUDE.md — AI Developer Guide for tina4-nodejs (v3.10.15)
+# CLAUDE.md — AI Developer Guide for tina4-nodejs (v3.10.19)
 
 > This file helps AI assistants (Claude, Copilot, Cursor, etc.) understand and work on this codebase effectively.
 
 ## What This Project Is
 
-Tina4 for Node.js/TypeScript v3.10.15 — a convention-over-configuration structural paradigm. **Not a framework.** The developer writes TypeScript; Tina4 is invisible infrastructure.
+Tina4 for Node.js/TypeScript v3.10.19 — a convention-over-configuration structural paradigm. **Not a framework.** The developer writes TypeScript; Tina4 is invisible infrastructure.
 
 The philosophy: zero ceremony, batteries included, file system as source of truth.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tina4-nodejs",
-  "version": "3.10.17",
+  "version": "3.10.19",
   "type": "module",
   "description": "This is not a framework. Tina4 for Node.js/TypeScript — zero deps, 38 built-in features.",
   "keywords": ["tina4", "framework", "web", "api", "orm", "graphql", "websocket", "typescript"],

package/packages/frond/src/engine.ts

@@ -308,6 +308,23 @@ function evalExpr(expr: string, context: Record<string, unknown>): unknown {
     }
   }
 
+  // Parenthesized sub-expression: (expr) — strip parens and evaluate inner
+  if (expr.length >= 2 && expr[0] === "(" && expr.endsWith(")")) {
+    let depth = 0;
+    let matched = true;
+    for (let pi = 0; pi < expr.length; pi++) {
+      if (expr[pi] === "(") depth++;
+      else if (expr[pi] === ")") depth--;
+      if (depth === 0 && pi < expr.length - 1) {
+        matched = false;
+        break;
+      }
+    }
+    if (matched) {
+      return evalExpr(expr.slice(1, -1), context);
+    }
+  }
+
   // Ternary: condition ? true_val : false_val
   // Match carefully to handle nested ternaries
   const ternaryIdx = findTernary(expr);
@@ -323,11 +340,17 @@ function evalExpr(expr: string, context: Record<string, unknown>): unknown {
     }
   }
 
-  // Jinja2-style inline if: value if condition else other_value
-  const inlineIfMatch = expr.match(/^(.+?)\s+if\s+(.+?)\s+else\s+(.+)$/);
-  if (inlineIfMatch) {
-    const cond = evalExpr(inlineIfMatch[2], context);
-    return cond ? evalExpr(inlineIfMatch[1], context) : evalExpr(inlineIfMatch[3], context);
+  // Jinja2-style inline if: value if condition else other_value — quote-aware
+  const ifIdx = findOutsideQuotes(expr, " if ");
+  if (ifIdx >= 0) {
+    const elseIdx = findOutsideQuotes(expr, " else ");
+    if (elseIdx >= 0 && elseIdx > ifIdx) {
+      const valuePart = expr.slice(0, ifIdx).trim();
+      const condPart = expr.slice(ifIdx + 4, elseIdx).trim();
+      const elsePart = expr.slice(elseIdx + 6).trim();
+      const cond = evalExpr(condPart, context);
+      return cond ? evalExpr(valuePart, context) : evalExpr(elsePart, context);
+    }
   }
 
   // Null coalescing: value ?? "default"
@@ -944,9 +967,9 @@ const BUILTIN_FILTERS: Record<string, FilterFn> = {
   dump: (v) => JSON.stringify(v),
   formToken: (v?: unknown) => _generateFormToken(v != null ? String(v) : ""),
   form_token: (v?: unknown) => _generateFormToken(v != null ? String(v) : ""),
-  tojson: (v, indent) => indent !== undefined ? JSON.stringify(v, null, parseInt(String(indent), 10)) : JSON.stringify(v),
-  to_json: (v, indent) => indent !== undefined ? JSON.stringify(v, null, parseInt(String(indent), 10)) : JSON.stringify(v),
-  js_escape: (v) => String(v).replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t"),
+  tojson: (v, indent) => new SafeString(indent !== undefined ? JSON.stringify(v, null, parseInt(String(indent), 10)) : JSON.stringify(v)),
+  to_json: (v, indent) => new SafeString(indent !== undefined ? JSON.stringify(v, null, parseInt(String(indent), 10)) : JSON.stringify(v)),
+  js_escape: (v) => new SafeString(String(v).replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t")),
 };
 
 // ── Form Token ────────────────────────────────────────────────