tina4-nodejs 3.13.85 → 3.13.87

package/packages/core/dist/index.js

@@ -1181,7 +1181,7 @@ var init_sqlite = __esm({
           this.db.exec("ROLLBACK");
           throw e;
         }
-        return { totalAffected, lastInsertId: lastId };
+        return { totalAffected, lastId };
       }
       query(sql, params) {
         const stmt = this.db.prepare(sql);
@@ -1207,13 +1207,13 @@ var init_sqlite = __esm({
       }
       insert(table2, data) {
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, rowsAffected: 0 };
+          if (data.length === 0) return { success: true, affectedRows: 0 };
           const keys2 = Object.keys(data[0]);
           const placeholders2 = keys2.map(() => "?").join(", ");
           const sql2 = `INSERT INTO "${table2}" ("${keys2.join('", "')}") VALUES (${placeholders2})`;
           const paramsList = data.map((row) => keys2.map((k) => row[k]));
           const result = this.executeMany(sql2, paramsList);
-          return { success: true, rowsAffected: result.totalAffected, lastInsertId: result.lastInsertId };
+          return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
         }
         const keys = Object.keys(data);
         const placeholders = keys.map(() => "?").join(", ");
@@ -1222,9 +1222,9 @@ var init_sqlite = __esm({
         try {
           const result = this.db.prepare(sql).run(...toSqlParams(values));
           this._lastInsertId = result.lastInsertRowid;
-          return { success: true, rowsAffected: Number(result.changes), lastInsertId: result.lastInsertRowid };
+          return { success: true, affectedRows: Number(result.changes), lastId: result.lastInsertRowid };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       update(table2, data, filter, params) {
@@ -1234,9 +1234,9 @@ var init_sqlite = __esm({
         const values = [...Object.values(data), ...Object.values(filter)];
         try {
           const result = this.db.prepare(sql).run(...toSqlParams(values));
-          return { success: true, rowsAffected: Number(result.changes) };
+          return { success: true, affectedRows: Number(result.changes) };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       delete(table2, filter, params) {
@@ -1244,17 +1244,17 @@ var init_sqlite = __esm({
           let totalAffected = 0;
           for (const row of filter) {
             const result = this.delete(table2, row);
-            totalAffected += result.rowsAffected;
+            totalAffected += result.affectedRows;
           }
-          return { success: true, rowsAffected: totalAffected };
+          return { success: true, affectedRows: totalAffected };
         }
         if (typeof filter === "string") {
           const sql2 = filter ? `DELETE FROM "${table2}" WHERE ${filter}` : `DELETE FROM "${table2}"`;
           try {
             const result = this.db.prepare(sql2).run(...toSqlParams(params ?? []));
-            return { success: true, rowsAffected: Number(result.changes) };
+            return { success: true, affectedRows: Number(result.changes) };
           } catch (e) {
-            return { success: false, rowsAffected: 0, error: e.message };
+            return { success: false, affectedRows: 0, error: e.message };
           }
         }
         const whereClauses = Object.keys(filter).map((k) => `"${k}" = ?`).join(" AND ");
@@ -1262,9 +1262,9 @@ var init_sqlite = __esm({
         const values = Object.values(filter);
         try {
           const result = this.db.prepare(sql).run(...toSqlParams(values));
-          return { success: true, rowsAffected: Number(result.changes) };
+          return { success: true, affectedRows: Number(result.changes) };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       _inTransaction = false;
@@ -1505,7 +1505,7 @@ var init_postgres = __esm({
       }
       /**
        * Normalise an `id` column value (typed `unknown` because pg row values are
-       * `unknown`) into the shape `_lastInsertId` / `DatabaseResult.lastInsertId`
+       * `unknown`) into the shape `_lastInsertId` / `DatabaseResult.lastId`
        * expect. At runtime PG returns numeric PKs as number/bigint (the int8/numeric
        * type parsers above coerce them to Number); a numeric string is coerced to a
        * number so the SERIAL path always returns the integer id.
@@ -1540,8 +1540,8 @@ var init_postgres = __esm({
           for (const params of paramsList) {
             const result = await this.executeAsync(sql, params);
             totalAffected++;
-            if (result && typeof result === "object" && "lastInsertId" in result) {
-              lastId = result.lastInsertId;
+            if (result && typeof result === "object" && "lastId" in result) {
+              lastId = result.lastId;
             }
           }
           if (owns) await this.commitAsync();
@@ -1554,7 +1554,7 @@ var init_postgres = __esm({
           }
           throw e;
         }
-        return { totalAffected, lastInsertId: lastId };
+        return { totalAffected, lastId };
       }
       /** Async execute for real usage. */
       async executeAsync(sql, params) {
@@ -1602,17 +1602,17 @@ var init_postgres = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, rowsAffected: 0 };
+          if (data.length === 0) return { success: true, affectedRows: 0 };
           const keys2 = Object.keys(data[0]);
           const placeholders2 = keys2.map(() => "?").join(", ");
           const sql2 = `INSERT INTO "${table2}" ("${keys2.join('", "')}") VALUES (${placeholders2})`;
           const paramsList = data.map((row) => keys2.map((k) => row[k]));
           try {
             const result = await this.executeManyAsync(sql2, paramsList);
-            if (result.lastInsertId !== void 0) this._lastInsertId = result.lastInsertId;
-            return { success: true, rowsAffected: result.totalAffected, lastInsertId: result.lastInsertId };
+            if (result.lastId !== void 0) this._lastInsertId = result.lastId;
+            return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
           } catch (e) {
-            return { success: false, rowsAffected: 0, error: e.message };
+            return { success: false, affectedRows: 0, error: e.message };
           }
         }
         const keys = Object.keys(data);
@@ -1626,11 +1626,11 @@ var init_postgres = __esm({
           if (id !== null) this._lastInsertId = id;
           return {
             success: true,
-            rowsAffected: result.rowCount ?? 1,
-            lastInsertId: id ?? void 0
+            affectedRows: result.rowCount ?? 1,
+            lastId: id ?? void 0
           };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       update(table2, data, filter, params) {
@@ -1647,9 +1647,9 @@ var init_postgres = __esm({
         const values = [...Object.values(data), ...Object.values(filter)];
         try {
           const result = await this.client.query(sql, values);
-          return { success: true, rowsAffected: result.rowCount ?? 0 };
+          return { success: true, affectedRows: result.rowCount ?? 0 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       delete(table2, filter, params) {
@@ -1664,9 +1664,9 @@ var init_postgres = __esm({
         const values = Object.values(filter);
         try {
           const result = await this.client.query(sql, values);
-          return { success: true, rowsAffected: result.rowCount ?? 0 };
+          return { success: true, affectedRows: result.rowCount ?? 0 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       startTransaction() {
@@ -1674,18 +1674,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.");
@@ -1900,7 +1903,7 @@ var init_mysql = __esm({
           }
           throw e;
         }
-        return { totalAffected, lastInsertId: lastId };
+        return { totalAffected, lastId };
       }
       async executeAsync(sql, params) {
         this.ensureConnected();
@@ -1946,17 +1949,17 @@ var init_mysql = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, rowsAffected: 0 };
+          if (data.length === 0) return { success: true, affectedRows: 0 };
           const keys2 = Object.keys(data[0]);
           const placeholders2 = keys2.map(() => "?").join(", ");
           const sql2 = `INSERT INTO \`${table2}\` (\`${keys2.join("`, `")}\`) VALUES (${placeholders2})`;
           const paramsList = data.map((row) => keys2.map((k) => row[k]));
           try {
             const result = await this.executeManyAsync(sql2, paramsList);
-            if (result.lastInsertId !== void 0) this._lastInsertId = result.lastInsertId;
-            return { success: true, rowsAffected: result.totalAffected, lastInsertId: result.lastInsertId };
+            if (result.lastId !== void 0) this._lastInsertId = result.lastId;
+            return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
           } catch (e) {
-            return { success: false, rowsAffected: 0, error: e.message };
+            return { success: false, affectedRows: 0, error: e.message };
           }
         }
         const keys = Object.keys(data);
@@ -1968,11 +1971,11 @@ var init_mysql = __esm({
           this._lastInsertId = result.insertId ?? null;
           return {
             success: true,
-            rowsAffected: result.affectedRows ?? 1,
-            lastInsertId: result.insertId
+            affectedRows: result.affectedRows ?? 1,
+            lastId: result.insertId
           };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       update(table2, data, filter, params) {
@@ -1986,9 +1989,9 @@ var init_mysql = __esm({
         const values = [...Object.values(data), ...Object.values(filter)];
         try {
           const result = await this.queryPromise(sql, values);
-          return { success: true, rowsAffected: result.affectedRows ?? 0 };
+          return { success: true, affectedRows: result.affectedRows ?? 0 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       delete(table2, filter, params) {
@@ -2001,9 +2004,9 @@ var init_mysql = __esm({
         const values = Object.values(filter);
         try {
           const result = await this.queryPromise(sql, values);
-          return { success: true, rowsAffected: result.affectedRows ?? 0 };
+          return { success: true, affectedRows: result.affectedRows ?? 0 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       startTransaction() {
@@ -2344,17 +2347,17 @@ var init_mssql = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, rowsAffected: 0 };
+          if (data.length === 0) return { success: true, affectedRows: 0 };
           const keys2 = Object.keys(data[0]);
           const placeholders2 = keys2.map(() => "?").join(", ");
           const sql2 = `INSERT INTO [${table2}] ([${keys2.join("], [")}]) VALUES (${placeholders2})`;
           const paramsList = data.map((row) => keys2.map((k) => row[k]));
           try {
             const result = await this.executeManyAsync(sql2, paramsList);
-            if (result.lastInsertId !== void 0) this._lastInsertId = result.lastInsertId;
-            return { success: true, rowsAffected: result.totalAffected, lastInsertId: result.lastInsertId };
+            if (result.lastId !== void 0) this._lastInsertId = result.lastId;
+            return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
           } catch (e) {
-            return { success: false, rowsAffected: 0, error: e.message };
+            return { success: false, affectedRows: 0, error: e.message };
           }
         }
         const keys = Object.keys(data);
@@ -2370,12 +2373,12 @@ var init_mssql = __esm({
             // A single-object insert affects exactly one row. Do NOT use
             // result.rowCount here: the statement is "INSERT ...; SELECT
             // SCOPE_IDENTITY()", and tedious sums the row counts of BOTH statements
-            // (1 for the INSERT + 1 for the SELECT), which reported rowsAffected=2.
-            rowsAffected: 1,
-            lastInsertId: id ?? void 0
+            // (1 for the INSERT + 1 for the SELECT), which reported affectedRows=2.
+            affectedRows: 1,
+            lastId: id ?? void 0
           };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       update(table2, data, filter, params) {
@@ -2392,9 +2395,9 @@ var init_mssql = __esm({
         const values = [...Object.values(data), ...Object.values(filter)];
         try {
           const result = await this.execSqlPromise(sql, values);
-          return { success: true, rowsAffected: result.rowCount };
+          return { success: true, affectedRows: result.rowCount };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       delete(table2, filter, params) {
@@ -2409,9 +2412,9 @@ var init_mssql = __esm({
         const values = Object.values(filter);
         try {
           const result = await this.execSqlPromise(sql, values);
-          return { success: true, rowsAffected: result.rowCount };
+          return { success: true, affectedRows: result.rowCount };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       startTransaction() {
@@ -2704,10 +2707,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 ?? []);
           });
@@ -2716,7 +2744,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();
           });
@@ -2780,16 +2808,16 @@ var init_firebird = __esm({
       async insertAsync(table2, data) {
         this.ensureConnected();
         if (Array.isArray(data)) {
-          if (data.length === 0) return { success: true, rowsAffected: 0 };
+          if (data.length === 0) return { success: true, affectedRows: 0 };
           const keys2 = Object.keys(data[0]);
           const placeholders2 = keys2.map(() => "?").join(", ");
           const sql2 = `INSERT INTO "${table2}" ("${keys2.join('", "')}") VALUES (${placeholders2})`;
           const paramsList = data.map((row) => keys2.map((k) => row[k]));
           try {
             const result = await this.executeManyAsync(sql2, paramsList);
-            return { success: true, rowsAffected: result.totalAffected, lastInsertId: result.lastInsertId };
+            return { success: true, affectedRows: result.totalAffected, lastId: result.lastId };
           } catch (e) {
-            return { success: false, rowsAffected: 0, error: e.message };
+            return { success: false, affectedRows: 0, error: e.message };
           }
         }
         const keys = Object.keys(data);
@@ -2800,10 +2828,10 @@ var init_firebird = __esm({
           await this.executePromise(sql, values);
           return {
             success: true,
-            rowsAffected: 1
+            affectedRows: 1
           };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       update(table2, data, filter, params) {
@@ -2817,9 +2845,9 @@ var init_firebird = __esm({
         const values = [...Object.values(data), ...Object.values(filter)];
         try {
           await this.executePromise(sql, values);
-          return { success: true, rowsAffected: 1 };
+          return { success: true, affectedRows: 1 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       delete(table2, filter, params) {
@@ -2832,9 +2860,9 @@ var init_firebird = __esm({
         const values = Object.values(filter);
         try {
           await this.executePromise(sql, values);
-          return { success: true, rowsAffected: 1 };
+          return { success: true, affectedRows: 1 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       startTransaction() {
@@ -3330,14 +3358,14 @@ var init_mongodb = __esm({
         const col = this.db.collection(table2);
         try {
           if (Array.isArray(data)) {
-            if (data.length === 0) return { success: true, rowsAffected: 0 };
+            if (data.length === 0) return { success: true, affectedRows: 0 };
             const result2 = await col.insertMany(data, { session: this.session });
-            return { success: true, rowsAffected: result2.insertedCount };
+            return { success: true, affectedRows: result2.insertedCount };
           }
           const result = await col.insertOne(data, { session: this.session });
-          return { success: true, rowsAffected: 1, lastInsertId: void 0 };
+          return { success: true, affectedRows: 1, lastId: void 0 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       update(table2, data, filter) {
@@ -3348,9 +3376,9 @@ var init_mongodb = __esm({
         const col = this.db.collection(table2);
         try {
           const result = await col.updateMany(filter, { $set: data }, { session: this.session });
-          return { success: true, rowsAffected: result.modifiedCount };
+          return { success: true, affectedRows: result.modifiedCount };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       delete(table2, filter) {
@@ -3366,21 +3394,21 @@ var init_mongodb = __esm({
               const r = await col.deleteMany(f, { session: this.session });
               total += r.deletedCount;
             }
-            return { success: true, rowsAffected: total };
+            return { success: true, affectedRows: total };
           }
           if (typeof filter === "string") {
             if (!filter.trim()) {
               const r2 = await col.deleteMany({}, { session: this.session });
-              return { success: true, rowsAffected: r2.deletedCount };
+              return { success: true, affectedRows: r2.deletedCount };
             }
             const { filter: parsedFilter } = parseWhereClause(filter, []);
             const r = await col.deleteMany(parsedFilter, { session: this.session });
-            return { success: true, rowsAffected: r.deletedCount };
+            return { success: true, affectedRows: r.deletedCount };
           }
           const result = await col.deleteMany(filter, { session: this.session });
-          return { success: true, rowsAffected: result.deletedCount };
+          return { success: true, affectedRows: result.deletedCount };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       startTransaction() {
@@ -3640,8 +3668,8 @@ var init_odbc = __esm({
       async executeAsync(sql, params) {
         this.ensureConnected();
         const result = await this.connection.query(sql, params ?? []);
-        if (result && typeof result === "object" && "lastInsertId" in result) {
-          this._lastInsertId = result.lastInsertId;
+        if (result && typeof result === "object" && "lastId" in result) {
+          this._lastInsertId = result.lastId;
         }
         return result;
       }
@@ -3662,7 +3690,7 @@ var init_odbc = __esm({
           throw e;
         }
         if (lastId !== void 0) this._lastInsertId = lastId;
-        return { totalAffected, lastInsertId: lastId };
+        return { totalAffected, lastId };
       }
       /** Run a SELECT and return all matching rows. */
       async queryAsync(sql, params) {
@@ -3698,9 +3726,9 @@ var init_odbc = __esm({
         const values = Object.values(data);
         try {
           await this.connection.query(sql, values);
-          return { success: true, rowsAffected: 1, lastInsertId: this._lastInsertId ?? void 0 };
+          return { success: true, affectedRows: 1, lastId: this._lastInsertId ?? void 0 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       /** Update rows in a table matching filter. */
@@ -3712,9 +3740,9 @@ var init_odbc = __esm({
         const values = [...Object.values(data), ...Object.values(filter)];
         try {
           await this.connection.query(sql, values);
-          return { success: true, rowsAffected: 1 };
+          return { success: true, affectedRows: 1 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       /** Delete rows from a table. */
@@ -3724,17 +3752,17 @@ var init_odbc = __esm({
           let totalAffected = 0;
           for (const row of filter) {
             const result = await this.deleteAsync(table2, row);
-            totalAffected += result.rowsAffected;
+            totalAffected += result.affectedRows;
           }
-          return { success: true, rowsAffected: totalAffected };
+          return { success: true, affectedRows: totalAffected };
         }
         if (typeof filter === "string") {
           const sql2 = filter ? `DELETE FROM "${table2}" WHERE ${filter}` : `DELETE FROM "${table2}"`;
           try {
             await this.connection.query(sql2, []);
-            return { success: true, rowsAffected: 1 };
+            return { success: true, affectedRows: 1 };
           } catch (e) {
-            return { success: false, rowsAffected: 0, error: e.message };
+            return { success: false, affectedRows: 0, error: e.message };
           }
         }
         const whereClauses = Object.keys(filter).map((k) => `"${k}" = ?`).join(" AND ");
@@ -3742,9 +3770,9 @@ var init_odbc = __esm({
         const values = Object.values(filter);
         try {
           await this.connection.query(sql, values);
-          return { success: true, rowsAffected: 1 };
+          return { success: true, affectedRows: 1 };
         } catch (e) {
-          return { success: false, rowsAffected: 0, error: e.message };
+          return { success: false, affectedRows: 0, error: e.message };
         }
       }
       /** Begin a transaction. */
@@ -3924,7 +3952,7 @@ function extractLastInsertId(result) {
     const r = result;
     if (r.lastInsertRowid !== void 0 && r.lastInsertRowid !== null) return r.lastInsertRowid;
     if (r.rows?.[0]?.id !== void 0 && r.rows[0].id !== null) return r.rows[0].id;
-    if (r.lastInsertId !== void 0 && r.lastInsertId !== null) return r.lastInsertId;
+    if (r.lastId !== void 0 && r.lastId !== null) return r.lastId;
   }
   return null;
 }
@@ -4690,14 +4718,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;
@@ -12750,6 +12779,7 @@ 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 createHmac3, randomBytes as randomBytes4 } from "node:crypto";
@@ -12825,6 +12855,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) => {
@@ -13038,11 +13076,14 @@ function resolveVar(expr, context) {
   return value;
 }
 function findOutsideQuotes(expr, needle) {
+  if (!expr.includes(needle)) return -1;
   let inQuote = null;
   let depth = 0;
   let bracketDepth = 0;
   let i = 0;
-  while (i <= expr.length - needle.length) {
+  const needleLen = needle.length;
+  const lastStart = expr.length - needleLen;
+  while (i <= lastStart) {
     const ch = expr[i];
     if ((ch === '"' || ch === "'") && depth === 0 && bracketDepth === 0) {
       if (inQuote === null) {
@@ -13061,7 +13102,7 @@ function findOutsideQuotes(expr, needle) {
     else if (ch === ")") depth--;
     else if (ch === "[") bracketDepth++;
     else if (ch === "]") bracketDepth--;
-    if (depth === 0 && bracketDepth === 0 && expr.slice(i, i + needle.length) === needle) {
+    if (depth === 0 && bracketDepth === 0 && expr.startsWith(needle, i)) {
       return i;
     }
     i++;
@@ -13069,13 +13110,16 @@ function findOutsideQuotes(expr, needle) {
   return -1;
 }
 function splitOutsideQuotes(expr, sep5) {
+  if (!expr.includes(sep5)) return [expr];
   const parts = [];
   let currentStart = 0;
   let inQuote = null;
   let depth = 0;
   let bracketDepth = 0;
   let i = 0;
-  while (i <= expr.length - sep5.length) {
+  const sepLen = sep5.length;
+  const lastStart = expr.length - sepLen;
+  while (i <= lastStart) {
     const ch = expr[i];
     if ((ch === '"' || ch === "'") && depth === 0 && bracketDepth === 0) {
       if (inQuote === null) {
@@ -13094,9 +13138,9 @@ function splitOutsideQuotes(expr, sep5) {
     else if (ch === ")") depth--;
     else if (ch === "[") bracketDepth++;
     else if (ch === "]") bracketDepth--;
-    if (depth === 0 && bracketDepth === 0 && expr.slice(i, i + sep5.length) === sep5) {
+    if (depth === 0 && bracketDepth === 0 && expr.startsWith(sep5, i)) {
       parts.push(expr.slice(currentStart, i));
-      i += sep5.length;
+      i += sepLen;
       currentStart = i;
       continue;
     }
@@ -13170,6 +13214,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);
@@ -13725,7 +13772,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, 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";
@@ -13758,6 +13805,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 {
@@ -14163,6 +14211,7 @@ var init_engine = __esm({
         const source = readFileSync6(filePath, "utf-8");
         const mtime = statSync6(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);
       }
@@ -14177,6 +14226,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);
       }
@@ -14392,6 +14442,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++;
@@ -14958,7 +15011,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) {
@@ -14973,13 +15026,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;
@@ -14997,7 +15131,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) {
@@ -15015,7 +15149,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));
                 };
@@ -18122,7 +18257,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,