@type32/tauri-sqlite-orm 0.1.18-16 → 0.1.18-18

package/dist/index.d.mts

@@ -138,7 +138,7 @@ type RelationsBuilder = {
     many: <U extends AnyTable>(table: U) => ManyRelation<U>;
 };
 
-declare class SQLiteColumn<TName extends string = string, TType extends ColumnDataType = ColumnDataType, TMode extends Mode = "default", TNotNull extends boolean = false, THasDefault extends boolean = false, TAutoincrement extends boolean = false> {
+declare class SQLiteColumn<TName extends string = string, TType extends ColumnDataType = ColumnDataType, TMode extends Mode = 'default', TNotNull extends boolean = false, THasDefault extends boolean = false, TAutoincrement extends boolean = false> {
     type: TType;
     options: ColumnOptions<ColumnValueTypes<TType, TMode>>;
     _: {
@@ -156,11 +156,11 @@ declare class SQLiteColumn<TName extends string = string, TType extends ColumnDa
     primaryKey(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
     autoincrement(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, true>;
     unique(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
-    references<T extends AnyTable, K extends keyof T["_"]["columns"] & string>(ref: T, column: K): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
+    references<T extends AnyTable, K extends keyof T['_']['columns'] & string>(ref: T, column: K): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
     $onUpdateFn(fn: () => ColumnValueTypes<TType, TMode>): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
     as(alias: string): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
 }
-type IsOptionalOnInsert<C extends AnySQLiteColumn> = C["_"]["notNull"] extends false ? true : C["_"]["hasDefault"] extends true ? true : C["_"]["autoincrement"] extends true ? true : false;
+type IsOptionalOnInsert<C extends AnySQLiteColumn> = C['_']['notNull'] extends false ? true : C['_']['hasDefault'] extends true ? true : C['_']['autoincrement'] extends true ? true : false;
 type OptionalColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
     [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? K : never;
 }[keyof TColumns];
@@ -168,9 +168,9 @@ type RequiredColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
     [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? never : K;
 }[keyof TColumns];
 type InferInsertModel<T extends AnyTable> = {
-    [K in RequiredColumns<T["_"]["columns"]>]: ExtractColumnType<T["_"]["columns"][K]>;
+    [K in RequiredColumns<T['_']['columns']>]: ExtractColumnType<T['_']['columns'][K]>;
 } & {
-    [K in OptionalColumns<T["_"]["columns"]>]?: ExtractColumnType<T["_"]["columns"][K]>;
+    [K in OptionalColumns<T['_']['columns']>]?: ExtractColumnType<T['_']['columns'][K]>;
 };
 declare class Table<TColumns extends Record<string, AnySQLiteColumn>, TTableName extends string> {
     _: {
@@ -204,7 +204,7 @@ declare class TauriORM {
     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<T extends AnyTable, C extends (keyof T['_']['columns'])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
@@ -246,7 +246,7 @@ declare class OneRelation<T extends AnyTable = AnyTable> extends Relation<T> {
 declare class ManyRelation<T extends AnyTable = AnyTable> extends Relation<T> {
     constructor(foreignTable: T);
 }
-declare const relations: <T extends AnyTable, R extends Record<string, Relation>>(_table: T, relationsCallback: (helpers: RelationsBuilder) => R) => R;
+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"]>;
 

package/dist/index.d.ts

@@ -138,7 +138,7 @@ type RelationsBuilder = {
     many: <U extends AnyTable>(table: U) => ManyRelation<U>;
 };
 
-declare class SQLiteColumn<TName extends string = string, TType extends ColumnDataType = ColumnDataType, TMode extends Mode = "default", TNotNull extends boolean = false, THasDefault extends boolean = false, TAutoincrement extends boolean = false> {
+declare class SQLiteColumn<TName extends string = string, TType extends ColumnDataType = ColumnDataType, TMode extends Mode = 'default', TNotNull extends boolean = false, THasDefault extends boolean = false, TAutoincrement extends boolean = false> {
     type: TType;
     options: ColumnOptions<ColumnValueTypes<TType, TMode>>;
     _: {
@@ -156,11 +156,11 @@ declare class SQLiteColumn<TName extends string = string, TType extends ColumnDa
     primaryKey(): SQLiteColumn<TName, TType, TMode, true, THasDefault, TAutoincrement>;
     autoincrement(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, true>;
     unique(): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
-    references<T extends AnyTable, K extends keyof T["_"]["columns"] & string>(ref: T, column: K): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
+    references<T extends AnyTable, K extends keyof T['_']['columns'] & string>(ref: T, column: K): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
     $onUpdateFn(fn: () => ColumnValueTypes<TType, TMode>): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
     as(alias: string): SQLiteColumn<TName, TType, TMode, TNotNull, THasDefault, TAutoincrement>;
 }
-type IsOptionalOnInsert<C extends AnySQLiteColumn> = C["_"]["notNull"] extends false ? true : C["_"]["hasDefault"] extends true ? true : C["_"]["autoincrement"] extends true ? true : false;
+type IsOptionalOnInsert<C extends AnySQLiteColumn> = C['_']['notNull'] extends false ? true : C['_']['hasDefault'] extends true ? true : C['_']['autoincrement'] extends true ? true : false;
 type OptionalColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
     [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? K : never;
 }[keyof TColumns];
@@ -168,9 +168,9 @@ type RequiredColumns<TColumns extends Record<string, AnySQLiteColumn>> = {
     [K in keyof TColumns]: IsOptionalOnInsert<TColumns[K]> extends true ? never : K;
 }[keyof TColumns];
 type InferInsertModel<T extends AnyTable> = {
-    [K in RequiredColumns<T["_"]["columns"]>]: ExtractColumnType<T["_"]["columns"][K]>;
+    [K in RequiredColumns<T['_']['columns']>]: ExtractColumnType<T['_']['columns'][K]>;
 } & {
-    [K in OptionalColumns<T["_"]["columns"]>]?: ExtractColumnType<T["_"]["columns"][K]>;
+    [K in OptionalColumns<T['_']['columns']>]?: ExtractColumnType<T['_']['columns'][K]>;
 };
 declare class Table<TColumns extends Record<string, AnySQLiteColumn>, TTableName extends string> {
     _: {
@@ -204,7 +204,7 @@ declare class TauriORM {
     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<T extends AnyTable, C extends (keyof T['_']['columns'])[] | undefined = undefined>(table: T, columns?: C): SelectQueryBuilder<T, C>;
     insert<T extends AnyTable>(table: T): InsertQueryBuilder<T>;
     update<T extends AnyTable>(table: T): UpdateQueryBuilder<T>;
     delete<T extends AnyTable>(table: T): DeleteQueryBuilder<T>;
@@ -246,7 +246,7 @@ declare class OneRelation<T extends AnyTable = AnyTable> extends Relation<T> {
 declare class ManyRelation<T extends AnyTable = AnyTable> extends Relation<T> {
     constructor(foreignTable: T);
 }
-declare const relations: <T extends AnyTable, R extends Record<string, Relation>>(_table: T, relationsCallback: (helpers: RelationsBuilder) => R) => R;
+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"]>;
 

package/dist/index.js

@@ -296,9 +296,18 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     return rawResults;
   }
   processRelationResults(rawResults) {
-    if (!rawResults.length) return rawResults;
-    return rawResults.map((row) => {
-      const result = {};
+    if (!rawResults.length) return [];
+    const mainTablePks = Object.values(this.table._.columns).filter((c) => c.options.primaryKey).map((c) => c._.name);
+    if (mainTablePks.length === 0) {
+      return rawResults;
+    }
+    const groupedResults = /* @__PURE__ */ new Map();
+    for (const row of rawResults) {
+      const mainTableKey = mainTablePks.map((pk) => row[`${this.selectedTableAlias}.${pk}`] ?? row[pk]).join("_");
+      if (!groupedResults.has(mainTableKey)) {
+        groupedResults.set(mainTableKey, {});
+      }
+      const result = groupedResults.get(mainTableKey);
       const relations2 = {};
       for (const [key, value] of Object.entries(row)) {
         if (key.includes(".")) {
@@ -321,15 +330,25 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
         }
       }
       for (const [relName, relData] of Object.entries(relations2)) {
+        const relationConfig = this.table.relations[relName];
+        if (!relationConfig) continue;
         const hasData = Object.values(relData).some(
           (v) => v !== null && v !== void 0 && v !== ""
         );
-        if (hasData) {
+        if (!hasData) continue;
+        if (relationConfig.type === "many") {
+          if (!result[relName]) result[relName] = [];
+          const relatedPks = Object.values(relationConfig.foreignTable._.columns).filter((c) => c.options.primaryKey).map((c) => c._.name);
+          const relDataKey = relatedPks.map((pk) => relData[pk]).join("_");
+          if (relatedPks.length === 0 || !result[relName].some((r) => relatedPks.map((pk) => r[pk]).join("_") === relDataKey)) {
+            result[relName].push(relData);
+          }
+        } else {
           result[relName] = relData;
         }
       }
-      return result;
-    });
+    }
+    return Array.from(groupedResults.values());
   }
   // Update the return type signatures
   async all() {
@@ -626,28 +645,13 @@ var SQLiteColumn = class _SQLiteColumn {
   }
   _;
   notNull() {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, notNull: true },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, notNull: true }, this._.mode);
   }
   default(value) {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, default: value },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, default: value }, this._.mode);
   }
   $defaultFn(fn) {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, $defaultFn: fn },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, $defaultFn: fn }, this._.mode);
   }
   primaryKey() {
     return new _SQLiteColumn(
@@ -658,20 +662,10 @@ var SQLiteColumn = class _SQLiteColumn {
     );
   }
   autoincrement() {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, autoincrement: true },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, autoincrement: true }, this._.mode);
   }
   unique() {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, unique: true },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, unique: true }, this._.mode);
   }
   references(ref, column) {
     return new _SQLiteColumn(
@@ -688,12 +682,7 @@ var SQLiteColumn = class _SQLiteColumn {
     );
   }
   $onUpdateFn(fn) {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, $onUpdateFn: fn },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, $onUpdateFn: fn }, this._.mode);
   }
   as(alias2) {
     return this;
@@ -749,29 +738,6 @@ var TauriORM = class {
           this.tables.set(value._.name, value);
         }
       }
-      for (const [key, value] of Object.entries(schema)) {
-        if (!(value instanceof Table) && typeof value === "object") {
-          const tableName = key.replace("Relations", "");
-          const table = Array.from(this.tables.values()).find((t) => t._.name === tableName);
-          if (table) {
-            for (const [relName, rel] of Object.entries(value)) {
-              if (rel instanceof OneRelation) {
-                table.relations[relName] = {
-                  type: "one",
-                  foreignTable: rel.foreignTable,
-                  fields: rel.config?.fields,
-                  references: rel.config?.references
-                };
-              } else if (rel instanceof ManyRelation) {
-                table.relations[relName] = {
-                  type: "many",
-                  foreignTable: rel.foreignTable
-                };
-              }
-            }
-          }
-        }
-      }
     }
   }
   tables = /* @__PURE__ */ new Map();
@@ -796,9 +762,7 @@ var TauriORM = class {
   }
   async migrate() {
     for (const table of this.tables.values()) {
-      const existingTableInfo = await this.db.select(
-        `PRAGMA table_info('${table._.name}')`
-      );
+      const existingTableInfo = await this.db.select(`PRAGMA table_info('${table._.name}')`);
       if (existingTableInfo.length === 0) {
         const columnsSql = Object.values(table._.columns).map((col) => this.buildColumnDefinition(col)).join(", ");
         const createSql = `CREATE TABLE ${table._.name}
@@ -807,9 +771,7 @@ var TauriORM = class {
                                    )`;
         await this.db.execute(createSql);
       } else {
-        const existingColumnNames = new Set(
-          existingTableInfo.map((c) => c.name)
-        );
+        const existingColumnNames = new Set(existingTableInfo.map((c) => c.name));
         for (const column of Object.values(table._.columns)) {
           if (!existingColumnNames.has(column._.name)) {
             const columnSql = this.buildColumnDefinition(column, true);
@@ -822,7 +784,14 @@ var TauriORM = class {
     }
   }
   select(table, columns) {
-    return new SelectQueryBuilder(this.db, table, columns);
+    const internalTable = this.tables.get(table._.name);
+    if (!internalTable) {
+      console.warn(
+        `[Tauri-ORM] Table "${table._.name}" was not passed in the schema to the ORM constructor. Relations will not be available.`
+      );
+      return new SelectQueryBuilder(this.db, table, columns);
+    }
+    return new SelectQueryBuilder(this.db, internalTable, columns);
   }
   insert(table) {
     return new InsertQueryBuilder(this.db, table);
@@ -925,10 +894,7 @@ var TauriORM = class {
     const status = await this.isSchemaDirty();
     if (status.dirty) {
       await this.migrate();
-      await this.setSchemaMeta(
-        "schema_signature",
-        this.computeModelSignature()
-      );
+      await this.setSchemaMeta("schema_signature", this.computeModelSignature());
       return true;
     }
     return false;
@@ -950,15 +916,31 @@ var ManyRelation = class extends Relation {
     super(foreignTable);
   }
 };
-var relations = (_table, relationsCallback) => {
-  return relationsCallback({
-    one: (table, config) => {
-      return new OneRelation(table, config);
+var relations = (table, relationsCallback) => {
+  const builtRelations = relationsCallback({
+    one: (foreignTable, config) => {
+      return new OneRelation(foreignTable, config);
     },
-    many: (table) => {
-      return new ManyRelation(table);
+    many: (foreignTable) => {
+      return new ManyRelation(foreignTable);
     }
   });
+  for (const [name, relation] of Object.entries(builtRelations)) {
+    if (relation instanceof OneRelation) {
+      table.relations[name] = {
+        type: "one",
+        foreignTable: relation.foreignTable,
+        fields: relation.config?.fields,
+        references: relation.config?.references
+      };
+    } else if (relation instanceof ManyRelation) {
+      table.relations[name] = {
+        type: "many",
+        foreignTable: relation.foreignTable
+      };
+    }
+  }
+  return builtRelations;
 };
 var getTableColumns = (table) => {
   return table._.columns;

package/dist/index.mjs

@@ -229,9 +229,18 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     return rawResults;
   }
   processRelationResults(rawResults) {
-    if (!rawResults.length) return rawResults;
-    return rawResults.map((row) => {
-      const result = {};
+    if (!rawResults.length) return [];
+    const mainTablePks = Object.values(this.table._.columns).filter((c) => c.options.primaryKey).map((c) => c._.name);
+    if (mainTablePks.length === 0) {
+      return rawResults;
+    }
+    const groupedResults = /* @__PURE__ */ new Map();
+    for (const row of rawResults) {
+      const mainTableKey = mainTablePks.map((pk) => row[`${this.selectedTableAlias}.${pk}`] ?? row[pk]).join("_");
+      if (!groupedResults.has(mainTableKey)) {
+        groupedResults.set(mainTableKey, {});
+      }
+      const result = groupedResults.get(mainTableKey);
       const relations2 = {};
       for (const [key, value] of Object.entries(row)) {
         if (key.includes(".")) {
@@ -254,15 +263,25 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
         }
       }
       for (const [relName, relData] of Object.entries(relations2)) {
+        const relationConfig = this.table.relations[relName];
+        if (!relationConfig) continue;
         const hasData = Object.values(relData).some(
           (v) => v !== null && v !== void 0 && v !== ""
         );
-        if (hasData) {
+        if (!hasData) continue;
+        if (relationConfig.type === "many") {
+          if (!result[relName]) result[relName] = [];
+          const relatedPks = Object.values(relationConfig.foreignTable._.columns).filter((c) => c.options.primaryKey).map((c) => c._.name);
+          const relDataKey = relatedPks.map((pk) => relData[pk]).join("_");
+          if (relatedPks.length === 0 || !result[relName].some((r) => relatedPks.map((pk) => r[pk]).join("_") === relDataKey)) {
+            result[relName].push(relData);
+          }
+        } else {
           result[relName] = relData;
         }
       }
-      return result;
-    });
+    }
+    return Array.from(groupedResults.values());
   }
   // Update the return type signatures
   async all() {
@@ -559,28 +578,13 @@ var SQLiteColumn = class _SQLiteColumn {
   }
   _;
   notNull() {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, notNull: true },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, notNull: true }, this._.mode);
   }
   default(value) {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, default: value },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, default: value }, this._.mode);
   }
   $defaultFn(fn) {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, $defaultFn: fn },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, $defaultFn: fn }, this._.mode);
   }
   primaryKey() {
     return new _SQLiteColumn(
@@ -591,20 +595,10 @@ var SQLiteColumn = class _SQLiteColumn {
     );
   }
   autoincrement() {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, autoincrement: true },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, autoincrement: true }, this._.mode);
   }
   unique() {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, unique: true },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, unique: true }, this._.mode);
   }
   references(ref, column) {
     return new _SQLiteColumn(
@@ -621,12 +615,7 @@ var SQLiteColumn = class _SQLiteColumn {
     );
   }
   $onUpdateFn(fn) {
-    return new _SQLiteColumn(
-      this._.name,
-      this.type,
-      { ...this.options, $onUpdateFn: fn },
-      this._.mode
-    );
+    return new _SQLiteColumn(this._.name, this.type, { ...this.options, $onUpdateFn: fn }, this._.mode);
   }
   as(alias2) {
     return this;
@@ -682,29 +671,6 @@ var TauriORM = class {
           this.tables.set(value._.name, value);
         }
       }
-      for (const [key, value] of Object.entries(schema)) {
-        if (!(value instanceof Table) && typeof value === "object") {
-          const tableName = key.replace("Relations", "");
-          const table = Array.from(this.tables.values()).find((t) => t._.name === tableName);
-          if (table) {
-            for (const [relName, rel] of Object.entries(value)) {
-              if (rel instanceof OneRelation) {
-                table.relations[relName] = {
-                  type: "one",
-                  foreignTable: rel.foreignTable,
-                  fields: rel.config?.fields,
-                  references: rel.config?.references
-                };
-              } else if (rel instanceof ManyRelation) {
-                table.relations[relName] = {
-                  type: "many",
-                  foreignTable: rel.foreignTable
-                };
-              }
-            }
-          }
-        }
-      }
     }
   }
   tables = /* @__PURE__ */ new Map();
@@ -729,9 +695,7 @@ var TauriORM = class {
   }
   async migrate() {
     for (const table of this.tables.values()) {
-      const existingTableInfo = await this.db.select(
-        `PRAGMA table_info('${table._.name}')`
-      );
+      const existingTableInfo = await this.db.select(`PRAGMA table_info('${table._.name}')`);
       if (existingTableInfo.length === 0) {
         const columnsSql = Object.values(table._.columns).map((col) => this.buildColumnDefinition(col)).join(", ");
         const createSql = `CREATE TABLE ${table._.name}
@@ -740,9 +704,7 @@ var TauriORM = class {
                                    )`;
         await this.db.execute(createSql);
       } else {
-        const existingColumnNames = new Set(
-          existingTableInfo.map((c) => c.name)
-        );
+        const existingColumnNames = new Set(existingTableInfo.map((c) => c.name));
         for (const column of Object.values(table._.columns)) {
           if (!existingColumnNames.has(column._.name)) {
             const columnSql = this.buildColumnDefinition(column, true);
@@ -755,7 +717,14 @@ var TauriORM = class {
     }
   }
   select(table, columns) {
-    return new SelectQueryBuilder(this.db, table, columns);
+    const internalTable = this.tables.get(table._.name);
+    if (!internalTable) {
+      console.warn(
+        `[Tauri-ORM] Table "${table._.name}" was not passed in the schema to the ORM constructor. Relations will not be available.`
+      );
+      return new SelectQueryBuilder(this.db, table, columns);
+    }
+    return new SelectQueryBuilder(this.db, internalTable, columns);
   }
   insert(table) {
     return new InsertQueryBuilder(this.db, table);
@@ -858,10 +827,7 @@ var TauriORM = class {
     const status = await this.isSchemaDirty();
     if (status.dirty) {
       await this.migrate();
-      await this.setSchemaMeta(
-        "schema_signature",
-        this.computeModelSignature()
-      );
+      await this.setSchemaMeta("schema_signature", this.computeModelSignature());
       return true;
     }
     return false;
@@ -883,15 +849,31 @@ var ManyRelation = class extends Relation {
     super(foreignTable);
   }
 };
-var relations = (_table, relationsCallback) => {
-  return relationsCallback({
-    one: (table, config) => {
-      return new OneRelation(table, config);
+var relations = (table, relationsCallback) => {
+  const builtRelations = relationsCallback({
+    one: (foreignTable, config) => {
+      return new OneRelation(foreignTable, config);
     },
-    many: (table) => {
-      return new ManyRelation(table);
+    many: (foreignTable) => {
+      return new ManyRelation(foreignTable);
     }
   });
+  for (const [name, relation] of Object.entries(builtRelations)) {
+    if (relation instanceof OneRelation) {
+      table.relations[name] = {
+        type: "one",
+        foreignTable: relation.foreignTable,
+        fields: relation.config?.fields,
+        references: relation.config?.references
+      };
+    } else if (relation instanceof ManyRelation) {
+      table.relations[name] = {
+        type: "many",
+        foreignTable: relation.foreignTable
+      };
+    }
+  }
+  return builtRelations;
 };
 var getTableColumns = (table) => {
   return table._.columns;

package/package.json

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