typeorm 0.3.0-rc.9 → 0.3.0

package/browser/entity-manager/EntityManager.js

@@ -1,39 +1,39 @@
-import * as tslib_1 from "tslib";
-import { MongoDriver } from "../driver/mongodb/MongoDriver";
-import { OracleDriver } from "../driver/oracle/OracleDriver";
-import { CustomRepositoryCannotInheritRepositoryError } from "../error/CustomRepositoryCannotInheritRepositoryError";
-import { CustomRepositoryNotFoundError } from "../error/CustomRepositoryNotFoundError";
 import { EntityNotFoundError } from "../error/EntityNotFoundError";
-import { NoNeedToReleaseEntityManagerError } from "../error/NoNeedToReleaseEntityManagerError";
 import { QueryRunnerProviderAlreadyReleasedError } from "../error/QueryRunnerProviderAlreadyReleasedError";
-import { RepositoryNotFoundError } from "../error/RepositoryNotFoundError";
-import { TreeRepositoryNotSupportedError } from "../error/TreeRepositoryNotSupportedError";
+import { NoNeedToReleaseEntityManagerError } from "../error/NoNeedToReleaseEntityManagerError";
+import { MongoRepository } from "../repository/MongoRepository";
+import { TreeRepository } from "../repository/TreeRepository";
+import { Repository } from "../repository/Repository";
 import { FindOptionsUtils } from "../find-options/FindOptionsUtils";
-import { EntitySchema, getMetadataArgsStorage } from "../index";
-import { ObserverExecutor } from "../observer/ObserverExecutor";
-import { QueryObserver } from "../observer/QueryObserver";
-import { EntityPersistExecutor } from "../persistence/EntityPersistExecutor";
-import { PlainObjectToDatabaseEntityTransformer } from "../query-builder/transformer/PlainObjectToDatabaseEntityTransformer";
 import { PlainObjectToNewEntityTransformer } from "../query-builder/transformer/PlainObjectToNewEntityTransformer";
+import { PlainObjectToDatabaseEntityTransformer } from "../query-builder/transformer/PlainObjectToDatabaseEntityTransformer";
+import { CustomRepositoryCannotInheritRepositoryError, CustomRepositoryNotFoundError, TreeRepositoryNotSupportedError, TypeORMError, } from "../error";
 import { AbstractRepository } from "../repository/AbstractRepository";
-import { RepositoryFactory } from "../repository/RepositoryFactory";
+import { EntityPersistExecutor } from "../persistence/EntityPersistExecutor";
 import { ObjectUtils } from "../util/ObjectUtils";
+import { getMetadataArgsStorage } from "../globals";
+import { InstanceChecker } from "../util/InstanceChecker";
 /**
  * Entity manager supposed to work with any entity, automatically find its repository and call its methods,
  * whatever entity type are you passing.
  */
-var EntityManager = /** @class */ (function () {
+export class EntityManager {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function EntityManager(connection, queryRunner) {
+    constructor(connection, queryRunner) {
+        this["@instanceof"] = Symbol.for("EntityManager");
         // -------------------------------------------------------------------------
         // Protected Properties
         // -------------------------------------------------------------------------
         /**
-         * Once created and then reused by en repositories.
+         * Once created and then reused by repositories.
          */
         this.repositories = [];
+        /**
+         * Once created and then reused by repositories.
+         */
+        this.treeRepositories = [];
         /**
          * Plain to object transformer used in create and merge operations.
          */
@@ -49,196 +49,220 @@ var EntityManager = /** @class */ (function () {
      * Wraps given function execution (and all operations made there) in a transaction.
      * All database operations must be executed using provided entity manager.
      */
-    EntityManager.prototype.transaction = function (isolationOrRunInTransaction, runInTransactionParam) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var isolation, runInTransaction, queryRunner, result, err_1, rollbackError_1;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        isolation = typeof isolationOrRunInTransaction === "string" ? isolationOrRunInTransaction : undefined;
-                        runInTransaction = typeof isolationOrRunInTransaction === "function" ? isolationOrRunInTransaction : runInTransactionParam;
-                        if (!runInTransaction) {
-                            throw new Error("Transaction method requires callback in second paramter if isolation level is supplied.");
-                        }
-                        if (this.connection.driver instanceof MongoDriver)
-                            throw new Error("Transactions aren't supported by MongoDB.");
-                        if (this.queryRunner && this.queryRunner.isReleased)
-                            throw new QueryRunnerProviderAlreadyReleasedError();
-                        if (this.queryRunner && this.queryRunner.isTransactionActive)
-                            throw new Error("Cannot start transaction because its already started");
-                        queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 9, 14, 17]);
-                        if (!isolation) return [3 /*break*/, 3];
-                        return [4 /*yield*/, queryRunner.startTransaction(isolation)];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, queryRunner.startTransaction()];
-                    case 4:
-                        _a.sent();
-                        _a.label = 5;
-                    case 5: return [4 /*yield*/, runInTransaction(queryRunner.manager)];
-                    case 6:
-                        result = _a.sent();
-                        return [4 /*yield*/, queryRunner.commitTransaction()];
-                    case 7:
-                        _a.sent();
-                        return [4 /*yield*/, new ObserverExecutor(this.connection.observers).execute()];
-                    case 8:
-                        _a.sent();
-                        return [2 /*return*/, result];
-                    case 9:
-                        err_1 = _a.sent();
-                        _a.label = 10;
-                    case 10:
-                        _a.trys.push([10, 12, , 13]);
-                        return [4 /*yield*/, queryRunner.rollbackTransaction()];
-                    case 11:
-                        _a.sent();
-                        return [3 /*break*/, 13];
-                    case 12:
-                        rollbackError_1 = _a.sent();
-                        return [3 /*break*/, 13];
-                    case 13: throw err_1;
-                    case 14:
-                        if (!!this.queryRunner) return [3 /*break*/, 16];
-                        return [4 /*yield*/, queryRunner.release()];
-                    case 15:
-                        _a.sent();
-                        _a.label = 16;
-                    case 16: return [7 /*endfinally*/];
-                    case 17: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async transaction(isolationOrRunInTransaction, runInTransactionParam) {
+        const isolation = typeof isolationOrRunInTransaction === "string"
+            ? isolationOrRunInTransaction
+            : undefined;
+        const runInTransaction = typeof isolationOrRunInTransaction === "function"
+            ? isolationOrRunInTransaction
+            : runInTransactionParam;
+        if (!runInTransaction) {
+            throw new TypeORMError(`Transaction method requires callback in second paramter if isolation level is supplied.`);
+        }
+        if (this.queryRunner && this.queryRunner.isReleased)
+            throw new QueryRunnerProviderAlreadyReleasedError();
+        // if query runner is already defined in this class, it means this entity manager was already created for a single connection
+        // if its not defined we create a new query runner - single connection where we'll execute all our operations
+        const queryRunner = this.queryRunner || this.connection.createQueryRunner();
+        try {
+            await queryRunner.startTransaction(isolation);
+            const result = await runInTransaction(queryRunner.manager);
+            await queryRunner.commitTransaction();
+            return result;
+        }
+        catch (err) {
+            try {
+                // we throw original error even if rollback thrown an error
+                await queryRunner.rollbackTransaction();
+            }
+            catch (rollbackError) { }
+            throw err;
+        }
+        finally {
+            if (!this.queryRunner)
+                // if we used a new query runner provider then release it
+                await queryRunner.release();
+        }
+    }
     /**
      * Executes raw SQL query and returns raw database results.
      */
-    EntityManager.prototype.query = function (query, parameters) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.connection.query(query, parameters, this.queryRunner)];
-            });
-        });
-    };
+    async query(query, parameters) {
+        return this.connection.query(query, parameters, this.queryRunner);
+    }
     /**
-     * Creates a new query builder that can be used to build a sql query.
+     * Creates a new query builder that can be used to build a SQL query.
      */
