@iamkirbki/database-handler-core 4.2.0 → 4.3.0

package/dist/abstract/Model.d.ts

@@ -1,5 +1,5 @@
 import Repository from "../runtime/Repository.js";
-import { columnType, QueryCondition, QueryValues, ModelConfig, relation, QueryOptions, joinedEntity } from "../types/index.js";
+import { columnType, QueryWhereCondition, QueryValues, ModelConfig, relation, ExtraQueryParameters, joinedEntity } from "../types/index.js";
 /** Abstract Model class for ORM-style database interactions */
 export default abstract class Model<ModelType extends columnType> {
     private _repository?;
@@ -10,8 +10,8 @@ export default abstract class Model<ModelType extends columnType> {
     protected attributes: Partial<ModelType>;
     protected exists: boolean;
     protected dirty: boolean;
-    protected queryScopes?: QueryCondition;
-    protected queryOptions: QueryOptions;
+    protected queryScopes?: QueryWhereCondition;
+    protected queryOptions: ExtraQueryParameters;
     get primaryKeyColumn(): string;
     get primaryKey(): QueryValues | undefined;
     get values(): Partial<ModelType> | ModelType;
@@ -21,8 +21,8 @@ export default abstract class Model<ModelType extends columnType> {
     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 where<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, conditions: QueryWhereCondition): ParamterModelType;
+    where(conditions: QueryWhereCondition): this;
     static whereId<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, id: QueryValues): ParamterModelType;
     whereId(id: QueryValues): this;
     static find<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue: QueryValues): ParamterModelType;
@@ -42,12 +42,15 @@ export default abstract class Model<ModelType extends columnType> {
     protected relations: relation[];
     get JoinedEntities(): joinedEntity[];
     get Relations(): relation[];
-    hasMany<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
-    hasOne<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
-    belongsTo<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
-    static with<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, relation: string, queryScopes?: QueryCondition): ParamterModelType;
-    with(relation: string, queryScopes?: QueryCondition): this;
-    private callRelationMethod;
+    insertRecordIntoPivotTable(otherTable: string, foreignKey: string): Promise<void>;
+    protected ManyToMany<modelType extends Model<columnType>>(model: modelType, pivotTable?: string, localKey?: string, foreignKey?: string, pivotForeignKey?: string, pivotLocalKey?: string): Promise<this>;
+    protected hasMany<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
+    protected hasOne<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
+    protected belongsTo<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
+    static with<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, relation: string, queryScopes?: QueryWhereCondition): ParamterModelType;
+    with(relation: string, queryScopes?: QueryWhereCondition): this;
+    asyncWith(relation: string, queryScopes?: QueryWhereCondition): Promise<this>;
+    callRelationMethod(relation: string): void | Promise<void>;
     private normalizeQueryScopes;
     toJSON(): Partial<ModelType> | ModelType;
     toObject(): Partial<ModelType> | ModelType;

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":"AACA,OAAO,UAAU,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,oBAAoB,EAAE,YAAY,EAA6B,MAAM,sBAAsB,CAAC;AAE1K,+DAA+D;AAC/D,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,KAAK,CAAC,SAAS,SAAS,UAAU;IAC5D,OAAO,CAAC,WAAW,CAAC,CAA0C;IAE9D,SAAS,KAAK,UAAU,IAAI,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CASlE;IAED,SAAS,CAAC,aAAa,EAAE,WAAW,CASlC;IAEF,IAAW,aAAa,IAAI,WAAW,CAEtC;IAED,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAC,SAAS,CAAC,CAAM;IACtD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,CAAM;IAC9C,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;IAClC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAS;IACjC,SAAS,CAAC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAC5C,SAAS,CAAC,YAAY,EAAE,oBAAoB,CAAM;IAElD,IAAW,gBAAgB,IAAI,MAAM,CAEpC;IAED,IAAW,UAAU,IAAI,WAAW,GAAG,SAAS,CAE/C;IAED,IAAW,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS,CAElD;WAEa,KAAK,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC3D,IAAI,EAAE,UAAU,iBAAiB,EACjC,KAAK,EAAE,MAAM,GACd,iBAAiB;IAKb,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;WAKnB,MAAM,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC5D,IAAI,EAAE,UAAU,iBAAiB,EACjC,KAAK,EAAE,MAAM,GACd,iBAAiB;IAKb,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;WASpB,OAAO,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC7D,IAAI,EAAE,UAAU,iBAAiB,EACjC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,KAAK,GAAG,MAAc,GAClC,iBAAiB;IAKb,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,KAAK,GAAG,MAAc,GAAG,IAAI;WAKzD,KAAK,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC3D,IAAI,EAAE,UAAU,iBAAiB,EACjC,UAAU,EAAE,mBAAmB,GAChC,iBAAiB;IAKb,KAAK,CAAC,UAAU,EAAE,mBAAmB,GAAG,IAAI;WAKrC,OAAO,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC7D,IAAI,EAAE,UAAU,iBAAiB,EACjC,EAAE,EAAE,WAAW,GAChB,iBAAiB;IAKb,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,IAAI;WAKvB,IAAI,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC1D,IAAI,EAAE,UAAU,iBAAiB,EACjC,eAAe,EAAE,WAAW,GAC7B,iBAAiB;IAKb,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,IAAI;WAK3B,UAAU,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EACtE,IAAI,EAAE,UAAU,iBAAiB,EACjC,eAAe,EAAE,WAAW,GAC7B,OAAO,CAAC,iBAAiB,CAAC;IAKhB,UAAU,CAAC,eAAe,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;WAoBjD,KAAK,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EACjE,IAAI,EAAE,UAAU,iBAAiB,EACjC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,GAClC,OAAO,CAAC,iBAAiB,CAAC;IAKhB,KAAK,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWvD,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;WAYrB,GAAG,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAEzD,IAAI,EAAE,UAAU,iBAAiB,GAClC,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAKlB,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;WAYrB,GAAG,CAAC,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EACzD,IAAI,EAAE,UAAU,iBAAiB,EACjC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,GAChC,iBAAiB;IAKb,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI;IASnC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBlE,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,CAAM;IAC9C,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAM;IAErC,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;cASA,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;IAgBhB,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,iBAAiB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC1D,IAAI,EAAE,UAAU,iBAAiB,EACjC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,mBAAmB,GAClC,iBAAiB;IAKb,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;IAwBrB,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS;IAIxC,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS;CAGpD"}

