@type32/tauri-sqlite-orm 0.1.9 → 0.1.11

package/dist/cli.d.mts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/cli.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/cli.js

@@ -0,0 +1,63 @@
+#!/usr/bin/env node
+"use strict";
+
+// src/cli.ts
+var import_node_fs = require("fs");
+var import_node_path = require("path");
+var help = `
+tauriorm-kit
+
+Usage:
+  bunx tauriorm-kit generate --out ./src/lib/db-client.ts --schema ./src/lib/schema.ts
+
+Options:
+  --out <file>     Output file where a typed client factory will be written
+  --schema <file>  Path to a module that exports your tables and optional relations
+  --driver <uri>   Database URI (default: sqlite:app.db)
+`;
+async function main() {
+  const args = process.argv.slice(2);
+  if (args.length === 0 || args.includes("-h") || args.includes("--help")) {
+    console.log(help);
+    process.exit(0);
+  }
+  const cmd = args[0];
+  if (cmd !== "generate") {
+    console.error("Unknown command.\n" + help);
+    process.exit(1);
+  }
+  const outIdx = args.indexOf("--out");
+  const schemaIdx = args.indexOf("--schema");
+  const driverIdx = args.indexOf("--driver");
+  if (outIdx === -1 || schemaIdx === -1) {
+    console.error("Missing --out or --schema.\n" + help);
+    process.exit(1);
+  }
+  const outPath = (0, import_node_path.resolve)(process.cwd(), args[outIdx + 1]);
+  const schemaPath = (0, import_node_path.resolve)(process.cwd(), args[schemaIdx + 1]);
+  const driverUri = driverIdx !== -1 ? args[driverIdx + 1] : "sqlite:app.db";
+  const content = `
+import { TauriORM } from "@type32/tauri-sqlite-orm";
+import * as Schema from ${JSON.stringify(schemaPath)};
+
+export function createDb() {
+  const db = new TauriORM(${JSON.stringify(driverUri)}).configure(
+    // collect tables: any export that looks like a table (has _tableName)
+    Object.fromEntries(
+      Object.entries(Schema).filter(([, v]) => v && typeof v === 'object' && '_tableName' in v)
+    ) as any,
+    // optional relations export
+    (Schema as any).relations || {}
+  );
+  return db;
+}
+`;
+  const dir = (0, import_node_path.resolve)(outPath, "..");
+  if (!(0, import_node_fs.existsSync)(dir)) (0, import_node_fs.mkdirSync)(dir, { recursive: true });
+  (0, import_node_fs.writeFileSync)(outPath, content, "utf8");
+  console.log(`\u2714 Wrote ${outPath}`);
+}
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

package/dist/cli.mjs

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+
+// src/cli.ts
+import { writeFileSync, mkdirSync, existsSync } from "fs";
+import { resolve } from "path";
+var help = `
+tauriorm-kit
+
+Usage:
+  bunx tauriorm-kit generate --out ./src/lib/db-client.ts --schema ./src/lib/schema.ts
+
+Options:
+  --out <file>     Output file where a typed client factory will be written
+  --schema <file>  Path to a module that exports your tables and optional relations
+  --driver <uri>   Database URI (default: sqlite:app.db)
+`;
+async function main() {
+  const args = process.argv.slice(2);
+  if (args.length === 0 || args.includes("-h") || args.includes("--help")) {
+    console.log(help);
+    process.exit(0);
+  }
+  const cmd = args[0];
+  if (cmd !== "generate") {
+    console.error("Unknown command.\n" + help);
+    process.exit(1);
+  }
+  const outIdx = args.indexOf("--out");
+  const schemaIdx = args.indexOf("--schema");
+  const driverIdx = args.indexOf("--driver");
+  if (outIdx === -1 || schemaIdx === -1) {
+    console.error("Missing --out or --schema.\n" + help);
+    process.exit(1);
+  }
+  const outPath = resolve(process.cwd(), args[outIdx + 1]);
+  const schemaPath = resolve(process.cwd(), args[schemaIdx + 1]);
+  const driverUri = driverIdx !== -1 ? args[driverIdx + 1] : "sqlite:app.db";
+  const content = `
+import { TauriORM } from "@type32/tauri-sqlite-orm";
+import * as Schema from ${JSON.stringify(schemaPath)};
+
+export function createDb() {
+  const db = new TauriORM(${JSON.stringify(driverUri)}).configure(
+    // collect tables: any export that looks like a table (has _tableName)
+    Object.fromEntries(
+      Object.entries(Schema).filter(([, v]) => v && typeof v === 'object' && '_tableName' in v)
+    ) as any,
+    // optional relations export
+    (Schema as any).relations || {}
+  );
+  return db;
+}
+`;
+  const dir = resolve(outPath, "..");
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  writeFileSync(outPath, content, "utf8");
+  console.log(`\u2714 Wrote ${outPath}`);
+}
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