-    EntityManager.prototype.createQueryBuilder = function (entityClass, alias, queryRunner) {
+    createQueryBuilder(entityClass, alias, queryRunner) {
         if (alias) {
             return this.connection.createQueryBuilder(entityClass, alias, queryRunner || this.queryRunner);
         }
         else {
-            return this.connection.createQueryBuilder(entityClass || queryRunner || this.queryRunner);
+            return this.connection.createQueryBuilder(entityClass ||
+                queryRunner ||
+                this.queryRunner);
         }
-    };
+    }
     /**
      * Checks if entity has an id by its Function type or schema name.
      */
-    EntityManager.prototype.hasId = function (targetOrEntity, maybeEntity) {
-        var target = arguments.length === 2 ? targetOrEntity : targetOrEntity.constructor;
-        var entity = arguments.length === 2 ? maybeEntity : targetOrEntity;
-        var metadata = this.connection.getMetadata(target);
+    hasId(targetOrEntity, maybeEntity) {
+        const target = arguments.length === 2 ? targetOrEntity : targetOrEntity.constructor;
+        const entity = arguments.length === 2 ? maybeEntity : targetOrEntity;
+        const metadata = this.connection.getMetadata(target);
         return metadata.hasId(entity);
-    };
+    }
     /**
      * Gets entity mixed id.
      */
-    EntityManager.prototype.getId = function (targetOrEntity, maybeEntity) {
-        var target = arguments.length === 2 ? targetOrEntity : targetOrEntity.constructor;
-        var entity = arguments.length === 2 ? maybeEntity : targetOrEntity;
-        var metadata = this.connection.getMetadata(target);
+    getId(targetOrEntity, maybeEntity) {
+        const target = arguments.length === 2 ? targetOrEntity : targetOrEntity.constructor;
+        const entity = arguments.length === 2 ? maybeEntity : targetOrEntity;
+        const metadata = this.connection.getMetadata(target);
         return metadata.getEntityIdMixedMap(entity);
-    };
+    }
     /**
      * Creates a new entity instance or instances.
      * Can copy properties from the given object into new entities.
      */
-    EntityManager.prototype.create = function (entityClass, plainObjectOrObjects) {
-        var _this = this;
-        var metadata = this.connection.getMetadata(entityClass);
+    create(entityClass, plainObjectOrObjects) {
+        const metadata = this.connection.getMetadata(entityClass);
         if (!plainObjectOrObjects)
             return metadata.create(this.queryRunner);
-        if (plainObjectOrObjects instanceof Array)
-            return plainObjectOrObjects.map(function (plainEntityLike) { return _this.create(entityClass, plainEntityLike); });
-        var mergeIntoEntity = metadata.create(this.queryRunner);
+        if (Array.isArray(plainObjectOrObjects))
+            return plainObjectOrObjects.map((plainEntityLike) => this.create(entityClass, plainEntityLike));
+        const mergeIntoEntity = metadata.create(this.queryRunner);
         this.plainObjectToEntityTransformer.transform(mergeIntoEntity, plainObjectOrObjects, metadata, true);
         return mergeIntoEntity;
-    };
+    }
     /**
      * Merges two entities into one new entity.
      */
-    EntityManager.prototype.merge = function (entityClass, mergeIntoEntity) {
-        var _this = this;
-        var entityLikes = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            entityLikes[_i - 2] = arguments[_i];
-        }
-        var metadata = this.connection.getMetadata(entityClass);
-        entityLikes.forEach(function (object) { return _this.plainObjectToEntityTransformer.transform(mergeIntoEntity, object, metadata); });
+    merge(entityClass, mergeIntoEntity, ...entityLikes) {
+        // todo: throw exception if entity manager is released
+        const metadata = this.connection.getMetadata(entityClass);
+        entityLikes.forEach((object) => this.plainObjectToEntityTransformer.transform(mergeIntoEntity, object, metadata));
         return mergeIntoEntity;
-    };
+    }
     /**
-     * Creates a new entity from the given plan javascript object. If entity already exist in the database, then
+     * Creates a new entity from the given plain javascript object. If entity already exist in the database, then
      * it loads it (and everything related to it), replaces all values with the new ones from the given object
      * and returns this new entity. This new entity is actually a loaded from the db entity with all properties
      * replaced from the new object.
      */
