drizzle-orm 0.10.46 → 0.11.1

package/builders/highLvlBuilders/selectRequestBuilder.d.ts

@@ -0,0 +1,63 @@
+import { AbstractColumn } from '../../columns/column';
+import ColumnType from '../../columns/types/columnType';
+import DB from '../../db/db';
+import { ISession } from '../../db/session';
+import BaseLogger from '../../logger/abstractLogger';
+import { AbstractTable } from '../../tables';
+import { ExtractModel, ExtractPartialObjectFromColumns, FullOrPartial, PartialFor } from '../../tables/inferTypes';
+import SelectTRBWithJoin from '../joinBuilders/builders/selectWithJoin';
+import Expr from '../requestBuilders/where/where';
+import TableRequestBuilder from './abstractRequestBuilder';
+import JoinBuilder, { EmptyPartial, TableIfPartialIsUndefined } from './joins/selectJoinBuilder';
+import Order from './order';
+export default class SelectTRB<TTable extends AbstractTable<TTable>, TPartial extends EmptyPartial<TTable> = undefined> extends TableRequestBuilder<TTable, TPartial> {
+    protected _filter: Expr;
+    private props;
+    private __orderBy?;
+    private __groupBy?;
+    private __order?;
+    private __distinct;
+    private __partial?;
+    constructor(session: ISession, mappedServiceToDb: {
+        [name in keyof ExtractModel<TTable>]: AbstractColumn<ColumnType>;
+    }, props: {
+        limit?: number;
+        offset?: number;
+    }, table: AbstractTable<TTable>, logger?: BaseLogger, partial?: TPartial);
+    private join;
+    innerJoin<TJoinedTable extends AbstractTable<TJoinedTable>, TJoinedPartial extends EmptyPartial<TJoinedTable> = undefined>(value: TJoinedTable, callback: (...args: [TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>]) => Expr, partial?: TJoinedPartial): JoinBuilder<[TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>], [FullOrPartial<TTable, TPartial>, FullOrPartial<TJoinedTable, TJoinedPartial>]>;
+    leftJoin<TJoinedTable extends AbstractTable<TJoinedTable>, TJoinedPartial extends EmptyPartial<TJoinedTable> = undefined>(value: TJoinedTable, callback: (...args: [TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>]) => Expr, partial?: TJoinedPartial): JoinBuilder<[TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>], [FullOrPartial<TTable, TPartial>, FullOrPartial<TJoinedTable, TJoinedPartial>]>;
+    rightJoin<TJoinedTable extends AbstractTable<TJoinedTable>, TJoinedPartial extends EmptyPartial<TJoinedTable> = undefined>(value: TJoinedTable, callback: (...args: [TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>]) => Expr, partial?: TJoinedPartial): JoinBuilder<[TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>], [FullOrPartial<TTable, TPartial>, FullOrPartial<TJoinedTable, TJoinedPartial>]>;
+    fullJoin<TJoinedTable extends AbstractTable<TJoinedTable>, TJoinedPartial extends EmptyPartial<TJoinedTable> = undefined>(value: TJoinedTable, callback: (...args: [TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>]) => Expr, partial?: TJoinedPartial): JoinBuilder<[TableIfPartialIsUndefined<TPartial, ExtractPartialObjectFromColumns<TTable>>, TableIfPartialIsUndefined<TJoinedPartial, ExtractPartialObjectFromColumns<TJoinedTable>>], [FullOrPartial<TTable, TPartial>, FullOrPartial<TJoinedTable, TJoinedPartial>]>;
+    where: (expr: Expr) => Omit<this, 'leftJoin' | 'rightJoin' | 'innerJoin' | 'fullJoin'>;
+    orderBy<TColumnType extends ColumnType>(callback: (table: TTable) => AbstractColumn<TColumnType, boolean, boolean>, order: Order): SelectTRB<TTable, TPartial>;
+    distinct: (column: AbstractColumn<ColumnType<any>, boolean, boolean>) => SelectTRB<TTable, TPartial>;
+    limit: (limit: number) => SelectTRB<TTable, TPartial>;
+    offset: (offset: number) => SelectTRB<TTable, TPartial>;
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link innerJoinV2()} instead
+    */
+    innerJoinV1<TColumn extends ColumnType, TToColumn extends ColumnType, IToTable extends AbstractTable<IToTable>, IToPartial extends PartialFor<IToTable>>(table: {
+        new (db: DB): IToTable;
+    }, from: (table: TTable) => AbstractColumn<TColumn, boolean, boolean>, to: (table: IToTable) => AbstractColumn<TToColumn, boolean, boolean>, partial?: IToPartial): SelectTRBWithJoin<TTable, IToTable, TPartial extends undefined ? {} : TPartial, IToPartial>;
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link leftJoin()} instead
+    */
+    leftJoinV1<TColumn extends ColumnType<any>, IToColumn extends ColumnType<any>, IToTable extends AbstractTable<IToTable>, IToPartial extends PartialFor<IToTable> = {}>(table: {
+        new (db: DB): IToTable;
+    }, from: (table: TTable) => AbstractColumn<TColumn, boolean, boolean, TTable>, to: (table: IToTable) => AbstractColumn<IToColumn, boolean, boolean, IToTable>, partial?: IToPartial): SelectTRBWithJoin<TTable, IToTable, TPartial extends undefined ? {} : TPartial, IToPartial>;
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link rightJoin()} instead
+    */
+    rightJoinV1<TColumn extends ColumnType, TToColumn extends ColumnType, IToTable extends AbstractTable<IToTable>, IToPartial extends PartialFor<IToTable> = {}>(table: {
+        new (db: DB): IToTable;
+    }, from: (table: TTable) => AbstractColumn<TColumn, boolean, boolean>, to: (table: IToTable) => AbstractColumn<TToColumn, boolean, boolean>, partial?: IToPartial): SelectTRBWithJoin<TTable, IToTable, TPartial extends undefined ? {} : TPartial, IToPartial>;
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link fullJoin()} instead
+    */
+    fullJoinV1<TColumn extends ColumnType, TToColumn extends ColumnType, IToTable extends AbstractTable<IToTable>, IToPartial extends PartialFor<IToTable> = {}>(table: {
+        new (db: DB): IToTable;
+    }, from: (table: TTable) => AbstractColumn<TColumn, boolean, boolean>, to: (table: IToTable) => AbstractColumn<TToColumn, boolean, boolean>, partial?: IToPartial): SelectTRBWithJoin<TTable, IToTable, TPartial extends undefined ? {} : TPartial, IToPartial>;
+    execute: () => Promise<([keyof TPartial] extends [never] ? ExtractModel<TTable> : ExtractModel<TPartial>)[]>;
+    protected _execute: () => Promise<Array<[keyof TPartial] extends [never] ? ExtractModel<TTable> : ExtractModel<TPartial>>>;
+}

