@iamkirbki/database-handler-core 4.4.7 → 4.4.8

package/dist/abstract/Controller.d.ts

@@ -1,6 +1,6 @@
-import Model from './Model.js';
+import { Model } from './Model.js';
 import { columnType } from '../types/index.js';
-export default abstract class Controller<Type extends columnType> {
+export declare abstract class Controller<Type extends columnType> {
     abstract index(): Promise<Model<Type>[]>;
     abstract show(value: string | number): Promise<Model<Type>>;
     abstract edit(value: string | number): Promise<Model<Type>>;

package/dist/abstract/Controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Controller.d.ts","sourceRoot":"","sources":["../../src/abstract/Controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU,CAAC,IAAI,SAAS,UAAU;IAC9D,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;IACxC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3E,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAElC,KAAK,CAAC,UAAU,SAAS,UAAU,EACrD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,GACrC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;WAKX,IAAI,CAAC,UAAU,SAAS,UAAU,EACpD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,IAAI,CAAC,UAAU,SAAS,UAAU,EACpD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,MAAM,CAAC,UAAU,SAAS,UAAU,EACtD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,EAAE,EAAE,MAAM,GAAG,MAAM,EACnB,SAAS,EAAE,UAAU,GACpB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,MAAM,CAAC,UAAU,SAAS,UAAU,EACtD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,MAAM,CAAC,UAAU,SAAS,UAAU,EACtD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,EAAE,EAAE,MAAM,GAAG,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;CAIpB"}
+{"version":3,"file":"Controller.d.ts","sourceRoot":"","sources":["../../src/abstract/Controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,8BAAsB,UAAU,CAAC,IAAI,SAAS,UAAU;IACtD,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;IACxC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3E,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAElC,KAAK,CAAC,UAAU,SAAS,UAAU,EACrD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,GACrC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;WAKX,IAAI,CAAC,UAAU,SAAS,UAAU,EACpD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,IAAI,CAAC,UAAU,SAAS,UAAU,EACpD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,MAAM,CAAC,UAAU,SAAS,UAAU,EACtD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,EAAE,EAAE,MAAM,GAAG,MAAM,EACnB,SAAS,EAAE,UAAU,GACpB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,MAAM,CAAC,UAAU,SAAS,UAAU,EACtD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;WAKT,MAAM,CAAC,UAAU,SAAS,UAAU,EACtD,IAAI,EAAE,UAAU,UAAU,CAAC,UAAU,CAAC,EACtC,EAAE,EAAE,MAAM,GAAG,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;CAIpB"}

package/dist/abstract/Controller.js

@@ -1,4 +1,4 @@
-export default class Controller {
+export class Controller {
     static async index() {
         const instance = new this();
         return await instance.index();

package/dist/abstract/Model.d.ts

@@ -1,8 +1,8 @@
-import Repository from '../runtime/Repository.js';
-import ModelRelations from '../abstract/model/ModelRelation.js';
-import { columnType, QueryWhereCondition, QueryValues, ModelConfig, SpatialPoint, SpatialPointColumns, NestedJsonAggregateDefinition, QueryLayers } from '../types/index.js';
+import { Repository } from '../runtime/Repository.js';
+import { ModelRelations } from '../abstract/model/ModelRelation.js';
+import { columnType, QueryValues, ModelConfig, SpatialPoint, SpatialPointColumns, NestedJsonAggregateDefinition, QueryLayers, QueryWhereCondition } from '../types/index.js';
 /** Abstract Model class for ORM-style database interactions */
-export default abstract class Model<ModelType extends columnType> extends ModelRelations<ModelType> {
+export declare abstract class Model<ModelType extends columnType> extends ModelRelations<ModelType> {
     private _repository?;
     protected get repository(): Repository<ModelType, Model<ModelType>>;
     protected get self(): Model<ModelType>;
@@ -23,10 +23,9 @@ export default abstract class Model<ModelType extends columnType> extends ModelR
     static orderBy<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, column: string, direction?: 'ASC' | 'DESC'): ParamterModelType;
     orderBy(column: string, direction?: 'ASC' | 'DESC'): this;
     static where<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, conditions: QueryWhereCondition): ParamterModelType;
-    private normalizeConditions;
     where(conditions: QueryWhereCondition): this;
-    static whereId<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, id: QueryValues): Promise<ParamterModelType>;
-    whereId(id: QueryValues): Promise<this>;
+    static whereId<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, id: QueryValues): ParamterModelType;
+    whereId(id: QueryValues): this;
     static find<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue: QueryValues): ParamterModelType;
     find(primaryKeyValue: QueryValues): this;
     static findOrFail<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue: QueryValues): Promise<ParamterModelType>;
@@ -39,14 +38,16 @@ export default abstract class Model<ModelType extends columnType> extends ModelR
     static set<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, attributes: Partial<columnType>): ParamterModelType;
     set(attributes: Partial<ModelType>): this;
     save(): Promise<this>;
-    update(attributes: Partial<ModelType>): Promise<this>;
+    update(attributes?: Partial<ModelType>): Promise<this>;
     near(params: {
         referencePoint: SpatialPoint;
         targetColumns: SpatialPointColumns;
-        maxDistance: number;
+        maxDistance?: number;
+        minDistance?: number;
         unit: 'km' | 'miles';
         orderByDistance: 'ASC' | 'DESC';
         alias?: string;
+        valueClauseKeywords: Record<'lon' | 'lat', string>;
     }): this;
     isTextRelevant(params: {
         targetColumns: string[];

package/dist/abstract/Model.d.ts.map

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

package/dist/abstract/Model.js

@@ -1,8 +1,9 @@
-import Repository from '../runtime/Repository.js';
-import ModelRelations from '../abstract/model/ModelRelation.js';
-import { QueryEvaluationPhase, } from '../types/index.js';
+import { Repository } from '../runtime/Repository.js';
+import { ModelRelations } from '../abstract/model/ModelRelation.js';
+import { RecordNotFoundError } from '../helpers/Errors/ModelErrors/RecordNotFoundError.js';
+import { InvalidOperationError } from '../helpers/Errors/ModelErrors/InvalidOperationError.js';
 /** Abstract Model class for ORM-style database interactions */
-export default class Model extends ModelRelations {
+export class Model extends ModelRelations {
     constructor() {
         super(...arguments);
         this.configuration = {
@@ -24,7 +25,7 @@ export default class Model extends ModelRelations {
                 from: this.Configuration.table,
             },
             pretty: {},
-            final: {}
+            final: {},
         };
     }
     get repository() {
@@ -66,7 +67,7 @@ export default class Model extends ModelRelations {
     offset(value) {
         var _a;
         if (!((_a = this.queryLayers.final) === null || _a === void 0 ? void 0 : _a.limit)) {
-            throw new Error('Offset cannot be set without a limit.');
+            throw new InvalidOperationError('Offset cannot be set without a limit.');
         }
         this.queryLayers.final.offset = value;
         return this;
@@ -87,24 +88,19 @@ export default class Model extends ModelRelations {
         const instance = new this();
         return instance.where(conditions);
     }
-    normalizeConditions(conditions) {
-        if (Array.isArray(conditions)) {
-            return conditions;
-        }
-        return Object.entries(conditions).map(([column, value]) => ({
-            column,
-            operator: '=',
-            value,
-        }));
-    }
     where(conditions) {
-        const normalized = this.normalizeConditions(conditions);
-        if (!this.queryLayers.base.where) {
-            this.queryLayers.base.where = normalized;
+        const normalizedConditions = Array.isArray(conditions)
+            ? conditions
+            : Object.entries(conditions).map(([key, value]) => ({
+                column: key,
+                operator: '=',
+                value,
+            }));
+        if (this.queryLayers.base.where) {
+            this.queryLayers.base.where.push(...normalizedConditions);
         }
         else {
-            const existing = this.normalizeConditions(this.queryLayers.base.where);
-            this.queryLayers.base.where = [...existing, ...normalized];
+            this.queryLayers.base.where = normalizedConditions;
         }
         return this;
     }
@@ -112,9 +108,14 @@ export default class Model extends ModelRelations {
         const instance = new this();
         return instance.whereId(id);
     }
-    async whereId(id) {
-        this.queryLayers.base.where = [{ column: this.primaryKeyColumn, operator: '=', value: id }];
-        await this.first();
+    whereId(id) {
+        this.queryLayers.base.where = [
+            {
+                column: this.primaryKeyColumn,
+                operator: '=',
+                value: id,
+            },
+        ];
         return this;
     }
     static find(primaryKeyValue) {
@@ -122,23 +123,29 @@ export default class Model extends ModelRelations {
         return instance.find(primaryKeyValue);
     }
     find(primaryKeyValue) {
-        this.queryLayers.base.where = [{ column: this.primaryKeyColumn, operator: '=', value: primaryKeyValue }];
+        this.queryLayers.base.where = [
+            {
+                column: this.primaryKeyColumn,
+                operator: '=',
+                value: primaryKeyValue,
+            },
+        ];
         return this;
     }
     static async findOrFail(primaryKeyValue) {
         const instance = new this();
-        return (await instance.findOrFail(primaryKeyValue));
+        return await instance.findOrFail(primaryKeyValue);
     }
     async findOrFail(primaryKeyValue) {
         var _a;
         if (primaryKeyValue) {
-            this.queryLayers.base.where = [{ column: this.primaryKeyColumn, operator: '=', value: primaryKeyValue }];
+            this.find(primaryKeyValue);
         }
         this.queryLayers.base.from = this.Configuration.table;
         const query = this.queryLayers;
         const record = await ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.first(query, this));
         if (!record) {
-            throw new Error(`Record with primary key ${primaryKeyValue} not found.`);
+            throw new RecordNotFoundError(primaryKeyValue, this.Configuration.table);
         }
         this.attributes = record;
         this.originalAttributes = { ...this.attributes };
@@ -152,15 +159,15 @@ export default class Model extends ModelRelations {
     async first(primaryKeyValue) {
         var _a;
         if (primaryKeyValue !== undefined) {
-            this.queryLayers.base.where = [{ column: this.primaryKeyColumn, operator: '=', value: primaryKeyValue }, ...this.normalizeConditions(this.queryLayers.base.where || [])];
+            this.find(primaryKeyValue);
         }
         const attributes = (await ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.first({
             ...this.queryLayers,
             base: {
                 ...this.queryLayers.base,
                 from: this.Configuration.table,
-                where: this.normalizeConditions(this.queryLayers.base.where || []),
-            }
+                where: this.queryLayers.base.where,
+            },
         }, this)));
         if (attributes) {
             this.attributes = attributes;
@@ -175,7 +182,7 @@ export default class Model extends ModelRelations {
             base: {
                 ...this.queryLayers.base,
                 from: this.Configuration.table,
-            }
+            },
         }, this);
         return records.map((record) => {
             const instance = new this.constructor();
@@ -196,7 +203,7 @@ export default class Model extends ModelRelations {
             base: {
                 ...this.queryLayers.base,
                 from: this.Configuration.table,
-            }
+            },
         });
         return records.map((record) => {
             const instance = new this.constructor();
@@ -229,43 +236,56 @@ export default class Model extends ModelRelations {
         this.dirty = false;
         return this;
     }
-    async update(attributes) {
+    async update(attributes = {}) {
         var _a;
         if (this.primaryKey === undefined) {
-            throw new Error('Primary key value is undefined. Cannot update record without a valid primary key.');
+            throw new InvalidOperationError('Primary key value is undefined. Cannot update record without a valid primary key.');
         }
-        const newRecord = await ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.update({ [this.primaryKeyColumn]: this.primaryKey }, attributes, this.Configuration.table));
+        if (Object.keys(attributes).length > 0) {
+            this.set(attributes);
+        }
+        const dirtyAttributes = {};
+        for (const key in this.attributes) {
+            if (this.attributes[key] !== this.originalAttributes[key]) {
+                dirtyAttributes[key] = this.attributes[key];
+            }
+        }
+        const newRecord = await ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.update({ [this.primaryKeyColumn]: this.primaryKey }, dirtyAttributes, this.Configuration.table));
         if (newRecord) {
-            this.originalAttributes = newRecord.values;
+            this.attributes = { ...newRecord };
+            this.originalAttributes = { ...this.attributes };
             this.exists = true;
+            this.dirty = false;
         }
         return this;
     }
     near(params) {
         var _a;
         var _b;
-        const { referencePoint, targetColumns, maxDistance, unit, orderByDistance, alias = 'distance' } = params;
-        const valueClauseKeywords = [`${alias}_lat`, `${alias}_lon`];
+        const { referencePoint, targetColumns, maxDistance, minDistance, unit, orderByDistance, alias = 'distance', valueClauseKeywords, } = params;
         const expression = {
             type: 'spatialDistance',
-            requirements: {
-                phase: QueryEvaluationPhase.PROJECTION,
-                cardinality: 'row',
-                requiresAlias: true,
-                requiresSelectWrapping: true,
-            },
             parameters: {
                 referencePoint: referencePoint,
                 targetColumns: targetColumns,
                 alias: alias,
                 maxDistance: maxDistance,
+                minDistance: minDistance,
                 orderByDistance: orderByDistance,
                 valueClauseKeywords: valueClauseKeywords,
                 unit: unit,
-                where: {
-                    [valueClauseKeywords[0]]: referencePoint.lat,
-                    [valueClauseKeywords[1]]: referencePoint.lon,
-                }
+                where: [
+                    {
+                        column: valueClauseKeywords.lat,
+                        operator: '=',
+                        value: referencePoint.lat,
+                    },
+                    {
+                        column: valueClauseKeywords.lon,
+                        operator: '=',
+                        value: referencePoint.lon,
+                    },
+                ],
             },
         };
         (_a = (_b = this.queryLayers.base).expressions) !== null && _a !== void 0 ? _a : (_b.expressions = []);
@@ -275,26 +295,26 @@ export default class Model extends ModelRelations {
     isTextRelevant(params) {
         var _a, _b, _c, _d;
         var _e, _f, _g, _h;
-        const { targetColumns, searchTerm, minimumRelevance, alias = 'relevance', orderByRelevance = "ASC" } = params;
-        const valueClauseKeyword = `${alias}_searchTerm`;
+        const { targetColumns, searchTerm, minimumRelevance, alias = 'relevance', orderByRelevance = 'ASC', } = params;
+        const valueClauseKeywords = {
+            searchTerm: `${alias}_searchTerm`,
+        };
         const expression = {
             type: 'textRelevance',
-            requirements: {
-                phase: QueryEvaluationPhase.PROJECTION,
-                cardinality: 'row',
-                requiresAlias: true,
-                requiresSelectWrapping: true,
-            },
             parameters: {
                 targetColumns: targetColumns,
                 searchTerm: searchTerm,
                 alias: alias,
                 minimumRelevance: minimumRelevance,
                 orderByRelevance: orderByRelevance,
-                valueClauseKeywords: [valueClauseKeyword],
-                where: {
-                    [valueClauseKeyword]: searchTerm,
-                }
+                valueClauseKeywords: valueClauseKeywords,
+                where: [
+                    {
+                        column: valueClauseKeywords.searchTerm,
+                        operator: '=',
+                        value: searchTerm,
+                    },
+                ],
             },
         };
         (_a = (_e = this.queryLayers.base).expressions) !== null && _a !== void 0 ? _a : (_e.expressions = []);
@@ -316,19 +336,21 @@ export default class Model extends ModelRelations {
         const { table, columns, groupByColumns = [], alias = table, nested, having, } = params;
         const expression = {
             type: 'jsonAggregate',
-            requirements: {
-                phase: QueryEvaluationPhase.PROJECTION,
-                cardinality: 'row',
-                requiresAlias: true,
-                requiresSelectWrapping: true,
-            },
             parameters: {
                 columns: columns,
                 table: table,
                 groupByColumns: groupByColumns,
                 alias: alias,
                 nested: nested,
-                having: having,
+                having: having
+                    ? Array.isArray(having)
+                        ? having
+                        : Object.entries(having).map(([key, value]) => ({
+                            column: key,
+                            operator: '=',
+                            value: value,
+                        }))
+                    : undefined,
             },
         };
         (_a = (_f = this.queryLayers.base).expressionsSelect) !== null && _a !== void 0 ? _a : (_f.expressionsSelect = []);
@@ -353,12 +375,12 @@ export default class Model extends ModelRelations {
             base: {
                 ...this.queryLayers.base,
                 from: this.Configuration.table,
-            }
+            },
         }, this));
         return sql === null || sql === void 0 ? void 0 : sql.replace(/\s+/g, ' ').replace(/\n/g, '');
     }
     collectSelectAliases(def) {
-        const columnAliases = def.columns.map(col => `${def.table}.${col} AS ${def.table}_${col}`);
+        const columnAliases = def.columns.map((col) => `${def.table}.${col} AS ${def.table}_${col}`);
         if (def.nested) {
             for (const child of def.nested) {
                 columnAliases.push(...this.collectSelectAliases(child));

package/dist/abstract/SchemaTableBuilder.d.ts

@@ -1,5 +1,5 @@
 import { ColumnDefinition } from "../types/index.js";
-export default abstract class SchemaTableBuilder {
+export declare abstract class SchemaTableBuilder {
     protected columns: ColumnDefinition[];
     protected addColumn(data: ColumnDefinition): this;
     abstract build(): string;

package/dist/abstract/SchemaTableBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaTableBuilder.d.ts","sourceRoot":"","sources":["../../src/abstract/SchemaTableBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,kBAAkB;IAC5C,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,CAAM;IAE3C,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA2BjD,QAAQ,CAAC,KAAK,IAAI,MAAM;IAExB,QAAQ,CAAC,UAAU,IAAI,IAAI;IAC3B,QAAQ,CAAC,UAAU,IAAI,IAAI;IAC3B,QAAQ,CAAC,QAAQ,IAAI,IAAI;IACzB,QAAQ,CAAC,MAAM,IAAI,IAAI;IACvB,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IACxC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI;IAE1E,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IACnD,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAEpC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAEpD,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACpC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IACxE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAElC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACtC,QAAQ,CAAC,UAAU,IAAI,IAAI;IAE3B,QAAQ,CAAC,WAAW,IAAI,IAAI;IAC5B,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CACtC"}
+{"version":3,"file":"SchemaTableBuilder.d.ts","sourceRoot":"","sources":["../../src/abstract/SchemaTableBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,8BAAsB,kBAAkB;IACpC,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,CAAM;IAE3C,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA2BjD,QAAQ,CAAC,KAAK,IAAI,MAAM;IAExB,QAAQ,CAAC,UAAU,IAAI,IAAI;IAC3B,QAAQ,CAAC,UAAU,IAAI,IAAI;IAC3B,QAAQ,CAAC,QAAQ,IAAI,IAAI;IACzB,QAAQ,CAAC,MAAM,IAAI,IAAI;IACvB,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IACxC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI;IAE1E,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IACnD,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAEpC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAEpD,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACpC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IACxE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAElC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACtC,QAAQ,CAAC,UAAU,IAAI,IAAI;IAE3B,QAAQ,CAAC,WAAW,IAAI,IAAI;IAC5B,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CACtC"}

package/dist/abstract/SchemaTableBuilder.js

@@ -1,4 +1,4 @@
-export default class SchemaTableBuilder {
+export class SchemaTableBuilder {
     constructor() {
         this.columns = [];
     }

package/dist/abstract/model/ModelRelation.d.ts

@@ -1,7 +1,7 @@
-import { columnType, joinedEntity, ModelConfig, QueryWhereCondition, relation } from "../../types/index.js";
-import Model from "../../abstract/Model.js";
-import Repository from '../../runtime/Repository.js';
-export default abstract class ModelRelations<Type extends columnType, Self extends Model<Type> = Model<Type>> {
+import { columnType, joinedEntity, ModelConfig, QueryWhereCondition, relation } from '../../types/index.js';
+import { Model } from '../../abstract/Model.js';
+import { Repository } from '../../runtime/Repository.js';
+export declare abstract class ModelRelations<Type extends columnType, Self extends Model<Type> = Model<Type>> {
     protected joinedEntities: joinedEntity[];
     protected relations: relation[];
     abstract get Configuration(): ModelConfig;
@@ -17,6 +17,7 @@ export default abstract class ModelRelations<Type extends columnType, Self exten
     static with<ParameterModelType extends Model<columnType>>(this: new () => ParameterModelType, relation: string, queryScopes?: QueryWhereCondition): ParameterModelType;
     with(relation: string, queryScopes?: QueryWhereCondition): this;
     asyncWith(relation: string, queryScopes?: QueryWhereCondition): Promise<this>;
+    private finishWith;
     callRelationMethod(relation: string): void | Promise<void>;
     private normalizeQueryScopes;
 }

package/dist/abstract/model/ModelRelation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelRelation.d.ts","sourceRoot":"","sources":["../../../src/abstract/model/ModelRelation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAA6B,mBAAmB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACvI,OAAO,KAAK,MAAM,yBAAyB,CAAC;AAC5C,OAAO,UAAU,MAAM,6BAA6B,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,cAAc,CACxC,IAAI,SAAS,UAAU,EACvB,IAAI,SAAS,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAEtC,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,CAAM;IAC9C,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAM;IAErC,QAAQ,KAAK,aAAa,IAAI,WAAW,CAAC;IAC1C,SAAS,CAAC,QAAQ,KAAK,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5D,SAAS,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC;IAEpC,IAAW,cAAc,IAAI,YAAY,EAAE,CAE1C;IAED,IAAW,SAAS,IAAI,QAAQ,EAAE,CAEjC;IAEY,0BAA0B,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;cAYA,UAAU,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EAC1D,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAA+E,EAC3F,QAAQ,GAAE,MAAsC,EAChD,UAAU,GAAE,MAAuC,EACnD,eAAe,GAAE,MAAkD,EACnE,aAAa,GAAE,MAAqD,EACpE,IAAI,GAAE,MAAmB,EACzB,IAAI,GAAE,MAA2B,GAClC,OAAO,CAAC,IAAI,CAAC;IAsBhB,SAAS,CAAC,OAAO,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EACjD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAAuE,EACnF,QAAQ,GAAE,MAAsC,EAChD,IAAI,GAAE,MAAmE,EACzE,IAAI,GAAE,MAA2B,GAClC,IAAI;IAYP,SAAS,CAAC,MAAM,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EAChD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAA4C,EACxD,QAAQ,GAAE,MAAyE,EACnF,IAAI,GAAE,MAAmE,EACzE,IAAI,GAAE,MAA2B,GAClC,IAAI;IAYP,SAAS,CAAC,SAAS,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EACnD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAAyE,EACrF,QAAQ,GAAE,MAAuC,EACjD,IAAI,GAAE,MAAmE,EACzE,IAAI,GAAE,MAA2B,GAClC,IAAI;WAYO,IAAI,CAAC,kBAAkB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC3D,IAAI,EAAE,UAAU,kBAAkB,EAClC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,mBAAmB,GAClC,kBAAkB;IAKd,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAuBzD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnF,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjE,OAAO,CAAC,oBAAoB;CAuB/B"}
+{"version":3,"file":"ModelRelation.d.ts","sourceRoot":"","sources":["../../../src/abstract/model/ModelRelation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EAEX,mBAAmB,EACnB,QAAQ,EACT,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAIzD,8BAAsB,cAAc,CAClC,IAAI,SAAS,UAAU,EACvB,IAAI,SAAS,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAEtC,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,CAAM;IAC9C,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAM;IAErC,QAAQ,KAAK,aAAa,IAAI,WAAW,CAAC;IAC1C,SAAS,CAAC,QAAQ,KAAK,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5D,SAAS,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC;IAEpC,IAAW,cAAc,IAAI,YAAY,EAAE,CAE1C;IAED,IAAW,SAAS,IAAI,QAAQ,EAAE,CAEjC;IAEY,0BAA0B,CACrC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;cAgBA,UAAU,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EAC5D,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAEA,EACZ,QAAQ,GAAE,MAAsC,EAChD,UAAU,GAAE,MAAuC,EACnD,eAAe,GAAE,MAAkD,EACnE,aAAa,GAAE,MAAqD,EACpE,IAAI,GAAE,MAAmB,EACzB,IAAI,GAAE,MAA2B,GAChC,OAAO,CAAC,IAAI,CAAC;IAyBhB,SAAS,CAAC,OAAO,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EACnD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAAuE,EACnF,QAAQ,GAAE,MAAsC,EAChD,IAAI,GAAE,MAAmE,EACzE,IAAI,GAAE,MAA2B,GAChC,IAAI;IAYP,SAAS,CAAC,MAAM,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EAClD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAA4C,EACxD,QAAQ,GAAE,MAAyE,EACnF,IAAI,GAAE,MAAmE,EACzE,IAAI,GAAE,MAA2B,GAChC,IAAI;IAYP,SAAS,CAAC,SAAS,CAAC,SAAS,SAAS,KAAK,CAAC,UAAU,CAAC,EACrD,KAAK,EAAE,SAAS,EAChB,UAAU,GAAE,MAAyE,EACrF,QAAQ,GAAE,MAAuC,EACjD,IAAI,GAAE,MAAmE,EACzE,IAAI,GAAE,MAA2B,GAChC,IAAI;WAYO,IAAI,CAAC,kBAAkB,SAAS,KAAK,CAAC,UAAU,CAAC,EAC7D,IAAI,EAAE,UAAU,kBAAkB,EAClC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,mBAAmB,GAChC,kBAAkB;IAKd,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAazD,SAAS,CACpB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,mBAAmB,GAChC,OAAO,CAAC,IAAI,CAAC;IAMhB,OAAO,CAAC,UAAU;IAoBX,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjE,OAAO,CAAC,oBAAoB;CA6B7B"}

package/dist/abstract/model/ModelRelation.js

@@ -1,4 +1,6 @@
-export default class ModelRelations {
+import { RelationError } from '../../helpers/Errors/ModelErrors/RelationError.js';
+import { InvalidOperationError } from '../../helpers/Errors/ModelErrors/InvalidOperationError.js';
+export class ModelRelations {
     constructor() {
         this.joinedEntities = [];
         this.relations = [];
@@ -13,11 +15,13 @@ export default class ModelRelations {
         await this.callRelationMethod(otherTable);
         const relation = this.relations.pop();
         if (!relation) {
-            throw new Error(`Relation for pivot table insertion not found.`);
+            throw new RelationError('pivot table insertion', 'Relation not found');
         }
         await this.repository.insertRecordIntoPivotTable(foreignKey, this.self, relation);
     }
-    async ManyToMany(model, pivotTable = [this.Configuration.table, model.Configuration.table].sort().join('_'), localKey = this.Configuration.primaryKey, foreignKey = model.Configuration.primaryKey, pivotForeignKey = `${this.Configuration.table}_${localKey}`, pivotLocalKey = `${model.Configuration.table}_${foreignKey}`, path = pivotTable, name = path.split('.')[1]) {
+    async ManyToMany(model, pivotTable = [this.Configuration.table, model.Configuration.table]
+        .sort()
+        .join('_'), localKey = this.Configuration.primaryKey, foreignKey = model.Configuration.primaryKey, pivotForeignKey = `${this.Configuration.table}_${localKey}`, pivotLocalKey = `${model.Configuration.table}_${foreignKey}`, path = pivotTable, name = path.split('.')[1]) {
         const relation = await this.repository.getManyToManyRelation({
             type: 'manyToMany',
             model: model,
@@ -30,7 +34,7 @@ export default class ModelRelations {
             pivotLocalKey: pivotLocalKey,
         });
         if (!relation) {
-            throw new Error(`Failed to create many-to-many relation for model ${model.Configuration.table}`);
+            throw new RelationError(model.Configuration.table, 'Failed to create many-to-many relation');
         }
         this.relations.push(relation);
         return this;
@@ -42,7 +46,7 @@ export default class ModelRelations {
             foreignKey: foreignKey,
             localKey: localKey,
             path: path,
-            name: name
+            name: name,
         });
         return this;
     }
@@ -53,7 +57,7 @@ export default class ModelRelations {
             foreignKey: foreignKey,
             localKey: localKey,
             path: path,
-            name: name
+            name: name,
         });
         return this;
     }
@@ -64,7 +68,7 @@ export default class ModelRelations {
             foreignKey: foreignKey,
             localKey: localKey,
             path: path,
-            name: name
+            name: name,
         });
         return this;
     }
@@ -73,39 +77,37 @@ export default class ModelRelations {
         return instance.with(relation, queryScopes);
     }
     with(relation, queryScopes) {
-        const result = this.callRelationMethod(relation);
+        const [relationName, alias] = relation.split(' as ').map((s) => s.trim());
+        const result = this.callRelationMethod(relationName);
         if (result instanceof Promise) {
-            throw new Error(`Relation method '${relation}' is asynchronous. Use asyncWith() instead of with().`);
+            throw new InvalidOperationError(`Relation method '${relationName}' is asynchronous. Use asyncWith() instead of with().`);
         }
-        const lastRelation = this.relations[this.relations.length - 1];
-        const tableName = lastRelation.model.Configuration.table;
-        const normalizedScopes = this.normalizeQueryScopes(queryScopes, tableName);
-        this.joinedEntities.push({
-            relation: relation,
-            path: lastRelation.path,
-            queryScopes: normalizedScopes
-        });
-        return this;
+        return this.finishWith(alias, relationName, queryScopes);
     }
     async asyncWith(relation, queryScopes) {
-        await this.callRelationMethod(relation);
+        const [relationName, alias] = relation.split(' as ').map((s) => s.trim());
+        await this.callRelationMethod(relationName);
+        return this.finishWith(alias, relationName, queryScopes);
+    }
+    finishWith(alias, relationName, queryScopes) {
         const lastRelation = this.relations[this.relations.length - 1];
-        const tableName = lastRelation.model.Configuration.table;
+        const tableName = alias || lastRelation.model.Configuration.table;
         const normalizedScopes = this.normalizeQueryScopes(queryScopes, tableName);
         this.joinedEntities.push({
-            relation: relation,
+            relation: relationName,
+            alias: alias,
             path: lastRelation.path,
-            queryScopes: normalizedScopes
+            queryScopes: normalizedScopes,
         });
         return this;
     }
     callRelationMethod(relation) {
         const method = Reflect.get(this, relation);
         if (typeof method !== 'function') {
-            throw new Error(`Relation method '${relation}' does not exist`);
+            throw new RelationError(relation, 'Relation method does not exist');
         }
         const result = method.call(this);
-        //@TODO: check if method is not static 
+        //@TODO: check if method is not static
         // Only return promise if the method is actually async
         return result instanceof Promise ? result : undefined;
     }
@@ -119,10 +121,16 @@ export default class ModelRelations {
             'value' in queryScopes;
         const scopesArray = isSingleParameter
             ? [queryScopes]
-            : this.repository.ConvertParamsToArray(queryScopes);
-        return scopesArray.map(scope => ({
+            : (Array.isArray(queryScopes)
+                ? queryScopes
+                : Object.entries(queryScopes).map(([key, value]) => ({
+                    column: key,
+                    operator: '=',
+                    value,
+                })));
+        return scopesArray.map((scope) => ({
             ...scope,
-            column: `${tableName}.${scope.column}`
+            column: `${tableName}.${scope.column}`,
         }));
     }
 }

package/dist/base/Query.d.ts

@@ -1,14 +1,15 @@
-import { columnType, QueryWhereCondition, QueryIsEqualParameter, TableColumnInfo, QueryComparisonParameters, QueryConstructorType } from '../types/index.js';
+import { columnType, QueryIsEqualParameter, TableColumnInfo, QueryConstructorType } from '../types/index.js';
 import { Record } from '../index.js';
 /** Query class for executing custom SQL queries */
-export default class Query {
+export declare class Query {
     readonly TableName: string;
     private readonly _adapter;
     private readonly _recordFactory;
     private readonly _queryCache;
     private _query?;
     private _parameters;
-    get Parameters(): QueryWhereCondition;
+    get Parameters(): QueryIsEqualParameter;
+    private serializeParameters;
     constructor({ tableName, query, parameters, adapterName, recordFactory, }: QueryConstructorType);
     private throwIfTableNotExists;
     /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
@@ -20,10 +21,5 @@ export default class Query {
     TableColumnInformation(tableName: string): Promise<TableColumnInfo[]>;
     DoesTableExist(): Promise<boolean>;
     Count(): Promise<number>;
-    ConvertParamsToArray(params: QueryWhereCondition): QueryComparisonParameters[];
-    /** Convert various parameter formats to a consistent object format */
-    ConvertParamsToObject(params: QueryWhereCondition): QueryIsEqualParameter;
-    /** Databases don't like numeric values when inserting with a query */
-    ConvertValueToString(params: QueryIsEqualParameter): QueryIsEqualParameter;
 }
 //# sourceMappingURL=Query.d.ts.map

package/dist/base/Query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/base/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAa,MAAM,EAAoB,MAAM,gBAAgB,CAAC;AAKrE,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAA2B;IAE9C,IAAW,UAAU,IAAI,mBAAmB,CAE3C;gBAEW,EACV,SAAS,EACT,KAAK,EACL,UAAU,EACV,WAAW,EACX,aACoC,GACrC,EAAE,oBAAoB;YAaT,qBAAqB;IAWnC,gEAAgE;IACnD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAUvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAWpE,+DAA+D;IAClD,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAClD,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CACzB;IAaY,sBAAsB,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,EAAE,CAAC;IAUhB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAalC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAW9B,oBAAoB,CACzB,MAAM,EAAE,mBAAmB,GAC1B,yBAAyB,EAAE;IAkB9B,sEAAsE;IAC/D,qBAAqB,CAC1B,MAAM,EAAE,mBAAmB,GAC1B,qBAAqB;IAaxB,sEAAsE;IAC/D,oBAAoB,CACzB,MAAM,EAAE,qBAAqB,GAC5B,qBAAqB;CAYzB"}
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/base/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,qBAAqB,EACrB,eAAe,EACf,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAa,MAAM,EAAoB,MAAM,gBAAgB,CAAC;AAOrE,mDAAmD;AACnD,qBAAa,KAAK;IAChB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAC3D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IAEzC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAA6B;IAEhD,IAAW,UAAU,IAAI,qBAAqB,CAE7C;IAED,OAAO,CAAC,mBAAmB;gBAmBf,EACV,SAAS,EACT,KAAK,EACL,UAAU,EACV,WAAW,EACX,aAA+C,GAChD,EAAE,oBAAoB;YAmBT,qBAAqB;IAWnC,gEAAgE;IACnD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAcvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAoBpE,+DAA+D;IAClD,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAClD,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CACzB;IAoBY,sBAAsB,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,EAAE,CAAC;IAiBhB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAoBlC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;CActC"}