-    EntityManager.prototype.preload = function (entityClass, entityLike) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, plainObjectToDatabaseEntityTransformer, transformedEntity;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        metadata = this.connection.getMetadata(entityClass);
-                        plainObjectToDatabaseEntityTransformer = new PlainObjectToDatabaseEntityTransformer(this.connection.manager);
-                        return [4 /*yield*/, plainObjectToDatabaseEntityTransformer.transform(entityLike, metadata)];
-                    case 1:
-                        transformedEntity = _a.sent();
-                        if (transformedEntity)
-                            return [2 /*return*/, this.merge(entityClass, transformedEntity, entityLike)];
-                        return [2 /*return*/, undefined];
-                }
-            });
-        });
-    };
+    async preload(entityClass, entityLike) {
+        const metadata = this.connection.getMetadata(entityClass);
+        const plainObjectToDatabaseEntityTransformer = new PlainObjectToDatabaseEntityTransformer(this.connection.manager);
+        const transformedEntity = await plainObjectToDatabaseEntityTransformer.transform(entityLike, metadata);
+        if (transformedEntity)
+            return this.merge(entityClass, transformedEntity, entityLike);
+        return undefined;
+    }
     /**
      * Saves a given entity in the database.
      */
-    EntityManager.prototype.save = function (targetOrEntity, maybeEntityOrOptions, maybeOptions) {
+    save(targetOrEntity, maybeEntityOrOptions, maybeOptions) {
         // normalize mixed parameters
-        var target = (arguments.length > 1 && (targetOrEntity instanceof Function || targetOrEntity instanceof EntitySchema || typeof targetOrEntity === "string")) ? targetOrEntity : undefined;
-        var entity = target ? maybeEntityOrOptions : targetOrEntity;
-        var options = target ? maybeOptions : maybeEntityOrOptions;
-        if (target instanceof EntitySchema)
+        let target = arguments.length > 1 &&
+            (typeof targetOrEntity === "function" ||
+                InstanceChecker.isEntitySchema(targetOrEntity) ||
+                typeof targetOrEntity === "string")
+            ? targetOrEntity
+            : undefined;
+        const entity = target
+            ? maybeEntityOrOptions
+            : targetOrEntity;
+        const options = target
+            ? maybeOptions
+            : maybeEntityOrOptions;
+        if (InstanceChecker.isEntitySchema(target))
             target = target.options.name;
         // if user passed empty array of entities then we don't need to do anything
-        if (entity instanceof Array && entity.length === 0)
+        if (Array.isArray(entity) && entity.length === 0)
             return Promise.resolve(entity);
         // execute save operation
         return new EntityPersistExecutor(this.connection, this.queryRunner, "save", target, entity, options)
             .execute()
-            .then(function () { return entity; });
-    };
+            .then(() => entity);
+    }
     /**
      * Removes a given entity from the database.
      */
-    EntityManager.prototype.remove = function (targetOrEntity, maybeEntityOrOptions, maybeOptions) {
+    remove(targetOrEntity, maybeEntityOrOptions, maybeOptions) {
         // normalize mixed parameters
-        var target = (arguments.length > 1 && (targetOrEntity instanceof Function || typeof targetOrEntity === "string")) ? targetOrEntity : undefined;
-        var entity = target ? maybeEntityOrOptions : targetOrEntity;
-        var options = target ? maybeOptions : maybeEntityOrOptions;
+        const target = arguments.length > 1 &&
+            (typeof targetOrEntity === "function" ||
+                typeof targetOrEntity === "string")
+            ? targetOrEntity
+            : undefined;
+        const entity = target
+            ? maybeEntityOrOptions
+            : targetOrEntity;
+        const options = target
+            ? maybeOptions
+            : maybeEntityOrOptions;
         // if user passed empty array of entities then we don't need to do anything
-        if (entity instanceof Array && entity.length === 0)
+        if (Array.isArray(entity) && entity.length === 0)
             return Promise.resolve(entity);
         // execute save operation
         return new EntityPersistExecutor(this.connection, this.queryRunner, "remove", target, entity, options)
             .execute()
-            .then(function () { return entity; });
-    };
+            .then(() => entity);
+    }
+    /**
+     * Records the delete date of one or many given entities.
+     */
+    softRemove(targetOrEntity, maybeEntityOrOptions, maybeOptions) {
+        // normalize mixed parameters
+        let target = arguments.length > 1 &&
+            (typeof targetOrEntity === "function" ||
+                InstanceChecker.isEntitySchema(targetOrEntity) ||
+                typeof targetOrEntity === "string")
+            ? targetOrEntity
+            : undefined;
+        const entity = target
+            ? maybeEntityOrOptions
+            : targetOrEntity;
+        const options = target
+            ? maybeOptions
+            : maybeEntityOrOptions;
+        if (InstanceChecker.isEntitySchema(target))
+            target = target.options.name;
+        // if user passed empty array of entities then we don't need to do anything
+        if (Array.isArray(entity) && entity.length === 0)
+            return Promise.resolve(entity);
+        // execute soft-remove operation
+        return new EntityPersistExecutor(this.connection, this.queryRunner, "soft-remove", target, entity, options)
+            .execute()
+            .then(() => entity);
+    }
+    /**
+     * Recovers one or many given entities.
+     */
+    recover(targetOrEntity, maybeEntityOrOptions, maybeOptions) {
+        // normalize mixed parameters
+        let target = arguments.length > 1 &&
+            (typeof targetOrEntity === "function" ||
+                InstanceChecker.isEntitySchema(targetOrEntity) ||
+                typeof targetOrEntity === "string")
+            ? targetOrEntity
+            : undefined;
+        const entity = target
+            ? maybeEntityOrOptions
+            : targetOrEntity;
+        const options = target
+            ? maybeOptions
+            : maybeEntityOrOptions;
+        if (InstanceChecker.isEntitySchema(target))
+            target = target.options.name;
+        // if user passed empty array of entities then we don't need to do anything
+        if (Array.isArray(entity) && entity.length === 0)
+            return Promise.resolve(entity);
+        // execute recover operation
+        return new EntityPersistExecutor(this.connection, this.queryRunner, "recover", target, entity, options)
+            .execute()
+            .then(() => entity);
+    }
     /**
      * Inserts a given entity into the database.
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
@@ -246,27 +270,43 @@ var EntityManager = /** @class */ (function () {
      * Does not check if entity exist in the database, so query will fail if duplicate entity is being inserted.
      * You can execute bulk inserts using this method.
      */
-    EntityManager.prototype.insert = function (target, entity) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var results;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(this.connection.driver instanceof OracleDriver && entity instanceof Array)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, Promise.all(entity.map(function (entity) { return _this.insert(target, entity); }))];
-                    case 1:
-                        results = _a.sent();
-                        return [2 /*return*/, results.reduce(function (mergedResult, result) { return Object.assign(mergedResult, result); }, {})];
-                    case 2: return [2 /*return*/, this.createQueryBuilder()
-                            .insert()
-                            .into(target)
-                            .values(entity)
-                            .execute()];
-                }
-            });
-        });
-    };
+    async insert(target, entity) {
+        return this.createQueryBuilder()
+            .insert()
+            .into(target)
+            .values(entity)
+            .execute();
+    }
+    async upsert(target, entityOrEntities, conflictPathsOrOptions) {
+        const metadata = this.connection.getMetadata(target);
+        let options;
+        if (Array.isArray(conflictPathsOrOptions)) {
+            options = {
+                conflictPaths: conflictPathsOrOptions,
+            };
+        }
+        else {
+            options = conflictPathsOrOptions;
+        }
+        let entities;
+        if (!Array.isArray(entityOrEntities)) {
+            entities = [entityOrEntities];
+        }
+        else {
+            entities = entityOrEntities;
+        }
+        const conflictColumns = metadata.mapPropertyPathsToColumns(options.conflictPaths);
+        const overwriteColumns = metadata.columns.filter((col) => !conflictColumns.includes(col) &&
+            entities.some((entity) => typeof col.getEntityValue(entity) !== "undefined"));
+        return this.createQueryBuilder()
+            .insert()
+            .into(target)
+            .values(entities)
+            .orUpdate([...conflictColumns, ...overwriteColumns].map((col) => col.databaseName), conflictColumns.map((col) => col.databaseName), {
+            skipUpdateIfNoValuesChanged: options.skipUpdateIfNoValuesChanged,
+        })
+            .execute();
+    }
     /**
      * Updates entity partially. Entity can be found by a given condition(s).
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
@@ -274,18 +314,18 @@ var EntityManager = /** @class */ (function () {
      * Does not check if entity exist in the database.
      * Condition(s) cannot be empty.
      */
-    EntityManager.prototype.update = function (target, criteria, partialEntity) {
+    update(target, criteria, partialEntity) {
         // if user passed empty criteria or empty list of criterias, then throw an error
         if (criteria === undefined ||
             criteria === null ||
             criteria === "" ||
-            (criteria instanceof Array && criteria.length === 0)) {
-            return Promise.reject(new Error("Empty criteria(s) are not allowed for the update method."));
+            (Array.isArray(criteria) && criteria.length === 0)) {
+            return Promise.reject(new TypeORMError(`Empty criteria(s) are not allowed for the update method.`));
         }
         if (typeof criteria === "string" ||
             typeof criteria === "number" ||
             criteria instanceof Date ||
-            criteria instanceof Array) {
+            Array.isArray(criteria)) {
             return this.createQueryBuilder()
                 .update(target)
                 .set(partialEntity)
@@ -299,7 +339,7 @@ var EntityManager = /** @class */ (function () {
                 .where(criteria)
                 .execute();
         }
-    };
+    }
     /**
      * Deletes entities by a given condition(s).
      * Unlike save method executes a primitive operation without cascades, relations and other operations included.
@@ -307,18 +347,18 @@ var EntityManager = /** @class */ (function () {
      * Does not check if entity exist in the database.
      * Condition(s) cannot be empty.
      */
-    EntityManager.prototype.delete = function (targetOrEntity, criteria) {
+    delete(targetOrEntity, criteria) {
         // if user passed empty criteria or empty list of criterias, then throw an error
         if (criteria === undefined ||
             criteria === null ||
             criteria === "" ||
-            (criteria instanceof Array && criteria.length === 0)) {
-            return Promise.reject(new Error("Empty criteria(s) are not allowed for the delete method."));
+            (Array.isArray(criteria) && criteria.length === 0)) {
+            return Promise.reject(new TypeORMError(`Empty criteria(s) are not allowed for the delete method.`));
         }
         if (typeof criteria === "string" ||
             typeof criteria === "number" ||
             criteria instanceof Date ||
-            criteria instanceof Array) {
+            Array.isArray(criteria)) {
             return this.createQueryBuilder()
                 .delete()
                 .from(targetOrEntity)
@@ -332,310 +372,368 @@ var EntityManager = /** @class */ (function () {
                 .where(criteria)
                 .execute();
         }
-    };
+    }
+    /**
+     * Records the delete date of entities by a given condition(s).
+     * Unlike save method executes a primitive operation without cascades, relations and other operations included.
+     * Executes fast and efficient DELETE query.
+     * Does not check if entity exist in the database.
+     * Condition(s) cannot be empty.
+     */
+    softDelete(targetOrEntity, criteria) {
+        // if user passed empty criteria or empty list of criterias, then throw an error
+        if (criteria === undefined ||
+            criteria === null ||
+            criteria === "" ||
+            (Array.isArray(criteria) && criteria.length === 0)) {
+            return Promise.reject(new TypeORMError(`Empty criteria(s) are not allowed for the delete method.`));
+        }
+        if (typeof criteria === "string" ||
+            typeof criteria === "number" ||
+            criteria instanceof Date ||
+            Array.isArray(criteria)) {
+            return this.createQueryBuilder()
+                .softDelete()
+                .from(targetOrEntity)
+                .whereInIds(criteria)
+                .execute();
+        }
+        else {
+            return this.createQueryBuilder()
+                .softDelete()
+                .from(targetOrEntity)
+                .where(criteria)
+                .execute();
+        }
+    }
     /**
-     * Counts entities that match given find options or conditions.
+     * Restores entities by a given condition(s).
+     * Unlike save method executes a primitive operation without cascades, relations and other operations included.
+     * Executes fast and efficient DELETE query.
+     * Does not check if entity exist in the database.
+     * Condition(s) cannot be empty.
+     */
+    restore(targetOrEntity, criteria) {
+        // if user passed empty criteria or empty list of criterias, then throw an error
+        if (criteria === undefined ||
+            criteria === null ||
+            criteria === "" ||
+            (Array.isArray(criteria) && criteria.length === 0)) {
+            return Promise.reject(new TypeORMError(`Empty criteria(s) are not allowed for the delete method.`));
+        }
+        if (typeof criteria === "string" ||
+            typeof criteria === "number" ||
+            criteria instanceof Date ||
+            Array.isArray(criteria)) {
+            return this.createQueryBuilder()
+                .restore()
+                .from(targetOrEntity)
+                .whereInIds(criteria)
+                .execute();
+        }
+        else {
+            return this.createQueryBuilder()
+                .restore()
+                .from(targetOrEntity)
+                .where(criteria)
+                .execute();
+        }
+    }
+    /**
+     * Counts entities that match given options.
      * Useful for pagination.
      */
-    EntityManager.prototype.count = function (entityClass, conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, qb;
-            return tslib_1.__generator(this, function (_a) {
-                metadata = this.connection.getMetadata(entityClass);
-                qb = this.createQueryBuilder(entityClass, metadata.name);
-                qb.setFindOptions({
-                    where: conditions,
-                    options: options
-                });
-                return [2 /*return*/, qb.getCount()];
-            });
-        });
-    };
-    /**
-     * Finds entities that match given find options or conditions.
-     */
-    EntityManager.prototype.find = function (entityClass, optionsOrConditions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, qb;
-            return tslib_1.__generator(this, function (_a) {
-                metadata = this.connection.getMetadata(entityClass);
-                qb = this.createQueryBuilder(entityClass, metadata.name);
-                if (optionsOrConditions)
-                    qb.setFindOptions(FindOptionsUtils.isFindOptions(optionsOrConditions) ? optionsOrConditions : { where: optionsOrConditions });
-                return [2 /*return*/, qb.getMany()];
-            });
-        });
-    };
+    count(entityClass, options) {
+        const metadata = this.connection.getMetadata(entityClass);
+        return this.createQueryBuilder(entityClass, FindOptionsUtils.extractFindManyOptionsAlias(options) ||
+            metadata.name)
+            .setFindOptions(options || {})
+            .getCount();
+    }
+    /**
+     * Counts entities that match given conditions.
+     * Useful for pagination.
+     */
+    countBy(entityClass, where) {
+        const metadata = this.connection.getMetadata(entityClass);
+        return this.createQueryBuilder(entityClass, metadata.name)
+            .setFindOptions({ where })
+            .getCount();
+    }
     /**
-     * Finds entities that match given find options and conditions.
+     * Finds entities that match given find options.
+     */
+    async find(entityClass, options) {
+        const metadata = this.connection.getMetadata(entityClass);
+        return this.createQueryBuilder(entityClass, FindOptionsUtils.extractFindManyOptionsAlias(options) ||
+            metadata.name)
+            .setFindOptions(options || {})
+            .getMany();
+    }
+    /**
+     * Finds entities that match given find options.
+     */
+    async findBy(entityClass, where) {
+        const metadata = this.connection.getMetadata(entityClass);
+        return this.createQueryBuilder(entityClass, metadata.name)
+            .setFindOptions({ where: where })
+            .getMany();
+    }
+    /**
+     * Finds entities that match given find options.
      * Also counts all entities that match given conditions,
      * but ignores pagination settings (from and take options).
      */
-    EntityManager.prototype.findAndCount = function (entityClass, optionsOrConditions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, qb;
-            return tslib_1.__generator(this, function (_a) {
-                metadata = this.connection.getMetadata(entityClass);
-                qb = this.createQueryBuilder(entityClass, metadata.name);
-                if (optionsOrConditions)
-                    qb.setFindOptions(FindOptionsUtils.isFindOptions(optionsOrConditions) ? optionsOrConditions : { where: optionsOrConditions });
-                return [2 /*return*/, qb.getManyAndCount()];
-            });
-        });
-    };
+    findAndCount(entityClass, options) {
+        const metadata = this.connection.getMetadata(entityClass);
+        return this.createQueryBuilder(entityClass, FindOptionsUtils.extractFindManyOptionsAlias(options) ||
+            metadata.name)
+            .setFindOptions(options || {})
+            .getManyAndCount();
+    }
+    /**
+     * Finds entities that match given WHERE conditions.
+     * Also counts all entities that match given conditions,
+     * but ignores pagination settings (from and take options).
+     */
+    findAndCountBy(entityClass, where) {
+        const metadata = this.connection.getMetadata(entityClass);
+        return this.createQueryBuilder(entityClass, metadata.name)
+            .setFindOptions({ where })
+            .getManyAndCount();
+    }
     /**
      * Finds entities with ids.
      * Optionally find options or conditions can be applied.
+     *
+     * @deprecated use `findBy` method instead in conjunction with `In` operator, for example:
+     *
+     * .findBy({
+     *     id: In([1, 2, 3])
+     * })
      */
-    EntityManager.prototype.findByIds = function (entityClass, ids, optionsOrConditions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, qb, findOptions;
-            return tslib_1.__generator(this, function (_a) {
-                // if no ids passed, no need to execute a query - just return an empty array of values
-                if (!ids.length)
-                    return [2 /*return*/, Promise.resolve([])];
-                metadata = this.connection.getMetadata(entityClass);
-                qb = this.createQueryBuilder(entityClass, metadata.name);
-                findOptions = {};
-                if (FindOptionsUtils.isFindOptions(optionsOrConditions)) {
-                    Object.assign(findOptions, optionsOrConditions);
-                }
-                else if (optionsOrConditions) {
-                    Object.assign(findOptions, { where: optionsOrConditions });
-                }
-                // if (findOptions.where || metadata.primaryColumns.length > 1) {
-                return [2 /*return*/, qb
-                        .setFindOptions(findOptions)
-                        .andWhereInIds(ids)
-                        .getMany()];
-            });
-        });
-    };
-    /**
-     * Finds first entity that matches given conditions.
-     */
-    EntityManager.prototype.findOne = function (entityClass, idOrOptionsOrConditions, maybeOptions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var findOptions, options, metadata, qb;
-            return tslib_1.__generator(this, function (_a) {
-                findOptions = undefined;
-                if (FindOptionsUtils.isFindOptions(idOrOptionsOrConditions)) {
-                    findOptions = idOrOptionsOrConditions;
-                }
-                else if (maybeOptions && FindOptionsUtils.isFindOptions(maybeOptions)) {
-                    findOptions = maybeOptions;
-                }
-                options = undefined;
-                if (idOrOptionsOrConditions instanceof Object && !FindOptionsUtils.isFindOptions(idOrOptionsOrConditions))
-                    options = idOrOptionsOrConditions;
-                metadata = this.connection.getMetadata(entityClass);
-                qb = this.createQueryBuilder(entityClass, metadata.name);
-                // if (!findOptions || findOptions.loadEagerRelations !== false)
-                //     FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias!.metadata);
-                if (findOptions) {
-                    findOptions = tslib_1.__assign({}, (findOptions || {}), { take: 1 });
-                    qb.setFindOptions(findOptions);
-                }
-                if (options) {
-                    qb.where(options);
-                }
-                else if (typeof idOrOptionsOrConditions === "string" || typeof idOrOptionsOrConditions === "number" || idOrOptionsOrConditions instanceof Date) {
-                    qb.andWhereInIds(metadata.ensureEntityIdMap(idOrOptionsOrConditions));
-                }
-                return [2 /*return*/, qb.getOne()];
-            });
-        });
-    };
-    /**
-     * Finds first entity that matches given conditions or rejects the returned promise on error.
-     */
-    EntityManager.prototype.findOneOrFail = function (entityClass, idOrOptionsOrConditions, maybeOptions) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.findOne(entityClass, idOrOptionsOrConditions, maybeOptions).then(function (value) {
-                        if (value === undefined) {
-                            return Promise.reject(new EntityNotFoundError(entityClass, idOrOptionsOrConditions));
-                        }
-                        return Promise.resolve(value);
-                    })];
-            });
-        });
-    };
+    async findByIds(entityClass, ids) {
+        // if no ids passed, no need to execute a query - just return an empty array of values
+        if (!ids.length)
+            return Promise.resolve([]);
+        const metadata = this.connection.getMetadata(entityClass);
+        return this.createQueryBuilder(entityClass, metadata.name)
+            .andWhereInIds(ids)
+            .getMany();
+    }
     /**
-     * Finds entities that match given options and returns observable.
-     * Whenever new data appears that matches given query observable emits new value.
+     * Finds first entity by a given find options.
+     * If entity was not found in the database - returns null.
      */
