taon-typeorm 18.0.19 → 18.0.20

package/lib/typeorm/query-builder/RelationIdLoader.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationIdLoader = void 0;
-var tslib_1 = require("tslib");
-var DriverUtils_1 = require("../driver/DriverUtils");
+const DriverUtils_1 = require("../driver/DriverUtils");
 /**
  * Loads relation ids for the given entities.
  */
-var RelationIdLoader = /** @class */ (function () {
+class RelationIdLoader {
+    connection;
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function RelationIdLoader(connection) {
+    constructor(connection) {
         this.connection = connection;
     }
     // -------------------------------------------------------------------------
@@ -19,11 +19,11 @@ var RelationIdLoader = /** @class */ (function () {
     /**
      * Loads relation ids of the given entity or entities.
      */
-    RelationIdLoader.prototype.load = function (relation, entityOrEntities, relatedEntityOrRelatedEntities) {
-        var entities = Array.isArray(entityOrEntities)
+    load(relation, entityOrEntities, relatedEntityOrRelatedEntities) {
+        const entities = Array.isArray(entityOrEntities)
             ? entityOrEntities
             : [entityOrEntities];
-        var relatedEntities = Array.isArray(relatedEntityOrRelatedEntities)
+        const relatedEntities = Array.isArray(relatedEntityOrRelatedEntities)
             ? relatedEntityOrRelatedEntities
             : relatedEntityOrRelatedEntities
                 ? [relatedEntityOrRelatedEntities]
@@ -39,103 +39,92 @@ var RelationIdLoader = /** @class */ (function () {
             // if (relation.isOneToMany || relation.isOneToOneNotOwner) {
             return this.loadForOneToManyAndOneToOneNotOwner(relation, entities, relatedEntities);
         }
-    };
+    }
     /**
      * Loads relation ids of the given entities and groups them into the object with parent and children.
      *
      * todo: extract this method?
      */
-    RelationIdLoader.prototype.loadManyToManyRelationIdsAndGroup = function (relation, entitiesOrEntities, relatedEntityOrEntities, queryBuilder) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var isMany, entities, relationIds, relatedEntities, columns, inverseColumns;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        isMany = relation.isManyToMany || relation.isOneToMany;
-                        entities = Array.isArray(entitiesOrEntities)
-                            ? entitiesOrEntities
-                            : [entitiesOrEntities];
-                        if (!!relatedEntityOrEntities) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.connection.relationLoader.load(relation, entitiesOrEntities, undefined, queryBuilder)];
-                    case 1:
-                        relatedEntityOrEntities = _a.sent();
-                        if (!relatedEntityOrEntities.length)
-                            return [2 /*return*/, entities.map(function (entity) { return ({
-                                    entity: entity,
-                                    related: isMany ? [] : undefined,
-                                }); })];
-                        _a.label = 2;
-                    case 2: return [4 /*yield*/, this.load(relation, entitiesOrEntities, relatedEntityOrEntities)
-                        // console.log("entities", entities);
-                        // console.log("relatedEntityOrEntities", relatedEntityOrEntities);
-                        // console.log("relationIds", relationIds);
-                    ];
-                    case 3:
-                        relationIds = _a.sent();
-                        relatedEntities = Array.isArray(relatedEntityOrEntities)
-                            ? relatedEntityOrEntities
-                            : [relatedEntityOrEntities];
-                        columns = [], inverseColumns = [];
-                        if (relation.isManyToManyOwner) {
-                            columns = relation.junctionEntityMetadata.inverseColumns.map(function (column) { return column.referencedColumn; });
-                            inverseColumns = relation.junctionEntityMetadata.ownerColumns.map(function (column) { return column.referencedColumn; });
-                        }
-                        else if (relation.isManyToManyNotOwner) {
-                            columns = relation.junctionEntityMetadata.ownerColumns.map(function (column) { return column.referencedColumn; });
-                            inverseColumns =
-                                relation.junctionEntityMetadata.inverseColumns.map(function (column) { return column.referencedColumn; });
-                        }
-                        else if (relation.isManyToOne || relation.isOneToOneOwner) {
-                            columns = relation.joinColumns.map(function (column) { return column.referencedColumn; });
-                            inverseColumns = relation.entityMetadata.primaryColumns;
-                        }
-                        else if (relation.isOneToMany || relation.isOneToOneNotOwner) {
-                            columns = relation.inverseRelation.entityMetadata.primaryColumns;
-                            inverseColumns = relation.inverseRelation.joinColumns.map(function (column) { return column.referencedColumn; });
+    async loadManyToManyRelationIdsAndGroup(relation, entitiesOrEntities, relatedEntityOrEntities, queryBuilder) {
+        // console.log("relation:", relation.propertyName);
+        // console.log("entitiesOrEntities", entitiesOrEntities);
+        const isMany = relation.isManyToMany || relation.isOneToMany;
+        const entities = Array.isArray(entitiesOrEntities)
+            ? entitiesOrEntities
+            : [entitiesOrEntities];
+        if (!relatedEntityOrEntities) {
+            relatedEntityOrEntities = await this.connection.relationLoader.load(relation, entitiesOrEntities, undefined, queryBuilder);
+            if (!relatedEntityOrEntities.length)
+                return entities.map((entity) => ({
+                    entity: entity,
+                    related: isMany ? [] : undefined,
+                }));
+        }
+        // const relationIds = await this.load(relation, relatedEntityOrEntities!, entitiesOrEntities);
+        const relationIds = await this.load(relation, entitiesOrEntities, relatedEntityOrEntities);
+        // console.log("entities", entities);
+        // console.log("relatedEntityOrEntities", relatedEntityOrEntities);
+        // console.log("relationIds", relationIds);
+        const relatedEntities = Array.isArray(relatedEntityOrEntities)
+            ? relatedEntityOrEntities
+            : [relatedEntityOrEntities];
+        let columns = [], inverseColumns = [];
+        if (relation.isManyToManyOwner) {
+            columns = relation.junctionEntityMetadata.inverseColumns.map((column) => column.referencedColumn);
+            inverseColumns = relation.junctionEntityMetadata.ownerColumns.map((column) => column.referencedColumn);
+        }
+        else if (relation.isManyToManyNotOwner) {
+            columns = relation.junctionEntityMetadata.ownerColumns.map((column) => column.referencedColumn);
+            inverseColumns =
+                relation.junctionEntityMetadata.inverseColumns.map((column) => column.referencedColumn);
+        }
+        else if (relation.isManyToOne || relation.isOneToOneOwner) {
+            columns = relation.joinColumns.map((column) => column.referencedColumn);
+            inverseColumns = relation.entityMetadata.primaryColumns;
+        }
+        else if (relation.isOneToMany || relation.isOneToOneNotOwner) {
+            columns = relation.inverseRelation.entityMetadata.primaryColumns;
+            inverseColumns = relation.inverseRelation.joinColumns.map((column) => column.referencedColumn);
+        }
+        else {
+        }
+        return entities.map((entity) => {
+            const group = {
+                entity: entity,
+                related: isMany ? [] : undefined,
+            };
+            const entityRelationIds = relationIds.filter((relationId) => {
+                return inverseColumns.every((column) => {
+                    return column.compareEntityValue(entity, relationId[column.entityMetadata.name +
+                        "_" +
+                        column.propertyAliasName]);
+                });
+            });
+            if (!entityRelationIds.length)
+                return group;
+            relatedEntities.forEach((relatedEntity) => {
+                entityRelationIds.forEach((relationId) => {
+                    const relatedEntityMatched = columns.every((column) => {
+                        return column.compareEntityValue(relatedEntity, relationId[DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, column.entityMetadata.name +
+                            "_" +
+                            relation.propertyPath.replace(".", "_") +
+                            "_" +
+                            column.propertyPath.replace(".", "_"))]);
+                    });
+                    if (relatedEntityMatched) {
+                        if (isMany) {
+                            ;
+                            group.related.push(relatedEntity);
                         }
                         else {
+                            group.related = relatedEntity;
                         }
-                        return [2 /*return*/, entities.map(function (entity) {
-                                var group = {
-                                    entity: entity,
-                                    related: isMany ? [] : undefined,
-                                };
-                                var entityRelationIds = relationIds.filter(function (relationId) {
-                                    return inverseColumns.every(function (column) {
-                                        return column.compareEntityValue(entity, relationId[column.entityMetadata.name +
-                                            "_" +
-                                            column.propertyAliasName]);
-                                    });
-                                });
-                                if (!entityRelationIds.length)
-                                    return group;
-                                relatedEntities.forEach(function (relatedEntity) {
-                                    entityRelationIds.forEach(function (relationId) {
-                                        var relatedEntityMatched = columns.every(function (column) {
-                                            return column.compareEntityValue(relatedEntity, relationId[DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, column.entityMetadata.name +
-                                                "_" +
-                                                relation.propertyPath.replace(".", "_") +
-                                                "_" +
-                                                column.propertyPath.replace(".", "_"))]);
-                                        });
-                                        if (relatedEntityMatched) {
-                                            if (isMany) {
-                                                ;
-                                                group.related.push(relatedEntity);
-                                            }
-                                            else {
-                                                group.related = relatedEntity;
-                                            }
-                                        }
-                                    });
-                                });
-                                return group;
-                            })];
-                }
+                    }
+                });
             });
+            return group;
         });
-    };
+    }
     /**
      * Loads relation ids of the given entities and maps them into the given entity property.
      async loadManyToManyRelationIdsAndMap(
@@ -176,26 +165,25 @@ var RelationIdLoader = /** @class */ (function () {
     /**
      * Loads relation ids for the many-to-many relation.
      */
-    RelationIdLoader.prototype.loadForManyToMany = function (relation, entities, relatedEntities) {
-        var _this = this;
-        var junctionMetadata = relation.junctionEntityMetadata;
-        var mainAlias = junctionMetadata.name;
-        var columns = relation.isOwning
+    loadForManyToMany(relation, entities, relatedEntities) {
+        const junctionMetadata = relation.junctionEntityMetadata;
+        const mainAlias = junctionMetadata.name;
+        const columns = relation.isOwning
             ? junctionMetadata.ownerColumns
             : junctionMetadata.inverseColumns;
-        var inverseColumns = relation.isOwning
+        const inverseColumns = relation.isOwning
             ? junctionMetadata.inverseColumns
             : junctionMetadata.ownerColumns;
-        var qb = this.connection.createQueryBuilder();
+        const qb = this.connection.createQueryBuilder();
         // select all columns from junction table
-        columns.forEach(function (column) {
-            var columnName = DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, column.referencedColumn.entityMetadata.name +
+        columns.forEach((column) => {
+            const columnName = DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, column.referencedColumn.entityMetadata.name +
                 "_" +
                 column.referencedColumn.propertyPath.replace(".", "_"));
             qb.addSelect(mainAlias + "." + column.propertyPath, columnName);
         });
-        inverseColumns.forEach(function (column) {
-            var columnName = DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, column.referencedColumn.entityMetadata.name +
+        inverseColumns.forEach((column) => {
+            const columnName = DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, column.referencedColumn.entityMetadata.name +
                 "_" +
                 relation.propertyPath.replace(".", "_") +
                 "_" +
@@ -203,14 +191,12 @@ var RelationIdLoader = /** @class */ (function () {
             qb.addSelect(mainAlias + "." + column.propertyPath, columnName);
         });
         // add conditions for the given entities
-        var condition1 = "";
+        let condition1 = "";
         if (columns.length === 1) {
-            var values = entities.map(function (entity) {
-                return columns[0].referencedColumn.getEntityValue(entity);
-            });
-            var areAllNumbers = values.every(function (value) { return typeof value === "number"; });
+            const values = entities.map((entity) => columns[0].referencedColumn.getEntityValue(entity));
+            const areAllNumbers = values.every((value) => typeof value === "number");
             if (areAllNumbers) {
-                condition1 = "".concat(mainAlias, ".").concat(columns[0].propertyPath, " IN (").concat(values.join(", "), ")");
+                condition1 = `${mainAlias}.${columns[0].propertyPath} IN (${values.join(", ")})`;
             }
             else {
                 qb.setParameter("values1", values);
@@ -225,10 +211,10 @@ var RelationIdLoader = /** @class */ (function () {
             condition1 =
                 "(" +
                     entities
-                        .map(function (entity, entityIndex) {
+                        .map((entity, entityIndex) => {
                         return columns
-                            .map(function (column) {
-                            var paramName = "entity1_" +
+                            .map((column) => {
+                            const paramName = "entity1_" +
                                 entityIndex +
                                 "_" +
                                 column.propertyName;
@@ -241,20 +227,18 @@ var RelationIdLoader = /** @class */ (function () {
                         })
                             .join(" AND ");
                     })
-                        .map(function (condition) { return "(" + condition + ")"; })
+                        .map((condition) => "(" + condition + ")")
                         .join(" OR ") +
                     ")";
         }
         // add conditions for the given inverse entities
-        var condition2 = "";
+        let condition2 = "";
         if (relatedEntities) {
             if (inverseColumns.length === 1) {
-                var values = relatedEntities.map(function (entity) {
-                    return inverseColumns[0].referencedColumn.getEntityValue(entity);
-                });
-                var areAllNumbers = values.every(function (value) { return typeof value === "number"; });
+                const values = relatedEntities.map((entity) => inverseColumns[0].referencedColumn.getEntityValue(entity));
+                const areAllNumbers = values.every((value) => typeof value === "number");
                 if (areAllNumbers) {
-                    condition2 = "".concat(mainAlias, ".").concat(inverseColumns[0].propertyPath, " IN (").concat(values.join(", "), ")");
+                    condition2 = `${mainAlias}.${inverseColumns[0].propertyPath} IN (${values.join(", ")})`;
                 }
                 else {
                     qb.setParameter("values2", values);
@@ -269,10 +253,10 @@ var RelationIdLoader = /** @class */ (function () {
                 condition2 =
                     "(" +
                         relatedEntities
-                            .map(function (entity, entityIndex) {
+                            .map((entity, entityIndex) => {
                             return inverseColumns
-                                .map(function (column) {
-                                var paramName = "entity2_" +
+                                .map((column) => {
+                                const paramName = "entity2_" +
                                     entityIndex +
                                     "_" +
                                     column.propertyName;
@@ -285,7 +269,7 @@ var RelationIdLoader = /** @class */ (function () {
                             })
                                 .join(" AND ");
                         })
-                            .map(function (condition) { return "(" + condition + ")"; })
+                            .map((condition) => "(" + condition + ")")
                             .join(" OR ") +
                         ")";
             }
@@ -308,45 +292,44 @@ var RelationIdLoader = /** @class */ (function () {
         //     return qb.getRawMany();
         // }
         // execute query
-        var condition = [condition1, condition2]
-            .filter(function (v) { return v.length > 0; })
+        const condition = [condition1, condition2]
+            .filter((v) => v.length > 0)
             .join(" AND ");
         return qb
             .from(junctionMetadata.target, mainAlias)
             .where(condition)
             .getRawMany();
-    };
+    }
     /**
      * Loads relation ids for the many-to-one and one-to-one owner relations.
      */
-    RelationIdLoader.prototype.loadForManyToOneAndOneToOneOwner = function (relation, entities, relatedEntities) {
-        var _this = this;
-        var mainAlias = relation.entityMetadata.targetName;
+    loadForManyToOneAndOneToOneOwner(relation, entities, relatedEntities) {
+        const mainAlias = relation.entityMetadata.targetName;
         // console.log("entitiesx", entities);
         // console.log("relatedEntitiesx", relatedEntities);
-        var hasAllJoinColumnsInEntity = relation.joinColumns.every(function (joinColumn) {
-            return !!relation.entityMetadata.nonVirtualColumns.find(function (column) { return column === joinColumn; });
+        const hasAllJoinColumnsInEntity = relation.joinColumns.every((joinColumn) => {
+            return !!relation.entityMetadata.nonVirtualColumns.find((column) => column === joinColumn);
         });
         if (relatedEntities && hasAllJoinColumnsInEntity) {
-            var relationIdMaps_1 = [];
-            entities.forEach(function (entity) {
-                var relationIdMap = {};
-                relation.entityMetadata.primaryColumns.forEach(function (primaryColumn) {
-                    var key = primaryColumn.entityMetadata.name +
+            let relationIdMaps = [];
+            entities.forEach((entity) => {
+                let relationIdMap = {};
+                relation.entityMetadata.primaryColumns.forEach((primaryColumn) => {
+                    const key = primaryColumn.entityMetadata.name +
                         "_" +
                         primaryColumn.propertyPath.replace(".", "_");
                     relationIdMap[key] =
                         primaryColumn.getEntityValue(entity);
                 });
-                relatedEntities.forEach(function (relatedEntity) {
-                    relation.joinColumns.forEach(function (joinColumn) {
-                        var entityColumnValue = joinColumn.getEntityValue(entity);
-                        var relatedEntityColumnValue = joinColumn.referencedColumn.getEntityValue(relatedEntity);
+                relatedEntities.forEach((relatedEntity) => {
+                    relation.joinColumns.forEach((joinColumn) => {
+                        const entityColumnValue = joinColumn.getEntityValue(entity);
+                        const relatedEntityColumnValue = joinColumn.referencedColumn.getEntityValue(relatedEntity);
                         if (entityColumnValue === undefined ||
                             relatedEntityColumnValue === undefined)
                             return;
                         if (entityColumnValue === relatedEntityColumnValue) {
-                            var key = joinColumn.referencedColumn.entityMetadata
+                            const key = joinColumn.referencedColumn.entityMetadata
                                 .name +
                                 "_" +
                                 relation.propertyPath.replace(".", "_") +
@@ -359,24 +342,24 @@ var RelationIdLoader = /** @class */ (function () {
                 if (Object.keys(relationIdMap).length ===
                     relation.entityMetadata.primaryColumns.length +
                         relation.joinColumns.length) {
-                    relationIdMaps_1.push(relationIdMap);
+                    relationIdMaps.push(relationIdMap);
                 }
             });
             // console.log("relationIdMap", relationIdMaps);
             // console.log("entities.length", entities.length);
-            if (relationIdMaps_1.length === entities.length)
-                return Promise.resolve(relationIdMaps_1);
+            if (relationIdMaps.length === entities.length)
+                return Promise.resolve(relationIdMaps);
         }
         // select all columns we need
-        var qb = this.connection.createQueryBuilder();
-        relation.entityMetadata.primaryColumns.forEach(function (primaryColumn) {
-            var columnName = DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, primaryColumn.entityMetadata.name +
+        const qb = this.connection.createQueryBuilder();
+        relation.entityMetadata.primaryColumns.forEach((primaryColumn) => {
+            const columnName = DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, primaryColumn.entityMetadata.name +
                 "_" +
                 primaryColumn.propertyPath.replace(".", "_"));
             qb.addSelect(mainAlias + "." + primaryColumn.propertyPath, columnName);
         });
-        relation.joinColumns.forEach(function (column) {
-            var columnName = DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, column.referencedColumn.entityMetadata.name +
+        relation.joinColumns.forEach((column) => {
+            const columnName = DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, column.referencedColumn.entityMetadata.name +
                 "_" +
                 relation.propertyPath.replace(".", "_") +
                 "_" +
@@ -384,14 +367,12 @@ var RelationIdLoader = /** @class */ (function () {
             qb.addSelect(mainAlias + "." + column.propertyPath, columnName);
         });
         // add condition for entities
-        var condition = "";
+        let condition = "";
         if (relation.entityMetadata.primaryColumns.length === 1) {
-            var values = entities.map(function (entity) {
-                return relation.entityMetadata.primaryColumns[0].getEntityValue(entity);
-            });
-            var areAllNumbers = values.every(function (value) { return typeof value === "number"; });
+            const values = entities.map((entity) => relation.entityMetadata.primaryColumns[0].getEntityValue(entity));
+            const areAllNumbers = values.every((value) => typeof value === "number");
             if (areAllNumbers) {
-                condition = "".concat(mainAlias, ".").concat(relation.entityMetadata.primaryColumns[0].propertyPath, " IN (").concat(values.join(", "), ")");
+                condition = `${mainAlias}.${relation.entityMetadata.primaryColumns[0].propertyPath} IN (${values.join(", ")})`;
             }
             else {
                 qb.setParameter("values", values);
@@ -404,10 +385,10 @@ var RelationIdLoader = /** @class */ (function () {
         }
         else {
             condition = entities
-                .map(function (entity, entityIndex) {
+                .map((entity, entityIndex) => {
                 return relation.entityMetadata.primaryColumns
-                    .map(function (column, columnIndex) {
-                    var paramName = "entity" + entityIndex + "_" + columnIndex;
+                    .map((column, columnIndex) => {
+                    const paramName = "entity" + entityIndex + "_" + columnIndex;
                     qb.setParameter(paramName, column.getEntityValue(entity));
                     return (mainAlias +
                         "." +
@@ -417,7 +398,7 @@ var RelationIdLoader = /** @class */ (function () {
                 })
                     .join(" AND ");
             })
-                .map(function (condition) { return "(" + condition + ")"; })
+                .map((condition) => "(" + condition + ")")
                 .join(" OR ");
         }
         // execute query
@@ -425,28 +406,27 @@ var RelationIdLoader = /** @class */ (function () {
             .from(relation.entityMetadata.target, mainAlias)
             .where(condition)
             .getRawMany();
-    };
+    }
     /**
      * Loads relation ids for the one-to-many and one-to-one not owner relations.
      */
-    RelationIdLoader.prototype.loadForOneToManyAndOneToOneNotOwner = function (relation, entities, relatedEntities) {
-        var _this = this;
+    loadForOneToManyAndOneToOneNotOwner(relation, entities, relatedEntities) {
         relation = relation.inverseRelation;
         if (relation.entityMetadata.primaryColumns.length ===
             relation.joinColumns.length) {
-            var sameReferencedColumns = relation.entityMetadata.primaryColumns.every(function (column) {
+            const sameReferencedColumns = relation.entityMetadata.primaryColumns.every((column) => {
                 return relation.joinColumns.indexOf(column) !== -1;
             });
             if (sameReferencedColumns) {
-                return Promise.resolve(entities.map(function (entity) {
-                    var result = {};
+                return Promise.resolve(entities.map((entity) => {
+                    const result = {};
                     relation.joinColumns.forEach(function (joinColumn) {
-                        var value = joinColumn.referencedColumn.getEntityValue(entity);
-                        var joinColumnName = joinColumn.referencedColumn.entityMetadata
+                        const value = joinColumn.referencedColumn.getEntityValue(entity);
+                        const joinColumnName = joinColumn.referencedColumn.entityMetadata
                             .name +
                             "_" +
                             joinColumn.referencedColumn.propertyPath.replace(".", "_");
-                        var primaryColumnName = joinColumn.entityMetadata.name +
+                        const primaryColumnName = joinColumn.entityMetadata.name +
                             "_" +
                             relation.inverseRelation.propertyPath.replace(".", "_") +
                             "_" +
@@ -458,32 +438,30 @@ var RelationIdLoader = /** @class */ (function () {
                 }));
             }
         }
-        var mainAlias = relation.entityMetadata.targetName;
+        const mainAlias = relation.entityMetadata.targetName;
         // select all columns we need
-        var qb = this.connection.createQueryBuilder();
-        relation.entityMetadata.primaryColumns.forEach(function (primaryColumn) {
-            var columnName = DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, primaryColumn.entityMetadata.name +
+        const qb = this.connection.createQueryBuilder();
+        relation.entityMetadata.primaryColumns.forEach((primaryColumn) => {
+            const columnName = DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, primaryColumn.entityMetadata.name +
                 "_" +
                 relation.inverseRelation.propertyPath.replace(".", "_") +
                 "_" +
                 primaryColumn.propertyPath.replace(".", "_"));
             qb.addSelect(mainAlias + "." + primaryColumn.propertyPath, columnName);
         });
-        relation.joinColumns.forEach(function (column) {
-            var columnName = DriverUtils_1.DriverUtils.buildAlias(_this.connection.driver, column.referencedColumn.entityMetadata.name +
+        relation.joinColumns.forEach((column) => {
+            const columnName = DriverUtils_1.DriverUtils.buildAlias(this.connection.driver, column.referencedColumn.entityMetadata.name +
                 "_" +
                 column.referencedColumn.propertyPath.replace(".", "_"));
             qb.addSelect(mainAlias + "." + column.propertyPath, columnName);
         });
         // add condition for entities
-        var condition = "";
+        let condition = "";
         if (relation.joinColumns.length === 1) {
-            var values = entities.map(function (entity) {
-                return relation.joinColumns[0].referencedColumn.getEntityValue(entity);
-            });
-            var areAllNumbers = values.every(function (value) { return typeof value === "number"; });
+            const values = entities.map((entity) => relation.joinColumns[0].referencedColumn.getEntityValue(entity));
+            const areAllNumbers = values.every((value) => typeof value === "number");
             if (areAllNumbers) {
-                condition = "".concat(mainAlias, ".").concat(relation.joinColumns[0].propertyPath, " IN (").concat(values.join(", "), ")");
+                condition = `${mainAlias}.${relation.joinColumns[0].propertyPath} IN (${values.join(", ")})`;
             }
             else {
                 qb.setParameter("values", values);
@@ -496,10 +474,10 @@ var RelationIdLoader = /** @class */ (function () {
         }
         else {
             condition = entities
-                .map(function (entity, entityIndex) {
+                .map((entity, entityIndex) => {
                 return relation.joinColumns
-                    .map(function (joinColumn, joinColumnIndex) {
-                    var paramName = "entity" + entityIndex + "_" + joinColumnIndex;
+                    .map((joinColumn, joinColumnIndex) => {
+                    const paramName = "entity" + entityIndex + "_" + joinColumnIndex;
                     qb.setParameter(paramName, joinColumn.referencedColumn.getEntityValue(entity));
                     return (mainAlias +
                         "." +
@@ -509,7 +487,7 @@ var RelationIdLoader = /** @class */ (function () {
                 })
                     .join(" AND ");
             })
-                .map(function (condition) { return "(" + condition + ")"; })
+                .map((condition) => "(" + condition + ")")
                 .join(" OR ");
         }
         // execute query
@@ -517,8 +495,7 @@ var RelationIdLoader = /** @class */ (function () {
             .from(relation.entityMetadata.target, mainAlias)
             .where(condition)
             .getRawMany();
-    };
-    return RelationIdLoader;
-}());
+    }
+}
 exports.RelationIdLoader = RelationIdLoader;
 //# sourceMappingURL=RelationIdLoader.js.map