@iamkirbki/database-handler-core 4.3.0 → 4.4.0

package/dist/abstract/model/ModelRelation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelRelation.d.ts","sourceRoot":"","sources":["../../../src/abstract/model/ModelRelation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAA6B,mBAAmB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACvI,OAAO,KAAK,MAAM,yBAAyB,CAAC;AAC5C,OAAO,UAAU,MAAM,6BAA6B,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,cAAc,CACxC,IAAI,SAAS,UAAU,EACvB,IAAI,SAAS,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAEtC,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,CAAM;IAC9C,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAM;IAErC,QAAQ,KAAK,aAAa,IAAI,WAAW,CAAC;IAC1C,SAAS,CAAC,QAAQ,KAAK,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5D,SAAS,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC;IAEpC,IAAW,cAAc,IAAI,YAAY,EAAE,CAE1C;IAED,IAAW,SAAS,IAAI,QAAQ,EAAE,CAEjC;IAEY,0BAA0B,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;cAYA,UAAU,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EAC1D,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAA+E,EAC3F,QAAQ,GAAE,MAAsC,EAChD,UAAU,GAAE,MAAuC,EACnD,eAAe,GAAE,MAAkD,EACnE,aAAa,GAAE,MAAqD,GACrE,OAAO,CAAC,IAAI,CAAC;IAoBhB,SAAS,CAAC,OAAO,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EACjD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAAuE,EACnF,QAAQ,GAAE,MAAsC,GACjD,IAAI;IAUP,SAAS,CAAC,MAAM,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EAChD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAA4C,EACxD,QAAQ,GAAE,MAAyE,GACpF,IAAI;IAUP,SAAS,CAAC,SAAS,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EACnD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAAyE,EACrF,QAAQ,GAAE,MAAuC,GAClD,IAAI;WAUO,IAAI,CAAC,kBAAkB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC3D,IAAI,EAAE,UAAU,kBAAkB,EAClC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,mBAAmB,GAClC,kBAAkB;IAKd,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAsBzD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnF,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjE,OAAO,CAAC,oBAAoB;CAuB/B"}

package/dist/abstract/model/ModelRelation.js

@@ -0,0 +1,130 @@
+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());
+    });
+};
+export default class ModelRelations {
+    constructor() {
+        this.joinedEntities = [];
+        this.relations = [];
+    }
+    get JoinedEntities() {
+        return this.joinedEntities;
+    }
+    get Relations() {
+        return this.relations;
+    }
+    insertRecordIntoPivotTable(otherTable, foreignKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.callRelationMethod(otherTable);
+            const relation = this.relations.pop();
+            if (!relation) {
+                throw new Error(`Relation for pivot table insertion not found.`);
+            }
+            yield this.repository.insertRecordIntoPivotTable(foreignKey, this.self, relation);
+        });
+    }
+    ManyToMany(model_1) {
+        return __awaiter(this, arguments, void 0, function* (model, pivotTable = [this.Configuration.table, model.Configuration.table].sort().join('_'), localKey = this.Configuration.primaryKey, foreignKey = model.Configuration.primaryKey, pivotForeignKey = `${this.Configuration.table}_${localKey}`, pivotLocalKey = `${model.Configuration.table}_${foreignKey}`) {
+            const relation = yield this.repository.getManyToManyRelation({
+                type: 'manyToMany',
+                model: model,
+                pivotTable: pivotTable,
+                foreignKey: foreignKey,
+                pivotForeignKey: pivotForeignKey,
+                localKey: localKey,
+                pivotLocalKey: pivotLocalKey,
+            });
+            if (!relation) {
+                throw new Error(`Failed to create many-to-many relation for model ${model.Configuration.table}`);
+            }
+            this.relations.push(relation);
+            return this;
+        });
+    }
+    hasMany(model, foreignKey = `${this.Configuration.table}_${this.Configuration.primaryKey}`, localKey = this.Configuration.primaryKey) {
+        this.relations.push({
+            type: 'hasMany',
+            model: model,
+            foreignKey: foreignKey,
+            localKey: localKey,
+        });
+        return this;
+    }
+    hasOne(model, foreignKey = `${model.Configuration.primaryKey}`, localKey = `${model.Configuration.table}_${model.Configuration.primaryKey}`) {
+        this.relations.push({
+            type: 'hasOne',
+            model: model,
+            foreignKey: foreignKey,
+            localKey: localKey,
+        });
+        return this;
+    }
+    belongsTo(model, foreignKey = `${model.Configuration.table}_${model.Configuration.primaryKey}`, localKey = model.Configuration.primaryKey) {
+        this.relations.push({
+            type: 'belongsTo',
+            model: model,
+            foreignKey: foreignKey,
+            localKey: localKey,
+        });
+        return this;
+    }
+    static with(relation, queryScopes) {
+        const instance = new this();
+        return instance.with(relation, queryScopes);
+    }
+    with(relation, queryScopes) {
+        const result = this.callRelationMethod(relation);
+        if (result instanceof Promise) {
+            throw new Error(`Relation method '${relation}' is asynchronous. Use asyncWith() instead of with().`);
+        }
+        const lastRelation = this.relations[this.relations.length - 1];
+        const tableName = lastRelation.model.Configuration.table;
+        const normalizedScopes = this.normalizeQueryScopes(queryScopes, tableName);
+        this.joinedEntities.push({
+            relation: relation,
+            queryScopes: normalizedScopes
+        });
+        return this;
+    }
+    asyncWith(relation, queryScopes) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.callRelationMethod(relation);
+            const lastRelation = this.relations[this.relations.length - 1];
+            const tableName = lastRelation.model.Configuration.table;
+            const normalizedScopes = this.normalizeQueryScopes(queryScopes, tableName);
+            this.joinedEntities.push({
+                relation: relation,
+                queryScopes: normalizedScopes
+            });
+            return this;
+        });
+    }
+    callRelationMethod(relation) {
+        const method = Reflect.get(this, relation);
+        if (typeof method !== 'function') {
+            throw new Error(`Relation method '${relation}' does not exist`);
+        }
+        const result = method.call(this);
+        //@TODO: check if method is not static 
+        // Only return promise if the method is actually async
+        return result instanceof Promise ? result : undefined;
+    }
+    normalizeQueryScopes(queryScopes, tableName) {
+        if (!queryScopes) {
+            return undefined;
+        }
+        const isSingleParameter = Object.keys(queryScopes).length === 3 &&
+            'column' in queryScopes &&
+            'operator' in queryScopes &&
+            'value' in queryScopes;
+        const scopesArray = isSingleParameter
+            ? [queryScopes]
+            : this.repository.ConvertParamsToArray(queryScopes);
+        return scopesArray.map(scope => (Object.assign(Object.assign({}, scope), { column: `${tableName}.${scope.column}` })));
+    }
+}

package/dist/base/Query.d.ts