-    EntityManager.prototype.observe = function (entityClass, optionsOrConditions) {
-        var metadata = this.connection.getMetadata(entityClass);
-        return new QueryObserver(this.connection, "find", metadata, optionsOrConditions).observe();
-    };
+    async findOne(entityClass, options) {
+        const metadata = this.connection.getMetadata(entityClass);
+        // prepare alias for built query
+        let alias = metadata.name;
+        if (options && options.join) {
+            alias = options.join.alias;
+        }
+        // create query builder and apply find options
+        return this.createQueryBuilder(entityClass, alias)
+            .setFindOptions({
+            ...options,
+            take: 1,
+        })
+            .getOne();
+    }
     /**
-     * Finds entities and count that match given options and returns observable.
-     * Whenever new data appears that matches given query observable emits new value.
+     * Finds first entity that matches given where condition.
+     * If entity was not found in the database - returns null.
      */
-    EntityManager.prototype.observeManyAndCount = function (entityClass, optionsOrConditions) {
-        var metadata = this.connection.getMetadata(entityClass);
-        return new QueryObserver(this.connection, "findAndCount", metadata, optionsOrConditions).observe();
-    };
+    async findOneBy(entityClass, where) {
+        const metadata = this.connection.getMetadata(entityClass);
+        // create query builder and apply find options
+        return this.createQueryBuilder(entityClass, metadata.name)
+            .setFindOptions({
+            where,
+            take: 1,
+        })
+            .getOne();
+    }
     /**
-     * Finds entity that match given options and returns observable.
-     * Whenever new data appears that matches given query observable emits new value.
+     * Finds first entity that matches given id.
+     * If entity was not found in the database - returns null.
+     *
+     * @deprecated use `findOneBy` method instead in conjunction with `In` operator, for example:
+     *
+     * .findOneBy({
+     *     id: 1 // where "id" is your primary column name
+     * })
      */
