drizzle-orm 0.10.47 → 0.11.2

package/README.md

@@ -342,79 +342,71 @@ await usersTable.insertMany([{
 const usersTable = new UsersTable(db);
 const citiesTable = new CitiesTable(db);
 
- const userWithCities = await citiesTable.select()
-      .where(eq(citiesTable.id, 1))
-      .leftJoin(UsersTable,
-        (city) => city.userId,
-        (users) => users.id)
-      .execute();
+const userWithCities = await citiesTable.select()
+  .leftJoin(usersTable, (cities, users) => eq(cities.userId, users.id))
+  .where((cities, users) => eq(cities.id, 1))
+  .execute();
 
 const citiesWithUserObject = userWithCities.map((city, user) => ({ ...city, user }));
 ```
 
 ### Join Many-To-Many Tables
-##### Join User Groups with Users, using many-to-many table and map response to get user object with groups array
-```typescript
-    const usersWithUserGroups = await usersToUserGroupsTable.select()
-      .where(eq(userGroupsTable.id, 1))
-      .leftJoin(UsersTable,
-        (userToGroup) => userToGroup.userId,
-        (users) => users.id)
-      .leftJoin(UsersToUserGroupsTable, UserGroupsTable,
-        (userToGroup) => userToGroup.groupId,
-        (users) => users.id)
-      .execute();
-
-    const userGroupWithUsers = usersWithUserGroups.group({
-      one: (_, dbUser, dbUserGroup) => dbUser!,
-      many: (_, dbUser, dbUserGroup) => dbUserGroup!,
-    });
-
-    const userWithGroups: ExtractModel<UsersTable> & { groups: ExtractModel<UserGroupsTable>[] } = {
-      ...userGroupWithUsers.one,
-      groups: userGroupWithUsers.many,
-    };
-```
-##### Join User Groups with Users, using many-to-many table and map response to get user group object with users array
-```typescript
-    const usersWithUserGroups = await usersToUserGroupsTable.select()
-      .where(eq(userGroupsTable.id, 1))
-      .leftJoin(UsersTable,
-        (userToGroup) => userToGroup.userId,
-        (users) => users.id)
-      .leftJoin(UsersToUserGroupsTable, UserGroupsTable,
-        (userToGroup) => userToGroup.groupId,
-        (users) => users.id)
-      .execute();
-
-    const userGroupWithUsers = usersWithUserGroups.group({
-      one: (_, dbUser, dbUserGroup) => dbUserGroup!,
-      many: (_, dbUser, dbUserGroup) => dbUser!,
-    });
-
-    const userWithGroups: ExtractModel<UserGroupsTable> & { users: ExtractModel<UsersTable>[] } = {
-      ...userGroupWithUsers.one,
-      users: userGroupWithUsers.many,
-    };
+##### Join User Groups with Users, using many-to-many table
+```typescript
+const usersWithUserGroups = await usersToUserGroupsTable.select()
+  .leftJoin(usersTable, (usersToUserGroups, users) => eq(usersToUserGroups.userId, users.id))
+  .leftJoin(userGroupsTable, (usersToUserGroups, _users, userGroups) => eq(usersToUserGroups.groupId, userGroups.id))
+  .where((usersToUserGroups, _users, userGroups) => eq(userGroups.id, 1))
+  .execute();
 ```
 ### Join using partial field select
 ##### Join Cities with Users getting only needed fields form request
 ```typescript
-await citiesTable.select({
+    await citiesTable.select({
       id: citiesTable.id,
       userId: citiesTable.userId,
     })
-    .where(eq(citiesTable.id, 1))
-    .leftJoin(UsersTable,
-        (city) => city.userId,
-        (users) => users.id,
-        {
-          id: usersTable.id,
-        })
-    .execute();
+      .leftJoin(usersTable, (cities, users) => eq(cities.userId, users.id))
+      .where((cities, users) => eq(cities.id, 1))
+      .execute();
 
 const citiesWithUserObject = userWithCities.map((city, user) => ({ ...city, user }));
 ```
+### Another join examples with different callback ON statements
+```typescript
+await citiesTable.select()
+  .leftJoin(usersTable, (cities, _users) => eq(cities.id, 13))
+  .where((cities, _users) => eq(cities.location, 'q'))
+  .execute();
+// Join statement generated from query
+// LEFT JOIN users AS users_1
+// ON cities."id"=$1
+// WHERE cities."page"=$2
+//
+// Values: [13, 'q']
+
+await citiesTable.select()
+  .leftJoin(usersTable, (cities, _users) => and([
+    eq(cities.id, 13), notEq(cities.id, 14),
+  ]))
+  .execute();
+// Join statement generated from query
+// LEFT JOIN users AS users_1
+// ON (cities."id"=$1 and cities."id"!=$2)
+//
+// Values: [13, 14]
+
+await citiesTable.select()
+  .leftJoin(usersTable, (_cities, _users) => raw('<custom expression after ON statement>'))
+  .where((cities, _users) => eq(cities.location, 'location'))
+  .execute();
+// Join statement generated from query
+// LEFT JOIN users AS users_1
+// ON <custom expression after ON statement>
+// WHERE cities."page"=$1
+// 
+// Values: ['location']
+```
 
 
 ## Migrations

package/builders/aggregators/abstractAggregator.d.ts

@@ -8,4 +8,5 @@ export default class Aggregator {
         [name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, AbstractTable<any>>;
     });
     protected generateSelectArray: (table: string, columns: AbstractColumn<ColumnType>[], id?: number | undefined) => string[];
+    protected generateSelectArrayV1: (table: string, columns: AbstractColumn<ColumnType>[], id?: number | undefined) => string[];
 }

package/builders/aggregators/abstractAggregator.js

@@ -8,6 +8,22 @@ class Aggregator {
     constructor(table, partial) {
         this._fields = [];
         this.generateSelectArray = (table, columns, id) => {
+            const selectFields = [];
+            columns.forEach((field) => {
+                if (field instanceof column_1.Column) {
+                    selectFields.push(' ');
+                    selectFields.push(table);
+                    selectFields.push('.');
+                    selectFields.push(ecranate_1.ecranate(field.getColumnName()));
+                    selectFields.push(' AS ');
+                    selectFields.push(ecranate_1.ecranate(`${table}_${field.getColumnName()}`));
+                    selectFields.push(',');
+                }
+            });
+            selectFields.pop();
+            return selectFields;
+        };
+        this.generateSelectArrayV1 = (table, columns, id) => {
             const selectFields = [];
             columns.forEach((field) => {
                 if (field instanceof column_1.Column) {
@@ -33,3 +49,4 @@ class Aggregator {
     }
 }
 exports.default = Aggregator;
+//# sourceMappingURL=abstractAggregator.js.map

package/builders/aggregators/abstractAggregator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abstractAggregator.js","sourceRoot":"","sources":["../../../../src/builders/aggregators/abstractAggregator.ts"],"names":[],"mappings":";;AAAA,4BAA4B;AAC5B,iDAA8D;AAG9D,mDAAgD;AAEhD,mCAAmC;AACnC,MAAqB,UAAU;IAI7B,YAAmB,KAAyB,EAAE,OAAmG;QAHvI,YAAO,GAAkB,EAAE,CAAC;QAc5B,wBAAmB,GAAG,CAAC,KAAa,EAAE,OAAqC,EAAE,EAAW,EAAE,EAAE;YACpG,MAAM,YAAY,GAAa,EAAE,CAAC;YAElC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC7B,IAAI,KAAK,YAAY,eAAM,EAAE;oBAC3B,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACzB,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,YAAY,CAAC,IAAI,CAAC,mBAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;oBACnD,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC1B,YAAY,CAAC,IAAI,CAAC,mBAAQ,CAAC,GAAG,KAAK,IAAI,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC;oBACjE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACxB;YACH,CAAC,CAAC,CAAC;YAEH,YAAY,CAAC,GAAG,EAAE,CAAC;YACnB,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;QAEQ,0BAAqB,GAAG,CAAC,KAAa,EAAE,OAAqC,EAAE,EAAW,EAAE,EAAE;YACtG,MAAM,YAAY,GAAa,EAAE,CAAC;YAElC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;gBAC7B,IAAI,KAAK,YAAY,eAAM,EAAE;oBAC3B,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACzB,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,YAAY,CAAC,IAAI,CAAC,mBAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;oBACnD,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC1B,YAAY,CAAC,IAAI,CAAC,mBAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;oBACxE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACxB;YACH,CAAC,CAAC,CAAC;YAEH,YAAY,CAAC,GAAG,EAAE,CAAC;YACnB,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;QA9CA,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAC7D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;SAChD;aAAM;YACL,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAC7D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;SAC3B;IACH,CAAC;CAuCF;AApDD,6BAoDC"}

package/builders/aggregators/deleteAggregator.js

@@ -40,3 +40,4 @@ class DeleteAggregator extends abstractAggregator_1.default {
     }
 }
 exports.default = DeleteAggregator;
+//# sourceMappingURL=deleteAggregator.js.map

package/builders/aggregators/deleteAggregator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteAggregator.js","sourceRoot":"","sources":["../../../../src/builders/aggregators/deleteAggregator.ts"],"names":[],"mappings":";;;;;AAEA,8EAA8C;AAE9C,MAAqB,gBAAiB,SAAQ,4BAAU;IAMtD,YAAmB,KAAyB;QAC1C,KAAK,CAAC,KAAK,CAAC,CAAC;QANP,UAAK,GAAkB,EAAE,CAAC;QAC1B,aAAQ,GAAkB,EAAE,CAAC;QAC7B,YAAO,GAAe,EAAE,CAAC;QACzB,YAAO,GAAkB,CAAC,QAAQ,CAAC,CAAC;QAMrC,YAAO,GAAG,CAAC,OAAa,EAAoB,EAAE;YACnD,IAAI,OAAO,EAAE;gBACX,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC;aACnC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEK,eAAU,GAAG,CAAC,SAAiB,EAAoB,EAAE;YAC1D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEK,eAAU,GAAG,GAA0C,EAAE;YAC9D,4CAA4C;YAC5C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAEzC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QAChE,CAAC,CAAC;IA9BF,CAAC;CA+BF;AAvCD,mCAuCC"}

package/builders/aggregators/insertAggregator.js

@@ -107,3 +107,4 @@ class InsertAggregator extends abstractAggregator_1.default {
     }
 }
 exports.default = InsertAggregator;
+//# sourceMappingURL=insertAggregator.js.map

package/builders/aggregators/insertAggregator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"insertAggregator.js","sourceRoot":"","sources":["../../../../src/builders/aggregators/insertAggregator.ts"],"names":[],"mappings":";;;;;AAAA,oDAAoD;AACpD,iDAAqD;AAKrD,8EAA8C;AAE9C,MAAqB,gBAAiB,SAAQ,4BAAU;IAQtD,YAAmB,KAAyB;QAC1C,KAAK,CAAC,KAAK,CAAC,CAAC;QARP,gBAAW,GAAkB,EAAE,CAAC;QAChC,aAAQ,GAAkB,EAAE,CAAC;QAC7B,WAAM,GAAkB,EAAE,CAAC;QAC3B,YAAO,GAAe,EAAE,CAAC;QACzB,UAAK,GAAkB,EAAE,CAAC;QAC1B,YAAO,GAAkB,CAAC,aAAa,CAAC,CAAC;QAQ1C,kBAAa,GAAG,GAAG,EAAE;YAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAE1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;gBAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAExB,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC1B;aACF;QACH,CAAC,CAAC;QAEK,iBAAY,GAAG,CAAC,MAA+B,EAAE,EAAE;YACxD,kCAAkC;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAE5C,IAAI,QAAQ,GAAW,CAAC,CAAC;YACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAExB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAEvC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE;oBAC/B,MAAM,aAAa,GAAG,KAAK,CAAC,GAA8B,CAAC,CAAC;oBAC5D,MAAM,kBAAkB,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC;oBAEnD,MAAM,MAAM,GAAG,MAAM,CAAC,GAA8B,CAAC,CAAC;oBAEtD,IAAI,kBAAkB,EAAE;wBACtB,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,IAAI,EAAE;4BACzD,QAAQ,IAAI,CAAC,CAAC;4BACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;4BAClE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;yBACzE;6BAAM;4BACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;yBAC1B;qBACF;yBAAM;wBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBAC7B;oBAED,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBACxB;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC1B;qBAAM;oBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACzB;aACF;QACH,CAAC,CAAC;QAEK,qBAAgB,GAAG,CAAC,MAAgB,EACzC,OAAoB,EAAE,EAAE;YACxB,IAAI,MAAM,EAAE;gBACV,MAAM,SAAS,GAAG,MAAM,YAAY,sBAAa;oBAC/C,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3F,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,SAAS,KAAK,CAAC,CAAC;gBACtD,IAAI,OAAO,EAAE;oBACX,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;wBACpD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAExC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;wBACnC,QAAQ,EAAE,sBAAsB;wBAChC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;qBAClC,CAAC,CAAC;oBAEH,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACrC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;oBAEnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;iBAC3C;qBAAM;oBACL,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;iBACvC;aACF;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEK,eAAU,GAAG,GAA0C,EAAE;YAC9D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAEzC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QAChE,CAAC,CAAC;QAxGA,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IACrC,CAAC;CAuGF;AAnHD,mCAmHC"}

package/builders/aggregators/selectAggregator.d.ts

@@ -1,8 +1,8 @@
 import { AbstractColumn } from '../../columns/column';
 import ColumnType from '../../columns/types/columnType';
 import { AbstractTable } from '../../tables';
+import { JoinType } from '../highLvlBuilders/joins/selectJoinBuilder';
 import Order from '../highLvlBuilders/order';
-import Join from '../joinBuilders/join';
 import Expr from '../requestBuilders/where/where';
 import Aggregator from './abstractAggregator';
 export default class SelectAggregator extends Aggregator {
@@ -25,13 +25,7 @@ export default class SelectAggregator extends Aggregator {
     orderBy: (column?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectAggregator;
     distinct: (column?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined) => SelectAggregator;
     appendFrom: (tableName: string) => SelectAggregator;
-    join: (joins: {
-        join: Join<any>;
-        partial?: {
-            [name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, any>;
-        } | undefined;
-        id?: number | undefined;
-    }[]) => SelectAggregator;
+    join: (joins: Array<JoinType<AbstractTable<any>>>) => SelectAggregator;
     buildQuery: () => {
         query: string;
         values: Array<any>;

package/builders/aggregators/selectAggregator.js

@@ -7,8 +7,6 @@ const ecranate_1 = require("../../utils/ecranate");
 const order_1 = __importDefault(require("../highLvlBuilders/order"));
 const abstractAggregator_1 = __importDefault(require("./abstractAggregator"));
 class SelectAggregator extends abstractAggregator_1.default {
-    // public constructor(table: AbstractTable<any>);
-    // public constructor(table: AbstractTable<any>, partial: {[name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, AbstractTable<any>>})
     constructor(table, partial) {
         super(table, partial);
         this._from = [];
@@ -24,10 +22,10 @@ class SelectAggregator extends abstractAggregator_1.default {
         this._joinCache = {};
         this.filters = (filters) => {
             if (filters) {
-                const queryBuilder = filters.toQuery({ position: 1, tableCache: this._joinCache, session: this._table.db.session() });
+                const queryBuilder = filters.toQuery({ position: this._values.length + 1, session: this._table.db.session() });
                 this._filters.push('WHERE ');
                 this._filters.push(queryBuilder.query);
-                this._values = queryBuilder.values;
+                this._values.push(...queryBuilder.values);
             }
             return this;
         };
@@ -64,59 +62,28 @@ class SelectAggregator extends abstractAggregator_1.default {
             this._from.push('FROM ');
             this._from.push(tableName);
             // this._from.push(`${tableName} AS ${tableName}_0`);
-            this._joinCache[tableName] = tableName;
+            // this._joinCache[tableName] = tableName;
             return this;
         };
-        // Add select generator for second table also
         this.join = (joins) => {
-            // const cache: {[tableName: string]: string} = {};
-            joins.forEach((joinObject) => {
-                if (joinObject) {
-                    const tableFrom = joinObject.join.fromColumn.getParentName();
-                    const tableTo = joinObject.join.toColumn.getParentName();
-                    const { type } = joinObject.join;
-                    let fromAlias = '';
-                    if (this._joinCache[tableFrom]) {
-                        fromAlias = this._joinCache[tableFrom];
-                    }
-                    else {
-                        fromAlias = `${tableFrom}${joinObject.id ? `_${joinObject.id}` : ''}`;
-                        this._joinCache[tableFrom] = fromAlias;
-                    }
-                    let selectString;
-                    if (joinObject.partial) {
-                        selectString = this.generateSelectArray(`${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`, Object.values(joinObject.partial), joinObject.id).join('');
-                    }
-                    else {
-                        selectString = this.generateSelectArray(`${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`, Object.values(joinObject.join.mappedServiceToDb), joinObject.id).join('');
-                    }
-                    this._fields.push(', ');
-                    this._fields.push(selectString);
-                    this._join.push('\n');
-                    this._join.push(type);
-                    this._join.push(' ');
-                    this._join.push(tableTo);
-                    this._join.push(' ');
-                    this._join.push(`AS ${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`);
-                    this._joinCache[tableTo] = `${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`;
-                    this._join.push('\n');
-                    this._join.push('ON ');
-                    this._join.push(fromAlias);
-                    // if (this._joinCache[tableFrom]) {
-                    //   this._join.push(this._joinCache[tableFrom]);
-                    // } else {
-                    //   this._join.push(tableFrom);
-                    //   this._joinCache[tableFrom] = `${tableFrom}${joinObject.id ? `_${joinObject.id}` : ''}`;
-                    // }
-                    this._join.push('.');
-                    this._join.push(joinObject.join.fromColumn.getColumnName());
-                    this._join.push(' = ');
-                    this._join.push(`${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`);
-                    // this._join.push(toAlias);
-                    this._join.push('.');
-                    this._join.push(joinObject.join.toColumn.getColumnName());
-                }
-            });
+            const tableFrom = this._table.tableName();
+            for (const [index, join] of joins.entries()) {
+                const { table: tableToName, originalName, onExpression, type, columns, } = join;
+                const selectString = this.generateSelectArray(tableToName, Object.values(columns)).join('');
+                this._fields.push(', ');
+                this._fields.push(selectString);
+                this._join.push('\n');
+                this._join.push(type);
+                this._join.push(' ');
+                this._join.push(originalName);
+                this._join.push(' ');
+                this._join.push(`AS ${tableToName}`);
+                this._join.push('\n');
+                this._join.push('ON ');
+                const joinExpr = onExpression.toQuery({ position: this._values.length + 1, session: this._table.db.session() });
+                this._values.push(...joinExpr.values);
+                this._join.push(joinExpr.query);
+            }
             return this;
         };
         this.buildQuery = () => {
@@ -141,3 +108,4 @@ class SelectAggregator extends abstractAggregator_1.default {
     }
 }
 exports.default = SelectAggregator;
+//# sourceMappingURL=selectAggregator.js.map

package/builders/aggregators/selectAggregator.js.map

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

package/builders/aggregators/selectAggregatorV1.d.ts

@@ -0,0 +1,39 @@
+import { AbstractColumn } from '../../columns/column';
+import ColumnType from '../../columns/types/columnType';
+import { AbstractTable } from '../../tables';
+import Order from '../highLvlBuilders/order';
+import Join from '../joinBuilders/join';
+import Expr from '../requestBuilders/where/where';
+import Aggregator from './abstractAggregator';
+export default class SelectAggregatorV1 extends Aggregator {
+    private _from;
+    private _filters;
+    private _select;
+    private _join;
+    private _limit;
+    private _offset;
+    private _distinct;
+    private _orderBy;
+    private _values;
+    private _joinCache;
+    constructor(table: AbstractTable<any>, partial?: {
+        [name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, AbstractTable<any>>;
+    });
+    filters: (filters: Expr) => SelectAggregatorV1;
+    limit: (limit?: number | undefined) => SelectAggregatorV1;
+    offset: (offset?: number | undefined) => SelectAggregatorV1;
+    orderBy: (column?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectAggregatorV1;
+    distinct: (column?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined) => SelectAggregatorV1;
+    appendFrom: (tableName: string) => SelectAggregatorV1;
+    join: (joins: {
+        join: Join<any>;
+        partial?: {
+            [name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, any>;
+        } | undefined;
+        id?: number | undefined;
+    }[]) => SelectAggregatorV1;
+    buildQuery: () => {
+        query: string;
+        values: Array<any>;
+    };
+}

package/builders/aggregators/selectAggregatorV1.js

@@ -0,0 +1,144 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ecranate_1 = require("../../utils/ecranate");
+const order_1 = __importDefault(require("../highLvlBuilders/order"));
+const abstractAggregator_1 = __importDefault(require("./abstractAggregator"));
+class SelectAggregatorV1 extends abstractAggregator_1.default {
+    // public constructor(table: AbstractTable<any>);
+    // public constructor(table: AbstractTable<any>, partial: {[name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, AbstractTable<any>>})
+    constructor(table, partial) {
+        super(table, partial);
+        this._from = [];
+        this._filters = [];
+        this._select = ['SELECT'];
+        this._join = [];
+        this._limit = [];
+        this._offset = [];
+        this._distinct = [];
+        // private _groupBy: Array<string> = [];
+        this._orderBy = [];
+        this._values = [];
+        this._joinCache = {};
+        this.filters = (filters) => {
+            if (filters) {
+                const queryBuilder = filters.toQueryV1({ position: 1, tableCache: this._joinCache, session: this._table.db.session() });
+                this._filters.push('WHERE ');
+                this._filters.push(queryBuilder.query);
+                this._values = queryBuilder.values;
+            }
+            return this;
+        };
+        this.limit = (limit) => {
+            if (limit) {
+                this._limit.push('LIMIT ');
+                this._limit.push(limit.toString());
+            }
+            return this;
+        };
+        this.offset = (offset) => {
+            if (offset) {
+                this._offset.push('OFFSET ');
+                this._offset.push(offset.toString());
+            }
+            return this;
+        };
+        this.orderBy = (column, order) => {
+            if (column !== null && column !== undefined) {
+                this._orderBy.push('ORDER BY ');
+                const columnParent = this._joinCache[column.getParent().tableName()] ? this._joinCache[column.getParent().tableName()] : column.getParent().tableName();
+                this._orderBy.push(`${columnParent}.${ecranate_1.ecranate(column.getColumnName())} `);
+                this._orderBy.push(order_1.default[order]);
+            }
+            return this;
+        };
+        this.distinct = (column) => {
+            if (column) {
+                this._distinct.push(` DISTINCT ON(${column.getParent().tableName()}.${ecranate_1.ecranate(column.getColumnName())}) `);
+            }
+            return this;
+        };
+        this.appendFrom = (tableName) => {
+            this._from.push('FROM ');
+            this._from.push(tableName);
+            // this._from.push(`${tableName} AS ${tableName}_0`);
+            this._joinCache[tableName] = tableName;
+            return this;
+        };
+        // Add select generator for second table also
+        this.join = (joins) => {
+            // const cache: {[tableName: string]: string} = {};
+            joins.forEach((joinObject) => {
+                if (joinObject) {
+                    const tableFrom = joinObject.join.fromColumn.getParentName();
+                    const tableTo = joinObject.join.toColumn.getParentName();
+                    const { type } = joinObject.join;
+                    let fromAlias = '';
+                    if (this._joinCache[tableFrom]) {
+                        fromAlias = this._joinCache[tableFrom];
+                    }
+                    else {
+                        fromAlias = `${tableFrom}${joinObject.id ? `_${joinObject.id}` : ''}`;
+                        this._joinCache[tableFrom] = fromAlias;
+                    }
+                    let selectString;
+                    if (joinObject.partial) {
+                        selectString = this.generateSelectArrayV1(`${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`, Object.values(joinObject.partial), joinObject.id).join('');
+                    }
+                    else {
+                        selectString = this.generateSelectArrayV1(`${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`, Object.values(joinObject.join.mappedServiceToDb), joinObject.id).join('');
+                    }
+                    this._fields.push(', ');
+                    this._fields.push(selectString);
+                    this._join.push('\n');
+                    this._join.push(type);
+                    this._join.push(' ');
+                    this._join.push(tableTo);
+                    this._join.push(' ');
+                    this._join.push(`AS ${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`);
+                    this._joinCache[tableTo] = `${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`;
+                    this._join.push('\n');
+                    this._join.push('ON ');
+                    this._join.push(fromAlias);
+                    // if (this._joinCache[tableFrom]) {
+                    //   this._join.push(this._joinCache[tableFrom]);
+                    // } else {
+                    //   this._join.push(tableFrom);
+                    //   this._joinCache[tableFrom] = `${tableFrom}${joinObject.id ? `_${joinObject.id}` : ''}`;
+                    // }
+                    this._join.push('.');
+                    this._join.push(joinObject.join.fromColumn.getColumnName());
+                    this._join.push(' = ');
+                    this._join.push(`${tableTo}${joinObject.id ? `_${joinObject.id}` : ''}`);
+                    // this._join.push(toAlias);
+                    this._join.push('.');
+                    this._join.push(joinObject.join.toColumn.getColumnName());
+                }
+            });
+            return this;
+        };
+        this.buildQuery = () => {
+            this._select.push(this._distinct.join(''));
+            this._select.push(this._fields.join(''));
+            this._select.push('\n');
+            this._select.push(this._from.join(''));
+            this._select.push('\n');
+            this._select.push(this._join.join(''));
+            if (this._join.length > 0) {
+                this._select.push('\n');
+            }
+            this._select.push(this._filters.join(''));
+            this._select.push('\n');
+            this._select.push(this._orderBy.join(''));
+            this._select.push('\n');
+            this._select.push(this._limit.join(''));
+            this._select.push('\n');
+            this._select.push(this._offset.join(''));
+            return { query: this._select.join(''), values: this._values };
+        };
+    }
+}
+exports.default = SelectAggregatorV1;
+//# sourceMappingURL=selectAggregatorV1.js.map

package/builders/aggregators/selectAggregatorV1.js.map

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

package/builders/aggregators/updateAggregator.js

@@ -51,3 +51,4 @@ class UpdateAggregator extends abstractAggregator_1.default {
     }
 }
 exports.default = UpdateAggregator;
+//# sourceMappingURL=updateAggregator.js.map

package/builders/aggregators/updateAggregator.js.map

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

package/builders/highLvlBuilders/abstractRequestBuilder.d.ts

@@ -4,9 +4,8 @@ import { ISession } from '../../db/session';
 import BaseLogger from '../../logger/abstractLogger';
 import { AbstractTable } from '../../tables';
 import { ExtractModel } from '../../tables/inferTypes';
-export default abstract class TableRequestBuilder<TTable extends AbstractTable<TTable>, TPartial extends {
-    [name: string]: AbstractColumn<ColumnType<any>, boolean, boolean, TTable>;
-} = {}> {
+import { EmptyPartial } from './joins/selectJoinBuilder';
+export default abstract class TableRequestBuilder<TTable extends AbstractTable<TTable>, TPartial extends EmptyPartial<TTable>> {
     protected _table: TTable;
     protected _session: ISession;
     protected _mappedServiceToDb: {

package/builders/highLvlBuilders/abstractRequestBuilder.js

@@ -31,3 +31,4 @@ class TableRequestBuilder {
     }
 }
 exports.default = TableRequestBuilder;
+//# sourceMappingURL=abstractRequestBuilder.js.map

package/builders/highLvlBuilders/abstractRequestBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abstractRequestBuilder.js","sourceRoot":"","sources":["../../../../src/builders/highLvlBuilders/abstractRequestBuilder.ts"],"names":[],"mappings":";;AASA,MAA8B,mBAAmB;IAU/C,YAAmB,KAA4B,EAC7C,OAAiB,EACjB,iBAAwF,EACxF,MAAmB;QAQd,QAAG,GAAG,KAAK,IAAI,EAAE;YACtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;QAEF;;;;WAIG;QACI,YAAO,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC3B,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;aACzD;iBAAM,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;aAC1D;iBAAM;gBACL,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;aACxB;QACH,CAAC,CAAC;QA1BA,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,KAA0B,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;CAyBF;AA5CD,sCA4CC"}

package/builders/highLvlBuilders/deleteRequestBuilder.js

@@ -59,3 +59,4 @@ class DeleteTRB extends abstractRequestBuilder_1.default {
     }
 }
 exports.default = DeleteTRB;
+//# sourceMappingURL=deleteRequestBuilder.js.map

package/builders/highLvlBuilders/deleteRequestBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteRequestBuilder.js","sourceRoot":"","sources":["../../../../src/builders/highLvlBuilders/deleteRequestBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAIA,0EAAsE;AAEtE,kFAA+D;AAG/D,6EAAqD;AAErD,sFAA2D;AAE3D,MAAqB,SACnB,SAAQ,gCAAqC;IAG7C,YACE,KAA4B,EAC5B,OAAiB,EACjB,iBAAwF,EACxF,MAAmB;QAEnB,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAG5C,UAAK,GAAG,CAAC,IAAU,EAAqB,EAAE;YAC/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEK,YAAO,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC,CAAC;QAEQ,aAAQ,GAAG,KAAK,IAAqG,EAAE;YAC/H,MAAM,YAAY,GAAG,gBAAM;iBACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;iBACjB,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5B,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI;gBACF,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;gBAC3C,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;gBAC5B,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;aAC/B;YAAC,OAAO,CAAM,EAAE;gBACf,MAAM,IAAI,sBAAY,CAAC,0BAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAChE,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;aAClD;YAED,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC;aACvF;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1D,OAAO,wBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAA2F,CAAC;QAC5J,CAAC,CAAC;IAjCF,CAAC;CAkCF;AA7CD,4BA6CC"}

package/builders/highLvlBuilders/insertRequestBuilder.js

@@ -71,3 +71,4 @@ class InsertTRB extends abstractRequestBuilder_1.default {
     }
 }
 exports.default = InsertTRB;
+//# sourceMappingURL=insertRequestBuilder.js.map

package/builders/highLvlBuilders/insertRequestBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"insertRequestBuilder.js","sourceRoot":"","sources":["../../../../src/builders/highLvlBuilders/insertRequestBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA4B;AAC5B,0BAAkC;AAIlC,0EAAsE;AAEtE,kFAA+D;AAG/D,8EAAsD;AAEtD,sFAA2D;AAE3D,MAAqB,SACnB,SAAQ,gCAAqC;IAK7C,YACE,MAA8B,EAC9B,OAAiB,EACjB,iBAAwF,EACxF,KAA4B,EAC5B,MAAmB;QAEnB,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAI5C,YAAO,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC,CAAC;QAEK,eAAU,GAAG,CAClB,QAAqC,EACrC,MAAqC,EAClB,EAAE;YACrB,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,OAAO,GAAsB,EAAE,CAAC;YACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAiC,CAAC,CAAC;gBAC1E,OAAO,CAAC,IAAI,CAAC,OAAG,CAAC,MAAM,EAAE,KAAY,CAAC,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,GAAG,WAAO,CAAC,OAAO,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEQ,aAAQ,GAAG,KAAK,IAAqG,EAAE;YAC/H,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,MAAM,KAAK,CAAC,uEAAuE,CAAC,CAAC;YAExG,MAAM,YAAY,GAAG,gBAAM;iBACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;iBACjB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;iBACpB,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAEvD,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI;gBACF,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;gBAC3C,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;gBAC5B,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;aAC/B;YAAC,OAAO,CAAM,EAAE;gBACf,MAAM,IAAI,sBAAY,CAAC,0BAAW,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;aACtG;YAED,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,KAAK,KAAK,MAAM,EAAE,CAAC,CAAC;aACjG;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1D,OAAO,wBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAA2F,CAAC;QAC5J,CAAC,CAAC;QA7CA,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;CA6CF;AA5DD,4BA4DC"}

package/builders/highLvlBuilders/joins/joinBuilderResponse.d.ts

@@ -0,0 +1,8 @@
+import AbstractTable from '@/tables/abstractTable';
+import { FullOrPartial } from '@/tables/inferTypes';
+export default class JoinBuilderResponses<TResponses extends FullOrPartial<AbstractTable<any>, any>[]> {
+    private responses;
+    private responsesType;
+    constructor(responses: TResponses[]);
+    map: <M>(imac: (...args_0: TResponses) => M) => M[];
+}