tina4-nodejs 3.13.86 → 3.13.88

package/packages/orm/dist/index.js

@@ -3415,11 +3415,32 @@ var init_request = __esm({
 var engine_exports = {};
 __export(engine_exports, {
   Frond: () => Frond,
+  TEMPLATE_CACHE_MAX: () => TEMPLATE_CACHE_MAX,
   setFormTokenSessionId: () => setFormTokenSessionId
 });
 import { createHash as createHash2, createHmac as createHmac2, randomBytes as randomBytes2 } from "node:crypto";
 import { readFileSync as readFileSync4, existsSync as existsSync6, statSync as statSync4 } from "node:fs";
 import { join as join5, resolve as resolve2 } from "node:path";
+function jsonText(value) {
+  try {
+    const text = JSON.stringify(value);
+    return text === void 0 ? "null" : text;
+  } catch {
+    const seen = /* @__PURE__ */ new WeakSet();
+    const text = JSON.stringify(value, (_key, v) => {
+      if (typeof v === "bigint") return v.toString();
+      if (typeof v === "object" && v !== null) {
+        if (seen.has(v)) return null;
+        seen.add(v);
+      }
+      return v;
+    });
+    return text === void 0 ? "null" : text;
+  }
+}
+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";
@@ -3490,6 +3511,14 @@ function renderDump(value) {
 function liveAttr(value) {
   return String(value).replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function capCache(cache, maxEntries) {
+  if (cache.size < maxEntries) return;
+  let drop = Math.floor(maxEntries / 2);
+  for (const key of cache.keys()) {
+    cache.delete(key);
+    if (--drop <= 0) break;
+  }
+}
 function tokenize(source) {
   const rawBlocks = [];
   source = source.replace(RAW_BLOCK_RE, (_match, content) => {
@@ -3841,6 +3870,9 @@ function evalExpr(expr, context) {
       }).join("");
     }
   }
+  if (expr.startsWith("not ")) {
+    return evalComparison(expr, context);
+  }
   for (const op of [" not in ", " in ", " is not ", " is ", "!=", "==", ">=", "<=", ">", "<", " and ", " or ", " not "]) {
     if (findOutsideQuotes(expr, op) >= 0) {
       return evalComparison(expr, context);
@@ -4396,7 +4428,7 @@ function _generateFormToken(descriptor = "") {
 function _generateFormTokenValue(descriptor = "") {
   return new SafeString(_buildFormTokenJwt(descriptor));
 }
-var SafeString, NUMERIC_RE, METHOD_CALL_RE, FN_CALL_RE, IS_NOT_RE, IS_RE, NOT_IN_RE, IN_RE, DIVISIBLE_BY_RE, FILTER_WITH_ARGS_RE, FILTER_COMPARISON_RE, TITLE_WORD_RE, STRIP_TAGS_RE, FORMAT_RE, LEADING_WS_RE, TRAILING_WS_RE, THOUSANDS_RE, LIVE_RE, LIVE_WS_RE, LIVE_SRC_RE, filterChainCache, pathParseCache, TOKEN_RE, RAW_BLOCK_RE, VarRef, BUILTIN_FILTERS, _formTokenSessionId, Frond;
+var SafeString, JSON_UNSAFE_RE, JSON_UNSAFE_MAP, NUMERIC_RE, METHOD_CALL_RE, FN_CALL_RE, IS_NOT_RE, IS_RE, NOT_IN_RE, IN_RE, DIVISIBLE_BY_RE, FILTER_WITH_ARGS_RE, FILTER_COMPARISON_RE, TITLE_WORD_RE, STRIP_TAGS_RE, FORMAT_RE, LEADING_WS_RE, TRAILING_WS_RE, THOUSANDS_RE, LIVE_RE, LIVE_WS_RE, LIVE_SRC_RE, filterChainCache, pathParseCache, TEMPLATE_CACHE_MAX, TOKEN_RE, RAW_BLOCK_RE, VarRef, BUILTIN_FILTERS, _formTokenSessionId, Frond;
 var init_engine = __esm({
   "../frond/src/engine.ts"() {
     "use strict";
@@ -4408,6 +4440,15 @@ var init_engine = __esm({
         return this.value;
       }
     };
+    JSON_UNSAFE_RE = /[<>&'\u2028\u2029]/g;
+    JSON_UNSAFE_MAP = {
+      "<": "\\u003c",
+      ">": "\\u003e",
+      "&": "\\u0026",
+      "'": "\\u0027",
+      "\u2028": "\\u2028",
+      "\u2029": "\\u2029"
+    };
     NUMERIC_RE = /^-?\d+(\.\d+)?$/;
     METHOD_CALL_RE = /^(\w+)\s*\(([\s\S]*)?\)$/;
     FN_CALL_RE = /^([\w.]+)\s*\(([\s\S]*)?\)$/;
@@ -4429,6 +4470,7 @@ var init_engine = __esm({
     LIVE_SRC_RE = /src\s+["']([^"']+)["']/;
     filterChainCache = /* @__PURE__ */ new Map();
     pathParseCache = /* @__PURE__ */ new Map();
+    TEMPLATE_CACHE_MAX = 256;
     TOKEN_RE = /(\{%-?\s*[\s\S]*?\s*-?%\})|(\{\{-?\s*[\s\S]*?\s*-?\}\})|(\{#[\s\S]*?#\})/g;
     RAW_BLOCK_RE = /\{%-?\s*raw\s*-?%\}([\s\S]*?)\{%-?\s*endraw\s*-?%\}/g;
     VarRef = class {
@@ -4497,7 +4539,7 @@ var init_engine = __esm({
       int: (v) => v ? parseInt(String(v), 10) || 0 : 0,
       float: (v) => v ? parseFloat(String(v)) || 0 : 0,
       string: (v) => String(v),
-      json_encode: (v) => JSON.stringify(v),
+      json_encode: (v) => jsonSafe(v),
       json_decode: (v) => typeof v === "string" ? JSON.parse(v) : v,
       keys: (v) => typeof v === "object" && v !== null && !Array.isArray(v) ? Object.keys(v) : [],
       values: (v) => typeof v === "object" && v !== null && !Array.isArray(v) ? Object.values(v) : [],
@@ -4642,8 +4684,12 @@ var init_engine = __esm({
       form_token: (v) => _generateFormToken(v != null ? String(v) : ""),
       formTokenValue: (v) => _generateFormTokenValue(v != null ? String(v) : ""),
       form_token_value: (v) => _generateFormTokenValue(v != null ? String(v) : ""),
-      tojson: (v, indent) => new SafeString(indent !== void 0 ? JSON.stringify(v, null, parseInt(String(indent), 10)) : JSON.stringify(v)),
-      to_json: (v, indent) => new SafeString(indent !== void 0 ? JSON.stringify(v, null, parseInt(String(indent), 10)) : JSON.stringify(v)),
+      // Same serializer as json_encode -- the three names are one behaviour. The
+      // old indent argument is gone: PHP cannot honour an arbitrary indent
+      // (JSON_PRETTY_PRINT is fixed at four spaces), so honouring it here alone
+      // broke byte-parity for the one filter whose whole job is a wire format.
+      tojson: (v) => jsonSafe(v),
+      to_json: (v) => jsonSafe(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"))
     };
     _formTokenSessionId = "";
@@ -4834,6 +4880,7 @@ var init_engine = __esm({
         const source = readFileSync4(filePath, "utf-8");
         const mtime = statSync4(filePath).mtimeMs;
         const tokens = tokenize(source);
+        capCache(this.compiled, TEMPLATE_CACHE_MAX);
         this.compiled.set(template, { tokens, mtime, cachedAt: Date.now() });
         return this.executeWithSource(source, tokens, context);
       }
@@ -4848,6 +4895,7 @@ var init_engine = __esm({
           }
         }
         const tokens = tokenize(source);
+        capCache(this.compiledStrings, TEMPLATE_CACHE_MAX);
         this.compiledStrings.set(key, { tokens, cachedAt: Date.now() });
         return this.executeCached(tokens, context);
       }
@@ -5063,6 +5111,9 @@ var init_engine = __esm({
             } 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++;
@@ -5378,7 +5429,7 @@ var init_engine = __esm({
                 value = typeof value === "object" && value !== null && !Array.isArray(value) ? Object.values(value) : [];
                 continue;
               case "json_encode":
-                value = JSON.stringify(value);
+                value = jsonSafe(value);
                 continue;
               case "dump":
                 value = renderDump(value);
@@ -5629,7 +5680,7 @@ var init_engine = __esm({
           return i2;
         }
         const macroName = m[1];
-        const paramNames = m[2].split(",").map((p) => p.trim()).filter(Boolean);
+        const params = _Frond.parseMacroParams(m[2]);
         const bodyTokens = [];
         let i = start2 + 1;
         while (i < tokens.length) {
@@ -5644,13 +5695,94 @@ var init_engine = __esm({
         const capturedContext = { ...context };
         context[macroName] = (...args) => {
           const macroCtx = { ...capturedContext };
-          for (let pi = 0; pi < paramNames.length; pi++) {
-            macroCtx[paramNames[pi]] = pi < args.length ? args[pi] : null;
+          for (let pi = 0; pi < params.length; pi++) {
+            const [pname, pdefault] = params[pi];
+            macroCtx[pname] = pi < args.length ? args[pi] : pdefault;
           }
           return new SafeString(engine.renderTokens([...bodyTokens], macroCtx));
         };
         return i;
       }
+      /**
+       * Parse a macro parameter list into [name, default] pairs.
+       *
+       * Handles: name, name="default", name='default'. Splitting on "," alone left a
+       * defaulted parameter literally NAMED `greeting='Hello'`, so the body's
+       * {{ greeting }} matched nothing (rendered empty) AND the caller's positional
+       * argument was stored under that junk key and lost. Mirrors the Python master's
+       * _parse_macro_params. The default is null when none is declared.
+       */
+      static parseMacroParams(rawParams) {
+        return rawParams.split(",").map((p) => p.trim()).filter(Boolean).map((p) => {
+          const eq = p.indexOf("=");
+          if (eq === -1) return [p, null];
+          const name = p.slice(0, eq).trim();
+          let dflt = p.slice(eq + 1).trim();
+          if (dflt.length >= 2 && (dflt.startsWith('"') && dflt.endsWith('"') || dflt.startsWith("'") && dflt.endsWith("'"))) {
+            dflt = dflt.slice(1, -1);
+          }
+          return [name, dflt];
+        });
+      }
+      /**
+       * {% import "file" as alias %} -- load EVERY macro in a file under one namespace.
+       *
+       * The alias is bound as a plain object of macro functions, so {{ alias.greet(x) }}
+       * resolves through the engine's existing dotted-call path and each macro keeps the
+       * same argument binding, default handling and SafeString output as any other macro.
+       * A namespace object (not a class) is deliberate: a function stored as a class
+       * attribute binds as a method and would inject the namespace as the first argument,
+       * which is exactly the argument-shift bug the Python master carried (fixed there
+       * with types.SimpleNamespace). Both import forms must render identically.
+       */
+      handleImportAs(content, context) {
+        const m = content.match(/^import\s+["'](.+?)["']\s+as\s+(\w+)/);
+        if (!m) return;
+        const filename = m[1];
+        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++;
+        }
+        context[alias] = namespace;
+      }
       handleFromImport(content, context) {
         const m = content.match(/^from\s+["'](.+?)["']\s+import\s+(.+)/);
         if (!m) return;
@@ -5668,7 +5800,7 @@ var init_engine = __esm({
               const macroM = tagContent.match(/^macro\s+(\w+)\s*\(([^)]*)\)/);
               if (macroM && names.includes(macroM[1])) {
                 const macroName = macroM[1];
-                const paramNames = macroM[2].split(",").map((p) => p.trim()).filter(Boolean);
+                const paramNames = _Frond.parseMacroParams(macroM[2]);
                 const bodyTokens = [];
                 i++;
                 while (i < tokens.length) {
@@ -5686,7 +5818,8 @@ var init_engine = __esm({
                 context[macroName] = (...args) => {
                   const macroCtx = { ...capturedCtx };
                   for (let pi = 0; pi < capturedParams.length; pi++) {
-                    macroCtx[capturedParams[pi]] = pi < args.length ? args[pi] : null;
+                    const [pname, pdefault] = capturedParams[pi];
+                    macroCtx[pname] = pi < args.length ? args[pi] : pdefault;
                   }
                   return new SafeString(engine.renderTokens([...capturedBody], macroCtx));
                 };
@@ -8793,7 +8926,14 @@ function fullAnalysis(root = "src") {
     total_functions: allFunctions.length,
     avg_complexity: Math.round(avgCC * 100) / 100,
     avg_maintainability: Math.round(avgMI * 10) / 10,
+    // Display-only: the top-15 for the "most complex functions" report.
+    // Do NOT source offenders / --fail-on from this — capping here silently
+    // hides the 16th+ over-threshold function from the gate. offenders()
+    // reads "all_functions" (below) instead.
     most_complex_functions: allFunctions.slice(0, 15),
+    // Full, uncapped, complexity-sorted list — offenders()/--fail-on use this
+    // so no function over the complexity threshold ever escapes the gate.
+    all_functions: allFunctions,
     file_metrics: fileMetrics,
     violations,
     dependency_graph: importGraph,
@@ -29953,18 +30093,21 @@ var init_postgres = __esm({
       }
       async startTransactionAsync() {
         await this.executeAsync("BEGIN");
+        this._inTransaction = true;
       }
       commit() {
         throw new Error("Use commitAsync() for PostgreSQL.");
       }
       async commitAsync() {
         await this.executeAsync("COMMIT");
+        this._inTransaction = false;
       }
       rollback() {
         throw new Error("Use rollbackAsync() for PostgreSQL.");
       }
       async rollbackAsync() {
         await this.executeAsync("ROLLBACK");
+        this._inTransaction = false;
       }
       tables() {
         throw new Error("Use tablesAsync() for PostgreSQL.");
@@ -30983,10 +31126,35 @@ var init_firebird = __esm({
         translated = SQLTranslator.ilikeToLike(translated);
         return translated;
       }
+      /**
+       * The handle every statement runs on. While an explicit transaction is open
+       * (startTransactionAsync set `this.transaction`), statements MUST run on that
+       * transaction object so they are undone by rollbackAsync() / persisted by
+       * commitAsync() — node-firebird's transaction exposes the same
+       * query()/execute() as the connection. With no transaction open we run on
+       * `this.db`, whose per-statement work auto-commits on the connection.
+       *
+       * This matches the Python master's contract (tina4_python/database/firebird.py):
+       * there, ALL statements run on the single connection and start_transaction()
+       * merely suppresses the per-statement autocommit in execute() so the batch
+       * stays open until commit()/rollback(). node-firebird has no such suppression
+       * hook — its `db.query/execute` always auto-commit — so the equivalent is to
+       * route statements through the transaction object instead. Same observable
+       * behaviour: an open transaction is atomic and rolls back cleanly.
+       *
+       * Previously every statement ran on `this.db` unconditionally, so the
+       * transaction created by startTransactionAsync() never saw a single statement
+       * — rollbackAsync() rolled back an EMPTY transaction and the already
+       * auto-committed write survived (silent no-op). Twin of the PHP pdo_firebird
+       * bug fixed in 3.13.86.
+       */
+      statementHandle() {
+        return this.transaction ?? this.db;
+      }
       queryPromise(sql, params) {
         return new Promise((resolve21, reject) => {
           const translated = this.translateSql(sql);
-          this.db.query(translated, params ?? [], (err, result) => {
+          this.statementHandle().query(translated, params ?? [], (err, result) => {
             if (err) reject(err);
             else resolve21(result ?? []);
           });
@@ -30995,7 +31163,7 @@ var init_firebird = __esm({
       executePromise(sql, params) {
         return new Promise((resolve21, reject) => {
           const translated = this.translateSql(sql);
-          this.db.execute(translated, params ?? [], (err) => {
+          this.statementHandle().execute(translated, params ?? [], (err) => {
             if (err) reject(err);
             else resolve21();
           });
@@ -32969,14 +33137,15 @@ var init_database = __esm({
       async executeMany(sql, paramSets = []) {
         const adapter = this.getNextAdapter();
         const results = [];
-        await adapterStartTransaction(adapter);
+        const owns = !this.inExplicitTransaction();
+        if (owns) await adapterStartTransaction(adapter);
         try {
           for (const params of paramSets) {
             results.push(await adapterExecute(adapter, sql, params));
           }
-          await adapterCommit(adapter);
+          if (owns) await adapterCommit(adapter);
         } catch (e) {
-          await adapterRollback(adapter);
+          if (owns) await adapterRollback(adapter);
           throw e;
         }
         return results;

package/packages/orm/src/adapters/firebird.ts

@@ -236,10 +236,36 @@ export class FirebirdAdapter implements DatabaseAdapter {
     return translated;
   }
 
+  /**
+   * The handle every statement runs on. While an explicit transaction is open
+   * (startTransactionAsync set `this.transaction`), statements MUST run on that
+   * transaction object so they are undone by rollbackAsync() / persisted by
+   * commitAsync() — node-firebird's transaction exposes the same
+   * query()/execute() as the connection. With no transaction open we run on
+   * `this.db`, whose per-statement work auto-commits on the connection.
+   *
+   * This matches the Python master's contract (tina4_python/database/firebird.py):
+   * there, ALL statements run on the single connection and start_transaction()
+   * merely suppresses the per-statement autocommit in execute() so the batch
+   * stays open until commit()/rollback(). node-firebird has no such suppression
+   * hook — its `db.query/execute` always auto-commit — so the equivalent is to
+   * route statements through the transaction object instead. Same observable
+   * behaviour: an open transaction is atomic and rolls back cleanly.
+   *
+   * Previously every statement ran on `this.db` unconditionally, so the
+   * transaction created by startTransactionAsync() never saw a single statement
+   * — rollbackAsync() rolled back an EMPTY transaction and the already
+   * auto-committed write survived (silent no-op). Twin of the PHP pdo_firebird
+   * bug fixed in 3.13.86.
+   */
+  private statementHandle(): any {
+    return this.transaction ?? this.db;
+  }
+
   private queryPromise(sql: string, params?: unknown[]): Promise<any[]> {
     return new Promise((resolve, reject) => {
       const translated = this.translateSql(sql);
-      this.db.query(translated, params ?? [], (err: Error | null, result: any[]) => {
+      this.statementHandle().query(translated, params ?? [], (err: Error | null, result: any[]) => {
         if (err) reject(err);
         else resolve(result ?? []);
       });
@@ -249,7 +275,7 @@ export class FirebirdAdapter implements DatabaseAdapter {
   private executePromise(sql: string, params?: unknown[]): Promise<void> {
     return new Promise((resolve, reject) => {
       const translated = this.translateSql(sql);
-      this.db.execute(translated, params ?? [], (err: Error | null) => {
+      this.statementHandle().execute(translated, params ?? [], (err: Error | null) => {
         if (err) reject(err);
         else resolve();
       });

package/packages/orm/src/adapters/postgres.ts

@@ -325,6 +325,12 @@ export class PostgresAdapter implements DatabaseAdapter {
 
   async startTransactionAsync(): Promise<void> {
     await this.executeAsync("BEGIN");
+    // Mark the connection as inside an explicit transaction so executeManyAsync's
+    // owns-guard (owns = !_inTransaction) joins THIS transaction instead of
+    // opening its own inner BEGIN/COMMIT (which would commit this outer
+    // transaction early and defeat a later rollback). Mirrors the Python master
+    // (tina4_python/database/postgres.py start_transaction -> _in_transaction = True).
+    this._inTransaction = true;
   }
 
   commit(): void {
@@ -333,6 +339,9 @@ export class PostgresAdapter implements DatabaseAdapter {
 
   async commitAsync(): Promise<void> {
     await this.executeAsync("COMMIT");
+    // Transaction closed — clear the flag so subsequent standalone batches own
+    // their own transaction again (parity with Python master commit()).
+    this._inTransaction = false;
   }
 
   rollback(): void {
@@ -341,6 +350,8 @@ export class PostgresAdapter implements DatabaseAdapter {
 
   async rollbackAsync(): Promise<void> {
     await this.executeAsync("ROLLBACK");
+    // Transaction closed — clear the flag (parity with Python master rollback()).
+    this._inTransaction = false;
   }
 
   tables(): string[] {

package/packages/orm/src/database.ts

@@ -962,14 +962,26 @@ export class Database {
     const adapter = this.getNextAdapter();
     const results: unknown[] = [];
 
-    await adapterStartTransaction(adapter);
+    // Own the batch transaction ONLY when not already inside a caller's explicit
+    // transaction. inExplicitTransaction() is true when startTransaction() has
+    // pinned an adapter to this async context (getNextAdapter() returns that same
+    // pinned connection). If we owned a BEGIN/COMMIT here regardless, the inner
+    // COMMIT would commit the caller's OUTER transaction early and their later
+    // rollback() would undo nothing (the batch rows survive). So: standalone
+    // batch -> own BEGIN/COMMIT (atomic, all-or-nothing); nested batch -> join
+    // the caller's transaction and let their commit/rollback decide. Mirrors the
+    // sibling execute()/insert()/update()/delete() owns-guard, the PostgreSQL
+    // adapter's executeManyAsync owns-guard, and the Python master
+    // (Database.execute_many delegating to adapter.execute_many's owns_txn guard).
+    const owns = !this.inExplicitTransaction();
+    if (owns) await adapterStartTransaction(adapter);
     try {
       for (const params of paramSets) {
         results.push(await adapterExecute(adapter, sql, params));
       }
-      await adapterCommit(adapter);
+      if (owns) await adapterCommit(adapter);
     } catch (e) {
-      await adapterRollback(adapter);
+      if (owns) await adapterRollback(adapter);
       throw e;
     }