package/dist/abstract/Model.js

@@ -32,7 +32,7 @@ export default class Model {
     }
     get repository() {
         if (!this._repository) {
-            this._repository = Repository.getInstance(this.constructor, this.Configuration.table);
+            this._repository = Repository.getInstance(this.constructor, this.Configuration.table, this.Configuration.customAdapter);
         }
         return this._repository;
     }
@@ -214,6 +214,29 @@ export default class Model {
     get Relations() {
         return this.relations;
     }
+    insertRecordIntoPivotTable(otherTable, foreignKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.callRelationMethod(otherTable);
+            const relation = this.relations[this.relations.length - 1];
+            this.relations.pop();
+            yield this.repository.insertRecordIntoPivotTable(foreignKey, this, 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,
+            });
+            this.relations.push(relation);
+            return this;
+        });
+    }
     hasMany(model, foreignKey = `${this.Configuration.table}_${this.Configuration.primaryKey}`, localKey = this.Configuration.primaryKey) {
         this.relations.push({
             type: 'hasMany',
@@ -246,7 +269,10 @@ export default class Model {
         return instance.with(relation, queryScopes);
     }
     with(relation, queryScopes) {
-        this.callRelationMethod(relation);
+        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);
@@ -256,12 +282,28 @@ export default class Model {
         });
         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 on ${this.constructor.name}`);
+            throw new Error(`Relation method '${relation}' does not exist`);
         }
-        method.call(this);
+        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) {

package/dist/base/Query.d.ts

@@ -1,26 +1,32 @@
-import { columnType, QueryCondition, QueryWhereParameters, TableColumnInfo, QueryParameters } from "../types/index.js";
+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;
+};
 /** Query class for executing custom SQL queries */
 export default class Query {
     readonly TableName: string;
     private readonly _adapter;
-    private _query;
+    private _query?;
     private _parameters;
-    get Parameters(): QueryCondition;
-    set Parameters(value: QueryCondition);
-    constructor(TableName: string, Query: string);
+    get Parameters(): QueryWhereCondition;
+    constructor({ tableName, query, parameters, adapterName }: QueryConstructorType);
     /** 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): Promise<TableColumnInfo[]>;
+    static TableColumnInformation(tableName: string, customAdapter?: string): Promise<TableColumnInfo[]>;
+    DoesTableExist(): Promise<boolean>;
     Count(): Promise<number>;
-    static ConvertParamsToArray(params: QueryCondition): QueryParameters[];
+    static ConvertParamsToArray(params: QueryWhereCondition): QueryComparisonParameters[];
     /** Convert various parameter formats to a consistent object format */
-    static ConvertParamsToObject(params: QueryCondition): QueryWhereParameters;
+    static ConvertParamsToObject(params: QueryWhereCondition): QueryIsEqualParameter;
     /** Databases don't like numeric values when inserting with a query */
-    static ConvertValueToString(params: QueryWhereParameters): QueryWhereParameters;
+    static 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,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1H,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,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAI5E,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;WAMvB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,eAAe,EAAE;IAkB7E,sEAAsE;WACxD,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,oBAAoB;IAajF,sEAAsE;WACxD,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;CAKvF"}
+{"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"}

package/dist/base/Query.js

@@ -13,19 +13,21 @@ export default class Query {
     get Parameters() {
         return this._parameters;
     }
-    set Parameters(value) {
-        this._parameters = Query.ConvertParamsToObject(value);
-    }
-    constructor(TableName, Query) {
-        this._adapter = Container.getInstance().getAdapter();
+    constructor({ tableName, query, parameters, adapterName }) {
         this._query = "";
         this._parameters = {};
-        this.TableName = TableName;
-        this._query = Query;
+        this.TableName = tableName;
+        this._query = query;
+        if (parameters)
+            this._parameters = Query.ConvertParamsToObject(parameters);
+        this._adapter = Container.getInstance().getAdapter(adapterName);
     }
     /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
     Run() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                throw new Error("No query defined to run.");
+            }
             const stmt = yield this._adapter.prepare(this._query);
             return yield stmt.run(this.Parameters);
         });
@@ -33,26 +35,40 @@ export default class Query {
     /** Execute a SELECT query and return all matching rows */
     All() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                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(res, this.TableName));
+            return results.map(res => new Record(this.TableName, res));
         });
     }
     /** Execute a SELECT query and return the first matching row */
     Get() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                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(results, this.TableName) : undefined;
+            return results ? new Record(this.TableName, results) : undefined;
+        });
+    }
+    static TableColumnInformation(tableName, customAdapter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Container.getInstance().getAdapter(customAdapter).tableColumnInformation(tableName);
         });
     }
-    static tableColumnInformation(tableName) {
+    DoesTableExist() {
         return __awaiter(this, void 0, void 0, function* () {
-            return Container.getInstance().getAdapter().tableColumnInformation(tableName);
+            return yield this._adapter.tableExists(this.TableName);
         });
     }
     Count() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                throw new Error("No query defined to run.");
+            }
             const stmt = yield this._adapter.prepare(this._query);
             const result = yield stmt.get(this.Parameters);
             return parseInt(result.count) || 0;

package/dist/base/Record.d.ts

@@ -1,17 +1,18 @@
 import { inspect } from "util";
-import { columnType, QueryWhereParameters } from "../types/index.js";
+import { columnType, QueryIsEqualParameter } from "../types/index.js";
 /** Record class represents a single database row */
 export default class Record<ColumnValuesType extends columnType> {
     private _values;
     private readonly _tableName;
-    constructor(values: ColumnValuesType, table: string);
+    private readonly _customAdapter?;
+    constructor(table: string, values: ColumnValuesType, adapter?: string);
     /** Get the raw values object for this record */
     get values(): ColumnValuesType;
     Insert(): Promise<this | undefined>;
     /** Update this record in the database */
-    Update(newValues: Partial<ColumnValuesType>, primaryKey: QueryWhereParameters): Promise<this>;
+    Update(newValues: Partial<ColumnValuesType>, whereParameters: QueryIsEqualParameter): Promise<this>;
     /** Delete this record from the database */
-    Delete(primaryKey: QueryWhereParameters): Promise<void>;
+    Delete(primaryKey?: QueryIsEqualParameter): Promise<void>;
     /** Returns the values object for JSON.stringify() */
     toJSON(): ColumnValuesType;
     /** Convert record to pretty-printed JSON string */

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,oBAAoB,EAAE,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,EAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB1G,2CAA2C;IAC9B,MAAM,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpE,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,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"}

package/dist/base/Record.js

@@ -12,10 +12,11 @@ import Query from "./Query.js";
 import QueryStatementBuilder from "../helpers/QueryStatementBuilder.js";
 /** Record class represents a single database row */
 export default class Record {
-    constructor(values, table) {
+    constructor(table, values, adapter) {
         this._values = {};
-        this._values = values;
         this._tableName = table;
+        this._values = values;
+        this._customAdapter = adapter;
     }
     /** Get the raw values object for this record */
     get values() {
@@ -30,8 +31,12 @@ export default class Record {
                 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 query = new Query({
+                tableName: this._tableName,
+                query: queryStr,
+                parameters: this._values,
+                adapterName: this._customAdapter
+            });
             const result = yield query.Run();
             let recordId;
             // For PostgreSQL compatibility: use 'id' from values if lastInsertRowid is undefined
@@ -45,8 +50,12 @@ export default class Record {
                 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 querySelect = new Query({
+                tableName: this._tableName,
+                query: queryStrSelect,
+                parameters: this._values,
+                adapterName: this._customAdapter
+            });
             const insertedRecord = yield querySelect.All();
             if (insertedRecord.length > 0) {
                 this._values = insertedRecord[insertedRecord.length - 1].values;
@@ -56,20 +65,24 @@ export default class Record {
         });
     }
     /** Update this record in the database */
-    Update(newValues, primaryKey) {
+    Update(newValues, whereParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             const originalValues = this._values;
             if (originalValues.updated_at !== undefined) {
                 newValues.updated_at = new Date().toISOString();
             }
-            const queryStr = QueryStatementBuilder.BuildUpdate(this._tableName, newValues, primaryKey);
-            const _query = new Query(this._tableName, queryStr);
+            const queryStr = QueryStatementBuilder.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;
             });
-            _query.Parameters = params;
+            const _query = new Query({
+                tableName: this._tableName,
+                query: queryStr,
+                parameters: params,
+                adapterName: this._customAdapter
+            });
             yield _query.Run();
             this._values = Object.assign(Object.assign({}, this._values), newValues);
             return this;
@@ -81,12 +94,14 @@ export default class Record {
             const originalValues = this._values;
             if (originalValues.deleted_at !== undefined) {
                 this._values.deleted_at = new Date().toISOString();
-                this.Update(this._values, primaryKey);
+                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(this._tableName, queryStr);
-            _query.Parameters = Object.assign({}, this._values);
+            const _query = new Query({
+                tableName: this._tableName,
+                query: queryStr, parameters: this.values, adapterName: this._customAdapter
+            });
             yield _query.Run();
         });
     }

package/dist/base/Table.d.ts

@@ -1,25 +1,27 @@
-import { DefaultQueryOptions, Join, QueryOptions, ReadableTableColumnInfo, TableColumnInfo, columnType } from "../types/index.js";
+import { DefaultQueryParameters, Join, ExtraQueryParameters, ReadableTableColumnInfo, TableColumnInfo, columnType } from "../types/index.js";
 import { Record } from "../index.js";
 /** Table class for interacting with a database table */
 export default class Table {
+    private readonly _customAdapter?;
     private readonly _name;
     /** Private constructor - use Table.create() */
-    constructor(name: string);
+    constructor(name: string, customAdapter?: 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 extends columnType>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
+    Records<Type extends columnType>(options?: DefaultQueryParameters & ExtraQueryParameters): Promise<Record<Type>[]>;
     /** Fetch a single record from the table */
-    Record<Type extends columnType>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type> | undefined>;
+    Record<Type extends columnType>(options?: DefaultQueryParameters & ExtraQueryParameters): 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?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
+    Join<Type extends columnType>(Joins: Join | Join[], options?: DefaultQueryParameters & ExtraQueryParameters): 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":"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"}
+{"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"}

package/dist/base/Table.js

@@ -12,13 +12,14 @@ 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) {
+    constructor(name, customAdapter) {
         this._name = name;
+        this._customAdapter = customAdapter;
     }
     /** Get raw column information */
     TableColumnInformation() {
         return __awaiter(this, void 0, void 0, function* () {
-            return Query.tableColumnInformation(this._name);
+            return Query.TableColumnInformation(this._name, this._customAdapter);
         });
     }
     /** Get readable, formatted column information */
@@ -37,7 +38,11 @@ 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._name, queryStr);
+            const query = new Query({
+                tableName: this._name,
+                query: queryStr,
+                adapterName: this._customAdapter
+            });
             yield query.Run();
         });
     }
@@ -51,9 +56,14 @@ export default class Table {
                 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._name, queryStr);
+            let params = {};
             if ((options === null || options === void 0 ? void 0 : options.where) && Object.keys(options.where).length > 0)
-                query.Parameters = options.where;
+                params = options.where;
+            const query = new Query({
+                tableName: this._name,
+                query: queryStr,
+                parameters: params
+            });
             const results = yield query.All();
             return results;
         });
@@ -73,15 +83,27 @@ export default class Table {
     /** Get the total count of records */
     RecordsCount() {
         return __awaiter(this, void 0, void 0, function* () {
-            const query = new Query(this._name, `SELECT COUNT(*) as count FROM "${this._name}";`);
+            const query = new Query({
+                tableName: this._name,
+                query: `SELECT COUNT(*) as count FROM "${this._name}"`
+            });
             const count = yield query.Count();
             return count || 0;
         });
     }
+    exists() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const query = new Query({
+                tableName: this._name,
+                adapterName: this._customAdapter
+            });
+            return yield query.DoesTableExist();
+        });
+    }
     /** Insert a record into the table */
     Insert(values) {
         return __awaiter(this, void 0, void 0, function* () {
-            const record = new Record(values, this._name);
+            const record = new Record(this._name, values);
             yield record.Insert();
             return record;
         });
@@ -89,38 +111,51 @@ export default class Table {
     /** Perform JOIN operations with other tables */
     Join(Joins, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            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;
-            }
+            const queryString = yield QueryStatementBuilder.BuildJoin(this._name, Joins, options);
+            let params = {};
+            if (options === null || options === void 0 ? void 0 : options.where)
+                params = options.where;
+            const query = new Query({
+                tableName: this._name,
+                query: queryString,
+                parameters: params
+            });
             const joinedTables = Array.isArray(Joins) ? Joins.map(j => j.fromTable) : [Joins.fromTable];
+            if (options) {
+                options.select = joinedTables.map(table => `${table}.*`).join(', ');
+            }
             const records = yield query.All();
-            return yield this.splitJoinValues(records, joinedTables);
+            const splitTables = yield this.splitJoinValues(records, joinedTables);
+            return splitTables;
         });
     }
     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);
+                const mainTableData = {};
+                const joinedTableData = {};
+                for (const tableName of joinedTables) {
+                    joinedTableData[tableName] = {};
+                }
+                for (const [aliasedKey, value] of Object.entries(record.values)) {
+                    if (aliasedKey.includes('__')) {
+                        const [tableName, columnName] = aliasedKey.split('__');
+                        if (tableName === this._name) {
+                            mainTableData[columnName] = value;
+                        }
+                        else if (joinedTables.includes(tableName)) {
+                            joinedTableData[tableName][columnName] = value;
+                        }
+                    }
+                    else {
+                        mainTableData[aliasedKey] = value;
+                    }
                 }
-                return new Record(Object.assign(Object.assign({}, Object.fromEntries(thisRecordEntries)), joinedRecords), this._name);
+                // Combine main table data with nested joined table data
+                const combinedData = Object.assign(Object.assign({}, mainTableData), joinedTableData);
+                return new Record(this._name, combinedData);
             });
         });
     }

package/dist/helpers/QueryStatementBuilder.d.ts

@@ -1,4 +1,4 @@
-import { DefaultQueryOptions, QueryOptions, QueryCondition, Join, QueryWhereParameters } from "../types/index.js";
+import { DefaultQueryParameters, ExtraQueryParameters, QueryWhereCondition, Join, QueryIsEqualParameter } from "../types/index.js";
 /** Utility class for building SQL query strings */
 export default class QueryStatementBuilder {
     /**
@@ -25,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(tableName: string, options?: DefaultQueryOptions & QueryOptions): string;
+    static BuildSelect(tableName: string, options?: DefaultQueryParameters & ExtraQueryParameters): string;
     /**
      * Build an INSERT SQL statement with named parameter placeholders
      *
@@ -45,7 +45,7 @@ export default class QueryStatementBuilder {
      * // Note: The actual values will be bound separately using the Parameters object
      * ```
      */
-    static BuildInsert(tableName: string, record: QueryWhereParameters): string;
+    static BuildInsert(tableName: string, record: QueryIsEqualParameter): string;
     /**
      * Build an UPDATE SQL statement with SET clause and WHERE conditions
      *
@@ -72,7 +72,7 @@ export default class QueryStatementBuilder {
      * // "UPDATE users SET status = @status WHERE status = @status AND last_login = @last_login"
      * ```
      */
-    static BuildUpdate(tableName: string, record: QueryCondition, where: QueryCondition): string;
+    static BuildUpdate(tableName: string, record: QueryWhereCondition, where: QueryWhereCondition): string;
     /**
      * Build a DELETE SQL statement with WHERE conditions
      *
@@ -93,7 +93,7 @@ export default class QueryStatementBuilder {
      * // "DELETE FROM users WHERE status = @status AND last_login = @last_login"
      * ```
      */
-    static BuildDelete(tableName: string, where: QueryCondition): string;
+    static BuildDelete(tableName: string, where: QueryWhereCondition): string;
     /**
      * Build a COUNT SQL statement to count rows, optionally with WHERE conditions
      *
@@ -115,7 +115,7 @@ export default class QueryStatementBuilder {
      * // "SELECT COUNT(*) as count FROM users WHERE status = @status AND age = @age"
      * ```
      */
-    static BuildCount(tableName: string, where?: QueryCondition): string;
+    static BuildCount(tableName: string, where?: QueryWhereCondition): string;
     /**
      * Build a WHERE clause from parameter conditions (helper method)
      *
@@ -144,7 +144,7 @@ export default class QueryStatementBuilder {
      * // ""
      * ```
      */
-    static BuildWhere(where?: QueryCondition): string;
+    static BuildWhere(where?: QueryWhereCondition): string;
     private static buildWhereWithOperators;
     private static buildWhereSimple;
     /**
@@ -191,7 +191,8 @@ export default class QueryStatementBuilder {
      * );
      * ```
      */
-    static BuildJoin(fromTableName: string, joins: Join | Join[], options?: DefaultQueryOptions & QueryOptions): string;
+    static BuildJoin(fromTableName: string, joins: Join | Join[], options?: DefaultQueryParameters & ExtraQueryParameters): Promise<string>;
+    static BuildJoinSelect(fromTableName: string, joins: Join | Join[]): Promise<string>;
     /**
      * Build JOIN clause(s) recursively (helper method)
      *
@@ -264,7 +265,7 @@ export default class QueryStatementBuilder {
      * // "ON users.id = orders.user_id AND users.company_id = orders.company_id"
      * ```
      */
-    static BuildJoinOnPart(tableName: string, joinTableName: string, on: QueryWhereParameters | QueryWhereParameters[]): string;
+    static BuildJoinOnPart(tableName: string, joinTableName: string, on: QueryIsEqualParameter | QueryIsEqualParameter[]): string;
     /**
      * Build query options clause (ORDER BY, LIMIT, OFFSET) (helper method)
      *
@@ -298,6 +299,6 @@ export default class QueryStatementBuilder {
      * // "LIMIT 25 OFFSET 50"
      * ```
      */
-    static BuildQueryOptions(options: QueryOptions): string;
+    static BuildQueryOptions(options: ExtraQueryParameters): string;
 }
 //# sourceMappingURL=QueryStatementBuilder.d.ts.map

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;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"}
+{"version":3,"file":"QueryStatementBuilder.d.ts","sourceRoot":"","sources":["../../src/helpers/QueryStatementBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,IAAI,EAA6B,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEjK,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACtC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,GAAG,MAAM;IAW7G;;;;;;;;;;;;;;;;;;OAkBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,MAAM;IAYnF;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE,mBAAmB,GAAG,MAAM;IAW7G;;;;;;;;;;;;;;;;;;;OAmBG;WACW,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,GAAG,MAAM;IAShF;;;;;;;;;;;;;;;;;;;;OAoBG;WACW,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,mBAAmB,GAAG,MAAM;IAQhF;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;WACW,UAAU,CAAC,KAAK,CAAC,EAAE,mBAAmB,GAAG,MAAM;IAgB7D,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAStC,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAK/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2CG;WACiB,SAAS,CACzB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,EACpB,OAAO,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,GACxD,OAAO,CAAC,MAAM,CAAC;WAaE,eAAe,CAC/B,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,GACrB,OAAO,CAAC,MAAM,CAAC;IAmBlB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;WACW,aAAa,CACvB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,GACrB,MAAM;IAaT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;WACW,eAAe,CACzB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,GACpD,MAAM;IAWT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;WACW,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM;CAiBzE"}

package/dist/helpers/QueryStatementBuilder.js

@@ -1,3 +1,13 @@
+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 { Query } from "../index.js";
 /** Utility class for building SQL query strings */
 export default class QueryStatementBuilder {
     /**
@@ -246,14 +256,28 @@ export default class QueryStatementBuilder {
      * ```
      */
     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 "${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(" ");
+        return __awaiter(this, void 0, void 0, function* () {
+            const queryParts = [];
+            const selectClause = yield QueryStatementBuilder.BuildJoinSelect(fromTableName, joins);
+            queryParts.push(`SELECT ${selectClause}`);
+            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(" ");
+        });
+    }
+    static BuildJoinSelect(fromTableName, joins) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const mainTableCols = yield Query.TableColumnInformation(fromTableName);
+            const mainTableSelect = mainTableCols.map(col => `"${fromTableName}"."${col.name}" AS "${fromTableName}__${col.name}"`).join(', ');
+            const joinArray = Array.isArray(joins) ? joins : [joins];
+            const joinedSelects = yield Promise.all(joinArray.map((join) => __awaiter(this, void 0, void 0, function* () {
+                const cols = yield Query.TableColumnInformation(join.fromTable);
+                return cols.map(col => `"${join.fromTable}"."${col.name}" AS "${join.fromTable}__${col.name}"`).join(', ');
+            })));
+            return [mainTableSelect, ...joinedSelects].join(', ');
+        });
     }
     /**
      * Build JOIN clause(s) recursively (helper method)
@@ -296,12 +320,11 @@ export default class QueryStatementBuilder {
      */
     static BuildJoinPart(fromTableName, joins) {
         const queryParts = [];
-        const joinsArray = Array.isArray(joins) ? joins : [joins];
-        let currentTableName = fromTableName;
-        for (const join of joinsArray) {
+        joins = Array.isArray(joins) ? joins : [joins];
+        for (const join of joins) {
+            const baseTable = join.baseTable || fromTableName; // Use explicit base or default
             queryParts.push(`${join.joinType} JOIN "${join.fromTable}"`);
-            queryParts.push(this.BuildJoinOnPart(currentTableName, join.fromTable, join.on));
-            currentTableName = join.fromTable;
+            queryParts.push(this.BuildJoinOnPart(baseTable, join.fromTable, join.on));
         }
         return queryParts.join(" ");
     }

package/dist/interfaces/IDatabaseAdapter.d.ts

@@ -6,6 +6,7 @@ export default interface IDatabaseAdapter {
     exec(query: string): Promise<void>;
     transaction(fn: (items: any[]) => void): Promise<Function>;
     tableColumnInformation(tableName: string): Promise<TableColumnInfo[]>;
+    tableExists(tableName: string): Promise<boolean>;
     close(): Promise<void>;
 }
 //# sourceMappingURL=IDatabaseAdapter.d.ts.map

package/dist/interfaces/IDatabaseAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IDatabaseAdapter.d.ts","sourceRoot":"","sources":["../../src/interfaces/IDatabaseAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACrC,OAAO,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACtE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}
+{"version":3,"file":"IDatabaseAdapter.d.ts","sourceRoot":"","sources":["../../src/interfaces/IDatabaseAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACrC,OAAO,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACtE,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}

package/dist/runtime/Repository.d.ts

@@ -1,20 +1,26 @@
 import type Model from "../abstract/Model.js";
 import Record from "../base/Record.js";
-import { columnType, QueryCondition, QueryOptions, QueryWhereParameters } from "../types/index.js";
+import { columnType, QueryWhereCondition, ExtraQueryParameters, relation, QueryIsEqualParameter } from "../types/index.js";
 export default class Repository<Type extends columnType, ModelType extends Model<Type>> {
     private static _instances;
     private models;
+    private manyToManyRelations;
     private Table;
-    constructor(tableName: string, ModelClass: ModelType);
-    static getInstance<ModelType extends columnType>(ModelClass: new () => Model<ModelType>, tableName: string): Repository<ModelType, Model<ModelType>>;
+    constructor(tableName: string, ModelClass: ModelType, customDatabaseAdapter?: string);
+    static getInstance<ModelType extends columnType>(ModelClass: new () => Model<ModelType>, tableName: string, customDatabaseAdapter?: string): Repository<ModelType, Model<ModelType>>;
+    private generatePivotTableKeys;
+    insertRecordIntoPivotTable(foreignKey: string, modelOfOrigin: ModelType, relation: relation): Promise<void>;
+    deleteRecordFromPivotTable(foreignKey: string, modelOfOrigin: ModelType, relation: relation): Promise<void>;
+    getManyToManyRelation(relation: relation): Promise<relation | undefined>;
+    doesTableExist(name: string): Promise<boolean>;
     syncModel(model: ModelType): void;
     getModel(name: string): ModelType;
     save(attributes: Type): Promise<void>;
-    first(conditions: QueryCondition, Model: Model<Type>): Promise<Type | null>;
-    get(conditions: QueryCondition, queryOptions: QueryOptions, Model: Model<Type>): Promise<Type[]>;
-    all(Model: Model<Type>, queryscopes?: QueryCondition, queryOptions?: QueryOptions): Promise<Type[]>;
-    update(primaryKey: QueryWhereParameters, newAttributes: Partial<Type>): Promise<Record<Type> | undefined>;
+    first(conditions: QueryWhereCondition, Model: Model<Type>): Promise<Type | null>;
+    get(conditions: QueryWhereCondition, queryOptions: ExtraQueryParameters, Model: Model<Type>): Promise<Type[]>;
+    all(Model: Model<Type>, queryscopes?: QueryWhereCondition, queryOptions?: ExtraQueryParameters): Promise<Type[]>;
+    update(primaryKey: QueryIsEqualParameter, newAttributes: Partial<Type>): Promise<Record<Type> | undefined>;
     private join;
-    private mergeQueryConditions;
+    private mergeQueryWhereConditions;
 }
 //# sourceMappingURL=Repository.d.ts.map

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;AACjD,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAG1C,OAAO,EAAE,UAAU,EAAQ,cAAc,EAAE,YAAY,EAA6B,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEvI,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,WAAW,CAAC,EAAE,cAAc,EAAE,YAAY,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAQnG,MAAM,CAAC,UAAU,EAAE,oBAAoB,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YAOxG,IAAI;IAyBlB,OAAO,CAAC,oBAAoB;CAG/B"}
+{"version":3,"file":"Repository.d.ts","sourceRoot":"","sources":["../../src/runtime/Repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAC;AACjD,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAG1C,OAAO,EAAE,UAAU,EAAQ,mBAAmB,EAAE,oBAAoB,EAAE,QAAQ,EAA6B,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE/J,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,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,KAAK,CAAO;gBAER,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,qBAAqB,CAAC,EAAE,MAAM;WAMtE,WAAW,CAAC,SAAS,SAAS,UAAU,EAClD,UAAU,EAAE,UAAU,KAAK,CAAC,SAAS,CAAC,EACtC,SAAS,EAAE,MAAM,EACjB,qBAAqB,CAAC,EAAE,MAAM,GAC/B,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAW1C,OAAO,CAAC,sBAAsB;IAajB,0BAA0B,CACnC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,SAAS,EACxB,QAAQ,EAAE,QAAQ,GACnB,OAAO,CAAC,IAAI,CAAC;IAKH,0BAA0B,CACnC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,SAAS,EACxB,QAAQ,EAAE,QAAQ,GACnB,OAAO,CAAC,IAAI,CAAC;IAMH,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAaxE,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,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,mBAAmB,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAYhF,GAAG,CAAC,UAAU,EAAE,mBAAmB,EAAE,YAAY,EAAE,oBAAoB,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAS7G,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,EAAE,mBAAmB,EAAE,YAAY,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAShH,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YAOzG,IAAI;IAgDlB,OAAO,CAAC,yBAAyB;CAGpC"}

package/dist/runtime/Repository.js

@@ -10,22 +10,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Query from "../base/Query.js";
 import Table from "../base/Table.js";
 class Repository {
-    constructor(tableName, ModelClass) {
+    constructor(tableName, ModelClass, customDatabaseAdapter) {
         var _a;
         this.models = new Map();
+        this.manyToManyRelations = new Map();
         const modelPk = ((_a = ModelClass.primaryKey) === null || _a === void 0 ? void 0 : _a.toString()) || ModelClass.constructor.name;
         this.models.set(modelPk, ModelClass);
-        this.Table = new Table(tableName);
+        this.Table = new Table(tableName, customDatabaseAdapter);
     }
-    static getInstance(ModelClass, tableName) {
+    static getInstance(ModelClass, tableName, customDatabaseAdapter) {
         const className = ModelClass.name;
         if (!this._instances.has(className)) {
-            const instance = new Repository(tableName, new ModelClass());
+            const instance = new Repository(tableName, new ModelClass(), customDatabaseAdapter);
             this._instances.set(className, instance);
             return instance;
         }
         return this._instances.get(className);
     }
+    generatePivotTableKeys(foreignKey, modelOfOrigin, relation) {
+        var _a;
+        const isLocal = !((_a = relation.pivotLocalKey) === null || _a === void 0 ? void 0 : _a.includes(modelOfOrigin.Configuration.table));
+        return {
+            [relation.pivotLocalKey]: isLocal ? foreignKey : modelOfOrigin.values[relation.foreignKey],
+            [relation.pivotForeignKey]: isLocal ? modelOfOrigin.values[relation.foreignKey] : foreignKey
+        };
+    }
+    insertRecordIntoPivotTable(foreignKey, modelOfOrigin, relation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const table = new Table(relation.pivotTable);
+            yield table.Insert(this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation));
+        });
+    }
+    deleteRecordFromPivotTable(foreignKey, modelOfOrigin, relation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const table = new Table(relation.pivotTable);
+            const record = yield table.Record(this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation));
+            yield (record === null || record === void 0 ? void 0 : record.Delete());
+        });
+    }
+    getManyToManyRelation(relation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (relation.pivotTable && this.manyToManyRelations.has(relation.pivotTable)) {
+                return this.manyToManyRelations.get(relation.pivotTable);
+            }
+            if (yield this.doesTableExist(relation.pivotTable)) {
+                this.manyToManyRelations.set(relation.pivotTable, relation);
+                return relation;
+            }
+            else {
+                throw new Error(`Pivot table ${relation.pivotTable} does not exist. Create it in alphabetical order before using many-to-many relationships.`);
+            }
+        });
+    }
+    doesTableExist(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const table = new Table(name);
+            return yield table.exists();
+        });
+    }
     syncModel(model) {
         var _a;
         const modelPk = ((_a = model.primaryKey) === null || _a === void 0 ? void 0 : _a.toString()) || model.constructor.name;
@@ -43,7 +85,8 @@ class Repository {
         return __awaiter(this, void 0, void 0, function* () {
             let record;
             if (Model.JoinedEntities.length > 0) {
-                record = yield this.join(Model, conditions, { limit: 1 }).then(results => results[0]);
+                const results = yield this.join(Model, conditions, { limit: 1 });
+                record = results[0] ? { values: results[0] } : undefined;
             }
             else {
                 record = yield this.Table.Record({ where: conditions });
@@ -57,7 +100,8 @@ class Repository {
                 return yield this.join(Model, conditions, queryOptions);
             }
             else {
-                return yield this.Table.Records(Object.assign({ where: conditions }, queryOptions)).then(records => records.map(record => record.values));
+                const records = yield this.Table.Records(Object.assign({ where: conditions }, queryOptions));
+                return records.map(record => record.values);
             }
         });
     }
@@ -67,7 +111,8 @@ class Repository {
                 return yield this.join(Model);
             }
             else {
-                return yield this.Table.Records(Object.assign({ where: queryscopes }, queryOptions)).then(records => records.map(record => record.values));
+                const records = yield this.Table.Records(Object.assign({ where: queryscopes }, queryOptions));
+                return records.map(record => record.values);
             }
         });
     }
