@type32/tauri-sqlite-orm 0.1.12 → 0.1.14

package/dist/index.d.mts

@@ -194,6 +194,31 @@ type InferInsert<T> = T extends {
 type InferSelect<T> = T extends {
     $inferSelect: infer S;
 } ? S : never;
+type WithSpec = Record<string, boolean | {
+    with?: WithSpec;
+    columns?: string[];
+}>;
+type FindManyOptions<TTable extends Table<any>> = {
+    with?: WithSpec;
+    join?: boolean;
+    columns?: (keyof InferSelect<TTable>)[] | Record<keyof InferSelect<TTable>, boolean>;
+    where?: SQL | Partial<InferSelect<TTable>> | ((table: TTable, ops: {
+        eq: typeof eq;
+        ne: typeof ne;
+        gt: typeof gt;
+        gte: typeof gte;
+        lt: typeof lt;
+        lte: typeof lte;
+        like: typeof like;
+    }) => SQL);
+    orderBy?: (keyof InferSelect<TTable>)[] | ((table: TTable, ops: {
+        asc: typeof asc;
+        desc: typeof desc;
+    }) => (string | SQL)[]);
+    limit?: number;
+    offset?: number;
+};
+type FindFirstOptions<TTable extends Table<any>> = Omit<FindManyOptions<TTable>, "limit" | "offset">;
 declare class SelectQueryBuilder<T> {
     private _table;
     private _selectedColumns;
@@ -323,8 +348,8 @@ declare class TauriORM {
     configure<TTables extends Record<string, Table<any>>, TRelDefs extends Record<string, Record<string, RelationConfig>> = Record<string, Record<string, RelationConfig>>>(tables: TTables, relDefs?: TRelDefs): this & {
         query: {
             [K in keyof TTables]: {
-                findMany: (opts?: any) => Promise<Array<InferSelect<TTables[K]>>>;
-                findFirst: (opts?: any) => Promise<InferSelect<TTables[K]> | null>;
+                findMany: (opts?: FindManyOptions<TTables[K]>) => Promise<Array<InferSelect<TTables[K]>>>;
+                findFirst: (opts?: FindFirstOptions<TTables[K]>) => Promise<InferSelect<TTables[K]> | null>;
             };
         };
     };
@@ -414,10 +439,6 @@ type ManyRelation = {
 };
 declare function relations(baseTable: Table<any>, builder: (ctx: RelationBuilderCtx) => Record<string, OneRelation | ManyRelation>): Record<string, OneRelation | ManyRelation>;
 type RelationConfig = OneRelation | ManyRelation;
-type WithSpec = Record<string, boolean | {
-    with?: WithSpec;
-    columns?: string[];
-}>;
 declare function makeQueryAPI(tables: Record<string, Table<any>>, relDefs: Record<string, Record<string, RelationConfig>>, dbProvider: () => Promise<Database>): { [K in keyof typeof tables]: {
     findMany: (opts?: {
         with?: WithSpec;

package/dist/index.d.ts

@@ -194,6 +194,31 @@ type InferInsert<T> = T extends {
 type InferSelect<T> = T extends {
     $inferSelect: infer S;
 } ? S : never;
+type WithSpec = Record<string, boolean | {
+    with?: WithSpec;
+    columns?: string[];
+}>;
+type FindManyOptions<TTable extends Table<any>> = {
+    with?: WithSpec;
+    join?: boolean;
+    columns?: (keyof InferSelect<TTable>)[] | Record<keyof InferSelect<TTable>, boolean>;
+    where?: SQL | Partial<InferSelect<TTable>> | ((table: TTable, ops: {
+        eq: typeof eq;
+        ne: typeof ne;
+        gt: typeof gt;
+        gte: typeof gte;
+        lt: typeof lt;
+        lte: typeof lte;
+        like: typeof like;
+    }) => SQL);
+    orderBy?: (keyof InferSelect<TTable>)[] | ((table: TTable, ops: {
+        asc: typeof asc;
+        desc: typeof desc;
+    }) => (string | SQL)[]);
+    limit?: number;
+    offset?: number;
+};
+type FindFirstOptions<TTable extends Table<any>> = Omit<FindManyOptions<TTable>, "limit" | "offset">;
 declare class SelectQueryBuilder<T> {
     private _table;
     private _selectedColumns;
@@ -323,8 +348,8 @@ declare class TauriORM {
     configure<TTables extends Record<string, Table<any>>, TRelDefs extends Record<string, Record<string, RelationConfig>> = Record<string, Record<string, RelationConfig>>>(tables: TTables, relDefs?: TRelDefs): this & {
         query: {
             [K in keyof TTables]: {
-                findMany: (opts?: any) => Promise<Array<InferSelect<TTables[K]>>>;
-                findFirst: (opts?: any) => Promise<InferSelect<TTables[K]> | null>;
+                findMany: (opts?: FindManyOptions<TTables[K]>) => Promise<Array<InferSelect<TTables[K]>>>;
+                findFirst: (opts?: FindFirstOptions<TTables[K]>) => Promise<InferSelect<TTables[K]> | null>;
             };
         };
     };
@@ -414,10 +439,6 @@ type ManyRelation = {
 };
 declare function relations(baseTable: Table<any>, builder: (ctx: RelationBuilderCtx) => Record<string, OneRelation | ManyRelation>): Record<string, OneRelation | ManyRelation>;
 type RelationConfig = OneRelation | ManyRelation;
-type WithSpec = Record<string, boolean | {
-    with?: WithSpec;
-    columns?: string[];
-}>;
 declare function makeQueryAPI(tables: Record<string, Table<any>>, relDefs: Record<string, Record<string, RelationConfig>>, dbProvider: () => Promise<Database>): { [K in keyof typeof tables]: {
     findMany: (opts?: {
         with?: WithSpec;

package/dist/index.js

@@ -273,7 +273,7 @@ function defineTable(tableName, schema, extras) {
     col.tableName = tableName;
   }
   const table = {
-    _tableName: tableName,
+    tableName,
     _schema: finalizedSchema,
     _constraints: [],
     _indexes: [],
@@ -1066,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}`;
@@ -1222,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'`
@@ -1236,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),
@@ -1407,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

@@ -195,7 +195,7 @@ function defineTable(tableName, schema, extras) {
     col.tableName = tableName;
   }
   const table = {
-    _tableName: tableName,
+    tableName,
     _schema: finalizedSchema,
     _constraints: [],
     _indexes: [],
@@ -988,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}`;
@@ -1144,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'`
@@ -1158,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),
@@ -1329,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,6 +1,6 @@
 {
   "name": "@type32/tauri-sqlite-orm",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",