tina4-nodejs 3.13.1 → 3.13.2

package/CLAUDE.md

@@ -1,10 +1,10 @@
-# CLAUDE.md — AI Developer Guide for tina4-nodejs (v3.13.1)
+# CLAUDE.md — AI Developer Guide for tina4-nodejs (v3.13.2)
 
 > 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.13.1 — The Intelligent Native Application 4ramework. A convention-over-configuration structural paradigm. The developer writes TypeScript; Tina4 is invisible infrastructure.
+Tina4 for Node.js/TypeScript v3.13.2 — The Intelligent Native Application 4ramework. A convention-over-configuration structural paradigm. The developer writes TypeScript; Tina4 is invisible infrastructure.
 
 The philosophy: zero ceremony, batteries included, file system as source of truth.
 

package/package.json

@@ -3,7 +3,7 @@
 
 
 
-  "version": "3.13.1",
+  "version": "3.13.2",
 
   "type": "module",
   "description": "Tina4 for Node.js/TypeScript \u2014 54 built-in features, zero dependencies",

package/packages/core/src/ai.ts

@@ -424,7 +424,7 @@ npx tina4nodejs routes    # List routes
 ## Database
 
 Default: SQLite via \`node:sqlite\`. Adapters for PostgreSQL, MySQL, MSSQL, Firebird.
-Set \`DATABASE_URL\` in \`.env\` (e.g. \`postgres://localhost:5432/mydb\`).
+Set \`TINA4_DATABASE_URL\` in \`.env\` (e.g. \`postgres://localhost:5432/mydb\`).
 
 ## Auth
 
@@ -485,7 +485,7 @@ npx tina4nodejs routes    # List routes
 ## Database
 
 Default: SQLite via \`node:sqlite\`. Adapters for PostgreSQL, MySQL, MSSQL, Firebird.
-Set \`DATABASE_URL\` in \`.env\`.
+Set \`TINA4_DATABASE_URL\` in \`.env\`.
 `;
 }
 
@@ -593,7 +593,7 @@ npx tina4nodejs routes          # List routes
 ## Database
 
 Default: SQLite via \`node:sqlite\`. Adapters for PostgreSQL, MySQL, MSSQL, Firebird.
-Set \`DATABASE_URL\` in \`.env\` (e.g. \`sqlite:///path/to/db.sqlite\`, \`postgres://localhost:5432/mydb\`).
+Set \`TINA4_DATABASE_URL\` in \`.env\` (e.g. \`sqlite:///path/to/db.sqlite\`, \`postgres://localhost:5432/mydb\`).
 
 ## Auth
 
@@ -693,7 +693,7 @@ npx tina4nodejs routes          # List routes
 ## Database
 
 Default: SQLite via \`node:sqlite\`. Adapters for PostgreSQL, MySQL, MSSQL, Firebird.
-Set \`DATABASE_URL\` in \`.env\`.
+Set \`TINA4_DATABASE_URL\` in \`.env\`.
 
 ## Auth
 

package/packages/core/src/scss.ts

@@ -251,30 +251,70 @@ function resolveIncludes(
 // ── Math Evaluation ──────────────────────────────────────────────
 
 function evalMath(scss: string): string {
-  return scss.replace(
+  // Mixed-unit arithmetic is left verbatim — that is exactly what CSS calc()
+  // is for, and folding it silently produces invalid output (see tina4-nodejs#1).
+  // Math inside calc(...) is preserved untouched on the same principle: the
+  // author asked the browser to compute it.
+  //
+  // Rules for folding:
+  //   * Both operands unitless                  → fold
+  //   * Same unit on both operands              → fold, keep unit
+  //   * One operand unitless for * or /         → fold, keep the other unit
+  //   * Anything else (mixed units on +/-, etc) → leave verbatim
+
+  // Step 1 — mask calc(...) ranges so the math regex cannot eat into them.
+  const placeholders: string[] = [];
+  const masked = scss.replace(/calc\([^()]*\)/g, (m) => {
+    placeholders.push(m);
+    return `\x00CALC${placeholders.length - 1}\x00`;
+  });
+
+  // Step 2 — run the math fold on what remains.
+  const folded = masked.replace(
     /([\d.]+)([a-z%]*)\s*([+\-*/])\s*([\d.]+)([a-z%]*)/g,
-    (_m, n1: string, u1: string, op: string, n2: string, _u2: string) => {
-      try {
-        const num1 = parseFloat(n1);
-        const num2 = parseFloat(n2);
-        let result: number;
-        switch (op) {
-          case "+": result = num1 + num2; break;
-          case "-": result = num1 - num2; break;
-          case "*": result = num1 * num2; break;
-          case "/": result = num2 !== 0 ? num1 / num2 : 0; break;
-          default: return _m;
-        }
-        const unit = u1 || "";
-        if (result === Math.floor(result)) {
-          return `${Math.floor(result)}${unit}`;
-        }
-        return `${result.toFixed(2)}${unit}`;
-      } catch {
-        return _m;
+    (full, n1: string, u1: string, op: string, n2: string, u2: string) => {
+      const num1 = parseFloat(n1);
+      const num2 = parseFloat(n2);
+      if (Number.isNaN(num1) || Number.isNaN(num2)) return full;
+
+      const unit1 = u1 || "";
+      const unit2 = u2 || "";
+
+      // Decide result unit; bail if units are incompatible.
+      let unit: string;
+      if (unit1 === unit2) {
+        unit = unit1;
+      } else if ((op === "*" || op === "/") && unit1 === "") {
+        unit = unit2;
+      } else if ((op === "*" || op === "/") && unit2 === "") {
+        unit = unit1;
+      } else {
+        return full;
       }
+
+      let result: number;
+      switch (op) {
+        case "+": result = num1 + num2; break;
+        case "-": result = num1 - num2; break;
+        case "*": result = num1 * num2; break;
+        case "/":
+          if (num2 === 0) return full;
+          result = num1 / num2;
+          break;
+        default: return full;
+      }
+
+      if (result === Math.floor(result)) {
+        return `${Math.floor(result)}${unit}`;
+      }
+      return `${result.toFixed(2)}${unit}`;
     }
   );
+
+  // Step 3 — restore the calc() ranges verbatim.
+  return folded.replace(/\x00CALC(\d+)\x00/g, (_m, idx: string) => {
+    return placeholders[parseInt(idx, 10)];
+  });
 }
 
 // ── Nesting Flattener ────────────────────────────────────────────

package/packages/core/src/sessionHandlers/databaseHandler.ts

@@ -5,7 +5,7 @@
  * Stores sessions in a `tina4_session` table with JSON data and expiry.
  *
  * Configure via environment variables:
- *   DATABASE_URL  (default: "sqlite:///data/tina4_sessions.db")
+ *   TINA4_DATABASE_URL  (default: "sqlite:///data/tina4_sessions.db")
  *
  * The handler dynamically imports `better-sqlite3` and throws a clear
  * error if the package is not installed.
@@ -20,7 +20,7 @@ interface SessionData {
 }
 
 export interface DatabaseSessionConfig {
-  /** SQLite database file path (default: extracted from DATABASE_URL or "data/tina4_sessions.db") */
+  /** SQLite database file path (default: extracted from TINA4_DATABASE_URL or "data/tina4_sessions.db") */
   dbPath?: string;
 }
 

package/packages/orm/src/baseModel.ts

@@ -206,7 +206,7 @@ export class BaseModel {
 
   /**
    * Get the database adapter for this model.
-   * If no adapter is registered, attempts auto-discovery from DATABASE_URL.
+   * If no adapter is registered, attempts auto-discovery from TINA4_DATABASE_URL.
    * SQLite URLs are initialised synchronously. Other engines require initDatabase()
    * to be called before first use.
    */
@@ -229,12 +229,12 @@ export class BaseModel {
           return adapter;
         }
         throw new Error(
-          `DATABASE_URL is set to a non-SQLite engine ("${parsed.type}"). ` +
+          `TINA4_DATABASE_URL is set to a non-SQLite engine ("${parsed.type}"). ` +
           `Call await initDatabase() at startup before using ORM models.`,
         );
       }
       throw new Error(
-        "No database adapter configured. Call initDatabase() or set DATABASE_URL in .env.",
+        "No database adapter configured. Call initDatabase() or set TINA4_DATABASE_URL in .env.",
       );
     }
   }

package/packages/orm/src/database.ts

@@ -60,7 +60,7 @@ export interface DatabaseConfig {
 }
 
 /**
- * Parsed result from a DATABASE_URL connection string.
+ * Parsed result from a TINA4_DATABASE_URL connection string.
  */
 export interface ParsedDatabaseUrl {
   type: "sqlite" | "postgres" | "mysql" | "mssql" | "firebird" | "mongodb" | "odbc";
@@ -75,7 +75,7 @@ export interface ParsedDatabaseUrl {
 }
 
 /**
- * Parse a DATABASE_URL connection string into its components.
+ * Parse a TINA4_DATABASE_URL connection string into its components.
  *
  * Supported formats:
  *   sqlite:///path/to/db.sqlite
@@ -325,10 +325,10 @@ export class Database {
 
   /**
    * Create a Database from an environment variable.
-   * @param envKey - Name of the env var holding the connection URL. Defaults to "DATABASE_URL".
+   * @param envKey - Name of the env var holding the connection URL. Defaults to "TINA4_DATABASE_URL".
    * @param pool - Number of pooled connections (0 = single, N>0 = round-robin)
    */
-  static async fromEnv(envKey = "DATABASE_URL", pool: number = 0): Promise<Database> {
+  static async fromEnv(envKey = "TINA4_DATABASE_URL", pool: number = 0): Promise<Database> {
     const url = process.env[envKey];
     if (!url) {
       throw new Error(`Environment variable "${envKey}" is not set.`);