@iamkirbki/database-handler-core 4.4.3 → 4.4.5

package/dist/helpers/QueryBuilders/QueryDecorators/WhereDecorator.js

@@ -1,12 +1,3 @@
-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 QueryDecorator from "./QueryDecorator.js";
 import QueryStatementBuilder from "../QueryStatementBuilder.js";
 export default class WhereDecorator extends QueryDecorator {
@@ -14,16 +5,14 @@ export default class WhereDecorator extends QueryDecorator {
         super(component);
         this.conditions = conditions;
     }
-    build() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            var _c;
-            const context = yield this.component.build();
-            const combinedConditions = [...QueryStatementBuilder.normalizeQueryConditions(this.conditions)];
-            (_a = context.conditions) !== null && _a !== void 0 ? _a : (context.conditions = {});
-            (_b = (_c = context.conditions).where) !== null && _b !== void 0 ? _b : (_c.where = []);
-            context.conditions.where.push(...combinedConditions);
-            return context;
-        });
+    async build() {
+        var _a, _b;
+        var _c;
+        const context = await this.component.build();
+        const combinedConditions = [...QueryStatementBuilder.normalizeQueryConditions(this.conditions)];
+        (_a = context.conditions) !== null && _a !== void 0 ? _a : (context.conditions = {});
+        (_b = (_c = context.conditions).where) !== null && _b !== void 0 ? _b : (_c.where = []);
+        context.conditions.where.push(...combinedConditions);
+        return context;
     }
 }

package/dist/helpers/QueryBuilders/QueryStatementBuilder.js

@@ -1,12 +1,3 @@
-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 BaseSelectQueryBuilder from "./BaseQueryBuilders/BaseSelectQueryBuilder.js";
 import ExpressionDecorator from "./QueryDecorators/ExpressionDecorator.js";
 import QueryExpressionBuilder from "./QueryExpressionBuilder.js";
@@ -26,112 +17,104 @@ export default class QueryStatementBuilder {
             this._tableColumnsCache = tableColumnInformation;
         }
     }
-    build() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let sql = yield this.buildBaseLayer();
-            if (this._layers.pretty) {
-                sql = yield this.buildPrettyLayer(sql);
-            }
-            if (this._layers.final) {
-                sql = yield this.buildFinalLayer(sql);
-            }
-            return sql;
-        });
+    async build() {
+        let sql = await this.buildBaseLayer();
+        if (this._layers.pretty) {
+            sql = await this.buildPrettyLayer(sql);
+        }
+        if (this._layers.final) {
+            sql = await this.buildFinalLayer(sql);
+        }
+        return sql;
     }
