@iamkirbki/database-handler-core 4.3.1 → 4.4.0

package/dist/runtime/Repository.js

@@ -20,13 +20,14 @@ class Repository {
         this.customDatabaseAdapter = customDatabaseAdapter;
     }
     static getInstance(ModelClass, tableName, customDatabaseAdapter, tableFactory) {
-        const className = ModelClass.name;
-        if (!this._instances.has(className)) {
+        // Use tableName as key to differentiate instances for different tables
+        const key = tableName || ModelClass.name;
+        if (!this._instances.has(key)) {
             const instance = new Repository(tableName, new ModelClass(), customDatabaseAdapter, tableFactory);
-            this._instances.set(className, instance);
+            this._instances.set(key, instance);
             return instance;
         }
-        return this._instances.get(className);
+        return this._instances.get(key);
     }
     static clearInstances() {
         this._instances.clear();
@@ -48,7 +49,7 @@ class Repository {
     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(this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation));
+            const record = yield table.Record({ base: { where: this.generatePivotTableKeys(foreignKey, modelOfOrigin, relation) } });
             yield (record === null || record === void 0 ? void 0 : record.Delete());
         });
     }
@@ -85,92 +86,126 @@ class Repository {
             yield this.Table.Insert(attributes);
         });
     }
-    first(conditions, Model) {
+    first(queryLayers, Model) {
         return __awaiter(this, void 0, void 0, function* () {
             let record;
             if (Model.JoinedEntities.length > 0) {
-                const results = yield this.join(Model, conditions, { limit: 1 });
-                record = results[0] ? { values: results[0] } : undefined;
+                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({ where: conditions });
+                record = yield this.Table.Record(queryLayers);
             }
-            return record ? record.values : null;
+            return record === null || record === void 0 ? void 0 : record.values;
         });
     }
-    get(conditions, queryOptions, Model) {
+    get(QueryLayers, Model) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Model.JoinedEntities.length > 0) {
-                return yield this.join(Model, conditions, queryOptions);
+                return yield this.join(Model, QueryLayers);
             }
             else {
-                const records = yield this.Table.Records(Object.assign({ where: conditions }, queryOptions));
+                const records = yield this.Table.Records(QueryLayers);
                 return records.map(record => record.values);
             }
         });
     }
-    all(Model, queryscopes, queryOptions) {
+    all(Model, QueryLayers) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (Model.JoinedEntities.length > 0) {
-                return yield this.join(Model);
-            }
-            else {
-                const records = yield this.Table.Records(Object.assign({ where: queryscopes }, queryOptions));
-                return records.map(record => record.values);
-            }
+            return this.get(QueryLayers, Model);
         });
     }
     update(primaryKey, newAttributes) {
         return __awaiter(this, void 0, void 0, function* () {
-            const record = yield this.Table.Record({ where: primaryKey });
+            const record = yield this.Table.Record({ base: { where: primaryKey } });
             if (record) {
                 return yield record.Update(newAttributes, primaryKey);
             }
         });
     }
-    join(Model, conditions, queryOptions) {
+    join(Model, queryLayers) {
         return __awaiter(this, void 0, void 0, function* () {
-            const Join = Model.JoinedEntities.flatMap(join => {
-                const relation = Model.Relations.find(rel => rel.model.Configuration.table.replace("_", "").toLowerCase() === join.relation.toLowerCase());
-                if (join.queryScopes) {
-                    conditions = this.mergeQueryWhereConditions(conditions || {}, join.queryScopes);
-                }
-                if (!relation) {
-                    throw new Error(`Relation for joined entity ${join} not found.`);
-                }
-                if (relation.type === 'manyToMany') {
-                    return [
-                        {
-                            fromTable: relation.pivotTable,
-                            baseTable: Model.Configuration.table,
-                            joinType: 'INNER',
-                            on: [
-                                { [relation.pivotForeignKey]: relation.localKey }
-                            ]
-                        },
-                        {
-                            fromTable: relation.model.Configuration.table,
-                            baseTable: relation.pivotTable,
-                            joinType: 'INNER',
-                            on: [
-                                { [relation.foreignKey]: relation.pivotLocalKey }
-                            ]
-                        }
-                    ];
-                }
-                const JoinType = relation.type === 'hasOne' || relation.type === 'belongsTo' ? 'INNER' : 'LEFT';
-                return [{
+            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);
+        });
+    }
+    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);
+        });
+    }
+    buildJoinObject(Model, inputLayers) {
+        var _a;
+        const queryLayers = Object.assign(Object.assign({}, inputLayers), { base: Object.assign(Object.assign({}, inputLayers.base), { where: Object.assign({}, ((_a = inputLayers.base.where) !== null && _a !== void 0 ? _a : {})) }), final: inputLayers.final
+                ? Object.assign({}, inputLayers.final) : undefined });
+        const joins = Model.JoinedEntities.flatMap(join => {
+            var _a, _b;
+            var _c;
+            const relation = Model.Relations.find(rel => rel.model.Configuration.table
+                .replace("_", "")
+                .toLowerCase() === join.relation.toLowerCase());
+            if (!relation) {
+                throw new Error(`Relation for joined entity ${join.relation} not found.`);
+            }
+            if (join.queryScopes && queryLayers.base.where) {
+                queryLayers.base.where = this.mergeQueryWhereConditions(queryLayers.base.where, join.queryScopes);
+            }
+            else {
+                queryLayers.base.where = join.queryScopes;
+            }
+            if (relation.type !== 'manyToMany') {
+                const joinType = relation.type === 'hasOne' || relation.type === 'belongsTo'
+                    ? 'INNER'
+                    : 'LEFT';
+                const [baseTable, baseKey] = relation.localKey.includes('.')
+                    ? relation.localKey.split('.')
+                    : [Model.Configuration.table, relation.localKey];
+                return [
+                    {
                         fromTable: relation.model.Configuration.table,
-                        baseTable: Model.Configuration.table,
-                        joinType: JoinType,
+                        baseTable,
+                        joinType,
                         on: [
-                            { [relation.foreignKey]: relation.localKey }
+                            { [relation.foreignKey]: baseKey }
                         ]
-                    }];
-            });
-            const records = yield this.Table.Join(Join, Object.assign({ where: conditions }, queryOptions));
-            return records.map(record => record.values);
+                    }
+                ];
+            }
+            // many to many
+            (_a = queryLayers.final) !== null && _a !== void 0 ? _a : (queryLayers.final = {});
+            (_b = (_c = queryLayers.final).blacklistTables) !== null && _b !== void 0 ? _b : (_c.blacklistTables = []);
+            queryLayers.final.blacklistTables = [
+                ...queryLayers.final.blacklistTables,
+                relation.pivotTable
+            ];
+            return [
+                {
+                    fromTable: relation.pivotTable,
+                    baseTable: Model.Configuration.table,
+                    joinType: 'INNER',
+                    on: [
+                        { [relation.pivotForeignKey]: relation.localKey }
+                    ]
+                },
+                {
+                    fromTable: relation.model.Configuration.table,
+                    baseTable: relation.pivotTable,
+                    joinType: 'INNER',
+                    on: [
+                        { [relation.foreignKey]: relation.pivotLocalKey }
+                    ]
+                }
+            ];
         });
