@iamkirbki/database-handler-core 4.4.6 → 4.4.8

package/dist/helpers/Errors/QueryErrors/InvalidWhereConditionError.js

@@ -0,0 +1,6 @@
+import { DatabaseHandlerError } from '../DatabaseHandlerError.js';
+export class InvalidWhereConditionError extends DatabaseHandlerError {
+    constructor(message = 'Invalid WHERE condition encountered.') {
+        super(message, { code: 'INVALID_WHERE_CONDITION_ERROR' });
+    }
+}

package/dist/helpers/Errors/QueryErrors/QueryExecutionError.d.ts

@@ -0,0 +1,5 @@
+import { DatabaseHandlerError } from "../DatabaseHandlerError.js";
+export declare class QueryExecutionError extends DatabaseHandlerError {
+    constructor(query: string, cause?: unknown);
+}
+//# sourceMappingURL=QueryExecutionError.d.ts.map

package/dist/helpers/Errors/QueryErrors/QueryExecutionError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryExecutionError.d.ts","sourceRoot":"","sources":["../../../../src/helpers/Errors/QueryErrors/QueryExecutionError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,mBAAoB,SAAQ,oBAAoB;gBAC7C,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO;CAG7C"}

package/dist/helpers/Errors/QueryErrors/QueryExecutionError.js

@@ -0,0 +1,6 @@
+import { DatabaseHandlerError } from "../DatabaseHandlerError.js";
+export class QueryExecutionError extends DatabaseHandlerError {
+    constructor(query, cause) {
+        super(`Query failed to execute: ${query}`, { cause: cause, code: 'QUERY_EXECUTION_ERROR' });
+    }
+}

package/dist/helpers/Errors/QueryErrors/UnexpectedEmptyQueryError.d.ts

@@ -1,4 +1,5 @@
-export default class UnexpectedEmptyQueryError extends Error {
+import { DatabaseHandlerError } from "../DatabaseHandlerError.js";
+export declare class UnexpectedEmptyQueryError extends DatabaseHandlerError {
     constructor();
 }
 //# sourceMappingURL=UnexpectedEmptyQueryError.d.ts.map

package/dist/helpers/Errors/QueryErrors/UnexpectedEmptyQueryError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnexpectedEmptyQueryError.d.ts","sourceRoot":"","sources":["../../../../src/helpers/Errors/QueryErrors/UnexpectedEmptyQueryError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,KAAK;;CAK3D"}
+{"version":3,"file":"UnexpectedEmptyQueryError.d.ts","sourceRoot":"","sources":["../../../../src/helpers/Errors/QueryErrors/UnexpectedEmptyQueryError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,yBAA0B,SAAQ,oBAAoB;;CAIlE"}

package/dist/helpers/Errors/QueryErrors/UnexpectedEmptyQueryError.js

@@ -1,6 +1,6 @@
-export default class UnexpectedEmptyQueryError extends Error {
+import { DatabaseHandlerError } from "../DatabaseHandlerError.js";
+export class UnexpectedEmptyQueryError extends DatabaseHandlerError {
     constructor() {
-        super(`The query is unexpectedly empty. Please ensure that the query is properly constructed and contains valid clauses.`);
-        this.name = "UnexpectedEmptyQueryError";
+        super(`The query is unexpectedly empty. Please ensure that the query is properly constructed and contains valid clauses.`, { code: 'UNEXPECTED_EMPTY_QUERY' });
     }
 }

package/dist/helpers/Errors/TableErrors/UnknownTableError.d.ts

@@ -1,4 +1,5 @@
-export default class UnknownTableError extends Error {
-    constructor(tableName: string);
+import { DatabaseHandlerError } from "../DatabaseHandlerError.js";
+export declare class UnknownTableError extends DatabaseHandlerError {
+    constructor(tableName: string, message?: string);
 }
 //# sourceMappingURL=UnknownTableError.d.ts.map

package/dist/helpers/Errors/TableErrors/UnknownTableError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnknownTableError.d.ts","sourceRoot":"","sources":["../../../../src/helpers/Errors/TableErrors/UnknownTableError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,KAAK;gBACpC,SAAS,EAAE,MAAM;CAIhC"}
+{"version":3,"file":"UnknownTableError.d.ts","sourceRoot":"","sources":["../../../../src/helpers/Errors/TableErrors/UnknownTableError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC3C,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;CAGlD"}

package/dist/helpers/Errors/TableErrors/UnknownTableError.js

@@ -1,6 +1,6 @@
-export default class UnknownTableError extends Error {
-    constructor(tableName) {
-        super(`Unknown table: ${tableName}`);
-        this.name = "UnknownTableError";
+import { DatabaseHandlerError } from "../DatabaseHandlerError.js";
+export class UnknownTableError extends DatabaseHandlerError {
+    constructor(tableName, message) {
+        super(`Unknown table: ${tableName}${message ? `. ${message}` : ''}`, { code: 'UNKNOWN_TABLE' });
     }
 }

package/dist/helpers/QueryBuilders/BaseQueryBuilders/BaseSelectQueryBuilder.d.ts

@@ -1,6 +1,6 @@
+import { IQueryBuilder } from "../../../interfaces/IQueryBuilder.js";
 import { QueryContext } from "../../../index";
-import IQueryBuilder from "../../../interfaces/IQueryBuilder.js";
-export default class BaseSelectQueryBuilder implements IQueryBuilder {
+export declare class BaseSelectQueryBuilder implements IQueryBuilder {
     private tableName;
     private select;
     private joinsSelect?;

package/dist/helpers/QueryBuilders/BaseQueryBuilders/BaseSelectQueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseSelectQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/BaseQueryBuilders/BaseSelectQueryBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,sBAAuB,YAAW,aAAa;IAChE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAC,CAAW;IAC/B,OAAO,CAAC,iBAAiB,CAAC,CAAW;gBAEzB,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE;IAO/F,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAQvC"}
+{"version":3,"file":"BaseSelectQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/BaseQueryBuilders/BaseSelectQueryBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,qBAAa,sBAAuB,YAAW,aAAa;IACxD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAC,CAAW;IAC/B,OAAO,CAAC,iBAAiB,CAAC,CAAW;gBAEzB,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE;IAO/F,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAQvC"}

package/dist/helpers/QueryBuilders/BaseQueryBuilders/BaseSelectQueryBuilder.js

@@ -1,4 +1,4 @@
-export default class BaseSelectQueryBuilder {
+export class BaseSelectQueryBuilder {
     constructor(tableName, select, joinsSelect, expressionsSelect) {
         this.tableName = tableName;
         this.select = select;

package/dist/helpers/QueryBuilders/ExpressionBuilders/JsonAggregateExpression.d.ts

@@ -1,9 +1,8 @@
-import { expressionClause, JsonAggregateQueryExpression } from "../../../index.js";
-import IExpressionBuilder from "../../../interfaces/IExpressionBuilder.js";
-export default class JsonAggregateExpression implements IExpressionBuilder {
+import { expressionClause, JsonAggregateQueryExpression } from '../../../types/index.js';
+import { IExpressionBuilder } from '../../../interfaces/IExpressionBuilder.js';
+export declare class JsonAggregateExpression implements IExpressionBuilder {
     build(expression: JsonAggregateQueryExpression): expressionClause;
     private buildJsonBuildObject;
     validate(expression: JsonAggregateQueryExpression): boolean;
-    get defaultRequirements(): JsonAggregateQueryExpression['requirements'];
 }
 //# sourceMappingURL=JsonAggregateExpression.d.ts.map

package/dist/helpers/QueryBuilders/ExpressionBuilders/JsonAggregateExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JsonAggregateExpression.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/ExpressionBuilders/JsonAggregateExpression.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAwE,MAAM,gBAAgB,CAAC;AACtJ,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AAUxE,MAAM,CAAC,OAAO,OAAO,uBAAwB,YAAW,kBAAkB;IACtE,KAAK,CAAC,UAAU,EAAE,4BAA4B,GAAG,gBAAgB;IA8BjE,OAAO,CAAC,oBAAoB;IAqE5B,QAAQ,CAAC,UAAU,EAAE,4BAA4B,GAAG,OAAO;IAa3D,IAAI,mBAAmB,IAAI,4BAA4B,CAAC,cAAc,CAAC,CAOtE;CACJ"}
+{"version":3,"file":"JsonAggregateExpression.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/ExpressionBuilders/JsonAggregateExpression.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAG7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAS5E,qBAAa,uBAAwB,YAAW,kBAAkB;IAChE,KAAK,CAAC,UAAU,EAAE,4BAA4B,GAAG,gBAAgB;IAgCjE,OAAO,CAAC,oBAAoB;IAgG5B,QAAQ,CAAC,UAAU,EAAE,4BAA4B,GAAG,OAAO;CAY5D"}

package/dist/helpers/QueryBuilders/ExpressionBuilders/JsonAggregateExpression.js

@@ -1,11 +1,9 @@
-import InvalidExpressionParametersError from "../../../helpers/Errors/ExpressionErrors/InvalidExpressionParametersError.js";
-import { QueryEvaluationPhase } from "../../../index.js";
-import QueryExpressionBuilder from "../QueryExpressionBuilder.js";
-import QueryStatementBuilder from "../QueryStatementBuilder.js";
-export default class JsonAggregateExpression {
+import { InvalidExpressionParametersError } from '../../../helpers/Errors/ExpressionErrors/InvalidExpressionParametersError.js';
+import { QueryExpressionBuilder } from '../QueryExpressionBuilder.js';
+export class JsonAggregateExpression {
     build(expression) {
         if (!this.validate(expression)) {
-            throw new InvalidExpressionParametersError("Invalid JSON aggregate expression parameters.");
+            throw new InvalidExpressionParametersError('Invalid JSON aggregate expression parameters.');
         }
         const jsonBuildObjects = this.buildJsonBuildObject(expression);
         const baseExpressionClause = `JSON_AGG(
@@ -13,55 +11,66 @@ export default class JsonAggregateExpression {
         ) AS ${expression.parameters.alias}`;
         const groupByClause = expression.parameters.groupByColumns.length > 0
             ? expression.parameters.groupByColumns
-                .map(col => col.includes(".") ? `"${col.replace(".", "__")}"` : `"${col}"`)
-                .join(", ")
+                .map((col) => col.includes('.') ? `"${col.replace('.', '__')}"` : `"${col}"`)
+                .join(', ')
             : undefined;
         return {
             baseExpressionClause,
-            phase: expression.requirements.phase,
-            requiresWrapping: expression.requirements.requiresSelectWrapping || false,
             groupByClause,
             whereClause: jsonBuildObjects.whereClause,
             valueClauseKeywords: jsonBuildObjects.valueClauseKeywords,
-            havingClause: expression.parameters.having
+            havingClause: expression.parameters.having,
         };
     }
     buildJsonBuildObject(expression) {
         var _a, _b;
         const columnPart = expression.parameters.columns
-            .map(col => `'${col}', "${expression.parameters.table}_${col}"`)
-            .join(",\n  ");
+            .map((col) => `'${col}', "${expression.parameters.table}_${col}"`)
+            .join(',\n  ');
         const computedPart = ((_a = expression.parameters.computed) === null || _a === void 0 ? void 0 : _a.length)
-            ? expression.parameters.computed
-                .map(comp => {
+            ? expression.parameters.computed.map((comp) => {
                 var _a;
-                const valueClauseKeywords = [`${comp.parameters.alias}_lat`, `${comp.parameters.alias}_lon`];
+                const valueClauseKeywords = {
+                    lat: `${comp.parameters.alias}_lat`,
+                    lon: `${comp.parameters.alias}_lon`,
+                };
                 const expr = {
                     type: comp.type,
                     parameters: {
                         ...comp.parameters,
-                        valueClauseKeywords: comp.type === 'spatialDistance' ? valueClauseKeywords : comp.parameters.valueClauseKeywords,
-                        isComputed: true
+                        valueClauseKeywords: comp.type === 'spatialDistance'
+                            ? valueClauseKeywords
+                            : comp.parameters.valueClauseKeywords,
+                        isComputed: true,
                     },
-                    requirements: QueryExpressionBuilder.getExpressionDefaultRequirements(comp.type)
                 };
-                const builder = QueryExpressionBuilder.buildExpressionsPart([expr])[0];
+                const builder = QueryExpressionBuilder.buildExpressionsPart([
+                    expr,
+                ])[0];
+                const prefixedKeywords = {};
+                if (builder.valueClauseKeywords) {
+                    for (const [key, value] of Object.entries(builder.valueClauseKeywords)) {
+                        prefixedKeywords[`${comp.parameters.alias}_${key}`] = value;
+                    }
+                }
                 return {
-                    sql: `'${comp.parameters.alias}', ${(_a = builder.baseExpressionClause) === null || _a === void 0 ? void 0 : _a.split(" AS ")[0]}`,
+                    sql: `'${comp.parameters.alias}', ${(_a = builder.baseExpressionClause) === null || _a === void 0 ? void 0 : _a.split(' AS ')[0]}`,
                     whereClause: builder.whereClause,
-                    valueClauseKeywords: builder.valueClauseKeywords
+                    valueClauseKeywords: prefixedKeywords,
                 };
-            }) : [];
+            })
+            : [];
         const computedSqlPart = computedPart.length
-            ? computedPart.map(c => c.sql).join(",\n  ")
-            : "";
-        const whereClauses = computedPart
-            .flatMap(c => c.whereClause ? QueryStatementBuilder.normalizeQueryConditions(c.whereClause) : []);
-        const valueClauseKeywords = computedPart
-            .flatMap(c => c.valueClauseKeywords || []);
+            ? computedPart.map((c) => c.sql).join(',\n  ')
+            : '';
+        const whereClauses = computedPart.flatMap((c) => c.whereClause ? c.whereClause : []);
+        const valueClauseKeywords = computedPart.reduce((acc, c) => ({
+            ...acc,
+            ...(c.valueClauseKeywords || {}),
+        }), {});
         const nestedPart = ((_b = expression.parameters.nested) === null || _b === void 0 ? void 0 : _b.length)
             ? expression.parameters.nested
-                .map(n => {
+                .map((n) => {
                 return `'${n.alias}', ${this.buildJsonBuildObject({
                     type: 'jsonAggregate',
                     parameters: {
@@ -70,20 +79,21 @@ export default class JsonAggregateExpression {
                         columns: n.columns,
                         computed: n.computed,
                         nested: n.nested,
-                        groupByColumns: []
+                        groupByColumns: [],
                     },
-                    requirements: this.defaultRequirements
                 }).sql}`;
             })
-                .join(",\n  ")
-            : "";
-        const parts = [columnPart, computedSqlPart, nestedPart].filter(Boolean).join(",\n  ");
+                .join(',\n  ')
+            : '';
+        const parts = [columnPart, computedSqlPart, nestedPart]
+            .filter(Boolean)
+            .join(',\n  ');
         return {
             sql: `JSON_BUILD_OBJECT(
                 ${parts}
             )`,
             whereClause: whereClauses,
-            valueClauseKeywords: valueClauseKeywords
+            valueClauseKeywords: valueClauseKeywords,
         };
     }
     validate(expression) {
@@ -95,12 +105,4 @@ export default class JsonAggregateExpression {
             Array.isArray(expression.parameters.groupByColumns) &&
             typeof expression.parameters.alias === 'string');
     }
-    get defaultRequirements() {
-        return {
-            phase: QueryEvaluationPhase.PROJECTION,
-            cardinality: 'row',
-            requiresAlias: true,
-            requiresSelectWrapping: true
-        };
-    }
 }

package/dist/helpers/QueryBuilders/ExpressionBuilders/SpatialDistanceExpression.d.ts

@@ -1,8 +1,7 @@
-import IExpressionBuilder from "../../../interfaces/IExpressionBuilder.js";
-import { expressionClause, SpatialQueryExpression } from "../../../types/index.js";
-export default class SpatialDistanceExpression implements IExpressionBuilder {
+import { IExpressionBuilder } from '../../../interfaces/IExpressionBuilder.js';
+import { expressionClause, SpatialQueryExpression } from '../../../types/index.js';
+export declare class SpatialDistanceExpression implements IExpressionBuilder {
     build(expression: SpatialQueryExpression): expressionClause;
     validate(expression: SpatialQueryExpression): boolean;
-    get defaultRequirements(): SpatialQueryExpression['requirements'];
 }
 //# sourceMappingURL=SpatialDistanceExpression.d.ts.map

package/dist/helpers/QueryBuilders/ExpressionBuilders/SpatialDistanceExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpatialDistanceExpression.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/ExpressionBuilders/SpatialDistanceExpression.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAwB,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAGtG,MAAM,CAAC,OAAO,OAAO,yBAA0B,YAAW,kBAAkB;IACxE,KAAK,CAAC,UAAU,EAAE,sBAAsB,GAAG,gBAAgB;IAkD3D,QAAQ,CAAC,UAAU,EAAE,sBAAsB,GAAG,OAAO;IAcrD,IAAI,mBAAmB,IAAI,sBAAsB,CAAC,cAAc,CAAC,CAOhE;CACJ"}
+{"version":3,"file":"SpatialDistanceExpression.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/ExpressionBuilders/SpatialDistanceExpression.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EACL,gBAAgB,EAEhB,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,yBAA0B,YAAW,kBAAkB;IAClE,KAAK,CAAC,UAAU,EAAE,sBAAsB,GAAG,gBAAgB;IA2D3D,QAAQ,CAAC,UAAU,EAAE,sBAAsB,GAAG,OAAO;CAiBtD"}

package/dist/helpers/QueryBuilders/ExpressionBuilders/SpatialDistanceExpression.js

@@ -1,44 +1,50 @@
-import InvalidExpressionParametersError from "../../../helpers/Errors/ExpressionErrors/InvalidExpressionParametersError.js";
-import { QueryEvaluationPhase } from "../../../types/index.js";
-import QueryStatementBuilder from "../QueryStatementBuilder.js";
-export default class SpatialDistanceExpression {
+import { InvalidExpressionParametersError } from '../../../helpers/Errors/ExpressionErrors/InvalidExpressionParametersError.js';
+export class SpatialDistanceExpression {
     build(expression) {
         var _a;
         if (!this.validate(expression)) {
-            throw new InvalidExpressionParametersError("Invalid spatial distance expression parameters.");
+            throw new InvalidExpressionParametersError('Invalid spatial distance expression parameters.');
         }
         const earthRadius = (_a = expression.parameters.earthRadius) !== null && _a !== void 0 ? _a : (expression.parameters.unit === 'km' ? 6371 : 3959);
         const isComputed = expression.parameters.isComputed;
         const baseExpressionClause = `
             ${earthRadius} * acos(
-                cos(radians(@${expression.parameters.valueClauseKeywords[0]}))
-                * cos(radians(${isComputed ? expression.parameters.targetColumns.lat.replace(".", "_") : `${expression.parameters.targetColumns.lat}`}))
+                cos(radians(@${expression.parameters.valueClauseKeywords.lat}))
+                * cos(radians(${isComputed ? expression.parameters.targetColumns.lat.replace('.', '_') : `${expression.parameters.targetColumns.lat}`}))
                 * cos(
-                    radians(${isComputed ? expression.parameters.targetColumns.lon.replace(".", "_") : `${expression.parameters.targetColumns.lon}`})
-                    - radians(@${expression.parameters.valueClauseKeywords[1]})
+                    radians(${isComputed ? expression.parameters.targetColumns.lon.replace('.', '_') : `${expression.parameters.targetColumns.lon}`})
+                    - radians(@${expression.parameters.valueClauseKeywords.lon})
                 )
-                + sin(radians(@${expression.parameters.valueClauseKeywords[0]}))
-                * sin(radians(${isComputed ? expression.parameters.targetColumns.lat.replace(".", "_") : `${expression.parameters.targetColumns.lat}`}))
+                + sin(radians(@${expression.parameters.valueClauseKeywords.lat}))
+                * sin(radians(${isComputed ? expression.parameters.targetColumns.lat.replace('.', '_') : `${expression.parameters.targetColumns.lat}`}))
             ) AS ${expression.parameters.alias}
         `.trim();
         const orderByClause = {
             column: expression.parameters.alias,
-            direction: expression.parameters.orderByDistance || 'ASC'
+            direction: expression.parameters.orderByDistance || 'ASC',
         };
+        const whereClauses = [
+            ...(expression.parameters.where || []),
+        ];
+        if (expression.parameters.maxDistance !== undefined) {
+            whereClauses.push({
+                column: expression.parameters.alias,
+                operator: '<=',
+                value: expression.parameters.maxDistance,
+            });
+        }
+        if (expression.parameters.minDistance !== undefined) {
+            whereClauses.push({
+                column: expression.parameters.alias,
+                operator: '>=',
+                value: expression.parameters.minDistance,
+            });
+        }
         return {
             baseExpressionClause,
-            phase: expression.requirements.phase,
-            requiresWrapping: expression.requirements.requiresSelectWrapping || false,
-            whereClause: [
-                {
-                    column: expression.parameters.alias,
-                    operator: '<=',
-                    value: expression.parameters.maxDistance
-                },
-                ...QueryStatementBuilder.normalizeQueryConditions(expression.parameters.where || [])
-            ],
+            whereClause: whereClauses,
             valueClauseKeywords: expression.parameters.valueClauseKeywords,
-            orderByClause
+            orderByClause,
         };
     }
     validate(expression) {
@@ -50,14 +56,10 @@ export default class SpatialDistanceExpression {
             typeof expression.parameters.targetColumns.lon === 'string' &&
             (expression.parameters.unit === 'km' ||
                 expression.parameters.unit === 'miles') &&
-            typeof expression.parameters.alias === 'string');
-    }
-    get defaultRequirements() {
-        return {
-            phase: QueryEvaluationPhase.PROJECTION,
-            cardinality: 'row',
-            requiresAlias: true,
-            requiresSelectWrapping: true
-        };
+            typeof expression.parameters.alias === 'string' &&
+            (expression.parameters.maxDistance === undefined ||
+                typeof expression.parameters.maxDistance === 'number') &&
+            (expression.parameters.minDistance === undefined ||
+                typeof expression.parameters.minDistance === 'number'));
     }
 }

package/dist/helpers/QueryBuilders/ExpressionBuilders/TextRelevanceExpression.d.ts

@@ -1,8 +1,7 @@
-import IExpressionBuilder from "../../../interfaces/IExpressionBuilder.js";
-import { expressionClause, QueryExpressionRequirements, TextRelevanceQueryExpression } from "../../../types/index.js";
-export default class TextRelevanceExpression implements IExpressionBuilder {
+import { IExpressionBuilder } from '../../../interfaces/IExpressionBuilder.js';
+import { expressionClause, TextRelevanceQueryExpression } from '../../../types/index.js';
+export declare class TextRelevanceExpression implements IExpressionBuilder {
     build(expression: TextRelevanceQueryExpression): expressionClause;
     validate(expression: TextRelevanceQueryExpression): boolean;
-    get defaultRequirements(): QueryExpressionRequirements;
 }
 //# sourceMappingURL=TextRelevanceExpression.d.ts.map

package/dist/helpers/QueryBuilders/ExpressionBuilders/TextRelevanceExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextRelevanceExpression.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/ExpressionBuilders/TextRelevanceExpression.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAwB,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEzI,MAAM,CAAC,OAAO,OAAO,uBAAwB,YAAW,kBAAkB;IACtE,KAAK,CAAC,UAAU,EAAE,4BAA4B,GAAG,gBAAgB;IAqCjE,QAAQ,CAAC,UAAU,EAAE,4BAA4B,GAAG,OAAO;IAW3D,IAAI,mBAAmB,IAAI,2BAA2B,CAOrD;CACJ"}
+{"version":3,"file":"TextRelevanceExpression.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/ExpressionBuilders/TextRelevanceExpression.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC7B,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,uBAAwB,YAAW,kBAAkB;IAChE,KAAK,CAAC,UAAU,EAAE,4BAA4B,GAAG,gBAAgB;IAkCjE,QAAQ,CAAC,UAAU,EAAE,4BAA4B,GAAG,OAAO;CAY5D"}

package/dist/helpers/QueryBuilders/ExpressionBuilders/TextRelevanceExpression.js

@@ -1,30 +1,27 @@
-import InvalidExpressionParametersError from "../../../helpers/Errors/ExpressionErrors/InvalidExpressionParametersError.js";
-import { QueryEvaluationPhase } from "../../../types/index.js";
-export default class TextRelevanceExpression {
+import { InvalidExpressionParametersError } from '../../../helpers/Errors/ExpressionErrors/InvalidExpressionParametersError.js';
+export class TextRelevanceExpression {
     build(expression) {
         if (!this.validate(expression)) {
-            throw new InvalidExpressionParametersError("Invalid text relevance expression parameters.");
+            throw new InvalidExpressionParametersError('Invalid text relevance expression parameters.');
         }
         // Score: 3 = exact match, 2 = starts with, 1 = contains, 0 = no match
         const columnConcat = expression.parameters.targetColumns
-            .map(col => `COALESCE(${col}, '')`)
+            .map((col) => `COALESCE(${col}, '')`)
             .join(" || ' ' || ");
         const baseExpressionClause = `(
             CASE 
-                WHEN LOWER(${columnConcat}) = LOWER(@${expression.parameters.valueClauseKeywords[0]}) THEN 3
-                WHEN LOWER(${columnConcat}) LIKE LOWER(@${expression.parameters.valueClauseKeywords[0]} || '%') THEN 2
-                WHEN LOWER(${columnConcat}) LIKE LOWER('%' || @${expression.parameters.valueClauseKeywords[0]} || '%') THEN 1
+                WHEN LOWER(${columnConcat}) = LOWER(@${expression.parameters.valueClauseKeywords.searchTerm}) THEN 3
+                WHEN LOWER(${columnConcat}) LIKE LOWER(@${expression.parameters.valueClauseKeywords.searchTerm} || '%') THEN 2
+                WHEN LOWER(${columnConcat}) LIKE LOWER('%' || @${expression.parameters.valueClauseKeywords.searchTerm} || '%') THEN 1
                 ELSE 0
             END
         ) AS ${expression.parameters.alias}`;
         const orderByClause = {
             column: expression.parameters.alias,
-            direction: expression.parameters.orderByRelevance || 'ASC'
+            direction: expression.parameters.orderByRelevance || 'ASC',
         };
         return {
             baseExpressionClause,
-            phase: expression.requirements.phase,
-            requiresWrapping: expression.requirements.requiresSelectWrapping || false,
             whereClause: expression.parameters.where,
             valueClauseKeywords: expression.parameters.valueClauseKeywords,
             orderByClause,
@@ -34,16 +31,8 @@ export default class TextRelevanceExpression {
         return (expression.type === 'textRelevance' &&
             typeof expression.parameters.searchTerm === 'string' &&
             Array.isArray(expression.parameters.targetColumns) &&
-            expression.parameters.targetColumns.every(col => typeof col === 'string') &&
+            expression.parameters.targetColumns.every((col) => typeof col === 'string') &&
             typeof expression.parameters.alias === 'string' &&
             typeof expression.parameters.minimumRelevance == 'number');
     }
-    get defaultRequirements() {
-        return {
-            phase: QueryEvaluationPhase.PROJECTION,
-            cardinality: 'row',
-            requiresAlias: true,
-            requiresSelectWrapping: true
-        };
-    }
 }

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

@@ -1,7 +1,7 @@
-import { expressionClause, OrderByDefinition, QueryComparisonParameters, QueryContext } from "../../../types/index.js";
-import QueryDecorator from "./QueryDecorator.js";
-import IQueryBuilder from "../../../interfaces/IQueryBuilder.js";
-export default class ExpressionDecorator extends QueryDecorator {
+import { expressionClause, OrderByDefinition, QueryComparisonParameters, QueryContext } from '../../../types/index.js';
+import { QueryDecorator } from './QueryDecorator.js';
+import { IQueryBuilder } from '../../../interfaces/IQueryBuilder.js';
+export declare class ExpressionDecorator extends QueryDecorator {
     private parsedExpressions;
     whereClauses?: QueryComparisonParameters[];
     orderByClauses?: OrderByDefinition[];

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

@@ -1 +1 @@
-{"version":3,"file":"ExpressionDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/ExpressionDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAG9D,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,cAAc;IAC3D,OAAO,CAAC,iBAAiB,CAAqB;IACvC,YAAY,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC3C,cAAc,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC5C,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;gBAGhD,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,gBAAgB,EAAE;IAW7B,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;IAU7B,eAAe,IAAI,IAAI;IASvB,iBAAiB,IAAI,IAAI;IAIzB,iBAAiB,IAAI,IAAI;IAIzB,gBAAgB,IAAI,IAAI;IASxB,sBAAsB,IAAI,IAAI;CASxC"}
+{"version":3,"file":"ExpressionDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/ExpressionDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,yBAAyB,EACzB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,OAAO,CAAC,iBAAiB,CAAqB;IACvC,YAAY,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC3C,cAAc,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAC5C,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;gBAExC,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE;IAU/D,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;IAY7B,eAAe,IAAI,IAAI;IAMvB,iBAAiB,IAAI,IAAI;IAMzB,iBAAiB,IAAI,IAAI;IAMzB,gBAAgB,IAAI,IAAI;IAMxB,sBAAsB,IAAI,IAAI;CAStC"}

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

@@ -1,6 +1,5 @@
-import QueryDecorator from "./QueryDecorator.js";
-import QueryStatementBuilder from "../QueryStatementBuilder.js";
-export default class ExpressionDecorator extends QueryDecorator {
+import { QueryDecorator } from './QueryDecorator.js';
+export class ExpressionDecorator extends QueryDecorator {
     constructor(component, expressions) {
         super(component);
         this.valueClauseKeywords = new Set();
@@ -15,32 +14,30 @@ export default class ExpressionDecorator extends QueryDecorator {
         var _a, _b;
         const context = await this.component.build();
         (_a = context.expressionSelect) !== null && _a !== void 0 ? _a : (context.expressionSelect = []);
-        context.expressionSelect.push(...this.parsedExpressions.map(e => e.baseExpressionClause));
+        context.expressionSelect.push(...this.parsedExpressions.map((e) => e.baseExpressionClause));
         (_b = context.conditions) !== null && _b !== void 0 ? _b : (context.conditions = {});
         return context;
     }
     setWhereClauses() {
-        this.whereClauses = this.parsedExpressions
-            .flatMap(expr => expr.whereClause
-            ? QueryStatementBuilder.normalizeQueryConditions(expr.whereClause)
-            : []);
+        this.whereClauses = this.parsedExpressions.flatMap((expr) => expr.whereClause ? expr.whereClause : []);
     }
     setOrderByClauses() {
-        this.orderByClauses = this.parsedExpressions.map(expr => expr.orderByClause).filter(o => o !== undefined);
+        this.orderByClauses = this.parsedExpressions
+            .map((expr) => expr.orderByClause)
+            .filter((o) => o !== undefined);
     }
     setGroupByClauses() {
-        this.groupByClauses = this.parsedExpressions.map(expr => expr.groupByClause).filter(g => g !== undefined);
+        this.groupByClauses = this.parsedExpressions
+            .map((expr) => expr.groupByClause)
+            .filter((g) => g !== undefined);
     }
     setHavingClauses() {
-        this.havingClauses = this.parsedExpressions
-            .flatMap(expr => expr.havingClause
-            ? QueryStatementBuilder.normalizeQueryConditions(expr.havingClause)
-            : []);
+        this.havingClauses = this.parsedExpressions.flatMap((expr) => expr.havingClause ? expr.havingClause : []);
     }
     setValueClauseKeywords() {
-        this.parsedExpressions.forEach(expr => {
-            if (expr.valueClauseKeywords && expr.valueClauseKeywords.length > 0) {
-                for (const keyword of expr.valueClauseKeywords) {
+        this.parsedExpressions.forEach((expr) => {
+            if (expr.valueClauseKeywords) {
+                for (const keyword of Object.values(expr.valueClauseKeywords)) {
                     this.valueClauseKeywords.add(keyword);
                 }
             }

package/dist/helpers/QueryBuilders/QueryDecorators/GroupByDecorator.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 GroupByDecorator extends QueryDecorator {
+export declare class GroupByDecorator extends QueryDecorator {
     private groupByColumns?;
     constructor(component: IQueryBuilder, groupByColumns?: string[]);
     build(): Promise<QueryContext>;

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

@@ -1 +1 @@
-{"version":3,"file":"GroupByDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/GroupByDecorator.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,gBAAiB,SAAQ,cAAc;IACxD,OAAO,CAAC,cAAc,CAAC,CAAW;gBAEtB,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE;IAKzD,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CASvC"}
+{"version":3,"file":"GroupByDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/GroupByDecorator.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,gBAAiB,SAAQ,cAAc;IAChD,OAAO,CAAC,cAAc,CAAC,CAAW;gBAEtB,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE;IAKzD,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CASvC"}

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

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

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

@@ -1,8 +1,8 @@
 import { QueryLayers, QueryContext } from "../../../index.js";
-import QueryDecorator from "./QueryDecorator.js";
-import IQueryBuilder from "../../../interfaces/IQueryBuilder.js";
+import { QueryDecorator } from "./QueryDecorator.js";
+import { IQueryBuilder } from "../../../interfaces/IQueryBuilder.js";
 import { TableColumnInfo } from "../../../types/index.js";
-export default class JoinDecorator extends QueryDecorator {
+export declare class JoinDecorator extends QueryDecorator {
     private fromTableName;
     private joins;
     private tableColumnsCache;
@@ -10,6 +10,6 @@ export default class JoinDecorator extends QueryDecorator {
     constructor(builder: IQueryBuilder, layer: QueryLayers, tableColumnInformation: Map<string, TableColumnInfo[]>);
     build(): Promise<QueryContext>;
     private buildJoinSelect;
-    private buildJoinPart;
+    private buildSqlJoinPart;
 }
 //# sourceMappingURL=JoinDecorator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"JoinDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/JoinDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,aAAa,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,cAAc;IACrD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,iBAAiB,CAAiC;IAC1D,OAAO,CAAC,OAAO,CAAC,CAAgD;gBAEpD,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAmBxG,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;YActB,eAAe;IAuB7B,OAAO,CAAC,aAAa;CAgBxB"}
+{"version":3,"file":"JoinDecorator.d.ts","sourceRoot":"","sources":["../../../../src/helpers/QueryBuilders/QueryDecorators/JoinDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,aAAc,SAAQ,cAAc;IAC7C,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,iBAAiB,CAAiC;IAC1D,OAAO,CAAC,OAAO,CAAC,CAAgD;gBAEpD,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAmBxG,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;IAcpC,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,gBAAgB;CAiB3B"}