-    buildBaseLayer() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            var _d, _e;
-            if (!this._layers.base.from) {
-                throw new Error("Base layer must specify 'from' table name.");
+    async buildBaseLayer() {
+        var _a, _b, _c;
+        var _d, _e;
+        if (!this._layers.base.from) {
+            throw new Error("Base layer must specify 'from' table name.");
+        }
+        let builder = new BaseSelectQueryBuilder(this._layers.base.from, this._layers.base.select || [], this._layers.base.joinsSelect || [], this._layers.base.expressionsSelect || []);
+        if (this._layers.base.joins && this._layers.base.joins.length > 0) {
+            builder = new JoinDecorator(builder, { base: this._layers.base, pretty: this._layers.pretty, final: this._layers.final }, this._tableColumnsCache);
+        }
+        if (this._layers.base.expressions && this._layers.base.expressions.length > 0) {
+            const expressions = QueryExpressionBuilder.buildExpressionsPart(this._layers.base.expressions || []);
+            builder = new ExpressionDecorator(builder, expressions || []);
+            if (builder instanceof ExpressionDecorator) {
+                this._valueClauseKeywords = new Set([...this._valueClauseKeywords, ...builder.valueClauseKeywords]);
+                (_a = (_d = this._layers).pretty) !== null && _a !== void 0 ? _a : (_d.pretty = {});
+                (_b = (_e = this._layers).final) !== null && _b !== void 0 ? _b : (_e.final = {});
+                this._layers.pretty.where = this.addUnique(this._layers.pretty.where, builder.whereClauses);
+                this._layers.pretty.groupBy = this.addUnique(this._layers.pretty.groupBy, builder.groupByClauses);
+                this._layers.pretty.having = this.addUnique(this._layers.pretty.having, builder.havingClauses);
+                this._layers.base.orderBy = this.addUnique((_c = this._layers.base.orderBy) === null || _c === void 0 ? void 0 : _c.map(ob => ({ column: `${ob.column}`, direction: ob.direction })), builder.orderByClauses);
             }
-            let builder = new BaseSelectQueryBuilder(this._layers.base.from, this._layers.base.select || [], this._layers.base.joinsSelect || [], this._layers.base.expressionsSelect || []);
-            if (this._layers.base.joins && this._layers.base.joins.length > 0) {
-                builder = new JoinDecorator(builder, { base: this._layers.base, pretty: this._layers.pretty, final: this._layers.final }, this._tableColumnsCache);
+            if (this._layers.base.where) {
+                builder = new WhereDecorator(builder, this._layers.base.joins ? QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.base.where, this._layers.base.from) : this._layers.base.where);
             }
-            if (this._layers.base.expressions && this._layers.base.expressions.length > 0) {
-                const expressions = QueryExpressionBuilder.buildExpressionsPart(this._layers.base.expressions || []);
-                builder = new ExpressionDecorator(builder, expressions || []);
+        }
+        else if (this._layers.base.where) {
+            builder = new WhereDecorator(builder, this._layers.base.joins ? QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.base.where, this._layers.base.from) : this._layers.base.where);
+        }
+        if (this._layers.base.where) {
+            builder = new WhereDecorator(builder, this._layers.base.joins ? QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.base.where, this._layers.base.from) : this._layers.base.where);
+        }
+        if (this._layers.base.orderBy) {
+            builder = new OrderByDecorator(builder, this._layers.base.orderBy);
+        }
+        this._contexts.base = await builder.build();
+        const renderer = new SqlRenderer(this._contexts.base);
+        return renderer.build();
+    }
+    async buildPrettyLayer(sql) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        var _h;
+        let builder = new BaseSelectQueryBuilder(`( ${sql} ) AS BASE_QUERY`, [...((_a = this._contexts.base) === null || _a === void 0 ? void 0 : _a.select) || [], ...((_b = this._layers.pretty) === null || _b === void 0 ? void 0 : _b.select) || []], ((_d = (_c = this._contexts.base) === null || _c === void 0 ? void 0 : _c.joinsSelect) === null || _d === void 0 ? void 0 : _d.map(j => j.split("AS")[1].trim())) || []);
+        if (this._layers.pretty) {
+            const expressions = ((_e = this._layers.pretty.expressions) === null || _e === void 0 ? void 0 : _e.length)
+                ? QueryExpressionBuilder.buildExpressionsPart(this._layers.pretty.expressions)
+                : [];
+            if (expressions.length > 0) {
+                builder = new ExpressionDecorator(builder, expressions);
                 if (builder instanceof ExpressionDecorator) {
-                    this._valueClauseKeywords = new Set([...this._valueClauseKeywords, ...builder.valueClauseKeywords]);
-                    (_a = (_d = this._layers).pretty) !== null && _a !== void 0 ? _a : (_d.pretty = {});
-                    (_b = (_e = this._layers).final) !== null && _b !== void 0 ? _b : (_e.final = {});
                     this._layers.pretty.where = this.addUnique(this._layers.pretty.where, builder.whereClauses);
                     this._layers.pretty.groupBy = this.addUnique(this._layers.pretty.groupBy, builder.groupByClauses);
                     this._layers.pretty.having = this.addUnique(this._layers.pretty.having, builder.havingClauses);
-                    this._layers.base.orderBy = this.addUnique((_c = this._layers.base.orderBy) === null || _c === void 0 ? void 0 : _c.map(ob => ({ column: `${ob.column}`, direction: ob.direction })), builder.orderByClauses);
+                    (_f = (_h = this._layers).final) !== null && _f !== void 0 ? _f : (_h.final = {});
+                    this._layers.final.orderBy = this.addUnique((_g = this._layers.final.orderBy) === null || _g === void 0 ? void 0 : _g.map(ob => ({ column: `BASE_QUERY.${ob.column}`, direction: ob.direction })), builder.orderByClauses);
                 }
-                if (this._layers.base.where) {
-                    builder = new WhereDecorator(builder, this._layers.base.joins ? QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.base.where, this._layers.base.from) : this._layers.base.where);
+                if (this._layers.pretty.where) {
+                    builder = new WhereDecorator(builder, QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.pretty.where, "BASE_QUERY", [], this._valueClauseKeywords));
                 }
             }
-            else if (this._layers.base.where) {
-                builder = new WhereDecorator(builder, this._layers.base.joins ? QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.base.where, this._layers.base.from) : this._layers.base.where);
+            else if (this._layers.pretty.where) {
+                builder = new WhereDecorator(builder, QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.pretty.where, "BASE_QUERY", [], this._valueClauseKeywords));
             }
-            if (this._layers.base.where) {
-                builder = new WhereDecorator(builder, this._layers.base.joins ? QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.base.where, this._layers.base.from) : this._layers.base.where);
+            if (this._layers.pretty.groupBy) {
+                builder = new GroupByDecorator(builder, this._layers.pretty.groupBy);
             }
-            if (this._layers.base.orderBy) {
-                builder = new OrderByDecorator(builder, this._layers.base.orderBy);
+            if (this._layers.pretty.having) {
+                builder = new WhereDecorator(builder, QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.pretty.having, "BASE_QUERY"));
             }
-            this._contexts.base = yield builder.build();
-            const renderer = new SqlRenderer(this._contexts.base);
-            return renderer.build();
-        });
+        }
+        this._contexts.pretty = await builder.build();
+        const renderer = new SqlRenderer(this._contexts.pretty);
+        return renderer.build();
     }
-    buildPrettyLayer(sql) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
-            var _h;
-            let builder = new BaseSelectQueryBuilder(`( ${sql} ) AS BASE_QUERY`, [...((_a = this._contexts.base) === null || _a === void 0 ? void 0 : _a.select) || [], ...((_b = this._layers.pretty) === null || _b === void 0 ? void 0 : _b.select) || []], ((_d = (_c = this._contexts.base) === null || _c === void 0 ? void 0 : _c.joinsSelect) === null || _d === void 0 ? void 0 : _d.map(j => j.split("AS")[1].trim())) || []);
-            if (this._layers.pretty) {
-                const expressions = ((_e = this._layers.pretty.expressions) === null || _e === void 0 ? void 0 : _e.length)
-                    ? QueryExpressionBuilder.buildExpressionsPart(this._layers.pretty.expressions)
-                    : [];
-                if (expressions.length > 0) {
-                    builder = new ExpressionDecorator(builder, expressions);
-                    if (builder instanceof ExpressionDecorator) {
-                        this._layers.pretty.where = this.addUnique(this._layers.pretty.where, builder.whereClauses);
-                        this._layers.pretty.groupBy = this.addUnique(this._layers.pretty.groupBy, builder.groupByClauses);
-                        this._layers.pretty.having = this.addUnique(this._layers.pretty.having, builder.havingClauses);
-                        (_f = (_h = this._layers).final) !== null && _f !== void 0 ? _f : (_h.final = {});
-                        this._layers.final.orderBy = this.addUnique((_g = this._layers.final.orderBy) === null || _g === void 0 ? void 0 : _g.map(ob => ({ column: `BASE_QUERY.${ob.column}`, direction: ob.direction })), builder.orderByClauses);
-                    }
-                    if (this._layers.pretty.where) {
-                        builder = new WhereDecorator(builder, QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.pretty.where, "BASE_QUERY", [], this._valueClauseKeywords));
-                    }
-                }
-                else if (this._layers.pretty.where) {
-                    builder = new WhereDecorator(builder, QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.pretty.where, "BASE_QUERY", [], this._valueClauseKeywords));
-                }
-                if (this._layers.pretty.groupBy) {
-                    builder = new GroupByDecorator(builder, this._layers.pretty.groupBy);
-                }
-                if (this._layers.pretty.having) {
-                    builder = new WhereDecorator(builder, QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.pretty.having, "BASE_QUERY"));
-                }
+    async buildFinalLayer(sql) {
+        var _a;
+        let builder = new BaseSelectQueryBuilder(`( ${sql} ) AS PRETTY_QUERY`, ((_a = this._layers.final) === null || _a === void 0 ? void 0 : _a.select) || []);
+        if (this._layers.final) {
+            if (this._layers.final.orderBy) {
+                builder = new OrderByDecorator(builder, this._layers.final.orderBy);
             }
-            this._contexts.pretty = yield builder.build();
-            const renderer = new SqlRenderer(this._contexts.pretty);
-            return renderer.build();
-        });
-    }
-    buildFinalLayer(sql) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            let builder = new BaseSelectQueryBuilder(`( ${sql} ) AS PRETTY_QUERY`, ((_a = this._layers.final) === null || _a === void 0 ? void 0 : _a.select) || []);
-            if (this._layers.final) {
-                if (this._layers.final.orderBy) {
-                    builder = new OrderByDecorator(builder, this._layers.final.orderBy);
-                }
-                if (this._layers.final.limit) {
-                    builder = new LimitDecorator(builder, this._layers.final.limit, this._layers.final.offset);
-                }
+            if (this._layers.final.limit) {
+                builder = new LimitDecorator(builder, this._layers.final.limit, this._layers.final.offset);
             }
-            this._contexts.final = yield builder.build();
-            const renderer = new SqlRenderer(this._contexts.final);
-            return renderer.build();
-        });
+        }
+        this._contexts.final = await builder.build();
+        const renderer = new SqlRenderer(this._contexts.final);
+        return renderer.build();
     }
     static normalizeAndQualifyConditions(where, tableName, normalizeBlacklist = [], valueClauseKeywords = new Set()) {
         const conditions = this.normalizeQueryConditions(where);
@@ -142,9 +125,12 @@ export default class QueryStatementBuilder {
             if (isValueClauseKeyword) {
                 return;
             }
-            return Object.assign(Object.assign({}, condition), { column: shouldSkipQualification
+            return {
+                ...condition,
+                column: shouldSkipQualification
                     ? condition.column
-                    : `${tableName}.${condition.column}` });
+                    : `${tableName}.${condition.column}`,
+            };
         }).filter(cond => cond !== undefined);
     }
     static normalizeQueryConditions(where) {

package/dist/runtime/Repository.d.ts

@@ -22,7 +22,7 @@ export default class Repository<Type extends columnType, ModelType extends Model
     first(queryLayers: QueryLayers, Model: Model<Type>): Promise<Type | undefined>;
     get(QueryLayers: QueryLayers, Model: Model<Type>): Promise<Type[]>;
     all(Model: Model<Type>, QueryLayers: QueryLayers): Promise<Type[]>;
-    update(primaryKey: QueryIsEqualParameter, newAttributes: Partial<Type>): Promise<Record<Type> | undefined>;
+    update(primaryKey: QueryIsEqualParameter, newAttributes: Partial<Type>, table: string): Promise<Record<Type> | undefined>;
     private join;
     toSql(queryLayers: QueryLayers, Model: Model<Type>): Promise<string>;
     private buildJoinObject;

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;AAE1C,OAAO,EAAE,UAAU,EAAQ,mBAAmB,EAAE,QAAQ,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEpK,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;IACpB,OAAO,CAAC,qBAAqB,CAAC,CAAS;IACvC,OAAO,CAAC,YAAY,CAAe;gBAG/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,SAAS,EACrB,qBAAqB,CAAC,EAAE,MAAM,EAC9B,YAAY,GAAE,YAA0D;WAS9D,WAAW,CAAC,SAAS,SAAS,UAAU,EAClD,UAAU,EAAE,UAAU,KAAK,CAAC,SAAS,CAAC,EACtC,SAAS,EAAE,MAAM,EACjB,qBAAqB,CAAC,EAAE,MAAM,EAC9B,YAAY,CAAC,EAAE,YAAY,GAC5B,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;WAiB5B,cAAc,IAAI,IAAI;IAIpC,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,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAY9E,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IASlE,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAIlE,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YAOzG,IAAI;IAaL,KAAK,CACd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GACnB,OAAO,CAAC,MAAM,CAAC;IAYlB,OAAO,CAAC,eAAe;IA4FhB,yBAAyB,CAAC,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,mBAAmB,GAAG,yBAAyB,EAAE;IAKlH,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,yBAAyB,EAAE;CAIxF"}
+{"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;AAE1C,OAAO,EAAE,UAAU,EAAQ,mBAAmB,EAAE,QAAQ,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEpK,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;IACpB,OAAO,CAAC,qBAAqB,CAAC,CAAS;IACvC,OAAO,CAAC,YAAY,CAAe;gBAG/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,SAAS,EACrB,qBAAqB,CAAC,EAAE,MAAM,EAC9B,YAAY,GAAE,YAA0D;WAS9D,WAAW,CAAC,SAAS,SAAS,UAAU,EAClD,UAAU,EAAE,UAAU,KAAK,CAAC,SAAS,CAAC,EACtC,SAAS,EAAE,MAAM,EACjB,qBAAqB,CAAC,EAAE,MAAM,EAC9B,YAAY,CAAC,EAAE,YAAY,GAC5B,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;WAiB5B,cAAc,IAAI,IAAI;IAIpC,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,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAY9E,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IASlE,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAIlE,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YAOxH,IAAI;IAaL,KAAK,CACd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GACnB,OAAO,CAAC,MAAM,CAAC;IAYlB,OAAO,CAAC,eAAe;IAmHhB,yBAAyB,CAAC,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,mBAAmB,GAAG,yBAAyB,EAAE;IAKlH,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,yBAAyB,EAAE;CAIxF"}

package/dist/runtime/Repository.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import Table from "../base/Table.js";
 class Repository {
     constructor(tableName, ModelClass, customDatabaseAdapter, tableFactory = (name, adapter) => new Table(name, adapter)) {
@@ -40,38 +31,30 @@ class Repository {
             [relation.pivotForeignKey]: isLocal ? modelOfOrigin.values[relation.foreignKey] : foreignKey
         };
     }
-    insertRecordIntoPivotTable(foreignKey, modelOfOrigin, relation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const table = this.tableFactory(relation.pivotTable, this.customDatabaseAdapter);
-            yield table.Insert(this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation));
-        });
+    async insertRecordIntoPivotTable(foreignKey, modelOfOrigin, relation) {
+        const table = this.tableFactory(relation.pivotTable, this.customDatabaseAdapter);
+        await table.Insert(this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation));
     }
-    deleteRecordFromPivotTable(foreignKey, modelOfOrigin, relation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const table = this.tableFactory(relation.pivotTable, this.customDatabaseAdapter);
-            const record = yield table.Record({ base: { where: this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation) } });
-            yield (record === null || record === void 0 ? void 0 : record.Delete());
-        });
+    async deleteRecordFromPivotTable(foreignKey, modelOfOrigin, relation) {
+        const table = this.tableFactory(relation.pivotTable, this.customDatabaseAdapter);
+        const record = await table.Record({ base: { where: this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation) } });
+        await (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.`);
-            }
-        });
+    async getManyToManyRelation(relation) {
+        if (relation.pivotTable && this.manyToManyRelations.has(relation.pivotTable)) {
+            return this.manyToManyRelations.get(relation.pivotTable);
+        }
+        if (await 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 = this.tableFactory(name, this.customDatabaseAdapter);
-            return yield table.exists();
-        });
+    async doesTableExist(name) {
+        const table = this.tableFactory(name, this.customDatabaseAdapter);
+        return await table.exists();
     }
     syncModel(model) {
         var _a;
@@ -81,76 +64,72 @@ class Repository {
     getModel(name) {
         return this.models.get(name);
     }
-    save(attributes) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.Table.Insert(attributes);
-        });
-    }
-    first(queryLayers, Model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let record;
-            if (Model.JoinedEntities.length > 0) {
-                const result = (yield this.join(Model, Object.assign(Object.assign({}, queryLayers), { final: Object.assign(Object.assign({}, queryLayers.final), { limit: 1 }) })))[0];
-                record = result ? { values: result } : undefined;
-            }
-            else {
-                record = yield this.Table.Record(queryLayers);
-            }
-            return record === null || record === void 0 ? void 0 : record.values;
-        });
+    async save(attributes) {
+        await this.Table.Insert(attributes);
     }
-    get(QueryLayers, Model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (Model.JoinedEntities.length > 0) {
-                return yield this.join(Model, QueryLayers);
-            }
-            else {
-                const records = yield this.Table.Records(QueryLayers);
-                return records.map(record => record.values);
-            }
-        });
+    async first(queryLayers, Model) {
+        let record;
+        if (Model.JoinedEntities.length > 0) {
+            const result = (await this.join(Model, { ...queryLayers, final: { ...queryLayers.final, limit: 1 } }))[0];
+            record = result ? { values: result } : undefined;
+        }
+        else {
+            record = await this.Table.Record(queryLayers);
+        }
+        return record === null || record === void 0 ? void 0 : record.values;
     }
-    all(Model, QueryLayers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.get(QueryLayers, Model);
-        });
+    async get(QueryLayers, Model) {
+        if (Model.JoinedEntities.length > 0) {
+            return await this.join(Model, QueryLayers);
+        }
+        else {
+            const records = await this.Table.Records(QueryLayers);
+            return records.map(record => record.values);
+        }
     }
-    update(primaryKey, newAttributes) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const record = yield this.Table.Record({ base: { where: primaryKey } });
-            if (record) {
-                return yield record.Update(newAttributes, primaryKey);
-            }
-        });
+    async all(Model, QueryLayers) {
+        return this.get(QueryLayers, Model);
     }
-    join(Model, queryLayers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { joins, queryLayers: nextLayers } = this.buildJoinObject(Model, queryLayers);
-            nextLayers.base.joins = joins;
-            const records = yield this.Table.Join(nextLayers);
-            return records.map(record => record.values);
-        });
+    async update(primaryKey, newAttributes, table) {
+        const record = await this.Table.Record({ base: { from: table, where: primaryKey } });
+        if (record) {
+            return await record.Update(newAttributes, primaryKey);
+        }
     }
-    toSql(queryLayers, Model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let nextLayers = queryLayers;
-            if (Model.JoinedEntities.length > 0) {
-                const result = this.buildJoinObject(Model, queryLayers);
-                nextLayers = result.queryLayers;
-                nextLayers.base.joins = result.joins;
-            }
-            return this.Table.toSql(nextLayers);
-        });
+    async join(Model, queryLayers) {
+        const { joins, queryLayers: nextLayers } = this.buildJoinObject(Model, queryLayers);
+        nextLayers.base.joins = joins;
+        const records = await this.Table.Join(nextLayers);
+        return records.map(record => record.values);
+    }
+    async toSql(queryLayers, Model) {
+        let nextLayers = queryLayers;
+        if (Model.JoinedEntities.length > 0) {
+            const result = this.buildJoinObject(Model, queryLayers);
+            nextLayers = result.queryLayers;
+            nextLayers.base.joins = result.joins;
+        }
+        return this.Table.toSql(nextLayers);
     }
     buildJoinObject(Model, inputLayers) {
-        const queryLayers = Object.assign(Object.assign({}, inputLayers), { base: Object.assign({}, inputLayers.base), final: inputLayers.final
-                ? Object.assign({}, inputLayers.final) : undefined });
+        const queryLayers = {
+            ...inputLayers,
+            base: {
+                ...inputLayers.base,
+            },
+            final: inputLayers.final
+                ? { ...inputLayers.final }
+                : undefined
+        };
         const joins = Model.JoinedEntities.flatMap(join => {
             var _a, _b;
             var _c;
-            const relation = Model.Relations.find(rel => rel.model.Configuration.table
+            let relation = Model.Relations.find(rel => rel.model.Configuration.table
                 .replace("_", "")
                 .toLowerCase() === join.relation.toLowerCase());
+            if (!relation) {
+                relation = Model.Relations.find(rel => rel.path.split(".")[1] === join.path.split('.')[1]); //Try a little harder
+            }
             if (!relation) {
                 throw new Error(`Relation for joined entity ${join.relation} not found.`);
             }
@@ -164,16 +143,31 @@ class Repository {
                 const joinType = relation.type === 'hasOne' || relation.type === 'belongsTo'
                     ? 'INNER'
                     : 'LEFT';
-                const [baseTable, baseKey] = relation.localKey.includes('.')
-                    ? relation.localKey.split('.')
-                    : [Model.Configuration.table, relation.localKey];
+                let baseTable;
+                let targetTable;
+                let baseKey;
+                const [firstPathSegment, secondPathSegment] = relation.path.split('.');
+                if (firstPathSegment !== Model.Configuration.table) {
+                    baseTable = firstPathSegment;
+                    targetTable = secondPathSegment;
+                }
+                else {
+                    baseTable = Model.Configuration.table;
+                    if (relation.localKey.includes('.')) {
+                        [baseTable, baseKey] = relation.localKey.split('.');
+                    }
+                    else {
+                        baseKey = relation.localKey;
+                    }
+                }
                 return [
                     {
-                        fromTable: relation.model.Configuration.table,
-                        baseTable,
+                        fromTable: targetTable ? targetTable : relation.model.Configuration.table,
+                        baseTable: baseTable ? baseTable : Model.Configuration.table,
                         joinType,
+                        name: relation.name,
                         on: [
-                            { [relation.foreignKey]: baseKey }
+                            { [relation.foreignKey]: baseKey ? baseKey : relation.localKey }
                         ]
                     }
                 ];
@@ -190,6 +184,7 @@ class Repository {
                     fromTable: relation.pivotTable,
                     baseTable: Model.Configuration.table,
                     joinType: 'INNER',
+                    name: relation.name,
                     on: [
                         { [relation.pivotForeignKey]: relation.localKey }
                     ]
@@ -198,6 +193,7 @@ class Repository {
                     fromTable: relation.model.Configuration.table,
                     baseTable: relation.pivotTable,
                     joinType: 'INNER',
+                    name: relation.name,
                     on: [
                         { [relation.foreignKey]: relation.pivotLocalKey }
                     ]

package/dist/types/model.d.ts

@@ -58,6 +58,8 @@ export type ModelConfig = {
     dateFormat?: string;
 };
 export type relation = {
+    name: string;
+    path: string;
     type: 'hasOne' | 'hasMany' | 'belongsTo' | 'manyToMany';
     model: unknown & Model<columnType>;
     foreignKey: string;
@@ -76,6 +78,7 @@ export type ModelWithTimestamps = {
 };
 export type joinedEntity = {
     relation: string;
+    path: string;
     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/table.d.ts

@@ -29,5 +29,6 @@ export type Join = {
     joinType: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL';
     on: QueryIsEqualParameter | QueryIsEqualParameter[];
     where?: QueryIsEqualParameter | QueryIsEqualParameter[];
+    name?: string;
 };
 //# 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,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"}
+{"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;IACxD,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAA"}

package/package.json

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