+        return { joins, queryLayers };
     }
     mergeQueryWhereConditions(base, additional) {
         const query = this.Table.QueryHelperObject;

package/dist/types/expressions.d.ts

@@ -0,0 +1,154 @@
+import { OrderByDefinition, QueryWhereCondition } from "../types/index.js";
+export type expressionClause = {
+    /**
+     * SQL fragment that produces the expression value.
+     * Must include an alias if it needs to be referenced later.
+     *
+     * Example:
+     *   6371 * acos(...) AS distance
+     */
+    baseExpressionClause: string;
+    /**
+     * Determines *where* in the query lifecycle this expression is evaluated.
+     *
+     * - base:      Can live directly in SELECT
+     * - projection: Must be computed in a subquery
+     */
+    phase?: QueryEvaluationPhase;
+    /**
+     * Signals that this expression cannot safely exist in the same
+     * SELECT level where it is filtered or ordered on.
+     *
+     * This is the “SQL is dumb, wrap it” flag.
+     */
+    requiresWrapping?: boolean;
+    selectClause?: string;
+    /**
+     * ORDER BY fragment derived from the expression.
+     *
+     * Example:
+     *   distance ASC
+     */
+    orderByClause?: OrderByDefinition;
+    whereClause?: QueryWhereCondition;
+    valueClauseKeywords?: string[];
+    groupByClause?: string;
+    havingClause?: QueryWhereCondition;
+};
+/**
+ * Generic function signature for expression builders.
+ *
+ * Each builder:
+ * - receives a strongly-typed expression definition
+ * - returns a normalized expressionClause
+ */
+export type ExpressionBuilderFunction<T extends PossibleExpressions = PossibleExpressions> = (expression: T) => expressionClause;
+export type QueryExpression<T extends string = string> = {
+    type: T;
+    requirements: QueryExpressionRequirements;
+};
+export type PossibleExpressions = SpatialQueryExpression | TextRelevanceQueryExpression | JsonAggregateQueryExpression;
+export type ComputedExpression<T extends string = string> = {
+    type: T;
+};
+export type PossibleComputedExpressions = SpatialComputedExpression | TextRelevanceComputedExpression;
+export type QueryExpressionRequirements = {
+    phase: QueryEvaluationPhase;
+    cardinality: 'row' | 'aggregate';
+    select?: string;
+    where?: QueryWhereCondition;
+    having?: QueryWhereCondition;
+    orderBy?: string;
+    requiresAlias: boolean;
+    requiresSelectWrapping: boolean;
+};
+export type QueryShape = {
+    kind: 'flat';
+} | {
+    kind: 'wrapped';
+    reason: 'projection-expressions';
+};
+export type SpatialDistanceDefinition = {
+    referencePoint: SpatialPoint;
+    targetColumns: SpatialPointColumns;
+    unit: 'km' | 'miles';
+    earthRadius?: number;
+    alias: string;
+    valueClauseKeywords: string[];
+    where?: QueryWhereCondition;
+    maxDistance: number;
+    orderByDistance?: 'ASC' | 'DESC';
+    isComputed?: boolean;
+};
+export type SpatialQueryExpression = QueryExpression<'spatialDistance'> & {
+    parameters: SpatialDistanceDefinition;
+};
+export type SpatialComputedExpression = ComputedExpression<'spatialDistance'> & {
+    parameters: SpatialDistanceDefinition;
+};
+export type SpatialPointColumns = {
+    lat: string;
+    lon: string;
+};
+export type SpatialPoint = {
+    lat: number;
+    lon: number;
+};
+export type TextRelevanceDefinition = {
+    targetColumns: string[];
+    searchTerm: string;
+    alias: string;
+    where?: QueryWhereCondition;
+    valueClauseKeywords: string[];
+    minimumRelevance?: number;
+    orderByRelevance?: 'ASC' | 'DESC';
+};
+export type TextRelevanceQueryExpression = QueryExpression<'textRelevance'> & {
+    parameters: TextRelevanceDefinition;
+};
+export type TextRelevanceComputedExpression = ComputedExpression<'textRelevance'> & {
+    parameters: TextRelevanceDefinition;
+};
+export type JsonAggregateDefinition<Tables extends string = string> = {
+    /** Table this aggregate is built from */
+    table: Tables;
+    /** Columns selected from this table */
+    columns: string[];
+    nonTableColumns?: string[];
+    /** GROUP BY columns required for this level */
+    groupByColumns: string[];
+    /** Alias of this JSON object / array */
+    alias: string;
+    /** Computed expressions */
+    computed?: PossibleComputedExpressions[];
+    /** Having clause */
+    having?: QueryWhereCondition;
+    /** Nested JSON objects or arrays */
+    nested?: NestedJsonAggregateDefinition<Tables>[];
+};
+export type NestedJsonAggregateDefinition<Tables extends string = string> = {
+    /** Table this aggregate is built from */
+    table: Tables;
+    /** Columns selected from this table */
+    columns: string[];
+    nonTableColumns?: string[];
+    /** Alias of this JSON object / array */
+    alias: string;
+    /** Computed expressions */
+    computed?: PossibleComputedExpressions[];
+    /** Having clause */
+    having?: QueryWhereCondition;
+    /** Nested JSON objects or arrays */
+    nested?: NestedJsonAggregateDefinition<Tables>[];
+};
+export type JsonAggregateQueryExpression = QueryExpression<'jsonAggregate'> & {
+    parameters: JsonAggregateDefinition;
+};
+export declare enum QueryEvaluationPhase {
+    BASE = "base",
+    PROJECTION = "projection",
+    LATERAL = "lateral"
+}
+export type PossibleBaseExpressions = SpatialQueryExpression | TextRelevanceQueryExpression;
+export type PossiblePrettyExpressions = JsonAggregateQueryExpression;
+//# sourceMappingURL=expressions.d.ts.map

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

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

package/dist/types/expressions.js

@@ -0,0 +1,6 @@
+export var QueryEvaluationPhase;
+(function (QueryEvaluationPhase) {
+    QueryEvaluationPhase["BASE"] = "base";
+    QueryEvaluationPhase["PROJECTION"] = "projection";
+    QueryEvaluationPhase["LATERAL"] = "lateral";
+})(QueryEvaluationPhase || (QueryEvaluationPhase = {}));

package/dist/types/factories.d.ts

@@ -1,6 +1,7 @@
-import type Table from "../base/Table";
-import type { columnType, Query, QueryConstructorType, Record } from "../index.js";
+import type Table from "../base/Table.js";
+import type { columnType, Model, Query, QueryConstructorType, Record, Repository } from "../index.js";
 export type TableFactory = (name: string, adapter?: string) => Table;
 export type QueryFactory = (config: QueryConstructorType) => Query;
 export type RecordFactory = <T extends columnType>(table: string, values: T, adapter?: string, queryFactory?: QueryFactory, recordFactory?: RecordFactory) => Record<T>;
+export type RepositoryFactory<ModelType extends columnType> = (model: Model<ModelType>) => Repository<ModelType, Model<ModelType>>;
 //# sourceMappingURL=factories.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"factories.d.ts","sourceRoot":"","sources":["../../src/types/factories.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEtF,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,KAAK,CAAC;AACrE,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,KAAK,CAAC;AACnE,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,UAAU,EAC7C,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,CAAC,EACT,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,YAAY,EAC3B,aAAa,CAAC,EAAE,aAAa,KAC5B,MAAM,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"factories.d.ts","sourceRoot":"","sources":["../../src/types/factories.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEzG,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,KAAK,CAAC;AACrE,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,KAAK,CAAC;AACnE,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,UAAU,EAC7C,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,CAAC,EACT,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,YAAY,EAC3B,aAAa,CAAC,EAAE,aAAa,KAC5B,MAAM,CAAC,CAAC,CAAC,CAAC;AAEf,MAAM,MAAM,iBAAiB,CAAC,SAAS,SAAS,UAAU,IAAI,CAC1D,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,KACtB,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC"}

package/dist/types/index.d.ts

@@ -5,4 +5,5 @@ export * from './query.js';
 export * from './table.js';
 export * from './model.js';
 export * from './factories.js';
+export * from './expressions.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,IAC3D,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,GAC7B;KACG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;CAC3E,CAAC,IAAI,CAAC,CAAA;AAEX,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,IAC3D,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,GAC7B;KACG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;CAC3E,CAAC,IAAI,CAAC,CAAA;AAEX,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}

package/dist/types/index.js

@@ -5,3 +5,4 @@ export * from './query.js';
 export * from './table.js';
 export * from './model.js';
 export * from './factories.js';
+export * from './expressions.js';

package/dist/types/model.d.ts

@@ -3,7 +3,7 @@ import Model from "../abstract/Model";
 import { columnType, QueryWhereCondition } from "./index";
 export type ModelEventType = 'retrieved' | 'creating' | 'created' | 'updating' | 'updated' | 'saving' | 'saved' | 'deleting' | 'deleted' | 'restoring' | 'restored' | 'forceDeleting' | 'forceDeleted';
 export type ModelEventHandler<T> = (model: T) => void | Promise<void>;
-export interface ModelObserver<T> {
+export type ModelObserver<T> = {
     retrieved?(model: T): void | Promise<void>;
     creating?(model: T): void | Promise<void>;
     created?(model: T): void | Promise<void>;
@@ -17,11 +17,11 @@ export interface ModelObserver<T> {
     restored?(model: T): void | Promise<void>;
     forceDeleting?(model: T): void | Promise<void>;
     forceDeleted?(model: T): void | Promise<void>;
-}
-export interface ModelScope {
+};
+export type ModelScope = {
     (query: any): void;
-}
-export interface ModelConfig {
+};
+export type ModelConfig = {
     /** Table name - defaults to lowercase class name */
     table: string;
     /** Custom adapter name - defaults to default name */
@@ -56,7 +56,7 @@ export interface ModelConfig {
     attributes?: Record<string, any>;
     /** Date format for serialization */
     dateFormat?: string;
-}
+};
 export type relation = {
     type: 'hasOne' | 'hasMany' | 'belongsTo' | 'manyToMany';
     model: unknown & Model<columnType>;
@@ -66,9 +66,9 @@ export type relation = {
     pivotForeignKey?: string;
     pivotLocalKey?: string;
 };
-export interface SoftDeletable {
+export type SoftDeletable = {
     deleted_at?: string | Date | null;
-}
+};
 export type ModelWithTimestamps = {
     created_at?: string | number | Date;
     updated_at?: string | number | Date;

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":"AAAA,oCAAoC;AAEpC,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE1D,MAAM,MAAM,cAAc,GACpB,WAAW,GACX,UAAU,GACV,SAAS,GACT,UAAU,GACV,SAAS,GACT,QAAQ,GACR,OAAO,GACP,UAAU,GACV,SAAS,GACT,WAAW,GACX,UAAU,GACV,eAAe,GACf,cAAc,CAAC;AAErB,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEtE,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC3B,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,YAAY,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACrB,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAC;CACtB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,oDAAoD;IACpD,KAAK,EAAE,MAAM,CAAC;IAEd,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IAEnB,+DAA+D;IAC/D,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAE9B,+DAA+D;IAC/D,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,wDAAwD;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,wDAAwD;IACxD,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,yCAAyC;IACzC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEjC,oCAAoC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,CAAC;IACxD,KAAK,EAAE,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;CACrC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CACvC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACrC,CAAA"}

package/dist/types/query.d.ts

@@ -1,4 +1,4 @@
-import { RecordFactory } from "../index.js";
+import { expressionClause, Join, PossibleBaseExpressions, PossibleExpressions, PossiblePrettyExpressions, RecordFactory } from "../index.js";
 export type QueryIsEqualParameter = {
     [key: string]: QueryValues;
 };
@@ -14,9 +14,12 @@ export type DefaultQueryParameters = {
     where?: QueryWhereCondition;
 };
 export type ExtraQueryParameters = {
-    orderBy?: string;
+    orderBy?: OrderByDefinition[];
     limit?: number;
     offset?: number;
+    groupBy?: string[];
+    expressions?: PossibleExpressions[];
+    blacklistTables?: string[];
 };
 export type QueryConstructorType = {
     tableName: string;
@@ -25,4 +28,55 @@ export type QueryConstructorType = {
     adapterName?: string;
     recordFactory?: RecordFactory;
 };
+export type QueryLayers = {
+    base: BaseQueryOptions;
+    pretty?: PrettyQueryOptions;
+    final?: FinalQueryOptions;
+};
+export type BaseQueryOptions = {
+    from?: string;
+    joins?: Join[];
+    where?: QueryWhereCondition;
+    orderBy?: OrderByDefinition[];
+    expressions?: PossibleBaseExpressions[];
+    select?: string[];
+    joinsSelect?: string[];
+    expressionsSelect?: string[];
+};
+export type PrettyQueryOptions = {
+    expressions?: PossiblePrettyExpressions[];
+    groupBy?: string[];
+    having?: QueryComparisonParameters[];
+    where?: QueryComparisonParameters[];
+    select?: string[];
+};
+export type FinalQueryOptions = {
+    orderBy?: OrderByDefinition[];
+    limit?: number;
+    offset?: number;
+    blacklistTables?: string[];
+    select?: string[];
+    groupBy?: string[];
+};
+export type OrderByDirection = 'ASC' | 'DESC';
+export type OrderByDefinition = {
+    column: string;
+    direction: OrderByDirection;
+};
+export type QueryContext = {
+    from?: string;
+    select?: string[];
+    joinsSelect?: string[];
+    expressionSelect?: string[];
+    joins?: string[];
+    conditions?: {
+        where?: QueryComparisonParameters[];
+        having?: QueryComparisonParameters[];
+    };
+    expressions?: expressionClause[];
+    groupBy?: string[];
+    orderBy?: OrderByDefinition[];
+    limit?: number;
+    offset?: number;
+};
 //# sourceMappingURL=query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/types/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,MAAM,qBAAqB,GAAG;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC;IAC1E,KAAK,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,GAAG,yBAAyB,EAAE,CAAC;AAEtF,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;AAE3E,MAAM,MAAM,sBAAsB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/types/query.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamkirbki/database-handler-core",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "author": "iamkirbki",
   "description": "Core database abstractions and interfaces",
   "license": "ISC",
@@ -23,11 +23,19 @@
     "directory": "packages/core"
   },
   "scripts": {
-    "build": "tsc --build && tsc-alias"
+    "build": "tsc --build && tsc-alias",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "test:ui": "vitest --ui"
   },
   "devDependencies": {
     "@types/node": "^24.10.1",
+    "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3",
-    "tsc-alias": "^1.8.16"
+    "vitest": "^4.0.15"
+  },
+  "dependencies": {
+    "ts-node": "^10.9.2"
   }
 }