@type32/tauri-sqlite-orm 0.1.11 → 0.1.13

package/dist/index.js

@@ -504,6 +504,10 @@ var asc = (column) => `${getQualifiedName(column)} ASC`;
 var desc = (column) => `${getQualifiedName(column)} DESC`;
 
 // src/orm.ts
+function getTableName(table) {
+  const anyTable = table;
+  return anyTable._tableName || anyTable.tableName || anyTable.name || "";
+}
 var SelectQueryBuilder = class {
   _table = null;
   _selectedColumns = [];
@@ -593,8 +597,12 @@ 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 baseTableName = getTableName(this._table);
+    if (!baseTableName) {
+      throw new Error(
+        "Invalid table passed to select.from(): missing table name"
+      );
+    }
     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) => `${baseTableName}.${c.name}`).join(", ");
     let query = `SELECT ${this._distinct ? "DISTINCT " : ""}${selectList} FROM ${baseTableName}`;
@@ -724,8 +732,11 @@ 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");
+        const tableName = getTableName(this._table);
+        if (!tableName)
+          throw new Error(
+            "Invalid table passed to insert(): missing table name"
+          );
         if (this._selectSql) {
           const cols = Object.keys(this._table._schema);
           let query = `INSERT INTO ${tableName} (${cols.join(", ")}) ${this._selectSql.clause}`;
@@ -763,7 +774,9 @@ var TauriORM = class {
           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 ${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);
@@ -855,8 +868,11 @@ 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 tableName = getTableName(this._table);
+        if (!tableName)
+          throw new Error(
+            "Invalid table passed to update(): missing table name"
+          );
         const schema = this._table._schema;
         const dataToSet = { ...this._data };
         for (const [key, col] of Object.entries(schema)) {
@@ -972,8 +988,11 @@ 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 delete(): missing _tableName");
+        const tableName = getTableName(this._table);
+        if (!tableName)
+          throw new Error(
+            "Invalid table passed to delete(): missing table name"
+          );
         let query = `DELETE FROM ${tableName}`;
         const bindings = [];
         if (this._where) {
@@ -1047,7 +1066,9 @@ var TauriORM = class {
     return String(dv);
   }
   generateCreateTableSql(table) {
-    const tableName = table._tableName;
+    const tableName = getTableName(table);
+    if (!tableName)
+      throw new Error("Invalid table passed to DDL: missing table name");
     const columns = Object.values(table._schema);
     const columnDefs = columns.map((col) => {
       let def = `${col.name} ${col.type}`;
@@ -1203,7 +1224,7 @@ var TauriORM = class {
     if (!this._tables) throw new Error("No tables configured.");
     const dbi = await this.getDb();
     const configuredNames = Object.values(this._tables).map(
-      (t) => t._tableName
+      (t) => getTableName(t)
     );
     const existing = await dbi.select(
       `SELECT name FROM sqlite_master WHERE type='table'`
@@ -1217,7 +1238,7 @@ var TauriORM = class {
     );
     const tables = {};
     for (const tbl of Object.values(this._tables)) {
-      const tableName = tbl._tableName;
+      const tableName = getTableName(tbl);
       if (!existingNames.includes(tableName)) {
         tables[tableName] = {
           missingColumns: Object.keys(tbl._schema),
@@ -1388,7 +1409,7 @@ var TauriORM = class {
     const dbi = await this.getDb();
     const preserve = options?.preserveData !== false;
     for (const tbl of tables) {
-      const tableName = tbl._tableName;
+      const tableName = getTableName(tbl);
       const exists2 = await this.tableExists(tableName);
       if (!exists2) {
         await this.run(this.buildCreateTableSQL(tbl));

package/dist/index.mjs

@@ -426,6 +426,10 @@ var asc = (column) => `${getQualifiedName(column)} ASC`;
 var desc = (column) => `${getQualifiedName(column)} DESC`;
 
 // src/orm.ts
+function getTableName(table) {
+  const anyTable = table;
+  return anyTable._tableName || anyTable.tableName || anyTable.name || "";
+}
 var SelectQueryBuilder = class {
   _table = null;
   _selectedColumns = [];
@@ -515,8 +519,12 @@ 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 baseTableName = getTableName(this._table);
+    if (!baseTableName) {
+      throw new Error(
+        "Invalid table passed to select.from(): missing table name"
+      );
+    }
     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) => `${baseTableName}.${c.name}`).join(", ");
     let query = `SELECT ${this._distinct ? "DISTINCT " : ""}${selectList} FROM ${baseTableName}`;
@@ -646,8 +654,11 @@ 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");
+        const tableName = getTableName(this._table);
+        if (!tableName)
+          throw new Error(
+            "Invalid table passed to insert(): missing table name"
+          );
         if (this._selectSql) {
           const cols = Object.keys(this._table._schema);
           let query = `INSERT INTO ${tableName} (${cols.join(", ")}) ${this._selectSql.clause}`;
@@ -685,7 +696,9 @@ var TauriORM = class {
           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 ${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);
@@ -777,8 +790,11 @@ 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 tableName = getTableName(this._table);
+        if (!tableName)
+          throw new Error(
+            "Invalid table passed to update(): missing table name"
+          );
         const schema = this._table._schema;
         const dataToSet = { ...this._data };
         for (const [key, col] of Object.entries(schema)) {
@@ -894,8 +910,11 @@ 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 delete(): missing _tableName");
+        const tableName = getTableName(this._table);
+        if (!tableName)
+          throw new Error(
+            "Invalid table passed to delete(): missing table name"
+          );
         let query = `DELETE FROM ${tableName}`;
         const bindings = [];
         if (this._where) {
@@ -969,7 +988,9 @@ var TauriORM = class {
     return String(dv);
   }
   generateCreateTableSql(table) {
-    const tableName = table._tableName;
+    const tableName = getTableName(table);
+    if (!tableName)
+      throw new Error("Invalid table passed to DDL: missing table name");
     const columns = Object.values(table._schema);
     const columnDefs = columns.map((col) => {
       let def = `${col.name} ${col.type}`;
@@ -1125,7 +1146,7 @@ var TauriORM = class {
     if (!this._tables) throw new Error("No tables configured.");
     const dbi = await this.getDb();
     const configuredNames = Object.values(this._tables).map(
-      (t) => t._tableName
+      (t) => getTableName(t)
     );
     const existing = await dbi.select(
       `SELECT name FROM sqlite_master WHERE type='table'`
@@ -1139,7 +1160,7 @@ var TauriORM = class {
     );
     const tables = {};
     for (const tbl of Object.values(this._tables)) {
-      const tableName = tbl._tableName;
+      const tableName = getTableName(tbl);
       if (!existingNames.includes(tableName)) {
         tables[tableName] = {
           missingColumns: Object.keys(tbl._schema),
@@ -1310,7 +1331,7 @@ var TauriORM = class {
     const dbi = await this.getDb();
     const preserve = options?.preserveData !== false;
     for (const tbl of tables) {
-      const tableName = tbl._tableName;
+      const tableName = getTableName(tbl);
       const exists2 = await this.tableExists(tableName);
       if (!exists2) {
         await this.run(this.buildCreateTableSQL(tbl));

package/package.json

@@ -1,13 +1,10 @@
 {
   "name": "@type32/tauri-sqlite-orm",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "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",
@@ -18,8 +15,8 @@
     "dist"
   ],
   "scripts": {
-    "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",
+    "build": "tsup src/index.ts --format esm,cjs --dts",
+    "dev": "tsup src/index.ts --format esm,cjs --dts --watch",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [