@iamkirbki/database-handler-core 4.0.1 → 4.0.4

package/dist/abstract/Model.d.ts

@@ -1,5 +1,5 @@
 import Repository from "../runtime/Repository.js";
-import { columnType, QueryCondition, QueryValues, ModelConfig, relation } from "../types/index.js";
+import { columnType, QueryCondition, QueryValues, ModelConfig, relation, QueryOptions } from "../types/index.js";
 /** Abstract Model class for ORM-style database interactions */
 export default abstract class Model<ModelType extends columnType> {
     private _repository?;
@@ -11,9 +11,16 @@ export default abstract class Model<ModelType extends columnType> {
     protected exists: boolean;
     protected dirty: boolean;
     protected queryScopes?: QueryCondition;
+    protected queryOptions: QueryOptions;
     get primaryKeyColumn(): string;
     get primaryKey(): QueryValues | undefined;
     get values(): Partial<ModelType> | ModelType;
+    static limit<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, value: number): ParamterModelType;
+    limit(value: number): this;
+    static offset<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, value: number): ParamterModelType;
+    offset(value: number): this;
+    static orderBy<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, column: string, direction?: 'ASC' | 'DESC'): ParamterModelType;
+    orderBy(column: string, direction?: 'ASC' | 'DESC'): this;
     static where<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, conditions: QueryCondition): ParamterModelType;
     where(conditions: QueryCondition): this;
     static whereId<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, id: QueryValues): ParamterModelType;

package/dist/abstract/Model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/abstract/Model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/abstract/Model.ts"],"names":[],"mappings":"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"}

package/dist/abstract/Model.js

@@ -25,6 +25,7 @@ export default class Model {
         this.attributes = {};
         this.exists = false;
         this.dirty = false;
+        this.queryOptions = {};
         this.joinedEntities = [];
         this.relations = [];
     }