-    EntityManager.prototype.observeOne = function (entityClass, optionsOrConditions) {
-        var metadata = this.connection.getMetadata(entityClass);
-        return new QueryObserver(this.connection, "findOne", metadata, optionsOrConditions).observe();
-    };
+    async findOneById(entityClass, id) {
+        const metadata = this.connection.getMetadata(entityClass);
+        // create query builder and apply find options
+        return this.createQueryBuilder(entityClass, metadata.name)
+            .setFindOptions({
+            take: 1,
+        })
+            .whereInIds(metadata.ensureEntityIdMap(id))
+            .getOne();
+    }
     /**
-     * Gets the entities count match given options and returns observable.
-     * Whenever new data appears that matches given query observable emits new value.
+     * Finds first entity by a given find options.
+     * If entity was not found in the database - rejects with error.
      */
-    EntityManager.prototype.observeCount = function (entityClass, optionsOrConditions) {
-        var metadata = this.connection.getMetadata(entityClass);
-        return new QueryObserver(this.connection, "count", metadata, optionsOrConditions).observe();
-    };
+    async findOneOrFail(entityClass, options) {
+        return this.findOne(entityClass, options).then((value) => {
+            if (value === null) {
+                return Promise.reject(new EntityNotFoundError(entityClass, options));
+            }
+            return Promise.resolve(value);
+        });
+    }
+    /**
+     * Finds first entity that matches given where condition.
+     * If entity was not found in the database - rejects with error.
+     */
+    async findOneByOrFail(entityClass, where) {
+        return this.findOneBy(entityClass, where).then((value) => {
+            if (value === null) {
+                return Promise.reject(new EntityNotFoundError(entityClass, where));
+            }
+            return Promise.resolve(value);
+        });
+    }
     /**
      * Clears all the data from the given table (truncates/drops it).
      *
      * Note: this method uses TRUNCATE and may not work as you expect in transactions on some platforms.
      * @see https://stackoverflow.com/a/5972738/925151
      */