package/dist/index.js

@@ -593,9 +593,11 @@ var SelectQueryBuilder = class {
       throw new Error("Cannot execute select query without a 'from' table.");
     }
     const db = await this._dbProvider();
+    const baseTableName = this._table._tableName || this._table.tableName;
+    if (!baseTableName) throw new Error("Invalid table passed to select.from(): missing _tableName");
     const bindings = [];
-    const selectList = this._selectedColumns.length > 0 ? this._selectedColumns.map((c) => c.alias ? `${c.sql} AS ${c.alias}` : c.sql).join(", ") : Object.values(this._table._schema).map((c) => `${this._table._tableName}.${c.name}`).join(", ");
-    let query = `SELECT ${this._distinct ? "DISTINCT " : ""}${selectList} FROM ${this._table._tableName}`;
+    const selectList = this._selectedColumns.length > 0 ? this._selectedColumns.map((c) => c.alias ? `${c.sql} AS ${c.alias}` : c.sql).join(", ") : Object.values(this._table._schema).map((c) => `${baseTableName}.${c.name}`).join(", ");
+    let query = `SELECT ${this._distinct ? "DISTINCT " : ""}${selectList} FROM ${baseTableName}`;
     if (this._joins.length > 0) query += ` ${this._joins.join(" ")}`;
     if (this._where.length > 0) {
       const whereClauses = this._where.map((condition) => {
@@ -722,30 +724,46 @@ var TauriORM = class {
       }
       async execute() {
         const db = await self.getDb();
+        const tableName = this._table._tableName || this._table.tableName;
+        if (!tableName) throw new Error("Invalid table passed to insert(): missing _tableName");
         if (this._selectSql) {
           const cols = Object.keys(this._table._schema);
-          let query = `INSERT INTO ${this._table._tableName} (${cols.join(", ")}) ${this._selectSql.clause}`;
+          let query = `INSERT INTO ${tableName} (${cols.join(", ")}) ${this._selectSql.clause}`;
           const bindings = [...this._selectSql.bindings];
           query += this._buildConflictClause();
           const ret = await this._executeWithReturning(db, query, bindings);
           return ret;
         }
         for (const data of this._rows) {
+          let coerceValue2 = function(col, value) {
+            if (col && col.mode === "boolean") {
+              return value ? 1 : 0;
+            }
+            if (value instanceof Date) {
+              if (col && col.mode === "timestamp_ms")
+                return value.getTime();
+              if (col && col.mode === "timestamp")
+                return Math.floor(value.getTime() / 1e3);
+            }
+            return value;
+          };
+          var coerceValue = coerceValue2;
           const finalData = Object.assign({}, data);
           const schema = this._table._schema;
           for (const [key, col] of Object.entries(schema)) {
             if (finalData[key] === void 0) {
               if (col.defaultFn) {
-                finalData[key] = col.defaultFn();
+                finalData[key] = coerceValue2(col, col.defaultFn());
               } else if (col.onUpdateFn) {
-                finalData[key] = col.onUpdateFn();
+                finalData[key] = coerceValue2(col, col.onUpdateFn());
               }
             }
           }
-          const keys = Object.keys(finalData);
-          const values = Object.values(finalData);
+          const entries = Object.entries(finalData);
+          const keys = entries.map(([k]) => schema[k]?.name ?? k);
+          const values = entries.map(([k, v]) => coerceValue2(schema[k], v));
           const placeholders = values.map(() => "?").join(", ");
-          let query = `INSERT INTO ${this._table._tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
+          let query = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
           const bindings = [...values];
           query += this._buildConflictClause();
           const ret = await this._executeWithReturning(db, query, bindings);
@@ -837,11 +855,21 @@ var TauriORM = class {
         if (!this._data)
           throw new Error("Update requires set() before execute()");
         const db = await self.getDb();
+        const tableName = this._table._tableName || this._table.tableName;
+        if (!tableName) throw new Error("Invalid table passed to update(): missing _tableName");
         const schema = this._table._schema;
         const dataToSet = { ...this._data };
         for (const [key, col] of Object.entries(schema)) {
           if (!(key in dataToSet) && col.onUpdateFn) {
-            dataToSet[key] = col.onUpdateFn();
+            const v = col.onUpdateFn();
+            if (col.mode === "boolean") dataToSet[key] = v ? 1 : 0;
+            else if (v instanceof Date) {
+              if (col.mode === "timestamp_ms")
+                dataToSet[key] = v.getTime();
+              else if (col.mode === "timestamp")
+                dataToSet[key] = Math.floor(v.getTime() / 1e3);
+              else dataToSet[key] = v;
+            } else dataToSet[key] = v;
           }
         }
         const setParts = [];
@@ -850,14 +878,25 @@ var TauriORM = class {
           if (v === void 0) continue;
           if (v && typeof v === "object" && typeof v.toSQL === "function") {
             const s = v.toSQL();
-            setParts.push(`${k} = ${s.clause}`);
+            const colName = schema[k]?.name ?? k;
+            setParts.push(`${colName} = ${s.clause}`);
             bindings.push(...s.bindings);
           } else {
-            setParts.push(`${k} = ?`);
-            bindings.push(v);
+            const colName = schema[k]?.name ?? k;
+            let val = v;
+            const col = schema[k];
+            if (col && col.mode === "boolean") val = v ? 1 : 0;
+            else if (v instanceof Date) {
+              if (col && col.mode === "timestamp_ms")
+                val = v.getTime();
+              else if (col && col.mode === "timestamp")
+                val = Math.floor(v.getTime() / 1e3);
+            }
+            setParts.push(`${colName} = ?`);
+            bindings.push(val);
           }
         }
-        let query = `UPDATE ${this._table._tableName} SET ${setParts.join(", ")}`;
+        let query = `UPDATE ${tableName} SET ${setParts.join(", ")}`;
         if (this._from) query += ` FROM ${this._from._tableName}`;
         if (this._where) {
           if (typeof this._where.toSQL === "function") {
@@ -867,7 +906,7 @@ var TauriORM = class {
           } else {
             const entries = Object.entries(this._where);
             if (entries.length > 0) {
-              query += ` WHERE ${entries.map(([k]) => `${k} = ?`).join(" AND ")}`;
+              query += ` WHERE ${entries.map(([k]) => `${schema[k]?.name ?? k} = ?`).join(" AND ")}`;
               bindings.push(...entries.map(([, v]) => v));
             }
           }
@@ -933,7 +972,9 @@ var TauriORM = class {
       }
       async execute() {
         const db = await self.getDb();
-        let query = `DELETE FROM ${this._table._tableName}`;
+        const tableName = this._table._tableName || this._table.tableName;
+        if (!tableName) throw new Error("Invalid table passed to delete(): missing _tableName");
+        let query = `DELETE FROM ${tableName}`;
         const bindings = [];
         if (this._where) {
           if (typeof this._where.toSQL === "function") {
@@ -943,7 +984,8 @@ var TauriORM = class {
           } else {
             const entries = Object.entries(this._where);
             if (entries.length > 0) {
-              query += ` WHERE ${entries.map(([k]) => `${k} = ?`).join(" AND ")}`;
+              const schema = this._table._schema;
+              query += ` WHERE ${entries.map(([k]) => `${schema[k]?.name ?? k} = ?`).join(" AND ")}`;
               bindings.push(...entries.map(([, v]) => v));
             }
           }

package/dist/index.mjs

@@ -515,9 +515,11 @@ var SelectQueryBuilder = class {
       throw new Error("Cannot execute select query without a 'from' table.");
     }
     const db = await this._dbProvider();
+    const baseTableName = this._table._tableName || this._table.tableName;
+    if (!baseTableName) throw new Error("Invalid table passed to select.from(): missing _tableName");
     const bindings = [];
-    const selectList = this._selectedColumns.length > 0 ? this._selectedColumns.map((c) => c.alias ? `${c.sql} AS ${c.alias}` : c.sql).join(", ") : Object.values(this._table._schema).map((c) => `${this._table._tableName}.${c.name}`).join(", ");
-    let query = `SELECT ${this._distinct ? "DISTINCT " : ""}${selectList} FROM ${this._table._tableName}`;
+    const selectList = this._selectedColumns.length > 0 ? this._selectedColumns.map((c) => c.alias ? `${c.sql} AS ${c.alias}` : c.sql).join(", ") : Object.values(this._table._schema).map((c) => `${baseTableName}.${c.name}`).join(", ");
+    let query = `SELECT ${this._distinct ? "DISTINCT " : ""}${selectList} FROM ${baseTableName}`;
     if (this._joins.length > 0) query += ` ${this._joins.join(" ")}`;
     if (this._where.length > 0) {
       const whereClauses = this._where.map((condition) => {
@@ -644,30 +646,46 @@ var TauriORM = class {
       }
       async execute() {
         const db = await self.getDb();
+        const tableName = this._table._tableName || this._table.tableName;
+        if (!tableName) throw new Error("Invalid table passed to insert(): missing _tableName");
         if (this._selectSql) {
           const cols = Object.keys(this._table._schema);
-          let query = `INSERT INTO ${this._table._tableName} (${cols.join(", ")}) ${this._selectSql.clause}`;
+          let query = `INSERT INTO ${tableName} (${cols.join(", ")}) ${this._selectSql.clause}`;
           const bindings = [...this._selectSql.bindings];
           query += this._buildConflictClause();
           const ret = await this._executeWithReturning(db, query, bindings);
           return ret;
         }
         for (const data of this._rows) {
+          let coerceValue2 = function(col, value) {
+            if (col && col.mode === "boolean") {
+              return value ? 1 : 0;
+            }
+            if (value instanceof Date) {
+              if (col && col.mode === "timestamp_ms")
+                return value.getTime();
+              if (col && col.mode === "timestamp")
+                return Math.floor(value.getTime() / 1e3);
+            }
+            return value;
+          };
+          var coerceValue = coerceValue2;
           const finalData = Object.assign({}, data);
           const schema = this._table._schema;
           for (const [key, col] of Object.entries(schema)) {
             if (finalData[key] === void 0) {
               if (col.defaultFn) {
-                finalData[key] = col.defaultFn();
+                finalData[key] = coerceValue2(col, col.defaultFn());
               } else if (col.onUpdateFn) {
-                finalData[key] = col.onUpdateFn();
+                finalData[key] = coerceValue2(col, col.onUpdateFn());
               }
             }
           }
-          const keys = Object.keys(finalData);
-          const values = Object.values(finalData);
+          const entries = Object.entries(finalData);
+          const keys = entries.map(([k]) => schema[k]?.name ?? k);
+          const values = entries.map(([k, v]) => coerceValue2(schema[k], v));
           const placeholders = values.map(() => "?").join(", ");
-          let query = `INSERT INTO ${this._table._tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
+          let query = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
           const bindings = [...values];
           query += this._buildConflictClause();
           const ret = await this._executeWithReturning(db, query, bindings);
@@ -759,11 +777,21 @@ var TauriORM = class {
         if (!this._data)
           throw new Error("Update requires set() before execute()");
         const db = await self.getDb();
+        const tableName = this._table._tableName || this._table.tableName;
+        if (!tableName) throw new Error("Invalid table passed to update(): missing _tableName");
         const schema = this._table._schema;
         const dataToSet = { ...this._data };
         for (const [key, col] of Object.entries(schema)) {
           if (!(key in dataToSet) && col.onUpdateFn) {
-            dataToSet[key] = col.onUpdateFn();
+            const v = col.onUpdateFn();
+            if (col.mode === "boolean") dataToSet[key] = v ? 1 : 0;
+            else if (v instanceof Date) {
+              if (col.mode === "timestamp_ms")
+                dataToSet[key] = v.getTime();
+              else if (col.mode === "timestamp")
+                dataToSet[key] = Math.floor(v.getTime() / 1e3);
+              else dataToSet[key] = v;
+            } else dataToSet[key] = v;
           }
         }
         const setParts = [];
@@ -772,14 +800,25 @@ var TauriORM = class {
           if (v === void 0) continue;
           if (v && typeof v === "object" && typeof v.toSQL === "function") {
             const s = v.toSQL();
-            setParts.push(`${k} = ${s.clause}`);
+            const colName = schema[k]?.name ?? k;
+            setParts.push(`${colName} = ${s.clause}`);
             bindings.push(...s.bindings);
           } else {
-            setParts.push(`${k} = ?`);
-            bindings.push(v);
+            const colName = schema[k]?.name ?? k;
+            let val = v;
+            const col = schema[k];
+            if (col && col.mode === "boolean") val = v ? 1 : 0;
+            else if (v instanceof Date) {
+              if (col && col.mode === "timestamp_ms")
+                val = v.getTime();
+              else if (col && col.mode === "timestamp")
+                val = Math.floor(v.getTime() / 1e3);
+            }
+            setParts.push(`${colName} = ?`);
+            bindings.push(val);
           }
         }
-        let query = `UPDATE ${this._table._tableName} SET ${setParts.join(", ")}`;
+        let query = `UPDATE ${tableName} SET ${setParts.join(", ")}`;
         if (this._from) query += ` FROM ${this._from._tableName}`;
         if (this._where) {
           if (typeof this._where.toSQL === "function") {
@@ -789,7 +828,7 @@ var TauriORM = class {
           } else {
             const entries = Object.entries(this._where);
             if (entries.length > 0) {
-              query += ` WHERE ${entries.map(([k]) => `${k} = ?`).join(" AND ")}`;
+              query += ` WHERE ${entries.map(([k]) => `${schema[k]?.name ?? k} = ?`).join(" AND ")}`;
               bindings.push(...entries.map(([, v]) => v));
             }
           }
@@ -855,7 +894,9 @@ var TauriORM = class {
       }
       async execute() {
         const db = await self.getDb();
-        let query = `DELETE FROM ${this._table._tableName}`;
+        const tableName = this._table._tableName || this._table.tableName;
+        if (!tableName) throw new Error("Invalid table passed to delete(): missing _tableName");
+        let query = `DELETE FROM ${tableName}`;
         const bindings = [];
         if (this._where) {
           if (typeof this._where.toSQL === "function") {
@@ -865,7 +906,8 @@ var TauriORM = class {
           } else {
             const entries = Object.entries(this._where);
             if (entries.length > 0) {
-              query += ` WHERE ${entries.map(([k]) => `${k} = ?`).join(" AND ")}`;
+              const schema = this._table._schema;
+              query += ` WHERE ${entries.map(([k]) => `${schema[k]?.name ?? k} = ?`).join(" AND ")}`;
               bindings.push(...entries.map(([, v]) => v));
             }
           }

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@type32/tauri-sqlite-orm",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
+  "bin": {
+    "tauriorm-kit": "./dist/cli.mjs"
+  },
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
@@ -15,8 +18,8 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts",
-    "dev": "tsup src/index.ts --format esm,cjs --dts --watch",
+    "build": "tsup src/index.ts src/cli.ts --format esm,cjs --dts",
+    "dev": "tsup src/index.ts src/cli.ts --format esm,cjs --dts --watch",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [