taon-typeorm 18.0.19 → 18.0.21

package/lib/typeorm/query-builder/transformer/PlainObjectToNewEntityTransformer.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlainObjectToNewEntityTransformer = void 0;
-var ObjectUtils_1 = require("../../util/ObjectUtils");
+const ObjectUtils_1 = require("../../util/ObjectUtils");
 /**
  * Transforms plain old javascript object
  * Entity is constructed based on its entity metadata.
  */
-var PlainObjectToNewEntityTransformer = /** @class */ (function () {
-    function PlainObjectToNewEntityTransformer() {
-    }
+class PlainObjectToNewEntityTransformer {
     // -------------------------------------------------------------------------
     // Public Methods
     // -------------------------------------------------------------------------
-    PlainObjectToNewEntityTransformer.prototype.transform = function (newEntity, object, metadata, getLazyRelationsPromiseValue) {
-        if (getLazyRelationsPromiseValue === void 0) { getLazyRelationsPromiseValue = false; }
+    transform(newEntity, object, metadata, getLazyRelationsPromiseValue = false) {
         // console.log("groupAndTransform entity:", newEntity);
         // console.log("groupAndTransform object:", object);
         this.groupAndTransform(newEntity, object, metadata, getLazyRelationsPromiseValue);
         // console.log("result:", newEntity);
         return newEntity;
-    };
+    }
     // -------------------------------------------------------------------------
     // Private Methods
     // -------------------------------------------------------------------------
@@ -27,22 +24,20 @@ var PlainObjectToNewEntityTransformer = /** @class */ (function () {
      * Since db returns a duplicated rows of the data where accuracies of the same object can be duplicated
      * we need to group our result and we must have some unique id (primary key in our case)
      */
-    PlainObjectToNewEntityTransformer.prototype.groupAndTransform = function (entity, object, metadata, getLazyRelationsPromiseValue) {
+    groupAndTransform(entity, object, metadata, getLazyRelationsPromiseValue = false) {
         // console.log("groupAndTransform entity:", entity);
         // console.log("groupAndTransform object:", object);
-        var _this = this;
-        if (getLazyRelationsPromiseValue === void 0) { getLazyRelationsPromiseValue = false; }
         // copy regular column properties from the given object
-        metadata.nonVirtualColumns.forEach(function (column) {
-            var objectColumnValue = column.getEntityValue(object);
+        metadata.nonVirtualColumns.forEach((column) => {
+            const objectColumnValue = column.getEntityValue(object);
             if (objectColumnValue !== undefined)
                 column.setEntityValue(entity, objectColumnValue);
         });
         // // copy relation properties from the given object
         if (metadata.relations.length) {
-            metadata.relations.forEach(function (relation) {
-                var entityRelatedValue = relation.getEntityValue(entity);
-                var objectRelatedValue = relation.getEntityValue(object, getLazyRelationsPromiseValue);
+            metadata.relations.forEach((relation) => {
+                let entityRelatedValue = relation.getEntityValue(entity);
+                const objectRelatedValue = relation.getEntityValue(object, getLazyRelationsPromiseValue);
                 if (objectRelatedValue === undefined)
                     return;
                 if (relation.isOneToMany || relation.isManyToMany) {
@@ -52,9 +47,9 @@ var PlainObjectToNewEntityTransformer = /** @class */ (function () {
                         entityRelatedValue = [];
                         relation.setEntityValue(entity, entityRelatedValue);
                     }
-                    objectRelatedValue.forEach(function (objectRelatedValueItem) {
+                    objectRelatedValue.forEach((objectRelatedValueItem) => {
                         // check if we have this item from the merging object in the original entity we merge into
-                        var objectRelatedValueEntity = entityRelatedValue.find(function (entityRelatedValueItem) {
+                        let objectRelatedValueEntity = entityRelatedValue.find((entityRelatedValueItem) => {
                             return relation.inverseEntityMetadata.compareEntities(objectRelatedValueItem, entityRelatedValueItem);
                         });
                         // if such item already exist then merge new data into it, if its not we create a new entity and merge it into the array
@@ -63,7 +58,7 @@ var PlainObjectToNewEntityTransformer = /** @class */ (function () {
                                 relation.inverseEntityMetadata.create(undefined, { fromDeserializer: true });
                             entityRelatedValue.push(objectRelatedValueEntity);
                         }
-                        _this.groupAndTransform(objectRelatedValueEntity, objectRelatedValueItem, relation.inverseEntityMetadata, getLazyRelationsPromiseValue);
+                        this.groupAndTransform(objectRelatedValueEntity, objectRelatedValueItem, relation.inverseEntityMetadata, getLazyRelationsPromiseValue);
                     });
                 }
                 else {
@@ -83,12 +78,11 @@ var PlainObjectToNewEntityTransformer = /** @class */ (function () {
                             });
                         relation.setEntityValue(entity, entityRelatedValue);
                     }
-                    _this.groupAndTransform(entityRelatedValue, objectRelatedValue, relation.inverseEntityMetadata, getLazyRelationsPromiseValue);
+                    this.groupAndTransform(entityRelatedValue, objectRelatedValue, relation.inverseEntityMetadata, getLazyRelationsPromiseValue);
                 }
             });
         }
-    };
-    return PlainObjectToNewEntityTransformer;
-}());
+    }
+}
 exports.PlainObjectToNewEntityTransformer = PlainObjectToNewEntityTransformer;
 //# sourceMappingURL=PlainObjectToNewEntityTransformer.js.map

package/lib/typeorm/query-builder/transformer/PlainObjectToNewEntityTransformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlainObjectToNewEntityTransformer.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"PlainObjectToNewEntityTransformer.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/query-builder/transformer/PlainObjectToNewEntityTransformer.ts"],"names":[],"mappings":"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"}

package/lib/typeorm/query-builder/transformer/RawSqlResultsToEntityTransformer.js

@@ -1,19 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RawSqlResultsToEntityTransformer = void 0;
-var tslib_1 = require("tslib");
-var OrmUtils_1 = require("../../util/OrmUtils");
-var DriverUtils_1 = require("../../driver/DriverUtils");
-var ObjectUtils_1 = require("../../util/ObjectUtils");
+const OrmUtils_1 = require("../../util/OrmUtils");
+const DriverUtils_1 = require("../../driver/DriverUtils");
+const ObjectUtils_1 = require("../../util/ObjectUtils");
 /**
  * Transforms raw sql results returned from the database into entity object.
  * Entity is constructed based on its entity metadata.
  */
-var RawSqlResultsToEntityTransformer = /** @class */ (function () {
+class RawSqlResultsToEntityTransformer {
+    expressionMap;
+    driver;
+    rawRelationIdResults;
+    rawRelationCountResults;
+    queryRunner;
+    /**
+     * Contains a hashmap for every rawRelationIdResults given.
+     * In the hashmap you will find the idMaps of a result under the hash of this.hashEntityIds for the result.
+     */
+    relationIdMaps;
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function RawSqlResultsToEntityTransformer(expressionMap, driver, rawRelationIdResults, rawRelationCountResults, queryRunner) {
+    constructor(expressionMap, driver, rawRelationIdResults, rawRelationCountResults, queryRunner) {
         this.expressionMap = expressionMap;
         this.driver = driver;
         this.rawRelationIdResults = rawRelationIdResults;
@@ -27,42 +36,36 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
      * Since db returns a duplicated rows of the data where accuracies of the same object can be duplicated
      * we need to group our result and we must have some unique id (primary key in our case)
      */
-    RawSqlResultsToEntityTransformer.prototype.transform = function (rawResults, alias) {
-        var _this = this;
-        var group = this.group(rawResults, alias);
-        var entities = [];
-        group.forEach(function (results) {
-            var entity = _this.transformRawResultsGroup(results, alias);
+    transform(rawResults, alias) {
+        const group = this.group(rawResults, alias);
+        const entities = [];
+        group.forEach((results) => {
+            const entity = this.transformRawResultsGroup(results, alias);
             if (entity !== undefined &&
-                !Object.values(entity).every(function (value) { return value === null; }))
+                !Object.values(entity).every((value) => value === null))
                 entities.push(entity);
         });
         return entities;
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * Groups given raw results by ids of given alias.
      */
-    RawSqlResultsToEntityTransformer.prototype.group = function (rawResults, alias) {
-        var _this = this;
-        var map = new Map();
-        var keys = [];
+    group(rawResults, alias) {
+        const map = new Map();
+        const keys = [];
         if (alias.metadata.tableType === "view") {
-            keys.push.apply(keys, tslib_1.__spreadArray([], tslib_1.__read(alias.metadata.columns.map(function (column) {
-                return DriverUtils_1.DriverUtils.buildAlias(_this.driver, alias.name, column.databaseName);
-            })), false));
+            keys.push(...alias.metadata.columns.map((column) => DriverUtils_1.DriverUtils.buildAlias(this.driver, alias.name, column.databaseName)));
         }
         else {
-            keys.push.apply(keys, tslib_1.__spreadArray([], tslib_1.__read(alias.metadata.primaryColumns.map(function (column) {
-                return DriverUtils_1.DriverUtils.buildAlias(_this.driver, alias.name, column.databaseName);
-            })), false));
+            keys.push(...alias.metadata.primaryColumns.map((column) => DriverUtils_1.DriverUtils.buildAlias(this.driver, alias.name, column.databaseName)));
         }
-        rawResults.forEach(function (rawResult) {
-            var id = keys
-                .map(function (key) {
-                var keyValue = rawResult[key];
+        rawResults.forEach((rawResult) => {
+            const id = keys
+                .map((key) => {
+                const keyValue = rawResult[key];
                 //#region @backend
                 if (Buffer.isBuffer(keyValue)) { // TODO is this correct for browser version ?
                     return keyValue.toString("hex");
@@ -74,7 +77,7 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
                 return keyValue;
             })
                 .join("_"); // todo: check partial
-            var items = map.get(id);
+            const items = map.get(id);
             if (!items) {
                 map.set(id, [rawResult]);
             }
@@ -83,36 +86,31 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
             }
         });
         return map;
-    };
+    }
     /**
      * Transforms set of data results into single entity.
      */
-    RawSqlResultsToEntityTransformer.prototype.transformRawResultsGroup = function (rawResults, alias) {
-        var _this = this;
+    transformRawResultsGroup(rawResults, alias) {
         // let hasColumns = false; // , hasEmbeddedColumns = false, hasParentColumns = false, hasParentEmbeddedColumns = false;
-        var metadata = alias.metadata;
+        let metadata = alias.metadata;
         if (metadata.discriminatorColumn) {
-            var discriminatorValues_1 = rawResults.map(function (result) {
-                return result[DriverUtils_1.DriverUtils.buildAlias(_this.driver, alias.name, alias.metadata.discriminatorColumn.databaseName)];
-            });
-            var discriminatorMetadata = metadata.childEntityMetadatas.find(function (childEntityMetadata) {
-                return (typeof discriminatorValues_1.find(function (value) {
-                    return value ===
-                        childEntityMetadata.discriminatorValue;
-                }) !== "undefined");
+            const discriminatorValues = rawResults.map((result) => result[DriverUtils_1.DriverUtils.buildAlias(this.driver, alias.name, alias.metadata.discriminatorColumn.databaseName)]);
+            const discriminatorMetadata = metadata.childEntityMetadatas.find((childEntityMetadata) => {
+                return (typeof discriminatorValues.find((value) => value ===
+                    childEntityMetadata.discriminatorValue) !== "undefined");
             });
             if (discriminatorMetadata)
                 metadata = discriminatorMetadata;
         }
-        var entity = metadata.create(this.queryRunner, {
+        let entity = metadata.create(this.queryRunner, {
             fromDeserializer: true,
             pojo: this.expressionMap.options.indexOf("create-pojo") !== -1,
         });
         // get value from columns selections and put them into newly created entity
-        var hasColumns = this.transformColumns(rawResults, alias, entity, metadata);
-        var hasRelations = this.transformJoins(rawResults, entity, alias, metadata);
-        var hasRelationIds = this.transformRelationIds(rawResults, alias, entity, metadata);
-        var hasRelationCounts = this.transformRelationCounts(rawResults, alias, entity);
+        const hasColumns = this.transformColumns(rawResults, alias, entity, metadata);
+        const hasRelations = this.transformJoins(rawResults, entity, alias, metadata);
+        const hasRelationIds = this.transformRelationIds(rawResults, alias, entity, metadata);
+        const hasRelationCounts = this.transformRelationCounts(rawResults, alias, entity);
         // if we have at least one selected column then return this entity
         // since entity must have at least primary columns to be really selected and transformed into entity
         if (hasColumns)
@@ -120,49 +118,45 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
         // if we don't have any selected column we should not return entity,
         // except for the case when entity only contain a primary column as a relation to another entity
         // in this case its absolutely possible our entity to not have any columns except a single relation
-        var hasOnlyVirtualPrimaryColumns = metadata.primaryColumns.filter(function (column) { return column.isVirtual === false; }).length === 0; // todo: create metadata.hasOnlyVirtualPrimaryColumns
+        const hasOnlyVirtualPrimaryColumns = metadata.primaryColumns.filter((column) => column.isVirtual === false).length === 0; // todo: create metadata.hasOnlyVirtualPrimaryColumns
         if (hasOnlyVirtualPrimaryColumns &&
             (hasRelations || hasRelationIds || hasRelationCounts))
             return entity;
         return undefined;
-    };
+    }
     // get value from columns selections and put them into object
-    RawSqlResultsToEntityTransformer.prototype.transformColumns = function (rawResults, alias, entity, metadata) {
-        var _this = this;
-        var hasData = false;
-        metadata.columns.forEach(function (column) {
+    transformColumns(rawResults, alias, entity, metadata) {
+        let hasData = false;
+        metadata.columns.forEach((column) => {
             // if table inheritance is used make sure this column is not child's column
             if (metadata.childEntityMetadatas.length > 0 &&
-                metadata.childEntityMetadatas.findIndex(function (childMetadata) { return childMetadata.target === column.target; }) !== -1)
+                metadata.childEntityMetadatas.findIndex((childMetadata) => childMetadata.target === column.target) !== -1)
                 return;
-            var value = rawResults[0][DriverUtils_1.DriverUtils.buildAlias(_this.driver, alias.name, column.databaseName)];
+            const value = rawResults[0][DriverUtils_1.DriverUtils.buildAlias(this.driver, alias.name, column.databaseName)];
             if (value === undefined || column.isVirtual)
                 return;
             // if user does not selected the whole entity or he used partial selection and does not select this particular column
             // then we don't add this column and its value into the entity
-            if (!_this.expressionMap.selects.find(function (select) {
-                return select.selection === alias.name ||
-                    select.selection ===
-                        alias.name + "." + column.propertyPath;
-            }))
+            if (!this.expressionMap.selects.find((select) => select.selection === alias.name ||
+                select.selection ===
+                    alias.name + "." + column.propertyPath))
                 return;
-            column.setEntityValue(entity, _this.driver.prepareHydratedValue(value, column));
+            column.setEntityValue(entity, this.driver.prepareHydratedValue(value, column));
             if (value !== null)
                 // we don't mark it as has data because if we will have all nulls in our object - we don't need such object
                 hasData = true;
         });
         return hasData;
-    };
+    }
     /**
      * Transforms joined entities in the given raw results by a given alias and stores to the given (parent) entity
      */
-    RawSqlResultsToEntityTransformer.prototype.transformJoins = function (rawResults, entity, alias, metadata) {
-        var _this = this;
-        var hasData = false;
+    transformJoins(rawResults, entity, alias, metadata) {
+        let hasData = false;
         // let discriminatorValue: string = "";
         // if (metadata.discriminatorColumn)
         //     discriminatorValue = rawResults[0][DriverUtils.buildAlias(this.connection.driver, alias.name, alias.metadata.discriminatorColumn!.databaseName)];
-        this.expressionMap.joinAttributes.forEach(function (join) {
+        this.expressionMap.joinAttributes.forEach((join) => {
             // todo: we have problem here - when inner joins are used without selects it still create empty array
             // skip joins without metadata
             if (!join.metadata)
@@ -173,7 +167,7 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
             // this check need to avoid setting properties than not belong to entity when single table inheritance used. (todo: check if we still need it)
             // const metadata = metadata.childEntityMetadatas.find(childEntityMetadata => discriminatorValue === childEntityMetadata.discriminatorValue);
             if (join.relation &&
-                !metadata.relations.find(function (relation) { return relation === join.relation; }))
+                !metadata.relations.find((relation) => relation === join.relation))
                 return;
             // some checks to make sure this join is for current alias
             if (join.mapToProperty) {
@@ -187,7 +181,7 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
                     return;
             }
             // transform joined data into entities
-            var result = _this.transform(rawResults, join.alias);
+            let result = this.transform(rawResults, join.alias);
             result = !join.isMany ? result[0] : result;
             result = !join.isMany && result === undefined ? null : result; // this is needed to make relations to return null when its joined but nothing was found in the database
             if (result === undefined)
@@ -204,28 +198,27 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
             hasData = true;
         });
         return hasData;
-    };
-    RawSqlResultsToEntityTransformer.prototype.transformRelationIds = function (rawSqlResults, alias, entity, metadata) {
-        var _this = this;
-        var hasData = false;
-        this.rawRelationIdResults.forEach(function (rawRelationIdResult, index) {
+    }
+    transformRelationIds(rawSqlResults, alias, entity, metadata) {
+        let hasData = false;
+        this.rawRelationIdResults.forEach((rawRelationIdResult, index) => {
             if (rawRelationIdResult.relationIdAttribute.parentAlias !==
                 alias.name)
                 return;
-            var relation = rawRelationIdResult.relationIdAttribute.relation;
-            var valueMap = _this.createValueMapFromJoinColumns(relation, rawRelationIdResult.relationIdAttribute.parentAlias, rawSqlResults);
+            const relation = rawRelationIdResult.relationIdAttribute.relation;
+            const valueMap = this.createValueMapFromJoinColumns(relation, rawRelationIdResult.relationIdAttribute.parentAlias, rawSqlResults);
             if (valueMap === undefined || valueMap === null) {
                 return;
             }
             // prepare common data for this call
-            _this.prepareDataForTransformRelationIds();
+            this.prepareDataForTransformRelationIds();
             // Extract idMaps from prepared data by hash
-            var hash = _this.hashEntityIds(relation, valueMap);
-            var idMaps = _this.relationIdMaps[index][hash] || [];
+            const hash = this.hashEntityIds(relation, valueMap);
+            const idMaps = this.relationIdMaps[index][hash] || [];
             // Map data to properties
-            var properties = rawRelationIdResult.relationIdAttribute.mapToPropertyPropertyPath.split(".");
-            var mapToProperty = function (properties, map, value) {
-                var property = properties.shift();
+            const properties = rawRelationIdResult.relationIdAttribute.mapToPropertyPropertyPath.split(".");
+            const mapToProperty = (properties, map, value) => {
+                const property = properties.shift();
                 if (property && properties.length === 0) {
                     map[property] = value;
                     return map;
@@ -249,18 +242,15 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
             }
         });
         return hasData;
-    };
-    RawSqlResultsToEntityTransformer.prototype.transformRelationCounts = function (rawSqlResults, alias, entity) {
-        var _this = this;
-        var hasData = false;
+    }
+    transformRelationCounts(rawSqlResults, alias, entity) {
+        let hasData = false;
         this.rawRelationCountResults
-            .filter(function (rawRelationCountResult) {
-            return rawRelationCountResult.relationCountAttribute
-                .parentAlias === alias.name;
-        })
-            .forEach(function (rawRelationCountResult) {
-            var relation = rawRelationCountResult.relationCountAttribute.relation;
-            var referenceColumnName;
+            .filter((rawRelationCountResult) => rawRelationCountResult.relationCountAttribute
+            .parentAlias === alias.name)
+            .forEach((rawRelationCountResult) => {
+            const relation = rawRelationCountResult.relationCountAttribute.relation;
+            let referenceColumnName;
             if (relation.isOneToMany) {
                 referenceColumnName =
                     relation.inverseRelation.joinColumns[0]
@@ -272,74 +262,71 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
                     : relation.inverseRelation.joinColumns[0]
                         .referencedColumn.databaseName;
             }
-            var referenceColumnValue = rawSqlResults[0][DriverUtils_1.DriverUtils.buildAlias(_this.driver, alias.name, referenceColumnName)]; // we use zero index since its grouped data // todo: selection with alias for entity columns wont work
+            const referenceColumnValue = rawSqlResults[0][DriverUtils_1.DriverUtils.buildAlias(this.driver, alias.name, referenceColumnName)]; // we use zero index since its grouped data // todo: selection with alias for entity columns wont work
             if (referenceColumnValue !== undefined &&
                 referenceColumnValue !== null) {
                 entity[rawRelationCountResult.relationCountAttribute.mapToPropertyPropertyName] = 0;
                 rawRelationCountResult.results
-                    .filter(function (result) {
-                    return result["parentId"] === referenceColumnValue;
-                })
-                    .forEach(function (result) {
+                    .filter((result) => result["parentId"] === referenceColumnValue)
+                    .forEach((result) => {
                     entity[rawRelationCountResult.relationCountAttribute.mapToPropertyPropertyName] = parseInt(result["cnt"]);
                     hasData = true;
                 });
             }
         });
         return hasData;
-    };
-    RawSqlResultsToEntityTransformer.prototype.createValueMapFromJoinColumns = function (relation, parentAlias, rawSqlResults) {
-        var _this = this;
-        var columns;
+    }
+    createValueMapFromJoinColumns(relation, parentAlias, rawSqlResults) {
+        let columns;
         if (relation.isManyToOne || relation.isOneToOneOwner) {
-            columns = relation.entityMetadata.primaryColumns.map(function (joinColumn) { return joinColumn; });
+            columns = relation.entityMetadata.primaryColumns.map((joinColumn) => joinColumn);
         }
         else if (relation.isOneToMany || relation.isOneToOneNotOwner) {
-            columns = relation.inverseRelation.joinColumns.map(function (joinColumn) { return joinColumn; });
+            columns = relation.inverseRelation.joinColumns.map((joinColumn) => joinColumn);
         }
         else {
             if (relation.isOwning) {
-                columns = relation.joinColumns.map(function (joinColumn) { return joinColumn; });
+                columns = relation.joinColumns.map((joinColumn) => joinColumn);
             }
             else {
-                columns = relation.inverseRelation.inverseJoinColumns.map(function (joinColumn) { return joinColumn; });
+                columns = relation.inverseRelation.inverseJoinColumns.map((joinColumn) => joinColumn);
             }
         }
-        return columns.reduce(function (valueMap, column) {
-            rawSqlResults.forEach(function (rawSqlResult) {
+        return columns.reduce((valueMap, column) => {
+            rawSqlResults.forEach((rawSqlResult) => {
                 if (relation.isManyToOne || relation.isOneToOneOwner) {
                     valueMap[column.databaseName] =
-                        _this.driver.prepareHydratedValue(rawSqlResult[DriverUtils_1.DriverUtils.buildAlias(_this.driver, parentAlias, column.databaseName)], column);
+                        this.driver.prepareHydratedValue(rawSqlResult[DriverUtils_1.DriverUtils.buildAlias(this.driver, parentAlias, column.databaseName)], column);
                 }
                 else {
                     valueMap[column.databaseName] =
-                        _this.driver.prepareHydratedValue(rawSqlResult[DriverUtils_1.DriverUtils.buildAlias(_this.driver, parentAlias, column.referencedColumn.databaseName)], column);
+                        this.driver.prepareHydratedValue(rawSqlResult[DriverUtils_1.DriverUtils.buildAlias(this.driver, parentAlias, column.referencedColumn.databaseName)], column);
                 }
             });
             return valueMap;
         }, {});
-    };
-    RawSqlResultsToEntityTransformer.prototype.extractEntityPrimaryIds = function (relation, relationIdRawResult) {
-        var columns;
+    }
+    extractEntityPrimaryIds(relation, relationIdRawResult) {
+        let columns;
         if (relation.isManyToOne || relation.isOneToOneOwner) {
-            columns = relation.entityMetadata.primaryColumns.map(function (joinColumn) { return joinColumn; });
+            columns = relation.entityMetadata.primaryColumns.map((joinColumn) => joinColumn);
         }
         else if (relation.isOneToMany || relation.isOneToOneNotOwner) {
-            columns = relation.inverseRelation.joinColumns.map(function (joinColumn) { return joinColumn; });
+            columns = relation.inverseRelation.joinColumns.map((joinColumn) => joinColumn);
         }
         else {
             if (relation.isOwning) {
-                columns = relation.joinColumns.map(function (joinColumn) { return joinColumn; });
+                columns = relation.joinColumns.map((joinColumn) => joinColumn);
             }
             else {
-                columns = relation.inverseRelation.inverseJoinColumns.map(function (joinColumn) { return joinColumn; });
+                columns = relation.inverseRelation.inverseJoinColumns.map((joinColumn) => joinColumn);
             }
         }
-        return columns.reduce(function (data, column) {
+        return columns.reduce((data, column) => {
             data[column.databaseName] = relationIdRawResult[column.databaseName];
             return data;
         }, {});
-    };
+    }
     /*private removeVirtualColumns(entity: ObjectLiteral, alias: Alias) {
         const virtualColumns = this.expressionMap.selects
             .filter(select => select.virtual)
@@ -348,17 +335,16 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
         virtualColumns.forEach(virtualColumn => delete entity[virtualColumn]);
     }*/
     /** Prepare data to run #transformRelationIds, as a lot of result independent data is needed in every call */
-    RawSqlResultsToEntityTransformer.prototype.prepareDataForTransformRelationIds = function () {
-        var _this = this;
+    prepareDataForTransformRelationIds() {
         // Return early if the relationIdMaps were already calculated
         if (this.relationIdMaps) {
             return;
         }
         // Ensure this prepare function is only called once
-        this.relationIdMaps = this.rawRelationIdResults.map(function (rawRelationIdResult) {
-            var relation = rawRelationIdResult.relationIdAttribute.relation;
+        this.relationIdMaps = this.rawRelationIdResults.map((rawRelationIdResult) => {
+            const relation = rawRelationIdResult.relationIdAttribute.relation;
             // Calculate column metadata
-            var columns;
+            let columns;
             if (relation.isManyToOne || relation.isOneToOneOwner) {
                 columns = relation.joinColumns;
             }
@@ -376,9 +362,9 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
                 }
             }
             // Calculate the idMaps for the rawRelationIdResult
-            return rawRelationIdResult.results.reduce(function (agg, result) {
-                var idMap = columns.reduce(function (idMap, column) {
-                    var value = result[column.databaseName];
+            return rawRelationIdResult.results.reduce((agg, result) => {
+                let idMap = columns.reduce((idMap, column) => {
+                    let value = result[column.databaseName];
                     if (relation.isOneToMany ||
                         relation.isOneToOneNotOwner) {
                         if (column.isVirtual &&
@@ -412,7 +398,7 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
                 }
                 // If an idMap is found, set it in the aggregator under the correct hash
                 if (idMap !== undefined) {
-                    var hash = _this.hashEntityIds(relation, result);
+                    const hash = this.hashEntityIds(relation, result);
                     if (agg[hash]) {
                         agg[hash].push(idMap);
                     }
@@ -423,17 +409,16 @@ var RawSqlResultsToEntityTransformer = /** @class */ (function () {
                 return agg;
             }, {});
         });
-    };
+    }
     /**
      * Use a simple JSON.stringify to create a simple hash of the primary ids of an entity.
      * As this.extractEntityPrimaryIds always creates the primary id object in the same order, if the same relation is
      * given, a simple JSON.stringify should be enough to get a unique hash per entity!
      */
-    RawSqlResultsToEntityTransformer.prototype.hashEntityIds = function (relation, data) {
-        var entityPrimaryIds = this.extractEntityPrimaryIds(relation, data);
+    hashEntityIds(relation, data) {
+        const entityPrimaryIds = this.extractEntityPrimaryIds(relation, data);
         return JSON.stringify(entityPrimaryIds);
-    };
-    return RawSqlResultsToEntityTransformer;
-}());
+    }
+}
 exports.RawSqlResultsToEntityTransformer = RawSqlResultsToEntityTransformer;
 //# sourceMappingURL=RawSqlResultsToEntityTransformer.js.map