tina4-nodejs 3.13.124 → 3.13.130

package/packages/core/dist/index.js

@@ -6374,6 +6374,38 @@ var init_sqlTranslator = __esm({
             return sql;
         }
       }
+      /**
+       * Translate SQLite-canonical DDL column TYPES + CREATE-TABLE options to the
+       * target engine.
+       *
+       * ONLY acts on `CREATE TABLE` / `ALTER TABLE` statements, so a query or INSERT
+       * that happens to contain the word `TEXT` (a column name, a string literal) is
+       * never rewritten. Complements `autoIncrementSyntax` (which maps the id
+       * keyword) so ONE portable migration — and every `Model.createTable()` DDL,
+       * which is also SQLite-canonical — applies on every engine instead of failing
+       * on Firebird/MSSQL.
+       *
+       *   * Firebird has no `TEXT` (-607), no `REAL`, and no `CREATE TABLE IF NOT
+       *     EXISTS`.
+       *   * MSSQL has no `CREATE TABLE IF NOT EXISTS` and its `TIMESTAMP` is a
+       *     rowversion, not a datetime — a `created_at TIMESTAMP` there is wrong.
+       *   * MySQL's `TIMESTAMP` carries auto-update / 2038 surprises, so a datetime
+       *     column maps to `DATETIME` (matching the adapters' createTableAsync).
+       */
+      static ddlTypes(sql, engine) {
+        const head = sql.replace(/^(?:\s*--[^\n]*\n)+/, "");
+        if (!/^\s*(?:CREATE\s+TABLE|ALTER\s+TABLE)\b/i.test(head)) return sql;
+        switch ((engine ?? "").toLowerCase()) {
+          case "firebird":
+            return sql.replace(/\bIF\s+NOT\s+EXISTS\b/gi, "").replace(/\bBLOB\s+SUB_TYPE\s+TEXT\b/gi, "\0FBTEXT\0").replace(/\bTEXT\b/gi, "BLOB SUB_TYPE TEXT").replaceAll("\0FBTEXT\0", "BLOB SUB_TYPE TEXT").replace(/\bREAL\b/gi, "DOUBLE PRECISION");
+          case "mssql":
+            return sql.replace(/\bIF\s+NOT\s+EXISTS\b/gi, "").replace(/\bTIMESTAMP\b/gi, "DATETIME2");
+          case "mysql":
+            return sql.replace(/\bTIMESTAMP\b/gi, "DATETIME");
+          default:
+            return sql;
+        }
+      }
       /**
        * Convert ? placeholders to engine-specific style.
        *
@@ -8415,6 +8447,8 @@ var init_mysql = __esm({
       translateSql(sql) {
         let translated = SQLTranslator.concatPipesToFunc(sql);
         translated = SQLTranslator.ilikeToLike(translated);
+        translated = SQLTranslator.autoIncrementSyntax(translated, "mysql");
+        translated = SQLTranslator.ddlTypes(translated, "mysql");
         return translated;
       }
       execute(sql, params) {
@@ -8836,6 +8870,9 @@ var init_mssql = __esm({
         let translated = SQLTranslator.limitToTop(sql);
         translated = SQLTranslator.concatPipesToFunc(translated);
         translated = SQLTranslator.ilikeToLike(translated);
+        translated = SQLTranslator.autoIncrementSyntax(translated, "mssql");
+        translated = SQLTranslator.booleanToInt(translated);
+        translated = SQLTranslator.ddlTypes(translated, "mssql");
         return translated;
       }
       execSqlPromise(sql, params) {
@@ -9466,6 +9503,8 @@ var init_firebird = __esm({
         let translated = SQLTranslator.limitToRows(sql);
         translated = SQLTranslator.booleanToInt(translated);
         translated = SQLTranslator.ilikeToLike(translated);
+        translated = SQLTranslator.autoIncrementSyntax(translated, "firebird");
+        translated = SQLTranslator.ddlTypes(translated, "firebird");
         return translated;
       }
       /**
@@ -15417,7 +15456,7 @@ function mulberry32(seed) {
     return ((t ^ t >>> 14) >>> 0) / 4294967296;
   };
 }
-var FIRST_NAMES, LAST_NAMES, DOMAINS, WORDS, CITIES, COUNTRIES, STREETS, JOB_TITLES, CURRENCIES, FakeData;
+var FIRST_NAMES, LAST_NAMES, DOMAINS, WORDS, CITIES, COUNTRIES, STREETS, JOB_TITLES, CURRENCIES, PRODUCT_ADJECTIVES, PRODUCT_NOUNS, FakeData;
 var init_fakeData = __esm({
   "src/fakeData.ts"() {
     "use strict";
@@ -15679,6 +15718,59 @@ var init_fakeData = __esm({
       "ZAR",
       "INR"
     ];
+    PRODUCT_ADJECTIVES = [
+      "Wireless",
+      "Organic",
+      "Premium",
+      "Classic",
+      "Eco",
+      "Smart",
+      "Portable",
+      "Deluxe",
+      "Compact",
+      "Rustic",
+      "Handcrafted",
+      "Vintage",
+      "Modern",
+      "Ergonomic",
+      "Stainless",
+      "Bamboo",
+      "Recycled",
+      "Artisan",
+      "Professional",
+      "Ultra",
+      "Insulated",
+      "Lightweight",
+      "Adjustable",
+      "Foldable"
+    ];
+    PRODUCT_NOUNS = [
+      "Keyboard",
+      "Coffee Beans",
+      "Backpack",
+      "Water Bottle",
+      "Desk Lamp",
+      "Headphones",
+      "Notebook",
+      "Sneakers",
+      "Sunglasses",
+      "Wallet",
+      "Mug",
+      "Chair",
+      "Blender",
+      "Speaker",
+      "Charger",
+      "Umbrella",
+      "Toothbrush",
+      "Jacket",
+      "Watch",
+      "Kettle",
+      "Picture Frame",
+      "Planter",
+      "Cutlery Set",
+      "Yoga Mat",
+      "Phone Case"
+    ];
     FakeData = class _FakeData {
       rng;
       seeded;
@@ -15750,6 +15842,16 @@ var init_fakeData = __esm({
       jobTitle() {
         return this.pick(JOB_TITLES);
       }
+      /**
+       * A plausible product name, e.g. "Wireless Keyboard" or "Organic Coffee
+       * Beans" — an adjective + noun from the product vocabulary. Deterministic
+       * under a seed like every other generator (draws from the same instance
+       * PRNG). Used to seed a generic `name` column on a product-ish table instead
+       * of a person name (see the ORM FakeData `forField` heuristic).
+       */
+      product() {
+        return `${this.pick(PRODUCT_ADJECTIVES)} ${this.pick(PRODUCT_NOUNS)}`;
+      }
       paragraph(sentences = 4) {
         const parts = [];
         for (let i = 0; i < sentences; i++) {
@@ -15873,11 +15975,27 @@ var init_fakeData = __esm({
 });
 
 // ../orm/src/fakeData.ts
-var FakeData2;
+function isProductTable(table2) {
+  const t = (table2 ?? "").toLowerCase();
+  return PRODUCT_TABLE_HINTS.some((hint) => t.includes(hint));
+}
+var PRODUCT_TABLE_HINTS, FakeData2;
 var init_fakeData2 = __esm({
   "../orm/src/fakeData.ts"() {
     "use strict";
     init_fakeData();
+    PRODUCT_TABLE_HINTS = [
+      "product",
+      "item",
+      "catalog",
+      "inventory",
+      "goods",
+      "merchandise",
+      "sku",
+      "listing",
+      "stock",
+      "ware"
+    ];
     FakeData2 = class extends FakeData {
       constructor(seed) {
         super(seed);
@@ -15899,8 +16017,11 @@ var init_fakeData2 = __esm({
        *
        * @param fieldDef - An ORM FieldDefinition object
        * @param columnName - Optional column name for heuristic matching (e.g. "email", "phone")
+       * @param table - Optional table/model name. A generic `name`/`full_name`
+       *   column on a product-ish table (see {@link isProductTable}) gets a
+       *   product name; with no table context it stays a person name (back-compat).
        */
-      forField(fieldDef, columnName) {
+      forField(fieldDef, columnName, table2) {
         if (fieldDef.primaryKey && fieldDef.autoIncrement) {
           return void 0;
         }
@@ -15910,7 +16031,9 @@ var init_fakeData2 = __esm({
         const col = (columnName ?? "").toLowerCase();
         if (col.includes("email")) return this.email();
         if (col.includes("phone") || col.includes("mobile") || col.includes("tel")) return this.phone();
-        if (col === "name" || col === "full_name" || col === "fullname") return this.name();
+        if (col === "name" || col === "full_name" || col === "fullname") {
+          return isProductTable(table2) ? this.product() : this.name();
+        }
         if (col === "first_name" || col === "firstname") return this.firstName();
         if (col === "last_name" || col === "lastname" || col === "surname") return this.lastName();
         if (col.includes("address")) return this.address();
@@ -15997,7 +16120,7 @@ async function autoFieldMap(db, table2, fake = new FakeData2()) {
       continue;
     }
     const fieldType = sqlTypeToFieldType(sqlType);
-    fieldMap[name] = () => fake.forField({ type: fieldType }, name);
+    fieldMap[name] = () => fake.forField({ type: fieldType }, name, table2);
   }
   return fieldMap;
 }
@@ -16143,7 +16266,7 @@ async function seedOrm(ormClass, count = 10, overrides, seed, opts, fkPools) {
         } else if (pools[name] && pools[name].length > 0) {
           attrs[name] = fake.choice(pools[name]);
         } else {
-          attrs[name] = fake.forField(def, name);
+          attrs[name] = fake.forField(def, name, modelName);
         }
       }
       validateTypes(fields, attrs, modelName);
@@ -24370,6 +24493,7 @@ __export(generate_exports, {
   parseEvery: () => parseEvery,
   parseFields: () => parseFields,
   pluralizeReserved: () => pluralizeReserved,
+  resolveTable: () => resolveTable,
   toPascal: () => toPascal,
   toSnake: () => toSnake,
   toTableName: () => toTableName
@@ -24412,12 +24536,35 @@ function toTableName(name) {
       from: raw,
       to: safe,
       reason: `SQL reserved word '${raw}' would break CREATE TABLE`,
-      override: `--table ${raw} --quote (requires quoted-identifier mode, not yet implemented)`
+      override: `--table-name <name> (table names interpolate unquoted; forcing a reserved name is yours to quote in raw SQL)`
     });
     return safe;
   }
   return raw;
 }
+function resolveTable(name, flags, opts = {}) {
+  const announce = opts.announce ?? false;
+  const override = (flags ?? {})["table-name"];
+  if (typeof override === "string" && override) {
+    if (announce && SQL_RESERVED_TABLE_NAMES.has(toSnake(override))) {
+      console.error(
+        `  ! table_name '${override}' is a SQL reserved word. Tina4 interpolates table names UNQUOTED, so the ORM's generated SQL will fail on it -- quote it yourself in raw SQL and migrations.`
+      );
+    }
+    return override;
+  }
+  const bare = toSnake(name);
+  if (!SQL_RESERVED_TABLE_NAMES.has(bare)) {
+    return bare;
+  }
+  const table2 = toTableName(name);
+  if (announce) {
+    console.error(
+      `  \xB7 '${bare}' is a SQL reserved word; using table_name '${table2}' (Tina4 interpolates table names unquoted). Override with --table-name <name>.`
+    );
+  }
+  return table2;
+}
 function resetResolution(target, input, opts) {
   __resolution.target = target;
   __resolution.input = input;
@@ -24516,10 +24663,11 @@ function printResolution() {
     lines.push(`  migration  ${b.migration_path}`);
   }
   const reserved = b.transformations.find((t) => t.kind === "reserved_word_pluralize");
-  if (reserved && reserved.from && reserved.override) {
+  if (reserved && reserved.from) {
     lines.push("");
-    lines.push(`  To keep the raw name '${reserved.from}' as the table:`);
-    lines.push(`    tina4nodejs generate ${__resolution.target} ${__resolution.input.name} ${reserved.override}`);
+    lines.push(`  To set the table name yourself:`);
+    lines.push(`    tina4nodejs generate ${__resolution.target} ${__resolution.input.name} --table-name <name>`);
+    lines.push(`  Tina4 interpolates table names unquoted; if you force the reserved '${reserved.from}', you own the quoting in raw SQL.`);
   }
   if (b.test_paths && b.test_paths.length > 0) {
     lines.push("");
@@ -24655,6 +24803,7 @@ async function generate(what, name, extraArgs = []) {
     console.error("  Usage: tina4nodejs generate <what> <name> [options]");
     console.error(`  Generators: ${GENERATOR_LIST}`);
     console.error('  Options:    --fields "name:string,price:float"  --model ModelName');
+    console.error("              --table-name <name>       force the model's table name (else derived; reserved words auto-pluralise)");
     console.error("              --public                 open a route's writes (default: secure)");
     console.error('              --every 5m | --cron "\u2026"   service schedule');
     console.error("              --json                    emit machine-readable resolution envelope on stdout");
@@ -24705,7 +24854,7 @@ async function generateProgrammatic(what, name, extraArgs = []) {
 }
 function generateModel(name, flags, emitTest = true) {
   const fields = fieldsOrDefault(flags.fields || "");
-  const table2 = toTableName(name);
+  const table2 = resolveTable(name, flags, { announce: true });
   const dir = resolve10("src/models");
   ensureDir(dir);
   const path8 = join20(dir, `${name}.ts`);
@@ -24756,7 +24905,7 @@ function generateRoute(name, flags, emitTest = true) {
   if (__resolution.target === "route") {
     setResolutionField("file_path", `src/routes/api/${routePath}/get.ts`);
   }
-  const table2 = model ? toTableName(model) : "";
+  const table2 = model ? resolveTable(model, flags, { announce: false }) : "";
   const modelImportBase = model ? `import ${model} from "../../../models/${model}.js";
 ` : "";
   const modelImportId = model ? `import ${model} from "../../../../models/${model}.js";
@@ -24977,7 +25126,7 @@ ${aiFill(`delete_${singular}`, {
   }
 }
 function generateCrud(name, flags) {
-  const table2 = toTableName(name);
+  const table2 = resolveTable(name, flags, { announce: false });
   const routeName = toPlural(table2);
   const isPublic = Boolean(flags.public);
   if (!__resolution.jsonMode) console.log(`
@@ -25004,7 +25153,7 @@ function generateMigration(name, flags, fieldsOverride, tableOverride, emitTest
     table2 = tableOverride;
   } else {
     const raw = name.replace(/^create_/, "").replace(/^add_/, "").replace(/^drop_/, "");
-    table2 = toTableName(raw);
+    table2 = resolveTable(raw, flags, { announce: false });
   }
   if (__resolution.target === "migration") {
     setResolutionField("table_name", table2);
@@ -25027,7 +25176,7 @@ function generateMigration(name, flags, fieldsOverride, tableOverride, emitTest
       const defaultClause = info.defaultVal !== "NULL" ? ` DEFAULT ${info.defaultVal}` : "";
       colLines.push(`    ${fname} ${info.sql}${defaultClause}`);
     }
-    colLines.push("    created_at TEXT DEFAULT CURRENT_TIMESTAMP");
+    colLines.push("    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP");
     upSql = `CREATE TABLE IF NOT EXISTS ${table2} (
     -- tina4:edit  add columns beyond id + created_at
 ${colLines.join(",\n")}
@@ -25230,7 +25379,7 @@ void test${titleName};
 }
 function generateForm(name, flags) {
   const fields = fieldsOrDefault(flags.fields || "");
-  const table2 = toTableName(name);
+  const table2 = resolveTable(name, flags, { announce: false });
   const routeName = toPlural(table2);
   const inputTypes = {
     string: "text",
@@ -25296,7 +25445,7 @@ function generateForm(name, flags) {
 }
 function generateView(name, flags) {
   const fields = fieldsOrDefault(flags.fields || "");
-  const table2 = toTableName(name);
+  const table2 = resolveTable(name, flags, { announce: false });
   const routeName = toPlural(table2);
   const cols = fields.map(([f]) => f);
   const dir = resolve10("src/templates/pages");
@@ -25651,8 +25800,8 @@ ${rules}  validator.required("name");   // starter rule (matches the model's def
   writeFileSafe(path8, content);
   emitValidatorTest(name, toSnake(name), toPascal(name));
 }
-function generateSeeder(name, _flags) {
-  const table2 = toTableName(name);
+function generateSeeder(name, flags) {
+  const table2 = resolveTable(name, flags, { announce: false });
   const dir = resolve10("src/seeds");
   ensureDir(dir);
   const path8 = join20(dir, `${table2}_seeder.ts`);
@@ -26170,8 +26319,8 @@ var init_generate = __esm({
   "../cli/src/commands/generate.ts"() {
     "use strict";
     FIELD_TYPE_MAP = {
-      string: { orm: '"string"', sql: "TEXT", defaultVal: "''" },
-      str: { orm: '"string"', sql: "TEXT", defaultVal: "''" },
+      string: { orm: '"string"', sql: "VARCHAR(255)", defaultVal: "''" },
+      str: { orm: '"string"', sql: "VARCHAR(255)", defaultVal: "''" },
       int: { orm: '"integer"', sql: "INTEGER", defaultVal: "0" },
       integer: { orm: '"integer"', sql: "INTEGER", defaultVal: "0" },
       float: { orm: '"number"', sql: "REAL", defaultVal: "0" },
@@ -26181,7 +26330,7 @@ var init_generate = __esm({
       bool: { orm: '"boolean"', sql: "INTEGER", defaultVal: "0" },
       boolean: { orm: '"boolean"', sql: "INTEGER", defaultVal: "0" },
       text: { orm: '"string"', sql: "TEXT", defaultVal: "''" },
-      datetime: { orm: '"datetime"', sql: "TEXT", defaultVal: "NULL" },
+      datetime: { orm: '"datetime"', sql: "TIMESTAMP", defaultVal: "NULL" },
       blob: { orm: '"string"', sql: "BLOB", defaultVal: "NULL" }
     };
     SQL_RESERVED_TABLE_NAMES = /* @__PURE__ */ new Set([
@@ -26277,7 +26426,7 @@ var init_generate = __esm({
     TINA4_EDIT_MARKER = /^\s*(?:\/\/|--|\{#|#)\s*tina4:edit\s+(.+?)(?:\s*#\})?\s*$/;
     DEFAULT_FIELDS = [["name", "string"]];
     GENERATORS = {
-      model: { handler: generateModel, usage: '<Name> [--fields "name:string,price:float"]', summary: "ORM model + matching migration" },
+      model: { handler: generateModel, usage: '<Name> [--fields "name:string,price:float"] [--table-name <name>]', summary: "ORM model + matching migration" },
       route: { handler: generateRoute, usage: "<name> [--model Name] [--public]", summary: "CRUD route file, secure by default (--public opens writes)" },
       crud: { handler: generateCrud, usage: '<Name> [--fields "..."] [--public]', summary: "Model + migration + routes + form + view + test" },
       migration: { handler: (n, f) => generateMigration(n, f, void 0, void 0, !f["no-test"]), usage: "<description>", summary: "Timestamped migration file (UP/DOWN)" },

package/packages/core/src/fakeData.ts

@@ -22,7 +22,10 @@ import { resolve, join } from "node:path";
 
 // ── Word Banks ───────────────────────────────────────────────────
 
-const FIRST_NAMES = [
+// Exported (not via the barrel) so seeding tests can build the disjoint
+// product-vs-person vocabulary check, mirroring the Python master's
+// `_FIRST_NAMES` import. Internal-but-importable, like Python's underscore name.
+export const FIRST_NAMES = [
   "Alice", "Bob", "Charlie", "Diana", "Eve", "Frank", "Grace", "Henry",
   "Ivy", "Jack", "Kate", "Leo", "Mia", "Noah", "Olivia", "Pete",
   "Quinn", "Rose", "Sam", "Tina", "Uma", "Vince", "Wendy", "Xander",
@@ -32,7 +35,7 @@ const FIRST_NAMES = [
   "Zara", "Amber", "Blake", "Clara",
 ];
 
-const LAST_NAMES = [
+export const LAST_NAMES = [
   "Smith", "Johnson", "Williams", "Brown", "Jones", "Garcia", "Miller",
   "Davis", "Rodriguez", "Martinez", "Hernandez", "Lopez", "Wilson",
   "Anderson", "Thomas", "Taylor", "Moore", "Jackson", "Martin", "Lee",
@@ -88,6 +91,27 @@ const CURRENCIES = [
   "SEK", "NZD", "MXN", "SGD", "HKD", "NOK", "ZAR", "INR",
 ];
 
+// Product-name vocabulary (adjective + noun). Seeds a generic `name` column on
+// a product-ish table with "Wireless Keyboard" instead of a person name.
+// Exported (not via the barrel) so seeding tests can assert product-vs-person
+// disjointness — mirrors the Python master's `_PRODUCT_ADJECTIVES`. The two
+// vocabularies are disjoint from FIRST_NAMES by construction, so the FIRST word
+// of a generated value tells which generator ran.
+export const PRODUCT_ADJECTIVES = [
+  "Wireless", "Organic", "Premium", "Classic", "Eco", "Smart", "Portable",
+  "Deluxe", "Compact", "Rustic", "Handcrafted", "Vintage", "Modern",
+  "Ergonomic", "Stainless", "Bamboo", "Recycled", "Artisan", "Professional",
+  "Ultra", "Insulated", "Lightweight", "Adjustable", "Foldable",
+];
+
+export const PRODUCT_NOUNS = [
+  "Keyboard", "Coffee Beans", "Backpack", "Water Bottle", "Desk Lamp",
+  "Headphones", "Notebook", "Sneakers", "Sunglasses", "Wallet", "Mug",
+  "Chair", "Blender", "Speaker", "Charger", "Umbrella", "Toothbrush",
+  "Jacket", "Watch", "Kettle", "Picture Frame", "Planter", "Cutlery Set",
+  "Yoga Mat", "Phone Case",
+];
+
 // ── Seeded PRNG (mulberry32) ─────────────────────────────────────
 
 /**
@@ -193,6 +217,17 @@ export class FakeData {
     return this.pick(JOB_TITLES);
   }
 
+  /**
+   * A plausible product name, e.g. "Wireless Keyboard" or "Organic Coffee
+   * Beans" — an adjective + noun from the product vocabulary. Deterministic
+   * under a seed like every other generator (draws from the same instance
+   * PRNG). Used to seed a generic `name` column on a product-ish table instead
+   * of a person name (see the ORM FakeData `forField` heuristic).
+   */
+  product(): string {
+    return `${this.pick(PRODUCT_ADJECTIVES)} ${this.pick(PRODUCT_NOUNS)}`;
+  }
+
   paragraph(sentences = 4): string {
     const parts: string[] = [];
     for (let i = 0; i < sentences; i++) {