@@ -81,27 +126,49 @@ class Repository {
     }
     join(Model, conditions, queryOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const Join = Model.JoinedEntities.map(join => {
-                const relation = Model.Relations.find(rel => rel.model.Configuration.table.toLowerCase() === join.relation.toLowerCase());
+            const Join = Model.JoinedEntities.flatMap(join => {
+                const relation = Model.Relations.find(rel => rel.model.Configuration.table.replace("_", "").toLowerCase() === join.relation.toLowerCase());
                 if (join.queryScopes) {
-                    conditions = this.mergeQueryConditions(conditions || {}, join.queryScopes);
+                    conditions = this.mergeQueryWhereConditions(conditions || {}, join.queryScopes);
                 }
                 if (!relation) {
                     throw new Error(`Relation for joined entity ${join} not found.`);
                 }
+                if (relation.type === 'manyToMany') {
+                    return [
+                        {
+                            fromTable: relation.pivotTable,
+                            baseTable: Model.Configuration.table,
+                            joinType: 'INNER',
+                            on: [
+                                { [relation.pivotForeignKey]: relation.localKey }
+                            ]
+                        },
+                        {
+                            fromTable: relation.model.Configuration.table,
+                            baseTable: relation.pivotTable,
+                            joinType: 'INNER',
+                            on: [
+                                { [relation.foreignKey]: relation.pivotLocalKey }
+                            ]
+                        }
+                    ];
+                }
                 const JoinType = relation.type === 'hasOne' || relation.type === 'belongsTo' ? 'INNER' : 'LEFT';
-                return {
-                    fromTable: relation.model.Configuration.table,
-                    joinType: JoinType,
-                    on: [
-                        { [relation.foreignKey]: relation.localKey }
-                    ]
-                };
+                return [{
+                        fromTable: relation.model.Configuration.table,
+                        baseTable: Model.Configuration.table,
+                        joinType: JoinType,
+                        on: [
+                            { [relation.foreignKey]: relation.localKey }
+                        ]
+                    }];
             });
-            return (yield this.Table.Join(Join, Object.assign({ where: conditions }, queryOptions))).map(record => record.values);
+            const records = yield this.Table.Join(Join, Object.assign({ where: conditions }, queryOptions));
+            return records.map(record => record.values);
         });
     }
