@iamkirbki/database-handler-core 4.4.6 → 4.4.8

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

@@ -1,9 +1,10 @@
-import QueryDecorator from "./QueryDecorator.js";
-export default class JoinDecorator extends QueryDecorator {
+import { QueryDecorator } from "./QueryDecorator.js";
+import { InvalidOperationError } from "../../../helpers/Errors/ModelErrors/InvalidOperationError.js";
+export class JoinDecorator extends QueryDecorator {
     constructor(builder, layer, tableColumnInformation) {
         var _a, _b, _c, _d, _e;
         if (!layer.base.from) {
-            throw new Error("Base layer must specify 'from' table name for JoinDecorator.");
+            throw new InvalidOperationError("Base layer must specify 'from' table name for JoinDecorator.");
         }
         super(builder);
         this.fromTableName = layer.base.from;
@@ -20,14 +21,14 @@ export default class JoinDecorator extends QueryDecorator {
     async build() {
         var _a;
         const context = await this.component.build();
-        const selectExtensions = await this.buildJoinSelect();
-        const joinPart = this.buildJoinPart();
+        const selectExtensions = this.buildJoinSelect();
+        const joinPart = this.buildSqlJoinPart();
         context.joinsSelect = selectExtensions;
         (_a = context.joins) !== null && _a !== void 0 ? _a : (context.joins = []);
         context.joins.push(...joinPart);
         return context;
     }
-    async buildJoinSelect() {
+    buildJoinSelect() {
         var _a;
         const blacklist = ((_a = this.options) === null || _a === void 0 ? void 0 : _a.blacklistTables) || [];
         const joinArray = Array.isArray(this.joins) ? this.joins : [this.joins];
@@ -35,27 +36,29 @@ export default class JoinDecorator extends QueryDecorator {
         const mainSelect = mainCols
             .filter(() => !blacklist.includes(this.fromTableName))
             .map(col => `"${this.fromTableName}"."${col.name}" AS "${this.fromTableName}__${col.name}"`);
-        const joinedSelects = await Promise.all(joinArray.map(async (join) => {
-            if (blacklist.includes(join.fromTable))
+        const innerSelects = joinArray.map((join) => {
+            const alias = join.name || join.fromTable;
+            if (blacklist.includes(join.fromTable) || blacklist.includes(alias))
                 return "";
             const cols = this.tableColumnsCache.get(join.fromTable) || [];
             return cols
-                .map(col => `"${join.fromTable}"."${col.name}" AS "${join.fromTable}__${col.name}"`)
+                .map(col => `"${alias}"."${col.name}" AS "${alias}__${col.name}"`)
                 .filter(col => col.trim() !== "");
-        }));
-        return [...mainSelect, ...joinedSelects.flat()].filter(s => s !== "").filter(Boolean);
+        });
+        return [...mainSelect, ...innerSelects.flat()].filter(s => s !== "").filter(Boolean);
     }
-    buildJoinPart() {
+    buildSqlJoinPart() {
         const joinArray = Array.isArray(this.joins) ? this.joins : [this.joins];
         return joinArray.map(join => {
             const baseTable = join.baseTable || this.fromTableName;
             const onConditions = Array.isArray(join.on) ? join.on : [join.on];
+            const alias = join.name || join.fromTable;
             const onClause = onConditions.map(part => {
                 const targetCol = Object.keys(part)[0];
                 const sourceCol = Object.values(part)[0];
-                return `${baseTable}.${sourceCol} = ${join.fromTable}.${targetCol}`;
+                return `${baseTable}.${sourceCol} = ${alias}.${targetCol}`;
             }).join(" AND ");
-            return `${join.joinType} JOIN "${join.fromTable}" ON ${onClause}`;
+            return `${join.joinType} JOIN "${join.fromTable}" AS "${alias}" ON ${onClause}`;
         });
     }
 }

package/dist/helpers/QueryBuilders/QueryDecorators/LimitDecorator.d.ts

@@ -1,7 +1,7 @@
-import IQueryBuilder from "../../../interfaces/IQueryBuilder.js";
-import QueryDecorator from "./QueryDecorator.js";
+import { IQueryBuilder } from "../../../interfaces/IQueryBuilder.js";
+import { QueryDecorator } from "./QueryDecorator.js";
 import { QueryContext } from "../../../types/query.js";
-export default class LimitDecorator extends QueryDecorator {
+export declare class LimitDecorator extends QueryDecorator {
     private limitCount;
     private offsetCount?;
     constructor(component: IQueryBuilder, limitCount: number, offsetCount?: number);

package/dist/helpers/QueryBuilders/QueryDecorators/LimitDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LimitDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/LimitDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAC9D,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,cAAc;IACtD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAC,CAAS;gBAEjB,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAMxE,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAYvC"}
+{"version":3,"file":"LimitDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/LimitDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,qBAAa,cAAe,SAAQ,cAAc;IAC9C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAC,CAAS;gBAEjB,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAMxE,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAYvC"}

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

@@ -1,5 +1,5 @@
-import QueryDecorator from "./QueryDecorator.js";
-export default class LimitDecorator extends QueryDecorator {
+import { QueryDecorator } from "./QueryDecorator.js";
+export class LimitDecorator extends QueryDecorator {
     constructor(component, limitCount, offsetCount) {
         super(component);
         this.limitCount = limitCount;

package/dist/helpers/QueryBuilders/QueryDecorators/OrderByDecorator.d.ts

@@ -1,7 +1,7 @@
-import IQueryBuilder from "../../../interfaces/IQueryBuilder.js";
-import QueryDecorator from "./QueryDecorator.js";
+import { IQueryBuilder } from "../../../interfaces/IQueryBuilder.js";
+import { QueryDecorator } from "./QueryDecorator.js";
 import { OrderByDefinition, QueryContext } from "../../../types/query.js";
-export default class OrderByDecorator extends QueryDecorator {
+export declare class OrderByDecorator extends QueryDecorator {
     private orderByColumns?;
     constructor(component: IQueryBuilder, orderByColumns?: OrderByDefinition[]);
     build(): Promise<QueryContext>;

package/dist/helpers/QueryBuilders/QueryDecorators/OrderByDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OrderByDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/OrderByDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAC9D,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEvE,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IACxD,OAAO,CAAC,cAAc,CAAC,CAAsB;gBAEjC,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,iBAAiB,EAAE;IAKpE,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CASvC"}
+{"version":3,"file":"OrderByDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/OrderByDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEvE,qBAAa,gBAAiB,SAAQ,cAAc;IAChD,OAAO,CAAC,cAAc,CAAC,CAAsB;gBAEjC,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,iBAAiB,EAAE;IAKpE,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CASvC"}

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

@@ -1,5 +1,5 @@
-import QueryDecorator from "./QueryDecorator.js";
-export default class OrderByDecorator extends QueryDecorator {
+import { QueryDecorator } from "./QueryDecorator.js";
+export class OrderByDecorator extends QueryDecorator {
     constructor(component, orderByColumns) {
         super(component);
         this.orderByColumns = orderByColumns;

package/dist/helpers/QueryBuilders/QueryDecorators/QueryDecorator.d.ts

@@ -1,6 +1,6 @@
-import IQueryBuilder from "../../../interfaces/IQueryBuilder";
+import { IQueryBuilder } from "../../../interfaces/IQueryBuilder";
 import { QueryContext } from "../../../types/query";
-export default abstract class QueryDecorator implements IQueryBuilder {
+export declare abstract class QueryDecorator implements IQueryBuilder {
     protected component: IQueryBuilder;
     constructor(component: IQueryBuilder);
     abstract build(): Promise<QueryContext>;

package/dist/helpers/QueryBuilders/QueryDecorators/QueryDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/QueryDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,cAAe,YAAW,aAAa;IACjE,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC;gBAEvB,SAAS,EAAE,aAAa;IAIpC,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAC1C"}
+{"version":3,"file":"QueryDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/QueryDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,8BAAsB,cAAe,YAAW,aAAa;IACzD,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC;gBAEvB,SAAS,EAAE,aAAa;IAIpC,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAC1C"}

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

@@ -1,4 +1,4 @@
-export default class QueryDecorator {
+export class QueryDecorator {
     constructor(component) {
         this.component = component;
     }

package/dist/helpers/QueryBuilders/QueryDecorators/WhereDecorator.d.ts

@@ -1,9 +1,9 @@
-import IQueryBuilder from "../../../interfaces/IQueryBuilder.js";
-import { QueryContext, QueryWhereCondition } from "../../../types/query.js";
-import QueryDecorator from "./QueryDecorator.js";
-export default class WhereDecorator extends QueryDecorator {
+import { IQueryBuilder } from '../../../interfaces/IQueryBuilder.js';
+import { QueryContext, QueryComparisonParameters } from '../../../types/query.js';
+import { QueryDecorator } from './QueryDecorator.js';
+export declare class WhereDecorator extends QueryDecorator {
     private conditions;
-    constructor(component: IQueryBuilder, conditions: QueryWhereCondition);
+    constructor(component: IQueryBuilder, conditions: QueryComparisonParameters[]);
     build(): Promise<QueryContext>;
 }
 //# sourceMappingURL=WhereDecorator.d.ts.map

package/dist/helpers/QueryBuilders/QueryDecorators/WhereDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhereDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/WhereDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,cAAc;IACtD,OAAO,CAAC,UAAU,CAAsB;gBAGpC,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,mBAAmB;IAM7B,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAUvC"}
+{"version":3,"file":"WhereDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/WhereDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,cAAe,SAAQ,cAAc;IAChD,OAAO,CAAC,UAAU,CAA8B;gBAG9C,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,yBAAyB,EAAE;IAMnC,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAUrC"}

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

@@ -1,6 +1,5 @@
-import QueryDecorator from "./QueryDecorator.js";
-import QueryStatementBuilder from "../QueryStatementBuilder.js";
-export default class WhereDecorator extends QueryDecorator {
+import { QueryDecorator } from './QueryDecorator.js';
+export class WhereDecorator extends QueryDecorator {
     constructor(component, conditions) {
         super(component);
         this.conditions = conditions;
@@ -9,7 +8,7 @@ export default class WhereDecorator extends QueryDecorator {
         var _a, _b;
         var _c;
         const context = await this.component.build();
-        const combinedConditions = [...QueryStatementBuilder.normalizeQueryConditions(this.conditions)];
+        const combinedConditions = [...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);

package/dist/helpers/QueryBuilders/QueryExpressionBuilder.d.ts

@@ -21,7 +21,7 @@ import { PossibleExpressions, ExpressionBuilderFunction, expressionClause } from
  * Its ONLY job is to translate abstract expressions
  * into structured SQL fragments with metadata.
  */
-export default class QueryExpressionBuilder {
+export declare class QueryExpressionBuilder {
     /**
      * Registry mapping expression "type" → builder function.
      *
@@ -31,8 +31,6 @@ export default class QueryExpressionBuilder {
      * - no touching core logic to add new expressions
      */
     private static expressionBuilders;
-    private static expressionDefaults;
-    static getExpressionDefaultRequirements(type: string): PossibleExpressions['requirements'] | undefined;
     /**
      * Registers a new expression builder at runtime.
      *

package/dist/helpers/QueryBuilders/QueryExpressionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryExpressionBuilder.d.ts","sourceRoot":"","sources":["../../../src/helpers/QueryBuilders/QueryExpressionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EAEnB,yBAAyB,EACzB,gBAAgB,EAGnB,MAAM,sBAAsB,CAAC;AAM9B;;;;;;;;;;GAUG;AAEH;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IAEvC;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB,CA0B9B;IAEH,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAa9B;WAEW,gCAAgC,CAC1C,IAAI,EAAE,MAAM,GACb,mBAAmB,CAAC,cAAc,CAAC,GAAG,SAAS;IAIlD;;;;;;;;OAQG;WACW,yBAAyB,CAAC,CAAC,SAAS,mBAAmB,EACjE,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,yBAAyB,CAAC,CAAC,CAAC,GACtC,IAAI;IAIP;;;;;OAKG;WACW,oBAAoB,CAC9B,WAAW,EAAE,mBAAmB,EAAE,GACnC,gBAAgB,EAAE;CAexB"}
+{"version":3,"file":"QueryExpressionBuilder.d.ts","sourceRoot":"","sources":["../../../src/helpers/QueryBuilders/QueryExpressionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EAEnB,yBAAyB,EACzB,gBAAgB,EAGnB,MAAM,sBAAsB,CAAC;AAM9B;;;;;;;;;;GAUG;AAEH;;;;;;;;;;GAUG;AACH,qBAAa,sBAAsB;IAE/B;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB,CA0B9B;IAEH;;;;;;;;OAQG;WACW,yBAAyB,CAAC,CAAC,SAAS,mBAAmB,EACjE,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,yBAAyB,CAAC,CAAC,CAAC,GACtC,IAAI;IAIP;;;;;OAKG;WACW,oBAAoB,CAC9B,WAAW,EAAE,mBAAmB,EAAE,GACnC,gBAAgB,EAAE;CAexB"}

package/dist/helpers/QueryBuilders/QueryExpressionBuilder.js

@@ -1,7 +1,7 @@
-import SpatialDistanceExpression from "./ExpressionBuilders/SpatialDistanceExpression.js";
+import { SpatialDistanceExpression } from "./ExpressionBuilders/SpatialDistanceExpression.js";
 import { UnknownExpressionTypeError } from "../Errors/ExpressionErrors/UnknownExpressionTypeError.js";
-import TextRelevanceExpression from "./ExpressionBuilders/TextRelevanceExpression.js";
-import JsonAggregateExpression from "./ExpressionBuilders/JsonAggregateExpression.js";
+import { TextRelevanceExpression } from "./ExpressionBuilders/TextRelevanceExpression.js";
+import { JsonAggregateExpression } from "./ExpressionBuilders/JsonAggregateExpression.js";
 /**
  * A normalized, intermediate representation of a query expression.
  *
@@ -24,10 +24,7 @@ import JsonAggregateExpression from "./ExpressionBuilders/JsonAggregateExpressio
  * Its ONLY job is to translate abstract expressions
  * into structured SQL fragments with metadata.
  */
-class QueryExpressionBuilder {
-    static getExpressionDefaultRequirements(type) {
-        return this.expressionDefaults.get(type);
-    }
+export class QueryExpressionBuilder {
     /**
      * Registers a new expression builder at runtime.
      *
@@ -85,18 +82,3 @@ QueryExpressionBuilder.expressionBuilders = new Map([
     // ['jsonAggregation', (expr) => QueryExpressionBuilder.BuildJsonAggregation(expr)]
     // ['windowFunction', (expr) => QueryExpressionBuilder.BuildWindowFunction(expr)]
 ]);
-QueryExpressionBuilder.expressionDefaults = new Map([
-    [
-        'spatialDistance',
-        new SpatialDistanceExpression().defaultRequirements
-    ],
-    [
-        'textRelevance',
-        new TextRelevanceExpression().defaultRequirements
-    ],
-    [
-        'jsonAggregate',
-        new JsonAggregateExpression().defaultRequirements
-    ]
-]);
-export default QueryExpressionBuilder;

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

@@ -1,5 +1,5 @@
-import { QueryWhereCondition, QueryComparisonParameters, QueryLayers, TableColumnInfo } from "../../types/index.js";
-export default class QueryStatementBuilder {
+import { QueryComparisonParameters, QueryLayers, TableColumnInfo } from '../../types/index.js';
+export declare class QueryStatementBuilder {
     private _layers;
     private _contexts;
     private _tableColumnsCache;
@@ -9,8 +9,7 @@ export default class QueryStatementBuilder {
     private buildBaseLayer;
     private buildPrettyLayer;
     private buildFinalLayer;
-    static normalizeAndQualifyConditions(where: QueryWhereCondition, tableName: string, normalizeBlacklist?: string[], valueClauseKeywords?: Set<string>): QueryComparisonParameters[];
-    static normalizeQueryConditions(where: QueryWhereCondition): QueryComparisonParameters[];
+    static normalizeAndQualifyConditions(where: QueryComparisonParameters[], tableName: string, normalizeBlacklist?: string[], valueClauseKeywords?: Set<string>): QueryComparisonParameters[];
     private addUnique;
 }
 //# sourceMappingURL=QueryStatementBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"QueryStatementBuilder.d.ts","sourceRoot":"","sources":["../../../src/helpers/QueryBuilders/QueryStatementBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,yBAAyB,EACzB,WAAW,EAEX,eAAe,EAClB,MAAM,sBAAsB,CAAC;AAY9B,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACtC,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,SAAS,CAIV;IAEP,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,oBAAoB,CAA0B;gBAE1C,WAAW,EAAE,WAAW,EAAE,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAQhF,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;YAcvB,cAAc;YA+Cd,gBAAgB;YAgDhB,eAAe;WAiBf,6BAA6B,CACvC,KAAK,EAAE,mBAAmB,EAC1B,SAAS,EAAE,MAAM,EACjB,kBAAkB,GAAE,MAAM,EAAO,EACjC,mBAAmB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC7C,yBAAyB,EAAE;WAqBhB,wBAAwB,CAClC,KAAK,EAAE,mBAAmB,GAC3B,yBAAyB,EAAE;IAa9B,OAAO,CAAC,SAAS;CAWpB"}
+{"version":3,"file":"QueryStatementBuilder.d.ts","sourceRoot":"","sources":["../../../src/helpers/QueryBuilders/QueryStatementBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,WAAW,EAEX,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAa9B,qBAAa,qBAAqB;IAChC,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,SAAS,CAIV;IAEP,OAAO,CAAC,kBAAkB,CAA6C;IACvE,OAAO,CAAC,oBAAoB,CAA0B;gBAGpD,WAAW,EAAE,WAAW,EACxB,sBAAsB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAS5C,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;YAcvB,cAAc;YA6Gd,gBAAgB;YAsFhB,eAAe;WAwBf,6BAA6B,CACzC,KAAK,EAAE,yBAAyB,EAAE,EAClC,SAAS,EAAE,MAAM,EACjB,kBAAkB,GAAE,MAAM,EAAO,EACjC,mBAAmB,GAAE,GAAG,CAAC,MAAM,CAAa,GAC3C,yBAAyB,EAAE;IAyB9B,OAAO,CAAC,SAAS;CAWlB"}

package/dist/helpers/QueryBuilders/QueryStatementBuilder.js

@@ -1,13 +1,14 @@
-import BaseSelectQueryBuilder from "./BaseQueryBuilders/BaseSelectQueryBuilder.js";
-import ExpressionDecorator from "./QueryDecorators/ExpressionDecorator.js";
-import QueryExpressionBuilder from "./QueryExpressionBuilder.js";
-import WhereDecorator from "./QueryDecorators/WhereDecorator.js";
-import JoinDecorator from "./QueryDecorators/JoinDecorator.js";
-import GroupByDecorator from "./QueryDecorators/GroupByDecorator.js";
-import OrderByDecorator from "./QueryDecorators/OrderByDecorator.js";
-import LimitDecorator from "./QueryDecorators/LimitDecorator.js";
-import SqlRenderer from "./SqlRenderer.js";
-export default class QueryStatementBuilder {
+import { BaseSelectQueryBuilder } from './BaseQueryBuilders/BaseSelectQueryBuilder.js';
+import { ExpressionDecorator } from './QueryDecorators/ExpressionDecorator.js';
+import { QueryExpressionBuilder } from './QueryExpressionBuilder.js';
+import { WhereDecorator } from './QueryDecorators/WhereDecorator.js';
+import { JoinDecorator } from './QueryDecorators/JoinDecorator.js';
+import { GroupByDecorator } from './QueryDecorators/GroupByDecorator.js';
+import { OrderByDecorator } from './QueryDecorators/OrderByDecorator.js';
+import { LimitDecorator } from './QueryDecorators/LimitDecorator.js';
+import { SqlGenerator } from './SqlGenerator.js';
+import { InvalidOperationError } from '../../helpers/Errors/ModelErrors/InvalidOperationError.js';
+export class QueryStatementBuilder {
     constructor(queryLayers, tableColumnInformation) {
         this._contexts = {};
         this._tableColumnsCache = new Map();
@@ -31,45 +32,66 @@ export default class QueryStatementBuilder {
         var _a, _b, _c;
         var _d, _e;
         if (!this._layers.base.from) {
-            throw new Error("Base layer must specify 'from' table name.");
+            throw new InvalidOperationError("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);
+            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) {
+        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]);
+                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);
+                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);
             }
             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);
+                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.base.where) {
-            builder = new WhereDecorator(builder, this._layers.base.joins ? QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.base.where, this._layers.base.from) : 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);
+            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);
+        const renderer = new SqlGenerator(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())) || []);
+        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)
@@ -81,24 +103,27 @@ export default class QueryStatementBuilder {
                     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);
+                    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));
+                    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));
+                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"));
+                builder = new WhereDecorator(builder, QueryStatementBuilder.normalizeAndQualifyConditions(this._layers.pretty.having, 'BASE_QUERY'));
             }
         }
         this._contexts.pretty = await builder.build();
-        const renderer = new SqlRenderer(this._contexts.pretty);
+        const renderer = new SqlGenerator(this._contexts.pretty);
         return renderer.build();
     }
     async buildFinalLayer(sql) {
@@ -113,14 +138,15 @@ export default class QueryStatementBuilder {
             }
         }
         this._contexts.final = await builder.build();
-        const renderer = new SqlRenderer(this._contexts.final);
+        const renderer = new SqlGenerator(this._contexts.final);
         return renderer.build();
     }
     static normalizeAndQualifyConditions(where, tableName, normalizeBlacklist = [], valueClauseKeywords = new Set()) {
-        const conditions = this.normalizeQueryConditions(where);
-        return conditions.map((condition) => {
+        const normalizedWhere = where;
+        return normalizedWhere
+            .map((condition) => {
             const shouldSkipQualification = normalizeBlacklist.some((blk) => condition.column.includes(blk)) ||
-                condition.column.includes(".");
+                condition.column.includes('.');
             const isValueClauseKeyword = valueClauseKeywords.has(condition.column);
             if (isValueClauseKeyword) {
                 return;
@@ -131,31 +157,19 @@ export default class QueryStatementBuilder {
                     ? condition.column
                     : `${tableName}.${condition.column}`,
             };
-        }).filter(cond => cond !== undefined);
-    }
-    static normalizeQueryConditions(where) {
-        if (Array.isArray(where)) {
-            return where;
-        }
-        else {
-            return Object.entries(where).map(([column, value]) => ({
-                column,
-                operator: "=",
-                value,
-            }));
-        }
+        })
+            .filter((cond) => cond !== undefined);
     }
     // Copilot moment maybe refactor this later
     addUnique(target, values) {
         if (!(values === null || values === void 0 ? void 0 : values.length))
             return target !== null && target !== void 0 ? target : [];
-        const set = new Set((target !== null && target !== void 0 ? target : []).map(v => JSON.stringify(v)));
+        const set = new Set((target !== null && target !== void 0 ? target : []).map((v) => JSON.stringify(v)));
         for (const v of values) {
             const key = JSON.stringify(v);
             if (!set.has(key))
                 set.add(key);
         }
-        return Array.from(set).map(s => JSON.parse(s));
+        return Array.from(set).map((s) => JSON.parse(s));
     }
-    ;
 }

package/dist/helpers/QueryBuilders/{SqlRenderer.d.ts → SqlGenerator.d.ts}

@@ -1,5 +1,5 @@
-import { QueryContext } from "../../types/query.js";
-export default class SqlRenderer {
+import { QueryContext } from '../../types/query.js';
+export declare class SqlGenerator {
     private _context;
     constructor(context: QueryContext);
     build(): string;
@@ -12,4 +12,4 @@ export default class SqlRenderer {
     private renderLimit;
     private renderOffset;
 }
-//# sourceMappingURL=SqlRenderer.d.ts.map
+//# sourceMappingURL=SqlGenerator.d.ts.map

package/dist/helpers/QueryBuilders/SqlGenerator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SqlGenerator.d.ts","sourceRoot":"","sources":["../../../src/helpers/QueryBuilders/SqlGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAG/E,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAe;gBAEnB,OAAO,EAAE,YAAY;IAI1B,KAAK,IAAI,MAAM;IAgBtB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,YAAY;CAOvB"}

package/dist/helpers/QueryBuilders/{SqlRenderer.js → SqlGenerator.js}

@@ -1,4 +1,5 @@
-export default class SqlRenderer {
+import { InvalidWhereConditionError } from '../Errors/QueryErrors/InvalidWhereConditionError.js';
+export class SqlGenerator {
     constructor(context) {
         this._context = context;
     }
@@ -7,34 +8,42 @@ export default class SqlRenderer {
         return [
             this.renderSelect(),
             this.renderFrom(),
-            (_a = this._context.joins) === null || _a === void 0 ? void 0 : _a.join(" "),
+            (_a = this._context.joins) === null || _a === void 0 ? void 0 : _a.join(' '),
             this.renderWhere(),
             this.renderGroupBy(),
             this.renderOrderBy(),
             this.renderLimit(),
-            this.renderOffset()
-        ].map(e => e === null || e === void 0 ? void 0 : e.trim()).filter(e => e !== "").join(" ");
+            this.renderOffset(),
+        ]
+            .map((e) => e === null || e === void 0 ? void 0 : e.trim())
+            .filter((e) => e !== '')
+            .join(' ');
     }
     renderSelect() {
         const selects = [];
         if (this._context.select && this._context.select.length > 0) {
             selects.push(...this._context.select);
         }
-        else if (!this._context.joinsSelect || this._context.joinsSelect.length === 0) {
+        else if (!this._context.joinsSelect ||
+            this._context.joinsSelect.length === 0) {
             selects.push('*');
         }
         selects.push(...(this._context.joinsSelect || []));
         selects.push(...(this._context.expressionSelect || []));
-        return selects.length > 0 ? `SELECT ${selects.join(", ")}` : "SELECT *";
+        return selects.length > 0 ? `SELECT ${selects.join(', ')}` : 'SELECT *';
     }
     renderFrom() {
-        return this._context.from ? `FROM ${this._context.from}` : "";
+        return this._context.from ? `FROM ${this._context.from}` : '';
     }
     renderWhere() {
-        var _a;
-        if (!((_a = this._context.conditions) === null || _a === void 0 ? void 0 : _a.where) ||
+        var _a, _b;
+        if (((_a = this._context.conditions) === null || _a === void 0 ? void 0 : _a.where) &&
+            this._context.conditions.where instanceof Date) {
+            throw new InvalidWhereConditionError('Date objects are not supported in WHERE conditions.');
+        }
+        if (!((_b = this._context.conditions) === null || _b === void 0 ? void 0 : _b.where) ||
             Object.keys(this._context.conditions.where).length === 0) {
-            return "";
+            return '';
         }
         return `WHERE ${this.buildWhereWithOperators(this._context.conditions.where)}`;
     }
@@ -42,36 +51,38 @@ export default class SqlRenderer {
         return where
             .map((condition) => {
             const colName = condition.column.trim();
-            const paramName = colName.includes(".") ? colName.split(".")[1].trim() : colName;
+            const paramName = colName.includes('.')
+                ? colName.split('.')[1].trim()
+                : colName;
             return `${colName} ${condition.operator} @${paramName}`;
         })
             .filter(Boolean)
-            .join(" AND ");
+            .join(' AND ');
     }
     renderOrderBy() {
         if (!this._context.orderBy || this._context.orderBy.length === 0) {
-            return "";
+            return '';
         }
-        const orderByClauses = this._context.orderBy.map(ob => {
+        const orderByClauses = this._context.orderBy.map((ob) => {
             return `${ob.column} ${ob.direction}`;
         });
-        return `ORDER BY ${orderByClauses.join(", ")}`;
+        return `ORDER BY ${orderByClauses.join(', ')}`;
     }
     renderGroupBy() {
         if (!this._context.groupBy || this._context.groupBy.length === 0) {
-            return "";
+            return '';
         }
-        return `GROUP BY ${this._context.groupBy.join(", ")}`;
+        return `GROUP BY ${this._context.groupBy.join(', ')}`;
     }
     renderLimit() {
         if (!this._context.limit) {
-            return "";
+            return '';
         }
         return `LIMIT ${this._context.limit}`;
     }
     renderOffset() {
         if (!this._context.offset) {
-            return "";
+            return '';
         }
         return `OFFSET ${this._context.offset}`;
     }