@@ -1,32 +1,29 @@
-import { columnType, QueryWhereCondition, QueryIsEqualParameter, TableColumnInfo, QueryComparisonParameters } from "../types/index.js";
-import { Record } from "../index.js";
-export type QueryConstructorType = {
-    tableName: string;
-    query?: string;
-    parameters?: QueryWhereCondition;
-    adapterName?: string;
-};
+import { columnType, QueryWhereCondition, QueryIsEqualParameter, TableColumnInfo, QueryComparisonParameters, QueryConstructorType } from '../types/index.js';
+import { Record } from '../index.js';
 /** Query class for executing custom SQL queries */
 export default class Query {
     readonly TableName: string;
     private readonly _adapter;
+    private readonly _recordFactory;
+    private readonly _queryCache;
     private _query?;
     private _parameters;
     get Parameters(): QueryWhereCondition;
-    constructor({ tableName, query, parameters, adapterName }: QueryConstructorType);
+    constructor({ tableName, query, parameters, adapterName, recordFactory, }: QueryConstructorType);
+    private throwIfTableNotExists;
     /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
     Run<Type>(): Promise<Type>;
     /** Execute a SELECT query and return all matching rows */
     All<Type extends columnType>(): Promise<Record<Type>[]>;
     /** Execute a SELECT query and return the first matching row */
     Get<Type extends columnType>(): Promise<Record<Type> | undefined>;
-    static TableColumnInformation(tableName: string, customAdapter?: string): Promise<TableColumnInfo[]>;
+    TableColumnInformation(tableName: string): Promise<TableColumnInfo[]>;
     DoesTableExist(): Promise<boolean>;
     Count(): Promise<number>;
-    static ConvertParamsToArray(params: QueryWhereCondition): QueryComparisonParameters[];
+    ConvertParamsToArray(params: QueryWhereCondition): QueryComparisonParameters[];
     /** Convert various parameter formats to a consistent object format */
-    static ConvertParamsToObject(params: QueryWhereCondition): QueryIsEqualParameter;
+    ConvertParamsToObject(params: QueryWhereCondition): QueryIsEqualParameter;
     /** Databases don't like numeric values when inserting with a query */
-    static ConvertValueToString(params: QueryIsEqualParameter): QueryIsEqualParameter;
+    ConvertValueToString(params: QueryIsEqualParameter): QueryIsEqualParameter;
 }
 //# 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,EAAE,UAAU,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC1I,OAAO,EAAa,MAAM,EAAoB,MAAM,gBAAgB,CAAC;AAErE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,MAAM,CAAC,CAAc;IAC7B,OAAO,CAAC,WAAW,CAA2B;IAE9C,IAAW,UAAU,IAAI,mBAAmB,CAE3C;gBAEW,EACV,SAAS,EACT,KAAK,EACL,UAAU,EACV,WAAW,EACZ,EAAE,oBAAoB;IAUvB,gEAAgE;IACnD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAQvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAUpE,+DAA+D;IAClD,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;WAS1D,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAIpG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;WASvB,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,yBAAyB,EAAE;IAkB5F,sEAAsE;WACxD,qBAAqB,CAAC,MAAM,EAAE,mBAAmB,GAAG,qBAAqB;IAavF,sEAAsE;WACxD,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,qBAAqB;CAKzF"}
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/base/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAa,MAAM,EAAoB,MAAM,gBAAgB,CAAC;AAKrE,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAA2B;IAE9C,IAAW,UAAU,IAAI,mBAAmB,CAE3C;gBAEW,EACV,SAAS,EACT,KAAK,EACL,UAAU,EACV,WAAW,EACX,aACoC,GACrC,EAAE,oBAAoB;YAaT,qBAAqB;IAWnC,gEAAgE;IACnD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAUvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAWpE,+DAA+D;IAClD,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAClD,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CACzB;IAaY,sBAAsB,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,EAAE,CAAC;IAUhB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAalC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAW9B,oBAAoB,CACzB,MAAM,EAAE,mBAAmB,GAC1B,yBAAyB,EAAE;IAkB9B,sEAAsE;IAC/D,qBAAqB,CAC1B,MAAM,EAAE,mBAAmB,GAC1B,qBAAqB;IAaxB,sEAAsE;IAC/D,oBAAoB,CACzB,MAAM,EAAE,qBAAqB,GAC5B,qBAAqB;CAYzB"}

package/dist/base/Query.js

@@ -7,74 +7,110 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Container, Record } from "../index.js";
+import { Container, Record } from '../index.js';
+import UnknownTableError from '../helpers/Errors/TableErrors/UnknownTableError.js';
+import UnexpectedEmptyQueryError from '../helpers/Errors/QueryErrors/UnexpectedEmptyQueryError.js';
+import QueryCache from '../runtime/QueryCache.js';
 /** Query class for executing custom SQL queries */
 export default class Query {
     get Parameters() {
         return this._parameters;
     }
-    constructor({ tableName, query, parameters, adapterName }) {
-        this._query = "";
+    constructor({ tableName, query, parameters, adapterName, recordFactory = (table, values, adapter) => new Record(table, values, adapter), }) {
         this._parameters = {};
         this.TableName = tableName;
         this._query = query;
         if (parameters)
-            this._parameters = Query.ConvertParamsToObject(parameters);
+            this._parameters = this.ConvertParamsToObject(parameters);
+        // eslint-disable-next-line no-undef
+        if (Container.getInstance().logging)
+            this._query ? console.info(this._query, "\n", this._parameters) : console.info("No query found, probably checking if a table exists or getting the table column information.");
         this._adapter = Container.getInstance().getAdapter(adapterName);
+        this._queryCache = QueryCache.getInstance();
+        this._recordFactory = recordFactory;
+    }
+    throwIfTableNotExists() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._queryCache.doesTableExist(this.TableName)) {
+                const exists = yield this.DoesTableExist();
+                if (!exists) {
+                    throw new UnknownTableError(this.TableName);
+                }
+                this._queryCache.addExistingTable(this.TableName);
+            }
+        });
     }
     /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
     Run() {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.throwIfTableNotExists();
             if (!this._query) {
-                throw new Error("No query defined to run.");
+                throw new UnexpectedEmptyQueryError();
             }
             const stmt = yield this._adapter.prepare(this._query);
-            return yield stmt.run(this.Parameters);
+            return (yield stmt.run(this.Parameters));
         });
     }
     /** Execute a SELECT query and return all matching rows */
     All() {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.throwIfTableNotExists();
             if (!this._query) {
-                throw new Error("No query defined to run.");
+                throw new Error('No query defined to run.');
             }
             const stmt = yield this._adapter.prepare(this._query);
-            const results = yield stmt.all(this.Parameters);
-            return results.map(res => new Record(this.TableName, res));
+            const results = (yield stmt.all(this.Parameters));
+            return results.map((res) => this._recordFactory(this.TableName, res));
         });
     }
     /** Execute a SELECT query and return the first matching row */
     Get() {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.throwIfTableNotExists();
             if (!this._query) {
-                throw new Error("No query defined to run.");
+                throw new Error('No query defined to run.');
             }
             const stmt = yield this._adapter.prepare(this._query);
-            const results = yield stmt.get(this.Parameters);
-            return results ? new Record(this.TableName, results) : undefined;
+            const results = (yield stmt.get(this.Parameters));
+            return results
+                ? this._recordFactory(this.TableName, results)
+                : undefined;
         });
     }
-    static TableColumnInformation(tableName, customAdapter) {
+    TableColumnInformation(tableName) {
         return __awaiter(this, void 0, void 0, function* () {
-            return Container.getInstance().getAdapter(customAdapter).tableColumnInformation(tableName);
+            let tableColumnInfo = this._queryCache.getTableColumnInformation(tableName);
+            if (tableColumnInfo)
+                return tableColumnInfo;
+            tableColumnInfo = yield this._adapter.tableColumnInformation(tableName);
+            this._queryCache.setTableColumnInformation(tableName, tableColumnInfo);
+            return tableColumnInfo;
         });
     }
     DoesTableExist() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this._adapter.tableExists(this.TableName);
+            if (this._queryCache.doesTableExist(this.TableName)) {
+                return true;
+            }
+            const exists = yield this._adapter.tableExists(this.TableName);
+            if (exists) {
+                this._queryCache.addExistingTable(this.TableName);
+            }
+            return exists;
         });
     }
     Count() {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.throwIfTableNotExists();
             if (!this._query) {
-                throw new Error("No query defined to run.");
+                throw new Error('No query defined to run.');
             }
             const stmt = yield this._adapter.prepare(this._query);
-            const result = yield stmt.get(this.Parameters);
+            const result = (yield stmt.get(this.Parameters));
             return parseInt(result.count) || 0;
         });
     }