-    mergeQueryConditions(base, additional) {
+    mergeQueryWhereConditions(base, additional) {
         return [...Query.ConvertParamsToArray(base), ...Query.ConvertParamsToArray(additional)];
     }
 }

package/dist/types/model.d.ts

@@ -1,6 +1,6 @@
 /** Model configuration and types */
 import Model from "../abstract/Model";
-import { columnType, QueryCondition } from "./index";
+import { columnType, QueryWhereCondition } from "./index";
 export type ModelEventType = 'retrieved' | 'creating' | 'created' | 'updating' | 'updated' | 'saving' | 'saved' | 'deleting' | 'deleted' | 'restoring' | 'restored' | 'forceDeleting' | 'forceDeleted';
 export type ModelEventHandler<T> = (model: T) => void | Promise<void>;
 export interface ModelObserver<T> {
@@ -24,6 +24,8 @@ export interface ModelScope {
 export interface ModelConfig {
     /** Table name - defaults to lowercase class name */
     table: string;
+    /** Custom adapter name - defaults to default name */
+    customAdapter?: string;
     /** Primary key column - defaults to 'id' */
     primaryKey: string;
     /** Whether to auto-increment primary key - defaults to true */
@@ -56,10 +58,13 @@ export interface ModelConfig {
     dateFormat?: string;
 }
 export type relation = {
-    type: 'hasOne' | 'hasMany' | 'belongsTo';
+    type: 'hasOne' | 'hasMany' | 'belongsTo' | 'manyToMany';
     model: unknown & Model<columnType>;
     foreignKey: string;
-    localKey?: string;
+    localKey: string;
+    pivotTable?: string;
+    pivotForeignKey?: string;
+    pivotLocalKey?: string;
 };
 export interface SoftDeletable {
     deleted_at?: string | Date | null;
@@ -71,6 +76,6 @@ export type ModelWithTimestamps = {
 };
 export type joinedEntity = {
     relation: string;
-    queryScopes?: QueryCondition;
+    queryScopes?: QueryWhereCondition;
 };
 //# sourceMappingURL=model.d.ts.map

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

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

package/dist/types/query.d.ts

@@ -1,18 +1,18 @@
-export type QueryWhereParameters = {
+export type QueryIsEqualParameter = {
     [key: string]: QueryValues;
 };
-export type QueryParameters = {
+export type QueryComparisonParameters = {
     column: string;
     operator: '=' | '!=' | '<' | '<=' | '>' | '>=' | 'LIKE' | 'IN' | 'NOT IN';
     value: QueryValues;
 };
-export type QueryCondition = QueryWhereParameters | QueryParameters[];
+export type QueryWhereCondition = QueryIsEqualParameter | QueryComparisonParameters[];
 export type QueryValues = string | number | boolean | null | bigint | Date;
-export type DefaultQueryOptions = {
+export type DefaultQueryParameters = {
     select?: string;
-    where?: QueryCondition;
+    where?: QueryWhereCondition;
 };
-export type QueryOptions = {
+export type ExtraQueryParameters = {
     orderBy?: string;
     limit?: number;
     offset?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/types/query.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;CAC9B,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC;IAC1E,KAAK,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,eAAe,EAAE,CAAC;AAEtE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;AAE3E,MAAM,MAAM,mBAAmB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,cAAc,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/types/query.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC;IAC1E,KAAK,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,GAAG,yBAAyB,EAAE,CAAC;AAEtF,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;AAE3E,MAAM,MAAM,sBAAsB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/dist/types/table.d.ts

@@ -1,4 +1,4 @@
-import { QueryValues, QueryWhereParameters } from "../index";
+import { QueryValues, QueryIsEqualParameter } from "../index";
 export type TableColumnInfo = {
     cid: number;
     name: string;
@@ -25,8 +25,9 @@ export type ColumnDefinition = {
 };
 export type Join = {
     fromTable: string;
+    baseTable: string;
     joinType: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL';
-    on: QueryWhereParameters | QueryWhereParameters[];
-    where?: QueryWhereParameters | QueryWhereParameters[];
+    on: QueryIsEqualParameter | QueryIsEqualParameter[];
+    where?: QueryIsEqualParameter | QueryIsEqualParameter[];
 };
 //# sourceMappingURL=table.d.ts.map

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;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"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/types/table.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAE3D,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,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC9C,EAAE,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,CAAC;IACpD,KAAK,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,CAAC;CAC3D,CAAA"}

package/package.json

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