-    EntityManager.prototype.clear = function (entityClass) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, queryRunner;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        metadata = this.connection.getMetadata(entityClass);
-                        queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, , 3, 6]);
-                        return [4 /*yield*/, queryRunner.clearTable(metadata.tablePath)];
-                    case 2: return [2 /*return*/, _a.sent()]; // await is needed here because we are using finally
-                    case 3:
-                        if (!!this.queryRunner) return [3 /*break*/, 5];
-                        return [4 /*yield*/, queryRunner.release()];
-                    case 4:
-                        _a.sent();
-                        _a.label = 5;
-                    case 5: return [7 /*endfinally*/];
-                    case 6: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async clear(entityClass) {
+        const metadata = this.connection.getMetadata(entityClass);
+        const queryRunner = this.queryRunner || this.connection.createQueryRunner();
+        try {
+            return await queryRunner.clearTable(metadata.tablePath); // await is needed here because we are using finally
+        }
+        finally {
+            if (!this.queryRunner)
+                await queryRunner.release();
+        }
+    }
     /**
      * Increments some column by provided value of the entities matched given conditions.
      */
-    EntityManager.prototype.increment = function (entityClass, conditions, propertyPath, value) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, column, values;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                metadata = this.connection.getMetadata(entityClass);
-                column = metadata.findColumnWithPropertyPath(propertyPath);
-                if (!column)
-                    throw new Error("Column " + propertyPath + " was not found in " + metadata.targetName + " entity.");
-                if (isNaN(Number(value)))
-                    throw new Error("Value \"" + value + "\" is not a number.");
-                values = propertyPath
-                    .split(".")
-                    .reduceRight(function (value, key) {
-                    var _a;
-                    return (_a = {}, _a[key] = value, _a);
-                }, function () { return _this.connection.driver.escape(column.databaseName) + " + " + value; });
-                return [2 /*return*/, this
-                        .createQueryBuilder(entityClass, "entity")
-                        .update(entityClass)
-                        .set(values)
-                        .where(conditions)
-                        .execute()];
-            });
-        });
-    };
+    async increment(entityClass, conditions, propertyPath, value) {
+        const metadata = this.connection.getMetadata(entityClass);
+        const column = metadata.findColumnWithPropertyPath(propertyPath);
+        if (!column)
+            throw new TypeORMError(`Column ${propertyPath} was not found in ${metadata.targetName} entity.`);
+        if (isNaN(Number(value)))
+            throw new TypeORMError(`Value "${value}" is not a number.`);
+        // convert possible embeded path "social.likes" into object { social: { like: () => value } }
+        const values = propertyPath
+            .split(".")
+            .reduceRight((value, key) => ({ [key]: value }), () => this.connection.driver.escape(column.databaseName) +
+            " + " +
+            value);
+        return this.createQueryBuilder(entityClass, "entity")
+            .update(entityClass)
+            .set(values)
+            .where(conditions)
+            .execute();
+    }
     /**
      * Decrements some column by provided value of the entities matched given conditions.
      */
-    EntityManager.prototype.decrement = function (entityClass, conditions, propertyPath, value) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var metadata, column, values;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                metadata = this.connection.getMetadata(entityClass);
-                column = metadata.findColumnWithPropertyPath(propertyPath);
-                if (!column)
-                    throw new Error("Column " + propertyPath + " was not found in " + metadata.targetName + " entity.");
-                if (isNaN(Number(value)))
-                    throw new Error("Value \"" + value + "\" is not a number.");
-                values = propertyPath
-                    .split(".")
-                    .reduceRight(function (value, key) {
-                    var _a;
-                    return (_a = {}, _a[key] = value, _a);
-                }, function () { return _this.connection.driver.escape(column.databaseName) + " - " + value; });
-                return [2 /*return*/, this
-                        .createQueryBuilder(entityClass, "entity")
-                        .update(entityClass)
-                        .set(values)
-                        .where(conditions)
-                        .execute()];
-            });
-        });
-    };
+    async decrement(entityClass, conditions, propertyPath, value) {
+        const metadata = this.connection.getMetadata(entityClass);
+        const column = metadata.findColumnWithPropertyPath(propertyPath);
+        if (!column)
+            throw new TypeORMError(`Column ${propertyPath} was not found in ${metadata.targetName} entity.`);
+        if (isNaN(Number(value)))
+            throw new TypeORMError(`Value "${value}" is not a number.`);
+        // convert possible embeded path "social.likes" into object { social: { like: () => value } }
+        const values = propertyPath
+            .split(".")
+            .reduceRight((value, key) => ({ [key]: value }), () => this.connection.driver.escape(column.databaseName) +
+            " - " +
+            value);
+        return this.createQueryBuilder(entityClass, "entity")
+            .update(entityClass)
+            .set(values)
+            .where(conditions)
+            .execute();
+    }
     /**
      * Gets repository for the given entity class or name.
      * If single database connection mode is used, then repository is obtained from the
      * repository aggregator, where each repository is individually created for this entity manager.
      * When single database connection is not used, repository is being obtained from the connection.
      */