@@ -46,6 +47,33 @@ export default class Model {
     get values() {
         return this.attributes;
     }
+    static limit(value) {
+        const instance = new this();
+        return instance.limit(value);
+    }
+    limit(value) {
+        this.queryOptions.limit = value;
+        return this;
+    }
+    static offset(value) {
+        const instance = new this();
+        return instance.offset(value);
+    }
+    offset(value) {
+        if (!this.queryOptions.limit) {
+            throw new Error("Offset cannot be set without a limit.");
+        }
+        this.queryOptions.offset = value;
+        return this;
+    }
+    static orderBy(column, direction = 'ASC') {
+        const instance = new this();
+        return instance.orderBy(column, direction);
+    }
+    orderBy(column, direction = 'ASC') {
+        this.queryOptions.orderBy = column + " " + direction;
+        return this;
+    }
     static where(conditions) {
         const instance = new this();
         return instance.where(conditions);
@@ -103,7 +131,7 @@ export default class Model {
     }
     get() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repository.get(this.queryScopes || {}, this);
+            return this.repository.get(this.queryScopes || {}, this.queryOptions, this);
         });
     }
     static all() {
@@ -111,7 +139,7 @@ export default class Model {
         return instance.all();
     }
     all() {
-        return this.repository.all(this);
+        return this.repository.all(this, this.queryOptions);
     }
     static set(attributes) {
         const instance = new this();

package/dist/base/Query.d.ts

@@ -1,43 +1,25 @@
-import Table from "./Table.js";
-import { QueryCondition, QueryWhereParameters } from "../types/index.js";
-import Record from "./Record.js";
-import IDatabaseAdapter from "../interfaces/IDatabaseAdapter.js";
+import { columnType, QueryCondition, QueryWhereParameters, TableColumnInfo } from "../types/index.js";
+import { Record } from "../index.js";
 /** Query class for executing custom SQL queries */
 export default class Query {
-    readonly Table: Table;
+    readonly TableName: string;
     private readonly _adapter;
     private _query;
     private _parameters;
     get Parameters(): QueryCondition;
     set Parameters(value: QueryCondition);
-    constructor(Table: Table, Query: string, adapter: IDatabaseAdapter);
-    /**
-     * Execute a query that modifies data (INSERT, UPDATE, DELETE)
-     *
-     * @template Type - Expected return type (typically { lastInsertRowid: number, changes: number })
-     * @returns Result object with lastInsertRowid and changes count
-     *
-     * @example
-     * ```typescript
-     * // INSERT query
-     * const query = db.Query(users, 'INSERT INTO users (name, age) VALUES (@name, @age)');
-     * query.Parameters = { name: 'John', age: 30 };
-     * const result = query.Run<{ lastInsertRowid: number, changes: number }>();
-     * console.log(`Inserted ID: ${result.lastInsertRowid}`);
-     *
-     * // UPDATE query
-     * const update = db.Query(users, 'UPDATE users SET age = @age WHERE id = @id');
-     * update.Parameters = { age: 31, id: 1 };
-     * const updateResult = update.Run<{ changes: number }>();
-     * console.log(`Updated ${updateResult.changes} rows`);
-     * ```
-     */
+    constructor(TableName: string, Query: string);
+    /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
     Run<Type>(): Promise<Type>;
     /** Execute a SELECT query and return all matching rows */
-    All<Type>(): Promise<Record<Type>[]>;
-    static ConvertParamsToObject(params: QueryCondition): QueryWhereParameters;
-    static ConvertIdToString(params: QueryWhereParameters): QueryWhereParameters;
+    All<Type extends columnType>(): Promise<Record<Type>[]>;
     /** Execute a SELECT query and return the first matching row */
-    Get<Type>(): Promise<Record<Type> | undefined>;
+    Get<Type extends columnType>(): Promise<Record<Type> | undefined>;
+    static tableColumnInformation(tableName: string): Promise<TableColumnInfo[]>;
+    Count(): Promise<number>;
+    /** Convert various parameter formats to a consistent object format */
+    static ConvertParamsToObject(params: QueryCondition): QueryWhereParameters;
+    /** Databases don't like numeric values when inserting with a query */
+    static ConvertValueToString(params: QueryWhereParameters): QueryWhereParameters;
 }
 //# sourceMappingURL=Query.d.ts.map

package/dist/base/Query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/base/Query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AAEpE,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,SAAgB,KAAK,EAAE,KAAK,CAAC;IAE7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,WAAW,CAAsB;IAEzC,IAAW,UAAU,IAAI,cAAc,CAEtC;IAED,IAAW,UAAU,CAAC,KAAK,EAAE,cAAc,EAE1C;gBAEW,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB;IAMlE;;;;;;;;;;;;;;;;;;;;OAoBG;IACU,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAKvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;WAMnC,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,oBAAoB;WAanE,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;IAQnF,+DAA+D;IAClD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;CAK5D"}
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/base/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACzG,OAAO,EAAa,MAAM,EAAoB,MAAM,gBAAgB,CAAC;AAErE,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0D;IACnF,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,WAAW,CAAsB;IAEzC,IAAW,UAAU,IAAI,cAAc,CAEtC;IAED,IAAW,UAAU,CAAC,KAAK,EAAE,cAAc,EAE1C;gBAEW,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAK5C,gEAAgE;IACnD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAKvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAMpE,+DAA+D;IAClD,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;WAM1D,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAI7E,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC,sEAAsE;WACxD,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,oBAAoB;IAajF,sEAAsE;WACxD,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;CAKvF"}

package/dist/base/Query.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import Record from "./Record.js";
+import { Container, Record } from "../index.js";
 /** Query class for executing custom SQL queries */
 export default class Query {
     get Parameters() {
@@ -16,34 +16,14 @@ export default class Query {
     set Parameters(value) {
         this._parameters = Query.ConvertParamsToObject(value);
     }
-    constructor(Table, Query, adapter) {
+    constructor(TableName, Query) {
+        this._adapter = Container.getInstance().getAdapter();
         this._query = "";
         this._parameters = {};
-        this.Table = Table;
+        this.TableName = TableName;
         this._query = Query;
-        this._adapter = adapter;
     }
-    /**
-     * Execute a query that modifies data (INSERT, UPDATE, DELETE)
-     *
-     * @template Type - Expected return type (typically { lastInsertRowid: number, changes: number })
-     * @returns Result object with lastInsertRowid and changes count
-     *
-     * @example
-     * ```typescript
-     * // INSERT query
-     * const query = db.Query(users, 'INSERT INTO users (name, age) VALUES (@name, @age)');
-     * query.Parameters = { name: 'John', age: 30 };
-     * const result = query.Run<{ lastInsertRowid: number, changes: number }>();
-     * console.log(`Inserted ID: ${result.lastInsertRowid}`);
-     *
-     * // UPDATE query
-     * const update = db.Query(users, 'UPDATE users SET age = @age WHERE id = @id');
-     * update.Parameters = { age: 31, id: 1 };
-     * const updateResult = update.Run<{ changes: number }>();
-     * console.log(`Updated ${updateResult.changes} rows`);
-     * ```
-     */
+    /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
     Run() {
         return __awaiter(this, void 0, void 0, function* () {
             const stmt = yield this._adapter.prepare(this._query);
@@ -55,9 +35,30 @@ export default class Query {
         return __awaiter(this, void 0, void 0, function* () {
             const stmt = yield this._adapter.prepare(this._query);
             const results = yield stmt.all(this.Parameters);
-            return results.map(res => new Record(res, this._adapter, this.Table));
+            return results.map(res => new Record(res, this.TableName));
         });
     }
+    /** Execute a SELECT query and return the first matching row */
+    Get() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stmt = yield this._adapter.prepare(this._query);
+            const results = yield stmt.get(this.Parameters);
+            return results ? new Record(results, this.TableName) : undefined;
+        });
+    }
+    static tableColumnInformation(tableName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Container.getInstance().getAdapter().tableColumnInformation(tableName);
+        });
+    }
+    Count() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stmt = yield this._adapter.prepare(this._query);
+            const result = yield stmt.get(this.Parameters);
+            return parseInt(result.count) || 0;
+        });
+    }
+    /** Convert various parameter formats to a consistent object format */
     static ConvertParamsToObject(params) {
         const paramObject = {};
         if (Array.isArray(params)) {
@@ -68,20 +69,12 @@ export default class Query {
         else {
             Object.assign(paramObject, params);
         }
-        return this.ConvertIdToString(paramObject);
+        return this.ConvertValueToString(paramObject);
     }
-    static ConvertIdToString(params) {
-        if (params.id && typeof params.id === 'number') {
-            return Object.assign(Object.assign({}, params), { id: params.id.toString() });
-        }
-        return params;
-    }
-    /** Execute a SELECT query and return the first matching row */
-    Get() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stmt = yield this._adapter.prepare(this._query);
-            const results = yield stmt.get(this.Parameters);
-            return results ? new Record(results, this._adapter, this.Table) : undefined;
-        });
+    /** Databases don't like numeric values when inserting with a query */
+    static ConvertValueToString(params) {
+        return Object.entries(params).map(([key, value]) => {
+            return { [key]: value !== null && value !== undefined ? value.toString() : value };
+        }).reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
     }
 }

package/dist/base/Record.d.ts

@@ -1,16 +1,15 @@
 import { inspect } from "util";
-import Table from "./Table.js";
-import IDatabaseAdapter from "../interfaces/IDatabaseAdapter.js";
+import { columnType } from "../types/index.js";
 /** Record class represents a single database row */
-export default class Record<ColumnValuesType> {
-    private readonly _adapter;
+export default class Record<ColumnValuesType extends columnType> {
     private _values;
-    private readonly _table;
-    constructor(values: ColumnValuesType, adapter: IDatabaseAdapter, table: Table);
+    private readonly _tableName;
+    constructor(values: ColumnValuesType, table: string);
     /** Get the raw values object for this record */
     get values(): ColumnValuesType;
+    Insert(): Promise<this | undefined>;
     /** Update this record in the database */
-    Update(newValues: object): Promise<void>;
+    Update(newValues: Partial<ColumnValuesType>): Promise<void>;
     /** Delete this record from the database */
     Delete(): Promise<void>;
     /** Returns the values object for JSON.stringify() */

package/dist/base/Record.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Record.d.ts","sourceRoot":"","sources":["../../src/base/Record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AAGpE,oDAAoD;AACpD,MAAM,CAAC,OAAO,OAAO,MAAM,CAAC,gBAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;gBAEnB,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK;IAM7E,gDAAgD;IAChD,IAAW,MAAM,IAAI,gBAAgB,CAEpC;IAED,yCAAyC;IAC5B,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BrD,2CAA2C;IAC9B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAUpC,qDAAqD;IAC9C,MAAM,IAAI,gBAAgB;IAIjC,mDAAmD;IAC5C,QAAQ,IAAI,MAAM;IAIzB,uCAAuC;IACvC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,gBAAgB;CAGvC"}
+{"version":3,"file":"Record.d.ts","sourceRoot":"","sources":["../../src/base/Record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,UAAU,EAA0D,MAAM,sBAAsB,CAAC;AAG1G,oDAAoD;AACpD,MAAM,CAAC,OAAO,OAAO,MAAM,CAAC,gBAAgB,SAAS,UAAU;IAC3D,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM;IAKnD,gDAAgD;IAChD,IAAW,MAAM,IAAI,gBAAgB,CAEpC;IAEY,MAAM,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAuChD,yCAAyC;IAC5B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBxE,2CAA2C;IAC9B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,qDAAqD;IAC9C,MAAM,IAAI,gBAAgB;IAIjC,mDAAmD;IAC5C,QAAQ,IAAI,MAAM;IAIzB,uCAAuC;IACvC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,gBAAgB;CAGvC"}

package/dist/base/Record.js

@@ -9,34 +9,62 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { inspect } from "util";
 import Query from "./Query.js";
+import QueryStatementBuilder from "../helpers/QueryStatementBuilder.js";
 /** Record class represents a single database row */
 export default class Record {
-    constructor(values, adapter, table) {
+    constructor(values, table) {
         this._values = {};
         this._values = values;
-        this._adapter = adapter;
-        this._table = table;
+        this._tableName = table;
     }
     /** Get the raw values object for this record */
     get values() {
         return this._values;
     }
     ;
+    Insert() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const columns = Object.keys(this._values);
+            if (columns.length === 0) {
+                throw new Error("Cannot insert record with no columns");
+            }
+            const queryStr = QueryStatementBuilder.BuildInsert(this._tableName, this._values);
+            const query = new Query(this._tableName, queryStr);
+            query.Parameters = this._values;
+            const result = yield query.Run();
+            let recordId;
+            // For PostgreSQL compatibility: use 'id' from values if lastInsertRowid is undefined
+            if (Array.isArray(this._values)) {
+                recordId = (_a = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _a !== void 0 ? _a : this._values.map(v => v.column === 'id' ? v.value : undefined);
+            }
+            else {
+                recordId = (_b = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _b !== void 0 ? _b : this._values.id;
+            }
+            if (recordId === undefined) {
+                return undefined;
+            }
+            const queryStrSelect = QueryStatementBuilder.BuildSelect(this._tableName, { where: Object.assign({}, this._values) });
+            const querySelect = new Query(this._tableName, queryStrSelect);
+            querySelect.Parameters = Object.assign({}, this._values);
+            const insertedRecord = yield querySelect.All();
+            if (insertedRecord.length > 0) {
+                this._values = insertedRecord[insertedRecord.length - 1].values;
+            }
+            this._values = Object.assign(Object.assign({}, this._values), { id: recordId });
+            return this;
+        });
+    }
     /** Update this record in the database */
     Update(newValues) {
         return __awaiter(this, void 0, void 0, function* () {
-            const setClauses = Object.keys(newValues)
-                .map(key => `${key} = @${key}`)
-                .join(", ");
             const originalValues = this._values;
             if (originalValues.updated_at !== undefined) {
                 newValues.updated_at = new Date().toISOString();
             }
-            const whereClauses = Object.keys(originalValues)
-                .map(key => `${key} = @where_${key}`)
-                .join(" AND ");
-            const query = `UPDATE "${this._table.Name}" SET ${setClauses} WHERE ${whereClauses};`;
-            const _query = new Query(this._table, query, this._adapter);
+            const queryStr = QueryStatementBuilder.BuildUpdate(this._tableName, newValues, originalValues);
+            const _query = new Query(this._tableName, queryStr);
+            // Merge newValues and originalValues for parameters (with 'where_' prefix for where clause)
             const params = Object.assign({}, newValues);
             Object.entries(originalValues).forEach(([key, value]) => {
                 params[`where_${key}`] = value;
@@ -49,10 +77,8 @@ export default class Record {
     /** Delete this record from the database */
     Delete() {
         return __awaiter(this, void 0, void 0, function* () {
-            const whereClauses = Object.keys(this._values)
-                .map(key => `${key} = @${key}`)
-                .join(" AND ");
-            const _query = new Query(this._table, `DELETE FROM "${this._table.Name}" WHERE ${whereClauses};`, this._adapter);
+            const queryStr = QueryStatementBuilder.BuildDelete(this._tableName, this._values);
+            const _query = new Query(this._tableName, queryStr);
             _query.Parameters = Object.assign({}, this._values);
             yield _query.Run();
         });

package/dist/base/Table.d.ts

@@ -1,27 +1,25 @@
 import { DefaultQueryOptions, Join, QueryOptions, ReadableTableColumnInfo, TableColumnInfo, columnType } from "../types/index.js";
-import Record from "../base/Record.js";
+import { Record } from "../index.js";
 /** Table class for interacting with a database table */
 export default class Table {
     private readonly _name;
-    private readonly _adapter;
     /** Private constructor - use Table.create() */
     constructor(name: string);
-    /** Get the table name */
-    get Name(): string;
     /** Get raw column information */
     TableColumnInformation(): Promise<TableColumnInfo[]>;
     /** Get readable, formatted column information */
     ReadableTableColumnInformation(): Promise<ReadableTableColumnInfo[]>;
     Drop(): Promise<void>;
     /** Fetch records with optional filtering, ordering, and pagination */
-    Records<Type>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
+    Records<Type extends columnType>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
     /** Fetch a single record from the table */
-    Record<Type>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type> | undefined>;
+    Record<Type extends columnType>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type> | undefined>;
     /** Get the total count of records */
     RecordsCount(): Promise<number>;
     /** Insert a record into the table */
-    Insert<Type>(values: columnType): Promise<Record<Type> | undefined>;
+    Insert<Type extends columnType>(values: Type): Promise<Record<Type> | undefined>;
     /** Perform JOIN operations with other tables */
-    Join<Type>(Joins: Join | Join[], options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
+    Join<Type extends columnType>(Joins: Join | Join[], options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
+    private splitJoinValues;
 }
 //# sourceMappingURL=Table.d.ts.map

package/dist/base/Table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/base/Table.ts"],"names":[],"mappings":"AACA,OAAO,EACH,mBAAmB,EACnB,IAAI,EACJ,YAAY,EACZ,uBAAuB,EAEvB,eAAe,EAEf,UAAU,EACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAI1C,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0D;IAEnF,+CAA+C;gBACnC,IAAI,EAAE,MAAM;IAIxB,yBAAyB;IACzB,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,iCAAiC;IACpB,sBAAsB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAIjE,iDAAiD;IACpC,8BAA8B,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAWpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,EACrB,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAoB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAWpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAM5C,qCAAqC;IACxB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IA+BhF,gDAAgD;IACnC,IAAI,CAAC,IAAI,EAClB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;CAW7B"}
+{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/base/Table.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,IAAI,EACJ,YAAY,EACZ,uBAAuB,EACvB,eAAe,EACf,UAAU,EACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAS,MAAM,gBAAgB,CAAC;AAE/C,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,+CAA+C;gBACnC,IAAI,EAAE,MAAM;IAIxB,iCAAiC;IACpB,sBAAsB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAIjE,iDAAiD;IACpC,8BAA8B,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAWpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,SAAS,UAAU,EACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAkB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,SAAS,UAAU,EACvC,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAWpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAM5C,qCAAqC;IACxB,MAAM,CAAC,IAAI,SAAS,UAAU,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAM7F,gDAAgD;IACnC,IAAI,CAAC,IAAI,SAAS,UAAU,EACrC,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAcZ,eAAe;CA0BhC"}

package/dist/base/Table.js

@@ -7,24 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import Query from "../base/Query.js";
 import QueryStatementBuilder from "../helpers/QueryStatementBuilder.js";
-import Container from "../runtime/Container.js";
+import { Record, Query } from "../index.js";
 /** Table class for interacting with a database table */
 export default class Table {
     /** Private constructor - use Table.create() */
     constructor(name) {
-        this._adapter = Container.getInstance().getAdapter();
         this._name = name;
     }
-    /** Get the table name */
-    get Name() {
-        return this._name;
-    }
     /** Get raw column information */
     TableColumnInformation() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._adapter.tableColumnInformation(this._name);
+            return Query.tableColumnInformation(this._name);
         });
     }
     /** Get readable, formatted column information */
@@ -43,25 +37,24 @@ export default class Table {
     Drop() {
         return __awaiter(this, void 0, void 0, function* () {
             const queryStr = `DROP TABLE IF EXISTS "${this._name}";`;
-            const query = new Query(this, queryStr, this._adapter);
+            const query = new Query(this._name, queryStr);
             yield query.Run();
         });
     }
     /** Fetch records with optional filtering, ordering, and pagination */
     Records(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const queryStr = QueryStatementBuilder.BuildSelect(this, {
+            const queryStr = QueryStatementBuilder.BuildSelect(this._name, {
                 select: options === null || options === void 0 ? void 0 : options.select,
                 where: options === null || options === void 0 ? void 0 : options.where,
                 orderBy: options === null || options === void 0 ? void 0 : options.orderBy,
                 limit: options === null || options === void 0 ? void 0 : options.limit,
                 offset: options === null || options === void 0 ? void 0 : options.offset,
             });
-            const query = new Query(this, queryStr, this._adapter);
+            const query = new Query(this._name, queryStr);
             if ((options === null || options === void 0 ? void 0 : options.where) && Object.keys(options.where).length > 0)
                 query.Parameters = options.where;
             const results = yield query.All();
-            // Wrap each result in a Record object
             return results;
         });
     }
@@ -80,49 +73,55 @@ export default class Table {
     /** Get the total count of records */
     RecordsCount() {
         return __awaiter(this, void 0, void 0, function* () {
-            const stmt = yield this._adapter.prepare(`SELECT COUNT(*) as count FROM "${this._name}";`);
-            const count = yield stmt.get({});
-            return parseInt(count.count) || 0;
+            const query = new Query(this._name, `SELECT COUNT(*) as count FROM "${this._name}";`);
+            const count = yield query.Count();
+            return count || 0;
         });
     }
     /** Insert a record into the table */
     Insert(values) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const columns = Object.keys(values);
-            if (columns.length === 0) {
-                throw new Error("Cannot insert record with no columns");
-            }
-            const queryStr = QueryStatementBuilder.BuildInsert(this, values);
-            const query = new Query(this, queryStr, this._adapter);
-            query.Parameters = values;
-            const result = yield query.Run();
-            let recordId;
-            // For PostgreSQL compatibility: use 'id' from values if lastInsertRowid is undefined
-            if (Array.isArray(values)) {
-                recordId = (_a = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _a !== void 0 ? _a : values.map(v => v.column === 'id' ? v.value : undefined);
-            }
-            else {
-                recordId = (_b = result === null || result === void 0 ? void 0 : result.lastInsertRowid) !== null && _b !== void 0 ? _b : values.id;
-            }
-            if (recordId === undefined) {
-                return undefined;
-            }
-            return this.Record({
-                where: { id: recordId }
-            });
+            const record = new Record(values, this._name);
+            yield record.Insert();
+            return record;
         });
     }
     /** Perform JOIN operations with other tables */
     Join(Joins, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const queryString = QueryStatementBuilder.BuildJoin(this, Joins, options);
-            const query = new Query(this, queryString, this._adapter);
+            const queryString = QueryStatementBuilder.BuildJoin(this._name, Joins, options);
+            const query = new Query(this._name, queryString);
             // Set parameters if WHERE clause is present
             if (options === null || options === void 0 ? void 0 : options.where) {
                 query.Parameters = options.where;
             }
-            return yield query.All();
+            const joinedTables = Array.isArray(Joins) ? Joins.map(j => j.fromTable) : [Joins.fromTable];
+            const records = yield query.All();
+            return yield this.splitJoinValues(records, joinedTables);
+        });
+    }
+    splitJoinValues(records, joinedTables) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const thisRecordColumns = (yield this.TableColumnInformation()).map(col => col.name);
+            const tableColumnsMap = new Map();
+            for (const tableName of joinedTables) {
+                const columns = (yield Query.tableColumnInformation(tableName)).map(col => col.name);
+                tableColumnsMap.set(tableName, columns);
+            }
+            return records.map(record => {
+                if (!record.values)
+                    return record;
+                const thisRecordEntries = thisRecordColumns
+                    .map(colName => [colName, record.values[colName]])
+                    .filter(([, value]) => value !== undefined);
+                const joinedRecords = {};
+                for (const [tableName, tableColumns] of tableColumnsMap) {
+                    const joinedRecordEntries = Object.entries(record.values)
+                        .filter(([key]) => tableColumns.includes(key));
+                    joinedRecords[tableName] = Object.fromEntries(joinedRecordEntries);
+                }
+                return new Record(Object.assign(Object.assign({}, Object.fromEntries(thisRecordEntries)), joinedRecords), this._name);
+            });
         });
     }
 }

package/dist/helpers/QueryStatementBuilder.d.ts

@@ -1,5 +1,4 @@
 import { DefaultQueryOptions, QueryOptions, QueryCondition, Join, QueryWhereParameters } from "../types/index.js";
-import Table from "../base/Table";
 /** Utility class for building SQL query strings */
 export default class QueryStatementBuilder {
     /**
@@ -26,7 +25,7 @@ export default class QueryStatementBuilder {
      * // "SELECT id, name, email FROM users WHERE status = @status AND age = @age ORDER BY created_at DESC LIMIT 10 OFFSET 20"
      * ```
      */
-    static BuildSelect(table: Table, options?: DefaultQueryOptions & QueryOptions): string;
+    static BuildSelect(tableName: string, options?: DefaultQueryOptions & QueryOptions): string;
     /**
      * Build an INSERT SQL statement with named parameter placeholders
      *
@@ -46,7 +45,7 @@ export default class QueryStatementBuilder {
      * // Note: The actual values will be bound separately using the Parameters object
      * ```
      */
-    static BuildInsert(table: Table, record: QueryWhereParameters): string;
+    static BuildInsert(tableName: string, record: QueryWhereParameters): string;
     /**
      * Build an UPDATE SQL statement with SET clause and WHERE conditions
      *
@@ -73,7 +72,7 @@ export default class QueryStatementBuilder {
      * // "UPDATE users SET status = @status WHERE status = @status AND last_login = @last_login"
      * ```
      */
-    static BuildUpdate(table: Table, record: QueryCondition, where: QueryCondition): string;
+    static BuildUpdate(tableName: string, record: QueryCondition, where: QueryCondition): string;
     /**
      * Build a DELETE SQL statement with WHERE conditions
      *
@@ -94,7 +93,7 @@ export default class QueryStatementBuilder {
      * // "DELETE FROM users WHERE status = @status AND last_login = @last_login"
      * ```
      */
-    static BuildDelete(table: Table, where: QueryCondition): string;
+    static BuildDelete(tableName: string, where: QueryCondition): string;
     /**
      * Build a COUNT SQL statement to count rows, optionally with WHERE conditions
      *
@@ -116,7 +115,7 @@ export default class QueryStatementBuilder {
      * // "SELECT COUNT(*) as count FROM users WHERE status = @status AND age = @age"
      * ```
      */
-    static BuildCount(table: Table, where?: QueryCondition): string;
+    static BuildCount(tableName: string, where?: QueryCondition): string;
     /**
      * Build a WHERE clause from parameter conditions (helper method)
      *
@@ -192,7 +191,7 @@ export default class QueryStatementBuilder {
      * );
      * ```
      */
-    static BuildJoin(fromTable: Table, joins: Join | Join[], options?: DefaultQueryOptions & QueryOptions): string;
+    static BuildJoin(fromTableName: string, joins: Join | Join[], options?: DefaultQueryOptions & QueryOptions): string;
     /**
      * Build JOIN clause(s) recursively (helper method)
      *
@@ -232,7 +231,7 @@ export default class QueryStatementBuilder {
      * // "INNER JOIN orders ON users.id = orders.user_id INNER JOIN products ON orders.id = products.product_id"
      * ```
      */
-    static BuildJoinPart(fromTable: Table, joins: Join | Join[]): string;
+    static BuildJoinPart(fromTableName: string, joins: Join | Join[]): string;
     /**
      * Build ON clause for JOIN operations (helper method)
      *
@@ -265,7 +264,7 @@ export default class QueryStatementBuilder {
      * // "ON users.id = orders.user_id AND users.company_id = orders.company_id"
      * ```
      */
-    static BuildJoinOnPart(table: Table, joinTable: Table, on: QueryWhereParameters | QueryWhereParameters[]): string;
+    static BuildJoinOnPart(tableName: string, joinTableName: string, on: QueryWhereParameters | QueryWhereParameters[]): string;
     /**
      * Build query options clause (ORDER BY, LIMIT, OFFSET) (helper method)
      *

package/dist/helpers/QueryStatementBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryStatementBuilder.d.ts","sourceRoot":"","sources":["../../src/helpers/QueryStatementBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,cAAc,EAAE,IAAI,EAAmB,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACtI,OAAO,KAAK,MAAM,kBAAkB,CAAC;AAErC,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACtC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;WACW,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAAG,MAAM;IAY7F;;;;;;;;;;;;;;;;;;OAkBG;WACW,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,GAAG,MAAM;IAY7E;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;WACW,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM;IAW9F;;;;;;;;;;;;;;;;;;;OAmBG;WACW,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM;IAStE;;;;;;;;;;;;;;;;;;;;OAoBG;WACW,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,cAAc,GAAG,MAAM;IAQtE;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;WACW,UAAU,CAAC,KAAK,CAAC,EAAE,cAAc,GAAG,MAAM;IAgBxD,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAStC,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAK/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2CG;WACW,SAAS,CACnB,SAAS,EAAE,KAAK,EAChB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,MAAM;IAWT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;WACW,aAAa,CACvB,SAAS,EAAE,KAAK,EAChB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,GACrB,MAAM;IAcT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;WACW,eAAe,CACzB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,KAAK,EAChB,EAAE,EAAE,oBAAoB,GAAG,oBAAoB,EAAE,GAClD,MAAM;IAWT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;WACW,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;CAiBjE"}
+{"version":3,"file":"QueryStatementBuilder.d.ts","sourceRoot":"","sources":["../../src/helpers/QueryStatementBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,cAAc,EAAE,IAAI,EAAmB,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEtI,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACtC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAAG,MAAM;IAWlG;;;;;;;;;;;;;;;;;;OAkBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,MAAM;IAYlF;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM;IAWnG;;;;;;;;;;;;;;;;;;;OAmBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM;IAS3E;;;;;;;;;;;;;;;;;;;;OAoBG;WACW,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,cAAc,GAAG,MAAM;IAQ3E;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;WACW,UAAU,CAAC,KAAK,CAAC,EAAE,cAAc,GAAG,MAAM;IAgBxD,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAStC,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAK/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2CG;WACW,SAAS,CACnB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,MAAM;IAWT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;WACW,aAAa,CACvB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,GACrB,MAAM;IAcT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;WACW,eAAe,CACzB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,oBAAoB,GAAG,oBAAoB,EAAE,GAClD,MAAM;IAWT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;WACW,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;CAiBjE"}

package/dist/helpers/QueryStatementBuilder.js

@@ -24,11 +24,11 @@ export default class QueryStatementBuilder {
      * // "SELECT id, name, email FROM users WHERE status = @status AND age = @age ORDER BY created_at DESC LIMIT 10 OFFSET 20"
      * ```
      */
-    static BuildSelect(table, options) {
+    static BuildSelect(tableName, options) {
         var _a;
         const queryParts = [];
         queryParts.push(`SELECT ${(_a = options === null || options === void 0 ? void 0 : options.select) !== null && _a !== void 0 ? _a : "*"}`);
-        queryParts.push(`FROM "${table.Name}"`);
+        queryParts.push(`FROM "${tableName}"`);
         queryParts.push(this.BuildWhere(options === null || options === void 0 ? void 0 : options.where));
         queryParts.push(this.BuildQueryOptions(options !== null && options !== void 0 ? options : {}));
         return queryParts.join(" ");
@@ -52,12 +52,12 @@ export default class QueryStatementBuilder {
      * // Note: The actual values will be bound separately using the Parameters object
      * ```
      */
-    static BuildInsert(table, record) {
+    static BuildInsert(tableName, record) {
         const queryParts = [];
         const columns = Object.keys(record);
         const placeholders = columns.map(col => `@${col}`);
-        queryParts.push(`INSERT INTO "${table.Name}"`);
-        queryParts.push(`(${columns.join(", ")})`);
+        queryParts.push(`INSERT INTO "${tableName}"`);
+        queryParts.push(`(${columns.map(c => `"${c}"`).join(", ")})`);
         queryParts.push(`VALUES (${placeholders.join(", ")})`);
         return queryParts.join(" ");
     }
@@ -87,10 +87,10 @@ export default class QueryStatementBuilder {
      * // "UPDATE users SET status = @status WHERE status = @status AND last_login = @last_login"
      * ```
      */
-    static BuildUpdate(table, record, where) {
+    static BuildUpdate(tableName, record, where) {
         const queryParts = [];
         const setClauses = Object.keys(record).map(col => `${col} = @${col}`);
-        queryParts.push(`UPDATE "${table.Name}"`);
+        queryParts.push(`UPDATE "${tableName}"`);
         queryParts.push(`SET ${setClauses.join(", ")}`);
         queryParts.push(this.BuildWhere(where));
         return queryParts.join(" ");
@@ -115,9 +115,9 @@ export default class QueryStatementBuilder {
      * // "DELETE FROM users WHERE status = @status AND last_login = @last_login"
      * ```
      */
-    static BuildDelete(table, where) {
+    static BuildDelete(tableName, where) {
         const queryParts = [];
-        queryParts.push(`DELETE FROM "${table.Name}"`);
+        queryParts.push(`DELETE FROM "${tableName}"`);
         queryParts.push(this.BuildWhere(where));
         return queryParts.join(" ");
     }
@@ -142,9 +142,9 @@ export default class QueryStatementBuilder {
      * // "SELECT COUNT(*) as count FROM users WHERE status = @status AND age = @age"
      * ```
      */
-    static BuildCount(table, where) {
+    static BuildCount(tableName, where) {
         const queryParts = [];
-        queryParts.push(`SELECT COUNT(*) as count FROM "${table.Name}"`);
+        queryParts.push(`SELECT COUNT(*) as count FROM "${tableName}"`);
         queryParts.push(this.BuildWhere(where));
         return queryParts.join(" ");
     }
@@ -245,12 +245,12 @@ export default class QueryStatementBuilder {
      * );
      * ```
      */
-    static BuildJoin(fromTable, joins, options) {
+    static BuildJoin(fromTableName, joins, options) {
         var _a;
         const queryParts = [];
         queryParts.push(`SELECT ${(_a = options === null || options === void 0 ? void 0 : options.select) !== null && _a !== void 0 ? _a : "*"}`);
-        queryParts.push(`FROM "${fromTable.Name}"`);
-        queryParts.push(this.BuildJoinPart(fromTable, joins));
+        queryParts.push(`FROM "${fromTableName}"`);
+        queryParts.push(this.BuildJoinPart(fromTableName, joins));
         queryParts.push(this.BuildWhere(options === null || options === void 0 ? void 0 : options.where));
         queryParts.push(this.BuildQueryOptions(options !== null && options !== void 0 ? options : {}));
         return queryParts.join(" ");
@@ -294,14 +294,14 @@ export default class QueryStatementBuilder {
      * // "INNER JOIN orders ON users.id = orders.user_id INNER JOIN products ON orders.id = products.product_id"
      * ```
      */
-    static BuildJoinPart(fromTable, joins) {
+    static BuildJoinPart(fromTableName, joins) {
         const queryParts = [];
         const joinsArray = Array.isArray(joins) ? joins : [joins];
-        let currentTable = fromTable;
+        let currentTableName = fromTableName;
         for (const join of joinsArray) {
-            queryParts.push(`${join.joinType} JOIN "${join.fromTable.Name}"`);
-            queryParts.push(this.BuildJoinOnPart(currentTable, join.fromTable, join.on));
-            currentTable = join.fromTable;
+            queryParts.push(`${join.joinType} JOIN "${join.fromTable}"`);
+            queryParts.push(this.BuildJoinOnPart(currentTableName, join.fromTable, join.on));
+            currentTableName = join.fromTable;
         }
         return queryParts.join(" ");
     }
@@ -337,11 +337,11 @@ export default class QueryStatementBuilder {
      * // "ON users.id = orders.user_id AND users.company_id = orders.company_id"
      * ```
      */
-    static BuildJoinOnPart(table, joinTable, on) {
+    static BuildJoinOnPart(tableName, joinTableName, on) {
         const queryParts = [];
         const onArray = Array.isArray(on) ? on : [on];
         for (const onPart of onArray) {
-            queryParts.push(`ON ${table.Name}.${Object.values(onPart)[0]} = ${joinTable.Name}.${Object.keys(onPart)[0]}`);
+            queryParts.push(`ON ${tableName}.${Object.values(onPart)[0]} = ${joinTableName}.${Object.keys(onPart)[0]}`);
         }
         return queryParts.join(" AND ");
     }

package/dist/index.d.ts

@@ -44,7 +44,6 @@
  *
  * @packageDocumentation
  */
-import Database from "./base/Database.js";
 import Table from "./base/Table.js";
 import Record from "./base/Record.js";
 import Query from "./base/Query.js";
@@ -58,6 +57,6 @@ import IStatementAdapter from "./interfaces/IStatementAdapter.js";
 import IController from "./interfaces/IController.js";
 import IMigration from "./interfaces/IMigration.js";
 import ISchemaBuilder from "./interfaces/ISchemaBuilder.js";
-export { Database, Model, Table, Query, Record, Repository, Container, SchemaTableBuilder, AbstractSchemaBuilder, IDatabaseAdapter, IStatementAdapter, IController, IMigration, ISchemaBuilder, };
+export { Model, Table, Query, Record, Repository, Container, SchemaTableBuilder, AbstractSchemaBuilder, IDatabaseAdapter, IStatementAdapter, IController, IMigration, ISchemaBuilder, };
 export * from "./types/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,MAAM,iBAAiB,CAAC;AAEpC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,kBAAkB,MAAM,kCAAkC,CAAC;AAClE,OAAO,qBAAqB,MAAM,oCAAoC,CAAC;AAEvE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AACpE,OAAO,iBAAiB,MAAM,uCAAuC,CAAC;AACtE,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EACH,QAAQ,EACR,KAAK,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,UAAU,EACV,SAAS,EAET,kBAAkB,EAClB,qBAAqB,EAErB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,UAAU,EACV,cAAc,GACjB,CAAC;AAEF,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,MAAM,iBAAiB,CAAC;AAEpC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,kBAAkB,MAAM,kCAAkC,CAAC;AAClE,OAAO,qBAAqB,MAAM,oCAAoC,CAAC;AAEvE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AACpE,OAAO,iBAAiB,MAAM,uCAAuC,CAAC;AACtE,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EACH,KAAK,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,UAAU,EACV,SAAS,EAET,kBAAkB,EAClB,qBAAqB,EAErB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,UAAU,EACV,cAAc,GACjB,CAAC;AAEF,cAAc,kBAAkB,CAAC"}

package/dist/index.js

@@ -44,7 +44,6 @@
  *
  * @packageDocumentation
  */
-import Database from "./base/Database.js";
 import Table from "./base/Table.js";
 import Record from "./base/Record.js";
 import Query from "./base/Query.js";
@@ -52,5 +51,5 @@ import Model from "./abstract/Model.js";
 import SchemaTableBuilder from "./abstract/SchemaTableBuilder.js";
 import Repository from "./runtime/Repository.js";
 import Container from "./runtime/Container.js";
-export { Database, Model, Table, Query, Record, Repository, Container, SchemaTableBuilder, };
+export { Model, Table, Query, Record, Repository, Container, SchemaTableBuilder, };
 export * from "./types/index.js";

package/dist/runtime/Container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../src/runtime/Container.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AAEpE,cAAM,SAAS;IACX,OAAO,CAAC,MAAM,CAAC,SAAS,CAAY;IACpC,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,eAAe,CAAC,CAAmB;IAE3C,OAAO;WAEO,WAAW,IAAI,SAAS;IAO/B,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,SAAS,UAAQ,GAAG,IAAI;IAOjF,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB;CASrD;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../../src/runtime/Container.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AAEpE,cAAM,SAAS;IACX,OAAO,CAAC,MAAM,CAAC,SAAS,CAAY;IACpC,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,eAAe,CAAC,CAAmB;IAE3C,OAAO;WAEO,WAAW,IAAI,SAAS;IAO/B,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,SAAS,UAAQ,GAAG,IAAI;IAYjF,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB;CASrD;AAED,eAAe,SAAS,CAAC"}

package/dist/runtime/Container.js

@@ -11,6 +11,10 @@ class Container {
     registerAdapter(name, adapter, isDefault = false) {
         this._adapters.set(name, adapter);
         if (isDefault || !this._defaultAdapter) {
+            if (this._defaultAdapter) {
+                // eslint-disable-next-line no-undef
+                console.warn(`Setting default adapter to '${name}'`);
+            }
             this._defaultAdapter = adapter;
         }
     }

package/dist/runtime/Repository.d.ts

@@ -1,5 +1,5 @@
 import type Model from "../abstract/Model.js";
-import { columnType, QueryCondition } from "../types/index";
+import { columnType, QueryCondition, QueryOptions } from "../types/index";
 export default class Repository<Type extends columnType, ModelType extends Model<Type>> {
     private static _instances;
     private models;
@@ -10,8 +10,8 @@ export default class Repository<Type extends columnType, ModelType extends Model
     getModel(name: string): ModelType;
     save(attributes: Type): Promise<void>;
     first(conditions: QueryCondition, Model: Model<Type>): Promise<Type | null>;
-    get(conditions: QueryCondition, Model: Model<Type>): Promise<Type[]>;
-    all(Model: Model<Type>): Promise<Type[]>;
+    get(conditions: QueryCondition, queryOptions: QueryOptions, Model: Model<Type>): Promise<Type[]>;
+    all(Model: Model<Type>, queryOptions?: QueryOptions): Promise<Type[]>;
     update(attributes: Partial<Type>): Promise<this>;
     private join;
 }

package/dist/runtime/Repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Repository.d.ts","sourceRoot":"","sources":["../../src/runtime/Repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAQ,cAAc,EAA0B,MAAM,mBAAmB,CAAC;AAE7F,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,IAAI,SAAS,UAAU,EAAE,SAAS,SAAS,KAAK,CAAC,IAAI,CAAC;IAClF,OAAO,CAAC,MAAM,CAAC,UAAU,CAAqE;IAC9F,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,KAAK,CAAO;gBAER,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;WAMtC,WAAW,CAAC,SAAS,SAAS,UAAU,EAClD,UAAU,EAAE,UAAU,KAAK,CAAC,SAAS,CAAC,EACtC,SAAS,EAAE,MAAM,GAClB,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAWnC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAKjC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS;IAI3B,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW3E,GAAG,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAQpE,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAQxC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAe/C,IAAI;CAoBrB"}
+{"version":3,"file":"Repository.d.ts","sourceRoot":"","sources":["../../src/runtime/Repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAQ,cAAc,EAAE,YAAY,EAAY,MAAM,mBAAmB,CAAC;AAE7F,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,IAAI,SAAS,UAAU,EAAE,SAAS,SAAS,KAAK,CAAC,IAAI,CAAC;IAClF,OAAO,CAAC,MAAM,CAAC,UAAU,CAAqE;IAC9F,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,KAAK,CAAO;gBAER,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;WAMtC,WAAW,CAAC,SAAS,SAAS,UAAU,EAClD,UAAU,EAAE,UAAU,KAAK,CAAC,SAAS,CAAC,EACtC,SAAS,EAAE,MAAM,GAClB,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAWnC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAKjC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS;IAI3B,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW3E,GAAG,CAAC,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAQhG,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAQrE,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAe/C,IAAI;CAoBrB"}

package/dist/runtime/Repository.js

@@ -50,23 +50,23 @@ class Repository {
             return record ? record.values : null;
         });
     }
-    get(conditions, Model) {
+    get(conditions, queryOptions, Model) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Model.JoinedEntities.length > 0) {
-                return yield this.join(Model, conditions);
+                return yield this.join(Model, conditions, queryOptions);
             }
             else {
-                return yield this.Table.Records({ where: conditions }).then(records => records.map(record => record.values));
+                return yield this.Table.Records(Object.assign({ where: conditions }, queryOptions)).then(records => records.map(record => record.values));
             }
         });
     }
-    all(Model) {
+    all(Model, queryOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Model.JoinedEntities.length > 0) {
                 return yield this.join(Model);
             }
             else {
-                return yield this.Table.Records().then(records => records.map(record => record.values));
+                return yield this.Table.Records(queryOptions).then(records => records.map(record => record.values));
             }
         });
     }
@@ -95,7 +95,7 @@ class Repository {
                 }
                 const JoinType = relation.type === 'hasOne' || relation.type === 'belongsTo' ? 'INNER' : 'LEFT';
                 return {
-                    fromTable: new Table(relation.model.Configuration.table),
+                    fromTable: relation.model.Configuration.table,
                     joinType: JoinType,
                     on: [
                         { [relation.foreignKey]: relation.localKey }

package/dist/types/table.d.ts

@@ -1,5 +1,4 @@
 import { QueryValues, QueryWhereParameters } from "../index";
-import Table from "../base/Table.js";
 export type TableColumnInfo = {
     cid: number;
     name: string;
@@ -25,7 +24,7 @@ export type ColumnDefinition = {
     autoincrement?: boolean;
 };
 export type Join = {
-    fromTable: Table;
+    fromTable: string;
     joinType: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL';
     on: QueryWhereParameters | QueryWhereParameters[];
     where?: QueryWhereParameters | QueryWhereParameters[];

package/dist/types/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/types/table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC1D,OAAO,KAAK,MAAM,kBAAkB,CAAC;AAErC,MAAM,MAAM,eAAe,GAAG;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,uBAAuB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,SAAS,EAAE,KAAK,CAAC;IACjB,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,EAAE,EAAE,oBAAoB,GAAG,oBAAoB,EAAE,CAAC;IAClD,KAAK,CAAC,EAAE,oBAAoB,GAAG,oBAAoB,EAAE,CAAC;CACzD,CAAA"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/types/table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,uBAAuB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,EAAE,EAAE,oBAAoB,GAAG,oBAAoB,EAAE,CAAC;IAClD,KAAK,CAAC,EAAE,oBAAoB,GAAG,oBAAoB,EAAE,CAAC;CACzD,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamkirbki/database-handler-core",
-  "version": "4.0.1",
+  "version": "4.0.4",
   "author": "iamkirbki",
   "description": "Core database abstractions and interfaces",
   "license": "ISC",

package/dist/base/Database.d.ts

@@ -1,13 +0,0 @@
-import Table from "./Table.js";
-import Query from "./Query.js";
-import IDatabaseAdapter from "../interfaces/IDatabaseAdapter.js";
-/** Main Database class */
-export default class Database {
-    adapter: IDatabaseAdapter;
-    constructor(adapter: IDatabaseAdapter);
-    /** Get a Table instance for an existing table */
-    Table(name: string): Promise<Table>;
-    /** Create a Query object for executing custom SQL */
-    Query(table: Table, query: string): Query;
-}
-//# sourceMappingURL=Database.d.ts.map

package/dist/base/Database.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Database.d.ts","sourceRoot":"","sources":["../../src/base/Database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AAEpE,0BAA0B;AAC1B,MAAM,CAAC,OAAO,OAAO,QAAQ;IACpB,OAAO,EAAE,gBAAgB,CAAC;gBAErB,OAAO,EAAE,gBAAgB;IAIrC,iDAAiD;IACpC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAIhD,qDAAqD;IAC9C,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK;CAGjD"}

package/dist/base/Database.js

@@ -1,27 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import Table from "./Table.js";
-import Query from "./Query.js";
-/** Main Database class */
-export default class Database {
-    constructor(adapter) {
-        this.adapter = adapter;
-    }
-    /** Get a Table instance for an existing table */
-    Table(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Table(name);
-        });
-    }
-    /** Create a Query object for executing custom SQL */
-    Query(table, query) {
-        return new Query(table, query, this.adapter);
-    }
-}