@type32/tauri-sqlite-orm 0.1.18-8 → 0.1.18-9

package/dist/index.d.mts

@@ -28,6 +28,7 @@ declare class SQLiteColumn<TName extends string = string, TType extends ColumnDa
         notNull: TNotNull;
         hasDefault: THasDefault;
         autoincrement: TAutoincrement;
+        table: AnyTable;
     };
     constructor(name: TName, type: TType, options?: ColumnOptions<ColumnValueTypes<TType, TMode>>, mode?: TMode);
     notNull(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
@@ -72,6 +73,9 @@ declare class Table<TColumns extends Record<string, AnySQLiteColumn>, TTableName
     constructor(name: TTableName, columns: TColumns);
 }
 declare const sqliteTable: <TTableName extends string, TColumns extends Record<string, AnySQLiteColumn>>(tableName: TTableName, columns: TColumns) => Table<TColumns, TTableName>;
+declare const getTableColumns: <T extends AnyTable>(table: T) => Record<string, AnySQLiteColumn>;
+declare const alias: <T extends AnyTable>(table: T, alias: string) => Table<T["_"]["columns"], T["_"]["name"]>;
+
 type SQLCondition = {
     sql: string;
     params: any[];
@@ -112,31 +116,57 @@ declare class BaseQueryBuilder {
     protected query: string;
     protected params: any[];
     constructor(db: Database);
+    build(): {
+        sql: string;
+        params: any[];
+    };
+}
+type SelectedFields = Record<string, AnySQLiteColumn | {
+    sql: string;
+    params: any[];
+}>;
+declare class SelectQueryBuilder<TTable extends AnyTable, TSelection extends SelectedFields, TResult = InferSelectModel<TTable>> extends BaseQueryBuilder {
+    private selection;
+    private isDistinct;
+    private groupByColumns;
+    private havingCondition;
+    private joinClauses;
+    private fromTable;
+    private orderByClauses;
+    private limitCount;
+    private offsetCount;
+    private whereCondition;
+    constructor(db: Database, table: TTable, selection: TSelection | undefined);
     where(condition: SQLCondition): this;
+    leftJoin(table: AnyTable, on: SQLCondition): this;
+    innerJoin(table: AnyTable, on: SQLCondition): this;
+    rightJoin(table: AnyTable, on: SQLCondition): this;
+    fullJoin(table: AnyTable, on: SQLCondition): this;
+    distinct(): this;
+    groupBy(...columns: AnySQLiteColumn[]): this;
+    having(condition: SQLCondition): this;
     orderBy(column: AnySQLiteColumn | {
         sql: string;
         params: any[];
     }, direction?: "ASC" | "DESC"): this;
     limit(count: number): this;
     offset(count: number): this;
+    private buildSelectQuery;
     build(): {
         sql: string;
         params: any[];
     };
+    execute(): Promise<TResult[]>;
+    all(): Promise<TResult[]>;
+    get(): Promise<TResult | undefined>;
 }
-declare class SelectQueryBuilder<TTable extends AnyTable, TSelectedColumns extends (keyof TTable["_"]["columns"])[] | undefined = undefined> extends BaseQueryBuilder {
-    private table;
-    private columns?;
-    private isDistinct;
-    private groupByColumns;
-    private havingCondition;
-    constructor(db: Database, table: TTable, columns?: TSelectedColumns | undefined);
-    distinct(): this;
-    groupBy(...columns: AnySQLiteColumn[]): this;
-    having(condition: SQLCondition): this;
-    execute(): Promise<TSelectedColumns extends (keyof TTable["_"]["columns"])[] ? Pick<InferSelectModel<TTable>, TSelectedColumns[number]>[] : InferSelectModel<TTable>[]>;
-    all(): Promise<TSelectedColumns extends (keyof TTable["_"]["columns"])[] ? Pick<InferSelectModel<TTable>, TSelectedColumns[number]>[] : InferSelectModel<TTable>[]>;
-    get(): Promise<TSelectedColumns extends (keyof TTable["_"]["columns"])[] ? Pick<InferSelectModel<TTable>, TSelectedColumns[number]> | undefined : InferSelectModel<TTable> | undefined>;
+declare class SelectBuilder<TSelection extends SelectedFields | undefined = undefined> {
+    private db;
+    private selection;
+    constructor(db: Database, selection: TSelection);
+    from<TTable extends AnyTable>(table: TTable): SelectQueryBuilder<TTable, TSelection extends SelectedFields ? TSelection : {}, TSelection extends SelectedFields ? {
+        [K in keyof TSelection]: any;
+    } : InferSelectModel<TTable>>;
 }
 declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private table;
@@ -147,7 +177,7 @@ declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private updateSet;
     constructor(db: Database, table: T);
     values(data: InferInsertModel<T> | InferInsertModel<T>[]): this;
-    returning(...columns: (keyof T["_"]["columns"])[]): this;
+    returning(...columns: (AnySQLiteColumn | keyof T["_"]["columns"])[]): this;
     onConflictDoNothing(target?: AnySQLiteColumn | AnySQLiteColumn[]): this;
     onConflictDoUpdate(config: {
         target: AnySQLiteColumn | AnySQLiteColumn[];
@@ -164,7 +194,7 @@ declare class UpdateQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private returningColumns;
     constructor(db: Database, table: T);
     set(data: Partial<InferInsertModel<T>>): this;
-    returning(...columns: (keyof T["_"]["columns"])[]): this;
+    returning(...columns: (AnySQLiteColumn | keyof T["_"]["columns"])[]): this;
     private buildUpdateClause;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
@@ -173,7 +203,7 @@ declare class DeleteQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private table;
     private returningColumns;
     constructor(db: Database, table: T);
-    returning(...columns: (keyof T["_"]["columns"])[]): this;
+    returning(...columns: (AnySQLiteColumn | keyof T["_"]["columns"])[]): this;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
 }
@@ -185,19 +215,23 @@ declare class WithQueryBuilder {
         sql: string;
         params: any[];
     }): this;
-    select<T extends AnyTable, C extends (keyof T["_"]["columns"])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
+    select<TTable extends AnyTable, TSelection extends SelectedFields | undefined = undefined>(table: TTable, selection?: TSelection): SelectQueryBuilder<TTable, TSelection extends SelectedFields ? TSelection : {}, TSelection extends SelectedFields ? {
+        [K in keyof TSelection]: any;
+    } : InferSelectModel<TTable>>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
     private applyWithClause;
 }
+
 declare class TauriORM {
     private db;
     private tables;
     constructor(db: Database, schema?: Record<string, AnyTable | Record<string, Relation>> | undefined);
     private buildColumnDefinition;
     migrate(): Promise<void>;
-    select<T extends AnyTable, C extends (keyof T["_"]["columns"])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
+    select(): SelectBuilder<undefined>;
+    select<TSelection extends SelectedFields>(selection: TSelection): SelectBuilder<TSelection>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
@@ -247,7 +281,5 @@ type RelationsBuilder = {
     many: <U extends AnyTable>(table: U) => ManyRelation<U>;
 };
 declare const relations: <T extends AnyTable, R extends Record<string, Relation>>(_table: T, relationsCallback: (helpers: RelationsBuilder) => R) => R;
-declare const getTableColumns: <T extends AnyTable>(table: T) => Record<string, AnySQLiteColumn>;
-declare const alias: <T extends AnyTable>(table: T, alias: string) => Table<T["_"]["columns"], T["_"]["name"]>;
 
-export { type AnySQLiteColumn, type AnyTable, type ColumnDataType, type ColumnOptions, DeleteQueryBuilder, type InferInsertModel, type InferSelectModel, InsertQueryBuilder, ManyRelation, type Mode, OneRelation, Relation, type SQLCondition, SQLiteColumn, SelectQueryBuilder, Table, TauriORM, UpdateQueryBuilder, WithQueryBuilder, alias, and, asc, avg, blob, boolean, count, countDistinct, desc, eq, getTableColumns, gt, gte, inArray, integer, isNotNull, isNull, like, lt, lte, max, min, not, or, real, relations, sql, sqliteTable, sum, text };
+export { type AnySQLiteColumn, type AnyTable, BaseQueryBuilder, type ColumnDataType, type ColumnOptions, DeleteQueryBuilder, type InferInsertModel, type InferSelectModel, InsertQueryBuilder, ManyRelation, type Mode, OneRelation, Relation, type SQLCondition, SQLiteColumn, SelectBuilder, SelectQueryBuilder, type SelectedFields, Table, TauriORM, UpdateQueryBuilder, WithQueryBuilder, alias, and, asc, avg, blob, boolean, count, countDistinct, desc, eq, getTableColumns, gt, gte, inArray, integer, isNotNull, isNull, like, lt, lte, max, min, not, or, real, relations, sql, sqliteTable, sum, text };

package/dist/index.d.ts

@@ -28,6 +28,7 @@ declare class SQLiteColumn<TName extends string = string, TType extends ColumnDa
         notNull: TNotNull;
         hasDefault: THasDefault;
         autoincrement: TAutoincrement;
+        table: AnyTable;
     };
     constructor(name: TName, type: TType, options?: ColumnOptions<ColumnValueTypes<TType, TMode>>, mode?: TMode);
     notNull(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
@@ -72,6 +73,9 @@ declare class Table<TColumns extends Record<string, AnySQLiteColumn>, TTableName
     constructor(name: TTableName, columns: TColumns);
 }
 declare const sqliteTable: <TTableName extends string, TColumns extends Record<string, AnySQLiteColumn>>(tableName: TTableName, columns: TColumns) => Table<TColumns, TTableName>;
+declare const getTableColumns: <T extends AnyTable>(table: T) => Record<string, AnySQLiteColumn>;
+declare const alias: <T extends AnyTable>(table: T, alias: string) => Table<T["_"]["columns"], T["_"]["name"]>;
+
 type SQLCondition = {
     sql: string;
     params: any[];
@@ -112,31 +116,57 @@ declare class BaseQueryBuilder {
     protected query: string;
     protected params: any[];
     constructor(db: Database);
+    build(): {
+        sql: string;
+        params: any[];
+    };
+}
+type SelectedFields = Record<string, AnySQLiteColumn | {
+    sql: string;
+    params: any[];
+}>;
+declare class SelectQueryBuilder<TTable extends AnyTable, TSelection extends SelectedFields, TResult = InferSelectModel<TTable>> extends BaseQueryBuilder {
+    private selection;
+    private isDistinct;
+    private groupByColumns;
+    private havingCondition;
+    private joinClauses;
+    private fromTable;
+    private orderByClauses;
+    private limitCount;
+    private offsetCount;
+    private whereCondition;
+    constructor(db: Database, table: TTable, selection: TSelection | undefined);
     where(condition: SQLCondition): this;
+    leftJoin(table: AnyTable, on: SQLCondition): this;
+    innerJoin(table: AnyTable, on: SQLCondition): this;
+    rightJoin(table: AnyTable, on: SQLCondition): this;
+    fullJoin(table: AnyTable, on: SQLCondition): this;
+    distinct(): this;
+    groupBy(...columns: AnySQLiteColumn[]): this;
+    having(condition: SQLCondition): this;
     orderBy(column: AnySQLiteColumn | {
         sql: string;
         params: any[];
     }, direction?: "ASC" | "DESC"): this;
     limit(count: number): this;
     offset(count: number): this;
+    private buildSelectQuery;
     build(): {
         sql: string;
         params: any[];
     };
+    execute(): Promise<TResult[]>;
+    all(): Promise<TResult[]>;
+    get(): Promise<TResult | undefined>;
 }
-declare class SelectQueryBuilder<TTable extends AnyTable, TSelectedColumns extends (keyof TTable["_"]["columns"])[] | undefined = undefined> extends BaseQueryBuilder {
-    private table;
-    private columns?;
-    private isDistinct;
-    private groupByColumns;
-    private havingCondition;
-    constructor(db: Database, table: TTable, columns?: TSelectedColumns | undefined);
-    distinct(): this;
-    groupBy(...columns: AnySQLiteColumn[]): this;
-    having(condition: SQLCondition): this;
-    execute(): Promise<TSelectedColumns extends (keyof TTable["_"]["columns"])[] ? Pick<InferSelectModel<TTable>, TSelectedColumns[number]>[] : InferSelectModel<TTable>[]>;
-    all(): Promise<TSelectedColumns extends (keyof TTable["_"]["columns"])[] ? Pick<InferSelectModel<TTable>, TSelectedColumns[number]>[] : InferSelectModel<TTable>[]>;
-    get(): Promise<TSelectedColumns extends (keyof TTable["_"]["columns"])[] ? Pick<InferSelectModel<TTable>, TSelectedColumns[number]> | undefined : InferSelectModel<TTable> | undefined>;
+declare class SelectBuilder<TSelection extends SelectedFields | undefined = undefined> {
+    private db;
+    private selection;
+    constructor(db: Database, selection: TSelection);
+    from<TTable extends AnyTable>(table: TTable): SelectQueryBuilder<TTable, TSelection extends SelectedFields ? TSelection : {}, TSelection extends SelectedFields ? {
+        [K in keyof TSelection]: any;
+    } : InferSelectModel<TTable>>;
 }
 declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private table;
@@ -147,7 +177,7 @@ declare class InsertQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private updateSet;
     constructor(db: Database, table: T);
     values(data: InferInsertModel<T> | InferInsertModel<T>[]): this;
-    returning(...columns: (keyof T["_"]["columns"])[]): this;
+    returning(...columns: (AnySQLiteColumn | keyof T["_"]["columns"])[]): this;
     onConflictDoNothing(target?: AnySQLiteColumn | AnySQLiteColumn[]): this;
     onConflictDoUpdate(config: {
         target: AnySQLiteColumn | AnySQLiteColumn[];
@@ -164,7 +194,7 @@ declare class UpdateQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private returningColumns;
     constructor(db: Database, table: T);
     set(data: Partial<InferInsertModel<T>>): this;
-    returning(...columns: (keyof T["_"]["columns"])[]): this;
+    returning(...columns: (AnySQLiteColumn | keyof T["_"]["columns"])[]): this;
     private buildUpdateClause;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
@@ -173,7 +203,7 @@ declare class DeleteQueryBuilder<T extends AnyTable> extends BaseQueryBuilder {
     private table;
     private returningColumns;
     constructor(db: Database, table: T);
-    returning(...columns: (keyof T["_"]["columns"])[]): this;
+    returning(...columns: (AnySQLiteColumn | keyof T["_"]["columns"])[]): this;
     execute(): Promise<T extends AnyTable ? (InferSelectModel<T> & Record<string, any>)[] : never>;
     returningAll(): Promise<InferSelectModel<T>[]>;
 }
@@ -185,19 +215,23 @@ declare class WithQueryBuilder {
         sql: string;
         params: any[];
     }): this;
-    select<T extends AnyTable, C extends (keyof T["_"]["columns"])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
+    select<TTable extends AnyTable, TSelection extends SelectedFields | undefined = undefined>(table: TTable, selection?: TSelection): SelectQueryBuilder<TTable, TSelection extends SelectedFields ? TSelection : {}, TSelection extends SelectedFields ? {
+        [K in keyof TSelection]: any;
+    } : InferSelectModel<TTable>>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
     private applyWithClause;
 }
+
 declare class TauriORM {
     private db;
     private tables;
     constructor(db: Database, schema?: Record<string, AnyTable | Record<string, Relation>> | undefined);
     private buildColumnDefinition;
     migrate(): Promise<void>;
-    select<T extends AnyTable, C extends (keyof T["_"]["columns"])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
+    select(): SelectBuilder<undefined>;
+    select<TSelection extends SelectedFields>(selection: TSelection): SelectBuilder<TSelection>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
@@ -247,7 +281,5 @@ type RelationsBuilder = {
     many: <U extends AnyTable>(table: U) => ManyRelation<U>;
 };
 declare const relations: <T extends AnyTable, R extends Record<string, Relation>>(_table: T, relationsCallback: (helpers: RelationsBuilder) => R) => R;
-declare const getTableColumns: <T extends AnyTable>(table: T) => Record<string, AnySQLiteColumn>;
-declare const alias: <T extends AnyTable>(table: T, alias: string) => Table<T["_"]["columns"], T["_"]["name"]>;
 
-export { type AnySQLiteColumn, type AnyTable, type ColumnDataType, type ColumnOptions, DeleteQueryBuilder, type InferInsertModel, type InferSelectModel, InsertQueryBuilder, ManyRelation, type Mode, OneRelation, Relation, type SQLCondition, SQLiteColumn, SelectQueryBuilder, Table, TauriORM, UpdateQueryBuilder, WithQueryBuilder, alias, and, asc, avg, blob, boolean, count, countDistinct, desc, eq, getTableColumns, gt, gte, inArray, integer, isNotNull, isNull, like, lt, lte, max, min, not, or, real, relations, sql, sqliteTable, sum, text };
+export { type AnySQLiteColumn, type AnyTable, BaseQueryBuilder, type ColumnDataType, type ColumnOptions, DeleteQueryBuilder, type InferInsertModel, type InferSelectModel, InsertQueryBuilder, ManyRelation, type Mode, OneRelation, Relation, type SQLCondition, SQLiteColumn, SelectBuilder, SelectQueryBuilder, type SelectedFields, Table, TauriORM, UpdateQueryBuilder, WithQueryBuilder, alias, and, asc, avg, blob, boolean, count, countDistinct, desc, eq, getTableColumns, gt, gte, inArray, integer, isNotNull, isNull, like, lt, lte, max, min, not, or, real, relations, sql, sqliteTable, sum, text };

package/dist/index.js

@@ -20,12 +20,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  BaseQueryBuilder: () => BaseQueryBuilder,
   DeleteQueryBuilder: () => DeleteQueryBuilder,
   InsertQueryBuilder: () => InsertQueryBuilder,
   ManyRelation: () => ManyRelation,
   OneRelation: () => OneRelation,
   Relation: () => Relation,
   SQLiteColumn: () => SQLiteColumn,
+  SelectBuilder: () => SelectBuilder,
   SelectQueryBuilder: () => SelectQueryBuilder,
   Table: () => Table,
   TauriORM: () => TauriORM,
@@ -64,7 +66,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/orm.ts
+// src/schema.ts
 var SQLiteColumn = class _SQLiteColumn {
   constructor(name, type, options = {}, mode) {
     this.type = type;
@@ -75,7 +77,8 @@ var SQLiteColumn = class _SQLiteColumn {
       mode: mode || "default",
       notNull: options.notNull ?? false,
       hasDefault: options.default !== void 0 || options.$defaultFn !== void 0,
-      autoincrement: options.autoincrement ?? false
+      autoincrement: options.autoincrement ?? false,
+      table: void 0
     };
   }
   _;
@@ -168,8 +171,20 @@ var Table = class {
   }
 };
 var sqliteTable = (tableName, columns) => {
-  return new Table(tableName, columns);
+  const table = new Table(tableName, columns);
+  for (const col of Object.values(columns)) {
+    col._.table = table;
+  }
+  return table;
+};
+var getTableColumns = (table) => {
+  return table._.columns;
 };
+var alias = (table, alias2) => {
+  return table;
+};
+
+// src/query-builder.ts
 var eq = (column, value) => ({
   sql: `${column._.name} = ?`,
   params: [value]
@@ -276,28 +291,6 @@ var BaseQueryBuilder = class {
   }
   query = "";
   params = [];
-  where(condition) {
-    this.query += ` WHERE ${condition.sql}`;
-    this.params.push(...condition.params);
-    return this;
-  }
-  orderBy(column, direction = "ASC") {
-    if ("sql" in column) {
-      this.query += ` ORDER BY ${column.sql} ${direction}`;
-      this.params.push(...column.params);
-    } else {
-      this.query += ` ORDER BY ${column._.name} ${direction}`;
-    }
-    return this;
-  }
-  limit(count2) {
-    this.query += ` LIMIT ${count2}`;
-    return this;
-  }
-  offset(count2) {
-    this.query += ` OFFSET ${count2}`;
-    return this;
-  }
   build() {
     return {
       sql: this.query,
@@ -306,35 +299,134 @@ var BaseQueryBuilder = class {
   }
 };
 var SelectQueryBuilder = class extends BaseQueryBuilder {
-  constructor(db, table, columns) {
+  constructor(db, table, selection) {
     super(db);
-    this.table = table;
-    this.columns = columns;
-    const columnNames = columns ? columns.map((c) => table._.columns[c]._.name) : ["*"];
-    this.query = `SELECT ${columnNames.join(", ")} FROM ${table._.name}`;
+    this.selection = selection;
+    this.fromTable = table;
+    this.query = "";
+    this.params = [];
   }
   isDistinct = false;
   groupByColumns = [];
-  havingCondition = null;
+  havingCondition;
+  joinClauses = [];
+  fromTable;
+  orderByClauses = [];
+  limitCount;
+  offsetCount;
+  whereCondition;
+  where(condition) {
+    this.whereCondition = condition;
+    return this;
+  }
+  leftJoin(table, on) {
+    this.joinClauses.push({ type: "LEFT JOIN", table, on });
+    return this;
+  }
+  innerJoin(table, on) {
+    this.joinClauses.push({ type: "INNER JOIN", table, on });
+    return this;
+  }
+  rightJoin(table, on) {
+    this.joinClauses.push({ type: "RIGHT JOIN", table, on });
+    return this;
+  }
+  fullJoin(table, on) {
+    this.joinClauses.push({ type: "FULL JOIN", table, on });
+    return this;
+  }
   distinct() {
     this.isDistinct = true;
-    this.query = this.query.replace("SELECT", "SELECT DISTINCT");
     return this;
   }
   groupBy(...columns) {
     this.groupByColumns.push(...columns);
-    const columnNames = columns.map((col) => col._.name).join(", ");
-    this.query += ` GROUP BY ${columnNames}`;
     return this;
   }
   having(condition) {
     this.havingCondition = condition;
-    this.query += ` HAVING ${condition.sql}`;
-    this.params.push(...condition.params);
     return this;
   }
+  orderBy(column, direction = "ASC") {
+    if ("sql" in column) {
+      this.orderByClauses.push({
+        sql: `${column.sql} ${direction}`,
+        params: column.params
+      });
+    } else {
+      this.orderByClauses.push({
+        sql: `${column._.name} ${direction}`,
+        params: []
+      });
+    }
+    return this;
+  }
+  limit(count2) {
+    this.limitCount = count2;
+    return this;
+  }
+  offset(count2) {
+    this.offsetCount = count2;
+    return this;
+  }
+  buildSelectQuery() {
+    const selectionEntries = this.selection ? Object.entries(this.selection) : [];
+    let columnsClause;
+    const selectParams = [];
+    if (selectionEntries.length === 0) {
+      columnsClause = "*";
+    } else {
+      columnsClause = selectionEntries.map(([alias2, col]) => {
+        if (col instanceof SQLiteColumn) {
+          return `${col._.table._.name}.${col._.name} AS "${alias2}"`;
+        } else {
+          selectParams.push(...col.params);
+          return `(${col.sql}) AS "${alias2}"`;
+        }
+      }).join(", ");
+    }
+    let query = `SELECT ${this.isDistinct ? "DISTINCT " : ""}${columnsClause} FROM ${this.fromTable._.name}`;
+    const queryParams = [...selectParams];
+    if (this.joinClauses.length > 0) {
+      const joins = this.joinClauses.map((j) => {
+        queryParams.push(...j.on.params);
+        return `${j.type} ${j.table._.name} ON ${j.on.sql}`;
+      });
+      query += ` ${joins.join(" ")}`;
+    }
+    if (this.whereCondition) {
+      query += ` WHERE ${this.whereCondition.sql}`;
+      queryParams.push(...this.whereCondition.params);
+    }
+    if (this.groupByColumns.length > 0) {
+      const columnNames = this.groupByColumns.map((c) => c._.name).join(", ");
+      query += ` GROUP BY ${columnNames}`;
+    }
+    if (this.havingCondition) {
+      query += ` HAVING ${this.havingCondition.sql}`;
+      queryParams.push(...this.havingCondition.params);
+    }
+    if (this.orderByClauses.length > 0) {
+      const orderBySql = this.orderByClauses.map((c) => c.sql).join(", ");
+      query += ` ORDER BY ${orderBySql}`;
+      queryParams.push(...this.orderByClauses.flatMap((c) => c.params));
+    }
+    if (this.limitCount !== void 0) {
+      query += ` LIMIT ${this.limitCount}`;
+    }
+    if (this.offsetCount !== void 0) {
+      query += ` OFFSET ${this.offsetCount}`;
+    }
+    return {
+      sql: query,
+      params: queryParams
+    };
+  }
+  build() {
+    return this.buildSelectQuery();
+  }
   async execute() {
-    const { sql: sql2, params } = this.build();
+    const { sql: sql2, params } = this.buildSelectQuery();
     return this.db.select(sql2, params);
   }
   async all() {
@@ -346,6 +438,19 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     return result[0];
   }
 };
+var SelectBuilder = class {
+  constructor(db, selection) {
+    this.db = db;
+    this.selection = selection;
+  }
+  from(table) {
+    return new SelectQueryBuilder(
+      this.db,
+      table,
+      this.selection
+    );
+  }
+};
 var InsertQueryBuilder = class extends BaseQueryBuilder {
   constructor(db, table) {
     super(db);
@@ -363,7 +468,13 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     return this;
   }
   returning(...columns) {
-    this.returningColumns = columns;
+    for (const col of columns) {
+      if (typeof col === "string") {
+        this.returningColumns.push(this.table._.columns[col]);
+      } else {
+        this.returningColumns.push(col);
+      }
+    }
     return this;
   }
   onConflictDoNothing(target) {
@@ -448,7 +559,7 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
         params.push(...setValues);
       }
       if (this.returningColumns.length > 0) {
-        const returningNames = this.returningColumns.map((col) => this.table._.columns[col]._.name).join(", ");
+        const returningNames = this.returningColumns.map((col) => col._.name).join(", ");
         const queryWithReturning = `${finalQuery} RETURNING ${returningNames}`;
         const rows = await this.db.select(queryWithReturning, params);
         results = results.concat(rows);
@@ -483,7 +594,13 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     return this;
   }
   returning(...columns) {
-    this.returningColumns = columns;
+    for (const col of columns) {
+      if (typeof col === "string") {
+        this.returningColumns.push(this.table._.columns[col]);
+      } else {
+        this.returningColumns.push(col);
+      }
+    }
     return this;
   }
   buildUpdateClause() {
@@ -524,7 +641,7 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
   async execute() {
     const { sql: updateSql, params } = this.buildUpdateClause();
     if (this.returningColumns.length > 0) {
-      const returningNames = this.returningColumns.map((col) => this.table._.columns[col]._.name).join(", ");
+      const returningNames = this.returningColumns.map((col) => col._.name).join(", ");
       const sqlWithReturning = `${updateSql} RETURNING ${returningNames}`;
       return this.db.select(sqlWithReturning, params);
     } else {
@@ -547,13 +664,19 @@ var DeleteQueryBuilder = class extends BaseQueryBuilder {
   }
   returningColumns = [];
   returning(...columns) {
-    this.returningColumns = columns;
+    for (const col of columns) {
+      if (typeof col === "string") {
+        this.returningColumns.push(this.table._.columns[col]);
+      } else {
+        this.returningColumns.push(col);
+      }
+    }
     return this;
   }
   async execute() {
     const { sql: sql2, params } = this.build();
     if (this.returningColumns.length > 0) {
-      const returningNames = this.returningColumns.map((col) => this.table._.columns[col]._.name).join(", ");
+      const returningNames = this.returningColumns.map((col) => col._.name).join(", ");
       const sqlWithReturning = `${sql2} RETURNING ${returningNames}`;
       return this.db.select(sqlWithReturning, params);
     } else {
@@ -577,8 +700,12 @@ var WithQueryBuilder = class {
     this.ctes.push({ alias: alias2, query: query.sql, params: query.params });
     return this;
   }
-  select(table, columns) {
-    const builder = new SelectQueryBuilder(this.db, table, columns);
+  select(table, selection) {
+    const builder = new SelectQueryBuilder(
+      this.db,
+      table,
+      selection
+    );
     this.applyWithClause(builder);
     return builder;
   }
@@ -608,6 +735,8 @@ var WithQueryBuilder = class {
     }
   }
 };
+
+// src/orm.ts
 var TauriORM = class {
   constructor(db, schema = void 0) {
     this.db = db;
@@ -662,8 +791,8 @@ var TauriORM = class {
       }
     }
   }
-  select(table, columns) {
-    return new SelectQueryBuilder(this.db, table, columns);
+  select(selection) {
+    return new SelectBuilder(this.db, selection);
   }
   insert(table) {
     return new InsertQueryBuilder(this.db, table);
@@ -786,20 +915,16 @@ var relations = (_table, relationsCallback) => {
     }
   });
 };
-var getTableColumns = (table) => {
-  return table._.columns;
-};
-var alias = (table, alias2) => {
-  return table;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  BaseQueryBuilder,
   DeleteQueryBuilder,
   InsertQueryBuilder,
   ManyRelation,
   OneRelation,
   Relation,
   SQLiteColumn,
+  SelectBuilder,
   SelectQueryBuilder,
   Table,
   TauriORM,

package/dist/index.mjs

@@ -1,4 +1,4 @@
-// src/orm.ts
+// src/schema.ts
 var SQLiteColumn = class _SQLiteColumn {
   constructor(name, type, options = {}, mode) {
     this.type = type;
@@ -9,7 +9,8 @@ var SQLiteColumn = class _SQLiteColumn {
       mode: mode || "default",
       notNull: options.notNull ?? false,
       hasDefault: options.default !== void 0 || options.$defaultFn !== void 0,
-      autoincrement: options.autoincrement ?? false
+      autoincrement: options.autoincrement ?? false,
+      table: void 0
     };
   }
   _;
@@ -102,8 +103,20 @@ var Table = class {
   }
 };
 var sqliteTable = (tableName, columns) => {
-  return new Table(tableName, columns);
+  const table = new Table(tableName, columns);
+  for (const col of Object.values(columns)) {
+    col._.table = table;
+  }
+  return table;
+};
+var getTableColumns = (table) => {
+  return table._.columns;
 };
+var alias = (table, alias2) => {
+  return table;
+};
+
+// src/query-builder.ts
 var eq = (column, value) => ({
   sql: `${column._.name} = ?`,
   params: [value]
@@ -210,28 +223,6 @@ var BaseQueryBuilder = class {
   }
   query = "";
   params = [];
-  where(condition) {
-    this.query += ` WHERE ${condition.sql}`;
-    this.params.push(...condition.params);
-    return this;
-  }
-  orderBy(column, direction = "ASC") {
-    if ("sql" in column) {
-      this.query += ` ORDER BY ${column.sql} ${direction}`;
-      this.params.push(...column.params);
-    } else {
-      this.query += ` ORDER BY ${column._.name} ${direction}`;
-    }
-    return this;
-  }
-  limit(count2) {
-    this.query += ` LIMIT ${count2}`;
-    return this;
-  }
-  offset(count2) {
-    this.query += ` OFFSET ${count2}`;
-    return this;
-  }
   build() {
     return {
       sql: this.query,
@@ -240,35 +231,134 @@ var BaseQueryBuilder = class {
   }
 };
 var SelectQueryBuilder = class extends BaseQueryBuilder {
-  constructor(db, table, columns) {
+  constructor(db, table, selection) {
     super(db);
-    this.table = table;
-    this.columns = columns;
-    const columnNames = columns ? columns.map((c) => table._.columns[c]._.name) : ["*"];
-    this.query = `SELECT ${columnNames.join(", ")} FROM ${table._.name}`;
+    this.selection = selection;
+    this.fromTable = table;
+    this.query = "";
+    this.params = [];
   }
   isDistinct = false;
   groupByColumns = [];
-  havingCondition = null;
+  havingCondition;
+  joinClauses = [];
+  fromTable;
+  orderByClauses = [];
+  limitCount;
+  offsetCount;
+  whereCondition;
+  where(condition) {
+    this.whereCondition = condition;
+    return this;
+  }
+  leftJoin(table, on) {
+    this.joinClauses.push({ type: "LEFT JOIN", table, on });
+    return this;
+  }
+  innerJoin(table, on) {
+    this.joinClauses.push({ type: "INNER JOIN", table, on });
+    return this;
+  }
+  rightJoin(table, on) {
+    this.joinClauses.push({ type: "RIGHT JOIN", table, on });
+    return this;
+  }
+  fullJoin(table, on) {
+    this.joinClauses.push({ type: "FULL JOIN", table, on });
+    return this;
+  }
   distinct() {
     this.isDistinct = true;
-    this.query = this.query.replace("SELECT", "SELECT DISTINCT");
     return this;
   }
   groupBy(...columns) {
     this.groupByColumns.push(...columns);
-    const columnNames = columns.map((col) => col._.name).join(", ");
-    this.query += ` GROUP BY ${columnNames}`;
     return this;
   }
   having(condition) {
     this.havingCondition = condition;
-    this.query += ` HAVING ${condition.sql}`;
-    this.params.push(...condition.params);
     return this;
   }
+  orderBy(column, direction = "ASC") {
+    if ("sql" in column) {
+      this.orderByClauses.push({
+        sql: `${column.sql} ${direction}`,
+        params: column.params
+      });
+    } else {
+      this.orderByClauses.push({
+        sql: `${column._.name} ${direction}`,
+        params: []
+      });
+    }
+    return this;
+  }
+  limit(count2) {
+    this.limitCount = count2;
+    return this;
+  }
+  offset(count2) {
+    this.offsetCount = count2;
+    return this;
+  }
+  buildSelectQuery() {
+    const selectionEntries = this.selection ? Object.entries(this.selection) : [];
+    let columnsClause;
+    const selectParams = [];
+    if (selectionEntries.length === 0) {
+      columnsClause = "*";
+    } else {
+      columnsClause = selectionEntries.map(([alias2, col]) => {
+        if (col instanceof SQLiteColumn) {
+          return `${col._.table._.name}.${col._.name} AS "${alias2}"`;
+        } else {
+          selectParams.push(...col.params);
+          return `(${col.sql}) AS "${alias2}"`;
+        }
+      }).join(", ");
+    }
+    let query = `SELECT ${this.isDistinct ? "DISTINCT " : ""}${columnsClause} FROM ${this.fromTable._.name}`;
+    const queryParams = [...selectParams];
+    if (this.joinClauses.length > 0) {
+      const joins = this.joinClauses.map((j) => {
+        queryParams.push(...j.on.params);
+        return `${j.type} ${j.table._.name} ON ${j.on.sql}`;
+      });
+      query += ` ${joins.join(" ")}`;
+    }
+    if (this.whereCondition) {
+      query += ` WHERE ${this.whereCondition.sql}`;
+      queryParams.push(...this.whereCondition.params);
+    }
+    if (this.groupByColumns.length > 0) {
+      const columnNames = this.groupByColumns.map((c) => c._.name).join(", ");
+      query += ` GROUP BY ${columnNames}`;
+    }
+    if (this.havingCondition) {
+      query += ` HAVING ${this.havingCondition.sql}`;
+      queryParams.push(...this.havingCondition.params);
+    }
+    if (this.orderByClauses.length > 0) {
+      const orderBySql = this.orderByClauses.map((c) => c.sql).join(", ");
+      query += ` ORDER BY ${orderBySql}`;
+      queryParams.push(...this.orderByClauses.flatMap((c) => c.params));
+    }
+    if (this.limitCount !== void 0) {
+      query += ` LIMIT ${this.limitCount}`;
+    }
+    if (this.offsetCount !== void 0) {
+      query += ` OFFSET ${this.offsetCount}`;
+    }
+    return {
+      sql: query,
+      params: queryParams
+    };
+  }
+  build() {
+    return this.buildSelectQuery();
+  }
   async execute() {
-    const { sql: sql2, params } = this.build();
+    const { sql: sql2, params } = this.buildSelectQuery();
     return this.db.select(sql2, params);
   }
   async all() {
@@ -280,6 +370,19 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     return result[0];
   }
 };
+var SelectBuilder = class {
+  constructor(db, selection) {
+    this.db = db;
+    this.selection = selection;
+  }
+  from(table) {
+    return new SelectQueryBuilder(
+      this.db,
+      table,
+      this.selection
+    );
+  }
+};
 var InsertQueryBuilder = class extends BaseQueryBuilder {
   constructor(db, table) {
     super(db);
@@ -297,7 +400,13 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
     return this;
   }
   returning(...columns) {
-    this.returningColumns = columns;
+    for (const col of columns) {
+      if (typeof col === "string") {
+        this.returningColumns.push(this.table._.columns[col]);
+      } else {
+        this.returningColumns.push(col);
+      }
+    }
     return this;
   }
   onConflictDoNothing(target) {
@@ -382,7 +491,7 @@ var InsertQueryBuilder = class extends BaseQueryBuilder {
         params.push(...setValues);
       }
       if (this.returningColumns.length > 0) {
-        const returningNames = this.returningColumns.map((col) => this.table._.columns[col]._.name).join(", ");
+        const returningNames = this.returningColumns.map((col) => col._.name).join(", ");
         const queryWithReturning = `${finalQuery} RETURNING ${returningNames}`;
         const rows = await this.db.select(queryWithReturning, params);
         results = results.concat(rows);
@@ -417,7 +526,13 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
     return this;
   }
   returning(...columns) {
-    this.returningColumns = columns;
+    for (const col of columns) {
+      if (typeof col === "string") {
+        this.returningColumns.push(this.table._.columns[col]);
+      } else {
+        this.returningColumns.push(col);
+      }
+    }
     return this;
   }
   buildUpdateClause() {
@@ -458,7 +573,7 @@ var UpdateQueryBuilder = class extends BaseQueryBuilder {
   async execute() {
     const { sql: updateSql, params } = this.buildUpdateClause();
     if (this.returningColumns.length > 0) {
-      const returningNames = this.returningColumns.map((col) => this.table._.columns[col]._.name).join(", ");
+      const returningNames = this.returningColumns.map((col) => col._.name).join(", ");
       const sqlWithReturning = `${updateSql} RETURNING ${returningNames}`;
       return this.db.select(sqlWithReturning, params);
     } else {
@@ -481,13 +596,19 @@ var DeleteQueryBuilder = class extends BaseQueryBuilder {
   }
   returningColumns = [];
   returning(...columns) {
-    this.returningColumns = columns;
+    for (const col of columns) {
+      if (typeof col === "string") {
+        this.returningColumns.push(this.table._.columns[col]);
+      } else {
+        this.returningColumns.push(col);
+      }
+    }
     return this;
   }
   async execute() {
     const { sql: sql2, params } = this.build();
     if (this.returningColumns.length > 0) {
-      const returningNames = this.returningColumns.map((col) => this.table._.columns[col]._.name).join(", ");
+      const returningNames = this.returningColumns.map((col) => col._.name).join(", ");
       const sqlWithReturning = `${sql2} RETURNING ${returningNames}`;
       return this.db.select(sqlWithReturning, params);
     } else {
@@ -511,8 +632,12 @@ var WithQueryBuilder = class {
     this.ctes.push({ alias: alias2, query: query.sql, params: query.params });
     return this;
   }
-  select(table, columns) {
-    const builder = new SelectQueryBuilder(this.db, table, columns);
+  select(table, selection) {
+    const builder = new SelectQueryBuilder(
+      this.db,
+      table,
+      selection
+    );
     this.applyWithClause(builder);
     return builder;
   }
@@ -542,6 +667,8 @@ var WithQueryBuilder = class {
     }
   }
 };
+
+// src/orm.ts
 var TauriORM = class {
   constructor(db, schema = void 0) {
     this.db = db;
@@ -596,8 +723,8 @@ var TauriORM = class {
       }
     }
   }
-  select(table, columns) {
-    return new SelectQueryBuilder(this.db, table, columns);
+  select(selection) {
+    return new SelectBuilder(this.db, selection);
   }
   insert(table) {
     return new InsertQueryBuilder(this.db, table);
@@ -720,19 +847,15 @@ var relations = (_table, relationsCallback) => {
     }
   });
 };
-var getTableColumns = (table) => {
-  return table._.columns;
-};
-var alias = (table, alias2) => {
-  return table;
-};
 export {
+  BaseQueryBuilder,
   DeleteQueryBuilder,
   InsertQueryBuilder,
   ManyRelation,
   OneRelation,
   Relation,
   SQLiteColumn,
+  SelectBuilder,
   SelectQueryBuilder,
   Table,
   TauriORM,

package/package.json

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