-    EntityManager.prototype.getRepository = function (target) {
-        // throw exception if there is no repository with this target registered
-        if (!this.connection.hasMetadata(target))
-            throw new RepositoryNotFoundError(this.connection.name, target);
+    getRepository(target) {
         // find already created repository instance and return it if found
-        var metadata = this.connection.getMetadata(target);
-        var repository = this.repositories.find(function (repository) { return repository.metadata === metadata; });
+        const repository = this.repositories.find((repository) => repository.target === target);
         if (repository)
             return repository;
         // if repository was not found then create it, store its instance and return it
-        var newRepository = new RepositoryFactory().create(this, metadata, this.queryRunner);
-        this.repositories.push(newRepository);
-        return newRepository;
-    };
+        if (this.connection.driver.options.type === "mongodb") {
+            const newRepository = new MongoRepository(target, this, this.queryRunner);
+            this.repositories.push(newRepository);
+            return newRepository;
+        }
+        else {
+            const newRepository = new Repository(target, this, this.queryRunner);
+            this.repositories.push(newRepository);
+            return newRepository;
+        }
+    }
     /**
      * Gets tree repository for the given entity class or name.
      * If single database connection mode is used, then repository is obtained from the
      * repository aggregator, where each repository is individually created for this entity manager.
      * When single database connection is not used, repository is being obtained from the connection.
      */
-    EntityManager.prototype.getTreeRepository = function (target) {
+    getTreeRepository(target) {
         // tree tables aren't supported by some drivers (mongodb)
         if (this.connection.driver.treeSupport === false)
             throw new TreeRepositoryNotSupportedError(this.connection.driver);
+        // find already created repository instance and return it if found
+        const repository = this.treeRepositories.find((repository) => repository.target === target);
+        if (repository)
+            return repository;
         // check if repository is real tree repository
-        var repository = this.getRepository(target);
-        // todo: fix it
-        // if (!(repository instanceof TreeRepository))
-        //     throw new RepositoryNotTreeError(target);
-        return repository;
-    };
+        const newRepository = new TreeRepository(target, this, this.queryRunner);
+        this.treeRepositories.push(newRepository);
+        return newRepository;
+    }
     /**
      * Gets mongodb repository for the given entity class.
      */
-    EntityManager.prototype.getMongoRepository = function (target) {
+    getMongoRepository(target) {
         return this.connection.getMongoRepository(target);
-    };
+    }
+    /**
+     * Creates a new repository instance out of a given Repository and
+     * sets current EntityManager instance to it. Used to work with custom repositories
+     * in transactions.
+     */
+    withRepository(repository) {
+        const repositoryConstructor = repository.constructor;
+        return new repositoryConstructor(repository.target, this);
+    }
     /**
      * Gets custom entity repository marked with @EntityRepository decorator.
+     *
+     * @deprecated use Repository.extend to create custom repositories
      */
-    EntityManager.prototype.getCustomRepository = function (customRepository) {
-        var entityRepositoryMetadataArgs = getMetadataArgsStorage().entityRepositories.find(function (repository) {
-            return repository.target === (customRepository instanceof Function ? customRepository : customRepository.constructor);
+    getCustomRepository(customRepository) {
+        const entityRepositoryMetadataArgs = getMetadataArgsStorage().entityRepositories.find((repository) => {
+            return (repository.target ===
+                (typeof customRepository === "function"
+                    ? customRepository
+                    : customRepository.constructor));
         });
         if (!entityRepositoryMetadataArgs)
             throw new CustomRepositoryNotFoundError(customRepository);
-        var entityMetadata = entityRepositoryMetadataArgs.entity ? this.connection.getMetadata(entityRepositoryMetadataArgs.entity) : undefined;
-        var entityRepositoryInstance = new entityRepositoryMetadataArgs.target(this, entityMetadata);
+        const entityMetadata = entityRepositoryMetadataArgs.entity
+            ? this.connection.getMetadata(entityRepositoryMetadataArgs.entity)
+            : undefined;
+        const entityRepositoryInstance = new entityRepositoryMetadataArgs.target(this, entityMetadata);
         // NOTE: dynamic access to protected properties. We need this to prevent unwanted properties in those classes to be exposed,
         // however we need these properties for internal work of the class
         if (entityRepositoryInstance instanceof AbstractRepository) {
@@ -649,23 +747,17 @@ var EntityManager = /** @class */ (function () {
             entityRepositoryInstance["metadata"] = entityMetadata;
         }
         return entityRepositoryInstance;
-    };
+    }
     /**
      * Releases all resources used by entity manager.
      * This is used when entity manager is created with a single query runner,
      * and this single query runner needs to be released after job with entity manager is done.
      */
-    EntityManager.prototype.release = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                if (!this.queryRunner)
-                    throw new NoNeedToReleaseEntityManagerError();
-                return [2 /*return*/, this.queryRunner.release()];
-            });
-        });
-    };
-    return EntityManager;
-}());
-export { EntityManager };
+    async release() {
+        if (!this.queryRunner)
+            throw new NoNeedToReleaseEntityManagerError();
+        return this.queryRunner.release();
+    }
+}
 
 //# sourceMappingURL=EntityManager.js.map