@type32/tauri-sqlite-orm 0.2.2 → 0.2.4

package/dist/index.d.mts

@@ -80,10 +80,23 @@ declare class SelectQueryBuilder<TTable extends AnyTable, TSelectedColumns exten
     innerJoin<T extends AnyTable>(table: T, condition: SQLCondition, alias: string): this;
     include(relations: IncludeRelations<TTable>): this;
     private buildJoins;
-    execute(): Promise<any[]>;
+    execute(): Promise<InferSelectModel<TTable>[]>;
     private processRelationResults;
-    all(): Promise<any[]>;
-    get(): Promise<any | undefined>;
+    all(): Promise<InferSelectModel<TTable>[]>;
+    get(): Promise<InferSelectModel<TTable> | undefined>;
+    exists(): Promise<boolean>;
+    count(): Promise<number>;
+    first(): Promise<InferSelectModel<TTable> | undefined>;
+    pluck<K extends keyof TTable['_']['columns']>(column: K): Promise<InferSelectModel<TTable>[K][]>;
+    paginate(page?: number, pageSize?: number): Promise<{
+        data: InferSelectModel<TTable>[];
+        total: number;
+        page: number;
+        pageSize: number;
+        totalPages: number;
+        hasNextPage: boolean;
+        hasPrevPage: boolean;
+    }>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -107,6 +120,7 @@ declare class UpdateQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private buildUpdateClause;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
+    returningFirst(): Promise<InferSelectModel<T> | undefined>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -132,6 +146,7 @@ declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private buildConflictClause;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
+    returningFirst(): Promise<InferSelectModel<T> | undefined>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -149,6 +164,7 @@ declare class DeleteQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     returning(...columns: (keyof T['_']['columns'])[]): this;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
+    returningFirst(): Promise<InferSelectModel<T> | undefined>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -268,6 +284,10 @@ declare class TauriORM {
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
+    upsert<T extends AnyTable>(table: T, data: InferInsertModel<T>, conflictTarget: (keyof T['_']['columns'])[]): Promise<T extends AnyTable ? {
+        lastInsertId: number;
+        rowsAffected: number;
+    }[] : never>;
     $with(alias: string): {
         as: (query: {
             sql: string;

package/dist/index.d.ts

@@ -80,10 +80,23 @@ declare class SelectQueryBuilder<TTable extends AnyTable, TSelectedColumns exten
     innerJoin<T extends AnyTable>(table: T, condition: SQLCondition, alias: string): this;
     include(relations: IncludeRelations<TTable>): this;
     private buildJoins;
-    execute(): Promise<any[]>;
+    execute(): Promise<InferSelectModel<TTable>[]>;
     private processRelationResults;
-    all(): Promise<any[]>;
-    get(): Promise<any | undefined>;
+    all(): Promise<InferSelectModel<TTable>[]>;
+    get(): Promise<InferSelectModel<TTable> | undefined>;
+    exists(): Promise<boolean>;
+    count(): Promise<number>;
+    first(): Promise<InferSelectModel<TTable> | undefined>;
+    pluck<K extends keyof TTable['_']['columns']>(column: K): Promise<InferSelectModel<TTable>[K][]>;
+    paginate(page?: number, pageSize?: number): Promise<{
+        data: InferSelectModel<TTable>[];
+        total: number;
+        page: number;
+        pageSize: number;
+        totalPages: number;
+        hasNextPage: boolean;
+        hasPrevPage: boolean;
+    }>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -107,6 +120,7 @@ declare class UpdateQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private buildUpdateClause;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
+    returningFirst(): Promise<InferSelectModel<T> | undefined>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -132,6 +146,7 @@ declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private buildConflictClause;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
+    returningFirst(): Promise<InferSelectModel<T> | undefined>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -149,6 +164,7 @@ declare class DeleteQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     returning(...columns: (keyof T['_']['columns'])[]): this;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
+    returningFirst(): Promise<InferSelectModel<T> | undefined>;
     toSQL(): {
         sql: string;
         params: any[];
@@ -268,6 +284,10 @@ declare class TauriORM {
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
+    upsert<T extends AnyTable>(table: T, data: InferInsertModel<T>, conflictTarget: (keyof T['_']['columns'])[]): Promise<T extends AnyTable ? {
+        lastInsertId: number;
+        rowsAffected: number;
+    }[] : never>;
     $with(alias: string): {
         as: (query: {
             sql: string;

package/dist/index.js

@@ -594,6 +594,57 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const result = await this.execute();
     return result[0];
   }
+  async exists() {
+    const originalColumns = this.selectedColumns;
+    this.selectedColumns = ["1"];
+    const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const query = `SELECT 1 ${this.query}${joinSql} LIMIT 1`;
+    const params = [...this.params, ...joinParams];
+    this.selectedColumns = originalColumns;
+    const result = await this.db.select(query, params);
+    return result.length > 0;
+  }
+  async count() {
+    const originalColumns = this.selectedColumns;
+    this.selectedColumns = ["COUNT(*) as count"];
+    const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const query = `SELECT COUNT(*) as count ${this.query}${joinSql}`;
+    const params = [...this.params, ...joinParams];
+    this.selectedColumns = originalColumns;
+    const result = await this.db.select(query, params);
+    return result[0]?.count || 0;
+  }
+  async first() {
+    return this.get();
+  }
+  async pluck(column) {
+    const columnName = this.table._.columns[column]._.name;
+    const originalColumns = this.selectedColumns;
+    this.selectedColumns = [`${this.selectedTableAlias}.${columnName} AS "${columnName}"`];
+    const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const query = `SELECT ${this.selectedColumns.join(", ")} ${this.query}${joinSql}`;
+    const params = [...this.params, ...joinParams];
+    this.selectedColumns = originalColumns;
+    const results = await this.db.select(query, params);
+    return results.map((row) => row[columnName]);
+  }
+  async paginate(page = 1, pageSize = 10) {
+    if (page < 1) page = 1;
+    if (pageSize < 1) pageSize = 10;
+    const total = await this.count();
+    const totalPages = Math.ceil(total / pageSize);
+    const offset = (page - 1) * pageSize;
+    const data = await this.limit(pageSize).offset(offset).all();
+    return {
+      data,
+      total,
+      page,
+      pageSize,
+      totalPages,
+      hasNextPage: page < totalPages,
+      hasPrevPage: page > 1
+    };
+  }
   toSQL() {
     const { sql: joinSql, params: joinParams } = this.buildJoins();
     const distinct = this.isDistinct ? "DISTINCT " : "";
@@ -781,6 +832,13 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     );
     return this.returning(...allColumns).execute();
   }
+  async returningFirst() {
+    const allColumns = Object.keys(
+      this.table._.columns
+    );
+    const results = await this.returning(...allColumns).execute();
+    return results[0];
+  }
   toSQL() {
     const { sql: updateSql, params } = this.buildUpdateClause();
     if (this.returningColumns.length > 0) {
@@ -918,6 +976,13 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     );
     return this.returning(...allColumns).execute();
   }
+  async returningFirst() {
+    const allColumns = Object.keys(
+      this.table._.columns
+    );
+    const results = await this.returning(...allColumns).execute();
+    return results[0];
+  }
   toSQL() {
     if (this.dataSets.length === 0) {
       throw new InsertValidationError("No data provided for insert. Use .values() to provide data.");
@@ -996,6 +1061,11 @@ var DeleteQueryBuilder = class extends BaseQueryBuilder {
     const allColumns = Object.keys(this.table._.columns);
     return this.returning(...allColumns).execute();
   }
+  async returningFirst() {
+    const allColumns = Object.keys(this.table._.columns);
+    const results = await this.returning(...allColumns).execute();
+    return results[0];
+  }
   toSQL() {
     const { sql: sql2, params } = this.build();
     if (this.returningColumns.length > 0) {
@@ -1253,6 +1323,13 @@ var TauriORM = class {
   delete(table) {
     return new DeleteQueryBuilder(this.db, table);
   }
+  async upsert(table, data, conflictTarget) {
+    const columns = conflictTarget.map((col) => table._.columns[col]);
+    return this.insert(table).values(data).onConflictDoUpdate({
+      target: columns.length === 1 ? columns[0] : columns,
+      set: data
+    }).execute();
+  }
   $with(alias2) {
     const withBuilder = new WithQueryBuilder(this.db);
     return {

package/dist/index.mjs

@@ -495,6 +495,57 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     const result = await this.execute();
     return result[0];
   }
+  async exists() {
+    const originalColumns = this.selectedColumns;
+    this.selectedColumns = ["1"];
+    const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const query = `SELECT 1 ${this.query}${joinSql} LIMIT 1`;
+    const params = [...this.params, ...joinParams];
+    this.selectedColumns = originalColumns;
+    const result = await this.db.select(query, params);
+    return result.length > 0;
+  }
+  async count() {
+    const originalColumns = this.selectedColumns;
+    this.selectedColumns = ["COUNT(*) as count"];
+    const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const query = `SELECT COUNT(*) as count ${this.query}${joinSql}`;
+    const params = [...this.params, ...joinParams];
+    this.selectedColumns = originalColumns;
+    const result = await this.db.select(query, params);
+    return result[0]?.count || 0;
+  }
+  async first() {
+    return this.get();
+  }
+  async pluck(column) {
+    const columnName = this.table._.columns[column]._.name;
+    const originalColumns = this.selectedColumns;
+    this.selectedColumns = [`${this.selectedTableAlias}.${columnName} AS "${columnName}"`];
+    const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const query = `SELECT ${this.selectedColumns.join(", ")} ${this.query}${joinSql}`;
+    const params = [...this.params, ...joinParams];
+    this.selectedColumns = originalColumns;
+    const results = await this.db.select(query, params);
+    return results.map((row) => row[columnName]);
+  }
+  async paginate(page = 1, pageSize = 10) {
+    if (page < 1) page = 1;
+    if (pageSize < 1) pageSize = 10;
+    const total = await this.count();
+    const totalPages = Math.ceil(total / pageSize);
+    const offset = (page - 1) * pageSize;
+    const data = await this.limit(pageSize).offset(offset).all();
+    return {
+      data,
+      total,
+      page,
+      pageSize,
+      totalPages,
+      hasNextPage: page < totalPages,
+      hasPrevPage: page > 1
+    };
+  }
   toSQL() {
     const { sql: joinSql, params: joinParams } = this.buildJoins();
     const distinct = this.isDistinct ? "DISTINCT " : "";
@@ -682,6 +733,13 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     );
     return this.returning(...allColumns).execute();
   }
+  async returningFirst() {
+    const allColumns = Object.keys(
+      this.table._.columns
+    );
+    const results = await this.returning(...allColumns).execute();
+    return results[0];
+  }
   toSQL() {
     const { sql: updateSql, params } = this.buildUpdateClause();
     if (this.returningColumns.length > 0) {
@@ -819,6 +877,13 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     );
     return this.returning(...allColumns).execute();
   }
+  async returningFirst() {
+    const allColumns = Object.keys(
+      this.table._.columns
+    );
+    const results = await this.returning(...allColumns).execute();
+    return results[0];
+  }
   toSQL() {
     if (this.dataSets.length === 0) {
       throw new InsertValidationError("No data provided for insert. Use .values() to provide data.");
@@ -897,6 +962,11 @@ var DeleteQueryBuilder = class extends BaseQueryBuilder {
     const allColumns = Object.keys(this.table._.columns);
     return this.returning(...allColumns).execute();
   }
+  async returningFirst() {
+    const allColumns = Object.keys(this.table._.columns);
+    const results = await this.returning(...allColumns).execute();
+    return results[0];
+  }
   toSQL() {
     const { sql: sql2, params } = this.build();
     if (this.returningColumns.length > 0) {
@@ -1154,6 +1224,13 @@ var TauriORM = class {
   delete(table) {
     return new DeleteQueryBuilder(this.db, table);
   }
+  async upsert(table, data, conflictTarget) {
+    const columns = conflictTarget.map((col) => table._.columns[col]);
+    return this.insert(table).values(data).onConflictDoUpdate({
+      target: columns.length === 1 ? columns[0] : columns,
+      set: data
+    }).execute();
+  }
   $with(alias2) {
     const withBuilder = new WithQueryBuilder(this.db);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@type32/tauri-sqlite-orm",
-    "version": "0.2.2",
+    "version": "0.2.4",
     "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",