tina4-nodejs 3.10.24 → 3.10.31

package/README.md

@@ -3,7 +3,7 @@
 </p>
 
 <h1 align="center">Tina4 Node.js</h1>
-<h3 align="center">This is not a framework</h3>
+<h3 align="center">This Is Now A 4Framework</h3>
 
 <p align="center">
   Laravel joy. TypeScript speed. 10x less code. Zero third-party dependencies.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tina4-nodejs",
-  "version": "3.10.24",
+  "version": "3.10.31",
   "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/core/src/devAdmin.ts

@@ -20,7 +20,7 @@ import { isTruthy } from "./dotenv.js";
 
 const cpuCount = osCpus().length;
 
-const TINA4_VERSION = "3.0.0";
+const TINA4_VERSION = "3.10.30";
 
 // ---------------------------------------------------------------------------
 // Types

package/packages/core/src/server.ts

@@ -29,7 +29,7 @@ const BUILTIN_ERROR_TEMPLATES_DIR = resolve(__dirname, "..", "templates");
 /** Built-in public directory for framework-bundled static assets. */
 const BUILTIN_PUBLIC_DIR = resolve(__dirname, "..", "public");
 
-const TINA4_VERSION = "3.0.0";
+const TINA4_VERSION = "3.10.30";
 
 /** Cache Frond instances by template directory to avoid repeated instantiation. */
 const frondCache = new Map<string, InstanceType<any>>();

package/packages/frond/src/engine.ts

@@ -419,6 +419,40 @@ function evalExpr(expr: string, context: Record<string, unknown>): unknown {
     }
   }
 
+  // Arithmetic operators: +, -, *, //, /, %, ** (lowest to highest precedence)
+  for (const op of [" + ", " - ", " * ", " // ", " / ", " % ", " ** "]) {
+    const pos = findOutsideQuotes(expr, op);
+    if (pos >= 0) {
+      const left = expr.slice(0, pos).trim();
+      const right = expr.slice(pos + op.length).trim();
+      const lVal = evalExpr(left, context);
+      const rVal = evalExpr(right, context);
+      try {
+        let lNum = lVal != null ? Number(lVal) : 0;
+        let rNum = rVal != null ? Number(rVal) : 0;
+        if (isNaN(lNum)) lNum = 0;
+        if (isNaN(rNum)) rNum = 0;
+        const opS = op.trim();
+        // Preserve int type when both operands are int-like (except for / which returns float)
+        const bothInt = Number.isInteger(lNum) && Number.isInteger(rNum) && opS !== "/";
+        let result: number;
+        switch (opS) {
+          case "+": result = lNum + rNum; break;
+          case "-": result = lNum - rNum; break;
+          case "*": result = lNum * rNum; break;
+          case "//": result = rNum !== 0 ? Math.floor(lNum / rNum) : 0; break;
+          case "/": result = rNum !== 0 ? lNum / rNum : 0; break;
+          case "%": result = rNum !== 0 ? lNum % rNum : 0; break;
+          case "**": result = lNum ** rNum; break;
+          default: result = 0;
+        }
+        return bothInt && Number.isInteger(result) ? result : result;
+      } catch {
+        return null;
+      }
+    }
+  }
+
   // Function call: name("arg1", "arg2") — supports dotted names like user.t("key")
   const fnMatch = expr.match(FN_CALL_RE);
   if (fnMatch) {
@@ -1782,7 +1816,7 @@ export class Frond {
     if (m) {
       const name = m[1];
       const expr = m[2].trim();
-      context[name] = evalExpr(expr, context);
+      context[name] = this.evalVarRaw(expr, context);
     }
   }
 

package/packages/orm/src/baseModel.ts

@@ -236,37 +236,43 @@ export class BaseModel {
     const pkValue = this[pk];
     this._relCache = {}; // Clear relationship cache on save
 
-    if (pkValue !== undefined && pkValue !== null) {
-      // Update
-      const updateFields = Object.entries(ModelClass.fields).filter(
-        ([name, def]) => !def.primaryKey && this[name] !== undefined,
-      );
-      if (updateFields.length === 0) return;
-
-      const setClause = updateFields.map(([k]) => `"${ModelClass.getDbColumn(k)}" = ?`).join(", ");
-      const values = [...updateFields.map(([k]) => this[k]), pkValue];
-
-      db.execute(`UPDATE "${ModelClass.tableName}" SET ${setClause} WHERE "${pkCol}" = ?`, values);
-    } else {
-      // Insert
-      const insertFields = Object.entries(ModelClass.fields).filter(
-        ([name, def]) => !(def.primaryKey && def.autoIncrement) && this[name] !== undefined,
-      );
-
-      const columns = insertFields.map(([k]) => `"${ModelClass.getDbColumn(k)}"`).join(", ");
-      const placeholders = insertFields.map(() => "?").join(", ");
-      const values = insertFields.map(([k]) => this[k]);
-
-      const result = db.execute(
-        `INSERT INTO "${ModelClass.tableName}" (${columns}) VALUES (${placeholders})`,
-        values,
-      ) as { lastInsertRowid?: number };
-
-      if (result.lastInsertRowid) {
-        this[pk] = result.lastInsertRowid;
+    db.startTransaction();
+    try {
+      if (pkValue !== undefined && pkValue !== null) {
+        // Update
+        const updateFields = Object.entries(ModelClass.fields).filter(
+          ([name, def]) => !def.primaryKey && this[name] !== undefined,
+        );
+        if (updateFields.length === 0) { db.commit(); return; }
+
+        const setClause = updateFields.map(([k]) => `"${ModelClass.getDbColumn(k)}" = ?`).join(", ");
+        const values = [...updateFields.map(([k]) => this[k]), pkValue];
+
+        db.execute(`UPDATE "${ModelClass.tableName}" SET ${setClause} WHERE "${pkCol}" = ?`, values);
+      } else {
+        // Insert
+        const insertFields = Object.entries(ModelClass.fields).filter(
+          ([name, def]) => !(def.primaryKey && def.autoIncrement) && this[name] !== undefined,
+        );
+
+        const columns = insertFields.map(([k]) => `"${ModelClass.getDbColumn(k)}"`).join(", ");
+        const placeholders = insertFields.map(() => "?").join(", ");
+        const values = insertFields.map(([k]) => this[k]);
+
+        const result = db.execute(
+          `INSERT INTO "${ModelClass.tableName}" (${columns}) VALUES (${placeholders})`,
+          values,
+        ) as { lastInsertRowid?: number };
+
+        if (result.lastInsertRowid) {
+          this[pk] = result.lastInsertRowid;
+        }
       }
+      db.commit();
+    } catch (e) {
+      db.rollback();
+      throw e;
     }
-    db.commit();
   }
 
   /**
@@ -283,19 +289,25 @@ export class BaseModel {
       throw new Error("Cannot delete a model without a primary key value");
     }
 
-    if (ModelClass.softDelete) {
-      db.execute(
-        `UPDATE "${ModelClass.tableName}" SET is_deleted = 1 WHERE "${pkCol}" = ?`,
-        [pkValue],
-      );
-      this.is_deleted = 1;
-    } else {
-      db.execute(
-        `DELETE FROM "${ModelClass.tableName}" WHERE "${pkCol}" = ?`,
-        [pkValue],
-      );
+    db.startTransaction();
+    try {
+      if (ModelClass.softDelete) {
+        db.execute(
+          `UPDATE "${ModelClass.tableName}" SET is_deleted = 1 WHERE "${pkCol}" = ?`,
+          [pkValue],
+        );
+        this.is_deleted = 1;
+      } else {
+        db.execute(
+          `DELETE FROM "${ModelClass.tableName}" WHERE "${pkCol}" = ?`,
+          [pkValue],
+        );
+      }
+      db.commit();
+    } catch (e) {
+      db.rollback();
+      throw e;
     }
-    db.commit();
   }
 
   /**
@@ -459,9 +471,15 @@ export class BaseModel {
       }
 
       const sql = `CREATE TABLE IF NOT EXISTS "${this.tableName}" (${colDefs.join(", ")})`;
-      db.execute(sql);
+      db.startTransaction();
+      try {
+        db.execute(sql);
+        db.commit();
+      } catch (e) {
+        db.rollback();
+        throw e;
+      }
     }
-    db.commit();
   }
 
   /**
@@ -504,11 +522,17 @@ export class BaseModel {
       throw new Error("Cannot delete a model without a primary key value");
     }
 
-    db.execute(
-      `DELETE FROM "${ModelClass.tableName}" WHERE "${pkCol}" = ?`,
-      [pkValue],
-    );
-    db.commit();
+    db.startTransaction();
+    try {
+      db.execute(
+        `DELETE FROM "${ModelClass.tableName}" WHERE "${pkCol}" = ?`,
+        [pkValue],
+      );
+      db.commit();
+    } catch (e) {
+      db.rollback();
+      throw e;
+    }
   }
 
   /**
@@ -529,11 +553,17 @@ export class BaseModel {
       throw new Error("Cannot restore a model without a primary key value");
     }
 
-    db.execute(
-      `UPDATE "${ModelClass.tableName}" SET is_deleted = 0 WHERE "${pkCol}" = ?`,
-      [pkValue],
-    );
-    db.commit();
+    db.startTransaction();
+    try {
+      db.execute(
+        `UPDATE "${ModelClass.tableName}" SET is_deleted = 0 WHERE "${pkCol}" = ?`,
+        [pkValue],
+      );
+      db.commit();
+    } catch (e) {
+      db.rollback();
+      throw e;
+    }
     this.is_deleted = 0;
   }