-    static ConvertParamsToArray(params) {
+    ConvertParamsToArray(params) {
         const paramArray = [];
         if (Array.isArray(params)) {
             return params;
@@ -83,18 +119,18 @@ export default class Query {
             Object.entries(params).forEach(([key, value]) => {
                 return paramArray.push({
                     column: key,
-                    operator: "=",
-                    value
+                    operator: '=',
+                    value,
                 });
             });
         }
         return paramArray;
     }
     /** Convert various parameter formats to a consistent object format */
-    static ConvertParamsToObject(params) {
+    ConvertParamsToObject(params) {
         const paramObject = {};
         if (Array.isArray(params)) {
-            params.forEach(param => {
+            params.forEach((param) => {
                 paramObject[param.column] = param.value;
             });
         }
@@ -104,9 +140,15 @@ export default class Query {
         return this.ConvertValueToString(paramObject);
     }
     /** 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 instanceof Date) && value !== undefined ? value.toString() : value };
-        }).reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
+    ConvertValueToString(params) {
+        return Object.entries(params)
+            .map(([key, value]) => {
+            return {
+                [key]: value !== null && !(value instanceof Date) && value !== undefined
+                    ? value.toString()
+                    : value,
+            };
+        })
+            .reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
     }
 }

package/dist/base/Record.d.ts

@@ -1,11 +1,13 @@
 import { inspect } from "util";
-import { columnType, QueryIsEqualParameter } from "../types/index.js";
+import { columnType, QueryIsEqualParameter, QueryFactory, RecordFactory } from "../types/index.js";
 /** Record class represents a single database row */
 export default class Record<ColumnValuesType extends columnType> {
     private _values;
     private readonly _tableName;
     private readonly _customAdapter?;
-    constructor(table: string, values: ColumnValuesType, adapter?: string);
+    private readonly _queryFactory;
+    private readonly _recordFactory;
+    constructor(table: string, values: ColumnValuesType, adapter?: string, queryFactory?: QueryFactory, recordFactory?: RecordFactory);
     /** Get the raw values object for this record */
     get values(): ColumnValuesType;
     Insert(): Promise<this | undefined>;

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;AAE/B,OAAO,EAAE,UAAU,EAAoC,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAG3G,oDAAoD;AACpD,MAAM,CAAC,OAAO,OAAO,MAAM,CAAC,gBAAgB,SAAS,UAAU;IAC3D,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;gBAE7B,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,MAAM;IAMrE,gDAAgD;IAChD,IAAW,MAAM,IAAI,gBAAgB,CAEpC;IAEY,MAAM,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IA+ChD,yCAAyC;IAC5B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BhH,2CAA2C;IAC9B,MAAM,CAAC,UAAU,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBtE,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,EACH,UAAU,EAGV,qBAAqB,EACrB,YAAY,EACZ,aAAa,EAChB,MAAM,sBAAsB,CAAC;AAI9B,oDAAoD;AACpD,MAAM,CAAC,OAAO,OAAO,MAAM,CAAC,gBAAgB,SAAS,UAAU;IAC3D,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;gBAG3C,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,GAAE,YAA4C,EAC1D,aAAa,GAAE,aAA8E;IASjG,gDAAgD;IAChD,IAAW,MAAM,IAAI,gBAAgB,CAEpC;IAEY,MAAM,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAkDhD,yCAAyC;IAC5B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhH,2CAA2C;IAC9B,MAAM,CAAC,UAAU,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBtE,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,14 +9,17 @@ 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";
+import QueryStatementBuilder from "../helpers/QueryBuilders/QueryStatementBuilder.js";
+import oldQueryStatementBuilder from "../helpers/QueryBuilders/oldQueryStatementBuilder.js";
 /** Record class represents a single database row */
 export default class Record {
-    constructor(table, values, adapter) {
+    constructor(table, values, adapter, queryFactory = (config) => new Query(config), recordFactory = (table, values, adapter) => new Record(table, values, adapter)) {
         this._values = {};
         this._tableName = table;
         this._values = values;
         this._customAdapter = adapter;
+        this._queryFactory = queryFactory;
+        this._recordFactory = recordFactory;
     }
     /** Get the raw values object for this record */
     get values() {
@@ -30,12 +33,13 @@ export default class Record {
             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({
+            const queryStr = yield oldQueryStatementBuilder.BuildInsert(this._tableName, this._values);
+            const query = this._queryFactory({
                 tableName: this._tableName,
                 query: queryStr,
                 parameters: this._values,
-                adapterName: this._customAdapter
+                adapterName: this._customAdapter,
+                recordFactory: this._recordFactory
             });
             const result = yield query.Run();
             let recordId;
@@ -49,12 +53,14 @@ export default class Record {
             if (recordId === undefined) {
                 return undefined;
             }
-            const queryStrSelect = QueryStatementBuilder.BuildSelect(this._tableName, { where: Object.assign({}, this._values) });
-            const querySelect = new Query({
+            const builder = new QueryStatementBuilder({ base: { from: this._tableName, where: Object.assign({}, this._values) } });
+            const queryStrSelect = yield builder.build();
+            const querySelect = this._queryFactory({
                 tableName: this._tableName,
                 query: queryStrSelect,
                 parameters: this._values,
-                adapterName: this._customAdapter
+                adapterName: this._customAdapter,
+                recordFactory: this._recordFactory
             });
             const insertedRecord = yield querySelect.All();
             if (insertedRecord.length > 0) {
@@ -71,17 +77,18 @@ export default class Record {
             if (originalValues.updated_at !== undefined) {
                 newValues.updated_at = new Date().toISOString();
             }
-            const queryStr = QueryStatementBuilder.BuildUpdate(this._tableName, newValues, whereParameters);
+            const queryStr = yield oldQueryStatementBuilder.BuildUpdate(this._tableName, newValues, whereParameters);
             // 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;
             });
-            const _query = new Query({
+            const _query = this._queryFactory({
                 tableName: this._tableName,
                 query: queryStr,
                 parameters: params,
-                adapterName: this._customAdapter
+                adapterName: this._customAdapter,
+                recordFactory: this._recordFactory
             });
             yield _query.Run();
             this._values = Object.assign(Object.assign({}, this._values), newValues);
@@ -97,10 +104,13 @@ export default class Record {
                 yield this.Update(this._values, this._values.id ? { id: this._values.id } : primaryKey || {});
                 return;
             }
-            const queryStr = QueryStatementBuilder.BuildDelete(this._tableName, this._values);
-            const _query = new Query({
+            const queryStr = yield oldQueryStatementBuilder.BuildDelete(this._tableName, this._values);
+            const _query = this._queryFactory({
                 tableName: this._tableName,
-                query: queryStr, parameters: this.values, adapterName: this._customAdapter
+                query: queryStr,
+                parameters: this.values,
+                adapterName: this._customAdapter,
+                recordFactory: this._recordFactory
             });
             yield _query.Run();
         });

package/dist/base/Table.d.ts

@@ -1,27 +1,32 @@
-import { DefaultQueryParameters, Join, ExtraQueryParameters, ReadableTableColumnInfo, TableColumnInfo, columnType } from "../types/index.js";
-import { Record } from "../index.js";
+import { ReadableTableColumnInfo, TableColumnInfo, columnType, QueryFactory, RecordFactory, QueryLayers } from "../types/index.js";
+import { Record, Query } from "../index.js";
 /** Table class for interacting with a database table */
 export default class Table {
+    private readonly _query;
     private readonly _customAdapter?;
     private readonly _name;
+    private readonly _queryFactory;
+    private readonly _recordFactory;
     /** Private constructor - use Table.create() */
-    constructor(name: string, customAdapter?: string);
+    constructor(name: string, customAdapter?: string, queryFactory?: QueryFactory, recordFactory?: RecordFactory);
+    get QueryHelperObject(): Query;
     /** Get raw column information */
-    TableColumnInformation(): Promise<TableColumnInfo[]>;
+    TableColumnInformation(tableName?: string): Promise<TableColumnInfo[]>;
     /** Get readable, formatted column information */
     ReadableTableColumnInformation(): Promise<ReadableTableColumnInfo[]>;
     Drop(): Promise<void>;
     /** Fetch records with optional filtering, ordering, and pagination */
-    Records<Type extends columnType>(options?: DefaultQueryParameters & ExtraQueryParameters): Promise<Record<Type>[]>;
+    Records<Type extends columnType>(queryLayers: QueryLayers): Promise<Record<Type>[]>;
     /** Fetch a single record from the table */
-    Record<Type extends columnType>(options?: DefaultQueryParameters & ExtraQueryParameters): Promise<Record<Type> | undefined>;
+    Record<Type extends columnType>(queryLayers: QueryLayers): Promise<Record<Type> | undefined>;
     /** Get the total count of records */
     RecordsCount(): Promise<number>;
     exists(): Promise<boolean>;
     /** Insert a record into the table */
     Insert<Type extends columnType>(values: Type): Promise<Record<Type> | undefined>;
     /** Perform JOIN operations with other tables */
-    Join<Type extends columnType>(Joins: Join | Join[], options?: DefaultQueryParameters & ExtraQueryParameters): Promise<Record<Type>[]>;
+    Join<Type extends columnType>(queryLayers: QueryLayers): Promise<Record<Type>[]>;
     private splitJoinValues;
+    toSql(queryLayers: QueryLayers): Promise<string>;
 }
 //# 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":"AAAA,OAAO,EACH,sBAAsB,EACtB,IAAI,EACJ,oBAAoB,EACpB,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,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,+CAA+C;gBACnC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;IAKhD,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;IAUlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,SAAS,UAAU,EACxC,OAAO,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,GACxD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAsB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,SAAS,UAAU,EACvC,OAAO,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,GACxD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAWpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAS/B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IASvC,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,sBAAsB,GAAG,oBAAoB,GACxD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAsBZ,eAAe;CAgChC"}
+{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/base/Table.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,uBAAuB,EACvB,eAAe,EACf,UAAU,EACV,YAAY,EACZ,aAAa,EACb,WAAW,EACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE/C,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,+CAA+C;gBAE3C,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,GAAE,YAA4C,EAC1D,aAAa,GAAE,aAA8E;IAcjG,IAAW,iBAAiB,IAAI,KAAK,CAEpC;IAED,iCAAiC;IACpB,sBAAsB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAInF,iDAAiD;IACpC,8BAA8B,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAWpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,SAAS,UAAU,EACxC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAqB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,SAAS,UAAU,EACvC,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAYpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU/B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAUvC,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,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAsCZ,eAAe;IAkChB,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CAoBhE"}