package/{src/builders → builders}/highLvlBuilders/selectRequestBuilder.js

@@ -28,6 +28,8 @@ const responseMapper_1 = __importDefault(require("../../mappers/responseMapper")
 const selectWithJoin_1 = __importDefault(require("../joinBuilders/builders/selectWithJoin"));
 const join_1 = require("../joinBuilders/join");
 const abstractRequestBuilder_1 = __importDefault(require("./abstractRequestBuilder"));
+const joinProxies_1 = require("./joins/proxies/joinProxies");
+const selectJoinBuilder_1 = __importDefault(require("./joins/selectJoinBuilder"));
 class SelectTRB extends abstractRequestBuilder_1.default {
     constructor(session, mappedServiceToDb, props, table, logger, partial) {
         super(table, session, mappedServiceToDb, logger);
@@ -70,8 +72,6 @@ class SelectTRB extends abstractRequestBuilder_1.default {
             catch (e) {
                 throw new builderError_1.default(builderError_1.BuilderType.SELECT, this._table.tableName(), this._columns, e, this._session, this._filter);
             }
-            console.log(query);
-            console.log(values);
             if (this._logger) {
                 this._logger.info(`Selecting from ${this._table.tableName()} using query:\n ${query}`);
                 this._logger.info(`Values for query:\n ${values}`);
@@ -85,6 +85,33 @@ class SelectTRB extends abstractRequestBuilder_1.default {
         this.props = props;
         this.__partial = partial;
     }
+    join(value, callback, joinType, partial) {
+        const valueAsProxy = new Proxy(value, new joinProxies_1.JoinedHandler(1));
+        if (partial) {
+            for (const key of Object.keys(partial)) {
+                // eslint-disable-next-line no-param-reassign
+                partial[key] = new Proxy(partial[key], new joinProxies_1.JoinedColumn(value, 1));
+            }
+        }
+        const obj = this.__partial ? this.__partial
+            : this._table.mapServiceToDb();
+        const obj1 = partial ? partial
+            : valueAsProxy.mapServiceToDb();
+        const joinExpression = callback(obj, obj1);
+        return new selectJoinBuilder_1.default([obj, obj1], value.tableName(), 1, joinExpression, valueAsProxy, joinType, this._table, this._filter, this.props, this.__orderBy, this.__order, this.__distinct, this.__partial, this._logger);
+    }
+    innerJoin(value, callback, partial) {
+        return this.join(value, callback, 'INNER JOIN', partial);
+    }
+    leftJoin(value, callback, partial) {
+        return this.join(value, callback, 'LEFT JOIN', partial);
+    }
+    rightJoin(value, callback, partial) {
+        return this.join(value, callback, 'RIGHT JOIN', partial);
+    }
+    fullJoin(value, callback, partial) {
+        return this.join(value, callback, 'FULL JOIN', partial);
+    }
     orderBy(callback, order) {
         this.__orderBy = callback(this._table);
         this.__order = order;
@@ -95,7 +122,10 @@ class SelectTRB extends abstractRequestBuilder_1.default {
     //   this.__groupBy = callback(this.__table);
     //   return this;
     // }
-    innerJoin(table, from, to, partial) {
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link innerJoinV2()} instead
+    */
+    innerJoinV1(table, from, to, partial) {
         const toTable = this._table.db.create(table);
         const fromColumn = from(this._table);
         const toColumn = to(toTable);
@@ -103,7 +133,10 @@ class SelectTRB extends abstractRequestBuilder_1.default {
             .columns(fromColumn, toColumn).joinStrategy(join_1.JoinStrategy.INNER_JOIN);
         return new selectWithJoin_1.default(this._table, this._session, this._filter, join, this.props, this.__orderBy, this.__order, this.__distinct, this.__partial, partial, this._logger);
     }
-    leftJoin(table, from, to, partial) {
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link leftJoin()} instead
+    */
+    leftJoinV1(table, from, to, partial) {
         const toTable = this._table.db.create(table);
         const fromColumn = from(this._table);
         const toColumn = to(toTable);
@@ -111,7 +144,10 @@ class SelectTRB extends abstractRequestBuilder_1.default {
             .columns(fromColumn, toColumn).joinStrategy(join_1.JoinStrategy.LEFT_JOIN);
         return new selectWithJoin_1.default(this._table, this._session, this._filter, join, this.props, this.__orderBy, this.__order, this.__distinct, this.__partial, partial, this._logger);
     }
-    rightJoin(table, from, to, partial) {
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link rightJoin()} instead
+    */
+    rightJoinV1(table, from, to, partial) {
         const toTable = this._table.db.create(table);
         const fromColumn = from(this._table);
         const toColumn = to(toTable);
@@ -119,7 +155,10 @@ class SelectTRB extends abstractRequestBuilder_1.default {
             .columns(fromColumn, toColumn).joinStrategy(join_1.JoinStrategy.RIGHT_JOIN);
         return new selectWithJoin_1.default(this._table, this._session, this._filter, join, this.props, this.__orderBy, this.__order, this.__distinct, this.__partial, partial, this._logger);
     }
-    fullJoin(table, from, to, partial) {
+    /**
+    * @deprecated Since version 0.11.0. Will be deleted in version 0.12.0. Use {@link fullJoin()} instead
+    */
+    fullJoinV1(table, from, to, partial) {
         const toTable = this._table.db.create(table);
         const fromColumn = from(this._table);
         const toColumn = to(toTable);

package/{src/builders → builders}/index.d.ts

@@ -2,6 +2,9 @@ export { default as DeleteTRB } from './highLvlBuilders/deleteRequestBuilder';
 export { default as InsertTRB } from './highLvlBuilders/insertRequestBuilder';
 export { default as SelectTRB } from './highLvlBuilders/selectRequestBuilder';
 export { default as UpdateTRB } from './highLvlBuilders/updateRequestBuilder';
+export * from './highLvlBuilders/joins/selectJoinBuilder';
+export { default as JoinBuilderResponses } from './highLvlBuilders/joins/joinBuilderResponse';
+export * from './highLvlBuilders/joins/proxies/joinProxies';
 export { default as to } from './joinBuilders/static';
 export { default as JoinWith } from './joinBuilders/joinWith';
 export { default as Join } from './joinBuilders/join';

package/{src/builders → builders}/index.js

@@ -1,9 +1,19 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotNull = exports.raw = exports.lessEq = exports.less = exports.greaterEq = exports.greater = exports.like = exports.or = exports.and = exports.in = exports.eq = exports.combine = exports.set = exports.Update = exports.Select = exports.Insert = exports.Delete = exports.Create = exports.SelectResponseJoin = exports.SelectResponseTwoJoins = exports.SelectTRBWithTwoJoins = exports.SelectTRBWithJoin = exports.Join = exports.JoinWith = exports.to = exports.UpdateTRB = exports.SelectTRB = exports.InsertTRB = exports.DeleteTRB = void 0;
+exports.isNotNull = exports.raw = exports.lessEq = exports.less = exports.greaterEq = exports.greater = exports.like = exports.or = exports.and = exports.in = exports.eq = exports.combine = exports.set = exports.Update = exports.Select = exports.Insert = exports.Delete = exports.Create = exports.SelectResponseJoin = exports.SelectResponseTwoJoins = exports.SelectTRBWithTwoJoins = exports.SelectTRBWithJoin = exports.Join = exports.JoinWith = exports.to = exports.JoinBuilderResponses = exports.UpdateTRB = exports.SelectTRB = exports.InsertTRB = exports.DeleteTRB = void 0;
 /* eslint-disable import/no-cycle */
 var deleteRequestBuilder_1 = require("./highLvlBuilders/deleteRequestBuilder");
 Object.defineProperty(exports, "DeleteTRB", { enumerable: true, get: function () { return __importDefault(deleteRequestBuilder_1).default; } });
@@ -13,6 +23,10 @@ var selectRequestBuilder_1 = require("./highLvlBuilders/selectRequestBuilder");
 Object.defineProperty(exports, "SelectTRB", { enumerable: true, get: function () { return __importDefault(selectRequestBuilder_1).default; } });
 var updateRequestBuilder_1 = require("./highLvlBuilders/updateRequestBuilder");
 Object.defineProperty(exports, "UpdateTRB", { enumerable: true, get: function () { return __importDefault(updateRequestBuilder_1).default; } });
+__exportStar(require("./highLvlBuilders/joins/selectJoinBuilder"), exports);
+var joinBuilderResponse_1 = require("./highLvlBuilders/joins/joinBuilderResponse");
+Object.defineProperty(exports, "JoinBuilderResponses", { enumerable: true, get: function () { return __importDefault(joinBuilderResponse_1).default; } });
+__exportStar(require("./highLvlBuilders/joins/proxies/joinProxies"), exports);
 var static_1 = require("./joinBuilders/static");
 Object.defineProperty(exports, "to", { enumerable: true, get: function () { return __importDefault(static_1).default; } });
 var joinWith_1 = require("./joinBuilders/joinWith");

package/{src/builders → builders}/joinBuilders/builders/abstractJoinBuilder.js

@@ -37,7 +37,7 @@ class AbstractJoined {
         };
         this.execute = async () => {
             const queryBuilder = select_1.default
-                .from(this._table, this._partial)
+                .fromV1(this._table, this._partial)
                 .distinct(this._distinct)
                 .joined(this.joins())
                 .limit(this._props.limit)

package/{src/builders → builders}/lowLvlBuilders/selects/select.d.ts

@@ -1,9 +1,12 @@
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import { AbstractTable } from '../../../tables';
-import SelectFrom from './selectFrom';
+import SelectFrom, { SelectFromV1 } from './selectFrom';
 export default class Select {
     static from: <TTable extends AbstractTable<TTable>, TType extends ColumnType<any>, TColumn extends AbstractColumn<TType, boolean, boolean, TTable>, T extends {
         [name: string]: TColumn;
     } = {}>(table: AbstractTable<TTable>, partial?: T | undefined) => SelectFrom;
+    static fromV1: <TTable extends AbstractTable<TTable>, TType extends ColumnType<any>, TColumn extends AbstractColumn<TType, boolean, boolean, TTable>, T extends {
+        [name: string]: TColumn;
+    } = {}>(table: AbstractTable<TTable>, partial?: T | undefined) => SelectFromV1;
 }

package/builders/lowLvlBuilders/selects/select.js

@@ -0,0 +1,42 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const selectAggregatorV1_1 = __importDefault(require("../../aggregators/selectAggregatorV1"));
+const selectAggregator_1 = __importDefault(require("../../aggregators/selectAggregator"));
+const selectFrom_1 = __importStar(require("./selectFrom"));
+class Select {
+}
+exports.default = Select;
+// eslint-disable-next-line max-len
+Select.from = (table, partial) => {
+    const aggregator = new selectAggregator_1.default(table, partial);
+    aggregator.appendFrom(table.tableName());
+    return new selectFrom_1.default(aggregator);
+};
+// eslint-disable-next-line max-len
+Select.fromV1 = (table, partial) => {
+    const aggregator = new selectAggregatorV1_1.default(table, partial);
+    aggregator.appendFrom(table.tableName());
+    return new selectFrom_1.SelectFromV1(aggregator);
+};

package/{src/builders → builders}/lowLvlBuilders/selects/selectFrom.d.ts

@@ -1,26 +1,43 @@
+import AbstractTable from '../../../tables/abstractTable';
+import SelectAggregatorV1 from '../../aggregators/selectAggregatorV1';
+import { JoinType } from '../../highLvlBuilders/joins/selectJoinBuilder';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import SelectAggregator from '../../aggregators/selectAggregator';
 import Order from '../../highLvlBuilders/order';
 import Join from '../../joinBuilders/join';
 import Expr from '../../requestBuilders/where/where';
-import SelectJoined from './selectJoined';
-import WhereSelect from './whereSelect';
+import SelectJoined, { SelectJoinedV1 } from './selectJoined';
+import WhereSelect, { WhereSelectV1 } from './whereSelect';
 export default class SelectFrom {
     private _aggregator;
     constructor(aggregator: SelectAggregator);
+    joined: (joins: Array<JoinType<AbstractTable<any>>>) => SelectJoined;
+    limit: (limit?: number | undefined) => SelectFrom;
+    offset: (offset?: number | undefined) => SelectFrom;
+    orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectFrom;
+    distinct: (column?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined) => SelectFrom;
+    filteredBy: (filters: Expr) => WhereSelect;
+    build: () => {
+        query: string;
+        values: any[];
+    };
+}
+export declare class SelectFromV1 {
+    private _aggregator;
+    constructor(aggregator: SelectAggregatorV1);
     joined: (joins: {
         join: Join<any>;
         partial?: {
             [name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, any>;
         } | undefined;
         id?: number | undefined;
-    }[]) => SelectJoined;
-    limit: (limit?: number | undefined) => SelectFrom;
-    offset: (offset?: number | undefined) => SelectFrom;
-    orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectFrom;
-    distinct: (column?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined) => SelectFrom;
-    filteredBy: (filters: Expr) => WhereSelect;
+    }[]) => SelectJoinedV1;
+    limit: (limit?: number | undefined) => SelectFromV1;
+    offset: (offset?: number | undefined) => SelectFromV1;
+    orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectFromV1;
+    distinct: (column?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined) => SelectFromV1;
+    filteredBy: (filters: Expr) => WhereSelectV1;
     build: () => {
         query: string;
         values: any[];

package/builders/lowLvlBuilders/selects/selectFrom.js

@@ -0,0 +1,78 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectFromV1 = void 0;
+const selectJoined_1 = __importStar(require("./selectJoined"));
+const whereSelect_1 = __importStar(require("./whereSelect"));
+class SelectFrom {
+    constructor(aggregator) {
+        this.joined = (joins) => new selectJoined_1.default(this._aggregator).apply(joins);
+        this.limit = (limit) => {
+            this._aggregator.limit(limit);
+            return this;
+        };
+        this.offset = (offset) => {
+            this._aggregator.offset(offset);
+            return this;
+        };
+        this.orderBy = (orderBy, order) => {
+            this._aggregator.orderBy(orderBy, order);
+            return this;
+        };
+        this.distinct = (column) => {
+            if (column) {
+                this._aggregator.distinct(column);
+            }
+            return this;
+        };
+        this.filteredBy = (filters) => new whereSelect_1.default(this._aggregator).apply(filters);
+        this.build = () => this._aggregator.buildQuery();
+        this._aggregator = aggregator;
+    }
+}
+exports.default = SelectFrom;
+class SelectFromV1 {
+    constructor(aggregator) {
+        this.joined = (joins) => new selectJoined_1.SelectJoinedV1(this._aggregator).apply(joins);
+        this.limit = (limit) => {
+            this._aggregator.limit(limit);
+            return this;
+        };
+        this.offset = (offset) => {
+            this._aggregator.offset(offset);
+            return this;
+        };
+        this.orderBy = (orderBy, order) => {
+            this._aggregator.orderBy(orderBy, order);
+            return this;
+        };
+        this.distinct = (column) => {
+            if (column) {
+                this._aggregator.distinct(column);
+            }
+            return this;
+        };
+        this.filteredBy = (filters) => new whereSelect_1.WhereSelectV1(this._aggregator).apply(filters);
+        this.build = () => this._aggregator.buildQuery();
+        this._aggregator = aggregator;
+    }
+}
+exports.SelectFromV1 = SelectFromV1;

package/{src/builders → builders}/lowLvlBuilders/selects/selectJoined.d.ts

@@ -1,24 +1,40 @@
+import AbstractTable from '../../../tables/abstractTable';
+import { JoinType } from '../../highLvlBuilders/joins/selectJoinBuilder';
+import SelectAggregatorV1 from '../../aggregators/selectAggregatorV1';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import SelectAggregator from '../../aggregators/selectAggregator';
 import Order from '../../highLvlBuilders/order';
 import Join from '../../joinBuilders/join';
 import Expr from '../../requestBuilders/where/where';
-import WhereSelect from './whereSelect';
+import WhereSelect, { WhereSelectV1 } from './whereSelect';
 export default class SelectJoined {
     private _aggregator;
     constructor(aggregator: SelectAggregator);
+    apply: (joins: Array<JoinType<AbstractTable<any>>>) => SelectJoined;
+    limit: (limit?: number | undefined) => SelectJoined;
+    offset: (offset?: number | undefined) => SelectJoined;
+    orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectJoined;
+    filteredBy: (filters: Expr) => WhereSelect;
+    build: () => {
+        query: string;
+        values: any[];
+    };
+}
+export declare class SelectJoinedV1 {
+    private _aggregator;
+    constructor(aggregator: SelectAggregatorV1);
     apply: (joins: {
         join: Join<any>;
         partial?: {
             [name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, any>;
         } | undefined;
         id?: number | undefined;
-    }[]) => SelectJoined;
-    limit: (limit?: number | undefined) => SelectJoined;
-    offset: (offset?: number | undefined) => SelectJoined;
-    orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectJoined;
-    filteredBy: (filters: Expr) => WhereSelect;
+    }[]) => SelectJoinedV1;
+    limit: (limit?: number | undefined) => SelectJoinedV1;
+    offset: (offset?: number | undefined) => SelectJoinedV1;
+    orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectJoinedV1;
+    filteredBy: (filters: Expr) => WhereSelectV1;
     build: () => {
         query: string;
         values: any[];